Ros-diffs

ros-diffs@reactos.org

81390 discussions

[mkupfer] 42140: fix a minor translation mistake
by mkupfer＠svn.reactos.org 22 Jul '09

22 Jul '09

Author: mkupfer Date: Wed Jul 22 14:11:56 2009 New Revision: 42140 URL: http://svn.reactos.org/svn/reactos?rev=42140&view=rev Log: fix a minor translation mistake Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc Modified: trunk/reactos/dll/win32/syssetup/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/de… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/syssetup/lang/de-DE.rc [iso-8859-1] Wed Jul 22 14:11:56 2009 @@ -150,10 +150,10 @@ BEGIN LTEXT "Fertigstellung des ReactOS Setup Assistenten",IDC_FINISHTITLE,115,9,195,37 LTEXT "Das ReactOS Setup wurde erfolgreich fertiggestellt.\n\n" \ - "Wenn Sie auf Fertig klicken, wird der Computer neu gestartet.", IDC_STATIC, 115, 58, 195, 100 + "Wenn Sie auf Beenden klicken, wird der Computer neu gestartet.", IDC_STATIC, 115, 58, 195, 100 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 115, 138, 188, 12 LTEXT "Entfernen Sie die CD, wenn vorhanden. Danach klicken Sie "\ - "auf Fertig, um den Computer neu zu starten.", IDC_STATIC, 115, 160, 195, 31 + "auf Beenden, um den Computer neu zu starten.", IDC_STATIC, 115, 160, 195, 31 END

1 0

[khornicek] 42139: - draw text with the foreground color
by khornicek＠svn.reactos.org 22 Jul '09

22 Jul '09

Author: khornicek Date: Wed Jul 22 13:24:35 2009 New Revision: 42139 URL: http://svn.reactos.org/svn/reactos?rev=42139&view=rev Log: - draw text with the foreground color Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c [iso-8859-1] Wed Jul 22 13:24:35 2009 @@ -26,8 +26,11 @@ int w; int xspan, lenspan; RECTL rcBounds; - - DPRINT("%d, %d\n", x, y); + BRUSHOBJ textBrush; + + RtlZeroMemory(&textBrush, sizeof(textBrush)); + textBrush.iSolidColor = physDev->crForegroundClr; + x -= gi->x; y -= gi->y; while (height--) @@ -62,7 +65,7 @@ RECTL_vOffsetRect(&rcBounds, physDev->rcVport.left, physDev->rcVport.top); GreLineTo(&physDev->pBitmap->SurfObj, NULL, - &physDev->pLineBrush->BrushObj, + &textBrush, xspan + physDev->rcVport.left, y + physDev->rcVport.top, xspan + lenspan + physDev->rcVport.left,

1 0

[fireball] 42138: - Add missing braces to prevent PVOID pointer arithmetic.
by fireball＠svn.reactos.org 22 Jul '09

22 Jul '09

Author: fireball Date: Wed Jul 22 13:15:34 2009 New Revision: 42138 URL: http://svn.reactos.org/svn/reactos?rev=42138&view=rev Log: - Add missing braces to prevent PVOID pointer arithmetic. Modified: trunk/reactos/ntoskrnl/mm/procsup.c Modified: trunk/reactos/ntoskrnl/mm/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/procsup.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/procsup.c [iso-8859-1] Wed Jul 22 13:15:34 2009 @@ -222,7 +222,7 @@ Peb->HeapDeCommitFreeBlockThreshold = MmHeapDeCommitFreeBlockThreshold;*/ Peb->NumberOfHeaps = 0; Peb->MaximumNumberOfHeaps = (PAGE_SIZE - sizeof(PEB)) / sizeof(PVOID); - Peb->ProcessHeaps = (PVOID*)Peb + 1; + Peb->ProcessHeaps = (PVOID*)(Peb + 1); /* Image Data */ if ((NtHeaders = RtlImageNtHeader(Peb->ImageBaseAddress)))

1 0

[fireball] 42137: - Add user buffer probing and copying to RosGdiPolygon. - Offset all points before calling the GrePolygon function.
by fireball＠svn.reactos.org 22 Jul '09

22 Jul '09

Author: fireball Date: Wed Jul 22 12:24:08 2009 New Revision: 42137 URL: http://svn.reactos.org/svn/reactos?rev=42137&view=rev Log: - Add user buffer probing and copying to RosGdiPolygon. - Offset all points before calling the GrePolygon function. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c [iso-8859-1] Wed Jul 22 12:24:08 2009 @@ -129,19 +129,64 @@ return FALSE; } -BOOL APIENTRY RosGdiPolygon( HDC physDev, const POINT* pt, INT count ) -{ - PDC pDC; - - /* Get a pointer to the DC */ - pDC = GDI_GetObjPtr(physDev, (SHORT)GDI_OBJECT_TYPE_DC); +BOOL APIENTRY RosGdiPolygon( HDC physDev, const POINT* pUserBuffer, INT count ) +{ + PDC pDC; + NTSTATUS Status = STATUS_SUCCESS; + POINT pStackBuf[16]; + POINT *pPoints = pStackBuf; + ULONG i; + + /* Get a pointer to the DC */ + pDC = GDI_GetObjPtr(physDev, (SHORT)GDI_OBJECT_TYPE_DC); + + /* Capture the points buffer */ + _SEH2_TRY + { + ProbeForRead(pUserBuffer, count * sizeof(POINT), 1); + + /* Use pool allocated buffer if data doesn't fit */ + if (count > sizeof(*pStackBuf) / sizeof(POINT)) + pPoints = ExAllocatePool(PagedPool, sizeof(POINT) * count); + + /* Copy points data */ + RtlCopyMemory(pPoints, pUserBuffer, count * sizeof(POINT)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + /* Release the object */ + GDI_ReleaseObj(physDev); + + /* Free the buffer if it was allocated */ + if (pPoints != pStackBuf) ExFreePool(pPoints); + + /* Return failure */ + return FALSE; + } + + /* Offset points data */ + for (i=0; i<count; i++) + { + pPoints[i].x += pDC->rcDcRect.left + pDC->rcVport.left; + pPoints[i].y += pDC->rcDcRect.top + pDC->rcVport.top; + } /* Draw the polygon */ - GrePolygon(pDC, pt, count); - - /* Release the object */ - GDI_ReleaseObj(physDev); - + GrePolygon(pDC, pPoints, count); + + /* Release the object */ + GDI_ReleaseObj(physDev); + + /* Free the buffer if it was allocated */ + if (pPoints != pStackBuf) ExFreePool(pPoints); + + /* Return success */ return TRUE; } Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] Wed Jul 22 12:24:08 2009 @@ -135,10 +135,10 @@ bRet = GreLineTo(&pDC->pBitmap->SurfObj, NULL,//dc->rosdc.CombinedClip, &pDC->pLineBrush->BrushObj, - ptPoints[i].x + pDC->rcDcRect.left, - ptPoints[i].y + pDC->rcDcRect.top, - ptPoints[i+1].x + pDC->rcDcRect.left, - ptPoints[i+1].y + pDC->rcDcRect.top, + ptPoints[i].x, + ptPoints[i].y, + ptPoints[i+1].x, + ptPoints[i+1].y, &DestRect, // Bounding rectangle Mix); }

