Ros-diffs September 2014

ros-diffs@reactos.org

16 participants
413 discussions

[cwittich] 64220: [uxtheme] fix typos
by cwittich＠svn.reactos.org 21 Sep '14

21 Sep '14

Author: cwittich Date: Sun Sep 21 17:54:33 2014 New Revision: 64220 URL: http://svn.reactos.org/svn/reactos?rev=64220&view=rev Log: [uxtheme] fix typos Modified: trunk/reactos/dll/win32/uxtheme/system.c trunk/reactos/dll/win32/uxtheme/themehooks.c trunk/reactos/dll/win32/uxtheme/uxthemep.h Modified: trunk/reactos/dll/win32/uxtheme/system.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/system.c… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/system.c [iso-8859-1] Sun Sep 21 17:54:33 2014 @@ -49,7 +49,7 @@ ATOM atWindowTheme; static ATOM atSubAppName; static ATOM atSubIdList; -ATOM atWndContrext; +ATOM atWndContext; PTHEME_FILE ActiveThemeFile; @@ -581,7 +581,7 @@ atSubAppName = GlobalAddAtomW(szSubAppName); atSubIdList = GlobalAddAtomW(szSubIdList); atDialogThemeEnabled = GlobalAddAtomW(szDialogThemeEnabled); - atWndContrext = GlobalAddAtomW(L"ux_WndContext"); + atWndContext = GlobalAddAtomW(L"ux_WndContext"); } /*********************************************************************** Modified: trunk/reactos/dll/win32/uxtheme/themehooks.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/themehoo… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/themehooks.c [iso-8859-1] Sun Sep 21 17:54:33 2014 @@ -17,7 +17,7 @@ { PWND_CONTEXT pcontext; - pcontext = (PWND_CONTEXT)GetPropW(hWnd, (LPCWSTR)MAKEINTATOM(atWndContrext)); + pcontext = (PWND_CONTEXT)GetPropW(hWnd, (LPCWSTR)MAKEINTATOM(atWndContext)); if(pcontext == NULL) { pcontext = HeapAlloc(GetProcessHeap(), @@ -28,13 +28,13 @@ return NULL; } - SetPropW( hWnd, (LPCWSTR)MAKEINTATOM(atWndContrext), pcontext); + SetPropW( hWnd, (LPCWSTR)MAKEINTATOM(atWndContext), pcontext); } return pcontext; } -void ThemeDetroyWndContext(HWND hWnd) +void ThemeDestroyWndContext(HWND hWnd) { PWND_CONTEXT pContext; DWORD ProcessId; @@ -46,7 +46,7 @@ return; } - pContext = (PWND_CONTEXT)GetPropW(hWnd, (LPCWSTR)MAKEINTATOM(atWndContrext)); + pContext = (PWND_CONTEXT)GetPropW(hWnd, (LPCWSTR)MAKEINTATOM(atWndContext)); if(pContext == NULL) { return; @@ -59,12 +59,12 @@ HeapFree(GetProcessHeap(), 0, pContext); - SetPropW( hWnd, (LPCWSTR)MAKEINTATOM(atWndContrext), NULL); + SetPropW( hWnd, (LPCWSTR)MAKEINTATOM(atWndContext), NULL); } static BOOL CALLBACK ThemeCleanupChildWndContext (HWND hWnd, LPARAM msg) { - ThemeDetroyWndContext(hWnd); + ThemeDestroyWndContext(hWnd); return TRUE; } @@ -76,7 +76,7 @@ } else { - ThemeDetroyWndContext(hWnd); + ThemeDestroyWndContext(hWnd); EnumChildWindows (hWnd, ThemeCleanupChildWndContext, 0); } @@ -249,7 +249,7 @@ } case WM_DESTROY: { - ThemeDetroyWndContext(hWnd); + ThemeDestroyWndContext(hWnd); return 0; } } Modified: trunk/reactos/dll/win32/uxtheme/uxthemep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/uxtheme/uxthemep… ============================================================================== --- trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/uxtheme/uxthemep.h [iso-8859-1] Sun Sep 21 17:54:33 2014 @@ -219,7 +219,7 @@ extern HINSTANCE hDllInst; extern ATOM atWindowTheme; -extern ATOM atWndContrext; +extern ATOM atWndContext; extern BOOL gbThemeHooksActive; extern PTHEME_FILE ActiveThemeFile;

1 0

[jgardou] 64219: [WIN32K] - Introduce the base of what should become a proper user object manager, with proper refcounting, handle management, cleanup callbacks and inter-object referencing. Approv...
by jgardou＠svn.reactos.org 21 Sep '14

21 Sep '14

