Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[fireball] 42141: - Silent debug prints in eng/engsurf.c. - Fix a typo in the comments of gdi/misc.c. - Offset source point in BitBlt by vport origin too. - Offset coordinates once in GreTextOut, so that SharpGlyphMono works with already offsetted device coordinates. - Offset coordinates by vport origin in GrePolyline and GreRectangle.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Jul 22 14:17:20 2009 New Revision: 42141 URL: http://svn.reactos.org/svn/reactos?rev=42141&view=rev Log: - Silent debug prints in eng/engsurf.c. - Fix a typo in the comments of gdi/misc.c. - Offset source point in BitBlt by vport origin too. - Offset coordinates once in GreTextOut, so that SharpGlyphMono works with already offsetted device coordinates. - Offset coordinates by vport origin in GrePolyline and GreRectangle. Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c branches/arwinss/reactos/subsystems/win32/win32k/gdi/misc.c branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/eng/engsurf.c [iso-8859-1] Wed Jul 22 14:17:20 2009 @@ -9,7 +9,7 @@ /* INCLUDES ******************************************************************/ #include <win32k.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> /* PUBLIC FUNCTIONS **********************************************************/ 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 14:17:20 2009 @@ -197,7 +197,7 @@ /* Get a pointer to the DC */ pDC = GDI_GetObjPtr(physDev, (SHORT)GDI_OBJECT_TYPE_DC); - /* Draw the polygon */ + /* Draw the polyline */ GrePolyline(pDC, pt, count); /* Release the object */ Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] Wed Jul 22 14:17:20 2009 @@ -182,8 +182,8 @@ if (pSrc) { - SourcePoint.x += pSrc->rcDcRect.left; - SourcePoint.y += pSrc->rcDcRect.top; + SourcePoint.x += pSrc->rcDcRect.left + pSrc->rcVport.left; + SourcePoint.y += pSrc->rcDcRect.top + pSrc->rcVport.left; } /* Perform the bitblt operation */ 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 14:17:20 2009 @@ -62,14 +62,13 @@ } while (bits & bitsMask); rcBounds.left = xspan; rcBounds.top = y; rcBounds.right = xspan+lenspan; rcBounds.bottom = y+1; - RECTL_vOffsetRect(&rcBounds, physDev->rcVport.left, physDev->rcVport.top); GreLineTo(&physDev->pBitmap->SurfObj, NULL, &textBrush, - xspan + physDev->rcVport.left, - y + physDev->rcVport.top, - xspan + lenspan + physDev->rcVport.left, - y + physDev->rcVport.top, + xspan, + y, + xspan + lenspan, + y, &rcBounds, 0); xspan += lenspan; @@ -158,8 +157,8 @@ //sharp_glyph_fn = SharpGlyphGray; for(idx = 0; idx < count; idx++) { - sharp_glyph_fn(pDC, pDC->rcDcRect.left + x + xoff, - pDC->rcDcRect.top + y + yoff, + sharp_glyph_fn(pDC, pDC->rcDcRect.left + pDC->rcVport.left + x + xoff, + pDC->rcDcRect.top + pDC->rcVport.top + y + yoff, formatEntry->bitmaps[wstr[idx]], &formatEntry->gis[wstr[idx]]); if(lpDx) { Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/lineto.c [iso-8859-1] Wed Jul 22 14:17:20 2009 @@ -124,10 +124,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 + pDC->rcDcRect.left + pDC->rcVport.left, + ptPoints[i].y + pDC->rcDcRect.top + pDC->rcVport.top, + ptPoints[i+1].x + pDC->rcDcRect.left + pDC->rcVport.left, + ptPoints[i+1].y + pDC->rcDcRect.top + pDC->rcVport.top, &DestRect, // Bounding rectangle Mix); } 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 14:17:20 2009 @@ -27,10 +27,10 @@ MIX Mix; POINT BrushOrigin = {0, 0}; - DestRect.left = LeftRect + pDC->rcDcRect.left; - DestRect.right = RightRect + pDC->rcDcRect.left; - DestRect.top = TopRect + pDC->rcDcRect.top; - DestRect.bottom = BottomRect + pDC->rcDcRect.top; + DestRect.left = LeftRect + pDC->rcDcRect.left + pDC->rcVport.left; + DestRect.right = RightRect + pDC->rcDcRect.left + pDC->rcVport.left; + DestRect.top = TopRect + pDC->rcDcRect.top + pDC->rcVport.top; + DestRect.bottom = BottomRect + pDC->rcDcRect.top + pDC->rcVport.top; /* Draw brush-based rectangle */ if (pDC->pFillBrush)

15 years, 5 months

[mkupfer] 42140: fix a minor translation mistake

by mkupfer＠svn.reactos.org

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

15 years, 5 months

[khornicek] 42139: - draw text with the foreground color

by khornicek＠svn.reactos.org

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,

15 years, 5 months

[fireball] 42138: - Add missing braces to prevent PVOID pointer arithmetic.

by fireball＠svn.reactos.org

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)))

15 years, 5 months

[fireball] 42137: - Add user buffer probing and copying to RosGdiPolygon. - Offset all points before calling the GrePolygon function.

by fireball＠svn.reactos.org

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); }

15 years, 5 months

[fireball] 42136: - Remove wake_up, this became an unneeded wineism now. - Silence timeout_user debug prints.

by fireball＠svn.reactos.org

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 )

15 years, 5 months

[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

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 )

15 years, 5 months

[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

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 )

15 years, 5 months

[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

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 */

15 years, 5 months

[ros-arm-bringup] 42132: - Prettify PFN dump output (add totals for each consumer and page type).

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

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); }

15 years, 5 months

← Newer
1
...
16
17
18
19
20
21
22
...
61
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2009