1 0

[fireball] 42136: - Remove wake_up, this became an unneeded wineism now. - Silence timeout_user debug prints.
by fireball＠svn.reactos.org 22 Jul '09

22 Jul '09

Author: fireball Date: Wed Jul 22 11:52:08 2009 New Revision: 42136 URL: http://svn.reactos.org/svn/reactos?rev=42136&view=rev Log: - Remove wake_up, this became an unneeded wineism now. - Silence timeout_user debug prints. Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/include/winesup.h [iso-8859-1] Wed Jul 22 11:52:08 2009 @@ -135,8 +135,6 @@ void remove_timeout_user( struct timeout_user *user ); struct timeout_user *add_timeout_user( timeout_t when, timeout_callback func, void *private ); -void wake_up( struct object *obj, int max ); - thread_id_t get_thread_id (PTHREADINFO Thread); process_id_t get_process_id(PPROCESSINFO Process); Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] Wed Jul 22 11:52:08 2009 @@ -45,7 +45,7 @@ DueTime.QuadPart = (LONGLONG)when; - DPRINT1("add_timeout_user(when %I64d, func %p)\n", when, func); + DPRINT("add_timeout_user(when %I64d, func %p)\n", when, func); /* Allocate memory for timeout structure */ TimeoutUser = ExAllocatePool(NonPagedPool, sizeof(struct timeout_user)); @@ -63,7 +63,7 @@ /* remove a timeout user */ void remove_timeout_user( struct timeout_user *user ) { - DPRINT1("remove_timeout_user %p\n", user); + DPRINT("remove_timeout_user %p\n", user); /* Cancel the timer */ KeCancelTimer(&user->Timer); @@ -90,26 +90,6 @@ process_id_t get_process_id(PPROCESSINFO Process) { return (process_id_t)Process->peProcess->UniqueProcessId; -} - -void wake_up( struct object *obj, int max ) -{ - DPRINT1("wake_up %p %d\n", obj, max); -#if 0 - struct list *ptr, *next; - - LIST_FOR_EACH_SAFE( ptr, next, &obj->wait_queue ) - { - struct wait_queue_entry *entry = LIST_ENTRY( ptr, struct wait_queue_entry, entry ); - DPRINT1("wake_thread 0x%x / process 0x%x\n", - entry->thread->peThread->Tcb.Teb->ClientId.UniqueThread, - entry->thread->peThread->Tcb.Teb->ClientId.UniqueProcess); - /*if (wake_thread( entry->thread )) - { - if (max && !--max) break; - }*/ - } -#endif } void set_fd_events( struct fd *fd, int events )

1 0

[fireball] 42135: - Create an event for every message queue and return its handle for the user driver to wait on. This fixes "active" looping in all GetMessage loops, which actually made the system feel soo slow. - Turn two DPC callbacks (timer and timeout) to allocate and schedule work items instead of processing everything inside the DPC, because the processing may result in a KePulseEvent call. - Change message queue and msg_result to be allocated from a nonpaged pool, because they are access
by fireball＠svn.reactos.org 22 Jul '09

22 Jul '09