Author: jgardou Date: Sun Sep 21 17:44:40 2014 New Revision: 64219 URL: http://svn.reactos.org/svn/reactos?rev=64219&view=rev Log: [WIN32K] - Introduce the base of what should become a proper user object manager, with proper refcounting, handle management, cleanup callbacks and inter-object referencing. Approved by Jim and Giannis. CORE-8539 #resolve Modified: trunk/reactos/win32ss/include/ntuser.h trunk/reactos/win32ss/user/ntuser/accelerator.c trunk/reactos/win32ss/user/ntuser/accelerator.h trunk/reactos/win32ss/user/ntuser/callproc.c trunk/reactos/win32ss/user/ntuser/class.c trunk/reactos/win32ss/user/ntuser/class.h trunk/reactos/win32ss/user/ntuser/cursoricon.c trunk/reactos/win32ss/user/ntuser/cursoricon.h trunk/reactos/win32ss/user/ntuser/event.c trunk/reactos/win32ss/user/ntuser/hook.c trunk/reactos/win32ss/user/ntuser/hook.h trunk/reactos/win32ss/user/ntuser/main.c trunk/reactos/win32ss/user/ntuser/menu.c trunk/reactos/win32ss/user/ntuser/menu.h trunk/reactos/win32ss/user/ntuser/object.c trunk/reactos/win32ss/user/ntuser/object.h trunk/reactos/win32ss/user/ntuser/simplecall.c trunk/reactos/win32ss/user/ntuser/userfuncs.h trunk/reactos/win32ss/user/ntuser/win32.h trunk/reactos/win32ss/user/ntuser/window.c trunk/reactos/win32ss/user/user32/misc/misc.c Modified: trunk/reactos/win32ss/include/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r… ============================================================================== --- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Sun Sep 21 17:44:40 2014 @@ -172,7 +172,7 @@ typedef struct _PROCDESKHEAD { HEAD; - DWORD hTaskWow; + DWORD_PTR hTaskWow; struct _DESKTOP *rpdesk; PVOID pSelf; } PROCDESKHEAD, *PPROCDESKHEAD; Modified: trunk/reactos/win32ss/user/ntuser/accelerator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/accele… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/accelerator.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/accelerator.c [iso-8859-1] Sun Sep 21 17:44:40 2014 @@ -235,6 +235,7 @@ ULONG Index; NTSTATUS Status = STATUS_SUCCESS; DECLARE_RETURN(HACCEL); + PTHREADINFO pti; TRACE("Enter NtUserCreateAcceleratorTable(Entries %p, EntriesCount %u)\n", Entries, EntriesCount); @@ -246,7 +247,14 @@ RETURN( (HACCEL) NULL ); } - Accel = UserCreateObject(gHandleTable, NULL, NULL, (PHANDLE)&hAccel, TYPE_ACCELTABLE, sizeof(ACCELERATOR_TABLE)); + pti = PsGetCurrentThreadWin32Thread(); + + Accel = UserCreateObject(gHandleTable, + pti->rpdesk, + pti, + (PHANDLE)&hAccel, + TYPE_ACCELTABLE, + sizeof(ACCELERATOR_TABLE)); if (Accel == NULL) { @@ -314,6 +322,21 @@ } BOOLEAN +UserDestroyAccelTable(PVOID Object) +{ + PACCELERATOR_TABLE Accel = Object; + + if (Accel->Table != NULL) + { + ExFreePoolWithTag(Accel->Table, USERTAG_ACCEL); + Accel->Table = NULL; + } + + UserDeleteObject(Accel->head.h, TYPE_ACCELTABLE); + return TRUE; +} + +BOOLEAN APIENTRY NtUserDestroyAcceleratorTable( HACCEL hAccel) @@ -334,13 +357,7 @@ RETURN( FALSE); } - if (Accel->Table != NULL) - { - ExFreePoolWithTag(Accel->Table, USERTAG_ACCEL); - Accel->Table = NULL; - } - - UserDeleteObject(hAccel, TYPE_ACCELTABLE); + UserDestroyAccelTable(Accel); RETURN( TRUE); Modified: trunk/reactos/win32ss/user/ntuser/accelerator.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/accele… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/accelerator.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/accelerator.h [iso-8859-1] Sun Sep 21 17:44:40 2014 @@ -2,9 +2,11 @@ typedef struct _ACCELERATOR_TABLE { - HEAD head; + PROCMARKHEAD head; ULONG Count; LPACCEL Table; } ACCELERATOR_TABLE, *PACCELERATOR_TABLE; PACCELERATOR_TABLE FASTCALL UserGetAccelObject(HACCEL); +BOOLEAN +UserDestroyAccelTable(PVOID Object); Modified: trunk/reactos/win32ss/user/ntuser/callproc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/callpr… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/callproc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/callproc.c [iso-8859-1] Sun Sep 21 17:44:40 2014 @@ -17,11 +17,11 @@ return (WNDPROC)((ULONG_PTR)UserHMGetHandle(CallProc) | 0xFFFF0000); } -VOID -DestroyCallProc(IN PDESKTOPINFO Desktop, - IN OUT PCALLPROCDATA CallProc) +BOOLEAN +DestroyCallProc(_Inout_ PVOID Object) { - UserDeleteObject(UserHMGetHandle(CallProc), TYPE_CALLPROC); + UserDeleteObject(UserHMGetHandle((PCALLPROCDATA)Object), TYPE_CALLPROC); + return TRUE; } PCALLPROCDATA @@ -33,9 +33,11 @@ PCALLPROCDATA NewCallProc; HANDLE Handle; + /* We can send any thread pointer to the object manager here, + * What's important is the process info */ NewCallProc = (PCALLPROCDATA)UserCreateObject(gHandleTable, Desktop, - NULL, + pi->ptiList, &Handle, TYPE_CALLPROC, sizeof(CALLPROCDATA)); @@ -129,7 +131,7 @@ // No luck, create a new one for the requested proc. if (!CallProc) { - CallProc = CreateCallProc( NULL, + CallProc = CreateCallProc( pCls->rpdeskParent, (WNDPROC)ProcIn, !!(Flags & UserGetCPDA2U), pti->ppi); Modified: trunk/reactos/win32ss/user/ntuser/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.c [iso-8859-1] Sun Sep 21 17:44:40 2014 @@ -224,8 +224,7 @@ NextCallProc = CallProc->spcpdNext; CallProc->spcpdNext = NULL; - DestroyCallProc(NULL, - CallProc); + DestroyCallProc(CallProc); CallProc = NextCallProc; } Modified: trunk/reactos/win32ss/user/ntuser/class.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/class.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/class.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/class.h [iso-8859-1] Sun Sep 21 17:44:40 2014 @@ -16,9 +16,8 @@ return ((ULONG_PTR)lpWndProc & 0xFFFF0000) == 0xFFFF0000; } -VOID -DestroyCallProc(IN PDESKTOPINFO Desktop, - IN OUT PCALLPROCDATA CallProc); +BOOLEAN +DestroyCallProc(_Inout_ PVOID Object); PCALLPROCDATA CreateCallProc(IN PDESKTOP Desktop, Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.c [iso-8859-1] Sun Sep 21 17:44:40 2014 @@ -209,7 +209,13 @@ PCURICON_OBJECT CurIcon; HANDLE hCurIcon; - CurIcon = UserCreateObject(gHandleTable, NULL, NULL, &hCurIcon, TYPE_CURSOR, sizeof(CURICON_OBJECT)); + CurIcon = UserCreateObject( + gHandleTable, + NULL, + GetW32ThreadInfo(), + &hCurIcon, + TYPE_CURSOR, + sizeof(CURICON_OBJECT)); if (!CurIcon) { @@ -315,19 +321,6 @@ Ret = UserDeleteObject(CurIcon->Self, TYPE_CURSOR); return Ret; -} - -VOID FASTCALL -IntCleanupCurIcons(struct _EPROCESS *Process, PPROCESSINFO Win32Process) -{ - PCURICON_OBJECT CurIcon, tmp; - - /* Run through the list of icon objects */ - LIST_FOR_EACH_SAFE(CurIcon, tmp, &gCurIconList, CURICON_OBJECT, ListEntry) - { - UserReferenceObject(CurIcon); - IntDestroyCurIconObject(CurIcon, Win32Process); - } } HCURSOR FASTCALL Modified: trunk/reactos/win32ss/user/ntuser/cursoricon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/cursor… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/cursoricon.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/cursoricon.h [iso-8859-1] Sun Sep 21 17:44:40 2014 @@ -105,7 +105,6 @@ BOOL InitCursorImpl(VOID); HANDLE IntCreateCurIconHandle(BOOLEAN Anim); -VOID FASTCALL IntCleanupCurIcons(struct _EPROCESS *Process, PPROCESSINFO Win32Process); BOOL UserDrawIconEx(HDC hDc, INT xLeft, INT yTop, PCURICON_OBJECT pIcon, INT cxWidth, INT cyHeight, UINT istepIfAniCur, HBRUSH hbrFlickerFreeDraw, UINT diFlags); @@ -115,6 +114,7 @@ PSYSTEM_CURSORINFO IntGetSysCursorInfo(VOID); HCURSOR FASTCALL IntSetCursor(HCURSOR hCursor); BOOL FASTCALL IntDestroyCursor(HANDLE hCurIcon, BOOL bForce); +BOOLEAN FASTCALL IntDestroyCurIconObject(PCURICON_OBJECT CurIcon, PPROCESSINFO ppi); #define IntReleaseCurIconObject(CurIconObj) \ UserDereferenceObject(CurIconObj) Modified: trunk/reactos/win32ss/user/ntuser/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/event.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/event.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/event.c [iso-8859-1] Sun Sep 21 17:44:40 2014 @@ -129,11 +129,10 @@ return NT_SUCCESS(Status) ? uResult : 0; } -static -BOOL -FASTCALL -IntRemoveEvent(PEVENTHOOK pEH) -{ +BOOLEAN +IntRemoveEvent(PVOID Object) +{ + PEVENTHOOK pEH = Object; if (pEH) { TRACE("IntRemoveEvent pEH %p\n", pEH); @@ -146,38 +145,6 @@ return TRUE; } return FALSE; -} - -VOID -FASTCALL -EVENT_DestroyThreadEvents(PETHREAD Thread) -{ - PTHREADINFO pti; - PEVENTHOOK pEH; - PLIST_ENTRY pLE; - - pti = Thread->Tcb.Win32Thread; - if (!pti) return; - - if (!GlobalEvents || !GlobalEvents->Counts) return; - - pLE = GlobalEvents->Events.Flink; - if (IsListEmpty(pLE)) return; - - pEH = CONTAINING_RECORD(pLE, EVENTHOOK, Chain); - do - { - if (IsListEmpty(pLE)) break; - if (!pEH) break; - pLE = pEH->Chain.Flink; - if (pEH->head.pti == pti) - { - IntRemoveEvent(pEH); - } - pEH = CONTAINING_RECORD(pLE, EVENTHOOK, Chain); - } while (pLE != &GlobalEvents->Events); - - return; } /* FUNCTIONS *****************************************************************/ @@ -332,7 +299,7 @@ HWINEVENTHOOK Ret = NULL; NTSTATUS Status; HANDLE Handle; - PETHREAD Thread = NULL; + PTHREADINFO pti; TRACE("NtUserSetWinEventHook hmod %p, pfn %p\n", hmodWinEventProc, lpfnWinEventProc); @@ -370,15 +337,22 @@ if (idThread) { + PETHREAD Thread; Status = PsLookupThreadByThreadId((HANDLE)(DWORD_PTR)idThread, &Thread); if (!NT_SUCCESS(Status)) { EngSetLastError(ERROR_INVALID_THREAD_ID); goto SetEventExit; } + pti = PsGetThreadWin32Thread(Thread); + ObDereferenceObject(Thread); + } + else + { + pti = PsGetCurrentThreadWin32Thread(); } // Creator, pti is set here. - pEH = UserCreateObject(gHandleTable, NULL, NULL, &Handle, TYPE_WINEVENTHOOK, sizeof(EVENTHOOK)); + pEH = UserCreateObject(gHandleTable, NULL, pti, &Handle, TYPE_WINEVENTHOOK, sizeof(EVENTHOOK)); if (pEH) { InsertTailList(&GlobalEvents->Events, &pEH->Chain); @@ -413,7 +387,6 @@ } SetEventExit: - if (Thread) ObDereferenceObject(Thread); UserLeave(); return Ret; } Modified: trunk/reactos/win32ss/user/ntuser/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.c [iso-8859-1] Sun Sep 21 17:44:40 2014 @@ -1028,14 +1028,13 @@ } /* Remove a hook, freeing it from the chain */ -static -VOID -FASTCALL -IntRemoveHook(PHOOK Hook) +BOOLEAN +IntRemoveHook(PVOID Object) { INT HookId; PTHREADINFO pti; PDESKTOP pdo; + PHOOK Hook = Object; HookId = Hook->HookId; @@ -1073,65 +1072,8 @@ pdo->pDeskInfo->fsHooks &= ~HOOKID_TO_FLAG(HookId); } } -} - -VOID -FASTCALL -HOOK_DestroyThreadHooks(PETHREAD Thread) -{ - PTHREADINFO pti; - PDESKTOP pdo; - int HookId; - PHOOK HookObj; - PLIST_ENTRY pElem; - - pti = Thread->Tcb.Win32Thread; - pdo = IntGetActiveDesktop(); - - if (!pti || !pdo) - { - ERR("Kill Thread Hooks pti %p pdo %p\n", pti, pdo); - return; - } - -// Local Thread cleanup. - if (pti->fsHooks) - { - for (HookId = WH_MINHOOK; HookId <= WH_MAXHOOK; HookId++) - { - PLIST_ENTRY pLastHead = &pti->aphkStart[HOOKID_TO_INDEX(HookId)]; - - pElem = pLastHead->Flink; - while (pElem != pLastHead) - { - HookObj = CONTAINING_RECORD(pElem, HOOK, Chain); - pElem = HookObj->Chain.Flink; // get next element before hook is destroyed - IntRemoveHook(HookObj); - } - } - pti->fsHooks = 0; - pti->pClientInfo->fsHooks = 0; - } -// Global search based on Thread and cleanup. - if (pdo->pDeskInfo->fsHooks) - { - for (HookId = WH_MINHOOK; HookId <= WH_MAXHOOK; HookId++) - { - PLIST_ENTRY pGLE = &pdo->pDeskInfo->aphkStart[HOOKID_TO_INDEX(HookId)]; - - pElem = pGLE->Flink; - while (pElem != pGLE) - { - HookObj = CONTAINING_RECORD(pElem, HOOK, Chain); - pElem = HookObj->Chain.Flink; // Get next element before hook is destroyed - if (HookObj->head.pti == pti) - { - IntRemoveHook(HookObj); - } - } - } - } - return; + + return TRUE; } /* @@ -1576,7 +1518,7 @@ } ObDereferenceObject(WinStaObj); - Hook = UserCreateObject(gHandleTable, NULL, NULL, (PHANDLE)&Handle, TYPE_HOOK, sizeof(HOOK)); + Hook = UserCreateObject(gHandleTable, NULL, ptiHook, (PHANDLE)&Handle, TYPE_HOOK, sizeof(HOOK)); if (!Hook) { Modified: trunk/reactos/win32ss/user/ntuser/hook.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/hook.h… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/hook.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/hook.h [iso-8859-1] Sun Sep 21 17:44:40 2014 @@ -43,12 +43,12 @@ LRESULT FASTCALL co_CallHook(INT HookId, INT Code, WPARAM wParam, LPARAM lParam); LRESULT FASTCALL co_HOOK_CallHooks(INT HookId, INT Code, WPARAM wParam, LPARAM lParam); LRESULT FASTCALL co_EVENT_CallEvents(DWORD, HWND, UINT_PTR, LONG_PTR); -VOID FASTCALL HOOK_DestroyThreadHooks(PETHREAD Thread); -VOID FASTCALL EVENT_DestroyThreadEvents(PETHREAD Thread); PHOOK FASTCALL IntGetHookObject(HHOOK); PHOOK FASTCALL IntGetNextHook(PHOOK Hook); LRESULT FASTCALL UserCallNextHookEx( PHOOK pHook, int Code, WPARAM wParam, LPARAM lParam, BOOL Ansi); BOOL FASTCALL IntUnhookWindowsHook(int,HOOKPROC); +BOOLEAN IntRemoveHook(PVOID Object); +BOOLEAN IntRemoveEvent(PVOID Object); BOOL FASTCALL UserLoadApiHook(VOID); BOOL IntLoadHookModule(int iHookID, HHOOK hHook, BOOL Unload); Modified: trunk/reactos/win32ss/user/ntuser/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/main.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/main.c [iso-8859-1] Sun Sep 21 17:44:40 2014 @@ -51,12 +51,232 @@ } #endif +static +NTSTATUS +CreateProcessInfo(PEPROCESS Process) +{ + PPROCESSINFO ppiCurrent; + NTSTATUS Status; + SIZE_T ViewSize = 0; + LARGE_INTEGER Offset; + PVOID UserBase = NULL; + PRTL_USER_PROCESS_PARAMETERS pParams = Process->Peb->ProcessParameters; + + /* We might be called with an already allocated win32 process */ + ppiCurrent = PsGetProcessWin32Process(Process); + if (ppiCurrent != NULL) + { + /* There is no more to do for us (this is a success code!) */ + return STATUS_ALREADY_WIN32; + } + + /* Allocate a new win32 process */ + ppiCurrent = ExAllocatePoolWithTag(NonPagedPool, + sizeof(PROCESSINFO), + USERTAG_PROCESSINFO); + if (ppiCurrent == NULL) + { + ERR_CH(UserProcess, "Failed to allocate ppi for PID:0x%lx\n", + HandleToUlong(Process->UniqueProcessId)); + return STATUS_NO_MEMORY; + } + + RtlZeroMemory(ppiCurrent, sizeof(PROCESSINFO)); + + PsSetProcessWin32Process(Process, ppiCurrent, NULL); + +#if DBG + DbgInitDebugChannels(); +#if KDBG + KdRosRegisterCliCallback(DbgGdiKdbgCliCallback); +#endif +#endif + + TRACE_CH(UserProcess,"Allocated ppi 0x%p for PID:0x%lx\n", ppiCurrent, HandleToUlong(Process->UniqueProcessId)); + + /* map the global heap into the process */ + Offset.QuadPart = 0; + Status = MmMapViewOfSection(GlobalUserHeapSection, + PsGetCurrentProcess(), + &UserBase, + 0, + 0, + &Offset, + &ViewSize, + ViewUnmap, + SEC_NO_CHANGE, + PAGE_EXECUTE_READ); /* would prefer PAGE_READONLY, but thanks to RTL heaps... */ + if (!NT_SUCCESS(Status)) + { + TRACE_CH(UserProcess,"Failed to map the global heap! 0x%x\n", Status); + return Status; + } + ppiCurrent->HeapMappings.Next = NULL; + ppiCurrent->HeapMappings.KernelMapping = (PVOID)GlobalUserHeap; + ppiCurrent->HeapMappings.UserMapping = UserBase; + ppiCurrent->HeapMappings.Count = 1; + + InitializeListHead(&ppiCurrent->GDIBrushAttrFreeList); + InitializeListHead(&ppiCurrent->GDIDcAttrFreeList); + + InitializeListHead(&ppiCurrent->PrivateFontListHead); + ExInitializeFastMutex(&ppiCurrent->PrivateFontListLock); + + InitializeListHead(&ppiCurrent->DriverObjListHead); + ExInitializeFastMutex(&ppiCurrent->DriverObjListLock); + + ppiCurrent->KeyboardLayout = W32kGetDefaultKeyLayout(); + if (!EngCreateEvent((PEVENT *)&ppiCurrent->InputIdleEvent)) + { + KeBugCheck(0); + } + + KeInitializeEvent(ppiCurrent->InputIdleEvent, NotificationEvent, FALSE); + + + /* map the gdi handle table to user land */ + Process->Peb->GdiSharedHandleTable = GDI_MapHandleTable(Process); + Process->Peb->GdiDCAttributeList = GDI_BATCH_LIMIT; + pParams = Process->Peb->ProcessParameters; + + ppiCurrent->peProcess = Process; + /* setup process flags */ + ppiCurrent->W32PF_flags = W32PF_THREADCONNECTED; + + if ( pParams && + pParams->WindowFlags & STARTF_SCRNSAVER ) + { + ppiScrnSaver = ppiCurrent; + ppiCurrent->W32PF_flags |= W32PF_SCREENSAVER; + } + + // Fixme check if this process is allowed. + ppiCurrent->W32PF_flags |= W32PF_ALLOWFOREGROUNDACTIVATE; // Starting application it will get toggled off. + + /* Create pools for GDI object attributes */ + ppiCurrent->pPoolDcAttr = GdiPoolCreate(sizeof(DC_ATTR), 'acdG'); + ppiCurrent->pPoolBrushAttr = GdiPoolCreate(sizeof(BRUSH_ATTR), 'arbG'); + ppiCurrent->pPoolRgnAttr = GdiPoolCreate(sizeof(RGN_ATTR), 'agrG'); + ASSERT(ppiCurrent->pPoolDcAttr); + ASSERT(ppiCurrent->pPoolBrushAttr); + ASSERT(ppiCurrent->pPoolRgnAttr); + + /* Add the process to the global list */ + ppiCurrent->ppiNext = gppiList; + gppiList = ppiCurrent; + IntReferenceProcessInfo(ppiCurrent); + + return STATUS_SUCCESS; +} + +static +NTSTATUS +DestroyProcessInfo(PEPROCESS Process) +{ + PPROCESSINFO ppiCurrent, *pppi; + + /* Get the Win32 Process */ + ppiCurrent = PsGetProcessWin32Process(Process); + + ASSERT(ppiCurrent); + + TRACE_CH(UserProcess, "Destroying ppi 0x%p\n", ppiCurrent); + ppiCurrent->W32PF_flags |= W32PF_TERMINATED; + + if (ppiScrnSaver == ppiCurrent) + ppiScrnSaver = NULL; + + /* Destroy user objects */ + UserDestroyObjectsForOwner(gHandleTable, ppiCurrent); + + TRACE_CH(UserProcess,"Freeing ppi 0x%p\n", ppiCurrent); +#if DBG + if (DBG_IS_CHANNEL_ENABLED(ppiCurrent, DbgChUserObj, WARN_LEVEL)) + { + TRACE_CH(UserObj, "Dumping user handles at the end of the process %s (Info %p).\n", + ppiCurrent->peProcess->ImageFileName, ppiCurrent); + DbgUserDumpHandleTable(); + } +#endif + + /* And GDI ones too */ + GDI_CleanupForProcess(Process); + + /* So we can now free the pools */ + GdiPoolDestroy(ppiCurrent->pPoolDcAttr); + GdiPoolDestroy(ppiCurrent->pPoolBrushAttr); + GdiPoolDestroy(ppiCurrent->pPoolRgnAttr); + + /* Remove it from the list of GUI apps */ + co_IntGraphicsCheck(FALSE); + + /* + * Deregister logon application automatically + */ + if(LogonProcess == ppiCurrent) + { + LogonProcess = NULL; + } + + /* Close the current window station */ + UserSetProcessWindowStation(NULL); + + if (gppiInputProvider == ppiCurrent) gppiInputProvider = NULL; + + /* Remove it from the list */ + pppi = &gppiList; + while (*pppi != NULL && *pppi != ppiCurrent) + pppi = &(*pppi)->ppiNext; + + ASSERT(*pppi == ppiCurrent); + + *pppi = ppiCurrent->ppiNext; + + if(ppiCurrent->hdeskStartup) + { + ZwClose(ppiCurrent->hdeskStartup); + ppiCurrent->hdeskStartup = NULL; + } + + /* The process is dying */ + PsSetProcessWin32Process(Process, NULL, ppiCurrent); + ppiCurrent->peProcess = NULL; + + /* At last, dereference */ + IntDereferenceProcessInfo(ppiCurrent); + + return STATUS_SUCCESS; +} + +VOID +UserDeleteW32Process(PPROCESSINFO ppiCurrent) +{ + if (ppiCurrent->InputIdleEvent) + { + EngDeleteEvent((PEVENT)ppiCurrent->InputIdleEvent); + } + + /* Close the startup desktop */ + if(ppiCurrent->rpdeskStartup) + ObDereferenceObject(ppiCurrent->rpdeskStartup); + +#if DBG + if (DBG_IS_CHANNEL_ENABLED(ppiCurrent, DbgChUserObj, WARN_LEVEL)) + { + TRACE_PPI(ppiCurrent, UserObj, "Dumping user handles now that process info %p is gets freed.\n", ppiCurrent); + DbgUserDumpHandleTable(); + } +#endif + + /* Free the PROCESSINFO */ + ExFreePoolWithTag(ppiCurrent, USERTAG_PROCESSINFO); +} + NTSTATUS APIENTRY Win32kProcessCallback(struct _EPROCESS *Process, BOOLEAN Create) { - PPROCESSINFO ppiCurrent, *pppi; NTSTATUS Status; ASSERT(Process->Peb); @@ -65,193 +285,13 @@ if (Create) { - SIZE_T ViewSize = 0; - LARGE_INTEGER Offset; - PVOID UserBase = NULL; - PRTL_USER_PROCESS_PARAMETERS pParams = Process->Peb->ProcessParameters; - - /* We might be called with an already allocated win32 process */ - ppiCurrent = PsGetProcessWin32Process(Process); - if (ppiCurrent != NULL) - { - /* There is no more to do for us (this is a success code!) */ - Status = STATUS_ALREADY_WIN32; - goto Leave; - } - - /* Allocate a new win32 process */ - ppiCurrent = ExAllocatePoolWithTag(NonPagedPool, - sizeof(PROCESSINFO), - USERTAG_PROCESSINFO); - if (ppiCurrent == NULL) - { - ERR_CH(UserProcess, "Failed to allocate ppi for PID:0x%lx\n", - HandleToUlong(Process->UniqueProcessId)); - Status = STATUS_NO_MEMORY; - goto Leave; - } - - RtlZeroMemory(ppiCurrent, sizeof(PROCESSINFO)); - - PsSetProcessWin32Process(Process, ppiCurrent, NULL); - -#if DBG - DbgInitDebugChannels(); -#if KDBG - KdRosRegisterCliCallback(DbgGdiKdbgCliCallback); -#endif -#endif - - TRACE_CH(UserProcess,"Allocated ppi 0x%p for PID:0x%lx\n", ppiCurrent, HandleToUlong(Process->UniqueProcessId)); - - /* map the global heap into the process */ - Offset.QuadPart = 0; - Status = MmMapViewOfSection(GlobalUserHeapSection, - PsGetCurrentProcess(), - &UserBase, - 0, - 0, - &Offset, - &ViewSize, - ViewUnmap, - SEC_NO_CHANGE, - PAGE_EXECUTE_READ); /* would prefer PAGE_READONLY, but thanks to RTL heaps... */ - if (!NT_SUCCESS(Status)) - { - TRACE_CH(UserProcess,"Failed to map the global heap! 0x%x\n", Status); - goto Leave; - } - ppiCurrent->HeapMappings.Next = NULL; - ppiCurrent->HeapMappings.KernelMapping = (PVOID)GlobalUserHeap; - ppiCurrent->HeapMappings.UserMapping = UserBase; - ppiCurrent->HeapMappings.Count = 1; - - InitializeListHead(&ppiCurrent->MenuListHead); - - InitializeListHead(&ppiCurrent->GDIBrushAttrFreeList); - InitializeListHead(&ppiCurrent->GDIDcAttrFreeList); - - InitializeListHead(&ppiCurrent->PrivateFontListHead); - ExInitializeFastMutex(&ppiCurrent->PrivateFontListLock); - - InitializeListHead(&ppiCurrent->DriverObjListHead); - ExInitializeFastMutex(&ppiCurrent->DriverObjListLock); - - ppiCurrent->KeyboardLayout = W32kGetDefaultKeyLayout(); - if (!EngCreateEvent((PEVENT *)&ppiCurrent->InputIdleEvent)) - { - KeBugCheck(0); - } - - KeInitializeEvent(ppiCurrent->InputIdleEvent, NotificationEvent, FALSE); - - - /* map the gdi handle table to user land */ - Process->Peb->GdiSharedHandleTable = GDI_MapHandleTable(Process); - Process->Peb->GdiDCAttributeList = GDI_BATCH_LIMIT; - pParams = Process->Peb->ProcessParameters; - - ppiCurrent->peProcess = Process; - /* setup process flags */ - ppiCurrent->W32PF_flags = W32PF_THREADCONNECTED; - - if ( pParams && - pParams->WindowFlags & STARTF_SCRNSAVER ) - { - ppiScrnSaver = ppiCurrent; - ppiCurrent->W32PF_flags |= W32PF_SCREENSAVER; - } - - // Fixme check if this process is allowed. - ppiCurrent->W32PF_flags |= W32PF_ALLOWFOREGROUNDACTIVATE; // Starting application it will get toggled off. - - /* Create pools for GDI object attributes */ - ppiCurrent->pPoolDcAttr = GdiPoolCreate(sizeof(DC_ATTR), 'acdG'); - ppiCurrent->pPoolBrushAttr = GdiPoolCreate(sizeof(BRUSH_ATTR), 'arbG'); - ppiCurrent->pPoolRgnAttr = GdiPoolCreate(sizeof(RGN_ATTR), 'agrG'); - ASSERT(ppiCurrent->pPoolDcAttr); - ASSERT(ppiCurrent->pPoolBrushAttr); - ASSERT(ppiCurrent->pPoolRgnAttr); - - /* Add the process to the global list */ - ppiCurrent->ppiNext = gppiList; - gppiList = ppiCurrent; + Status = CreateProcessInfo(Process); } else { - /* Get the Win32 Process */ - ppiCurrent = PsGetProcessWin32Process(Process); - - ASSERT(ppiCurrent); - - TRACE_CH(UserProcess, "Destroying ppi 0x%p\n", ppiCurrent); - ppiCurrent->W32PF_flags |= W32PF_TERMINATED; - - if (ppiScrnSaver == ppiCurrent) - ppiScrnSaver = NULL; - - if (ppiCurrent->InputIdleEvent) - { - EngFreeMem(ppiCurrent->InputIdleEvent); - ppiCurrent->InputIdleEvent = NULL; - } - - IntCleanupMenus(Process, ppiCurrent); - IntCleanupCurIcons(Process, ppiCurrent); - - - GDI_CleanupForProcess(Process); - - co_IntGraphicsCheck(FALSE); - - /* - * Deregister logon application automatically - */ - if(LogonProcess == ppiCurrent) - { - LogonProcess = NULL; - } - - /* Close the startup desktop */ - if(ppiCurrent->rpdeskStartup) - ObDereferenceObject(ppiCurrent->rpdeskStartup); - if(ppiCurrent->hdeskStartup) - ZwClose(ppiCurrent->hdeskStartup); - - /* Close the current window station */ - UserSetProcessWindowStation(NULL); - - /* Destroy GDI pools */ - GdiPoolDestroy(ppiCurrent->pPoolDcAttr); - GdiPoolDestroy(ppiCurrent->pPoolBrushAttr); - GdiPoolDestroy(ppiCurrent->pPoolRgnAttr); - - if (gppiInputProvider == ppiCurrent) gppiInputProvider = NULL; - - pppi = &gppiList; - while (*pppi != NULL && *pppi != ppiCurrent) - pppi = &(*pppi)->ppiNext; - - ASSERT(*pppi == ppiCurrent); - - *pppi = ppiCurrent->ppiNext; - - TRACE_CH(UserProcess,"Freeing ppi 0x%p\n", ppiCurrent); -#if DBG - if (DBG_IS_CHANNEL_ENABLED(ppiCurrent, DbgChUserObj, WARN_LEVEL)) - { - DbgUserDumpHandleTable(); - } -#endif - - /* Free the PROCESSINFO */ - PsSetProcessWin32Process(Process, NULL, ppiCurrent); - ExFreePoolWithTag(ppiCurrent, USERTAG_PROCESSINFO); - } - - Status = STATUS_SUCCESS; - -Leave: + Status = DestroyProcessInfo(Process); + } + UserLeave(); return Status; } @@ -291,7 +331,8 @@ PsSetThreadWin32Thread(Thread, ptiCurrent, NULL); IntReferenceThreadInfo(ptiCurrent); ptiCurrent->pEThread = Thread; - ptiCurrent->ppi = PsGetCurrentProcessWin32Process(); + ptiCurrent->ppi = PsGetProcessWin32Process(Process); + IntReferenceProcessInfo(ptiCurrent->ppi); pTeb->Win32ThreadInfo = ptiCurrent; ptiCurrent->pClientInfo = (PCLIENTINFO)pTeb->Win32ClientInfo; @@ -317,6 +358,7 @@ NULL, SynchronizationEvent, FALSE); if (!NT_SUCCESS(Status)) { + ERR_CH(UserThread, "Event creation failed, Status 0x%08x.\n", Status); goto error; } Status = ObReferenceObjectByHandle(ptiCurrent->hEventQueueClient, 0, @@ -324,6 +366,7 @@ (PVOID*)&ptiCurrent->pEventQueueServer, NULL); if (!NT_SUCCESS(Status)) { + ERR_CH(UserThread, "Failed referencing the event object, Status 0x%08x.\n", Status); ZwClose(ptiCurrent->hEventQueueClient); ptiCurrent->hEventQueueClient = NULL; goto error; @@ -451,29 +494,23 @@ Called from IntDereferenceThreadInfo. */ VOID -FASTCALL UserDeleteW32Thread(PTHREADINFO pti) { - if (!pti->RefCount) - { - TRACE_CH(UserThread,"UserDeleteW32Thread pti 0x%p\n",pti); - if (pti->hEventQueueClient != NULL) - ZwClose(pti->hEventQueueClient); - pti->hEventQueueClient = NULL; - - /* Free the message queue */ - if (pti->MessageQueue) - { - MsqDestroyMessageQueue(pti); - } - - MsqCleanupThreadMsgs(pti); - - IntSetThreadDesktop(NULL, TRUE); - - PsSetThreadWin32Thread(pti->pEThread, NULL, pti); - ExFreePoolWithTag(pti, USERTAG_THREADINFO); - } + PPROCESSINFO ppi = pti->ppi; + + TRACE_CH(UserThread,"UserDeleteW32Thread pti 0x%p\n",pti); + + /* Free the message queue */ + if (pti->MessageQueue) + { + MsqDestroyMessageQueue(pti); + } + + MsqCleanupThreadMsgs(pti); + + ExFreePoolWithTag(pti, USERTAG_THREADINFO); + + IntDereferenceProcessInfo(ppi); } NTSTATUS @@ -541,18 +578,16 @@ } DceFreeThreadDCE(ptiCurrent); - HOOK_DestroyThreadHooks(Thread); - EVENT_DestroyThreadEvents(Thread); DestroyTimersForThread(ptiCurrent); KeSetEvent(ptiCurrent->pEventQueueServer, IO_NO_INCREMENT, FALSE); UnregisterThreadHotKeys(ptiCurrent); -/* - if (IsListEmpty(&ptiCurrent->WindowListHead)) - { - ERR_CH(UserThread,"Thread Window List is Empty!\n"); - } -*/ - co_DestroyThreadWindows(Thread); + + if (!UserDestroyObjectsForOwner(gHandleTable, ptiCurrent)) + { + DPRINT1("Failed to delete objects belonging to thread %p. This is VERY BAD!.\n", ptiCurrent); + ASSERT(FALSE); + return STATUS_UNSUCCESSFUL; + } if (ppiCurrent && ppiCurrent->ptiList == ptiCurrent && !ptiCurrent->ptiSibling && ppiCurrent->W32PF_flags & W32PF_CLASSESREGISTERED) @@ -613,6 +648,19 @@ } */ TRACE_CH(UserThread,"Freeing pti 0x%p\n", ptiCurrent); + + IntSetThreadDesktop(NULL, TRUE); + + if (ptiCurrent->hEventQueueClient != NULL) + { + ZwClose(ptiCurrent->hEventQueueClient); + ObDereferenceObject(ptiCurrent->pEventQueueServer); + } + ptiCurrent->hEventQueueClient = NULL; + + /* The thread is dying */ + PsSetThreadWin32Thread(ptiCurrent->pEThread, NULL, ptiCurrent); + ptiCurrent->pEThread = NULL; /* Free the THREADINFO */ IntDereferenceThreadInfo(ptiCurrent); Modified: trunk/reactos/win32ss/user/ntuser/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.c… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.c [iso-8859-1] Sun Sep 21 17:44:40 2014 @@ -176,7 +176,7 @@ return pMenu; } -BOOL IntDestroyMenu( PMENU pMenu, BOOL bRecurse, BOOL RemoveFromProcess) +BOOL IntDestroyMenu( PMENU pMenu, BOOL bRecurse) { PMENU SubMenu; @@ -204,7 +204,7 @@ { /* Release submenu since it was referenced when inserted */ IntReleaseMenuObject(SubMenu); - IntDestroyMenuObject(SubMenu, bRecurse, RemoveFromProcess); + IntDestroyMenuObject(SubMenu, bRecurse); } } /* Free the Item */ @@ -215,20 +215,22 @@ return TRUE; } +/* Callback for the object manager */ +BOOLEAN +UserDestroyMenuObject(PVOID Object) +{ + return IntDestroyMenuObject(Object, TRUE); +} + BOOL FASTCALL -IntDestroyMenuObject(PMENU Menu, BOOL bRecurse, BOOL RemoveFromProcess) +IntDestroyMenuObject(PMENU Menu, BOOL bRecurse) { if(Menu) { PWND Window; /* Remove all menu items */ - IntDestroyMenu( Menu, bRecurse, RemoveFromProcess); - - if (RemoveFromProcess) - { - RemoveEntryList(&Menu->ListEntry); - } + IntDestroyMenu( Menu, bRecurse); if (PsGetCurrentProcessSessionId() == Menu->head.rpdesk->rpwinstaParent->dwSessionId) { @@ -361,7 +363,7 @@ FreeMenuText(pMenu,item); if (bRecurse && item->spSubMenu) { - IntDestroyMenuObject(item->spSubMenu, bRecurse, TRUE); + IntDestroyMenuObject(item->spSubMenu, bRecurse); } ////// Use cAlloced with inc's of 8's.... if (--pMenu->cItems == 0) @@ -477,14 +479,17 @@ } PMENU FASTCALL -IntCreateMenu(PHANDLE Handle, BOOL IsMenuBar) +IntCreateMenu( + _Out_ PHANDLE Handle, + _In_ BOOL IsMenuBar, + _In_ PDESKTOP Desktop, + _In_ PPROCESSINFO ppi) { PMENU Menu; - PPROCESSINFO CurrentWin32Process; Menu = (PMENU)UserCreateObject( gHandleTable, - NULL, - NULL, + Desktop, + ppi->ptiList, Handle, TYPE_MENU, sizeof(MENU)); @@ -511,10 +516,6 @@ Menu->hWnd = NULL; Menu->TimeToHide = FALSE; - - /* Insert menu item into process menu handle list */ - CurrentWin32Process = PsGetCurrentProcessWin32Process(); - InsertTailList(&CurrentWin32Process->MenuListHead, &Menu->ListEntry); return Menu; } @@ -572,19 +573,19 @@ PMENU FASTCALL IntCloneMenu(PMENU Source) { - PPROCESSINFO CurrentWin32Process; HANDLE hMenu; PMENU Menu; if(!Source) return NULL; + /* A menu is valid process wide. We can pass to the object manager any thread ptr */ Menu = (PMENU)UserCreateObject( gHandleTable, - NULL, - NULL, - &hMenu, - TYPE_MENU, - sizeof(MENU)); + Source->head.rpdesk, + ((PPROCESSINFO)Source->head.hTaskWow)->ptiList, + &hMenu, + TYPE_MENU, + sizeof(MENU)); if(!Menu) return NULL; @@ -606,10 +607,6 @@ Menu->hWnd = NULL; Menu->TimeToHide = FALSE; - /* Insert menu item into process menu handle list */ - CurrentWin32Process = PsGetCurrentProcessWin32Process(); - InsertTailList(&CurrentWin32Process->MenuListHead, &Menu->ListEntry); - IntCloneMenuItems(Menu, Source); return Menu; @@ -870,7 +867,10 @@ { HANDLE hMenu; ERR("Pop Up Menu Double Trouble!\n"); - SubMenuObject = IntCreateMenu(&hMenu, FALSE); // It will be marked. + SubMenuObject = IntCreateMenu(&hMenu, + FALSE, + MenuObject->head.rpdesk, + (PPROCESSINFO)MenuObject->head.hTaskWow); // It will be marked. if (!SubMenuObject) return FALSE; IntReleaseMenuObject(SubMenuObject); // This will be referenced again after insertion. circref = TRUE; @@ -878,7 +878,7 @@ if ( MENU_depth( SubMenuObject, 0) > MAXMENUDEPTH ) { ERR( "Loop detected in menu hierarchy or maximum menu depth exceeded!\n"); - if (circref) IntDestroyMenuObject(SubMenuObject, FALSE, TRUE); + if (circref) IntDestroyMenuObject(SubMenuObject, FALSE); return FALSE; } /* Make sure the submenu is marked as a popup menu */ @@ -1133,36 +1133,6 @@ co_IntExitTracking(Window, Menu, TRUE, Flags); return FALSE; -} - - -/*! - * Internal function. Called when the process is destroyed to free the remaining menu handles. -*/ -BOOL FASTCALL -IntCleanupMenus(struct _EPROCESS *Process, PPROCESSINFO Win32Process) -{ - PEPROCESS CurrentProcess; - PMENU MenuObject; - - CurrentProcess = PsGetCurrentProcess(); - if (CurrentProcess != Process) - { - KeAttachProcess(&Process->Pcb); - } - - while (!IsListEmpty(&Win32Process->MenuListHead)) - { - MenuObject = CONTAINING_RECORD(Win32Process->MenuListHead.Flink, MENU, ListEntry); - TRACE("Menus are stuck on the process list!\n"); - IntDestroyMenuObject(MenuObject, FALSE, TRUE); - } - - if (CurrentProcess != Process) - { - KeDetachProcess(); - } - return TRUE; } BOOLEAN APIENTRY @@ -1415,7 +1385,7 @@ } -HMENU FASTCALL UserCreateMenu(BOOL PopupMenu) +HMENU FASTCALL UserCreateMenu(PDESKTOP Desktop, BOOL PopupMenu) { PWINSTATION_OBJECT WinStaObject; HANDLE Handle; @@ -1441,7 +1411,7 @@ SetLastNtError(Status); return (HMENU)0; } - Menu = IntCreateMenu(&Handle, !PopupMenu); + Menu = IntCreateMenu(&Handle, !PopupMenu, Desktop, GetW32ProcessInfo()); if (Menu && Menu->head.rpdesk->rpwinstaParent != WinStaObject) { ERR("Desktop Window Station does not match Process one!\n"); @@ -1450,7 +1420,7 @@ } else { - Menu = IntCreateMenu(&Handle, !PopupMenu); + Menu = IntCreateMenu(&Handle, !PopupMenu, GetW32ThreadInfo()->rpdesk, GetW32ProcessInfo()); } if (Menu) UserDereferenceObject(Menu); @@ -1678,7 +1648,7 @@ ROSMENUITEMINFO ItemInfo = {0}; UNICODE_STRING MenuName; - hSysMenu = UserCreateMenu(FALSE); + hSysMenu = UserCreateMenu(Window->head.rpdesk, FALSE); if (NULL == hSysMenu) { return NULL; @@ -1742,7 +1712,7 @@ IntReleaseMenuObject(NewMenu); UserSetMenuDefaultItem(NewMenu, SC_CLOSE, FALSE); - IntDestroyMenuObject(Menu, FALSE, TRUE); + IntDestroyMenuObject(Menu, FALSE); } else { @@ -1782,7 +1752,7 @@ Menu = UserGetMenuObject(Window->SystemMenu); if (Menu && !(Menu->fFlags & MNF_SYSDESKMN)) { - IntDestroyMenuObject(Menu, TRUE, TRUE); + IntDestroyMenuObject(Menu, TRUE); Window->SystemMenu = NULL; } } @@ -1826,7 +1796,7 @@ if (OldMenu) { OldMenu->fFlags &= ~MNF_SYSMENU; - IntDestroyMenuObject(OldMenu, TRUE, TRUE); + IntDestroyMenuObject(OldMenu, TRUE); } } @@ -2091,7 +2061,7 @@ EngSetLastError(ERROR_ACCESS_DENIED); return FALSE; } - return IntDestroyMenuObject(Menu, FALSE, TRUE); + return IntDestroyMenuObject(Menu, FALSE); } /* @@ -2116,7 +2086,7 @@ EngSetLastError(ERROR_ACCESS_DENIED); RETURN( FALSE); } - RETURN( IntDestroyMenuObject(Menu, TRUE, TRUE)); + RETURN( IntDestroyMenuObject(Menu, TRUE)); CLEANUP: TRACE("Leave NtUserDestroyMenu, ret=%i\n",_ret_); Modified: trunk/reactos/win32ss/user/ntuser/menu.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/menu.h… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/menu.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/menu.h [iso-8859-1] Sun Sep 21 17:44:40 2014 @@ -23,8 +23,11 @@ #define IntReleaseMenuObject(MenuObj) \ UserDereferenceObject(MenuObj) +BOOLEAN +UserDestroyMenuObject(PVOID Object); + BOOL FASTCALL -IntDestroyMenuObject(PMENU MenuObject, BOOL bRecurse, BOOL RemoveFromProcess); +IntDestroyMenuObject(PMENU MenuObject, BOOL bRecurse); PMENU FASTCALL IntCloneMenu(PMENU Source); Modified: trunk/reactos/win32ss/user/ntuser/object.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.c [iso-8859-1] Sun Sep 21 17:44:40 2014 @@ -12,6 +12,233 @@ //int usedHandles=0; PUSER_HANDLE_TABLE gHandleTable = NULL; +/* Forward declarations */ +static PVOID AllocThreadObject( + _In_ PDESKTOP pDesk, + _In_ PTHREADINFO pti, + _In_ SIZE_T Size, + _Out_ PVOID* HandleOwner) +{ + PTHROBJHEAD ObjHead; + + UNREFERENCED_PARAMETER(pDesk); + + ASSERT(Size > sizeof(*ObjHead)); + ASSERT(pti != NULL); + + ObjHead = UserHeapAlloc(Size); + if (!ObjHead) + return NULL; + + RtlZeroMemory(ObjHead, Size); + + ObjHead->pti = pti; + IntReferenceThreadInfo(pti); + *HandleOwner = pti; + /* It's a thread object, but it still count as one for the process */ + pti->ppi->UserHandleCount++; + + return ObjHead; +} + +static void FreeThreadObject( + _In_ PVOID Object) +{ + PTHROBJHEAD ObjHead = (PTHROBJHEAD)Object; + PTHREADINFO pti = ObjHead->pti; + + UserHeapFree(ObjHead); + + pti->ppi->UserHandleCount--; + IntDereferenceThreadInfo(pti); +} + +static PVOID AllocDeskThreadObject( + _In_ PDESKTOP pDesk, + _In_ PTHREADINFO pti, + _In_ SIZE_T Size, + _Out_ PVOID* HandleOwner) +{ + PTHRDESKHEAD ObjHead; + + ASSERT(Size > sizeof(*ObjHead)); + ASSERT(pti != NULL); + + if (!pDesk) + pDesk = pti->rpdesk; + + ObjHead = DesktopHeapAlloc(pDesk, Size); + if (!ObjHead) + return NULL; + + RtlZeroMemory(ObjHead, Size); + + ObjHead->pSelf = ObjHead; + ObjHead->rpdesk = pDesk; + ObjHead->pti = pti; + IntReferenceThreadInfo(pti); + *HandleOwner = pti; + /* It's a thread object, but it still count as one for the process */ + pti->ppi->UserHandleCount++; + + return ObjHead; +} + +static void FreeDeskThreadObject( + _In_ PVOID Object) +{ + PTHRDESKHEAD ObjHead = (PTHRDESKHEAD)Object; + PDESKTOP pDesk = ObjHead->rpdesk; + PTHREADINFO pti = ObjHead->pti; + + DesktopHeapFree(pDesk, Object); + + pti->ppi->UserHandleCount--; + IntDereferenceThreadInfo(pti); +} + +static PVOID AllocDeskProcObject( + _In_ PDESKTOP pDesk, + _In_ PTHREADINFO pti, + _In_ SIZE_T Size, + _Out_ PVOID* HandleOwner) +{ + PPROCDESKHEAD ObjHead; + PPROCESSINFO ppi; + + ASSERT(Size > sizeof(*ObjHead)); + ASSERT(pDesk != NULL); + ASSERT(pti != NULL); + + ObjHead = DesktopHeapAlloc(pDesk, Size); + if (!ObjHead) + return NULL; + + RtlZeroMemory(ObjHead, Size); + + ppi = pti->ppi; + + ObjHead->pSelf = ObjHead; + ObjHead->rpdesk = pDesk; + ObjHead->hTaskWow = (DWORD_PTR)ppi; + ppi->UserHandleCount++; + IntReferenceProcessInfo(ppi); + *HandleOwner = ppi; + + return ObjHead; +} + +static void FreeDeskProcObject( + _In_ PVOID Object) +{ + PPROCDESKHEAD ObjHead = (PPROCDESKHEAD)Object; + PDESKTOP pDesk = ObjHead->rpdesk; + PPROCESSINFO ppi = (PPROCESSINFO)ObjHead->hTaskWow; + + ppi->UserHandleCount--; + IntDereferenceProcessInfo(ppi); + + DesktopHeapFree(pDesk, Object); +} + +static PVOID AllocProcMarkObject( + _In_ PDESKTOP pDesk, + _In_ PTHREADINFO pti, + _In_ SIZE_T Size, + _Out_ PVOID* HandleOwner) +{ + PPROCMARKHEAD ObjHead; + PPROCESSINFO ppi = pti->ppi; + + UNREFERENCED_PARAMETER(pDesk); + + ASSERT(Size > sizeof(*ObjHead)); + + ObjHead = UserHeapAlloc(Size); + if (!ObjHead) + return NULL; + + RtlZeroMemory(ObjHead, Size); + + ObjHead->ppi = ppi; + IntReferenceProcessInfo(ppi); + *HandleOwner = ppi; + ppi->UserHandleCount++; + + return ObjHead; +} + +static void FreeProcMarkObject( + _In_ PVOID Object) +{ + PPROCESSINFO ppi = ((PPROCMARKHEAD)Object)->ppi; + + UserHeapFree(Object); + + ppi->UserHandleCount--; + IntDereferenceProcessInfo(ppi); +} + +static PVOID AllocSysObject( + _In_ PDESKTOP pDesk, + _In_ PTHREADINFO pti, + _In_ SIZE_T Size, + _Out_ PVOID* ObjectOwner) +{ + PVOID Object; + + UNREFERENCED_PARAMETER(pDesk); + UNREFERENCED_PARAMETER(pti); + + ASSERT(Size > sizeof(HEAD)); + + Object = UserHeapAlloc(Size); + if (!Object) + return NULL; + + *ObjectOwner = NULL; + + RtlZeroMemory(Object, Size); + return Object; +} + +static void FreeSysObject( + _In_ PVOID Object) +{ + UserHeapFree(Object); +} + +static const struct +{ + PVOID (*ObjectAlloc)(PDESKTOP, PTHREADINFO, SIZE_T, PVOID*); + BOOLEAN (*ObjectDestroy)(PVOID); + void (*ObjectFree)(PVOID); +} ObjectCallbacks[TYPE_CTYPES] = +{ + { NULL, NULL, NULL }, /* TYPE_FREE */ + { AllocDeskThreadObject, co_UserDestroyWindow, FreeDeskThreadObject }, /* TYPE_WINDOW */ + { AllocDeskProcObject, UserDestroyMenuObject, FreeDeskProcObject }, /* TYPE_MENU */ + { AllocProcMarkObject, /*UserCursorCleanup*/NULL, FreeProcMarkObject }, /* TYPE_CURSOR */ + { AllocSysObject, /*UserSetWindowPosCleanup*/NULL, FreeSysObject }, /* TYPE_SETWINDOWPOS */ + { AllocDeskThreadObject, IntRemoveHook, FreeDeskThreadObject }, /* TYPE_HOOK */ + { AllocSysObject, /*UserClipDataCleanup*/NULL,FreeSysObject }, /* TYPE_CLIPDATA */ + { AllocDeskProcObject, DestroyCallProc, FreeDeskProcObject }, /* TYPE_CALLPROC */ + { AllocProcMarkObject, UserDestroyAccelTable, FreeProcMarkObject }, /* TYPE_ACCELTABLE */ + { NULL, NULL, NULL }, /* TYPE_DDEACCESS */ + { NULL, NULL, NULL }, /* TYPE_DDECONV */ + { NULL, NULL, NULL }, /* TYPE_DDEXACT */ + { AllocSysObject, /*UserMonitorCleanup*/NULL, FreeSysObject }, /* TYPE_MONITOR */ + { AllocSysObject, /*UserKbdLayoutCleanup*/NULL,FreeSysObject }, /* TYPE_KBDLAYOUT */ + { AllocSysObject, /*UserKbdFileCleanup*/NULL, FreeSysObject }, /* TYPE_KBDFILE */ + { AllocThreadObject, IntRemoveEvent, FreeThreadObject }, /* TYPE_WINEVENTHOOK */ + { AllocSysObject, /*UserTimerCleanup*/NULL, FreeSysObject }, /* TYPE_TIMER */ + { NULL, NULL, NULL }, /* TYPE_INPUTCONTEXT */ + { NULL, NULL, NULL }, /* TYPE_HIDDATA */ + { NULL, NULL, NULL }, /* TYPE_DEVICEINFO */ + { NULL, NULL, NULL }, /* TYPE_TOUCHINPUTINFO */ + { NULL, NULL, NULL }, /* TYPE_GESTUREINFOOBJ */ +}; + #if DBG void DbgUserDumpHandleTable() @@ -27,7 +254,7 @@ memset(HandleCounts, 0, sizeof(HandleCounts)); - /* First of all count the number of handles per tpe */ + /* First of all count the number of handles per type */ ppiList = gppiList; while (ppiList) { @@ -96,7 +323,6 @@ __inline static PUSER_HANDLE_ENTRY alloc_user_entry(PUSER_HANDLE_TABLE ht) { PUSER_HANDLE_ENTRY entry; - PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); TRACE("handles used %lu\n", gpsi->cHandleEntries); if (ht->freelist) @@ -105,7 +331,6 @@ ht->freelist = entry->ptr; gpsi->cHandleEntries++; - ppi->UserHandleCount++; return entry; } @@ -137,7 +362,6 @@ entry->generation = 1; gpsi->cHandleEntries++; - ppi->UserHandleCount++; return entry; } @@ -151,13 +375,33 @@ ht->allocated_handles = bytes / sizeof(USER_HANDLE_ENTRY); } + __inline static void *free_user_entry(PUSER_HANDLE_TABLE ht, PUSER_HANDLE_ENTRY entry) { - PPROCESSINFO ppi = PsGetCurrentProcessWin32Process(); void *ret; #if DBG - ppi->DbgHandleCount[entry->type]--; + { + PPROCESSINFO ppi; + switch (entry->type) + { + case TYPE_WINDOW: + case TYPE_HOOK: + case TYPE_WINEVENTHOOK: + ppi = ((PTHREADINFO)entry->pi)->ppi; + break; + case TYPE_MENU: + case TYPE_CURSOR: + case TYPE_CALLPROC: + case TYPE_ACCELTABLE: + ppi = entry->pi; + break; + default: + ppi = NULL; + } + if (ppi) + ppi->DbgHandleCount[entry->type]--; + } #endif ret = entry->ptr; @@ -168,46 +412,16 @@ ht->freelist = entry; gpsi->cHandleEntries--; - ppi->UserHandleCount--; return ret; } -static __inline PVOID -UserHandleOwnerByType(HANDLE_TYPE type) -{ - PVOID pi; - - switch (type) - { - case TYPE_WINDOW: - case TYPE_INPUTCONTEXT: - pi = GetW32ThreadInfo(); - break; - - case TYPE_MENU: - case TYPE_CURSOR: - case TYPE_HOOK: - case TYPE_CALLPROC: - case TYPE_ACCELTABLE: - case TYPE_SETWINDOWPOS: - pi = GetW32ProcessInfo(); - break; - - case TYPE_MONITOR: - pi = NULL; /* System */ - break; - - default: - pi = NULL; - break; - } - - return pi; -} - /* allocate a user handle for a given object */ -HANDLE UserAllocHandle(PUSER_HANDLE_TABLE ht, PVOID object, HANDLE_TYPE type ) +HANDLE UserAllocHandle( + _Inout_ PUSER_HANDLE_TABLE ht, + _In_ PVOID object, + _In_ HANDLE_TYPE type, + _In_ PVOID HandleOwner) { PUSER_HANDLE_ENTRY entry = alloc_user_entry(ht); if (!entry) @@ -215,7 +429,7 @@ entry->ptr = object; entry->type = type; entry->flags = 0; - entry->pi = UserHandleOwnerByType(type); + entry->pi = HandleOwner; if (++entry->generation >= 0xffff) entry->generation = 1; @@ -322,82 +536,41 @@ { HANDLE hi; PVOID Object; - PPROCESSINFO ppi; - BOOL dt; - PDESKTOP rpdesk = pDesktop; - - /* We could get the desktop for the new object from the pti however this is - * not always the case for example when creating a new desktop window for - * the desktop thread*/ - - if (!pti) pti = GetW32ThreadInfo(); - if (!pDesktop) rpdesk = pti->rpdesk; - ppi = pti->ppi; - - switch (type) - { - case TYPE_WINDOW: - case TYPE_MENU: - case TYPE_HOOK: - case TYPE_CALLPROC: - case TYPE_INPUTCONTEXT: - Object = DesktopHeapAlloc(rpdesk, size); - dt = TRUE; - break; - - default: - Object = UserHeapAlloc(size); - dt = FALSE; - break; - } - + PVOID ObjectOwner; + + /* Some sanity checks. Other checks will be made in the allocator */ + ASSERT(type < TYPE_CTYPES); + ASSERT(type != TYPE_FREE); + ASSERT(ht != NULL); + + /* Allocate the object */ + ASSERT(ObjectCallbacks[type].ObjectAlloc != NULL); + Object = ObjectCallbacks[type].ObjectAlloc(pDesktop, pti, size, &ObjectOwner); if (!Object) - return NULL; - - - hi = UserAllocHandle(ht, Object, type ); - if (!hi) - { - if (dt) - DesktopHeapFree(rpdesk, Object); - else - UserHeapFree(Object); - return NULL; + { + ERR("User object allocation failed. Out of memory!\n"); + return NULL; + } + + hi = UserAllocHandle(ht, Object, type, ObjectOwner); + if (hi == NULL) + { + ERR("Out of user handles!\n"); + ObjectCallbacks[type].ObjectFree(Object); + return NULL; } #if DBG - ppi->DbgHandleCount[type]++; + if (pti) + pti->ppi->DbgHandleCount[type]++; #endif - RtlZeroMemory(Object, size); - - switch (type) - { - case TYPE_WINDOW: - case TYPE_HOOK: - case TYPE_INPUTCONTEXT: - ((PTHRDESKHEAD)Object)->rpdesk = rpdesk; - ((PTHRDESKHEAD)Object)->pSelf = Object; - case TYPE_WINEVENTHOOK: - ((PTHROBJHEAD)Object)->pti = pti; - break; - - case TYPE_MENU: - case TYPE_CALLPROC: - ((PPROCDESKHEAD)Object)->rpdesk = rpdesk; - ((PPROCDESKHEAD)Object)->pSelf = Object; - break; - - case TYPE_CURSOR: - ((PPROCMARKHEAD)Object)->ppi = ppi; - break; - - default: - break; - } - /* Now set default headers. */ + /* Give this object its identity. */ ((PHEAD)Object)->h = hi; - ((PHEAD)Object)->cLockObj = 2; // We need this, because we create 2 refs: handle and pointer! + + /* The caller will get a locked object. + * Note: with the reference from the handle, that makes two */ + UserReferenceObject(Object); if (h) *h = hi; @@ -407,46 +580,43 @@ BOOL FASTCALL -UserDereferenceObject(PVOID object) -{ - PUSER_HANDLE_ENTRY entry; - HANDLE_TYPE type; - - ASSERT(((PHEAD)object)->cLockObj >= 1); - - if ((INT)--((PHEAD)object)->cLockObj <= 0) - { - entry = handle_to_entry(gHandleTable, ((PHEAD)object)->h ); - - if (!entry) - { - ERR("Warning! Dereference Object without ENTRY! Obj -> %p\n", object); - return FALSE; - } - TRACE("Warning! Dereference to zero! Obj -> %p\n", object); - - ((PHEAD)object)->cLockObj = 0; - - if (!(entry->flags & HANDLEENTRY_INDESTROY)) +UserDereferenceObject(PVOID Object) +{ + PHEAD ObjHead = (PHEAD)Object; + + ASSERT(ObjHead->cLockObj >= 1); + + if (--ObjHead->cLockObj == 0) + { + PUSER_HANDLE_ENTRY entry; + HANDLE_TYPE type; + + entry = handle_to_entry(gHandleTable, ObjHead->h); + + ASSERT(entry != NULL); + /* The entry should be marked as in deletion */ + ASSERT(entry->flags & HANDLEENTRY_INDESTROY); + + type = entry->type; + ASSERT(type != TYPE_FREE); + ASSERT(type < TYPE_CTYPES); + + /* We can now get rid of everything */ + free_user_entry(gHandleTable, entry ); + +#if 0 + /* Call the object destructor */ + ASSERT(ObjectCallbacks[type].ObjectCleanup != NULL); + ObjectCallbacks[type].ObjectCleanup(Object); +#endif + + /* And free it */ + ASSERT(ObjectCallbacks[type].ObjectFree != NULL); + ObjectCallbacks[type].ObjectFree(Object); + return TRUE; - - type = entry->type; - free_user_entry(gHandleTable, entry ); - - switch (type) - { - case TYPE_WINDOW: - case TYPE_MENU: - case TYPE_HOOK: - case TYPE_CALLPROC: - case TYPE_INPUTCONTEXT: - return DesktopHeapFree(((PTHRDESKHEAD)object)->rpdesk, object); - - default: - return UserHeapFree(object); - } - } - return FALSE; + } + return FALSE; } BOOL @@ -522,10 +692,10 @@ { PUSER_HANDLE_ENTRY entry = handle_to_entry(gHandleTable, ((PHEAD)obj)->h ); PPROCESSINFO ppi, oldppi; - + /* This must be called with a valid object */ ASSERT(entry); - + /* For now, only supported for CursorIcon object */ switch(type) { @@ -541,59 +711,55 @@ } oldppi->UserHandleCount--; + IntDereferenceProcessInfo(oldppi); ppi->UserHandleCount++; + IntReferenceProcessInfo(ppi); #if DBG oldppi->DbgHandleCount[type]--; ppi->DbgHandleCount[type]++; #endif } - -HANDLE FASTCALL ValidateHandleNoErr(HANDLE handle, HANDLE_TYPE type) -{ - if (handle) return (PWND)UserGetObjectNoErr(gHandleTable, handle, type); - return NULL; -} - -PVOID FASTCALL ValidateHandle(HANDLE handle, HANDLE_TYPE type) -{ - PVOID pObj; - DWORD dwError = 0; - if (handle) - { - pObj = UserGetObjectNoErr(gHandleTable, handle, type); - if (!pObj) - { - switch (type) - { - case TYPE_WINDOW: - dwError = ERROR_INVALID_WINDOW_HANDLE; - break; - case TYPE_MENU: - dwError = ERROR_INVALID_MENU_HANDLE; - break; - case TYPE_CURSOR: - dwError = ERROR_INVALID_CURSOR_HANDLE; - break; - case TYPE_SETWINDOWPOS: - dwError = ERROR_INVALID_DWP_HANDLE; - break; - case TYPE_HOOK: - dwError = ERROR_INVALID_HOOK_HANDLE; - break; - case TYPE_ACCELTABLE: - dwError = ERROR_INVALID_ACCEL_HANDLE; - break; - default: - dwError = ERROR_INVALID_HANDLE; - break; - } - EngSetLastError(dwError); - return NULL; - } - return pObj; - } - return NULL; +BOOLEAN +UserDestroyObjectsForOwner(PUSER_HANDLE_TABLE Table, PVOID Owner) +{ + int i; + PUSER_HANDLE_ENTRY Entry; + BOOLEAN Ret = TRUE; + + /* Sweep the whole handle table */ + for (i = 0; i < Table->allocated_handles; i++) + { + Entry = &Table->handles[i]; + + if (Entry->pi != Owner) + continue; + + /* Do not destroy if it's already been done */ + if (Entry->flags & HANDLEENTRY_INDESTROY) + continue; + + /* Spcial case for cursors until cursoricon_new is there */ + if (Entry->type == TYPE_CURSOR) + { + UserReferenceObject(Entry->ptr); + if (!IntDestroyCurIconObject(Entry->ptr, Owner)) + { + Ret = FALSE; + } + continue; + } + + /* Call destructor */ + if (!ObjectCallbacks[Entry->type].ObjectDestroy(Entry->ptr)) + { + ERR("Failed destructing object %p, type %u.\n", Entry->ptr, Entry->type); + /* Don't return immediately, we must continue destroying the other objects */ + Ret = FALSE; + } + } + + return Ret; } /* Modified: trunk/reactos/win32ss/user/ntuser/object.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/object… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/object.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/object.h [iso-8859-1] Sun Sep 21 17:44:40 2014 @@ -18,8 +18,8 @@ BOOL FASTCALL UserObjectInDestroy(HANDLE); void DbgUserDumpHandleTable(); VOID FASTCALL UserSetObjectOwner(PVOID obj, HANDLE_TYPE type, PVOID owner); -HANDLE FASTCALL ValidateHandleNoErr(HANDLE handle, HANDLE_TYPE type); PVOID FASTCALL ValidateHandle(HANDLE handle, HANDLE_TYPE type); +BOOLEAN UserDestroyObjectsForOwner(PUSER_HANDLE_TABLE Table, PVOID Owner); static __inline VOID UserRefObjectCo(PVOID obj, PUSER_REFERENCE_ENTRY UserReferenceEntry) Modified: trunk/reactos/win32ss/user/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/simple… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/simplecall.c [iso-8859-1] Sun Sep 21 17:44:40 2014 @@ -73,11 +73,11 @@ switch(Routine) { case NOPARAM_ROUTINE_CREATEMENU: - Result = (DWORD_PTR)UserCreateMenu(FALSE); + Result = (DWORD_PTR)UserCreateMenu(GetW32ThreadInfo()->rpdesk, FALSE); break; case NOPARAM_ROUTINE_CREATEMENUPOPUP: - Result = (DWORD_PTR)UserCreateMenu(TRUE); + Result = (DWORD_PTR)UserCreateMenu(GetW32ThreadInfo()->rpdesk, TRUE); break; case NOPARAM_ROUTINE_DESTROY_CARET: Modified: trunk/reactos/win32ss/user/ntuser/userfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/userfu… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/userfuncs.h [iso-8859-1] Sun Sep 21 17:44:40 2014 @@ -2,7 +2,7 @@ FORCEINLINE PMENU UserGetMenuObject(HMENU hMenu) { - return ValidateHandle(hMenu, TYPE_MENU); + return UserGetObject(gHandleTable, hMenu, TYPE_MENU); } #define ASSERT_REFS_CO(_obj_) \ @@ -106,12 +106,12 @@ VOID FASTCALL co_DestroyThreadWindows(struct _ETHREAD *Thread); HWND FASTCALL UserGetShellWindow(VOID); HDC FASTCALL UserGetDCEx(PWND Window OPTIONAL, HANDLE ClipRegion, ULONG Flags); -BOOLEAN FASTCALL co_UserDestroyWindow(PWND Wnd); +BOOLEAN co_UserDestroyWindow(PVOID Object); PWND FASTCALL UserGetAncestor(PWND Wnd, UINT Type); /*************** MENU.C ***************/ -HMENU FASTCALL UserCreateMenu(BOOL PopupMenu); +HMENU FASTCALL UserCreateMenu(PDESKTOP Desktop, BOOL PopupMenu); BOOL FASTCALL UserSetMenuDefaultItem(PMENU Menu, UINT uItem, UINT fByPos); BOOL FASTCALL UserDestroyMenu(HMENU hMenu); Modified: trunk/reactos/win32ss/user/ntuser/win32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/win32.… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/win32.h [iso-8859-1] Sun Sep 21 17:44:40 2014 @@ -158,14 +158,28 @@ #define IntReferenceThreadInfo(pti) \ InterlockedIncrement(&(pti)->RefCount) -VOID FASTCALL UserDeleteW32Thread(PTHREADINFO); +VOID UserDeleteW32Thread(PTHREADINFO); #define IntDereferenceThreadInfo(pti) \ do { \ if(InterlockedDecrement(&(pti)->RefCount) == 0) \ { \ - ASSERT(pti->TIF_flags &= (TIF_INCLEANUP|TIF_DONTATTACHQUEUE) == (TIF_INCLEANUP|TIF_DONTATTACHQUEUE)); \ + ASSERT(((pti)->TIF_flags & (TIF_INCLEANUP|TIF_DONTATTACHQUEUE)) == (TIF_INCLEANUP|TIF_DONTATTACHQUEUE)); \ UserDeleteW32Thread(pti); \ + } \ + } while(0) + +#define IntReferenceProcessInfo(ppi) \ + InterlockedIncrement((volatile LONG*)(&(ppi)->RefCount)) + +VOID UserDeleteW32Process(PPROCESSINFO); + +#define IntDereferenceProcessInfo(ppi) \ + do { \ + if(InterlockedDecrement((volatile LONG*)(&(ppi)->RefCount)) == 0) \ + { \ + ASSERT(((ppi)->W32PF_flags & W32PF_TERMINATED) != 0); \ + UserDeleteW32Process(ppi); \ } \ } while(0) @@ -242,7 +256,6 @@ DWORD dwLayout; DWORD dwRegisteredClasses; /* ReactOS */ - LIST_ENTRY MenuListHead; FAST_MUTEX PrivateFontListLock; LIST_ENTRY PrivateFontListHead; FAST_MUTEX DriverObjListLock; Modified: trunk/reactos/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/window… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/window.c [iso-8859-1] Sun Sep 21 17:44:40 2014 @@ -587,14 +587,14 @@ Window->IDMenu && (Menu = UserGetMenuObject((HMENU)Window->IDMenu))) { - IntDestroyMenuObject(Menu, TRUE, TRUE); + IntDestroyMenuObject(Menu, TRUE); Window->IDMenu = 0; } if(Window->SystemMenu && (Menu = UserGetMenuObject(Window->SystemMenu))) { - IntDestroyMenuObject(Menu, TRUE, TRUE); + IntDestroyMenuObject(Menu, TRUE); Window->SystemMenu = (HMENU)0; } @@ -860,40 +860,6 @@ /* INTERNAL ******************************************************************/ - -VOID FASTCALL -co_DestroyThreadWindows(struct _ETHREAD *Thread) -{ - PTHREADINFO WThread; - PLIST_ENTRY Current; - PWND Wnd; - USER_REFERENCE_ENTRY Ref; - WThread = (PTHREADINFO)Thread->Tcb.Win32Thread; - - while (!IsListEmpty(&WThread->WindowListHead)) - { - Current = WThread->WindowListHead.Flink; - Wnd = CONTAINING_RECORD(Current, WND, ThreadListEntry); - - TRACE("thread cleanup: while destroy wnds, wnd=%p\n", Wnd); - - /* Window removes itself from the list */ - - /* - * FIXME: It is critical that the window removes itself! If now, we will loop - * here forever... - */ - - //ASSERT(co_UserDestroyWindow(Wnd)); - - UserRefObjectCo(Wnd, &Ref); // FIXME: Temp HACK?? - if (!co_UserDestroyWindow(Wnd)) - { - ERR("Unable to destroy window %p at thread cleanup... This is _VERY_ bad!\n", Wnd); - } - UserDerefObjectCo(Wnd); // FIXME: Temp HACK?? - } -} BOOL FASTCALL IntIsChildWindow(PWND Parent, PWND BaseWindow) @@ -1788,7 +1754,7 @@ if (Class->atomClassName == gpsi->atomSysClass[ICLS_EDIT]) { PCALLPROCDATA CallProc; - CallProc = CreateCallProc(NULL, pWnd->lpfnWndProc, pWnd->Unicode , pWnd->head.pti->ppi); + CallProc = CreateCallProc(pWnd->head.rpdesk, pWnd->lpfnWndProc, pWnd->Unicode , pWnd->head.pti->ppi); if (!CallProc) { @@ -2431,9 +2397,10 @@ if ( (dwStyle & (WS_POPUP|WS_CHILD)) != WS_CHILD) { /* check hMenu is valid handle */ - if (hMenu && !ValidateHandle(hMenu, TYPE_MENU)) + if (hMenu && !UserGetMenuObject(hMenu)) { - /* error is set in ValidateHandle */ + ERR("NtUserCreateWindowEx: Got an invalid menu handle!\n"); + EngSetLastError(ERROR_INVALID_MENU_HANDLE); return NULL; } } @@ -2520,12 +2487,13 @@ } -BOOLEAN FASTCALL co_UserDestroyWindow(PWND Window) +BOOLEAN co_UserDestroyWindow(PVOID Object) { HWND hWnd; PWND pwndTemp; PTHREADINFO ti; MSG msg; + PWND Window = Object; ASSERT_REFS_CO(Window); // FIXME: Temp HACK? Modified: trunk/reactos/win32ss/user/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/m… ============================================================================== --- trunk/reactos/win32ss/user/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/user32/misc/misc.c [iso-8859-1] Sun Sep 21 17:44:40 2014 @@ -315,17 +315,17 @@ TRUE, /* TYPE_CURSOR */ TRUE, /* TYPE_SETWINDOWPOS */ FALSE, /* TYPE_HOOK */ - FALSE, /* TYPE_CLIPDATA */ + TRUE, /* TYPE_CLIPDATA */ FALSE, /* TYPE_CALLPROC */ TRUE, /* TYPE_ACCELTABLE */ FALSE, /* TYPE_DDEACCESS */ FALSE, /* TYPE_DDECONV */ FALSE, /* TYPE_DDEXACT */ TRUE, /* TYPE_MONITOR */ - FALSE, /* TYPE_KBDLAYOUT */ - FALSE, /* TYPE_KBDFILE */ + TRUE, /* TYPE_KBDLAYOUT */ + TRUE, /* TYPE_KBDFILE */ TRUE, /* TYPE_WINEVENTHOOK */ - FALSE, /* TYPE_TIMER */ + TRUE, /* TYPE_TIMER */ FALSE, /* TYPE_INPUTCONTEXT */ FALSE, /* TYPE_HIDDATA */ FALSE, /* TYPE_DEVICEINFO */