Author: fireball Date: Wed Jul 22 10:53:28 2009 New Revision: 42135 URL: http://svn.reactos.org/svn/reactos?rev=42135&view=rev Log: - Create an event for every message queue and return its handle for the user driver to wait on. This fixes "active" looping in all GetMessage loops, which actually made the system feel soo slow. - Turn two DPC callbacks (timer and timeout) to allocate and schedule work items instead of processing everything inside the DPC, because the processing may result in a KePulseEvent call. - Change message queue and msg_result to be allocated from a nonpaged pool, because they are accessed inside DPCs. - TODO: Add locking to prevent message queue lists corruption from concurrent access. Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/queue.c [iso-8859-1] Wed Jul 22 10:53:28 2009 @@ -53,6 +53,7 @@ void *data; /* message reply data */ unsigned int data_size; /* size of message reply data */ struct timeout_user *timeout; /* result timeout */ + PWORK_QUEUE_ITEM work_item; /* work item pointer to free */ }; struct message @@ -102,6 +103,8 @@ { struct object obj; /* object header */ struct fd *fd; /* optional file descriptor to poll */ + HANDLE wake_event; /* wakeup event handle */ + PKEVENT wake_event_ptr; /* wakeup event pointer */ unsigned int wake_bits; /* wakeup bits */ unsigned int wake_mask; /* wakeup mask */ unsigned int changed_bits; /* changed wakeup bits */ @@ -120,6 +123,7 @@ struct thread_input *input; /* thread input descriptor */ struct hook_table *hooks; /* hook table */ timeout_t last_get_msg; /* time of last get message call */ + PWORK_QUEUE_ITEM work_item; /* work item pointer to free */ }; static void msg_queue_dump( struct object *obj, int verbose ); @@ -252,6 +256,14 @@ if ((queue = alloc_object( &msg_queue_ops ))) { queue->fd = NULL; + ZwCreateEvent(&queue->wake_event, EVENT_ALL_ACCESS, NULL, NotificationEvent, FALSE); + /* Get a pointer to the object itself */ + ObReferenceObjectByHandle(queue->wake_event, + EVENT_ALL_ACCESS, + NULL, + KernelMode, + (PVOID)&queue->wake_event_ptr, + NULL); queue->wake_bits = 0; queue->wake_mask = 0; queue->changed_bits = 0; @@ -327,7 +339,10 @@ { queue->wake_bits |= bits; queue->changed_bits |= bits; - if (is_signaled( queue )) wake_up( &queue->obj, 0 ); + if (is_signaled( queue )) + { + KePulseEvent(queue->wake_event_ptr, EVENT_INCREMENT, FALSE); + } } /* clear some queue bits */ @@ -504,16 +519,18 @@ free_message( msg ); } -/* message timed out without getting a reply */ -static VOID +VOID NTAPI -result_timeout( PKDPC Dpc, PVOID Context, PVOID SystemArgument1, PVOID SystemArgument2) +result_timeout_worker( PVOID Context ) { struct message_result *result = Context; assert( !result->replied ); result->timeout = NULL; + + /* Free work item memory */ + ExFreePool(result->work_item); if (result->msg) /* not received yet */ { @@ -533,12 +550,27 @@ store_message_result( result, 0, STATUS_TIMEOUT ); } +/* message timed out without getting a reply */ +static VOID +NTAPI +result_timeout( PKDPC Dpc, PVOID Context, PVOID SystemArgument1, PVOID SystemArgument2) +{ + struct message_result *result = Context; + + /* Allocate memory for the work iteam */ + result->work_item = ExAllocatePool(NonPagedPool, sizeof(WORK_QUEUE_ITEM)); + + /* Queue a work item */ + ExInitializeWorkItem(result->work_item, result_timeout_worker, result); + ExQueueWorkItem(result->work_item, DelayedWorkQueue); +} + /* allocate and fill a message result structure */ static struct message_result *alloc_message_result( struct msg_queue *send_queue, struct msg_queue *recv_queue, struct message *msg, timeout_t timeout ) { - struct message_result *result = mem_alloc( sizeof(*result) ); + struct message_result *result = ExAllocatePool( NonPagedPool, sizeof(*result) ); if (result) { result->msg = msg; @@ -756,7 +788,7 @@ /* check if the thread owning the queue is hung (not checking for messages) */ static int is_queue_hung( struct msg_queue *queue ) { - struct wait_queue_entry *entry; + //struct wait_queue_entry *entry; LARGE_INTEGER current_time; KeQuerySystemTime(&current_time); @@ -764,11 +796,15 @@ if (current_time.QuadPart - queue->last_get_msg <= 5 * TICKS_PER_SEC) return 0; /* less than 5 seconds since last get message -> not hung */ +#if 0 LIST_FOR_EACH_ENTRY( entry, &queue->obj.wait_queue, struct wait_queue_entry, entry ) { if (entry->thread->queue == queue) return 0; /* thread is waiting on queue -> not hung */ } +#endif + DPRINT1("TODO: Check if anyone is waiting on queue is missing!\n"); + return 1; } @@ -853,6 +889,9 @@ cleanup_results( queue ); for (i = 0; i < NB_MSG_KINDS; i++) empty_msg_list( &queue->msg_list[i] ); + ObDereferenceObject(queue->wake_event_ptr); + ZwClose(queue->wake_event); + while ((ptr = list_head( &queue->pending_timers ))) { struct timer *timer = LIST_ENTRY( ptr, struct timer, entry ); @@ -878,7 +917,7 @@ if (event & (POLLERR | POLLHUP)) set_fd_events( fd, -1 ); else set_fd_events( queue->fd, 0 ); - wake_up( &queue->obj, 0 ); + KePulseEvent(queue->wake_event_ptr, EVENT_INCREMENT, FALSE); } static void thread_input_dump( struct object *obj, int verbose ) @@ -1027,10 +1066,13 @@ static VOID NTAPI -timer_callback( PKDPC Dpc, PVOID Context, PVOID SystemArgument1, PVOID SystemArgument2 ) +timer_callback_worker( PVOID Context ) { struct msg_queue *queue = Context; struct list *ptr; + + /* Free workitem */ + ExFreePool(queue->work_item); queue->timeout = NULL; /* move on to the next timer */ @@ -1038,6 +1080,21 @@ list_remove( ptr ); list_add_tail( &queue->expired_timers, ptr ); set_next_timer( queue ); +} + +static +VOID +NTAPI +timer_callback( PKDPC Dpc, PVOID Context, PVOID SystemArgument1, PVOID SystemArgument2 ) +{ + struct msg_queue *queue = Context; + + /* Allocate memory for the work iteam */ + queue->work_item = ExAllocatePool(NonPagedPool, sizeof(WORK_QUEUE_ITEM)); + + /* Queue a work item */ + ExInitializeWorkItem(queue->work_item, timer_callback_worker, queue); + ExQueueWorkItem(queue->work_item, DelayedWorkQueue); } /* link a timer at its rightful place in the queue list */ @@ -1495,7 +1552,7 @@ if (!thread) return; - if (thread->queue && (msg = mem_alloc( sizeof(*msg) ))) + if (thread->queue && (msg = ExAllocatePool( NonPagedPool, sizeof(*msg) ))) { msg->type = MSG_POSTED; msg->win = get_user_full_handle( win ); @@ -1522,7 +1579,7 @@ { struct message *msg; - if (thread->queue && (msg = mem_alloc( sizeof(*msg) ))) + if (thread->queue && (msg = ExAllocatePool( NonPagedPool, sizeof(*msg) ))) { struct winevent_msg_data *data; @@ -1577,7 +1634,8 @@ struct msg_queue *queue = get_current_queue(); reply->handle = 0; - if (queue) reply->handle = alloc_handle( (PPROCESSINFO)PsGetCurrentProcessWin32Process(), queue, SYNCHRONIZE, 0 ); + //if (queue) reply->handle = alloc_handle( (PPROCESSINFO)PsGetCurrentProcessWin32Process(), queue, SYNCHRONIZE, 0 ); + if (queue) reply->handle = (obj_handle_t)queue->wake_event; } @@ -1624,8 +1682,14 @@ if (is_signaled( queue )) { /* if skip wait is set, do what would have been done in the subsequent wait */ - if (req->skip_wait) msg_queue_satisfied( &queue->obj, (PTHREADINFO)PsGetCurrentThreadWin32Thread() ); - else wake_up( &queue->obj, 0 ); + if (req->skip_wait) + { + msg_queue_satisfied( &queue->obj, (PTHREADINFO)PsGetCurrentThreadWin32Thread() ); + } + else + { + KePulseEvent(queue->wake_event_ptr, EVENT_INCREMENT, FALSE); + } } } } @@ -1675,7 +1739,7 @@ return; } - if ((msg = mem_alloc( sizeof(*msg) ))) + if ((msg = ExAllocatePool( NonPagedPool, sizeof(*msg) ))) { msg->type = req->type; msg->win = get_user_full_handle( req->win ); @@ -1761,7 +1825,7 @@ data->y = req->y; data->info = req->info; - if ((msg = mem_alloc( sizeof(*msg) ))) + if ((msg = ExAllocatePool( NonPagedPool, sizeof(*msg) ))) { msg->type = MSG_HARDWARE; msg->win = get_user_full_handle( req->win ); Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/winesup.c [iso-8859-1] Wed Jul 22 10:53:28 2009 @@ -94,6 +94,8 @@ void wake_up( struct object *obj, int max ) { + DPRINT1("wake_up %p %d\n", obj, max); +#if 0 struct list *ptr, *next; LIST_FOR_EACH_SAFE( ptr, next, &obj->wait_queue ) @@ -107,6 +109,7 @@ if (max && !--max) break; }*/ } +#endif } void set_fd_events( struct fd *fd, int events )

1 0

[fireball] 42134: - It's fine to use kernel32's WaitForMultipleObjectsEx, it's going to be the same NtCreateEvent handle anyway. Thanks Alex for reminding. Win32k fix to follow.
by fireball＠svn.reactos.org 22 Jul '09

22 Jul '09

Author: fireball Date: Wed Jul 22 10:44:41 2009 New Revision: 42134 URL: http://svn.reactos.org/svn/reactos?rev=42134&view=rev Log: - It's fine to use kernel32's WaitForMultipleObjectsEx, it's going to be the same NtCreateEvent handle anyway. Thanks Alex for reminding. Win32k fix to follow. Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Wed Jul 22 10:44:41 2009 @@ -350,48 +350,11 @@ DWORD CDECL RosDrv_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) { - NTSTATUS status; - BOOL bWaitAll = FALSE, bAlertable = FALSE; - PLARGE_INTEGER TimePtr; - LARGE_INTEGER Time; + TRACE("WaitForMultipleObjectsEx(%d %p %d %x %x %x\n", count, handles, timeout, mask, flags); if (!count && !timeout) return WAIT_TIMEOUT; - - TRACE("WaitForMultipleObjectsEx(%d %p %d %x %x %x\n", count, handles, timeout, mask, flags); - - /* Set waitall and alertable flags */ - if (flags & MWMO_WAITALL) bWaitAll = TRUE; - if (flags & MWMO_ALERTABLE) bAlertable = TRUE; - - /* Check if this is an infinite wait */ - if (timeout == INFINITE) - { - /* Under NT, this means no timer argument */ - TimePtr = NULL; - } - else - { - /* Otherwise, convert the time to NT Format */ - Time.QuadPart = UInt32x32To64(-10000, timeout); - TimePtr = &Time; - } - - /* Call Nt function, because the handle we got is a NtCreateEvent one */ - status = NtWaitForMultipleObjects(count, - (PHANDLE)handles, - bWaitAll ? WaitAll : WaitAny, - bAlertable, - TimePtr); - - if (!NT_SUCCESS(status)) - { - /* Wait failed */ - WARN("Wait failed with status 0x%08x\n", status); - //SetLastErrorByStatus (status); - return WAIT_FAILED; - } - - return status; + return WaitForMultipleObjectsEx( count, handles, flags & MWMO_WAITALL, + timeout, flags & MWMO_ALERTABLE ); } void CDECL RosDrv_ReleaseDC( HWND hwnd, HDC hdc )

1 0

[fireball] 42133: - Fix user driver's MsgWaitForMultipleObjectsEx implementation to call native NtWaitForMultipleObjects instead of kernel32's WaitForMultipleObjects. Next commit will fix the corresponding win32k counter part to provide it a correct handle. Winex11.drv should be fixed in a similar way. - Disable move_window_bits invocation for now, so it doesn't distort the picture.
by fireball＠svn.reactos.org 22 Jul '09

22 Jul '09

Author: fireball Date: Wed Jul 22 10:31:39 2009 New Revision: 42133 URL: http://svn.reactos.org/svn/reactos?rev=42133&view=rev Log: - Fix user driver's MsgWaitForMultipleObjectsEx implementation to call native NtWaitForMultipleObjects instead of kernel32's WaitForMultipleObjects. Next commit will fix the corresponding win32k counter part to provide it a correct handle. Winex11.drv should be fixed in a similar way. - Disable move_window_bits invocation for now, so it doesn't distort the picture. Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c Modified: branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winen… ============================================================================== --- branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/winent.drv/userdrv.c [iso-8859-1] Wed Jul 22 10:31:39 2009 @@ -10,11 +10,14 @@ #include <stdarg.h> #include <stdio.h> +#define WIN32_NO_STATUS #include "windef.h" #include "winbase.h" #include "winuser.h" #include "winuser16.h" #include "wingdi.h" +#define NTOS_USER_MODE +#include <ndk/ntndk.h> #include "ntrosgdi.h" #include "winent.h" #include "wine/debug.h" @@ -28,7 +31,7 @@ * * Move the window bits when a window is moved. */ -static void move_window_bits( HWND hwnd, const RECT *old_rect, const RECT *new_rect, +void move_window_bits( HWND hwnd, const RECT *old_rect, const RECT *new_rect, const RECT *old_client_rect ) { RECT src_rect = *old_rect; @@ -347,8 +350,48 @@ DWORD CDECL RosDrv_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout, DWORD mask, DWORD flags ) { - return WaitForMultipleObjectsEx( count, handles, flags & MWMO_WAITALL, - timeout, flags & MWMO_ALERTABLE ); + NTSTATUS status; + BOOL bWaitAll = FALSE, bAlertable = FALSE; + PLARGE_INTEGER TimePtr; + LARGE_INTEGER Time; + + if (!count && !timeout) return WAIT_TIMEOUT; + + TRACE("WaitForMultipleObjectsEx(%d %p %d %x %x %x\n", count, handles, timeout, mask, flags); + + /* Set waitall and alertable flags */ + if (flags & MWMO_WAITALL) bWaitAll = TRUE; + if (flags & MWMO_ALERTABLE) bAlertable = TRUE; + + /* Check if this is an infinite wait */ + if (timeout == INFINITE) + { + /* Under NT, this means no timer argument */ + TimePtr = NULL; + } + else + { + /* Otherwise, convert the time to NT Format */ + Time.QuadPart = UInt32x32To64(-10000, timeout); + TimePtr = &Time; + } + + /* Call Nt function, because the handle we got is a NtCreateEvent one */ + status = NtWaitForMultipleObjects(count, + (PHANDLE)handles, + bWaitAll ? WaitAll : WaitAny, + bAlertable, + TimePtr); + + if (!NT_SUCCESS(status)) + { + /* Wait failed */ + WARN("Wait failed with status 0x%08x\n", status); + //SetLastErrorByStatus (status); + return WAIT_FAILED; + } + + return status; } void CDECL RosDrv_ReleaseDC( HWND hwnd, HDC hdc ) @@ -501,23 +544,21 @@ const RECT *window_rect, const RECT *rectClient, const RECT *visible_rect, const RECT *valid_rects ) { - void WINAPI DbgBreakPoint(void); - +#if 0 RECT old_whole_rect, old_client_rect; RECT whole_rect = *visible_rect; RECT client_rect = *rectClient; old_whole_rect = whole_rect; old_client_rect = client_rect; - - ERR("called\n"); +#endif + if (valid_rects) { ERR("valid_rects[0] (%d, %d)-(%d,%d)\n", valid_rects[0].top, valid_rects[0].left, valid_rects[0].bottom, valid_rects[0].right); - //DbgBreakPoint(); - } - + } +#if 0 if (!IsRectEmpty( &valid_rects[0] )) { int x_offset = old_whole_rect.left - whole_rect.left; @@ -540,6 +581,7 @@ else move_window_bits( hwnd, &valid_rects[1], &valid_rects[0], &old_client_rect ); } +#endif } /* EOF */