1 0

[akhaldi] 64218: [AMSTREAM_WINETEST] * Sync with Wine 1.7.27. A huge patch that demonstrates how much work has been done on this module.. I mean reduce diff to Wine ; p CORE-8540
by akhaldi＠svn.reactos.org 21 Sep '14

21 Sep '14

Author: akhaldi Date: Sun Sep 21 17:43:12 2014 New Revision: 64218 URL: http://svn.reactos.org/svn/reactos?rev=64218&view=rev Log: [AMSTREAM_WINETEST] * Sync with Wine 1.7.27. A huge patch that demonstrates how much work has been done on this module.. I mean reduce diff to Wine ;p CORE-8540 Modified: trunk/rostests/winetests/amstream/amstream.c Modified: trunk/rostests/winetests/amstream/amstream.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/amstream/amstre… ============================================================================== --- trunk/rostests/winetests/amstream/amstream.c [iso-8859-1] (original) +++ trunk/rostests/winetests/amstream/amstream.c [iso-8859-1] Sun Sep 21 17:43:12 2014 @@ -441,7 +441,7 @@ CoInitializeEx(NULL, COINIT_MULTITHREADED); test_media_streams(); - + file = CreateFileW(filenameW, 0, 0, NULL, OPEN_EXISTING, 0, NULL); if (file != INVALID_HANDLE_VALUE) {

1 0

[akhaldi] 64217: [AMSTREAM] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 21 Sep '14

21 Sep '14

Author: akhaldi Date: Sun Sep 21 17:28:06 2014 New Revision: 64217 URL: http://svn.reactos.org/svn/reactos?rev=64217&view=rev Log: [AMSTREAM] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/amstream/… ============================================================================== --- trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/amstream/mediastreamfilter.c [iso-8859-1] Sun Sep 21 17:28:06 2014 @@ -225,7 +225,7 @@ static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface) { IMediaStreamFilterImpl *This = impl_from_IMediaStreamFilter(iface); - ULONG ref = BaseFilterImpl_Release(&This->filter.IBaseFilter_iface); + ULONG ref = InterlockedDecrement(&This->filter.refCount); TRACE("(%p)->(): new ref = %u\n", iface, ref); @@ -237,6 +237,7 @@ IMediaStream_Release(This->streams[i]); IPin_Release(This->pins[i]); } + BaseFilter_Destroy(&This->filter); HeapFree(GetProcessHeap(), 0, This); } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 21 17:28:06 2014 @@ -27,7 +27,7 @@ The following libraries are shared with Wine. -reactos/dll/directx/wine/amstream # Synced to Wine-1.7.17 +reactos/dll/directx/wine/amstream # Synced to Wine-1.7.27 reactos/dll/directx/wine/d3d8 # Synced to Wine-1.7.17 reactos/dll/directx/wine/d3d9 # Synced to Wine-1.7.17 reactos/dll/directx/wine/d3dcompiler_43 # Synced to Wine-1.7.17

1 0

[akhaldi] 64216: [STRMBASE] * Sync with Wine 1.7.27. CORE-8540
by akhaldi＠svn.reactos.org 21 Sep '14

21 Sep '14

Author: akhaldi Date: Sun Sep 21 17:18:11 2014 New Revision: 64216 URL: http://svn.reactos.org/svn/reactos?rev=64216&view=rev Log: [STRMBASE] * Sync with Wine 1.7.27. CORE-8540 Modified: trunk/reactos/lib/3rdparty/strmbase/pin.c trunk/reactos/lib/3rdparty/strmbase/renderer.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/lib/3rdparty/strmbase/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/pin.… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/pin.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/pin.c [iso-8859-1] Sun Sep 21 17:18:11 2014 @@ -71,7 +71,6 @@ hr = IPin_QueryInternalConnections( from, NULL, &amount ); if (hr != E_NOTIMPL && amount) FIXME("Use QueryInternalConnections!\n"); - hr = S_OK; pin_info.pFilter = NULL; hr = IPin_QueryPinInfo( from, &pin_info ); @@ -391,11 +390,7 @@ if (!refCount) { - FreeMediaType(&This->pin.mtCurrent); - if (This->pAllocator) - IMemAllocator_Release(This->pAllocator); - This->pAllocator = NULL; - CoTaskMemFree(This); + BaseOutputPin_Destroy(This); return 0; } return refCount; @@ -839,6 +834,16 @@ return E_FAIL; } +HRESULT WINAPI BaseOutputPin_Destroy(BaseOutputPin *This) +{ + FreeMediaType(&This->pin.mtCurrent); + if (This->pAllocator) + IMemAllocator_Release(This->pAllocator); + This->pAllocator = NULL; + CoTaskMemFree(This); + return S_OK; +} + /*** Input Pin implementation ***/ static inline BaseInputPin *impl_BaseInputPin_from_IPin( IPin *iface ) @@ -890,12 +895,7 @@ if (!refCount) { - FreeMediaType(&This->pin.mtCurrent); - if (This->pAllocator) - IMemAllocator_Release(This->pAllocator); - This->pAllocator = NULL; - This->pin.IPin_iface.lpVtbl = NULL; - CoTaskMemFree(This); + BaseInputPin_Destroy(This); return 0; } else @@ -1263,3 +1263,14 @@ CoTaskMemFree(pPinImpl); return E_FAIL; } + +HRESULT WINAPI BaseInputPin_Destroy(BaseInputPin *This) +{ + FreeMediaType(&This->pin.mtCurrent); + if (This->pAllocator) + IMemAllocator_Release(This->pAllocator); + This->pAllocator = NULL; + This->pin.IPin_iface.lpVtbl = NULL; + CoTaskMemFree(This); + return S_OK; +} Modified: trunk/reactos/lib/3rdparty/strmbase/renderer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/strmbase/rend… ============================================================================== --- trunk/reactos/lib/3rdparty/strmbase/renderer.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/strmbase/renderer.c [iso-8859-1] Sun Sep 21 17:18:11 2014 @@ -95,8 +95,8 @@ TRACE("(%p/%p)->()\n", This, pFilter); + EnterCriticalSection(&pFilter->csRenderLock); EnterCriticalSection(&pFilter->filter.csFilter); - EnterCriticalSection(&pFilter->csRenderLock); hr = BaseInputPinImpl_EndOfStream(iface); EnterCriticalSection(This->pin.pCritSec); if (SUCCEEDED(hr)) @@ -107,8 +107,8 @@ hr = BaseRendererImpl_EndOfStream(pFilter); } LeaveCriticalSection(This->pin.pCritSec); + LeaveCriticalSection(&pFilter->filter.csFilter); LeaveCriticalSection(&pFilter->csRenderLock); - LeaveCriticalSection(&pFilter->filter.csFilter); return hr; } @@ -120,8 +120,8 @@ TRACE("(%p/%p)->()\n", This, iface); + EnterCriticalSection(&pFilter->csRenderLock); EnterCriticalSection(&pFilter->filter.csFilter); - EnterCriticalSection(&pFilter->csRenderLock); EnterCriticalSection(This->pin.pCritSec); hr = BaseInputPinImpl_BeginFlush(iface); if (SUCCEEDED(hr)) @@ -145,8 +145,8 @@ TRACE("(%p/%p)->()\n", This, pFilter); + EnterCriticalSection(&pFilter->csRenderLock); EnterCriticalSection(&pFilter->filter.csFilter); - EnterCriticalSection(&pFilter->csRenderLock); EnterCriticalSection(This->pin.pCritSec); hr = BaseInputPinImpl_EndFlush(iface); if (SUCCEEDED(hr)) @@ -157,8 +157,8 @@ hr = BaseRendererImpl_EndFlush(pFilter); } LeaveCriticalSection(This->pin.pCritSec); + LeaveCriticalSection(&pFilter->filter.csFilter); LeaveCriticalSection(&pFilter->csRenderLock); - LeaveCriticalSection(&pFilter->filter.csFilter); return hr; } Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sun Sep 21 17:18:11 2014 @@ -248,7 +248,7 @@ from Winehq CVS. If you are looking to update something in these files check Wine current souces first as it may already be fixed. -reactos/lib/3rdparty/strmbase # Synced to Wine-1.7.17 +reactos/lib/3rdparty/strmbase # Synced to Wine-1.7.27 advapi32 - reactos/dll/win32/advapi32/crypt/*.c # Synced to Wine-1.7.1

1 0

[akhaldi] 64215: [INCLUDES/WINE] * Update strmbase.h. CORE-8540
by akhaldi＠svn.reactos.org 21 Sep '14

21 Sep '14

Author: akhaldi Date: Sun Sep 21 17:13:18 2014 New Revision: 64215 URL: http://svn.reactos.org/svn/reactos?rev=64215&view=rev Log: [INCLUDES/WINE] * Update strmbase.h. CORE-8540 Modified: trunk/reactos/include/reactos/wine/strmbase.h Modified: trunk/reactos/include/reactos/wine/strmbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/strmb… ============================================================================== --- trunk/reactos/include/reactos/wine/strmbase.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/strmbase.h [iso-8859-1] Sun Sep 21 17:13:18 2014 @@ -136,6 +136,7 @@ HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(BasePin *This, IPin * pReceivePin, const AM_MEDIA_TYPE * pmt); HRESULT WINAPI BaseOutputPin_Construct(const IPinVtbl *OutputPin_Vtbl, LONG outputpin_size, const PIN_INFO * pPinInfo, const BaseOutputPinFuncTable* pBaseOutputFuncsTable, LPCRITICAL_SECTION pCritSec, IPin ** ppPin); +HRESULT WINAPI BaseOutputPin_Destroy(BaseOutputPin *This); /* Base Input Pin */ HRESULT WINAPI BaseInputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv); @@ -151,6 +152,7 @@ HRESULT BaseInputPin_Construct(const IPinVtbl *InputPin_Vtbl, LONG inputpin_size, const PIN_INFO * pPinInfo, const BaseInputPinFuncTable* pBaseInputFuncsTable, LPCRITICAL_SECTION pCritSec, IMemAllocator *, IPin ** ppPin); +HRESULT WINAPI BaseInputPin_Destroy(BaseInputPin *This); typedef struct BaseFilter {

1 0

[jgardou] 64214: [NTOS/MM] - Implement reading and writing for copy-on-write sections. Only for user space now. CORE-8541
by jgardou＠svn.reactos.org 21 Sep '14

21 Sep '14

Author: jgardou Date: Sun Sep 21 17:00:07 2014 New Revision: 64214 URL: http://svn.reactos.org/svn/reactos?rev=64214&view=rev Log: [NTOS/MM] - Implement reading and writing for copy-on-write sections. Only for user space now. CORE-8541 Modified: branches/TransitionPte/ntoskrnl/mm/ARM3/miarm.h branches/TransitionPte/ntoskrnl/mm/ARM3/pagfault.c branches/TransitionPte/ntoskrnl/mm/balance.c branches/TransitionPte/ntoskrnl/mm/marea.c Modified: branches/TransitionPte/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/mm/ARM3/… ============================================================================== --- branches/TransitionPte/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ branches/TransitionPte/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sun Sep 21 17:00:07 2014 @@ -2248,6 +2248,15 @@ IN PMMVAD Vad ); +VOID +NTAPI +MiDeletePte( + IN PMMPTE PointerPte, + IN PVOID VirtualAddress, + IN PEPROCESS CurrentProcess, + IN PMMPTE PrototypePte +); + ULONG NTAPI MiMakeSystemAddressValid( Modified: branches/TransitionPte/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/mm/ARM3/… ============================================================================== --- branches/TransitionPte/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ branches/TransitionPte/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sun Sep 21 17:00:07 2014 @@ -519,6 +519,71 @@ /* Now get rid of it */ MiReleaseSystemPtes(ZeroPte, 1, SystemPteSpace); +} + +VOID +NTAPI +MiCopyPfn( + _In_ PFN_NUMBER DestPage, + _In_ PFN_NUMBER SrcPage) +{ + PMMPTE SysPtes; + MMPTE TempPte; + PMMPFN DestPfn, SrcPfn; + PVOID DestAddress; + const VOID* SrcAddress; + + /* Get the PFNs */ + DestPfn = MiGetPfnEntry(DestPage); + ASSERT(DestPfn); + SrcPfn = MiGetPfnEntry(SrcPage); + ASSERT(SrcPfn); + + /* Grab 2 system PTEs */ + SysPtes = MiReserveSystemPtes(2, SystemPteSpace); + ASSERT(SysPtes); + + /* Initialize the destination PTE */ + TempPte = ValidKernelPte; + TempPte.u.Hard.PageFrameNumber = DestPage; + + /* Setup caching */ + if (DestPfn->u3.e1.CacheAttribute == MiWriteCombined) + { + /* Write combining, no caching */ + MI_PAGE_DISABLE_CACHE(&TempPte); + MI_PAGE_WRITE_COMBINED(&TempPte); + } + else if (DestPfn->u3.e1.CacheAttribute == MiNonCached) + { + /* Write through, no caching */ + MI_PAGE_DISABLE_CACHE(&TempPte); + MI_PAGE_WRITE_THROUGH(&TempPte); + } + + /* Make the system PTE valid with our PFN */ + MI_WRITE_VALID_PTE(&SysPtes[0], TempPte); + + /* Initialize the source PTE */ + TempPte = ValidKernelPte; + TempPte.u.Hard.PageFrameNumber = SrcPage; + + /* Setup caching */ + if (SrcPfn->u3.e1.CacheAttribute == MiNonCached) + { + MI_PAGE_DISABLE_CACHE(&TempPte); + } + + /* Make the system PTE valid with our PFN */ + MI_WRITE_VALID_PTE(&SysPtes[1], TempPte); + + /* Get the addresses and perform the copy */ + DestAddress = MiPteToAddress(&SysPtes[0]); + SrcAddress = MiPteToAddress(&SysPtes[1]); + RtlCopyMemory(DestAddress, SrcAddress, PAGE_SIZE); + + /* Now get rid of it */ + MiReleaseSystemPtes(SysPtes, 2, SystemPteSpace); } NTSTATUS @@ -1109,6 +1174,7 @@ PFN_NUMBER PageFrameIndex; NTSTATUS Status; PVOID InPageBlock = NULL; + ULONG Protection; /* Must be called with an invalid, prototype PTE, with the PFN lock held */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); @@ -1155,31 +1221,95 @@ { if (!PteContents.u.Proto.ReadOnly) { - /* Check for page acess in software */ - Status = MiAccessCheck(PointerProtoPte, - StoreInstruction, - KernelMode, - TempPte.u.Soft.Protection, - TrapInformation, - TRUE); - ASSERT(Status == STATUS_SUCCESS); - - /* Check for copy on write page */ - if ((TempPte.u.Soft.Protection & MM_WRITECOPY) == MM_WRITECOPY) - { - /* Not yet supported */ - ASSERT(FALSE); - } - } + Protection = TempPte.u.Soft.Protection; + } + else + { + Protection = MM_READONLY; + } + /* Check for page acess in software */ + Status = MiAccessCheck(PointerProtoPte, + StoreInstruction, + KernelMode, + TempPte.u.Soft.Protection, + TrapInformation, + TRUE); + ASSERT(Status == STATUS_SUCCESS); } else { - /* Check for copy on write page */ - if ((PteContents.u.Soft.Protection & MM_WRITECOPY) == MM_WRITECOPY) - { - /* Not yet supported */ - ASSERT(FALSE); - } + Protection = PteContents.u.Soft.Protection; + } + + /* Check for writing copy on write page */ + if (((Protection & MM_WRITECOPY) == MM_WRITECOPY) && StoreInstruction) + { + PFN_NUMBER PageFrameIndex, ProtoPageFrameIndex; + ULONG Color; + + /* Resolve the proto fault as if it was a read operation */ + Status = MiResolveProtoPteFault(FALSE, + Address, + PointerPte, + PointerProtoPte, + OutPfn, + PageFileData, + PteValue, + Process, + OldIrql, + TrapInformation); + + if (!NT_SUCCESS(Status)) + { + return Status; + } + + /* Lock again the PFN lock, MiResolveProtoPteFault unlocked it */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* And re-read the proto PTE */ + TempPte = *PointerProtoPte; + ASSERT(TempPte.u.Hard.Valid == 1); + ProtoPageFrameIndex = PFN_FROM_PTE(&TempPte); + + /* Get a new page for the private copy */ + if (Process > HYDRA_PROCESS) + Color = MI_GET_NEXT_PROCESS_COLOR(Process); + else + Color = MI_GET_NEXT_COLOR(); + + PageFrameIndex = MiRemoveAnyPage(Color); + + /* Perform the copy */ + MiCopyPfn(PageFrameIndex, ProtoPageFrameIndex); + + /* This will drop everything MiResolveProtoPteFault referenced */ + MiDeletePte(PointerPte, Address, Process, PointerProtoPte); + + /* Because now we use this */ + Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); + MiInitializePfn(PageFrameIndex, PointerPte, TRUE); + + /* Fix the protection */ + Protection &= ~MM_WRITECOPY; + Protection |= MM_READWRITE; + if (Address < MmSystemRangeStart) + { + /* Build the user PTE */ + MI_MAKE_HARDWARE_PTE_USER(&PteContents, PointerPte, Protection, PageFrameIndex); + } + else + { + /* Build the kernel PTE */ + MI_MAKE_HARDWARE_PTE(&PteContents, PointerPte, Protection, PageFrameIndex); + } + + /* And finally, write the valid PTE */ + MI_WRITE_VALID_PTE(PointerPte, PteContents); + + /* The caller expects us to release the PFN lock */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + return Status; } /* Check for clone PTEs */ @@ -2104,8 +2234,39 @@ /* Is this a copy on write PTE? */ if (TempPte.u.Hard.CopyOnWrite) { - /* Not supported yet */ - ASSERT(FALSE); + PFN_NUMBER PageFrameIndex, OldPageFrameIndex; + PMMPFN Pfn1; + + LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + ASSERT(MmAvailablePages > 0); + + /* Allocate a new page and copy it */ + PageFrameIndex = MiRemoveAnyPage(MI_GET_NEXT_PROCESS_COLOR(CurrentProcess)); + OldPageFrameIndex = PFN_FROM_PTE(&TempPte); + + MiCopyPfn(PageFrameIndex, OldPageFrameIndex); + + /* Dereference whatever this PTE is referencing */ + Pfn1 = MI_PFN_ELEMENT(OldPageFrameIndex); + ASSERT(Pfn1->u3.e1.PrototypePte == 1); + ASSERT(!MI_IS_PFN_DELETED(Pfn1)); + ProtoPte = Pfn1->PteAddress; + MiDeletePte(PointerPte, Address, CurrentProcess, ProtoPte); + + /* And make a new shiny one with our page */ + MiInitializePfn(PageFrameIndex, PointerPte, TRUE); + TempPte.u.Hard.PageFrameNumber = PageFrameIndex; + TempPte.u.Hard.Write = 1; + TempPte.u.Hard.CopyOnWrite = 0; + + MI_WRITE_VALID_PTE(PointerPte, TempPte); + + KeReleaseQueuedSpinLock(LockQueuePfnLock, LockIrql); + + /* Return the status */ + MiUnlockProcessWorkingSet(CurrentProcess, CurrentThread); + return STATUS_PAGE_FAULT_COPY_ON_WRITE; } /* Is this a read-only PTE? */ Modified: branches/TransitionPte/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/mm/balan… ============================================================================== --- branches/TransitionPte/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ branches/TransitionPte/ntoskrnl/mm/balance.c [iso-8859-1] Sun Sep 21 17:00:07 2014 @@ -196,13 +196,6 @@ return (MiBalancerThreadHandle != NULL) && (PsGetCurrentThreadId() == MiBalancerThreadId.UniqueThread); } - -VOID -NTAPI -MiDeletePte(IN PMMPTE PointerPte, - IN PVOID VirtualAddress, - IN PEPROCESS CurrentProcess, - IN PMMPTE PrototypePte); VOID NTAPI Modified: branches/TransitionPte/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/mm/marea… ============================================================================== --- branches/TransitionPte/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ branches/TransitionPte/ntoskrnl/mm/marea.c [iso-8859-1] Sun Sep 21 17:00:07 2014 @@ -787,12 +787,6 @@ * * @remarks Lock the address space before calling this function. */ -VOID -NTAPI -MiDeletePte(IN PMMPTE PointerPte, - IN PVOID VirtualAddress, - IN PEPROCESS CurrentProcess, - IN PMMPTE PrototypePte); NTSTATUS NTAPI MmFreeMemoryArea(