1 0

[ros-arm-bringup] 42132: - Prettify PFN dump output (add totals for each consumer and page type).
by ros-arm-bringup＠svn.reactos.org 22 Jul '09

22 Jul '09

Author: ros-arm-bringup Date: Wed Jul 22 09:52:47 2009 New Revision: 42132 URL: http://svn.reactos.org/svn/reactos?rev=42132&view=rev Log: - Prettify PFN dump output (add totals for each consumer and page type). Modified: trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Wed Jul 22 09:52:47 2009 @@ -728,6 +728,7 @@ PPHYSICAL_PAGE Pfn1; PCHAR State = "????", Consumer = "Unknown"; KIRQL OldIrql; + ULONG Totals[5] = {0}, BiosPages = 0, FreePages = 0; KeRaiseIrql(HIGH_LEVEL, &OldIrql); @@ -777,18 +778,21 @@ case MM_PHYSICAL_PAGE_USED: State = "Used"; + Totals[Pfn1->Flags.Consumer]++; break; case MM_PHYSICAL_PAGE_FREE: State = "Free"; Consumer = "Free"; + FreePages++; break; case MM_PHYSICAL_PAGE_BIOS: State = "BIOS"; Consumer = "System Reserved"; + BiosPages++; break; } @@ -804,6 +808,14 @@ Pfn1->LockCount, Pfn1->RmapListHead); } + + DbgPrint("Nonpaged Pool: %d pages\t[%d KB]\n", Totals[MC_NPPOOL], (Totals[MC_NPPOOL] << PAGE_SHIFT) / 1024); + DbgPrint("Paged Pool: %d pages\t[%d KB]\n", Totals[MC_PPOOL], (Totals[MC_PPOOL] << PAGE_SHIFT) / 1024); + DbgPrint("File System Cache: %d pages\t[%d KB]\n", Totals[MC_CACHE], (Totals[MC_CACHE] << PAGE_SHIFT) / 1024); + DbgPrint("Process Working Set: %d pages\t[%d KB]\n", Totals[MC_USER], (Totals[MC_USER] << PAGE_SHIFT) / 1024); + DbgPrint("System: %d pages\t[%d KB]\n", Totals[MC_SYSTEM], (Totals[MC_SYSTEM] << PAGE_SHIFT) / 1024); + DbgPrint("BIOS: %d pages\t[%d KB]\n", BiosPages, (BiosPages << PAGE_SHIFT) / 1024); + DbgPrint("Free: %d pages\t[%d KB]\n", FreePages, (FreePages << PAGE_SHIFT) / 1024); KeLowerIrql(OldIrql); }

1 0