1 0

[akhaldi] 64213: [TRANSLATIONS] * Turkish translation update by Erdem Ersoy. CORE-7861
by akhaldi＠svn.reactos.org 21 Sep '14

21 Sep '14

Author: akhaldi Date: Sun Sep 21 16:14:12 2014 New Revision: 64213 URL: http://svn.reactos.org/svn/reactos?rev=64213&view=rev Log: [TRANSLATIONS] * Turkish translation update by Erdem Ersoy. CORE-7861 Added: trunk/reactos/dll/win32/samsrv/lang/tr-TR.rc (with props) trunk/reactos/dll/win32/serialui/lang/tr-TR.rc (with props) trunk/reactos/dll/win32/shimgvw/lang/tr-TR.rc (with props) trunk/reactos/dll/win32/tapiui/lang/tr-TR.rc (with props) trunk/reactos/dll/win32/userenv/lang/tr-TR.rc (with props) trunk/reactos/dll/win32/winmm/lang/winmm_Tr.rc (with props) Modified: trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc trunk/reactos/base/applications/mspaint/lang/tr-TR.rc trunk/reactos/base/applications/mstsc/lang/tr-TR.rc trunk/reactos/base/applications/notepad/lang/tr-TR.rc trunk/reactos/base/applications/rapps/lang/tr-TR.rc trunk/reactos/base/applications/sndrec32/lang/tr-TR.rc trunk/reactos/base/applications/sndvol32/lang/tr-TR.rc trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc trunk/reactos/base/applications/wordpad/lang/Tr.rc trunk/reactos/base/system/winlogon/lang/tr-TR.rc trunk/reactos/dll/cpl/console/lang/tr-TR.rc trunk/reactos/dll/cpl/inetcpl/lang/tr-TR.rc trunk/reactos/dll/cpl/main/lang/tr-TR.rc trunk/reactos/dll/cpl/mmsys/lang/tr-TR.rc trunk/reactos/dll/cpl/powercfg/lang/tr-TR.rc trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Tr.rc trunk/reactos/dll/win32/devmgr/lang/tr-TR.rc trunk/reactos/dll/win32/modemui/lang/tr-TR.rc trunk/reactos/dll/win32/mpr/lang/mpr_Tr.rc trunk/reactos/dll/win32/msacm32/lang/msacm_Tr.rc trunk/reactos/dll/win32/msgina/lang/tr-TR.rc trunk/reactos/dll/win32/msi/msi_Tr.rc trunk/reactos/dll/win32/netcfgx/lang/tr-TR.rc trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Tr.rc trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc trunk/reactos/dll/win32/samsrv/samsrv.rc trunk/reactos/dll/win32/serialui/serialui.rc trunk/reactos/dll/win32/shimgvw/shimgvw.rc trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc trunk/reactos/dll/win32/tapiui/tapiui.rc trunk/reactos/dll/win32/userenv/userenv.rc trunk/reactos/dll/win32/wininet/lang/wininet_Tr.rc trunk/reactos/dll/win32/winmm/winmm_res.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/dxdiag/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mspaint/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mstsc/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… Modified: trunk/reactos/base/applications/notepad/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/sndrec32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndvol32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/taskmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/wordpad/lang/Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/wordpad/… Modified: trunk/reactos/base/system/winlogon/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/dll/cpl/console/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/console/lang/tr-TR… Modified: trunk/reactos/dll/cpl/inetcpl/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/tr-TR… Modified: trunk/reactos/dll/cpl/main/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/tr-TR.rc… Modified: trunk/reactos/dll/cpl/mmsys/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/lang/tr-TR.r… Modified: trunk/reactos/dll/cpl/powercfg/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/powercfg/lang/tr-T… Modified: trunk/reactos/dll/win32/comdlg32/lang/cdlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/lang/cd… Modified: trunk/reactos/dll/win32/cryptui/lang/cryptui_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/lang/cry… Modified: trunk/reactos/dll/win32/devmgr/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/tr-T… Modified: trunk/reactos/dll/win32/modemui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/modemui/lang/tr-… Modified: trunk/reactos/dll/win32/mpr/lang/mpr_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mpr/lang/mpr_Tr.… Modified: trunk/reactos/dll/win32/msacm32/lang/msacm_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msacm32/lang/msa… Modified: trunk/reactos/dll/win32/msgina/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msgina/lang/tr-T… Modified: trunk/reactos/dll/win32/msi/msi_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi_Tr.rc?re… Modified: trunk/reactos/dll/win32/netcfgx/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netcfgx/lang/tr-… Modified: trunk/reactos/dll/win32/oleaut32/lang/oleaut32_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oleaut32/lang/ol… Modified: trunk/reactos/dll/win32/oledlg/lang/oledlg_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/oledlg/lang/oled… Added: trunk/reactos/dll/win32/samsrv/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/lang/tr-T… Modified: trunk/reactos/dll/win32/samsrv/samsrv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/samsrv/samsrv.rc… Added: trunk/reactos/dll/win32/serialui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/lang/tr… Modified: trunk/reactos/dll/win32/serialui/serialui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/serialui/serialu… Added: trunk/reactos/dll/win32/shimgvw/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/lang/tr-… Modified: trunk/reactos/dll/win32/shimgvw/shimgvw.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shimgvw/shimgvw.… Modified: trunk/reactos/dll/win32/shlwapi/lang/shlwapi_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/lang/shl… Modified: trunk/reactos/dll/win32/syssetup/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/tr… Added: trunk/reactos/dll/win32/tapiui/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/lang/tr-T… Modified: trunk/reactos/dll/win32/tapiui/tapiui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/tapiui/tapiui.rc… Added: trunk/reactos/dll/win32/userenv/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/lang/tr-… Modified: trunk/reactos/dll/win32/userenv/userenv.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/userenv/userenv.… Modified: trunk/reactos/dll/win32/wininet/lang/wininet_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/lang/win… Added: trunk/reactos/dll/win32/winmm/lang/winmm_Tr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/lang/winmm… Modified: trunk/reactos/dll/win32/winmm/winmm_res.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/winmm_res.…

1 0

[tkreuzer] 64212: [HAL] Fix some function prototypes and avoid real ugly casts
by tkreuzer＠svn.reactos.org 21 Sep '14

21 Sep '14

Author: tkreuzer Date: Sun Sep 21 16:00:27 2014 New Revision: 64212 URL: http://svn.reactos.org/svn/reactos?rev=64212&view=rev Log: [HAL] Fix some function prototypes and avoid real ugly casts Modified: trunk/reactos/hal/halx86/acpi/busemul.c trunk/reactos/hal/halx86/include/bus.h trunk/reactos/hal/halx86/legacy/bus/pcibus.c trunk/reactos/hal/halx86/legacy/bussupp.c Modified: trunk/reactos/hal/halx86/acpi/busemul.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/acpi/busemul.c?… ============================================================================== --- trunk/reactos/hal/halx86/acpi/busemul.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/acpi/busemul.c [iso-8859-1] Sun Sep 21 16:00:27 2014 @@ -225,7 +225,7 @@ /* Call PCI function */ return HalpGetPCIData(&BusHandler, &BusHandler, - *(PPCI_SLOT_NUMBER)&SlotNumber, + SlotNumber, Buffer, Offset, Length); @@ -304,7 +304,7 @@ /* Call PCI function */ return HalpSetPCIData(&BusHandler, &BusHandler, - *(PPCI_SLOT_NUMBER)&SlotNumber, + SlotNumber, Buffer, Offset, Length); Modified: trunk/reactos/hal/halx86/include/bus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/bus.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] Sun Sep 21 16:00:27 2014 @@ -365,7 +365,7 @@ HalpGetPCIData( IN PBUS_HANDLER BusHandler, IN PBUS_HANDLER RootBusHandler, - IN PCI_SLOT_NUMBER SlotNumber, + IN ULONG SlotNumber, IN PVOID Buffer, IN ULONG Offset, IN ULONG Length @@ -376,7 +376,7 @@ HalpSetPCIData( IN PBUS_HANDLER BusHandler, IN PBUS_HANDLER RootBusHandler, - IN PCI_SLOT_NUMBER SlotNumber, + IN ULONG SlotNumber, IN PVOID Buffer, IN ULONG Offset, IN ULONG Length @@ -503,7 +503,7 @@ HalpAdjustPCIResourceList(IN PBUS_HANDLER BusHandler, IN PBUS_HANDLER RootHandler, IN OUT PIO_RESOURCE_REQUIREMENTS_LIST *pResourceList); - + ULONG NTAPI HalpGetPCIIntOnISABus(IN PBUS_HANDLER BusHandler, @@ -518,7 +518,7 @@ IN PBUS_HANDLER RootHandler, IN PCI_SLOT_NUMBER SlotNumber, IN PPCI_COMMON_CONFIG PciData); - + VOID NTAPI HalpPCIISALine2Pin(IN PBUS_HANDLER BusHandler, @@ -533,7 +533,7 @@ IN PBUS_HANDLER RootHandler, IN PCI_SLOT_NUMBER PciSlot, OUT PSUPPORTED_RANGE *Range); - + VOID NTAPI HalpInitBusHandler( @@ -590,7 +590,7 @@ NTAPI HalpTranslateSystemBusAddress( IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, + IN PBUS_HANDLER RootHandler, IN PHYSICAL_ADDRESS BusAddress, IN OUT PULONG AddressSpace, OUT PPHYSICAL_ADDRESS TranslatedAddress @@ -600,7 +600,7 @@ NTAPI HalpTranslateIsaBusAddress( IN PBUS_HANDLER BusHandler, - IN PBUS_HANDLER RootHandler, + IN PBUS_HANDLER RootHandler, IN PHYSICAL_ADDRESS BusAddress, IN OUT PULONG AddressSpace, OUT PPHYSICAL_ADDRESS TranslatedAddress @@ -616,7 +616,7 @@ OUT PKIRQL Irql, OUT PKAFFINITY Affinity ); - + extern ULONG HalpBusType; extern BOOLEAN HalpPCIConfigInitialized; extern BUS_HANDLER HalpFakePciBusHandler; Modified: trunk/reactos/hal/halx86/legacy/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bus/pcib… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bus/pcibus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bus/pcibus.c [iso-8859-1] Sun Sep 21 16:00:27 2014 @@ -343,15 +343,17 @@ NTAPI HalpGetPCIData(IN PBUS_HANDLER BusHandler, IN PBUS_HANDLER RootHandler, - IN PCI_SLOT_NUMBER Slot, + IN ULONG SlotNumber, IN PVOID Buffer, IN ULONG Offset, IN ULONG Length) { + PCI_SLOT_NUMBER Slot; UCHAR PciBuffer[PCI_COMMON_HDR_LENGTH]; PPCI_COMMON_CONFIG PciConfig = (PPCI_COMMON_CONFIG)PciBuffer; ULONG Len = 0; + Slot.u.AsULONG = SlotNumber; #ifdef SARCH_XBOX /* Trying to get PCI config data from devices 0:0:1 and 0:0:2 will completely * hang the Xbox. Also, the device number doesn't seem to be decoded for the @@ -433,15 +435,17 @@ NTAPI HalpSetPCIData(IN PBUS_HANDLER BusHandler, IN PBUS_HANDLER RootHandler, - IN PCI_SLOT_NUMBER Slot, + IN ULONG SlotNumber, IN PVOID Buffer, IN ULONG Offset, IN ULONG Length) { + PCI_SLOT_NUMBER Slot; UCHAR PciBuffer[PCI_COMMON_HDR_LENGTH]; PPCI_COMMON_CONFIG PciConfig = (PPCI_COMMON_CONFIG)PciBuffer; ULONG Len = 0; + Slot.u.AsULONG = SlotNumber; #ifdef SARCH_XBOX /* Trying to get PCI config data from devices 0:0:1 and 0:0:2 will completely * hang the Xbox. Also, the device number doesn't seem to be decoded for the Modified: trunk/reactos/hal/halx86/legacy/bussupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/legacy/bussupp.… ============================================================================== --- trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/legacy/bussupp.c [iso-8859-1] Sun Sep 21 16:00:27 2014 @@ -208,11 +208,11 @@ sizeof(PCIPBUSDATA)); /* Set it up */ - Bus->GetBusData = (PGETSETBUSDATA)HalpGetPCIData; - Bus->SetBusData = (PGETSETBUSDATA)HalpSetPCIData; - Bus->GetInterruptVector = (PGETINTERRUPTVECTOR)HalpGetPCIIntOnISABus; - Bus->AdjustResourceList = (PADJUSTRESOURCELIST)HalpAdjustPCIResourceList; - Bus->AssignSlotResources = (PASSIGNSLOTRESOURCES)HalpAssignPCISlotResources; + Bus->GetBusData = HalpGetPCIData; + Bus->SetBusData = HalpSetPCIData; + Bus->GetInterruptVector = HalpGetPCIIntOnISABus; + Bus->AdjustResourceList = HalpAdjustPCIResourceList; + Bus->AssignSlotResources = HalpAssignPCISlotResources; Bus->BusAddresses->Dma.Limit = 0; /* Get our custom bus data */ @@ -221,12 +221,12 @@ /* Setup custom bus data */ BusData->CommonData.Tag = PCI_DATA_TAG; BusData->CommonData.Version = PCI_DATA_VERSION; - BusData->CommonData.ReadConfig = (PciReadWriteConfig)HalpReadPCIConfig; - BusData->CommonData.WriteConfig = (PciReadWriteConfig)HalpWritePCIConfig; - BusData->CommonData.Pin2Line = (PciPin2Line)HalpPCIPin2ISALine; - BusData->CommonData.Line2Pin = (PciLine2Pin)HalpPCIISALine2Pin; + BusData->CommonData.ReadConfig = HalpReadPCIConfig; + BusData->CommonData.WriteConfig = HalpWritePCIConfig; + BusData->CommonData.Pin2Line = HalpPCIPin2ISALine; + BusData->CommonData.Line2Pin = HalpPCIISALine2Pin; BusData->MaxDevice = PCI_MAX_DEVICES; - BusData->GetIrqRange = (PciIrqRange)HalpGetISAFixedPCIIrq; + BusData->GetIrqRange = HalpGetISAFixedPCIIrq; /* Initialize the bitmap */ RtlInitializeBitMap(&BusData->DeviceConfigured, BusData->ConfiguredBits, 256);

1 0

[jgardou] 64211: [NTOS/MM] Commit what I got so far, including: - A very (very) basic balancer for the paged pool, simply sweeping all the pages of it and ageing the pages as they're run over - A p...
by jgardou＠svn.reactos.org 21 Sep '14

21 Sep '14

Author: jgardou Date: Sun Sep 21 12:49:24 2014 New Revision: 64211 URL: http://svn.reactos.org/svn/reactos?rev=64211&view=rev Log: [NTOS/MM] Commit what I got so far, including: - A very (very) basic balancer for the paged pool, simply sweeping all the pages of it and ageing the pages as they're run over - A page writer thread writing unreferenced pages to the pagefile. - Support for reading from the pagefile in the ARM3 page fault handler - Popping a page from the standby list when running out of free pages - Various fixes here and there Enjoy! Modified: branches/TransitionPte/ntoskrnl/include/internal/mm.h branches/TransitionPte/ntoskrnl/mm/ARM3/miarm.h branches/TransitionPte/ntoskrnl/mm/ARM3/pagfault.c branches/TransitionPte/ntoskrnl/mm/ARM3/pfnlist.c branches/TransitionPte/ntoskrnl/mm/ARM3/section.c branches/TransitionPte/ntoskrnl/mm/ARM3/virtual.c branches/TransitionPte/ntoskrnl/mm/balance.c branches/TransitionPte/ntoskrnl/mm/mminit.c branches/TransitionPte/ntoskrnl/mm/pagefile.c Modified: branches/TransitionPte/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/include/… ============================================================================== --- branches/TransitionPte/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ branches/TransitionPte/ntoskrnl/include/internal/mm.h [iso-8859-1] Sun Sep 21 12:49:24 2014 @@ -373,6 +373,7 @@ extern MMPFNLIST MmFreePageListHead; extern MMPFNLIST MmStandbyPageListHead; extern MMPFNLIST MmModifiedPageListHead; +extern MMPFNLIST MmModifiedPageListByColor[1]; extern MMPFNLIST MmModifiedNoWritePageListHead; typedef struct _MM_MEMORY_CONSUMER @@ -652,8 +653,27 @@ NTAPI MiReadPageFile( _In_ PFN_NUMBER Page, - _In_ ULONG PageFileIndex, - _In_ ULONG_PTR PageFileOffset); + _In_ const MMPTE* PointerPte +); + +NTSTATUS +NTAPI +MiWritePageFile( + _In_ PFN_NUMBER Page, + _In_ const MMPTE* PointerPte +); + +VOID +NTAPI +MiFreePageFileEntry( + _In_ PMMPTE PointerPte +); + +NTSTATUS +NTAPI +MiReservePageFileEntry( + _Out_ PMMPTE PointerPte +); /* process.c ****************************************************************/ Modified: branches/TransitionPte/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/mm/ARM3/… ============================================================================== --- branches/TransitionPte/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ branches/TransitionPte/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sun Sep 21 12:49:24 2014 @@ -687,6 +687,7 @@ extern PKEVENT MiHighPagedPoolEvent; extern PKEVENT MiLowNonPagedPoolEvent; extern PKEVENT MiHighNonPagedPoolEvent; +extern KEVENT MpwThreadEvent; extern PFN_NUMBER MmLowMemoryThreshold; extern PFN_NUMBER MmHighMemoryThreshold; extern PFN_NUMBER MiLowPagedPoolThreshold; @@ -695,6 +696,7 @@ extern PFN_NUMBER MiHighNonPagedPoolThreshold; extern PFN_NUMBER MmMinimumFreePages; extern PFN_NUMBER MmPlentyFreePages; +extern ULONG_PTR MmTotalPagesForPagingFile; extern SIZE_T MmMinimumStackCommitInBytes; extern PFN_COUNT MiExpansionPoolPagesInitialCharge; extern PFN_NUMBER MmResidentAvailablePages; Modified: branches/TransitionPte/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/mm/ARM3/… ============================================================================== --- branches/TransitionPte/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ branches/TransitionPte/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sun Sep 21 12:49:24 2014 @@ -583,7 +583,7 @@ ASSERT(PointerPte->u.Hard.Valid == 0); /* Assert we have enough pages */ - ASSERT(MmAvailablePages >= 32); + ASSERT(MmAvailablePages != 0); #if MI_TRACE_PFNS if (UserPdeFault) MI_SET_USAGE(MI_USAGE_PAGE_TABLE); @@ -688,7 +688,8 @@ IN PMMPTE PointerPte, IN PMMPTE PointerProtoPte, IN KIRQL OldIrql, - IN PMMPFN* LockedProtoPfn) + IN PMMPFN* LockedProtoPfn, + PVOID InPageBlock) { MMPTE TempPte; PMMPTE OriginalPte, PageTablePte; @@ -799,6 +800,10 @@ /* Reset the protection if needed */ if (OriginalProtection) Protection = MM_ZERO_ACCESS; + + /* Let waiters go ahead */ + if (InPageBlock) + KeSetEvent(InPageBlock, IO_NO_INCREMENT, FALSE); /* Return success */ ASSERT(PointerPte == MiAddressToPte(Address)); @@ -816,26 +821,30 @@ ULONG Color; PFN_NUMBER Page; NTSTATUS Status; - MMPTE TempPte = *PointerPte; - KEVENT Event; + MMPTE PageFilePte = *PointerPte, TempPte; PMMPFN Pfn1; - ULONG PageFileIndex = TempPte.u.Soft.PageFileLow; - ULONG_PTR PageFileOffset = TempPte.u.Soft.PageFileHigh; + + DPRINT1("Serving page fault for PTE %p (%x).\n", PointerPte, PageFilePte.u.Long); /* Things we don't support yet */ - ASSERT(CurrentProcess > HYDRA_PROCESS); ASSERT(*OldIrql != MM_NOIRQL); /* We must hold the PFN lock */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); /* Some sanity checks */ - ASSERT(TempPte.u.Hard.Valid == 0); - ASSERT(TempPte.u.Soft.PageFileHigh != 0); - ASSERT(TempPte.u.Soft.PageFileHigh != MI_PTE_LOOKUP_NEEDED); + ASSERT(PageFilePte.u.Hard.Valid == 0); + ASSERT(PageFilePte.u.Soft.Transition == 0); + ASSERT(PageFilePte.u.Soft.Prototype == 0); + ASSERT(PageFilePte.u.Soft.PageFileHigh != 0); + ASSERT(PageFilePte.u.Soft.PageFileHigh != MI_PTE_LOOKUP_NEEDED); /* Get any page, it will be overwritten */ - Color = MI_GET_NEXT_PROCESS_COLOR(CurrentProcess); + if (CurrentProcess > HYDRA_PROCESS) + Color = MI_GET_NEXT_PROCESS_COLOR(CurrentProcess); + else + Color = MI_GET_NEXT_COLOR(); + Page = MiRemoveAnyPage(Color); /* Initialize this PFN */ @@ -847,14 +856,13 @@ ASSERT(Pfn1->u3.e1.ReadInProgress == 0); ASSERT(Pfn1->u3.e1.WriteInProgress == 0); - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Pfn1->u1.Event = &Event; + /* Set NULL event */ + Pfn1->u1.Event = NULL; Pfn1->u3.e1.ReadInProgress = 1; /* We must write the PTE now as the PFN lock will be released while performing the IO operation */ + TempPte.u.Long = 0; TempPte.u.Soft.Transition = 1; - TempPte.u.Soft.PageFileLow = 0; - TempPte.u.Soft.Prototype = 0; TempPte.u.Trans.PageFrameNumber = Page; MI_WRITE_INVALID_PTE(PointerPte, TempPte); @@ -863,15 +871,25 @@ KeReleaseQueuedSpinLock(LockQueuePfnLock, *OldIrql); /* Do the paging IO */ - Status = MiReadPageFile(Page, PageFileIndex, PageFileOffset); + Status = MiReadPageFile(Page, &PageFilePte); /* Lock the PFN database again */ *OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); /* Nobody should have changed that while we were not looking */ - ASSERT(Pfn1->u1.Event == &Event); ASSERT(Pfn1->u3.e1.ReadInProgress == 1); ASSERT(Pfn1->u3.e1.WriteInProgress == 0); + + /* But maybe someone began waiting on us */ + if (Pfn1->u1.Event != NULL) + { + DPRINT1("The page got a waiter!\n"); + /* Waiters gonna wait */ + KeSetEvent(Pfn1->u1.Event, IO_NO_INCREMENT, FALSE); + Pfn1->u1.Event = NULL; + } + + DPRINT1("Pagefile read finished. Status: 0x%08x.\n", Status); if (!NT_SUCCESS(Status)) { @@ -879,38 +897,60 @@ ASSERT(FALSE); Pfn1->u4.InPageError = 1; Pfn1->u1.ReadStatus = Status; + Status = STATUS_IN_PAGE_ERROR; + } + else + { + /* This is a success status */ + Status = STATUS_PAGE_FAULT_PAGING_FILE; } /* This is now a nice and normal PFN */ - Pfn1->u1.Event = NULL; Pfn1->u3.e1.ReadInProgress = 0; - /* And the PTE can finally be valid */ - MI_MAKE_HARDWARE_PTE(&TempPte, PointerPte, TempPte.u.Trans.Protection, Page); + /* Check if this is a kernel or user address */ + if (PointerPte <= MiHighestUserPte) + { + /* Build the user PTE */ + MI_MAKE_HARDWARE_PTE_USER(&TempPte, + PointerPte, + PageFilePte.u.Soft.Protection, + Page); + } + else + { + /* Build the kernel PTE */ + MI_MAKE_HARDWARE_PTE(&TempPte, + PointerPte, + PageFilePte.u.Soft.Protection, + Page); + } + + /* Write it */ MI_WRITE_VALID_PTE(PointerPte, TempPte); - - /* Waiters gonna wait */ - KeSetEvent(&Event, IO_NO_INCREMENT, FALSE); return Status; } NTSTATUS NTAPI -MiResolveTransitionFault(IN PVOID FaultingAddress, - IN PMMPTE PointerPte, - IN PEPROCESS CurrentProcess, - IN KIRQL OldIrql, - OUT PVOID *InPageBlock) +MiResolveTransitionFault( + _In_ BOOLEAN StoreInstruction, + _In_ PVOID FaultingAddress, + _In_ PMMPTE PointerPte, + _In_ PEPROCESS CurrentProcess, + _In_ KIRQL OldIrql, + _In_ PVOID *InPageBlock) { PFN_NUMBER PageFrameIndex; PMMPFN Pfn1; MMPTE TempPte; PMMPTE PointerToPteForProtoPage; - DPRINT1("Transition fault on 0x%p with PTE 0x%p in process %s\n", - FaultingAddress, PointerPte, CurrentProcess->ImageFileName); - - /* Windowss does this check */ + + DPRINT("Transition fault on 0x%p with PTE 0x%p in process %s\n", + FaultingAddress, PointerPte, CurrentProcess ? CurrentProcess->ImageFileName : "Kernel"); + + /* Windows does this check */ ASSERT(*InPageBlock == NULL); /* ARM3 doesn't support this path */ @@ -934,25 +974,52 @@ ASSERT(Pfn1->u4.InPageError == 0); /* See if we should wait before terminating the fault */ - if (Pfn1->u3.e1.ReadInProgress == 1) - { - DPRINT1("The page is currently being read!\n"); - ASSERT(Pfn1->u1.Event != NULL); - *InPageBlock = Pfn1->u1.Event; - if (PointerPte == Pfn1->PteAddress) - { - DPRINT1("And this if for this particular PTE.\n"); - /* The PTE will be made valid by the thread serving the fault */ - return STATUS_SUCCESS; // FIXME: Maybe something more descriptive - } + if ((Pfn1->u3.e1.WriteInProgress == 1) || (Pfn1->u3.e1.ReadInProgress == 1)) + { + KEVENT IoEvent; + DPRINT1("The page is currently being written to or read!\n"); + + /* Both of them, it's not possible */ + ASSERT(((Pfn1->u3.e1.ReadInProgress == 0) && (Pfn1->u3.e1.WriteInProgress == 1)) || + ((Pfn1->u3.e1.ReadInProgress == 1) && (Pfn1->u3.e1.WriteInProgress == 0))); + + KeInitializeEvent(&IoEvent, NotificationEvent, FALSE); + *InPageBlock = Pfn1->u1.Event; + Pfn1->u1.Event = &IoEvent; + + /* + * Mark it as unmodified. + * The page-out thread will put it back in the standby list + * and we will be able to start anew for this PTE + */ + if ((Pfn1->u3.e1.WriteInProgress) && (!StoreInstruction)) + Pfn1->u3.e1.Modified = 0; + + /* Release the lock so the writer can finish */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + /* Wait for it to really finish */ + KeWaitForSingleObject(&IoEvent, WrPageIn, KernelMode, FALSE, NULL); + + /* Get it again */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Read the PTE again */ + TempPte = *PointerPte; + if (TempPte.u.Hard.Valid == 1) + { + /* Someone did it while we were not looking. */ + return STATUS_PAGE_FAULT_TRANSITION; + } + /* Otherwise the state of this PTE must still be the same */ + ASSERT(TempPte.u.Soft.Transition == 1); + ASSERT(TempPte.u.Soft.Prototype == 0); + ASSERT(TempPte.u.Trans.PageFrameNumber == PageFrameIndex); } /* Windows checks there's some free pages and this isn't an in-page error */ ASSERT(MmAvailablePages > 0); ASSERT(Pfn1->u4.InPageError == 0); - - /* ReactOS checks for this */ - ASSERT(MmAvailablePages > 32); /* Was this a transition page in the valid list, or free/zero list? */ if (Pfn1->u3.e1.PageLocation == ActiveAndValid) @@ -1066,7 +1133,8 @@ PointerPte, PointerProtoPte, OldIrql, - OutPfn); + OutPfn, + NULL); } /* Make sure there's some protection mask */ @@ -1125,18 +1193,25 @@ { /* Resolve the transition fault */ ASSERT(OldIrql != MM_NOIRQL); - Status = MiResolveTransitionFault(Address, + Status = MiResolveTransitionFault(StoreInstruction, + Address, PointerProtoPte, Process, OldIrql, &InPageBlock); ASSERT(NT_SUCCESS(Status)); } + else if (TempPte.u.Soft.PageFileHigh != 0) + { + Status = MiResolvePageFileFault(StoreInstruction, + Address, + PointerProtoPte, + Process, + &OldIrql); + ASSERT(NT_SUCCESS(Status)); + } else { - /* We also don't support paged out pages */ - ASSERT(TempPte.u.Soft.PageFileHigh == 0); - /* Resolve the demand zero fault */ Status = MiResolveDemandZeroFault(Address, PointerProtoPte, @@ -1152,7 +1227,8 @@ PointerPte, PointerProtoPte, OldIrql, - OutPfn); + OutPfn, + InPageBlock); } NTSTATUS @@ -1173,9 +1249,8 @@ PMMPFN Pfn1, OutPfn = NULL; PFN_NUMBER PageFrameIndex; PFN_COUNT PteCount, ProcessedPtes; - DPRINT("ARM3 Page Fault Dispatcher for address: %p in process: %p\n", - Address, - Process); + DPRINT("ARM3 Page Fault Dispatcher for address: %p (PTE %p) in process: %p\n", + Address, PointerPte, Process); /* Make sure the addresses are ok */ ASSERT(PointerPte == MiAddressToPte(Address)); @@ -1283,8 +1358,49 @@ ASSERT(Pfn1->u3.e1.PageLocation != ActiveAndValid); /* Should not yet happen in ReactOS */ - ASSERT(Pfn1->u3.e1.ReadInProgress == 0); ASSERT(Pfn1->u4.InPageError == 0); + + if ((Pfn1->u3.e1.ReadInProgress == 1) || (Pfn1->u3.e1.WriteInProgress == 1)) + { + KEVENT IoEvent; + PKEVENT PageEvent; + DPRINT1("The page is currently being written to or read!\n"); + + /* Both of them, it's not possible */ + ASSERT(((Pfn1->u3.e1.ReadInProgress == 0) && (Pfn1->u3.e1.WriteInProgress == 1)) || + ((Pfn1->u3.e1.ReadInProgress == 1) && (Pfn1->u3.e1.WriteInProgress == 0))); + + KeInitializeEvent(&IoEvent, NotificationEvent, FALSE); + PageEvent = Pfn1->u1.Event; + Pfn1->u1.Event = &IoEvent; + + /* + * Mark it as unmodified. + * The page-out thread will put it back in the standby list + * and we will be able to start anew for this PTE + */ + if (Pfn1->u3.e1.WriteInProgress) + Pfn1->u3.e1.Modified = 0; + + /* Release the lock so the writer can finish */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, LockIrql); + + /* Wait for it to really finish */ + KeWaitForSingleObject(&IoEvent, WrPageIn, KernelMode, FALSE, NULL); + + /* Get it again */ + LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Read the PTE again */ + TempPte = *PointerProtoPte; + + /* Maybe someone else was also waiting */ + if (PageEvent) + KeSetEvent(PageEvent, IO_NO_INCREMENT, FALSE); + + /* And re-loop */ + continue; + } /* Get the page */ MiUnlinkPageFromList(Pfn1); @@ -1337,7 +1453,8 @@ PointerPte, PointerProtoPte, LockIrql, - &OutPfn); + &OutPfn, + NULL); /* THIS RELEASES THE PFN LOCK! */ break; @@ -1390,14 +1507,14 @@ { /* We had a locked PFN, so acquire the PFN lock to dereference it */ ASSERT(PointerProtoPte != NULL); - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); /* Dereference the locked PFN */ MiDereferencePfnAndDropLockCount(OutPfn); ASSERT(OutPfn->u3.e2.ReferenceCount >= 1); /* And now release the lock */ - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, LockIrql); } /* Complete this as a transition fault */ @@ -1416,7 +1533,12 @@ LockIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); /* Resolve */ - Status = MiResolveTransitionFault(Address, PointerPte, Process, LockIrql, &InPageBlock); + Status = MiResolveTransitionFault(StoreInstruction, + Address, + PointerPte, + Process, + LockIrql, + &InPageBlock); NT_ASSERT(NT_SUCCESS(Status)); @@ -1425,8 +1547,8 @@ if (InPageBlock != NULL) { - /* The page is being paged in by another process */ - KeWaitForSingleObject(InPageBlock, WrPageIn, KernelMode, FALSE, NULL); + /* We must wake the blocked threads */ + KeSetEvent(InPageBlock, IO_NO_INCREMENT, FALSE); } ASSERT(OldIrql == KeGetCurrentIrql()); @@ -1821,9 +1943,6 @@ } else { - /* We don't implement transition PTEs */ - ASSERT(TempPte.u.Soft.Transition == 0); - /* Check for no-access PTE */ if (TempPte.u.Soft.Protection == MM_NOACCESS) { @@ -2090,7 +2209,7 @@ OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); /* Make sure we have enough pages */ - ASSERT(MmAvailablePages >= 32); + ASSERT(MmAvailablePages != 0); /* Try to get a zero page */ MI_SET_USAGE(MI_USAGE_PEB_TEB); Modified: branches/TransitionPte/ntoskrnl/mm/ARM3/pfnlist.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/mm/ARM3/… ============================================================================== --- branches/TransitionPte/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] (original) +++ branches/TransitionPte/ntoskrnl/mm/ARM3/pfnlist.c [iso-8859-1] Sun Sep 21 12:49:24 2014 @@ -36,7 +36,7 @@ ULONG MmSystemPageColor; ULONG MmTransitionSharedPages; -ULONG MmTotalPagesForPagingFile; +ULONG_PTR MmTotalPagesForPagingFile; MMPFNLIST MmZeroedPageListHead = {0, ZeroedPageList, LIST_HEAD, LIST_HEAD}; MMPFNLIST MmFreePageListHead = {0, FreePageList, LIST_HEAD, LIST_HEAD}; @@ -266,7 +266,6 @@ } /* Decrease transition page counter */ - ASSERT(Pfn->u3.e1.PrototypePte == 1); /* Only supported ARM3 case */ MmTransitionSharedPages--; /* One less page */ @@ -287,6 +286,9 @@ /* Decrement the counters */ ListHead->Total--; MmTotalPagesForPagingFile--; + + if (MmTotalPagesForPagingFile == 0) + KeClearEvent(&MpwThreadEvent); /* Pick the correct colored list */ ListHead = &MmModifiedPageListByColor[0]; @@ -477,12 +479,89 @@ return PageIndex; } +static +PFN_NUMBER +NTAPI +MiPopPageFromStandbyList(void) +{ + unsigned i; + PFN_NUMBER PageFrameIndex; + PMMPFN Pfn1; + PMMPTE PointerPte, SysPte, PteTable; + MMPTE PdePte; + + /* Make sure PFN lock is held and we have pages */ + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + ASSERT(MmAvailablePages != 0); + + /* This should be called in last resort if there are no more free pages */ + ASSERT(MmZeroedPageListHead.Total == 0); + ASSERT(MmFreePageListHead.Total == 0); + + /* Go by priority */ + for (i = 0; i < 8; i++) + { + /* Get the oldest one */ + PageFrameIndex = MmStandbyPageListByPriority[i].Blink; + if (PageFrameIndex != LIST_HEAD) + break; + } + + /* There are no free pages but still available ones, so this must be here */ + ASSERT(PageFrameIndex != LIST_HEAD); + + /* Get the PFN */ + Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); + + DPRINT1("Popping page %x from standbylist (PTE %p).\n", + PageFrameIndex, Pfn1->PteAddress); + + /* Sanity checks */ + ASSERT(Pfn1->u3.e1.PageLocation == StandbyPageList); + ASSERT(Pfn1->u3.e1.Modified == 0); + + /* Get a PTE to map the page directory */ + SysPte = MiReserveSystemPtes(1, SystemPteSpace); + ASSERT(SysPte != NULL); + + /* Build it */ + MI_MAKE_HARDWARE_PTE_KERNEL(&PdePte, + SysPte, + MM_READWRITE, + Pfn1->u4.PteFrame); + /* And map it */ + MI_WRITE_VALID_PTE(SysPte, PdePte); + PteTable = MiPteToAddress(SysPte); + + /* Finally get a pointer to the PTE this page represents */ + PointerPte = &PteTable[MiAddressToPteOffset(MiPteToAddress(Pfn1->PteAddress))]; + + /* Other sanity checks */ + ASSERT(PointerPte->u.Hard.Valid == 0); + ASSERT(PointerPte->u.Soft.Transition == 1); + + /* Restore the PTE to its original value */ + *PointerPte = Pfn1->OriginalPte; + + /* We can get rid of this */ + MiReleaseSystemPtes(SysPte, 1, SystemPteSpace); + + /* And dereference the page table frame */ + MiDecrementShareCount(MI_PFN_ELEMENT(Pfn1->u4.PteFrame), Pfn1->u4.PteFrame); + + /* Unlink */ + MiUnlinkPageFromList(Pfn1); + + return PageFrameIndex; +} + PFN_NUMBER NTAPI MiRemoveAnyPage(IN ULONG Color) { PFN_NUMBER PageIndex; PMMPFN Pfn1; + BOOLEAN FromStandbyList = FALSE; /* Make sure PFN lock is held and we have pages */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); @@ -507,23 +586,27 @@ ASSERT_LIST_INVARIANT(&MmZeroedPageListHead); PageIndex = MmZeroedPageListHead.Flink; Color = PageIndex & MmSecondaryColorMask; - ASSERT(PageIndex != LIST_HEAD); if (PageIndex == LIST_HEAD) { - /* FIXME: Should check the standby list */ ASSERT(MmZeroedPageListHead.Total == 0); + /* Pop one page from the standby list and try again */ + PageIndex = MiPopPageFromStandbyList(); + FromStandbyList = TRUE; + ASSERT(PageIndex != LIST_HEAD); } } } } /* Remove the page from its list */ - PageIndex = MiRemovePageByColor(PageIndex, Color); + if (!FromStandbyList) + PageIndex = MiRemovePageByColor(PageIndex, Color); /* Sanity checks */ Pfn1 = MI_PFN_ELEMENT(PageIndex); ASSERT((Pfn1->u3.e1.PageLocation == FreePageList) || - (Pfn1->u3.e1.PageLocation == ZeroedPageList)); + (Pfn1->u3.e1.PageLocation == ZeroedPageList) || + (Pfn1->u3.e1.PageLocation == StandbyPageList)); ASSERT(Pfn1->u3.e2.ReferenceCount == 0); ASSERT(Pfn1->u2.ShareCount == 0); ASSERT_LIST_INVARIANT(&MmFreePageListHead); @@ -540,6 +623,7 @@ PFN_NUMBER PageIndex; PMMPFN Pfn1; BOOLEAN Zero = FALSE; + BOOLEAN FromStandbyList = FALSE; /* Make sure PFN lock is held and we have pages */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); @@ -567,11 +651,13 @@ ASSERT_LIST_INVARIANT(&MmFreePageListHead); PageIndex = MmFreePageListHead.Flink; Color = PageIndex & MmSecondaryColorMask; - ASSERT(PageIndex != LIST_HEAD); if (PageIndex == LIST_HEAD) { - /* FIXME: Should check the standby list */ ASSERT(MmZeroedPageListHead.Total == 0); + /* Pop one page from the standby list and try again */ + PageIndex = MiPopPageFromStandbyList(); + FromStandbyList = TRUE; + ASSERT(PageIndex != LIST_HEAD); } } } @@ -584,10 +670,12 @@ /* Sanity checks */ Pfn1 = MI_PFN_ELEMENT(PageIndex); ASSERT((Pfn1->u3.e1.PageLocation == FreePageList) || - (Pfn1->u3.e1.PageLocation == ZeroedPageList)); + (Pfn1->u3.e1.PageLocation == ZeroedPageList)|| + (Pfn1->u3.e1.PageLocation == StandbyPageList)); /* Remove the page from its list */ - PageIndex = MiRemovePageByColor(PageIndex, Color); + if (!FromStandbyList) + PageIndex = MiRemovePageByColor(PageIndex, Color); ASSERT(Pfn1 == MI_PFN_ELEMENT(PageIndex)); /* Zero it, if needed */ @@ -744,7 +832,6 @@ Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); ASSERT(Pfn1->u4.MustBeCached == 0); ASSERT(Pfn1->u3.e2.ReferenceCount == 0); - ASSERT(Pfn1->u3.e1.PrototypePte == 1); ASSERT(Pfn1->u3.e1.Rom != 1); /* One more transition page on a list */ @@ -979,9 +1066,8 @@ } else if (ListName == ModifiedPageList) { - /* In ARM3, page must be destined for page file, and not yet written out */ + /* In ARM3, page must be destined for page file */ ASSERT(Pfn1->OriginalPte.u.Soft.Prototype == 0); - ASSERT(Pfn1->OriginalPte.u.Soft.PageFileHigh == 0); /* One more transition page */ MmTransitionSharedPages++; @@ -989,7 +1075,8 @@ /* Increment the number of per-process modified pages */ PsGetCurrentProcess()->ModifiedPageCount++; - /* FIXME: Wake up modified page writer if there are not enough free pages */ + /* Wake the page writer thread */ + KeSetEvent(&MpwThreadEvent, IO_NO_INCREMENT, FALSE); } else if (ListName == ModifiedNoWritePageList) { @@ -1059,6 +1146,9 @@ PageFrameIndex = PFN_FROM_PTE(PointerPtePte); ASSERT(PageFrameIndex != 0); Pfn1->u4.PteFrame = PageFrameIndex; + + /* HACK until we get working sets rolling */ + Pfn1->Wsle.u1.e1.Age = 0; /* Increase its share count so we don't get rid of it */ Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); @@ -1270,32 +1360,8 @@ /* PFN lock must be held */ ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); - if (Pfn1->u3.e2.ReferenceCount == 1) - { - /* Is there still a PFN for this page? */ - if (MI_IS_PFN_DELETED(Pfn1) == TRUE) - { - /* Clear the last reference */ - Pfn1->u3.e2.ReferenceCount = 0; - ASSERT(Pfn1->OriginalPte.u.Soft.Prototype == 0); - - /* Mark the page temporarily as valid, we're going to make it free soon */ - Pfn1->u3.e1.PageLocation = ActiveAndValid; - - /* Bring it back into the free list */ - MiInsertPageInFreeList(PageFrameIndex); - } - else - { - /* PFN not yet deleted, drop a ref count */ - MiDecrementReferenceCount(Pfn1, PageFrameIndex); - } - } - else - { - /* Otherwise, just drop the reference count */ - InterlockedDecrement16((PSHORT)&Pfn1->u3.e2.ReferenceCount); - } + /* Drop a ref count */ + MiDecrementReferenceCount(Pfn1, PageFrameIndex); } } @@ -1338,6 +1404,13 @@ /* Did someone set the delete flag? */ if (MI_IS_PFN_DELETED(Pfn1)) { + /* Did we have a Pagefile entry for it */ + if ((Pfn1->OriginalPte.u.Soft.Prototype == 0) + && (Pfn1->OriginalPte.u.Soft.PageFileHigh != 0)) + { + /* Yes. Set it free */ + MiFreePageFileEntry(&Pfn1->OriginalPte); + } /* Insert it into the free list, there's nothing left to do */ MiInsertPageInFreeList(PageFrameIndex); return; Modified: branches/TransitionPte/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/mm/ARM3/… ============================================================================== --- branches/TransitionPte/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ branches/TransitionPte/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Sun Sep 21 12:49:24 2014 @@ -680,25 +680,55 @@ PageFrameIndex = PFN_FROM_PTE(&TempPte); Pfn1 = MI_PFN_ELEMENT(PageFrameIndex); - /* As this is a paged-backed section, nobody should reference it anymore (no cache or whatever) */ - ASSERT(Pfn1->u3.ReferenceCount == 0); - - /* And it should be in standby or modified list */ - ASSERT((Pfn1->u3.e1.PageLocation == ModifiedPageList) || (Pfn1->u3.e1.PageLocation == StandbyPageList)); - - /* Unlink it and put it back in free list */ - MiUnlinkPageFromList(Pfn1); - - /* Temporarily mark this as active and make it free again */ - Pfn1->u3.e1.PageLocation = ActiveAndValid; - MI_SET_PFN_DELETED(Pfn1); - - MiInsertPageInFreeList(PageFrameIndex); + if (Pfn1->u3.e1.WriteInProgress == 1) + { + KEVENT WriteEvent; + + DPRINT1("Setting the page free while it is being paged out!\n"); + + /* Only the page writer thread should hold a reference to it */ + ASSERT(Pfn1->u3.ReferenceCount == 1); + + /* Set the page event */ + KeInitializeEvent(&WriteEvent, NotificationEvent, FALSE); + /* We must be the only ones waiting */ + ASSERT(Pfn1->u1.Event == NULL); + Pfn1->u1.Event = &WriteEvent; + + /* Tell the page-out thread to abort */ + Pfn1->u3.e1.WriteInProgress = 0; + /* We canceled the write operation, so the page-write-thread will simply dereference + * the Pfn. It has no way to know whether the page will be re-used again (page fault case) + * or if it should be made free. So mark it as deleted here */ + MI_SET_PFN_DELETED(Pfn1); + + /* Let the writer thread finish and go along */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + KeWaitForSingleObject(&WriteEvent, FreePage, KernelMode, FALSE, NULL); + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + } + else + { + /* As this is a paged-backed section, nobody should reference it anymore (no cache or whatever) */ + ASSERT(Pfn1->u3.ReferenceCount == 0); + + /* And it should be in standby or modified list */ + ASSERT((Pfn1->u3.e1.PageLocation == ModifiedPageList) || + (Pfn1->u3.e1.PageLocation == StandbyPageList)); + + /* Unlink it and temporarily take a reference */ + MiUnlinkPageFromList(Pfn1); + Pfn1->u3.e2.ReferenceCount++; + + /* This will put it back in free list and clean up properly */ + MI_SET_PFN_DELETED(Pfn1); + MiDecrementReferenceCount(Pfn1, PageFrameIndex); + } } else if (TempPte.u.Soft.PageFileHigh != 0) { - /* Should not happen for now */ - ASSERT(FALSE); + /* There isn't much to do */ + MiFreePageFileEntry(&TempPte); } } else Modified: branches/TransitionPte/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/mm/ARM3/… ============================================================================== --- branches/TransitionPte/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ branches/TransitionPte/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sun Sep 21 12:49:24 2014 @@ -317,7 +317,6 @@ { /* As always, only handle current ARM3 scenarios */ ASSERT(PointerPte->u.Soft.Prototype == 0); - ASSERT(PointerPte->u.Soft.Transition == 0); /* Normally this is one possibility -- freeing a valid page */ if (PointerPte->u.Hard.Valid) @@ -345,6 +344,57 @@ /* Decrement the page table too */ MiDecrementShareCount(Pfn2, PageTableIndex); + + /* Release the PFN database */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + /* Destroy the PTE */ + MI_ERASE_PTE(PointerPte); + } + else if (PointerPte->u.Soft.Transition == 1) + { + /* Get the page PFN */ + PageFrameIndex = PFN_FROM_PTE(PointerPte); + Pfn1 = MiGetPfnEntry(PageFrameIndex); + + /* The page should be out of any working set */ + ASSERT(Pfn1->u1.WsIndex == 0); + + /* Get the page table entry */ + PageTableIndex = Pfn1->u4.PteFrame; + Pfn2 = MiGetPfnEntry(PageTableIndex); + + /* Lock the PFN database */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Delete the page */ + MI_SET_PFN_DELETED(Pfn1); + + /* Decrement the page table */ + MiDecrementShareCount(Pfn2, PageTableIndex); + + ASSERT(Pfn1->u3.e2.ReferenceCount == 0); + /* Unlink it and temporarily take a reference */ + MiUnlinkPageFromList(Pfn1); + Pfn1->u3.e2.ReferenceCount++; + + /* This will put it back in free list and clean properly up */ + MI_SET_PFN_DELETED(Pfn1); + MiDecrementReferenceCount(Pfn1, PageFrameIndex); + + /* Release the PFN database */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + /* Destroy the PTE */ + MI_ERASE_PTE(PointerPte); + } + else if (PointerPte->u.Soft.PageFileHigh != 0) + { + /* The PFN lock also protects the page files */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Pretty easy: free the page file slot and go look elsewhere */ + MiFreePageFileEntry(PointerPte); /* Release the PFN database */ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); @@ -358,10 +408,7 @@ * The only other ARM3 possibility is a demand zero page, which would * mean freeing some of the paged pool pages that haven't even been * touched yet, as part of a larger allocation. - * - * Right now, we shouldn't expect any page file information in the PTE */ - ASSERT(PointerPte->u.Soft.PageFileHigh == 0); /* Destroy the PTE */ MI_ERASE_PTE(PointerPte); @@ -407,9 +454,8 @@ /* See if the PTE is valid */ if (TempPte.u.Hard.Valid == 0) { - /* Prototype and paged out PTEs not supported yet */ + /* Prototype PTEs not supported yet */ ASSERT(TempPte.u.Soft.Prototype == 0); - ASSERT((TempPte.u.Soft.PageFileHigh == 0) || (TempPte.u.Soft.Transition == 1)); if (TempPte.u.Soft.Transition) { @@ -435,15 +481,24 @@ /* And it should be in standby or modified list */ ASSERT((Pfn1->u3.e1.PageLocation == ModifiedPageList) || (Pfn1->u3.e1.PageLocation == StandbyPageList)); - /* Unlink it and temporarily mark it as active */ + /* Unlink it and temporarily take a reference */ MiUnlinkPageFromList(Pfn1); Pfn1->u3.e2.ReferenceCount++; - Pfn1->u3.e1.PageLocation = ActiveAndValid; /* This will put it back in free list and clean properly up */ MI_SET_PFN_DELETED(Pfn1); MiDecrementReferenceCount(Pfn1, PageFrameIndex); } + return; + } + + if (TempPte.u.Soft.PageFileHigh != 0) + { + /* Release the page file entry */ + MiFreePageFileEntry(&TempPte); + + /* And that's pretty much it */ + MI_ERASE_PTE(PointerPte); return; } } @@ -475,7 +530,6 @@ } #endif /* Drop the share count on the page table */ - PointerPde = MiPteToPde(PointerPte); MiDecrementShareCount(MiGetPfnEntry(PointerPde->u.Hard.PageFrameNumber), PointerPde->u.Hard.PageFrameNumber); Modified: branches/TransitionPte/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/mm/balan… ============================================================================== --- branches/TransitionPte/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ branches/TransitionPte/ntoskrnl/mm/balance.c [iso-8859-1] Sun Sep 21 12:49:24 2014 @@ -22,22 +22,14 @@ #pragma alloc_text(INIT, MiInitBalancerThread) #endif - -/* TYPES ********************************************************************/ -typedef struct _MM_ALLOCATION_REQUEST -{ - PFN_NUMBER Page; - LIST_ENTRY ListEntry; - KEVENT Event; -} -MM_ALLOCATION_REQUEST, *PMM_ALLOCATION_REQUEST; +#define TEST_PAGING + + /* GLOBALS ******************************************************************/ MM_MEMORY_CONSUMER MiMemoryConsumers[MC_MAXIMUM]; static ULONG MiMinimumAvailablePages; static ULONG MiNrTotalPages; -static LIST_ENTRY AllocationListHead; -static KSPIN_LOCK AllocationListLock; static ULONG MiMinimumPagesPerRun; static CLIENT_ID MiBalancerThreadId; @@ -53,8 +45,6 @@ MmInitializeBalancer(ULONG NrAvailablePages, ULONG NrSystemPages) { memset(MiMemoryConsumers, 0, sizeof(MiMemoryConsumers)); - InitializeListHead(&AllocationListHead); - KeInitializeSpinLock(&AllocationListLock); MiNrTotalPages = NrAvailablePages; @@ -86,18 +76,10 @@ MiMemoryConsumers[Consumer].Trim = Trim; } -VOID -NTAPI -MiZeroPhysicalPage( - IN PFN_NUMBER PageFrameIndex -); - NTSTATUS NTAPI MmReleasePageMemoryConsumer(ULONG Consumer, PFN_NUMBER Page) { - PMM_ALLOCATION_REQUEST Request; - PLIST_ENTRY Entry; KIRQL OldIrql; if (Page == 0) @@ -110,26 +92,11 @@ { if(Consumer == MC_USER) MmRemoveLRUUserPage(Page); (void)InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); - if ((Entry = ExInterlockedRemoveHeadList(&AllocationListHead, &AllocationListLock)) == NULL) - { - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - MmDereferencePage(Page); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - } - else - { - Request = CONTAINING_RECORD(Entry, MM_ALLOCATION_REQUEST, ListEntry); - MiZeroPhysicalPage(Page); - Request->Page = Page; - KeSetEvent(&Request->Event, IO_NO_INCREMENT, FALSE); - } } - else - { - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - MmDereferencePage(Page); - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); - } + + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + MmDereferencePage(Page); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); return(STATUS_SUCCESS); } @@ -149,10 +116,13 @@ return InitialTarget; } - if (MiMemoryConsumers[Consumer].PagesUsed > MiMemoryConsumers[Consumer].PagesTarget) - { - /* Consumer page limit exceeded */ - Target = max(Target, MiMemoryConsumers[Consumer].PagesUsed - MiMemoryConsumers[Consumer].PagesTarget); + // if (MiFreeSwapPages == 0) + { + if (MiMemoryConsumers[Consumer].PagesUsed > MiMemoryConsumers[Consumer].PagesTarget) + { + /* Consumer page limit exceeded */ + Target = max(Target, MiMemoryConsumers[Consumer].PagesUsed - MiMemoryConsumers[Consumer].PagesTarget); + } } if (MmAvailablePages < MiMinimumAvailablePages) { @@ -162,13 +132,6 @@ if (Target) { - if (!InitialTarget) - { - /* If there was no initial target, - * swap at least MiMinimumPagesPerRun */ - Target = max(Target, MiMinimumPagesPerRun); - } - /* Now swap the pages out */ Status = MiMemoryConsumers[Consumer].Trim(Target, 0, &NrFreedPages); @@ -265,8 +228,9 @@ * Make sure we don't exceed our individual target. */ PagesUsed = InterlockedIncrementUL(&MiMemoryConsumers[Consumer].PagesUsed); - if (PagesUsed > MiMemoryConsumers[Consumer].PagesTarget && - !MiIsBalancerThread()) + if ((PagesUsed > MiMemoryConsumers[Consumer].PagesTarget) && + !MiIsBalancerThread() && + (MmNumberOfPagingFiles == 0)) { MmRebalanceMemoryConsumers(); } @@ -285,52 +249,6 @@ } if (Consumer == MC_USER) MmInsertLRULastUserPage(Page); *AllocatedPage = Page; - if (MmAvailablePages < MiMinimumAvailablePages) - MmRebalanceMemoryConsumers(); - return(STATUS_SUCCESS); - } - - /* - * Make sure we don't exceed global targets. - */ - if (MmAvailablePages < MiMinimumAvailablePages) - { - MM_ALLOCATION_REQUEST Request; - - if (!CanWait) - { - (void)InterlockedDecrementUL(&MiMemoryConsumers[Consumer].PagesUsed); - MmRebalanceMemoryConsumers(); - return(STATUS_NO_MEMORY); - } - - /* Insert an allocation request. */ - Request.Page = 0; - KeInitializeEvent(&Request.Event, NotificationEvent, FALSE); - - ExInterlockedInsertTailList(&AllocationListHead, &Request.ListEntry, &AllocationListLock); - MmRebalanceMemoryConsumers(); - - KeWaitForSingleObject(&Request.Event, - 0, - KernelMode, - FALSE, - NULL); - - Page = Request.Page; - if (Page == 0) - { - KeBugCheck(NO_PAGES_AVAILABLE); - } - - if(Consumer == MC_USER) MmInsertLRULastUserPage(Page); - *AllocatedPage = Page; - - if (MmAvailablePages < MiMinimumAvailablePages) - { - MmRebalanceMemoryConsumers(); - } - return(STATUS_SUCCESS); } @@ -347,91 +265,246 @@ if(Consumer == MC_USER) MmInsertLRULastUserPage(Page); *AllocatedPage = Page; - if (MmAvailablePages < MiMinimumAvailablePages) - { - MmRebalanceMemoryConsumers(); - } - return(STATUS_SUCCESS); } +/* Old implementation of the balancer thread */ +static +VOID +NTAPI +MiRosBalancerThread(VOID) +{ + ULONG InitialTarget = 0; + + DPRINT1("Legacy MM balancer in action!\n"); + +#if (_MI_PAGING_LEVELS == 2) + if (!MiIsBalancerThread()) + { + /* Clean up the unused PDEs */ + ULONG_PTR Address; + PEPROCESS Process = PsGetCurrentProcess(); + + /* Acquire PFN lock */ + KIRQL OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + PMMPDE pointerPde; + for (Address = (ULONG_PTR) MI_LOWEST_VAD_ADDRESS ; + Address < (ULONG_PTR) MM_HIGHEST_VAD_ADDRESS; Address += (PAGE_SIZE * PTE_COUNT)) + { + if (MiQueryPageTableReferences((PVOID) Address) == 0) + { + pointerPde = MiAddressToPde(Address); + if (pointerPde->u.Hard.Valid) + MiDeletePte(pointerPde, MiPdeToPte(pointerPde), Process, NULL); + ASSERT(pointerPde->u.Hard.Valid == 0); + } + } + /* Release lock */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + } +#endif + do + { + ULONG OldTarget = InitialTarget; + ULONG i; + + /* Trim each consumer */ + for (i = 0; i < MC_MAXIMUM; i++) + { + InitialTarget = MiTrimMemoryConsumer(i, InitialTarget); + } + + /* No pages left to swap! */ + if (InitialTarget != 0 && InitialTarget == OldTarget) + { + /* Game over */ + KeBugCheck(NO_PAGES_AVAILABLE); + } + } while (InitialTarget != 0); +} VOID NTAPI MiBalancerThread(PVOID Unused) { - PVOID WaitObjects[2]; - NTSTATUS Status; - ULONG i; - - WaitObjects[0] = &MiBalancerEvent; - WaitObjects[1] = &MiBalancerTimer; - - while (1) - { - Status = KeWaitForMultipleObjects(2, - WaitObjects, - WaitAny, - Executive, - KernelMode, - FALSE, - NULL, - NULL); - - if (Status == STATUS_WAIT_0 || Status == STATUS_WAIT_1) - { - ULONG InitialTarget = 0; - -#if (_MI_PAGING_LEVELS == 2) - if (!MiIsBalancerThread()) - { - /* Clean up the unused PDEs */ - ULONG_PTR Address; - PEPROCESS Process = PsGetCurrentProcess(); - - /* Acquire PFN lock */ - KIRQL OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - PMMPDE pointerPde; - for (Address = (ULONG_PTR)MI_LOWEST_VAD_ADDRESS; - Address < (ULONG_PTR)MM_HIGHEST_VAD_ADDRESS; - Address += (PAGE_SIZE * PTE_COUNT)) - { - if (MiQueryPageTableReferences((PVOID)Address) == 0) + PVOID WaitObjects[2]; + NTSTATUS Status; + ULONG i; + PVOID LastPagedPoolAddress = MmPagedPoolStart; +#ifdef TEST_PAGING + PULONG PagingTestBuffer; + BOOLEAN TestPage = FALSE; +#endif + + WaitObjects[0] = &MiBalancerTimer; + WaitObjects[1] = &MiBalancerEvent; + +#ifdef TEST_PAGING + PagingTestBuffer = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, 'tseT'); + DPRINT1("PagingTestBuffer: %p, PTE %p\n", PagingTestBuffer, MiAddressToPte(PagingTestBuffer)); + for (i = 0; i < (PAGE_SIZE / sizeof(ULONG)); i++) + PagingTestBuffer[i] = i; +#endif + + while (1) + { + /* For now, we only age the paged pool, with 100 pages per run. */ + LONG Count = 100; + PVOID Address = LastPagedPoolAddress; + KIRQL OldIrql; + PMMPTE PointerPte; + PMMPDE PointerPde; + ULONG PdeIndex; + MMPTE TempPte; + PMMPFN Pfn1; + BOOLEAN Flush; + + Status = KeWaitForMultipleObjects( + 2, + WaitObjects, + WaitAny, + Executive, + KernelMode, + FALSE, + NULL, + NULL); + if (!NT_SUCCESS(Status)) + { + DPRINT1("KeWaitForMultipleObjects failed, status = %x\n", Status); + KeBugCheck(MEMORY_MANAGEMENT); + } + + DPRINT("MM Balancer: Starting to loop.\n"); + + while (Count-- > 0) + { + Address = (PVOID)((ULONG_PTR) Address + PAGE_SIZE); + + /* Acquire PFN lock while we are cooking */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + if (Address > MmPagedPoolEnd) + { + Address = MmPagedPoolStart; + } + + PointerPde = MiAddressToPde(Address); + PointerPte = MiAddressToPte(Address); + + PdeIndex = ((ULONG_PTR)PointerPde & (SYSTEM_PD_SIZE - 1)) / sizeof(MMPTE); + + if (MmSystemPagePtes[PdeIndex].u.Hard.Valid == 0) + TempPte.u.Long = 0; + else + TempPte = *PointerPte; + + if (TempPte.u.Hard.Valid == 0) + { + /* Bad luck, not a paged-in address */ +#ifdef TEST_PAGING + if (PointerPte == MiAddressToPte(PagingTestBuffer)) { - pointerPde = MiAddressToPde(Address); - if (pointerPde->u.Hard.Valid) - MiDeletePte(pointerPde, MiPdeToPte(pointerPde), Process, NULL); - ASSERT(pointerPde->u.Hard.Valid == 0); + /* Of course it should not magically become a prototype pte */ + ASSERT(TempPte.u.Soft.Prototype == 0); + if (TempPte.u.Soft.Transition == 0) + { + /* It was paged out! */ + ASSERT(TempPte.u.Soft.PageFileHigh != 0); + TestPage = TRUE; + } } - } - /* Release lock */ +#endif + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + continue; + } + + Flush = FALSE; + + /* Get the Pfn */ + Pfn1 = MI_PFN_ELEMENT(PFN_FROM_PTE(&TempPte)); + ASSERT(Pfn1->PteAddress == PointerPte); + ASSERT(Pfn1->u3.e1.PrototypePte == 0); + + /* First check if it was written to */ + if (TempPte.u.Hard.Dirty) + Pfn1->u3.e1.Modified = 1; + + /* See if it was accessed since the last time we looked */ + if (TempPte.u.Hard.Accessed) + { + /* Yes! Mark the page as young and fresh again */ + Pfn1->Wsle.u1.e1.Age = 0; + /* Tell the CPU we want to know for the next time */ + TempPte.u.Hard.Accessed = 0; + MI_UPDATE_VALID_PTE(PointerPte, TempPte); + Flush = TRUE; + } + else if (Pfn1->Wsle.u1.e1.Age == 3) + { + /* Page is getting old: Mark the PTE as transition */ + DPRINT1("MM Balancer: putting %p (page %x) as transition.\n", PointerPte, + PFN_FROM_PTE(&TempPte)); + TempPte.u.Hard.Valid = 0; + TempPte.u.Soft.Transition = 1; + TempPte.u.Trans.Protection = MM_READWRITE; + MiDecrementShareCount(Pfn1, PFN_FROM_PTE(&TempPte)); + MI_WRITE_INVALID_PTE(PointerPte, TempPte); + Flush = TRUE; + } + else + { + /* The page is just getting older */ + Pfn1->Wsle.u1.e1.Age++; + } + + /* Flush the TLB entry if we have to */ + if (Flush) + { +#ifdef CONFIG_SMP + // FIXME: Should invalidate entry in every CPU TLB + ASSERT(FALSE); +#endif + KeInvalidateTlbEntry(Address); + } + + /* Unlock, we're done for this address */ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } -#endif - do - { - ULONG OldTarget = InitialTarget; - - /* Trim each consumer */ - for (i = 0; i < MC_MAXIMUM; i++) - { - InitialTarget = MiTrimMemoryConsumer(i, InitialTarget); - } - - /* No pages left to swap! */ - if (InitialTarget != 0 && - InitialTarget == OldTarget) - { - /* Game over */ - KeBugCheck(NO_PAGES_AVAILABLE); - } - } while (InitialTarget != 0); - } - else - { - DPRINT1("KeWaitForMultipleObjects failed, status = %x\n", Status); - KeBugCheck(MEMORY_MANAGEMENT); - } - } + + DPRINT("MM Balancer: End of the loop.\n"); + +#ifdef TEST_PAGING + if (TestPage) + { + BOOLEAN Passed = TRUE; + DPRINT1("Verifying data integrity of paged out data!\n"); + for (i = 0; i < (PAGE_SIZE / sizeof(ULONG)); i++) + { + if (PagingTestBuffer[i] != i) + Passed = FALSE; + } + if (Passed) + DPRINT1("PASSED! \\o/\n"); + else + DPRINT1("FAILED /o\\\n"); + TestPage = FALSE; + } +#endif + /* Remember this for the next run */ + LastPagedPoolAddress = Address; + + if (Status == STATUS_WAIT_1) + { + /* Balancer thread was woken up by legacy MM + * This means we are really starving. Let's see if this still a problem */ + if ((MmAvailablePages >= MmMinimumFreePages) && (MmNumberOfPagingFiles != 0)) + { + /* Yay! No need to trust the old balancer */ + continue; + } + + MiRosBalancerThread(); + } + } } VOID Modified: branches/TransitionPte/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/mm/mmini… ============================================================================== --- branches/TransitionPte/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ branches/TransitionPte/ntoskrnl/mm/mminit.c [iso-8859-1] Sun Sep 21 12:49:24 2014 @@ -299,36 +299,179 @@ NTAPI MmMpwThreadMain(PVOID Parameter) { - NTSTATUS Status; - ULONG PagesWritten; - LARGE_INTEGER Timeout; - - UNREFERENCED_PARAMETER(Parameter); - - Timeout.QuadPart = -50000000; - - for(;;) - { - Status = KeWaitForSingleObject(&MpwThreadEvent, - 0, - KernelMode, - FALSE, - &Timeout); - if (!NT_SUCCESS(Status)) - { - DbgPrint("MpwThread: Wait failed\n"); - KeBugCheck(MEMORY_MANAGEMENT); - return; - } - - PagesWritten = 0; - -#ifndef NEWCC - // XXX arty -- we flush when evicting pages or destorying cache - // sections. - CcRosFlushDirtyPages(128, &PagesWritten, FALSE); -#endif - } + NTSTATUS Status; + PMMPTE SysPte, PteTable; + + UNREFERENCED_PARAMETER(Parameter); + + /* Reserve a PTE for the page table */ + SysPte = MiReserveSystemPtes(1, SystemPteSpace); + ASSERT(SysPte != NULL); + PteTable = MiPteToAddress(SysPte); + + for(;;) + { + KIRQL OldIrql; + PFN_NUMBER PageFrameIndex; + PMMPFN Pfn; + MMPTE TempPte, PdePte; + PMMPTE PointerPte; + BOOLEAN PageFileEntryFromPage = FALSE; + /* + * To start working, we wait for two conditions: + * - there are pages to be paged out. + * - We are in a low memory situation. + */ + Status = KeWaitForSingleObject( + &MpwThreadEvent, + WrPageOut, + KernelMode, + FALSE, + NULL); + + DPRINT("THE KRAKEN WAS RELEASED AND WILL PAGE YOUR ASS OUT!\n"); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("MpwThread: Wait failed\n"); + KeBugCheck(MEMORY_MANAGEMENT); + return; + } + + /* Lock the PFN database */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* The true main loop */ + while ((MmTotalPagesForPagingFile != 0) && (MiFreeSwapPages != 0)) + { + /* Get the first page from the list */ + PageFrameIndex = MmModifiedPageListByColor[0].Flink; + + /* Get The Pfn */ + Pfn = MI_PFN_ELEMENT(PageFrameIndex); + + /* Some things which must always hold */ + ASSERT(Pfn->OriginalPte.u.Soft.Transition == 0); + ASSERT(Pfn->u3.ReferenceCount == 0); + + /* And some that are not yet supported */ + ASSERT(Pfn->OriginalPte.u.Soft.Prototype == 0); + + /* Maybe this is not the first time */ + if ((Pfn->OriginalPte.u.Soft.Prototype == 0) && + (Pfn->OriginalPte.u.Soft.PageFileHigh != 0)) + { + /* Use that */ + TempPte = Pfn->OriginalPte; + PageFileEntryFromPage = TRUE; + } + else + { + MiReservePageFileEntry(&TempPte); + } + + /* Get it out of the list and reference it */ + MiUnlinkPageFromList(Pfn); + MiReferenceUnusedPageAndBumpLockCount(Pfn); + + ASSERT(Pfn->u3.e1.PageLocation == ModifiedPageList); + + /* Mark it as write in progress */ + Pfn->u3.e1.WriteInProgress = 1; + Pfn->u1.Event = NULL; + + /* Release the PFN lock while we are writing */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + /* Do the actual write */ + Status = MiWritePageFile(PageFrameIndex, &TempPte); + + /* Get the lock again */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Get a mapping to the page table */ + MI_MAKE_HARDWARE_PTE_KERNEL(&PdePte, + SysPte, + MM_READWRITE, + Pfn->u4.PteFrame); + MI_WRITE_VALID_PTE(SysPte, PdePte); + + /* Finally get a pointer to the PTE this page represents */ + PointerPte = &PteTable[MiAddressToPteOffset(MiPteToAddress(Pfn->PteAddress))]; + + /* Get relevant values from the original PTE */ + TempPte.u.Soft.Protection = PointerPte->u.Soft.Protection; + + /* Maybe someone aborted the operation */ + if (Pfn->u3.e1.WriteInProgress == 0) + { + DPRINT1("Someone aborted the page-out operation!\n"); + /* Just set the event and let the waiter go along */ + ASSERT(Pfn->u1.Event != NULL); + KeSetEvent(Pfn->u1.Event, IO_NO_INCREMENT, FALSE); + Pfn->u1.Event = NULL; + /* This is now useless */ + if (!PageFileEntryFromPage) + MiFreePageFileEntry(&TempPte); + } + /* Maybe someone tried to access the page while we were not looking */ + else if (Pfn->u1.Event != NULL) + { + DPRINT1("Page fault occured while we were paging out!\n"); + + /* So the page fault handler marked the page as unmodified */ + ASSERT(Pfn->u3.e1.Modified == 0); + + /* Save the pagefile entry for this page */ + Pfn->OriginalPte = TempPte; + KeSetEvent(Pfn->u1.Event, IO_NO_INCREMENT, FALSE); + Pfn->u1.Event = NULL; + } + else if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to write page to pagefile!\n"); + /* This is now useless */ + if (!PageFileEntryFromPage) + MiFreePageFileEntry(&TempPte); + /* MiDereferencePfnAndDropLockCount will put it back on the tail of the list */ + } + else + { + DPRINT1("Page %x successfully paged out. PTE pointer %p (-> %x)\n", + PageFrameIndex, Pfn->PteAddress, TempPte.u.Long); + + /* Of course it must already be invalid */ + ASSERT(PointerPte->u.Hard.Valid == 0); + + /* And be in transition */ + ASSERT(PointerPte->u.Soft.Transition == 1); + + /* So the PTE is now officially paged out */ + MI_WRITE_INVALID_PTE(PointerPte, TempPte); + + /* And the pagefile entry belongs to the PTE, not to the page! */ + Pfn->OriginalPte.u.Long = 0; + + /* And dereference the page table frame */ + MiDecrementShareCount(MI_PFN_ELEMENT(Pfn->u4.PteFrame), Pfn->u4.PteFrame); + /* We can finally make it available for real */ + MI_SET_PFN_DELETED(Pfn); + } + + /* We're done with this */ + Pfn->u3.e1.WriteInProgress = 0; + + /* This will put it back in the free list */ + MiDereferencePfnAndDropLockCount(Pfn); + + /* Unmap the Page Table */ + MI_ERASE_PTE(SysPte); + KeInvalidateTlbEntry(PteTable); + } + + /* We're done for this run */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + } } NTSTATUS Modified: branches/TransitionPte/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/branches/TransitionPte/ntoskrnl/mm/pagef… ============================================================================== --- branches/TransitionPte/ntoskrnl/mm/pagefile.c [iso-8859-1] (original) +++ branches/TransitionPte/ntoskrnl/mm/pagefile.c [iso-8859-1] Sun Sep 21 12:49:24 2014 @@ -46,13 +46,14 @@ { LIST_ENTRY PagingFileListEntry; PFILE_OBJECT FileObject; - LARGE_INTEGER MaximumSize; - LARGE_INTEGER CurrentSize; + ULONG_PTR MaximumSize; + ULONG_PTR CurrentSize; PFN_NUMBER FreePages; PFN_NUMBER UsedPages; - PULONG AllocMap; + PVOID AllocMap; + RTL_BITMAP AllocBitMap; + ULONG_PTR AllocBitMapHint; KSPIN_LOCK AllocMapLock; - ULONG AllocMapSize; PRETRIEVAL_POINTERS_BUFFER RetrievalPointers; } PAGINGFILE, *PPAGINGFILE; @@ -72,9 +73,6 @@ /* List of paging files, both used and free */ static PPAGINGFILE PagingFileList[MAX_PAGING_FILES]; - -/* Lock for examining the list of paging files */ -static KSPIN_LOCK PagingFileListLock; /* Number of paging files */ ULONG MmNumberOfPagingFiles; @@ -221,30 +219,62 @@ NTAPI MmWriteToSwapPage(SWAPENTRY SwapEntry, PFN_NUMBER Page) { - ULONG i; - ULONG_PTR offset; - LARGE_INTEGER file_offset; + MMPTE TempPte; + + TempPte.u.Long = 0; + TempPte.u.Soft.PageFileHigh = OFFSET_FROM_ENTRY(SwapEntry); + TempPte.u.Soft.PageFileLow = FILE_FROM_ENTRY(SwapEntry); + return MiWritePageFile(Page, &TempPte); +} + + +NTSTATUS +NTAPI +MmReadFromSwapPage(SWAPENTRY SwapEntry, PFN_NUMBER Page) +{ + MMPTE TempPte; + + TempPte.u.Long = 0; + TempPte.u.Soft.PageFileHigh = OFFSET_FROM_ENTRY(SwapEntry); + TempPte.u.Soft.PageFileLow = FILE_FROM_ENTRY(SwapEntry); + return MiReadPageFile(Page, &TempPte); +} + +NTSTATUS +NTAPI +MiReadPageFile( + _In_ PFN_NUMBER Page, + _In_ const MMPTE* PointerPte +) +{ + LARGE_INTEGER FileOffset; IO_STATUS_BLOCK Iosb; + ULONG PageFileIndex = PointerPte->u.Soft.PageFileLow; + ULONG_PTR PageFileOffset = PointerPte->u.Soft.PageFileHigh; NTSTATUS Status; KEVENT Event; - UCHAR MdlBase[sizeof(MDL) + sizeof(ULONG)]; + UCHAR MdlBase[sizeof(MDL) + sizeof(PFN_NUMBER)]; PMDL Mdl = (PMDL)MdlBase; - - DPRINT("MmWriteToSwapPage\n"); - - if (SwapEntry == 0) + PPAGINGFILE PagingFile; + + DPRINT("MiReadPageFile\n"); + + if (PageFileOffset == 0) { KeBugCheck(MEMORY_MANAGEMENT); return(STATUS_UNSUCCESSFUL); } - i = FILE_FROM_ENTRY(SwapEntry); - offset = OFFSET_FROM_ENTRY(SwapEntry); - - if (PagingFileList[i]->FileObject == NULL || - PagingFileList[i]->FileObject->DeviceObject == NULL) - { - DPRINT1("Bad paging file 0x%.8X\n", SwapEntry); + /* Normalize it */ + PageFileOffset--; + + ASSERT(PageFileIndex < MAX_PAGING_FILES); + + PagingFile = PagingFileList[PageFileIndex]; + + if (PagingFile->FileObject == NULL || PagingFile->FileObject->DeviceObject == NULL) + { + DPRINT1("Bad paging file %u\n", PageFileIndex); KeBugCheck(MEMORY_MANAGEMENT); } @@ -252,80 +282,13 @@ MmBuildMdlFromPages(Mdl, &Page); Mdl->MdlFlags |= MDL_PAGES_LOCKED; - file_offset.QuadPart = offset * PAGE_SIZE; - file_offset = MmGetOffsetPageFile(PagingFileList[i]->RetrievalPointers, file_offset); - - KeInitializeEvent(&Event, NotificationEvent, FALSE); - Status = IoSynchronousPageWrite(PagingFileList[i]->FileObject, - Mdl, - &file_offset, - &Event, - &Iosb); - if (Status == STATUS_PENDING) - { - KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); - Status = Iosb.Status; - } - - if (Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA) - { - MmUnmapLockedPages (Mdl->MappedSystemVa, Mdl); - } - return(Status); -} - - -NTSTATUS -NTAPI -MmReadFromSwapPage(SWAPENTRY SwapEntry, PFN_NUMBER Page) -{ - return MiReadPageFile(Page, FILE_FROM_ENTRY(SwapEntry), OFFSET_FROM_ENTRY(SwapEntry)); -} - -NTSTATUS -NTAPI -MiReadPageFile( - _In_ PFN_NUMBER Page, - _In_ ULONG PageFileIndex, - _In_ ULONG_PTR PageFileOffset) -{ - LARGE_INTEGER file_offset; - IO_STATUS_BLOCK Iosb; - NTSTATUS Status; - KEVENT Event; - UCHAR MdlBase[sizeof(MDL) + sizeof(ULONG)]; - PMDL Mdl = (PMDL)MdlBase; - PPAGINGFILE PagingFile; - - DPRINT("MiReadSwapFile\n"); - - if (PageFileOffset == 0) - { - KeBugCheck(MEMORY_MANAGEMENT); - return(STATUS_UNSUCCESSFUL); - } - - ASSERT(PageFileIndex < MAX_PAGING_FILES); - - PagingFile = PagingFileList[PageFileIndex]; - - if (PagingFile->FileObject == NULL || PagingFile->FileObject->DeviceObject == NULL) - { - DPRINT1("Bad paging file %u\n", PageFileIndex); - KeBugCheck(MEMORY_MANAGEMENT); - } - - MmInitializeMdl(Mdl, NULL, PAGE_SIZE); - MmBuildMdlFromPages(Mdl, &Page); - Mdl->MdlFlags |= MDL_PAGES_LOCKED; - - file_offset.QuadPart = PageFileOffset * PAGE_SIZE; - file_offset = MmGetOffsetPageFile(PagingFile->RetrievalPointers, file_offset); + FileOffset.QuadPart = PageFileOffset * PAGE_SIZE; + FileOffset = MmGetOffsetPageFile(PagingFile->RetrievalPointers, FileOffset); KeInitializeEvent(&Event, NotificationEvent, FALSE); Status = IoPageRead(PagingFile->FileObject, Mdl, - &file_offset, + &FileOffset, &Event, &Iosb); if (Status == STATUS_PENDING) @@ -340,14 +303,182 @@ return(Status); } +NTSTATUS +NTAPI +MiWritePageFile( + _In_ PFN_NUMBER Page, + _In_ const MMPTE* PointerPte +) +{ + ULONG PageFileIndex = PointerPte->u.Soft.PageFileLow; + ULONG_PTR PageFileOffset = PointerPte->u.Soft.PageFileHigh; + LARGE_INTEGER FileOffset; + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + KEVENT Event; + UCHAR MdlBase[sizeof(MDL) + sizeof(PFN_NUMBER)]; + PMDL Mdl = (PMDL) MdlBase; + PPAGINGFILE PagingFile; + + /* The PTE must already be setup to point to a pagefile entry */ + ASSERT(PointerPte->u.Hard.Valid == 0); + ASSERT(PointerPte->u.Soft.Transition == 0); + ASSERT(PointerPte->u.Soft.Prototype == 0); + + DPRINT("MiWriteSwapFile\n"); + + if (PageFileOffset == 0) + { + KeBugCheck(MEMORY_MANAGEMENT); + return (STATUS_UNSUCCESSFUL); + } + + /* Normalize it */ + PageFileOffset--; + + ASSERT(PageFileIndex < MAX_PAGING_FILES); + + PagingFile = PagingFileList[PageFileIndex]; + + if (PagingFile->FileObject == NULL || PagingFile->FileObject->DeviceObject == NULL) + { + DPRINT1("Bad paging file %u\n", PageFileIndex); + KeBugCheck(MEMORY_MANAGEMENT); + } + + MmInitializeMdl(Mdl, NULL, PAGE_SIZE); + MmBuildMdlFromPages(Mdl, &Page); + Mdl->MdlFlags |= MDL_PAGES_LOCKED; + + FileOffset.QuadPart = PageFileOffset * PAGE_SIZE; + FileOffset = MmGetOffsetPageFile(PagingFile->RetrievalPointers, FileOffset); + + KeInitializeEvent(&Event, NotificationEvent, FALSE); + Status = IoSynchronousPageWrite(PagingFile->FileObject, + Mdl, + &FileOffset, + &Event, + &Iosb); + if (Status == STATUS_PENDING) + { + KeWaitForSingleObject(&Event, Executive, KernelMode, FALSE, NULL); + Status = Iosb.Status; + } + if (Mdl->MdlFlags & MDL_MAPPED_TO_SYSTEM_VA) + { + MmUnmapLockedPages(Mdl->MappedSystemVa, Mdl); + } + return Status; +} + +VOID +NTAPI +MiFreePageFileEntry( + _In_ PMMPTE PointerPte +) +{ + ULONG PageFileIndex; + ULONG_PTR PageFileOffset; + PPAGINGFILE PageFile; + + /* Some sanity checks */ + ASSERT(PointerPte->u.Hard.Valid == 0); + ASSERT(PointerPte->u.Soft.Transition == 0); + ASSERT(PointerPte->u.Soft.Prototype == 0); + + /* We must hold the PFN lock */ + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + + PageFileIndex = PointerPte->u.Soft.PageFileLow; + PageFileOffset = PointerPte->u.Soft.PageFileHigh; + + /* Fix up the value */ + ASSERT(PageFileOffset != 0); + PageFileOffset--; + + DPRINT1("Releasing page file entry %u, %lu\n", PageFileIndex, PageFileOffset); + + ASSERT(PageFileIndex < MAX_PAGING_FILES); + + PageFile = PagingFileList[PageFileIndex]; + + /* And also lock this pagefile */ + KeAcquireSpinLockAtDpcLevel(&PageFile->AllocMapLock); + + /* It must be already in use */ + ASSERT(RtlTestBit(&PageFile->AllocBitMap, PageFileOffset)); + RtlClearBit(&PageFile->AllocBitMap, PageFileOffset); + + /* One more */ + PageFile->FreePages++; + PageFile->UsedPages--; + + MiFreeSwapPages++; + MiUsedSwapPages--; + + /* Done */ + KeReleaseSpinLockFromDpcLevel(&PageFile->AllocMapLock); +} + +NTSTATUS +NTAPI +MiReservePageFileEntry( + _Out_ PMMPTE PointerPte +) +{ + ULONG PageFileIndex; + ULONG_PTR PageFileOffset; + PPAGINGFILE PageFile; + + /* We must hold the PFN lock */ + ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); + + for (PageFileIndex = 0; PageFileIndex < MAX_PAGING_FILES; PageFileIndex++) + { + if (PagingFileList[PageFileIndex] == NULL) + continue; + if (PagingFileList[PageFileIndex]->FreePages != 0) + break; + } + + if (PageFileIndex == MAX_PAGING_FILES) + { + DPRINT1("Pagefiles are full!\n"); + return STATUS_PAGEFILE_QUOTA; + } + + PointerPte->u.Long = 0; + + PageFile = PagingFileList[PageFileIndex]; + + /* And also lock this page file */ + KeAcquireSpinLockAtDpcLevel(&PageFile->AllocMapLock); + + /* Find a free entry in this page file */ + PageFileOffset = RtlFindClearBitsAndSet(&PageFile->AllocBitMap, 1, PageFile->AllocBitMapHint); + + /* We must have found something as the file was marked as having free entries */ + ASSERT(PageFileOffset != ~((ULONG_PTR)0)); + PageFile->AllocBitMapHint = PageFileOffset & ~((PageFile->MaximumSize / PAGE_SIZE) - 1); + + DPRINT1("Reserving page file entry %lu, %Iu\n", PageFileIndex, PageFileOffset); + + /* Done */ + KeReleaseSpinLockFromDpcLevel(&PageFile->AllocMapLock); + + /* We rely on PageFileHigh being != 0 */ + PointerPte->u.Soft.PageFileHigh = PageFileOffset + 1; + PointerPte->u.Soft.PageFileLow = PageFileIndex; + + return STATUS_SUCCESS; +} + VOID INIT_FUNCTION NTAPI MmInitPagingFile(VOID) { ULONG i; - - KeInitializeSpinLock(&PagingFileListLock); MiFreeSwapPages = 0; MiUsedSwapPages = 0; @@ -360,104 +491,41 @@ MmNumberOfPagingFiles = 0; } -static ULONG -MiAllocPageFromPagingFile(PPAGINGFILE PagingFile) -{ - KIRQL oldIrql; - ULONG i, j; - - KeAcquireSpinLock(&PagingFile->AllocMapLock, &oldIrql); - - for (i = 0; i < PagingFile->AllocMapSize; i++) - { - for (j = 0; j < 32; j++) - { - if (!(PagingFile->AllocMap[i] & (1 << j))) - { - PagingFile->AllocMap[i] |= (1 << j); - PagingFile->UsedPages++; - PagingFile->FreePages--; - KeReleaseSpinLock(&PagingFile->AllocMapLock, oldIrql); - return((i * 32) + j); - } - } - } - - KeReleaseSpinLock(&PagingFile->AllocMapLock, oldIrql); - return(0xFFFFFFFF); -} - VOID NTAPI MmFreeSwapPage(SWAPENTRY Entry) { - ULONG i; - ULONG_PTR off; - KIRQL oldIrql; - - i = FILE_FROM_ENTRY(Entry); - off = OFFSET_FROM_ENTRY(Entry); - - KeAcquireSpinLock(&PagingFileListLock, &oldIrql); - if (PagingFileList[i] == NULL) - { - KeBugCheck(MEMORY_MANAGEMENT); - } - KeAcquireSpinLockAtDpcLevel(&PagingFileList[i]->AllocMapLock); - - PagingFileList[i]->AllocMap[off >> 5] &= (~(1 << (off % 32))); - - PagingFileList[i]->FreePages++; - PagingFileList[i]->UsedPages--; - - MiFreeSwapPages++; - MiUsedSwapPages--; - - KeReleaseSpinLockFromDpcLevel(&PagingFileList[i]->AllocMapLock); - KeReleaseSpinLock(&PagingFileListLock, oldIrql); + MMPTE TempPte; + KIRQL OldIrql; + + TempPte.u.Long = 0; + TempPte.u.Soft.PageFileLow = FILE_FROM_ENTRY(Entry); + TempPte.u.Soft.PageFileHigh = OFFSET_FROM_ENTRY(Entry); + + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + MiFreePageFileEntry(&TempPte); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); } SWAPENTRY NTAPI MmAllocSwapPage(VOID) { - KIRQL oldIrql; - ULONG i; - ULONG off; - SWAPENTRY entry; - - KeAcquireSpinLock(&PagingFileListLock, &oldIrql); - - if (MiFreeSwapPages == 0) - { - KeReleaseSpinLock(&PagingFileListLock, oldIrql); - return(0); - } - - for (i = 0; i < MAX_PAGING_FILES; i++) - { - if (PagingFileList[i] != NULL && - PagingFileList[i]->FreePages >= 1) - { - off = MiAllocPageFromPagingFile(PagingFileList[i]); - if (off == 0xFFFFFFFF) - { - KeBugCheck(MEMORY_MANAGEMENT); - KeReleaseSpinLock(&PagingFileListLock, oldIrql); - return(STATUS_UNSUCCESSFUL); - } - MiUsedSwapPages++; - MiFreeSwapPages--; - KeReleaseSpinLock(&PagingFileListLock, oldIrql); - - entry = ENTRY_FROM_FILE_OFFSET(i, off); - return(entry); - } - } - - KeReleaseSpinLock(&PagingFileListLock, oldIrql); - KeBugCheck(MEMORY_MANAGEMENT); - return(0); + MMPTE TempPte; + SWAPENTRY entry; + NTSTATUS Status; + KIRQL OldIrql; + + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + Status = MiReservePageFileEntry(&TempPte); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + if (!NT_SUCCESS(Status)) + return 0; + + entry = ENTRY_FROM_FILE_OFFSET(TempPte.u.Soft.PageFileLow, TempPte.u.Soft.PageFileHigh); + + return entry; } static PRETRIEVEL_DESCRIPTOR_LIST FASTCALL @@ -488,7 +556,7 @@ IO_STATUS_BLOCK IoStatus; PFILE_OBJECT FileObject; PPAGINGFILE PagingFile; - KIRQL oldIrql; + KIRQL OldIrql; ULONG AllocMapSize; FILE_FS_SIZE_INFORMATION FsSizeInformation; PRETRIEVEL_DESCRIPTOR_LIST RetDescList; @@ -646,7 +714,6 @@ #if defined(__GNUC__) Vcn.QuadPart = 0LL; #else - Vcn.QuadPart = 0; #endif @@ -718,16 +785,15 @@ RtlZeroMemory(PagingFile, sizeof(*PagingFile)); PagingFile->FileObject = FileObject; - PagingFile->MaximumSize.QuadPart = SafeMaximumSize.QuadPart; - PagingFile->CurrentSize.QuadPart = SafeInitialSize.QuadPart; - PagingFile->FreePages = (ULONG)(SafeInitialSize.QuadPart / PAGE_SIZE); + PagingFile->MaximumSize = SafeMaximumSize.LowPart; + PagingFile->CurrentSize = SafeInitialSize.LowPart; + PagingFile->FreePages = (ULONG)(SafeMaximumSize.LowPart / PAGE_SIZE); PagingFile->UsedPages = 0; KeInitializeSpinLock(&PagingFile->AllocMapLock); AllocMapSize = (PagingFile->FreePages / 32) + 1; PagingFile->AllocMap = ExAllocatePool(NonPagedPool, AllocMapSize * sizeof(ULONG)); - PagingFile->AllocMapSize = AllocMapSize; if (PagingFile->AllocMap == NULL) { @@ -760,8 +826,10 @@ return(STATUS_NO_MEMORY); } - RtlZeroMemory(PagingFile->AllocMap, AllocMapSize * sizeof(ULONG)); RtlZeroMemory(PagingFile->RetrievalPointers, Size); + + RtlInitializeBitMap(&PagingFile->AllocBitMap, PagingFile->AllocMap, AllocMapSize * 32); + RtlClearAllBits(&PagingFile->AllocBitMap); Count = 0; PagingFile->RetrievalPointers->ExtentCount = ExtentCount; @@ -799,7 +867,7 @@ PagingFile->RetrievalPointers->Extents[i].NextVcn.QuadPart *= BytesPerAllocationUnit; } - KeAcquireSpinLock(&PagingFileListLock, &oldIrql); + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); for (i = 0; i < MAX_PAGING_FILES; i++) { if (PagingFileList[i] == NULL) @@ -810,7 +878,7 @@ } MiFreeSwapPages = MiFreeSwapPages + PagingFile->FreePages; MmNumberOfPagingFiles++; - KeReleaseSpinLock(&PagingFileListLock, oldIrql); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); ZwClose(FileHandle);

1 0

← Newer
1
...
19
20
21
22
23
24
25
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2014