[ros-arm-bringup] 42131: - Separe ARM3 Init into 3 defined phases: - 1: No PFN Database exists - 2: PFN Database exists - 3: ReactOS NP Pool exists (deprecated) - Cleanup ReactOS Mm init to work with this. - ARM3 Phase 1 Init now uses pages directly from the physical memory descriptor. - This similar to how "MmAllocEarlyPage" used to work. - A new function MxGetNextPage now does this. - MxGetNextPage can allocate more than just one page however (making it possible to get contiguous physical memo
by ros-arm-bringup＠svn.reactos.org 22 Jul '09

22 Jul '09

Author: ros-arm-bringup Date: Wed Jul 22 09:33:22 2009 New Revision: 42131 URL: http://svn.reactos.org/svn/reactos?rev=42131&view=rev Log: - Separe ARM3 Init into 3 defined phases: - 1: No PFN Database exists - 2: PFN Database exists - 3: ReactOS NP Pool exists (deprecated) - Cleanup ReactOS Mm init to work with this. - ARM3 Phase 1 Init now uses pages directly from the physical memory descriptor. - This similar to how "MmAllocEarlyPage" used to work. - A new function MxGetNextPage now does this. - MxGetNextPage can allocate more than just one page however (making it possible to get contiguous physical memory without going through the PFN-based MmAllocateContiguousMemory beast) - Also MxGetNextPage will bugcheck with INSTALL_MORE_MEMORY if it runs out of pages. - Renamed the physical memory descriptor variables to MxFreeDescriptor, MxOldFreeDescriptor instead of MiFreeDescriptor and MiOrgFreeDescriptor (based on NT symbols) - Nonpaged pool PDEs, PFN database PDEs, and initial nonpaged pool PTEs are now allocated through MxGetNextPage. - Fix an off by one error in the sizing of MxPfnAllocation. - The PFN database is now fully "owned" by ARM3 in terms of its PDE mappings and VA location at 0xB0000000. - ie. MmArmPfnDatabase is now MmPfnDatabase. - The actual PFN database entries and setup are still done by the ReactOS Mm. - Got rid of ARM nonpaged pool allocator test. - Repositioned ReactOS nonpaged pool (deprecated) after the boot image (used to be after the PFN database). - Paged pool follows. Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Wed Jul 22 09:33:22 2009 @@ -1,8 +1,8 @@ /* * PROJECT: ReactOS Kernel * LICENSE: BSD - See COPYING.ARM in the top level directory - * FILE: ntoskrnl/mm/ARM3/init.c - * PURPOSE: ARM Memory Manager Initialization + * FILE: ntoskrnl/mm/ARM3/i386/init.c + * PURPOSE: ARM Memory Manager Initialization for x86 * PROGRAMMERS: ReactOS Portable Systems Group */ @@ -109,14 +109,25 @@ ULONG MxPfnAllocation; // -// The ARMÂ³ PFN Database -// -PMMPFN MmArmPfnDatabase; - -// // This structure describes the different pieces of RAM-backed address space // PPHYSICAL_MEMORY_DESCRIPTOR MmPhysicalMemoryBlock; + +// +// Before we have a PFN database, memory comes straight from our physical memory +// blocks, which is nice because it's guaranteed contiguous and also because once +// we take a page from here, the system doesn't see it anymore. +// However, once the fun is over, those pages must be re-integrated back into +// PFN society life, and that requires us keeping a copy of the original layout +// so that we can parse it later. +// +PMEMORY_ALLOCATION_DESCRIPTOR MxFreeDescriptor; +MEMORY_ALLOCATION_DESCRIPTOR MxOldFreeDescriptor; + +// +// This is where we keep track of the most basic physical layout markers +// +ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage; /* PRIVATE FUNCTIONS **********************************************************/ @@ -141,6 +152,35 @@ MmGlobalKernelPageDirectory[Pde] = ((PULONG)PDE_BASE)[Pde]; Pde++; } +} + +PFN_NUMBER +NTAPI +MxGetNextPage(IN PFN_NUMBER PageCount) +{ + PFN_NUMBER Pfn; + + // + // Make sure we have enough pages + // + if (PageCount > MxFreeDescriptor->PageCount) + { + // + // Crash the system + // + KeBugCheckEx(INSTALL_MORE_MEMORY, + MmNumberOfPhysicalPages, + MxFreeDescriptor->PageCount, + MxOldFreeDescriptor.PageCount, + PageCount); + } + + // + // Use our highest usable free pages + // + Pfn = MxFreeDescriptor->BasePage + MxFreeDescriptor->PageCount - PageCount; + MxFreeDescriptor->PageCount -= PageCount; + return Pfn; } PPHYSICAL_MEMORY_DESCRIPTOR @@ -284,8 +324,11 @@ MmArmInitSystem(IN ULONG Phase, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { + PLIST_ENTRY NextEntry; + PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; + ULONG FreePages = 0; PMEMORY_AREA MArea; - PHYSICAL_ADDRESS BoundaryAddressMultiple, Low, High; + PHYSICAL_ADDRESS BoundaryAddressMultiple; PFN_NUMBER PageFrameIndex; PMMPTE StartPde, EndPde, PointerPte, LastPte; MMPTE TempPde = HyperTemplatePte, TempPte = HyperTemplatePte; @@ -294,8 +337,7 @@ ULONG OldCount; BOOLEAN IncludeType[LoaderMaximum]; ULONG i; - BoundaryAddressMultiple.QuadPart = Low.QuadPart = 0; - High.QuadPart = -1; + BoundaryAddressMultiple.QuadPart = 0; if (Phase == 0) { @@ -314,6 +356,95 @@ RtlZeroMemory(StartPde, (EndPde - StartPde) * sizeof(MMPTE)); // + // Loop the memory descriptors + // + NextEntry = LoaderBlock->MemoryDescriptorListHead.Flink; + while (NextEntry != &LoaderBlock->MemoryDescriptorListHead) + { + // + // Get the memory block + // + MdBlock = CONTAINING_RECORD(NextEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + + // + // Skip invisible memory + // + if ((MdBlock->MemoryType != LoaderFirmwarePermanent) && + (MdBlock->MemoryType != LoaderSpecialMemory) && + (MdBlock->MemoryType != LoaderHALCachedMemory) && + (MdBlock->MemoryType != LoaderBBTMemory)) + { + // + // Check if BURNMEM was used + // + if (MdBlock->MemoryType != LoaderBad) + { + // + // Count this in the total of pages + // + MmNumberOfPhysicalPages += MdBlock->PageCount; + } + + // + // Check if this is the new lowest page + // + if (MdBlock->BasePage < MmLowestPhysicalPage) + { + // + // Update the lowest page + // + MmLowestPhysicalPage = MdBlock->BasePage; + } + + // + // Check if this is the new highest page + // + PageFrameIndex = MdBlock->BasePage + MdBlock->PageCount; + if (PageFrameIndex > MmHighestPhysicalPage) + { + // + // Update the highest page + // + MmHighestPhysicalPage = PageFrameIndex - 1; + } + + // + // Check if this is free memory + // + if ((MdBlock->MemoryType == LoaderFree) || + (MdBlock->MemoryType == LoaderLoadedProgram) || + (MdBlock->MemoryType == LoaderFirmwareTemporary) || + (MdBlock->MemoryType == LoaderOsloaderStack)) + { + // + // Check if this is the largest memory descriptor + // + if (MdBlock->PageCount > FreePages) + { + // + // For now, it is + // + FreePages = MdBlock->PageCount; + MxFreeDescriptor = MdBlock; + } + } + } + + // + // Keep going + // + NextEntry = MdBlock->ListEntry.Flink; + } + + // + // Save original values of the free descriptor, since it'll be + // altered by early allocations + // + MxOldFreeDescriptor = *MxFreeDescriptor; + + // // Check if this is a machine with less than 19MB of RAM // if (MmNumberOfPhysicalPages < MI_MIN_PAGES_FOR_SYSPTE_TUNING) @@ -434,6 +565,16 @@ // MxPfnAllocation = (MmHighestPhysicalPage + 1) * sizeof(MMPFN); MxPfnAllocation >>= PAGE_SHIFT; + + // + // We have to add one to the count here, because in the process of + // shifting down to the page size, we actually ended up getting the + // lower aligned size (so say, 0x5FFFF bytes is now 0x5F pages). + // Later on, we'll shift this number back into bytes, which would cause + // us to end up with only 0x5F000 bytes -- when we actually want to have + // 0x60000 bytes. + // + MxPfnAllocation++; // // Now calculate the nonpaged pool expansion VA region @@ -482,35 +623,23 @@ // with the old memory manager, so we'll create a "Shadow PFN Database" // instead, and arbitrarly start it at 0xB0000000. // - MmArmPfnDatabase = (PVOID)0xB0000000; - ASSERT(((ULONG_PTR)MmArmPfnDatabase & ((4 * 1024 * 1024) - 1)) == 0); + MmPfnDatabase = (PVOID)0xB0000000; + ASSERT(((ULONG_PTR)MmPfnDatabase & ((4 * 1024 * 1024) - 1)) == 0); // // Non paged pool comes after the PFN database // - MmNonPagedPoolStart = (PVOID)((ULONG_PTR)MmArmPfnDatabase + + MmNonPagedPoolStart = (PVOID)((ULONG_PTR)MmPfnDatabase + (MxPfnAllocation << PAGE_SHIFT)); // // Now we actually need to get these many physical pages. Nonpaged pool // is actually also physically contiguous (but not the expansion) // - PageFrameIndex = MmGetContinuousPages(MmSizeOfNonPagedPoolInBytes + - (MxPfnAllocation << PAGE_SHIFT), - Low, - High, - BoundaryAddressMultiple, - FALSE); + PageFrameIndex = MxGetNextPage(MxPfnAllocation + + (MmSizeOfNonPagedPoolInBytes >> PAGE_SHIFT)); ASSERT(PageFrameIndex != 0); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmArmPfnDatabase, - (ULONG_PTR)MmArmPfnDatabase + (MxPfnAllocation << PAGE_SHIFT), - "Shadow PFN Database"); DPRINT("PFN DB PA PFN begins at: %lx\n", PageFrameIndex); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmNonPagedPoolStart, - (ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes, - "ARM Non Paged Pool"); DPRINT("NP PA PFN begins at: %lx\n", PageFrameIndex + MxPfnAllocation); // @@ -529,7 +658,7 @@ // // Get a page // - TempPde.u.Hard.PageFrameNumber = MmAllocPage(MC_SYSTEM, 0); + TempPde.u.Hard.PageFrameNumber = MxGetNextPage(1); ASSERT(TempPde.u.Hard.Valid == 1); *StartPde = TempPde; @@ -548,7 +677,7 @@ // // Now we need pages for the page tables which will map initial NP // - StartPde = MiAddressToPde(MmArmPfnDatabase); + StartPde = MiAddressToPde(MmPfnDatabase); EndPde = MiAddressToPde((PVOID)((ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes - 1)); while (StartPde <= EndPde) @@ -561,7 +690,7 @@ // // Get a page // - TempPde.u.Hard.PageFrameNumber = MmAllocPage(MC_SYSTEM, 0); + TempPde.u.Hard.PageFrameNumber = MxGetNextPage(1); ASSERT(TempPde.u.Hard.Valid == 1); *StartPde = TempPde; @@ -581,12 +710,6 @@ // Now remember where the expansion starts // MmNonPagedPoolExpansionStart = NonPagedPoolExpansionVa; - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmNonPagedSystemStart, MmNonPagedPoolExpansionStart, - "System PTE Space"); - DPRINT1(" 0x%p - 0x%p\t%s\n", - MmNonPagedPoolExpansionStart, MmNonPagedPoolEnd, - "Non Paged Pool Expansion PTE Space"); // // Last step is to actually map the nonpaged pool @@ -646,6 +769,13 @@ // Now go ahead and initialize the ARM pool // MiInitializeArmPool(); + } + else if (Phase == 1) // IN BETWEEN, THE PFN DATABASE IS NOW CREATED + { + // + // Initialize the nonpaged pool + // + InitializePool(NonPagedPool, 0); // // We PDE-aligned the nonpaged system start VA, so haul some extra PTEs! @@ -707,36 +837,28 @@ // Sync us up with ReactOS Mm // MiSyncARM3WithROS(MmNonPagedSystemStart, (PVOID)((ULONG_PTR)MmNonPagedPoolEnd - 1)); - MiSyncARM3WithROS(MmArmPfnDatabase, (PVOID)((ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes - 1)); + MiSyncARM3WithROS(MmPfnDatabase, (PVOID)((ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes - 1)); MiSyncARM3WithROS((PVOID)HYPER_SPACE, (PVOID)(HYPER_SPACE + PAGE_SIZE - 1)); - - // - // Initialize the nonpaged pool - // - InitializePool(NonPagedPool, 0); - - // - // Do a little test of the nonpaged pool allocator - // - if (0) - { - ULONG i = 0; - PVOID Buffers[4096]; - while (TRUE) - { - Buffers[i] = MiAllocatePoolPages(NonPagedPool, PAGE_SIZE); - if (!Buffers[i]) break; - if (i == 4096) break; - i++; - } - - while (i--) - { - MiFreePoolPages(Buffers[i]); - } - } + + // + // Print the memory layout + // + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmPfnDatabase, + (ULONG_PTR)MmPfnDatabase + (MxPfnAllocation << PAGE_SHIFT), + "PFN Database"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmNonPagedPoolStart, + (ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes, + "ARM Non Paged Pool"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmNonPagedSystemStart, MmNonPagedPoolExpansionStart, + "System PTE Space"); + DPRINT1(" 0x%p - 0x%p\t%s\n", + MmNonPagedPoolExpansionStart, MmNonPagedPoolEnd, + "Non Paged Pool Expansion PTE Space"); } - else + else // NOW WE HAVE NONPAGED POOL { // // Instantiate memory that we don't consider RAM/usable Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Wed Jul 22 09:33:22 2009 @@ -105,6 +105,9 @@ extern ULONG MmBootImageSize; extern PMMPTE MmSystemPtesStart[MaximumPtePoolTypes]; extern PMMPTE MmSystemPtesEnd[MaximumPtePoolTypes]; +extern PMEMORY_ALLOCATION_DESCRIPTOR MxFreeDescriptor; +extern MEMORY_ALLOCATION_DESCRIPTOR MxOldFreeDescriptor; +extern ULONG MxPfnAllocation; VOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Wed Jul 22 09:33:22 2009 @@ -713,8 +713,8 @@ PFN_TYPE Pfn; /* Use one of our highest usable pages */ - Pfn = MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount - 1; - MiFreeDescriptor->PageCount--; + Pfn = MxFreeDescriptor->BasePage + MxFreeDescriptor->PageCount - 1; + MxFreeDescriptor->PageCount--; /* Return it */ return Pfn; @@ -813,7 +813,6 @@ MmInitializePageList(VOID) { ULONG i; - ULONG Reserved; NTSTATUS Status; PFN_TYPE Pfn = 0; PHYSICAL_PAGE UsedPage; @@ -824,12 +823,9 @@ InitializeListHead(&UserPageListHead); InitializeListHead(&FreeUnzeroedPageListHead); InitializeListHead(&FreeZeroedPageListHead); - - /* Set the size and start of the PFN Database */ - Reserved = PAGE_ROUND_UP((MmHighestPhysicalPage * sizeof(PHYSICAL_PAGE))) / PAGE_SIZE; /* Loop every page required to hold the PFN database */ - for (i = 0; i < Reserved; i++) + for (i = 0; i < MxPfnAllocation; i++) { PVOID Address = (char*)MmPfnDatabase + (i * PAGE_SIZE); @@ -924,10 +920,10 @@ } } } - + /* Finally handle the pages describing the PFN database themselves */ - for (i = (MiFreeDescriptor->BasePage + MiFreeDescriptor->PageCount); - i < (MiFreeDescriptorOrg.BasePage + MiFreeDescriptorOrg.PageCount); + for (i = (MxFreeDescriptor->BasePage + MxFreeDescriptor->PageCount); + i < (MxOldFreeDescriptor.BasePage + MxOldFreeDescriptor.PageCount); i++) { /* Ensure this page was not added previously */ Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Wed Jul 22 09:33:22 2009 @@ -48,10 +48,6 @@ PVOID MiNonPagedPoolStart; ULONG MiNonPagedPoolLength; ULONG MmBootImageSize; -ULONG MmNumberOfPhysicalPages, MmHighestPhysicalPage, MmLowestPhysicalPage; -ULONG_PTR MmPfnDatabaseEnd; -PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; -MEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptorOrg; ULONG MmUserProbeAddress = 0; PVOID MmHighestUserAddress = NULL; PBOOLEAN Mm64BitPhysicalAddress = FALSE; @@ -115,88 +111,6 @@ VOID NTAPI -MiCountFreePagesInLoaderBlock(PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - PLIST_ENTRY NextEntry; - PMEMORY_ALLOCATION_DESCRIPTOR Md; - ULONG FreePages = 0; - - for (NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; - NextEntry != &KeLoaderBlock->MemoryDescriptorListHead; - NextEntry = NextEntry->Flink) - { - Md = CONTAINING_RECORD(NextEntry, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry); - - /* Skip invisible memory */ - if ((Md->MemoryType != LoaderFirmwarePermanent) && - (Md->MemoryType != LoaderSpecialMemory) && - (Md->MemoryType != LoaderHALCachedMemory) && - (Md->MemoryType != LoaderBBTMemory)) - { - /* Check if BURNMEM was used */ - if (Md->MemoryType != LoaderBad) - { - /* Count this in the total of pages */ - MmNumberOfPhysicalPages += Md->PageCount; - } - - /* Check if this is the new lowest page */ - if (Md->BasePage < MmLowestPhysicalPage) - { - /* Update the lowest page */ - MmLowestPhysicalPage = Md->BasePage; - } - - /* Check if this is the new highest page */ - if ((Md->BasePage + Md->PageCount) > MmHighestPhysicalPage) - { - /* Update the highest page */ - MmHighestPhysicalPage = Md->BasePage + Md->PageCount - 1; - } - - /* Check if this is free memory */ - if ((Md->MemoryType == LoaderFree) || - (Md->MemoryType == LoaderLoadedProgram) || - (Md->MemoryType == LoaderFirmwareTemporary) || - (Md->MemoryType == LoaderOsloaderStack)) - { - /* Check if this is the largest memory descriptor */ - if (Md->PageCount > FreePages) - { - /* For now, it is */ - FreePages = Md->PageCount; - MiFreeDescriptor = Md; - } - } - } - } - - /* Save original values of the free descriptor, since it'll be - altered by early allocations */ - MiFreeDescriptorOrg = *MiFreeDescriptor; -} - -VOID -NTAPI -MiDbgKernelLayout(VOID) -{ - DPRINT1("%8s%12s\t\t%s\n", "Start", "End", "Type"); - DPRINT1("0x%p - 0x%p\t%s\n", - MmSystemRangeStart, (ULONG_PTR)MmSystemRangeStart + MmBootImageSize, - "Boot Image Mapping Region"); - DPRINT1("0x%p - 0x%p\t%s\n", - MmPfnDatabase, MmPfnDatabaseEnd, - "PFN Database region"); - DPRINT1("0x%p - 0x%p\t%s\n", - MiNonPagedPoolStart, (ULONG_PTR)MiNonPagedPoolStart + MiNonPagedPoolLength, - "Non paged pool region"); - DPRINT1("0x%p - 0x%p\t%s\n", - MmPagedPoolBase, (ULONG_PTR)MmPagedPoolBase + MmPagedPoolSize, - "Paged pool region"); -} - -VOID -NTAPI MiDbgDumpMemoryDescriptors(VOID) { PLIST_ENTRY NextEntry; @@ -225,7 +139,12 @@ INIT_FUNCTION NTAPI MmInit1(VOID) -{ +{ + /* Initialize the kernel address space */ + KeInitializeGuardedMutex(&PsGetCurrentProcess()->AddressCreationLock); + MmKernelAddressSpace = MmGetCurrentAddressSpace(); + MmInitGlobalKernelPageDirectory(); + /* Dump memory descriptors */ if (MiDbgEnableMdDump) MiDbgDumpMemoryDescriptors(); @@ -237,62 +156,46 @@ MmSystemRangeStart = (PVOID)KSEG0_BASE; MmUserProbeAddress = (ULONG_PTR)MmSystemRangeStart - 0x10000; MmHighestUserAddress = (PVOID)(MmUserProbeAddress - 1); - DPRINT("MmSystemRangeStart: %08x\n", MmSystemRangeStart); - DPRINT("MmUserProbeAddress: %08x\n", MmUserProbeAddress); - DPRINT("MmHighestUserAddress:%08x\n", MmHighestUserAddress); - - /* Count RAM */ - MiCountFreePagesInLoaderBlock(KeLoaderBlock); - DbgPrint("Used memory %dKb\n", (MmNumberOfPhysicalPages * PAGE_SIZE) / 1024); - - /* Initialize the kernel address space */ - KeInitializeGuardedMutex(&PsGetCurrentProcess()->AddressCreationLock); - MmKernelAddressSpace = MmGetCurrentAddressSpace(); - MmInitGlobalKernelPageDirectory(); - - /* We'll put the PFN array right after the loaded modules */ - MmPfnDatabase = (PVOID)((ULONG_PTR)MmSystemRangeStart + MmBootImageSize); - MmPfnDatabaseEnd = (ULONG_PTR)MmPfnDatabase + (MmHighestPhysicalPage * sizeof(MMPFN)); - MmPfnDatabaseEnd = PAGE_ROUND_UP(MmPfnDatabaseEnd); - - /* Put nonpaged pool after the PFN database */ - MiNonPagedPoolStart = (PVOID)MmPfnDatabaseEnd; - - /* Length of non-paged pool */ - MiNonPagedPoolLength = MM_NONPAGED_POOL_SIZE; - - /* Put the paged pool after the non-paged pool */ + + // + // Initialize ARMÂ³ in phase 0 + // + MmArmInitSystem(0, KeLoaderBlock); + + /* Intialize system memory areas */ + MiInitSystemMemoryAreas(); + + /* Initialize the page list */ + MmInitializePageList(); + + // + // Initialize ARMÂ³ in phase 1 + // + MmArmInitSystem(1, KeLoaderBlock); + // DEPRECATED + /* Put nonpaged pool after the loaded modules */ // DEPRECATED + MiNonPagedPoolStart = (PVOID)((ULONG_PTR)MmSystemRangeStart + // DEPRECATED + MmBootImageSize); // DEPRECATED + MiNonPagedPoolLength = MM_NONPAGED_POOL_SIZE; // DEPRECATED + // DEPRECATED + /* Initialize nonpaged pool */ // DEPRECATED + MiInitializeNonPagedPool(); // DEPRECATED + // DEPRECATED + // + // Initialize ARMÂ³ in phase 2 + // + MmArmInitSystem(2, KeLoaderBlock); + + /* Put the paged pool after nonpaged pool */ MmPagedPoolBase = (PVOID)PAGE_ROUND_UP((ULONG_PTR)MiNonPagedPoolStart + MiNonPagedPoolLength); MmPagedPoolSize = MM_PAGED_POOL_SIZE; - /* Dump kernel memory layout */ - MiDbgKernelLayout(); - - /* Intialize system memory areas */ - MiInitSystemMemoryAreas(); - - /* Initialize the page list */ - MmInitializePageList(); - - // - // Initialize ARMÂ³ in phase 0 - // - MmArmInitSystem(0, KeLoaderBlock); - - /* Initialize nonpaged pool */ - MiInitializeNonPagedPool(); - /* Initialize paged pool */ MmInitializePagedPool(); /* Initialize working sets */ MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); - - // - // Initialize ARMÂ³ in phase 1 - // - MmArmInitSystem(1, KeLoaderBlock); } BOOLEAN

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs