Ros-diffs July 2006

ros-diffs@reactos.org

19 participants
662 discussions

[mbosma] 23048: another sizeof I overlooked
by mbosma＠svn.reactos.org 13 Jul '06

13 Jul '06

Author: mbosma Date: Fri Jul 14 01:23:08 2006 New Revision: 23048 URL: http://svn.reactos.org/svn/reactos?rev=23048&view=rev Log: another sizeof I overlooked Modified: branches/cache_manager_rewrite/mm/section.c Modified: branches/cache_manager_rewrite/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/cache_manager_rewrite/mm/sectio… ============================================================================== --- branches/cache_manager_rewrite/mm/section.c (original) +++ branches/cache_manager_rewrite/mm/section.c Fri Jul 14 01:23:08 2006 @@ -4376,7 +4376,7 @@ ObjectAttributes, ExGetPreviousMode(), NULL, - sizeof(SECTION_OBJECT), + sizeof(ROS_SECTION_OBJECT), 0, 0, (PVOID*)(PVOID)&Section);

1 0

[greatlrd] 23047: 1. Fixing so the screensaver only start one time when ReactOS starting. 2. Fixing so the screensaver do not restart it self. Alesky here is the bugfix I promies, it will not longer see alot start screen msg. One bug remains before the reg key will be adding as defualt for matrix.scr so it can run from livecd as well
by greatlrd＠svn.reactos.org 13 Jul '06

13 Jul '06

Author: greatlrd Date: Fri Jul 14 01:21:30 2006 New Revision: 23047 URL: http://svn.reactos.org/svn/reactos?rev=23047&view=rev Log: 1. Fixing so the screensaver only start one time when ReactOS starting. 2. Fixing so the screensaver do not restart it self. Alesky here is the bugfix I promies, it will not longer see alot start screen msg. One bug remains before the reg key will be adding as defualt for matrix.scr so it can run from livecd as well Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c Fri Jul 14 01:21:30 2006 @@ -167,6 +167,7 @@ UINT ScreenSaverTimeOut = 0; BOOL nPreviousState = FALSE; NTSTATUS Status; + BOOL FristTime = TRUE; KeSetPriorityThread(&PsGetCurrentThread()->Tcb, @@ -216,18 +217,25 @@ (nPreviousState == FALSE)) { BOOL nPreviousState = FALSE; - DPRINT("Keyboard and Mouse TimeOut Starting Screen Saver ...\n"); - DPRINT(" %I64d Keyboard Timeout Value\n",DiffTimeKeyboard.QuadPart); - DPRINT(" %I64d Mouse Timeout Value \n",DiffTimeMouse.QuadPart); - DPRINT(" %I64d TimeOut \n",DiffTimeMouse.QuadPart); - - CSR_API_MESSAGE Request; - CsrInit(); - Request.Type = MAKE_CSR_API(START_SCREEN_SAVER, CSR_GUI); - Request.Data.StartScreenSaver.Start = TRUE; - co_CsrNotifyScreenSaver(&Request ); - - IntSystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &nPreviousState, 0); + DPRINT1("Keyboard and Mouse TimeOut Starting Screen Saver ...\n"); + DPRINT1(" %I64d Keyboard Timeout Value\n",DiffTimeKeyboard.QuadPart); + DPRINT1(" %I64d Mouse Timeout Value \n",DiffTimeMouse.QuadPart); + DPRINT1(" %I64d TimeOut \n",DiffTimeMouse.QuadPart); + + if (FristTime == FALSE) + { + CSR_API_MESSAGE Request; + CsrInit(); + Request.Type = MAKE_CSR_API(START_SCREEN_SAVER, CSR_GUI); + Request.Data.StartScreenSaver.Start = TRUE; + co_CsrNotifyScreenSaver(&Request ); + + IntSystemParametersInfo(SPI_SETSCREENSAVERRUNNING, TRUE, &nPreviousState, 0); + } + else + { + FristTime = FALSE; + } } if ( (DiffTimeMouse.QuadPart < Timeout.QuadPart) && Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c Fri Jul 14 01:21:30 2006 @@ -1020,16 +1020,14 @@ return TRUE; break; case SPI_SETFLATMENU: - WinStaObject->FlatMenu = uiParam; - return TRUE; + WinStaObject->FlatMenu = uiParam; break; case SPI_GETSCREENSAVETIMEOUT: if (pvParam != NULL) *((UINT*)pvParam) = WinStaObject->ScreenSaverTimeOut; return TRUE; break; case SPI_SETSCREENSAVETIMEOUT: - WinStaObject->ScreenSaverTimeOut = uiParam; - return TRUE; + WinStaObject->ScreenSaverTimeOut = uiParam; break; case SPI_GETSCREENSAVERRUNNING: if (pvParam != NULL) *((BOOL*)pvParam) = WinStaObject->ScreenSaverRunning; @@ -1037,8 +1035,7 @@ break; case SPI_SETSCREENSAVERRUNNING: if (pvParam != NULL) *((BOOL*)pvParam) = WinStaObject->ScreenSaverRunning; - WinStaObject->ScreenSaverRunning = uiParam; - return TRUE; + WinStaObject->ScreenSaverRunning = uiParam; break; case SPI_GETWHEELSCROLLLINES: CurInfo = IntGetSysCursorInfo(WinStaObject);

1 0

[fireball] 23046: Added a check for a non-null WndProc into IntCallWndProcA/W. Instead of bugchecking, it shows a DPRINT1 now to inform about a bug. As a side effect, mIRC now works in ReactOS.
by fireball＠svn.reactos.org 13 Jul '06

13 Jul '06

Author: fireball Date: Fri Jul 14 00:47:59 2006 New Revision: 23046 URL: http://svn.reactos.org/svn/reactos?rev=23046&view=rev Log: Added a check for a non-null WndProc into IntCallWndProcA/W. Instead of bugchecking, it shows a DPRINT1 now to inform about a bug. As a side effect, mIRC now works in ReactOS. Modified: trunk/reactos/dll/win32/user32/windows/message.c Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c (original) +++ trunk/reactos/dll/win32/user32/windows/message.c Fri Jul 14 00:47:59 2006 @@ -1141,6 +1141,12 @@ MSG UnicodeMsg; LRESULT Result; + if (WndProc == NULL) + { + DPRINT1("IntCallWindowsProcW() called with WndProc = NULL!\n"); + return FALSE; + } + if (IsAnsiProc) { UnicodeMsg.hwnd = hWnd; @@ -1176,6 +1182,12 @@ MSG AnsiMsg; MSG UnicodeMsg; LRESULT Result; + + if (WndProc == NULL) + { + DPRINT1("IntCallWindowsProcA() called with WndProc = NULL!\n"); + return FALSE; + } if (IsAnsiProc) {

1 0

[ion] 23045: [FORMATTING] - Cleanup timer.c
by ion＠svn.reactos.org 13 Jul '06

13 Jul '06

Author: ion Date: Thu Jul 13 23:43:10 2006 New Revision: 23045 URL: http://svn.reactos.org/svn/reactos?rev=23045&view=rev Log: [FORMATTING] - Cleanup timer.c Modified: trunk/reactos/ntoskrnl/ke/timer.c Modified: trunk/reactos/ntoskrnl/ke/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/timer.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ke/timer.c (original) +++ trunk/reactos/ntoskrnl/ke/timer.c Thu Jul 13 23:43:10 2006 @@ -1,98 +1,230 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/ke/timer.c * PURPOSE: Handle Kernel Timers (Kernel-part of Executive Timers) - * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) - Reimplemented some parts, fixed many bugs. - * David Welch (welch(a)mcmail.com) & Phillip Susi - Original Implementation. + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * David Welch (welch(a)mcmail.com) */ /* INCLUDES ***************************************************************/ #include <ntoskrnl.h> - #define NDEBUG #include <internal/debug.h> /* GLOBALS ****************************************************************/ LIST_ENTRY KiTimerListHead; - #define SYSTEM_TIME_UNITS_PER_MSEC (10000) -/* FUNCTIONS **************************************************************/ - -BOOLEAN STDCALL KiInsertTimer(PKTIMER Timer, LARGE_INTEGER DueTime); -VOID STDCALL KiHandleExpiredTimer(PKTIMER Timer); - -/* - * @implemented - * - * FUNCTION: Removes a timer from the system timer list - * ARGUMENTS: - * Timer = timer to cancel - * RETURNS: True if the timer was running - * False otherwise - * - * DANGER! - * The statement in the DDK for KeCancelTimer that "if a DPC object is - * associated with the timer, it too is canceled" is wrong -- nothing is - * done with the DPC object when the timer is removed from the system - * queue. So its very likely that the DPC will run after you have canceled - * the timer! - * For what it's worth, calling KeRemoveQueueDpc after KeCancelTimer would - * be sufficient to prevent any problems associated with destroying the DPC - * object, at least as the OS is currently implemented. This is because the - * DPC dispatcher doesn't need access to the object once the DPC is - * dequeued, and the dequeuing happens before the DPC routine gets called." - * -Gunnar (article by Walter Oney) - */ -BOOLEAN -STDCALL -KeCancelTimer(PKTIMER Timer) -{ +/* PRIVATE FUNCTIONS ******************************************************/ + +VOID +NTAPI +KiRemoveTimer(IN PKTIMER Timer) +{ + /* Remove the timer */ + Timer->Header.Inserted = FALSE; + RemoveEntryList(&Timer->TimerListEntry); +} + +/* + * Note: This function is called with the Dispatcher Lock held. + */ +BOOLEAN +NTAPI +KiInsertTimer(IN PKTIMER Timer, + IN LARGE_INTEGER DueTime) +{ + LARGE_INTEGER SystemTime; + LARGE_INTEGER DifferenceTime; + ULONGLONG InterruptTime; + + /* Set default data */ + Timer->Header.Inserted = TRUE; + Timer->Header.Absolute = FALSE; + if (!Timer->Period) Timer->Header.SignalState = FALSE; + + /* Convert to relative time if needed */ + if (DueTime.HighPart >= 0) + { + /* Get System Time */ + KeQuerySystemTime(&SystemTime); + + /* Do the conversion */ + DifferenceTime.QuadPart = SystemTime.QuadPart - DueTime.QuadPart; + + /* Make sure it hasn't already expired */ + if (DifferenceTime.HighPart >= 0) + { + /* Cancel everything */ + Timer->Header.SignalState = TRUE; + Timer->Header.Inserted = FALSE; + return FALSE; + } + + /* Set the time as Absolute */ + Timer->Header.Absolute = TRUE; + DueTime = DifferenceTime; + } + + /* Get the Interrupt Time */ + InterruptTime = KeQueryInterruptTime(); + + /* Set the Final Due Time */ + Timer->DueTime.QuadPart = InterruptTime - DueTime.QuadPart; + + /* Now insert it into the Timer List */ + InsertAscendingList(&KiTimerListHead, + Timer, + KTIMER, + TimerListEntry, + DueTime.QuadPart); + return TRUE; +} + +/* + * We enter this function at IRQL DISPATCH_LEVEL, and with the + * Dispatcher Lock held! + */ +VOID +NTAPI +KiHandleExpiredTimer(IN PKTIMER Timer) +{ + LARGE_INTEGER DueTime; + + /* Set it as Signaled */ + Timer->Header.SignalState = TRUE; + + /* Check if it has any waiters */ + if (!IsListEmpty(&Timer->Header.WaitListHead)) + { + /* Wake them */ + KiWaitTest(Timer, IO_NO_INCREMENT); + } + + /* If the Timer is periodic, reinsert the timer with the new due time */ + if (Timer->Period) + { + /* Reinsert the Timer */ + DueTime.QuadPart = Timer->Period * -SYSTEM_TIME_UNITS_PER_MSEC; + while (!KiInsertTimer(Timer, DueTime)); + } + + /* Check if the Timer has a DPC */ + if (Timer->Dpc) + { + /* Insert the DPC */ + KeInsertQueueDpc(Timer->Dpc, + NULL, + NULL); + } +} + +VOID +NTAPI +KiExpireTimers(IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + PKTIMER Timer; + ULONGLONG InterruptTime; + LIST_ENTRY ExpiredTimerList; + PLIST_ENTRY ListHead, NextEntry; KIRQL OldIrql; - BOOLEAN Inserted = FALSE; - - DPRINT("KeCancelTimer(Timer %x)\n",Timer); + + /* Initialize the Expired Timer List */ + InitializeListHead(&ExpiredTimerList); /* Lock the Database and Raise IRQL */ OldIrql = KeAcquireDispatcherDatabaseLock(); - /* Check if it's inserted, and remove it if it is */ - if ((Inserted = Timer->Header.Inserted)) { - - /* Remove from list */ - DPRINT("Timer was inserted, removing\n"); + /* Query Interrupt Times */ + InterruptTime = KeQueryInterruptTime(); + + /* Loop through the Timer List */ + ListHead = &KiTimerListHead; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + /* Get the timer */ + Timer = CONTAINING_RECORD(NextEntry, KTIMER, TimerListEntry); + + /* Check if we have to Expire it */ + if (InterruptTime < Timer->DueTime.QuadPart) break; + + /* Remove it from the Timer List, add it to the Expired List */ RemoveEntryList(&Timer->TimerListEntry); + InsertTailList(&ExpiredTimerList, &Timer->TimerListEntry); + NextEntry = ListHead->Flink; + } + + /* Expire the Timers */ + while (ExpiredTimerList.Flink != &ExpiredTimerList) + { + /* Get the Timer */ + Timer = CONTAINING_RECORD(ExpiredTimerList.Flink, + KTIMER, + TimerListEntry); + + /* Remove it */ + /// + // GCC IS A BRAINDEAD PIECE OF SHIT. WILL GIVE 5$ FOR EACH DEV KILLED. + /// Timer->Header.Inserted = FALSE; - - } else { - - DPRINT("Timer was not inserted\n"); + RemoveEntryList(&Timer->TimerListEntry); + //KiRemoveTimer(Timer); + + /* Expire it */ + KiHandleExpiredTimer(Timer); } /* Release Dispatcher Lock */ KeReleaseDispatcherDatabaseLock(OldIrql); - - /* Return the old state */ - DPRINT("Old State: %d\n", Inserted); - return(Inserted); -} - -/* - * @implemented - * - * FUNCTION: Initalizes a kernel timer object - * ARGUMENTS: - * Timer = caller supplied storage for the timer - * NOTE: This function initializes a notification timer - */ -VOID -STDCALL -KeInitializeTimer (PKTIMER Timer) - +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +BOOLEAN +NTAPI +KeCancelTimer(IN OUT PKTIMER Timer) +{ + KIRQL OldIrql; + BOOLEAN Inserted; + ASSERT_TIMER(Timer); + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); + + /* Lock the Database and Raise IRQL */ + OldIrql = KeAcquireDispatcherDatabaseLock(); + + /* Check if it's inserted, and remove it if it is */ + Inserted = Timer->Header.Inserted; + if (Inserted) + { + /// + // GCC IS A BRAINDEAD PIECE OF SHIT. WILL GIVE 5$ FOR EACH DEV KILLED. + /// + Timer->Header.Inserted = FALSE; + RemoveEntryList(&Timer->TimerListEntry); + //KiRemoveTimer(Timer); + } + + /* Release Dispatcher Lock */ + KeReleaseDispatcherDatabaseLock(OldIrql); + return Inserted; +} + +/* + * @implemented + */ +VOID +NTAPI +KeInitializeTimer(OUT PKTIMER Timer) { /* Call the New Function */ KeInitializeTimerEx(Timer, NotificationTimer); @@ -100,24 +232,12 @@ /* * @implemented - * - * FUNCTION: Initializes a kernel timer object - * ARGUMENTS: - * Timer = caller supplied storage for the timer - * Type = the type of timer (notification or synchronization) - * NOTE: When a notification type expires all waiting threads are released - * and the timer remains signalled until it is explicitly reset. When a - * syncrhonization timer expires its state is set to signalled until a - * single waiting thread is released and then the timer is reset. - */ -VOID -STDCALL -KeInitializeTimerEx (PKTIMER Timer, - TIMER_TYPE Type) -{ - - DPRINT("KeInitializeTimerEx(%x, %d)\n", Timer, Type); - + */ +VOID +NTAPI +KeInitializeTimerEx(OUT PKTIMER Timer, + IN TIMER_TYPE Type) +{ /* Initialize the Dispatch Header */ KeInitializeDispatcherHeader(&Timer->Header, TimerNotificationObject + Type, @@ -129,37 +249,26 @@ Timer->Period = 0; } - -/* - * @implemented - */ -BOOLEAN -STDCALL -KeReadStateTimer (PKTIMER Timer) +/* + * @implemented + */ +BOOLEAN +NTAPI +KeReadStateTimer(IN PKTIMER Timer) { /* Return the Signal State */ + ASSERT_TIMER(Timer); return (BOOLEAN)Timer->Header.SignalState; } /* * @implemented - * - * FUNCTION: Sets the absolute or relative interval at which a timer object - * is to be set to the signaled state and optionally supplies a - * CustomTimerDpc to be executed when the timer expires. - * ARGUMENTS: - * Timer = Points to a previously initialized timer object - * DueTimer = If positive then absolute time to expire at - * If negative then the relative time to expire at - * Dpc = If non-NULL then a dpc to be called when the timer expires - * RETURNS: True if the timer was already in the system timer queue - * False otherwise - */ -BOOLEAN -STDCALL -KeSetTimer (PKTIMER Timer, - LARGE_INTEGER DueTime, - PKDPC Dpc) + */ +BOOLEAN +NTAPI +KeSetTimer(IN OUT PKTIMER Timer, + IN LARGE_INTEGER DueTime, + IN PKDPC Dpc OPTIONAL) { /* Call the newer function and supply a period of 0 */ return KeSetTimerEx(Timer, DueTime, 0, Dpc); @@ -167,41 +276,32 @@ /* * @implemented - * - * FUNCTION: Sets the absolute or relative interval at which a timer object - * is to be set to the signaled state and optionally supplies a - * CustomTimerDpc to be executed when the timer expires. - * ARGUMENTS: - * Timer = Points to a previously initialized timer object - * DueTimer = If positive then absolute time to expire at - * If negative then the relative time to expire at - * Dpc = If non-NULL then a dpc to be called when the timer expires - * RETURNS: True if the timer was already in the system timer queue - * False otherwise - */ -BOOLEAN -STDCALL -KeSetTimerEx (PKTIMER Timer, - LARGE_INTEGER DueTime, - LONG Period, - PKDPC Dpc) + */ +BOOLEAN +NTAPI +KeSetTimerEx(IN OUT PKTIMER Timer, + IN LARGE_INTEGER DueTime, + IN LONG Period, + IN PKDPC Dpc OPTIONAL) { KIRQL OldIrql; BOOLEAN Inserted; - - DPRINT("KeSetTimerEx(Timer %x, DueTime %I64d, Period %d, Dpc %x)\n", Timer, DueTime.QuadPart, Period, Dpc); - ASSERT(KeGetCurrentIrql() <= DISPATCH_LEVEL); + ASSERT_TIMER(Timer); + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Lock the Database and Raise IRQL */ OldIrql = KeAcquireDispatcherDatabaseLock(); /* Check if it's inserted, and remove it if it is */ - if ((Inserted = Timer->Header.Inserted)) { - - /* Remove from list */ - DPRINT("Timer was already inserted\n"); + Inserted = Timer->Header.Inserted; + if (Inserted) + { + /// + // GCC IS A BRAINDEAD PIECE OF SHIT. WILL GIVE 5$ FOR EACH DEV KILLED. + /// + Timer->Header.Inserted = FALSE; RemoveEntryList(&Timer->TimerListEntry); - Timer->Header.Inserted = FALSE; + //KiRemoveTimer(Timer); } /* Set Default Timer Data */ @@ -241,174 +341,7 @@ KeReleaseDispatcherDatabaseLock(OldIrql); /* Return old state */ - DPRINT("Old State: %d\n", Inserted); return Inserted; } -VOID -STDCALL -KiExpireTimers(PKDPC Dpc, - PVOID DeferredContext, - PVOID SystemArgument1, - PVOID SystemArgument2) -{ - PKTIMER Timer; - ULONGLONG InterruptTime; - LIST_ENTRY ExpiredTimerList; - PLIST_ENTRY ListHead, NextEntry; - KIRQL OldIrql; - - /* Initialize the Expired Timer List */ - InitializeListHead(&ExpiredTimerList); - - /* Lock the Database and Raise IRQL */ - OldIrql = KeAcquireDispatcherDatabaseLock(); - - /* Query Interrupt Times */ - InterruptTime = KeQueryInterruptTime(); - - /* Loop through the Timer List */ - ListHead = &KiTimerListHead; - NextEntry = ListHead->Flink; - while (NextEntry != ListHead) - { - /* Get the timer */ - Timer = CONTAINING_RECORD(NextEntry, KTIMER, TimerListEntry); - - /* Check if we have to Expire it */ - if (InterruptTime < Timer->DueTime.QuadPart) break; - - /* Remove it from the Timer List, add it to the Expired List */ - RemoveEntryList(&Timer->TimerListEntry); - InsertTailList(&ExpiredTimerList, &Timer->TimerListEntry); - NextEntry = ListHead->Flink; - } - - /* Expire the Timers */ - while (ExpiredTimerList.Flink != &ExpiredTimerList) - { - /* Get the Timer */ - Timer = CONTAINING_RECORD(ExpiredTimerList.Flink, - KTIMER, - TimerListEntry); - - /* Remove it */ - Timer->Header.Inserted = FALSE; - RemoveEntryList(&Timer->TimerListEntry); - - /* Expire it */ - KiHandleExpiredTimer(Timer); - } - - /* Release Dispatcher Lock */ - KeReleaseDispatcherDatabaseLock(OldIrql); -} - -/* - * We enter this function at IRQL DISPATCH_LEVEL, and with the - * Dispatcher Lock held! - */ -VOID -STDCALL -KiHandleExpiredTimer(PKTIMER Timer) -{ - LARGE_INTEGER DueTime; - - /* Set it as Signaled */ - Timer->Header.SignalState = TRUE; - - /* Check if it has any waiters */ - if (!IsListEmpty(&Timer->Header.WaitListHead)) - { - /* Wake them */ - KiWaitTest(Timer, IO_NO_INCREMENT); - } - - /* If the Timer is periodic, reinsert the timer with the new due time */ - if (Timer->Period) { - - /* Reinsert the Timer */ - DueTime.QuadPart = Timer->Period * -SYSTEM_TIME_UNITS_PER_MSEC; - if (!KiInsertTimer(Timer, DueTime)) { - - /* FIXME: I will think about how to handle this and fix it ASAP -- Alex */ - DPRINT("CRITICAL UNHANDLED CASE: TIMER ALREADY EXPIRED!!!\n"); - }; - } - - /* Check if the Timer has a DPC */ - if (Timer->Dpc) { - - DPRINT("Timer->Dpc %x Timer->Dpc->DeferredRoutine %x\n", Timer->Dpc, Timer->Dpc->DeferredRoutine); - - /* Insert the DPC */ - KeInsertQueueDpc(Timer->Dpc, - NULL, - NULL); - - DPRINT("Finished dpc routine\n"); - } -} - -/* - * Note: This function is called with the Dispatcher Lock held. - */ -BOOLEAN -STDCALL -KiInsertTimer(PKTIMER Timer, - LARGE_INTEGER DueTime) -{ - LARGE_INTEGER SystemTime; - LARGE_INTEGER DifferenceTime; - ULONGLONG InterruptTime; - - DPRINT("KiInsertTimer(Timer %x DueTime %I64d)\n", Timer, DueTime.QuadPart); - - /* Set default data */ - Timer->Header.Inserted = TRUE; - Timer->Header.Absolute = FALSE; - if (!Timer->Period) Timer->Header.SignalState = FALSE; - - /* Convert to relative time if needed */ - if (DueTime.u.HighPart >= 0) { - - /* Get System Time */ - KeQuerySystemTime(&SystemTime); - - /* Do the conversion */ - DifferenceTime.QuadPart = SystemTime.QuadPart - DueTime.QuadPart; - DPRINT("Time Difference is: %I64d\n", DifferenceTime.QuadPart); - - /* Make sure it hasn't already expired */ - if (DifferenceTime.u.HighPart >= 0) { - - /* Cancel everything */ - DPRINT("Timer already expired: %d\n", DifferenceTime.u.HighPart); - Timer->Header.SignalState = TRUE; - Timer->Header.Inserted = FALSE; - return FALSE; - } - - /* Set the time as Absolute */ - Timer->Header.Absolute = TRUE; - DueTime = DifferenceTime; - } - - /* Get the Interrupt Time */ - InterruptTime = KeQueryInterruptTime(); - - /* Set the Final Due Time */ - Timer->DueTime.QuadPart = InterruptTime - DueTime.QuadPart; - DPRINT("Final Due Time is: %I64d\n", Timer->DueTime.QuadPart); - - /* Now insert it into the Timer List */ - DPRINT("Inserting Timer into list\n"); - InsertAscendingList(&KiTimerListHead, - Timer, - KTIMER, - TimerListEntry, - DueTime.QuadPart); - - return TRUE; -} /* EOF */

1 0

[ion] 23044: - Don't make the timer signaled in KeSetTimerEx if it already expired. - Only call KiWaitTest on timers if they have waiters. - Fix list looping in KiExpireTimers.
by ion＠svn.reactos.org 13 Jul '06

13 Jul '06

Author: ion Date: Thu Jul 13 23:04:39 2006 New Revision: 23044 URL: http://svn.reactos.org/svn/reactos?rev=23044&view=rev Log: - Don't make the timer signaled in KeSetTimerEx if it already expired. - Only call KiWaitTest on timers if they have waiters. - Fix list looping in KiExpireTimers. Modified: trunk/reactos/ntoskrnl/ke/timer.c Modified: trunk/reactos/ntoskrnl/ke/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/timer.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ke/timer.c (original) +++ trunk/reactos/ntoskrnl/ke/timer.c Thu Jul 13 23:04:39 2006 @@ -210,10 +210,32 @@ Timer->Header.SignalState = FALSE; /* Insert it */ - if (!KiInsertTimer(Timer, DueTime)) { - - KiHandleExpiredTimer(Timer); - }; + if (!KiInsertTimer(Timer, DueTime)) + { + /* Check if it has any waiters */ + if (!IsListEmpty(&Timer->Header.WaitListHead)) + { + /* Wake them */ + KiWaitTest(Timer, IO_NO_INCREMENT); + } + + /* Check if the Timer has a DPC */ + if (Dpc) + { + /* Insert the DPC */ + KeInsertQueueDpc(Timer->Dpc, + NULL, + NULL); + } + + /* Check if the Timer is periodic */ + if (Timer->Period) + { + /* Reinsert the Timer */ + DueTime.QuadPart = Timer->Period * -SYSTEM_TIME_UNITS_PER_MSEC; + while (!KiInsertTimer(Timer, DueTime)); + } + } /* Release Dispatcher Lock */ KeReleaseDispatcherDatabaseLock(OldIrql); @@ -230,13 +252,11 @@ PVOID SystemArgument1, PVOID SystemArgument2) { - PKTIMER Timer, tmp; + PKTIMER Timer; ULONGLONG InterruptTime; LIST_ENTRY ExpiredTimerList; - PLIST_ENTRY CurrentEntry = NULL; + PLIST_ENTRY ListHead, NextEntry; KIRQL OldIrql; - - DPRINT("KiExpireTimers(Dpc: %x)\n", Dpc); /* Initialize the Expired Timer List */ InitializeListHead(&ExpiredTimerList); @@ -247,10 +267,13 @@ /* Query Interrupt Times */ InterruptTime = KeQueryInterruptTime(); - /* Loop through the Timer List and remove Expired Timers. Insert them into the Expired Listhead */ - LIST_FOR_EACH_SAFE(Timer, tmp, &KiTimerListHead, KTIMER, TimerListEntry) + /* Loop through the Timer List */ + ListHead = &KiTimerListHead; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) { - DPRINT("Looping for Timer: %x. Duetime: %I64d. InterruptTime %I64d \n", Timer, Timer->DueTime.QuadPart, InterruptTime); + /* Get the timer */ + Timer = CONTAINING_RECORD(NextEntry, KTIMER, TimerListEntry); /* Check if we have to Expire it */ if (InterruptTime < Timer->DueTime.QuadPart) break; @@ -258,24 +281,25 @@ /* Remove it from the Timer List, add it to the Expired List */ RemoveEntryList(&Timer->TimerListEntry); InsertTailList(&ExpiredTimerList, &Timer->TimerListEntry); + NextEntry = ListHead->Flink; } /* Expire the Timers */ - while (!IsListEmpty(&ExpiredTimerList)) { - - CurrentEntry = RemoveHeadList(&ExpiredTimerList); - + while (ExpiredTimerList.Flink != &ExpiredTimerList) + { /* Get the Timer */ - Timer = CONTAINING_RECORD(CurrentEntry, KTIMER, TimerListEntry); + Timer = CONTAINING_RECORD(ExpiredTimerList.Flink, + KTIMER, + TimerListEntry); + + /* Remove it */ Timer->Header.Inserted = FALSE; - DPRINT("Expiring Timer: %x\n", Timer); + RemoveEntryList(&Timer->TimerListEntry); /* Expire it */ KiHandleExpiredTimer(Timer); } - DPRINT("Timers expired\n"); - /* Release Dispatcher Lock */ KeReleaseDispatcherDatabaseLock(OldIrql); } @@ -288,21 +312,17 @@ STDCALL KiHandleExpiredTimer(PKTIMER Timer) { - LARGE_INTEGER DueTime; - DPRINT("HandleExpiredTime(Timer %x)\n", Timer); - - if(Timer->Header.Inserted) { - - /* First of all, remove the Timer */ - Timer->Header.Inserted = FALSE; - RemoveEntryList(&Timer->TimerListEntry); - } /* Set it as Signaled */ - DPRINT("Setting Timer as Signaled\n"); Timer->Header.SignalState = TRUE; - KiWaitTest(&Timer->Header, IO_NO_INCREMENT); + + /* Check if it has any waiters */ + if (!IsListEmpty(&Timer->Header.WaitListHead)) + { + /* Wake them */ + KiWaitTest(Timer, IO_NO_INCREMENT); + } /* If the Timer is periodic, reinsert the timer with the new due time */ if (Timer->Period) {

1 0

[greatlrd] 23043: 1. Remove guithreadinfo from the make file. for it not longer builds. 2. Adding a test apps for starting directdraw hal interface, that I have keep within few ros devs, and one wine devs, it also being using in 2-3 diffent company same code. I known which company that using it with my written premitions I give them on icq or email. But u need a document how to use kernel, d3d, mocomp interface, and some more how to access them. I only show how to start dx hal the interface and
by greatlrd＠svn.reactos.org 13 Jul '06

13 Jul '06

Author: greatlrd Date: Thu Jul 13 23:00:05 2006 New Revision: 23043 URL: http://svn.reactos.org/svn/reactos?rev=23043&view=rev Log: 1. Remove guithreadinfo from the make file. for it not longer builds. 2. Adding a test apps for starting directdraw hal interface, that I have keep within few ros devs, and one wine devs, it also being using in 2-3 diffent company same code. I known which company that using it with my written premitions I give them on icq or email. But u need a document how to use kernel, d3d, mocomp interface,and some more how to access them. I only show how to start dx hal the interface and using so call IDrawDraw interface. in this apps. Added: trunk/rosapps/tests/DxHalTest/ trunk/rosapps/tests/DxHalTest/DxHalTest.rbuild (with props) trunk/rosapps/tests/DxHalTest/main.c (with props) trunk/rosapps/tests/DxHalTest/main.h (with props) Modified: trunk/rosapps/tests/directory.xml Added: trunk/rosapps/tests/DxHalTest/DxHalTest.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/tests/DxHalTest/DxHalTest.… ============================================================================== --- trunk/rosapps/tests/DxHalTest/DxHalTest.rbuild (added) +++ trunk/rosapps/tests/DxHalTest/DxHalTest.rbuild Thu Jul 13 23:00:05 2006 @@ -1,0 +1,8 @@ +<module name="dxhaltest" type="win32cui" installbase="bin" installname="dxhaltest.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <define name="__USE_W32API" /> + <library>kernel32</library> + <library>gdi32</library> + <file>main.c</file> +</module> Propchange: trunk/rosapps/tests/DxHalTest/DxHalTest.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/tests/DxHalTest/main.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/tests/DxHalTest/main.c?rev… ============================================================================== --- trunk/rosapps/tests/DxHalTest/main.c (added) +++ trunk/rosapps/tests/DxHalTest/main.c Thu Jul 13 23:00:05 2006 @@ -1,0 +1,665 @@ +#include <stdio.h> +#include "main.h" + + +// TODO: +// +// - free memory +// - Check if we ran out of memory (HeapAlloc == NULL) + HDC hdc; + DDRAWI_DIRECTDRAW_GBL mDDrawGlobal; + DDRAWI_DIRECTDRAW_LCL mDDrawLocal; + DDHALINFO mHALInfo; + + DDHAL_CALLBACKS mCallbacks; + DDHAL_DDEXEBUFCALLBACKS mD3dBufferCallbacks; + D3DHAL_CALLBACKS mD3dCallbacks; + D3DHAL_GLOBALDRIVERDATA mD3dDriverData; + + UINT mcModeInfos; + DDHALMODEINFO *mpModeInfos; + + UINT mcvmList; + VIDMEM *mpvmList; + + UINT mcFourCC; + DWORD *mpFourCC; + + UINT mcTextures; + DDSURFACEDESC *mpTextures; + + /* Surface */ + DDRAWI_DDRAWSURFACE_GBL mPrimaryGlobal; + DDRAWI_DDRAWSURFACE_MORE mPrimaryMore; + DDRAWI_DDRAWSURFACE_LCL mPrimaryLocal; + DDRAWI_DDRAWSURFACE_LCL *mpPrimaryLocals[1]; + DDRAWI_DDRAWCLIPPER_LCL mPrimaryClipperLocal; + DDRAWI_DDRAWCLIPPER_GBL mPrimaryClipperGlobal; + //DDRAWI_DDRAWCLIPPER_INT mPrimaryClipperInterface; + DDSURFACEDESC mddsdPrimary; + DDSURFACEDESC mddsdOverlay; + + DDRAWI_DDRAWSURFACE_GBL mOverlayGlobal; + DDRAWI_DDRAWSURFACE_LCL mOverlayLocal[6]; + DDRAWI_DDRAWSURFACE_LCL *mpOverlayLocals[6]; + DDRAWI_DDRAWSURFACE_MORE mOverlayMore[6]; + + DDHAL_BLTDATA mDdBlt; + + +typedef struct _DD_GETDRIVERINFODATA { + VOID *dhpdev; + DWORD dwSize; + DWORD dwFlags; + GUID guidInfo; + DWORD dwExpectedSize; + PVOID lpvData; + DWORD dwActualSize; + HRESULT ddRVal; + ULONG_PTR dwContext; +} DD_GETDRIVERINFODATA, *PDD_GETDRIVERINFODATA; + + +typedef struct _DD_MISCELLANEOUSCALLBACKS { + DWORD dwSize; + DWORD dwFlags; + PVOID GetAvailDriverMemory; +} DD_MISCELLANEOUSCALLBACKS; + + +int WINAPI WinMain (HINSTANCE hInst, HINSTANCE hPrevInst, + LPSTR lpCmdLine, int nCmdShow) +{ + /* get the functions we need */ +// DD_GETDRIVERINFODATA drv; + HMODULE lib = LoadLibrary("gdi32.dll"); + DdCreateDirectDrawObject = (BOOL (APIENTRY*)(LPDDRAWI_DIRECTDRAW_GBL, HDC))GetProcAddress(lib, "GdiEntry1"); + DdQueryDirectDrawObject = (BOOL (APIENTRY*)(LPDDRAWI_DIRECTDRAW_GBL, LPDDHALINFO,LPDDHAL_DDCALLBACKS,LPDDHAL_DDSURFACECALLBACKS,LPDDHAL_DDPALETTECALLBACKS,LPD3DHAL_CALLBACKS,LPD3DHAL_GLOBALDRIVERDATA,LPDDHAL_DDEXEBUFCALLBACKS,LPDDSURFACEDESC,LPDWORD,LPVIDMEM))GetProcAddress(lib, "GdiEntry2"); + DdAttachSurface = (BOOL (APIENTRY*)(LPDDRAWI_DDRAWSURFACE_LCL, LPDDRAWI_DDRAWSURFACE_LCL))GetProcAddress(lib, "GdiEntry11"); + DdResetVisrgn = (BOOL (APIENTRY*)(LPDDRAWI_DDRAWSURFACE_LCL, HWND))GetProcAddress(lib, "GdiEntry6"); + + /* HAL Startup process */ + DEVMODE devmode; + HBITMAP hbmp; + const UINT bmiSize = sizeof(BITMAPINFOHEADER) + 0x10; + UCHAR *pbmiData; + BITMAPINFO *pbmi; + + DWORD *pMasks; + //BOOL newmode = FALSE; + //DWORD Status; /* for create surface */ + UINT i; + UINT j; + + + printf("This apps showing how to start up directx draw/d3d interface and some other as well\n"); + printf("This code have been releae to some close applactons with my premtions, if any company\n"); + printf("want use part or whole code, you need contact the orginal author to ask for premtions\n"); + printf("This code are release under alot of diffent licen\n"); + printf("All GPL and LGPL project have right use and studing this code.\n"); + printf("This code maybe need more comment to known how stuff working and maybe looking bit mesy\n"); + printf("Bestreagds Magnus Olsen magnus(a)greatlord.com or greatlord(a)reactos.org\n"); + printf("Copyright 2006 by Magnus Olsen\n\n"); + printf("This demo showing how to start dx draw hal and create a primary surface,\n"); + printf("and a overlay sufrace and blt to the primary surface\n"); + + + /* + Get and Create mode info + */ + mcModeInfos = 1; + mpModeInfos = (DDHALMODEINFO*)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, + mcModeInfos * sizeof(DDHALMODEINFO)); + + if (mpModeInfos == NULL) + { + printf("Fail to alloc mpModeInfos\n"); + return DD_FALSE; + } + + + EnumDisplaySettings(NULL, ENUM_CURRENT_SETTINGS, &devmode); + + mpModeInfos[0].dwWidth = devmode.dmPelsWidth; + mpModeInfos[0].dwHeight = devmode.dmPelsHeight; + mpModeInfos[0].dwBPP = devmode.dmBitsPerPel; + mpModeInfos[0].lPitch = (devmode.dmPelsWidth*devmode.dmBitsPerPel)/8; + mpModeInfos[0].wRefreshRate = (WORD)devmode.dmDisplayFrequency; + + /* + Setup HDC and mDDrawGlobal right + */ + hdc = CreateDCW(L"DISPLAY",L"DISPLAY",NULL,NULL); + + if (hdc == NULL) + { + printf("Fail to create HDC\n"); + return DD_FALSE; + } + + /* + Dectect RGB bit mask + */ + hbmp = CreateCompatibleBitmap(hdc, 1, 1); + if (hbmp==NULL) + { + HeapFree(GetProcessHeap(), 0, mpModeInfos); + DeleteDC(hdc); + printf("Fail to Create Compatible Bitmap\n"); + return DD_FALSE; + } + + pbmiData = (UCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bmiSize); + pbmi = (BITMAPINFO*)pbmiData; + + if (pbmiData==NULL) + { + HeapFree(GetProcessHeap(), 0, mpModeInfos); + free(mpModeInfos); + DeleteDC(hdc); + DeleteObject(hbmp); + printf("Fail to Alloc pbmiData\n"); + return DDERR_UNSUPPORTED; + } + + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biBitCount = (WORD)devmode.dmBitsPerPel; + pbmi->bmiHeader.biCompression = BI_BITFIELDS; + pbmi->bmiHeader.biWidth = 1; + pbmi->bmiHeader.biHeight = 1; + + GetDIBits(hdc, hbmp, 0, 0, NULL, pbmi, 0); + DeleteObject(hbmp); + + pMasks = (DWORD*)(pbmiData + sizeof(BITMAPINFOHEADER)); + mpModeInfos[0].dwRBitMask = pMasks[0]; + mpModeInfos[0].dwGBitMask = pMasks[1]; + mpModeInfos[0].dwBBitMask = pMasks[2]; + mpModeInfos[0].dwAlphaBitMask = pMasks[3]; + + HeapFree(GetProcessHeap(), 0, pbmiData); + + /* + prepare start up the DX Draw HAL interface now + */ + + memset(&mDDrawGlobal, 0, sizeof(DDRAWI_DIRECTDRAW_GBL)); + memset(&mHALInfo, 0, sizeof(DDHALINFO)); + memset(&mCallbacks, 0, sizeof(DDHAL_CALLBACKS)); + + /* + Startup DX HAL step one of three + */ + if (!DdCreateDirectDrawObject(&mDDrawGlobal, hdc)) + { + HeapFree(GetProcessHeap(), 0, mpModeInfos); + DeleteDC(hdc); + DeleteObject(hbmp); + printf("Fail to Create Direct DrawObject\n"); + return DD_FALSE; + } + + mDDrawGlobal.dwRefCnt = 1; //addref / remove ref + + // Do not relase HDC it have been map in kernel mode + // DeleteDC(hdc); + + /* we need reanable it if screen res have changes, and some bad drv need be reanble very few + to contiune */ + /* + if (!DdReenableDirectDrawObject(&mDDrawGlobal, &newmode)) + { + HeapFree(GetProcessHeap(), 0, mpModeInfos); + DeleteDC(hdc); + DeleteObject(hbmp); + return DD_FALSE; + }*/ + + /* + Setup the DirectDraw Local + */ + + mDDrawLocal.lpDDCB = &mCallbacks; + mDDrawLocal.lpGbl = &mDDrawGlobal; + mDDrawLocal.dwProcessId = GetCurrentProcessId(); + + mDDrawGlobal.lpDDCBtmp = &mCallbacks; + mDDrawGlobal.lpExclusiveOwner = &mDDrawLocal; + //mDDrawLocal.dwLocalFlags = DDRAWILCL_DIRECTDRAW7; + + + /* + Startup DX HAL step two of three + */ + + if (!DdQueryDirectDrawObject(&mDDrawGlobal, + &mHALInfo, + &mCallbacks.HALDD, + &mCallbacks.HALDDSurface, + &mCallbacks.HALDDPalette, + &mD3dCallbacks, + &mD3dDriverData, + &mD3dBufferCallbacks, + NULL, + NULL, + NULL)) + { + HeapFree(GetProcessHeap(), 0, mpModeInfos); + DeleteDC(hdc); + DeleteObject(hbmp); + // FIXME Close DX fristcall and second call + return DD_FALSE; + } + + mcvmList = mHALInfo.vmiData.dwNumHeaps; + mpvmList = (VIDMEM*) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(VIDMEM) * mcvmList); + if (mpvmList == NULL) + { + HeapFree(GetProcessHeap(), 0, mpModeInfos); + DeleteDC(hdc); + DeleteObject(hbmp); + // FIXME Close DX fristcall and second call + printf("Fail to QueryDirect Draw Object frist pass\n"); + return DD_FALSE; + } + + mcFourCC = mHALInfo.ddCaps.dwNumFourCCCodes; + mpFourCC = (DWORD *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DWORD) * mcFourCC); + if (mpFourCC == NULL) + { + HeapFree(GetProcessHeap(), 0, mpvmList); + HeapFree(GetProcessHeap(), 0, mpModeInfos); + DeleteDC(hdc); + DeleteObject(hbmp); + // FIXME Close DX fristcall and second call + return DD_FALSE; + } + + mcTextures = mD3dDriverData.dwNumTextureFormats; + mpTextures = (DDSURFACEDESC*)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DDSURFACEDESC) * mcTextures); + if (mpTextures == NULL) + { + HeapFree(GetProcessHeap(), 0, mpFourCC); + HeapFree(GetProcessHeap(), 0, mpvmList); + HeapFree(GetProcessHeap(), 0, mpModeInfos); + DeleteDC(hdc); + DeleteObject(hbmp); + // FIXME Close DX fristcall and second call + printf("Fail QueryDirect Draw Object to Alloc mpTextures \n"); + return DD_FALSE; + } + + mHALInfo.vmiData.pvmList = mpvmList; + mHALInfo.lpdwFourCC = mpFourCC; + mD3dDriverData.lpTextureFormats = mpTextures; + + if (!DdQueryDirectDrawObject( + &mDDrawGlobal, + &mHALInfo, + &mCallbacks.HALDD, + &mCallbacks.HALDDSurface, + &mCallbacks.HALDDPalette, + &mD3dCallbacks, + &mD3dDriverData, + &mCallbacks.HALDDExeBuf, + mpTextures, + mpFourCC, + mpvmList)) + + { + HeapFree(GetProcessHeap(), 0, mpTextures); + HeapFree(GetProcessHeap(), 0, mpFourCC); + HeapFree(GetProcessHeap(), 0, mpvmList); + HeapFree(GetProcessHeap(), 0, mpModeInfos); + DeleteDC(hdc); + DeleteObject(hbmp); + printf("Fail to QueryDirect Draw Object second pass\n"); + return DD_FALSE; + } + + /* + Copy over from HalInfo to DirectDrawGlobal + */ + + // this is wrong, cDriverName need be in ASC code not UNICODE + //memcpy(mDDrawGlobal.cDriverName, mDisplayAdapter, sizeof(wchar)*MAX_DRIVER_NAME); + + memcpy(&mDDrawGlobal.vmiData, &mHALInfo.vmiData,sizeof(VIDMEMINFO)); + memcpy(&mDDrawGlobal.ddCaps, &mHALInfo.ddCaps,sizeof(DDCORECAPS)); + + mHALInfo.dwNumModes = mcModeInfos; + mHALInfo.lpModeInfo = mpModeInfos; + mHALInfo.dwMonitorFrequency = mpModeInfos[0].wRefreshRate; + + mDDrawGlobal.dwMonitorFrequency = mHALInfo.dwMonitorFrequency; + mDDrawGlobal.dwModeIndex = mHALInfo.dwModeIndex; + mDDrawGlobal.dwNumModes = mHALInfo.dwNumModes; + mDDrawGlobal.lpModeInfo = mHALInfo.lpModeInfo; + mDDrawGlobal.hInstance = mHALInfo.hInstance; + + mDDrawGlobal.lp16DD = &mDDrawGlobal; + + + + /* Hal insate is down now */ + + /* cleare surface code now*/ + + // memset(&mGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); + // memset(&mMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); + + /* mLocal.lpSurfMore = &mMore; + memset(mMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); + mMore.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE);*/ + + mPrimaryLocal.lpSurfMore = &mPrimaryMore; + + /* cleare surface ends now */ + + /* create primare surface now */ + + memset(&mddsdPrimary, 0, sizeof(DDSURFACEDESC)); + mddsdPrimary.dwSize = sizeof(DDSURFACEDESC); + mddsdPrimary.dwFlags = DDSD_CAPS; + mddsdPrimary.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE | DDSCAPS_VIDEOMEMORY | DDSCAPS_VISIBLE; + + DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; + mDdCanCreateSurface.lpDD = &mDDrawGlobal; + mDdCanCreateSurface.CanCreateSurface = mCallbacks.HALDD.CanCreateSurface; + mDdCanCreateSurface.bIsDifferentPixelFormat = FALSE; //isDifferentPixelFormat; + mDdCanCreateSurface.lpDDSurfaceDesc = &mddsdPrimary; // pDDSD; + + if (mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) + { + printf("Fail to mDdCanCreateSurface DDHAL_DRIVER_NOTHANDLED\n"); + return DDERR_NOTINITIALIZED; + } + + if (mDdCanCreateSurface.ddRVal != DD_OK) + { + printf("Fail to mDdCanCreateSurface mDdCanCreateSurface.ddRVal = %d:%s\n",(int)mDdCanCreateSurface.ddRVal,DDErrorString(mDdCanCreateSurface.ddRVal)); + return DDERR_NOTINITIALIZED; + } + + memset(&mPrimaryGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); + mPrimaryGlobal.dwGlobalFlags = DDRAWISURFGBL_ISGDISURFACE; + mPrimaryGlobal.lpDD = &mDDrawGlobal; + mPrimaryGlobal.lpDDHandle = &mDDrawGlobal; + mPrimaryGlobal.wWidth = (WORD)mpModeInfos[0].dwWidth; + mPrimaryGlobal.wHeight = (WORD)mpModeInfos[0].dwHeight; + mPrimaryGlobal.lPitch = mpModeInfos[0].lPitch; + + memset(&mPrimaryMore, 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); + mPrimaryMore.dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + + + //mPrimaryMore. = mpr + + memset(&mPrimaryLocal, 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); + mPrimaryLocal.lpGbl = &mPrimaryGlobal; + mPrimaryLocal.lpSurfMore = &mPrimaryMore; + mPrimaryLocal.dwProcessId = GetCurrentProcessId(); + mPrimaryLocal.dwFlags = DDRAWISURF_PARTOFPRIMARYCHAIN|DDRAWISURF_HASOVERLAYDATA; + mPrimaryLocal.ddsCaps.dwCaps = mddsdPrimary.ddsCaps.dwCaps; + + mpPrimaryLocals[0] = &mPrimaryLocal; + + DDHAL_CREATESURFACEDATA mDdCreateSurface; + mDdCreateSurface.lpDD = &mDDrawGlobal; + mDdCreateSurface.CreateSurface = mCallbacks.HALDD.CreateSurface; + mDdCreateSurface.lpDDSurfaceDesc = &mddsdPrimary;//pDDSD; + mDdCreateSurface.lplpSList = mpPrimaryLocals; //cSurfaces; + mDdCreateSurface.dwSCnt = 1 ; //ppSurfaces; + + if (mHALInfo.lpDDCallbacks->CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) + { + printf("Fail to mDdCreateSurface DDHAL_DRIVER_NOTHANDLED \n"); + return DDERR_NOTINITIALIZED; + } + + + if (mDdCreateSurface.ddRVal != DD_OK) + { + printf("Fail to mDdCanCreateSurface mDdCreateSurface.ddRVal = %d:%s\n",(int)mDdCreateSurface.ddRVal,DDErrorString(mDdCreateSurface.ddRVal)); + return mDdCreateSurface.ddRVal; + } + + // -- Setup Clipper --------------------------------------------------------- + memset(&mPrimaryClipperGlobal, 0, sizeof(DDRAWI_DDRAWCLIPPER_GBL)); + mPrimaryClipperGlobal.dwFlags = DDRAWICLIP_ISINITIALIZED; + mPrimaryClipperGlobal.dwProcessId = GetCurrentProcessId(); + //mPrimaryClipperGlobal.hWnd = (ULONG_PTR)hwnd; + mPrimaryClipperGlobal.hWnd = (ULONG_PTR)GetDesktopWindow(); + mPrimaryClipperGlobal.lpDD = &mDDrawGlobal; + mPrimaryClipperGlobal.lpStaticClipList = NULL; + + memset(&mPrimaryClipperLocal, 0, sizeof(DDRAWI_DDRAWCLIPPER_LCL)); + mPrimaryClipperLocal.lpGbl = &mPrimaryClipperGlobal; + + //memset(&mPrimaryClipperInterface, 0, sizeof(DDRAWI_DDRAWCLIPPER_INT)); + //mPrimaryClipperInterface.lpLcl = &mPrimaryClipperLocal; + //mPrimaryClipperInterface.dwIntRefCnt = 1; + //mPrimaryClipperInterface.lpLink = null; + //mPrimaryClipperInterface.lpVtbl = null; + + mPrimaryLocal.lpDDClipper = &mPrimaryClipperLocal; + //mPrimaryMore.lpDDIClipper = &mPrimaryClipperInterface; + + mDdBlt.lpDDDestSurface = mpPrimaryLocals[0]; + + + /* create primare surface is down now */ + + /* create overlay surface now */ + + memset(&mddsdOverlay, 0, sizeof(DDSURFACEDESC)); + mddsdOverlay.dwSize = sizeof(DDSURFACEDESC); + mddsdOverlay.dwFlags = DDSD_CAPS | DDSD_PIXELFORMAT | DDSD_BACKBUFFERCOUNT | DDSD_WIDTH | DDSD_HEIGHT; + + mddsdOverlay.ddsCaps.dwCaps = DDSCAPS_OVERLAY | DDSCAPS_VIDEOMEMORY | DDSCAPS_LOCALVIDMEM | DDSCAPS_COMPLEX | DDSCAPS_FLIP; + + mddsdOverlay.dwWidth = 100; //pels; + mddsdOverlay.dwHeight = 100; // lines; + mddsdOverlay.dwBackBufferCount = 1; //cBuffers; + + mddsdOverlay.ddpfPixelFormat.dwSize = sizeof(DDPIXELFORMAT); + mddsdOverlay.ddpfPixelFormat.dwFlags = DDPF_RGB; + mddsdOverlay.ddpfPixelFormat.dwRGBBitCount = 32; + + + //DDHAL_CANCREATESURFACEDATA mDdCanCreateSurface; + mDdCanCreateSurface.lpDD = &mDDrawGlobal; + mDdCanCreateSurface.CanCreateSurface = mCallbacks.HALDD.CanCreateSurface; + mDdCanCreateSurface.bIsDifferentPixelFormat = TRUE; //isDifferentPixelFormat; + mDdCanCreateSurface.lpDDSurfaceDesc = &mddsdOverlay; // pDDSD; + + + if (mHALInfo.lpDDCallbacks->CanCreateSurface(&mDdCanCreateSurface)== DDHAL_DRIVER_NOTHANDLED) + { + // derr(L"DirectDrawImpl[%08x]::__createPrimary Cannot create primary [%08x]", this, rv); + + printf("Fail to mDdCanCreateSurface DDHAL_DRIVER_NOTHANDLED \n"); + return DDERR_NOTINITIALIZED; + } + + if (mDdCanCreateSurface.ddRVal != DD_OK) + { + printf("Fail to mDdCanCreateSurface mDdCanCreateSurface.ddRVal = %d:%s\n",(int)mDdCanCreateSurface.ddRVal,DDErrorString(mDdCanCreateSurface.ddRVal)); + return DDERR_NOTINITIALIZED; + } + + + memset(&mOverlayGlobal, 0, sizeof(DDRAWI_DDRAWSURFACE_GBL)); + mOverlayGlobal.dwGlobalFlags = 0; + mOverlayGlobal.lpDD = &mDDrawGlobal; + mOverlayGlobal.lpDDHandle = &mDDrawGlobal; + mOverlayGlobal.wWidth = (WORD)mddsdOverlay.dwWidth; + mOverlayGlobal.wHeight = (WORD)mddsdOverlay.dwHeight; + mOverlayGlobal.lPitch = -1; + mOverlayGlobal.ddpfSurface = mddsdOverlay.ddpfPixelFormat; + + // setup front- and backbuffer surfaces + UINT cSurfaces = mddsdOverlay.dwBackBufferCount + 1; + for ( i = 0; i < cSurfaces; i++) + { + memset(&mOverlayMore[i], 0, sizeof(DDRAWI_DDRAWSURFACE_MORE)); + mOverlayMore[i].dwSize = sizeof(DDRAWI_DDRAWSURFACE_MORE); + + memset(&mOverlayLocal[i], 0, sizeof(DDRAWI_DDRAWSURFACE_LCL)); + mOverlayLocal[i].lpGbl = &mOverlayGlobal; + mOverlayLocal[i].lpSurfMore = &mOverlayMore[i]; + mOverlayLocal[i].dwProcessId = GetCurrentProcessId(); + mOverlayLocal[i].dwFlags = (i == 0) ? + (DDRAWISURF_IMPLICITROOT|DDRAWISURF_FRONTBUFFER): + (DDRAWISURF_IMPLICITCREATE|DDRAWISURF_BACKBUFFER); + + mOverlayLocal[i].dwFlags |= + DDRAWISURF_ATTACHED|DDRAWISURF_ATTACHED_FROM| + DDRAWISURF_HASPIXELFORMAT| + DDRAWISURF_HASOVERLAYDATA; + + mOverlayLocal[i].ddsCaps.dwCaps = mddsdOverlay.ddsCaps.dwCaps; + mpOverlayLocals[i] = &mOverlayLocal[i]; + } + + for ( i = 0; i < cSurfaces; i++) + { + j = (i + 1) % cSurfaces; + + + /*if (!mHALInfo.lpDDSurfaceCallbacks->AddAttachedSurface(mpOverlayLocals[i], mpOverlayLocals[j])) + { + // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); + return DD_FALSE; + }*/ + + if (!DdAttachSurface(mpOverlayLocals[i], mpOverlayLocals[j])) + { + // derr(L"DirectDrawImpl[%08x]::__setupDevice DdAttachSurface(%d, %d) failed", this, i, j); + printf("Fail to DdAttachSurface (%d:%d)\n", i, j); + return DD_FALSE; + } + + } + + + // DDHAL_CREATESURFACEDATA mDdCreateSurface; + mDdCreateSurface.lpDD = &mDDrawGlobal; + mDdCreateSurface.CreateSurface = mCallbacks.HALDD.CreateSurface; + mDdCreateSurface.lpDDSurfaceDesc = &mddsdOverlay;//pDDSD; + mDdCreateSurface.lplpSList = mpOverlayLocals; //cSurfaces; + mDdCreateSurface.dwSCnt = 1 ; //ppSurfaces; + + if (mHALInfo.lpDDCallbacks->CreateSurface(&mDdCreateSurface) == DDHAL_DRIVER_NOTHANDLED) + { + printf("Fail to mDdCreateSurface = DDHAL_DRIVER_HANDLED\n"); + return DDERR_NOTINITIALIZED; + } + + + if (mDdCreateSurface.ddRVal != DD_OK) + { + printf("Fail to mDdCreateSurface mDdCreateSurface.ddRVal = %d:%s\n",(int)mDdCreateSurface.ddRVal,DDErrorString(mDdCreateSurface.ddRVal)); + return mDdCreateSurface.ddRVal; + } + + + DDHAL_UPDATEOVERLAYDATA mDdUpdateOverlay; + mDdUpdateOverlay.lpDD = &mDDrawGlobal; + mDdUpdateOverlay.UpdateOverlay = mCallbacks.HALDDSurface.UpdateOverlay; + mDdUpdateOverlay.lpDDDestSurface = mpPrimaryLocals[0]; + mDdUpdateOverlay.lpDDSrcSurface = mpOverlayLocals[0];//pDDSurface; + mDdUpdateOverlay.dwFlags = DDOVER_SHOW; + + /* if (flags & DDOVER_DDFX) + mDdUpdateOverlay.overlayFX = *pFx; + copyRect(&mDdUpdateOverlay.rDest, pdst); + copyRect(&mDdUpdateOverlay.rSrc, psrc); +*/ + + mDdUpdateOverlay.rDest.top = 0; + mDdUpdateOverlay.rDest.left = 0; + mDdUpdateOverlay.rDest.right = 50; + mDdUpdateOverlay.rDest.bottom = 50; + + mDdUpdateOverlay.rSrc.top = 0; + mDdUpdateOverlay.rSrc.left = 0; + mDdUpdateOverlay.rSrc.right = 50; + mDdUpdateOverlay.rSrc.bottom = 50; + + + + + if ( mDdUpdateOverlay.UpdateOverlay(&mDdUpdateOverlay) == DDHAL_DRIVER_NOTHANDLED) + { + printf("Fail to mDdBlt = DDHAL_DRIVER_HANDLED\n"); + return DDERR_NOTINITIALIZED; + } + + + if (mDdUpdateOverlay.ddRVal != DD_OK) + { + printf("Fail to mDdUpdateOverlay mDdUpdateOverlay.ddRVal = %d:%s\n",(int)mDdUpdateOverlay.ddRVal,DDErrorString(mDdUpdateOverlay.ddRVal)); + return mDdUpdateOverlay.ddRVal; + } + + /* blt */ + + + DDRAWI_DDRAWSURFACE_LCL *pDDSurface = mpPrimaryLocals[0]; + + if (!DdResetVisrgn(pDDSurface, NULL)) + { + // derr(L"DirectDrawImpl[%08x]::_clear DdResetVisrgn failed", this); + } + + + memset(&mDdBlt, 0, sizeof(DDHAL_BLTDATA)); + memset(&mDdBlt.bltFX, 0, sizeof(DDBLTFX)); + mDdBlt.bltFX.dwSize = sizeof(DDBLTFX); + + mDdBlt.lpDD = &mDDrawGlobal; + mDdBlt.Blt = mCallbacks.HALDDSurface.Blt; + mDdBlt.lpDDDestSurface = mpPrimaryLocals[0]; + + mpPrimaryLocals[0]->hDC = (ULONG_PTR)GetDC(GetDesktopWindow()); + mDdBlt.rDest.top = 50; + mDdBlt.rDest.bottom = 100; + mDdBlt.rDest.left = 0; + mDdBlt.rDest.right = 100; + mDdBlt.lpDDSrcSurface = NULL; + mDdBlt.IsClipped = FALSE; + mDdBlt.bltFX.dwFillColor = 0xFFFF00; + mDdBlt.dwFlags = DDBLT_COLORFILL | DDBLT_WAIT; + // mDdBlt.IsClipped = TRUE; + + if (mDdBlt.Blt(&mDdBlt) != DDHAL_DRIVER_HANDLED) + { + printf("Fail to mDdBlt = DDHAL_DRIVER_HANDLED\n"); + return DDHAL_DRIVER_HANDLED; + } + + + + if (mDdBlt.ddRVal!=DD_OK) + { + printf("Fail to mDdBlt mDdBlt.ddRVal = %d:%s\n",(int)mDdBlt.ddRVal,DDErrorString(mDdBlt.ddRVal)); + return mDdBlt.ddRVal; + } + + mDdUpdateOverlay.rDest.right = 100; + if ( mDdUpdateOverlay.UpdateOverlay(&mDdUpdateOverlay) == DDHAL_DRIVER_NOTHANDLED) + { + printf("Fail to mDdUpdateOverlay = DDERR_NOTINITIALIZED\n"); + return DDERR_NOTINITIALIZED; + } + + while(TRUE); + + return DD_OK; + + +} + + Propchange: trunk/rosapps/tests/DxHalTest/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/tests/DxHalTest/main.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/tests/DxHalTest/main.h?rev… ============================================================================== --- trunk/rosapps/tests/DxHalTest/main.h (added) +++ trunk/rosapps/tests/DxHalTest/main.h Thu Jul 13 23:00:05 2006 @@ -1,0 +1,267 @@ +#include <windows.h> +#include <ddrawi.h> +#include <d3dhal.h> + + +int StartupHAL (); +extern HDC hdc; +extern DDRAWI_DIRECTDRAW_GBL mDDrawGlobal; + extern DDRAWI_DIRECTDRAW_LCL mDDrawLocal; + extern DDHALINFO mHALInfo; + + extern DDHAL_CALLBACKS mCallbacks; + extern DDHAL_DDEXEBUFCALLBACKS mD3dBufferCallbacks; + extern D3DHAL_CALLBACKS mD3dCallbacks; + extern D3DHAL_GLOBALDRIVERDATA mD3dDriverData; + + extern UINT mcModeInfos; + extern DDHALMODEINFO *mpModeInfos; + + extern UINT mcvmList; + extern VIDMEM *mpvmList; + + extern UINT mcFourCC; + extern DWORD *mpFourCC; + + extern UINT mcTextures; + extern DDSURFACEDESC *mpTextures; + + + +BOOL (APIENTRY *DdCreateDirectDrawObject) ( + LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, + HDC hdc +); + +BOOL (APIENTRY *DdQueryDirectDrawObject) ( + LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, + LPDDHALINFO pHalInfo, + LPDDHAL_DDCALLBACKS pDDCallbacks, + LPDDHAL_DDSURFACECALLBACKS pDDSurfaceCallbacks, + LPDDHAL_DDPALETTECALLBACKS pDDPaletteCallbacks, + LPD3DHAL_CALLBACKS pD3dCallbacks, + LPD3DHAL_GLOBALDRIVERDATA pD3dDriverData, + LPDDHAL_DDEXEBUFCALLBACKS pD3dBufferCallbacks, + LPDDSURFACEDESC pD3dTextureFormats, + LPDWORD pdwFourCC, + LPVIDMEM pvmList +); + +BOOL +APIENTRY +DdDeleteDirectDrawObject( + LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal +); + +BOOL +APIENTRY +DdCreateSurfaceObject( + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, + BOOL bPrimarySurface +); + +BOOL +APIENTRY +DdDeleteSurfaceObject( + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal +); + +//BOOL +//APIENTRY +//DdResetVisrgn( +// LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, +// HWND hWnd +//); +BOOL (APIENTRY *DdResetVisrgn) ( + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, + HWND hWnd +); + +HDC +APIENTRY +DdGetDC( + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal, + LPPALETTEENTRY pColorTable +); + +BOOL +APIENTRY +DdReleaseDC( + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceLocal +); + +HBITMAP +APIENTRY +DdCreateDIBSection( + HDC hdc, + CONST BITMAPINFO *pbmi, + UINT iUsage, + VOID **ppvBits, + HANDLE hSectionApp, + DWORD dwOffset +); + +BOOL +APIENTRY +DdReenableDirectDrawObject( + LPDDRAWI_DIRECTDRAW_GBL pDirectDrawGlobal, + BOOL *pbNewMode +); + +//BOOL +//APIENTRY +//DdAttachSurface( +// LPDDRAWI_DDRAWSURFACE_LCL pSurfaceFrom, +// LPDDRAWI_DDRAWSURFACE_LCL pSurfaceTo +//); + +BOOL (APIENTRY *DdAttachSurface) ( + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceFrom, + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceTo +); + +VOID +APIENTRY +DdUnattachSurface( + LPDDRAWI_DDRAWSURFACE_LCL pSurface, + LPDDRAWI_DDRAWSURFACE_LCL pSurfaceAttached +); + +ULONG +APIENTRY +DdQueryDisplaySettingsUniqueness(VOID); + +HANDLE +APIENTRY +DdGetDxHandle( + LPDDRAWI_DIRECTDRAW_LCL pDDraw, + LPDDRAWI_DDRAWSURFACE_LCL pSurface, + BOOL bRelease +); + +BOOL +APIENTRY +DdSetGammaRamp( + LPDDRAWI_DIRECTDRAW_LCL pDDraw, + HDC hdc, + LPVOID lpGammaRamp +); + +DWORD +APIENTRY +DdSwapTextureHandles( + LPDDRAWI_DIRECTDRAW_LCL pDDraw, + LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl1, + LPDDRAWI_DDRAWSURFACE_LCL pDDSLcl2 +); + +char* DDErrorString (HRESULT hr) +{ + switch (hr) + { + case DD_OK: return "DD_OK"; + case DDERR_ALREADYINITIALIZED: return "DDERR_ALREADYINITIALIZED"; + case DDERR_CANNOTATTACHSURFACE: return "DDERR_CANNOTATTACHSURFACE"; + case DDERR_CANNOTDETACHSURFACE: return "DDERR_CANNOTDETACHSURFACE"; + case DDERR_CURRENTLYNOTAVAIL: return "DDERR_CURRENTLYNOTAVAIL"; + case DDERR_EXCEPTION: return "DDERR_EXCEPTION"; + case DDERR_GENERIC: return "DDERR_GENERIC"; + case DDERR_HEIGHTALIGN: return "DDERR_HEIGHTALIGN"; + case DDERR_INCOMPATIBLEPRIMARY: return "DDERR_INCOMPATIBLEPRIMARY"; + case DDERR_INVALIDCAPS: return "DDERR_INVALIDCAPS"; + case DDERR_INVALIDCLIPLIST: return "DDERR_INVALIDCLIPLIST"; + case DDERR_INVALIDMODE: return "DDERR_INVALIDMODE"; + case DDERR_INVALIDOBJECT: return "DDERR_INVALIDOBJECT"; + case DDERR_INVALIDPARAMS: return "DDERR_INVALIDPARAMS"; + case DDERR_INVALIDPIXELFORMAT: return "DDERR_INVALIDPIXELFORMAT"; + case DDERR_INVALIDRECT: return "DDERR_INVALIDRECT"; + case DDERR_LOCKEDSURFACES: return "DDERR_LOCKEDSURFACES"; + case DDERR_NO3D: return "DDERR_NO3D"; + case DDERR_NOALPHAHW: return "DDERR_NOALPHAHW"; + case DDERR_NOCLIPLIST: return "DDERR_NOCLIPLIST"; + case DDERR_NOCOLORCONVHW: return "DDERR_NOCOLORCONVHW"; + case DDERR_NOCOOPERATIVELEVELSET: return "DDERR_NOCOOPERATIVELEVELSET"; + case DDERR_NOCOLORKEY: return "DDERR_NOCOLORKEY"; + case DDERR_NOCOLORKEYHW: return "DDERR_NOCOLORKEYHW"; + case DDERR_NODIRECTDRAWSUPPORT: return "DDERR_NODIRECTDRAWSUPPORT"; + case DDERR_NOEXCLUSIVEMODE: return "DDERR_NOEXCLUSIVEMODE"; + case DDERR_NOFLIPHW: return "DDERR_NOFLIPHW"; + case DDERR_NOGDI: return "DDERR_NOGDI"; + case DDERR_NOMIRRORHW: return "DDERR_NOMIRRORHW"; + case DDERR_NOTFOUND: return "DDERR_NOTFOUND"; + case DDERR_NOOVERLAYHW: return "DDERR_NOOVERLAYHW"; + case DDERR_NORASTEROPHW: return "DDERR_NORASTEROPHW"; + case DDERR_NOROTATIONHW: return "DDERR_NOROTATIONHW"; + case DDERR_NOSTRETCHHW: return "DDERR_NOSTRETCHHW"; + case DDERR_NOT4BITCOLOR: return "DDERR_NOT4BITCOLOR"; + case DDERR_NOT4BITCOLORINDEX: return "DDERR_NOT4BITCOLORINDEX"; + case DDERR_NOT8BITCOLOR: return "DDERR_NOT8BITCOLOR"; + case DDERR_NOTEXTUREHW: return "DDERR_NOTEXTUREHW"; + case DDERR_NOVSYNCHW: return "DDERR_NOVSYNCHW"; + case DDERR_NOZBUFFERHW: return "DDERR_NOZBUFFERHW"; + case DDERR_NOZOVERLAYHW: return "DDERR_NOZOVERLAYHW"; + case DDERR_OUTOFCAPS: return "DDERR_OUTOFCAPS"; + case DDERR_OUTOFMEMORY: return "DDERR_OUTOFMEMORY"; + case DDERR_OUTOFVIDEOMEMORY: return "DDERR_OUTOFVIDEOMEMORY"; + case DDERR_OVERLAYCANTCLIP: return "DDERR_OVERLAYCANTCLIP"; + case DDERR_OVERLAYCOLORKEYONLYONEACTIVE: return "DDERR_OVERLAYCOLORKEYONLYONEACTIVE"; + case DDERR_PALETTEBUSY: return "DDERR_PALETTEBUSY"; + case DDERR_COLORKEYNOTSET: return "DDERR_COLORKEYNOTSET"; + case DDERR_SURFACEALREADYATTACHED: return "DDERR_SURFACEALREADYATTACHED"; + case DDERR_SURFACEALREADYDEPENDENT: return "DDERR_SURFACEALREADYDEPENDENT"; + case DDERR_SURFACEBUSY: return "DDERR_SURFACEBUSY"; + case DDERR_CANTLOCKSURFACE: return "DDERR_CANTLOCKSURFACE"; + case DDERR_SURFACEISOBSCURED: return "DDERR_SURFACEISOBSCURED"; + case DDERR_SURFACELOST: return "DDERR_SURFACELOST"; + case DDERR_SURFACENOTATTACHED: return "DDERR_SURFACENOTATTACHED"; + case DDERR_TOOBIGHEIGHT: return "DDERR_TOOBIGHEIGHT"; + case DDERR_TOOBIGSIZE: return "DDERR_TOOBIGSIZE"; + case DDERR_TOOBIGWIDTH: return "DDERR_TOOBIGWIDTH"; + case DDERR_UNSUPPORTED: return "DDERR_UNSUPPORTED"; + case DDERR_UNSUPPORTEDFORMAT: return "DDERR_UNSUPPORTEDFORMAT"; + case DDERR_UNSUPPORTEDMASK: return "DDERR_UNSUPPORTEDMASK"; + case DDERR_VERTICALBLANKINPROGRESS: return "DDERR_VERTICALBLANKINPROGRESS"; + case DDERR_WASSTILLDRAWING: return "DDERR_WASSTILLDRAWING"; + case DDERR_XALIGN: return "DDERR_XALIGN"; + case DDERR_INVALIDDIRECTDRAWGUID: return "DDERR_INVALIDDIRECTDRAWGUID"; + case DDERR_DIRECTDRAWALREADYCREATED: return "DDERR_DIRECTDRAWALREADYCREATED"; + case DDERR_NODIRECTDRAWHW: return "DDERR_NODIRECTDRAWHW"; + case DDERR_PRIMARYSURFACEALREADYEXISTS: return "DDERR_PRIMARYSURFACEALREADYEXISTS"; + case DDERR_NOEMULATION: return "DDERR_NOEMULATION"; + case DDERR_REGIONTOOSMALL: return "DDERR_REGIONTOOSMALL"; + case DDERR_CLIPPERISUSINGHWND: return "DDERR_CLIPPERISUSINGHWND"; + case DDERR_NOCLIPPERATTACHED: return "DDERR_NOCLIPPERATTACHED"; + case DDERR_NOHWND: return "DDERR_NOHWND"; + case DDERR_HWNDSUBCLASSED: return "DDERR_HWNDSUBCLASSED"; + case DDERR_HWNDALREADYSET: return "DDERR_HWNDALREADYSET"; + case DDERR_NOPALETTEATTACHED: return "DDERR_NOPALETTEATTACHED"; + case DDERR_NOPALETTEHW: return "DDERR_NOPALETTEHW"; + case DDERR_BLTFASTCANTCLIP: return "DDERR_BLTFASTCANTCLIP"; + case DDERR_NOBLTHW: return "DDERR_NOBLTHW"; + case DDERR_NODDROPSHW: return "DDERR_NODDROPSHW"; + case DDERR_OVERLAYNOTVISIBLE: return "DDERR_OVERLAYNOTVISIBLE"; + case DDERR_NOOVERLAYDEST: return "DDERR_NOOVERLAYDEST"; + case DDERR_INVALIDPOSITION: return "DDERR_INVALIDPOSITION"; + case DDERR_NOTAOVERLAYSURFACE: return "DDERR_NOTAOVERLAYSURFACE"; + case DDERR_EXCLUSIVEMODEALREADYSET: return "DDERR_EXCLUSIVEMODEALREADYSET"; + case DDERR_NOTFLIPPABLE: return "DDERR_NOTFLIPPABLE"; + case DDERR_CANTDUPLICATE: return "DDERR_CANTDUPLICATE"; + case DDERR_NOTLOCKED: return "DDERR_NOTLOCKED"; + case DDERR_CANTCREATEDC: return "DDERR_CANTCREATEDC"; + case DDERR_NODC: return "DDERR_NODC"; + case DDERR_WRONGMODE: return "DDERR_WRONGMODE"; + case DDERR_IMPLICITLYCREATED: return "DDERR_IMPLICITLYCREATED"; + case DDERR_NOTPALETTIZED: return "DDERR_NOTPALETTIZED"; + case DDERR_UNSUPPORTEDMODE: return "DDERR_UNSUPPORTEDMODE"; + case DDERR_NOMIPMAPHW: return "DDERR_NOMIPMAPHW"; + case DDERR_INVALIDSURFACETYPE: return "DDERR_INVALIDSURFACETYPE"; + case DDERR_DCALREADYCREATED: return "DDERR_DCALREADYCREATED"; + case DDERR_CANTPAGELOCK: return "DDERR_CANTPAGELOCK"; + case DDERR_CANTPAGEUNLOCK: return "DDERR_CANTPAGEUNLOCK"; + case DDERR_NOTPAGELOCKED: return "DDERR_NOTPAGELOCKED"; + case DDERR_NOTINITIALIZED: return "DDERR_NOTINITIALIZED"; + } + + return "Unknown Error "; +} + Propchange: trunk/rosapps/tests/DxHalTest/main.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/tests/directory.xml URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/tests/directory.xml?rev=23… ============================================================================== --- trunk/rosapps/tests/directory.xml (original) +++ trunk/rosapps/tests/directory.xml Thu Jul 13 23:00:05 2006 @@ -67,6 +67,9 @@ <directory name="dnsquery"> <xi:include href="dnsquery/dnsquery.xml" /> </directory> +<directory name="DxHalTest"> + <xi:include href="DxHalTest/DxHalTest.rbuild" /> +</directory> <directory name="edit"> <xi:include href="edit/edit.xml" /> </directory> @@ -97,9 +100,9 @@ <directory name="gradient"> <xi:include href="gradient/gradient.xml" /> </directory> -<directory name="guithreadinfo"> - <xi:include href="guithreadinfo/guithreadinfo.xml" /> -</directory> + + + <directory name="hello"> <xi:include href="hello/hello.xml" /> </directory>

1 0

[hpoussin] 23042: Add static entries for PCnet and NE2000 network cards (VMware/QEmu resp.) The same commit was done in revision 20214 in 0.2.9 branch.
by hpoussin＠svn.reactos.org 13 Jul '06

13 Jul '06

Author: hpoussin Date: Thu Jul 13 22:55:18 2006 New Revision: 23042 URL: http://svn.reactos.org/svn/reactos?rev=23042&view=rev Log: Add static entries for PCnet and NE2000 network cards (VMware/QEmu resp.) The same commit was done in revision 20214 in 0.2.9 branch. Modified: branches/ros-branch-0_3_0/reactos/boot/bootdata/hivesys.inf Modified: branches/ros-branch-0_3_0/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/boot/b… ============================================================================== --- branches/ros-branch-0_3_0/reactos/boot/bootdata/hivesys.inf (original) +++ branches/ros-branch-0_3_0/reactos/boot/bootdata/hivesys.inf Thu Jul 13 22:55:18 2006 @@ -782,4 +782,172 @@ 00,01,01,00,11,00,00,00,08,00,00,00,00,00,00,00,f8,02,00,00,00,00,00,00,ff,02,00,00,00,00,00,00, \ 00,02,01,00,11,00,00,00,03,00,00,00,03,00,00,00 +; Static entries to get networking on the LiveCD working +; PCnet (VMware) +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000","NetCfgInstanceId",0x00000000,"{bf3401a0-6e70-11da-2d80-4fc4ac68929a}" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000","BUS_TO_SCAN",0x00000000,"ALL" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000","BUSTIMER",0x00000000,"0" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000","BUSTYPE",0x00000000,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000","EXTPHY",0x00000000,"0" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000","FDUP",0x00000000,"0" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000","LED0",0x00000000,"10000" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000","LED1",0x00000000,"10000" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000","LED2",0x00000000,"10000" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000","LED3",0x00000000,"10000" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000","MPMODE",0x00000000,"0" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000","TP",0x00000000,"1" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000","DriverDate",0x00000000,"10-8-2005" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000","DriverDateData",0x00000001,00,80,cc,39,9b,cb,c5,01 +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000","DriverDesc",0x00000000,"AMD 79c970 [PCnet32 LANCE]" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000","DriverVersion",0x00000000,"0.0.0.0" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000","InfPath",0x00000000,"netamd.inf" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000","InfSection",0x00000000,"PCNet_Inst" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000","InfSectionExt",0x00000000,".NT" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000","MatchingDeviceId",0x00000000,"PCI\VEN_1022&DEV_2000" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000","ProviderName",0x00000000,"ReactOS Team" + +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000\Linkage","Export",0x00000000,"\Device\{bf3401a0-6e70-11da-2d80-4fc4ac68929a}" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000\Linkage","RootDevice",0x00000000,"{bf3401a0-6e70-11da-2d80-4fc4ac68929a}" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0000\Linkage","UpperBind",0x00000000,"Tcpip" + +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}\{bf3401a0-6e70-11da-2d80-4fc4ac68929a}\Connection","Name",0x00000000,"Network connection" +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}\{bf3401a0-6e70-11da-2d80-4fc4ac68929a}\Connection","PnpInstanceId",0x00000000,"PCI\VEN_1022&DEV_2000&SUBSYS_20001022&REV_10\1&f103bba4&11" +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}\{bf3401a0-6e70-11da-2d80-4fc4ac68929a}\Connection","ShowIcon",0x00010001,0x00000001 + +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_1022&DEV_2000&SUBSYS_20001022&REV_10\1&f103bba4&11","Capabilities",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_1022&DEV_2000&SUBSYS_20001022&REV_10\1&f103bba4&11","HardwareID",0x00010000,\ + "PCI\VEN_1022&DEV_2000&SUBSYS_20001022&REV_10",\ + "PCI\VEN_1022&DEV_2000&SUBSYS_20001022",\ + "PCI\VEN_1022&DEV_2000&CC_020000",\ + "PCI\VEN_1022&DEV_2000&CC_0200" +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_1022&DEV_2000&SUBSYS_20001022&REV_10\1&f103bba4&11","CompatibleIDs",0x00010000,\ + "PCI\VEN_1022&DEV_2000&SUBSYS_20001022&REV_10",\ + "PCI\VEN_1022&DEV_2000&SUBSYS_20001022",\ + "PCI\VEN_1022&DEV_2000&CC_020000",\ + "PCI\VEN_1022&DEV_2000&CC_0200",\ + "PCI\VEN_1022",\ + "PCI\CC_020000",\ + "PCI\CC_0200" +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_1022&DEV_2000&SUBSYS_20001022&REV_10\1&f103bba4&11","DeviceDesc",0x00000000,"AMD 79c970 [PCnet32 LANCE]" +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_1022&DEV_2000&SUBSYS_20001022&REV_10\1&f103bba4&11","LocationInformation",0x00000000,"PCI-Bus 0, Device 17, Function 0" +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_1022&DEV_2000&SUBSYS_20001022&REV_10\1&f103bba4&11","Driver",0x00000000,"{4d36e972-e325-11ce-bfc1-08002be10318}\0000" +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_1022&DEV_2000&SUBSYS_20001022&REV_10\1&f103bba4&11","Class",0x00000000,"Net" +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_1022&DEV_2000&SUBSYS_20001022&REV_10\1&f103bba4&11","ClassGUID",0x00000000,"{4d36e972-e325-11ce-bfc1-08002be10318}" +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_1022&DEV_2000&SUBSYS_20001022&REV_10\1&f103bba4&11","Mfg",0x00000000,"Advanced Micro Devices (AMD)" +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_1022&DEV_2000&SUBSYS_20001022&REV_10\1&f103bba4&11","Service",0x00000000,"PCNet" + +HKLM,"SYSTEM\CurrentControlSet\Services\{bf3401a0-6e70-11da-2d80-4fc4ac68929a}\Parameters\Tcpip","DefaultGateway",0x00000000,"0.0.0.0" +HKLM,"SYSTEM\CurrentControlSet\Services\{bf3401a0-6e70-11da-2d80-4fc4ac68929a}\Parameters\Tcpip","IPAddress",0x00000000,"0.0.0.0" +HKLM,"SYSTEM\CurrentControlSet\Services\{bf3401a0-6e70-11da-2d80-4fc4ac68929a}\Parameters\Tcpip","SubnetMask",0x00000000,"0.0.0.0" + +HKLM,"SYSTEM\CurrentControlSet\Services\PCNet","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\PCNet","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\PCNet","ErrorControl",0x00010001,00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\PCNet","ImagePath",0x00000000,"System32\drivers\pcnet.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\PCNet","Group",0x00000000,"NDIS" + +; NE1000 (QEmu) +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0001","NetCfgInstanceId",0x00000000,"{7f14fc20-6e7d-11da-2d80-4fc4ac68929a}" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0001","BusType",0x00000000,"5" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0001","DriverDate",0x00000000,"11-14-2005" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0001","DriverDateData",0x00000001,00,40,15,5b,ae,e8,c5,01,00,00,00,00,00,00,00,00 +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0001","DriverDesc",0x00000000,"RTL-8029(AS)" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0001","DriverVersion",0x00000000,"0.0.0.0" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0001","InfPath",0x00000000,"netrtpnt.inf" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0001","InfSection",0x00000000,"NE2000_Inst" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0001","InfSectionExt",0x00000000,".NT" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0001","Irq",0x00000000,"B" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0001","MatchingDeviceId",0x00000000,"PCI\VEN_10EC&DEV_8029" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0001","NetworkAddress",0x00000000,"001122334455" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0001","Port",0x00000000,"c100" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0001","ProviderName",0x00000000,"ReactOS Team" + +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0001\Linkage","Export",0x00000000,"\Device\{7f14fc20-6e7d-11da-2d80-4fc4ac68929a}" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0001\Linkage","RootDevice",0x00000000,"{7f14fc20-6e7d-11da-2d80-4fc4ac68929a}" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4d36e972-e325-11ce-bfc1-08002be10318}\0001\Linkage","UpperBind",0x00000000,"Tcpip" + +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}\{7f14fc20-6e7d-11da-2d80-4fc4ac68929a}\Connection","Name",0x00000000,"Network connection" +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}\{7f14fc20-6e7d-11da-2d80-4fc4ac68929a}\Connection","PnpInstanceId",0x00000000,"PCI\VEN_10EC&DEV_8029&SUBSYS_00000000&REV_00\1&f103bba4&03" +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E972-E325-11CE-BFC1-08002BE10318}\{7f14fc20-6e7d-11da-2d80-4fc4ac68929a}\Connection","ShowIcon",0x00010001,0x00000001 + +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_10EC&DEV_8029&SUBSYS_00000000&REV_00\1&f103bba4&03","Capabilities",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_10EC&DEV_8029&SUBSYS_00000000&REV_00\1&f103bba4&03","HardwareID",0x00010000,\ + "PCI\VEN_10EC&DEV_8029&SUBSYS_00000000&REV_00",\ + "PCI\VEN_10EC&DEV_8029&SUBSYS_00000000",\ + "PCI\VEN_10EC&DEV_8029&CC_020000",\ + "PCI\VEN_10EC&DEV_8029&CC_0200" +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_10EC&DEV_8029&SUBSYS_00000000&REV_00\1&f103bba4&03","CompatibleIDs",0x00010000,\ + "PCI\VEN_10EC&DEV_8029&REV_00",\ + "PCI\VEN_10EC&DEV_8029&",\ + "PCI\VEN_10EC&CC_020000",\ + "PCI\VEN_10EC&CC_0200",\ + "PCI\VEN_10EC",\ + "PCI\CC_020000",\ + "PCI\CC_0200" +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_10EC&DEV_8029&SUBSYS_00000000&REV_00\1&f103bba4&03","DeviceDesc",0x00000000,"RTL-8029(AS)" +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_10EC&DEV_8029&SUBSYS_00000000&REV_00\1&f103bba4&03","LocationInformation",0x00000000,"PCI-Bus 0, Device 3, Function 0" +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_10EC&DEV_8029&SUBSYS_00000000&REV_00\1&f103bba4&03","Driver",0x00000000,"{4d36e972-e325-11ce-bfc1-08002be10318}\0001" +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_10EC&DEV_8029&SUBSYS_00000000&REV_00\1&f103bba4&03","Class",0x00000000,"Net" +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_10EC&DEV_8029&SUBSYS_00000000&REV_00\1&f103bba4&03","ClassGUID",0x00000000,"{4d36e972-e325-11ce-bfc1-08002be10318}" +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_10EC&DEV_8029&SUBSYS_00000000&REV_00\1&f103bba4&03","Mfg",0x00000000,"Realtek Semiconductor" +HKLM,"SYSTEM\CurrentControlSet\Enum\PCI\VEN_10EC&DEV_8029&SUBSYS_00000000&REV_00\1&f103bba4&03","Service",0x00000000,"ne2000" + +HKLM,"SYSTEM\CurrentControlSet\Services\{7f14fc20-6e7d-11da-2d80-4fc4ac68929a}\Parameters\Tcpip","DefaultGateway",0x00000000,"0.0.0.0" +HKLM,"SYSTEM\CurrentControlSet\Services\{7f14fc20-6e7d-11da-2d80-4fc4ac68929a}\Parameters\Tcpip","IPAddress",0x00000000,"0.0.0.0" +HKLM,"SYSTEM\CurrentControlSet\Services\{7f14fc20-6e7d-11da-2d80-4fc4ac68929a}\Parameters\Tcpip","SubnetMask",0x00000000,"0.0.0.0" + +HKLM,"SYSTEM\CurrentControlSet\Services\ne2000","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\ne2000","Start",0x00010001,0x00000003 +HKLM,"SYSTEM\CurrentControlSet\Services\ne2000","ErrorControl",0x00010001,00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\ne2000","ImagePath",0x00000000,"System32\drivers\ne2000.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\ne2000","Group",0x00000000,"NDIS" + +; Common info +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Linkage","Bind",0x00010000,\ + "\Device\{bf3401a0-6e70-11da-2d80-4fc4ac68929a}",\ + "\Device\{7f14fc20-6e7d-11da-2d80-4fc4ac68929a}" +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Linkage","Export",0x00010000,\ + "\Device\Tcpip_{bf3401a0-6e70-11da-2d80-4fc4ac68929a}",\ + "\Device\Tcpip_{7f14fc20-6e7d-11da-2d80-4fc4ac68929a}" +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Linkage","Route",0x00010000,\ + "{bf3401a0-6e70-11da-2d80-4fc4ac68929a}",\ + "{7f14fc20-6e7d-11da-2d80-4fc4ac68929a}" + +; The following entries should be generated from .inf files during installation +; TCPIP Protocol +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","Characteristics",0x00010001,0x00000080 +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","ComponentId",0x00000000,"ms_tcpip" +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","Description",0x00000000,"Internet Protocol (TCP/IP)" +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","InfPath",0x00000000,"BUGBUG_Create from Inffile.inf" +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}","InfSection",0x00000000,"BUGBUG_Create from Inffile.inf" +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}\Ndi","ClsId",0x00000000,"{A907657F-6FDF-11D0-8EFB-00C04FD912B2}" +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}\Ndi","HelpText",0x00000000,"Transmission Control Protocol/Internet Protocol" +HKLM,"SYSTEM\CurrentControlSet\Control\Network\{4D36E975-E325-11CE-BFC1-08002BE10318}\{RandomProtocolGUID_TCPIP}\Ndi","Service",0x00000000,"Tcpip" + +; TCP/IP driver +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","ErrorControl",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","Group",0x00000000,"PNP_TDI" +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","ImagePath",0x00020000,"system32\drivers\tcpip.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","Start",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip","Type",0x00010001,0x00000001 +; NOTE: These settings should be added by the network setup +; These bindings are of the windows 2000 type, and will probably need to be +; twiddled to get 3rd-party network-related software to work. +; NT4 puts additional stuff in the Bind, Export, and Route values. +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","DataBasePath",0x00010000,"DataBasePath" +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","Domain",0x00010000,"" +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","Hostname",0x00010000,"ROSHost" +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","NameServer",0x00010000,"0.0.0.0" +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","ForwardBroadcasts",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","IPEnableRouter",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","SearchList",0x00010000,"" +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters","EnableSecurityFilters",0x00010001,0x00000000 +;HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\PersistentRoutes",,0x00000010 +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","UseDelayedAcceptance",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MaxSockAddrLength",0x00010001,0x00000010 +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","MinSockAddrLength",0x00010001,0x00000010 +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","HelperDllName",0x00000000,"%SystemRoot%\System32\wshtcpip.dll" +HKLM,"SYSTEM\CurrentControlSet\Services\Tcpip\Parameters\WinSock","Mapping",0x00000001,0c,00,00,00,03,00,00,00,02,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,01,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,00,00,00,00,06,00,00,00,00,00,00,00,01,00,00,00,06,00,00,00,02,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,02,00,00,00,00,00,00,00,02,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,00,00,00,00,11,00,00,00,00,00,00,00,02,00,00,00,11,00,00,00,02,00,00,00,03,00,00,00,00,00,00,00,02,00,00,00,03,00,00,00,01,00,00 +HKLM,"SYSTEM\CurrentControlSet\Services\Winsock\Parameters","Transports",0x00010000,"Tcpip" + ; EOF

1 0

[greatlrd] 23041: patch from w3seek :Bug #: 1667 : NTOSKRNL: Fix GCC4 warning and return correct error code in NtSignalAndWaitForSingleObject
by greatlrd＠svn.reactos.org 13 Jul '06

13 Jul '06

Author: greatlrd Date: Thu Jul 13 16:30:56 2006 New Revision: 23041 URL: http://svn.reactos.org/svn/reactos?rev=23041&view=rev Log: patch from w3seek :Bug #: 1667 : NTOSKRNL: Fix GCC4 warning and return correct error code in NtSignalAndWaitForSingleObject Modified: trunk/reactos/ntoskrnl/ke/clock.c trunk/reactos/ntoskrnl/ob/obref.c trunk/reactos/ntoskrnl/ob/obwait.c Modified: trunk/reactos/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/clock.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ke/clock.c (original) +++ trunk/reactos/ntoskrnl/ke/clock.c Thu Jul 13 16:30:56 2006 @@ -261,7 +261,7 @@ { /* Update user times */ CurrentThread->UserTime++; - InterlockedIncrement(&CurrentProcess->UserTime); + InterlockedIncrement((PLONG)&CurrentProcess->UserTime); Prcb->UserTime++; } else @@ -276,7 +276,7 @@ { /* This was normal kernel time */ CurrentThread->KernelTime++; - InterlockedIncrement(&CurrentProcess->KernelTime); + InterlockedIncrement((PLONG)&CurrentProcess->KernelTime); } else if (Irql == DISPATCH_LEVEL) { Modified: trunk/reactos/ntoskrnl/ob/obref.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obref.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obref.c (original) +++ trunk/reactos/ntoskrnl/ob/obref.c Thu Jul 13 16:30:56 2006 @@ -224,7 +224,7 @@ } /* Switch objects */ - OldRef.Value = InterlockedExchange(&FastRef->Value, NewValue); + OldRef.Value = InterlockedExchange((PLONG)&FastRef->Value, NewValue); OldObject = (PVOID)((ULONG_PTR)OldRef.Object &~ MAX_FAST_REFS); if ((OldObject) && (OldRef.RefCnt)) { Modified: trunk/reactos/ntoskrnl/ob/obwait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obwait.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obwait.c (original) +++ trunk/reactos/ntoskrnl/ob/obwait.c Thu Jul 13 16:30:56 2006 @@ -477,6 +477,7 @@ !(HandleInfo.GrantedAccess & EVENT_MODIFY_STATE)) { /* Fail: lack of rights */ + Status = STATUS_ACCESS_DENIED; goto Quickie; } @@ -505,6 +506,7 @@ !(HandleInfo.GrantedAccess & SEMAPHORE_MODIFY_STATE)) { /* Fail: lack of rights */ + Status = STATUS_ACCESS_DENIED; goto Quickie; }

1 0

[fireball] 23040: Free the buffer as MSDN says
by fireball＠svn.reactos.org 13 Jul '06

13 Jul '06

Author: fireball Date: Thu Jul 13 11:17:13 2006 New Revision: 23040 URL: http://svn.reactos.org/svn/reactos?rev=23040&view=rev Log: Free the buffer as MSDN says Modified: trunk/reactos/ntoskrnl/wmi/wmi.c Modified: trunk/reactos/ntoskrnl/wmi/wmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/wmi/wmi.c?rev=230… ============================================================================== --- trunk/reactos/ntoskrnl/wmi/wmi.c (original) +++ trunk/reactos/ntoskrnl/wmi/wmi.c Thu Jul 13 11:17:13 2006 @@ -64,6 +64,10 @@ { DPRINT1("IoWMIWriteEvent() called for WnodeEventItem %p, returning success\n", WnodeEventItem); + + /* Free the buffer if we are returning success */ + if (WnodeEventItem != NULL) + ExFreePool(WnodeEventItem); return STATUS_SUCCESS; }

1 0

[ion] 23039: - Add some TIMER values to the ddk. - Add DPC Settings (Queue Depths, Rates, etc) - Cleanup System/Run Time Update code. - Always increase kernel time in PRCB when inside kernel-mode code. - Get rid of superflous interlocked commands when not needed. - Improve detection of DPC vs non-DPC time. - Respect and apply DPC queue/rate rules. - Allow future use of non-fulltick time increments.
by ion＠svn.reactos.org 13 Jul '06

13 Jul '06

Author: ion Date: Thu Jul 13 10:23:34 2006 New Revision: 23039 URL: http://svn.reactos.org/svn/reactos?rev=23039&view=rev Log: - Add some TIMER values to the ddk. - Add DPC Settings (Queue Depths, Rates, etc) - Cleanup System/Run Time Update code. - Always increase kernel time in PRCB when inside kernel-mode code. - Get rid of superflous interlocked commands when not needed. - Improve detection of DPC vs non-DPC time. - Respect and apply DPC queue/rate rules. - Allow future use of non-fulltick time increments. Modified: trunk/reactos/include/ddk/winddk.h trunk/reactos/ntoskrnl/ke/clock.c trunk/reactos/ntoskrnl/ke/dpc.c Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=2… ============================================================================== --- trunk/reactos/include/ddk/winddk.h (original) +++ trunk/reactos/include/ddk/winddk.h Thu Jul 13 10:23:34 2006 @@ -1189,6 +1189,9 @@ }; } KGUARDED_MUTEX, *PKGUARDED_MUTEX; +#define TIMER_TABLE_SIZE 512 +#define TIMER_TABLE_SHIFT 9 + typedef struct _KTIMER { DISPATCHER_HEADER Header; ULARGE_INTEGER DueTime; @@ -1196,6 +1199,10 @@ struct _KDPC *Dpc; LONG Period; } KTIMER, *PKTIMER, *RESTRICTED_POINTER PRKTIMER; + +#define ASSERT_TIMER(E) \ + ASSERT(((E)->Header.Type == TimerNotificationObject) || \ + ((E)->Header.Type == TimerSynchronizationObject)) typedef struct _KMUTANT { DISPATCHER_HEADER Header; Modified: trunk/reactos/ntoskrnl/ke/clock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/clock.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ke/clock.c (original) +++ trunk/reactos/ntoskrnl/ke/clock.c Thu Jul 13 10:23:34 2006 @@ -39,12 +39,17 @@ static KDPC KiExpireTimerDpc; static BOOLEAN KiClockSetupComplete = FALSE; +extern ULONG KiMaximumDpcQueueDepth; +extern ULONG KiMinimumDpcRate; +extern ULONG KiAdjustDpcThreshold; +extern ULONG KiIdealDpcRate; + /* * Number of timer interrupts since initialisation */ volatile KSYSTEM_TIME KeTickCount = {0}; volatile ULONG KiRawTicks = 0; - +LONG KiTickOffset = 0; extern LIST_ENTRY KiTimerListHead; /* @@ -237,73 +242,87 @@ */ VOID STDCALL -KeUpdateRunTime( - IN PKTRAP_FRAME TrapFrame, - IN KIRQL Irql - ) -{ - PKPRCB Prcb; - PKTHREAD CurrentThread; - PKPROCESS CurrentProcess; -#if 0 - ULONG DpcLastCount; -#endif - - Prcb = KeGetCurrentPrcb(); - - /* Make sure we don't go further if we're in early boot phase. */ - if (Prcb == NULL || Prcb->CurrentThread == NULL) - return; - - DPRINT("KernelTime %u, UserTime %u \n", Prcb->KernelTime, Prcb->UserTime); - - CurrentThread = Prcb->CurrentThread; - CurrentProcess = CurrentThread->ApcState.Process; - - /* - * Cs bit 0 is always set for user mode if we are in protected mode. - * V86 mode is counted as user time. - */ - if (TrapFrame->SegCs & MODE_MASK || - TrapFrame->EFlags & X86_EFLAGS_VM) - { - (void)InterlockedIncrementUL(&CurrentThread->UserTime); - (void)InterlockedIncrementUL(&CurrentProcess->UserTime); - Prcb->UserTime++; +KeUpdateRunTime(IN PKTRAP_FRAME TrapFrame, + IN KIRQL Irql) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + PKTHREAD CurrentThread; + PKPROCESS CurrentProcess; + + /* Make sure we don't go further if we're in early boot phase. */ + if (!(Prcb) || !(Prcb->CurrentThread)) return; + + /* Get the current thread and process */ + CurrentThread = Prcb->CurrentThread; + CurrentProcess = CurrentThread->ApcState.Process; + + /* Check if we came from user mode */ + if (TrapFrame->PreviousPreviousMode != KernelMode) + { + /* Update user times */ + CurrentThread->UserTime++; + InterlockedIncrement(&CurrentProcess->UserTime); + Prcb->UserTime++; + } + else + { + /* Check IRQ */ + if (Irql > DISPATCH_LEVEL) + { + /* This was an interrupt */ + Prcb->InterruptTime++; + } + else if ((Irql < DISPATCH_LEVEL) || !(Prcb->DpcRoutineActive)) + { + /* This was normal kernel time */ + CurrentThread->KernelTime++; + InterlockedIncrement(&CurrentProcess->KernelTime); + } + else if (Irql == DISPATCH_LEVEL) + { + /* This was DPC time */ + Prcb->DpcTime++; + } + + /* Update CPU kernel time in all cases */ + Prcb->KernelTime++; } - else - { - if (Irql > DISPATCH_LEVEL) - { - Prcb->InterruptTime++; - } - else if (Irql == DISPATCH_LEVEL) - { - Prcb->DpcTime++; - } - else - { - (void)InterlockedIncrementUL(&CurrentThread->KernelTime); - (void)InterlockedIncrementUL(&CurrentProcess->KernelTime); - Prcb->KernelTime++; - } - } - -#if 0 - DpcLastCount = Prcb->DpcLastCount; - Prcb->DpcLastCount = Prcb->DpcCount; - Prcb->DpcRequestRate = ((Prcb->DpcCount - DpcLastCount) + - Prcb->DpcRequestRate) / 2; -#endif - - if (Prcb->DpcData[0].DpcQueueDepth > 0 && - Prcb->DpcRoutineActive == FALSE && - Prcb->DpcInterruptRequested == FALSE) - { - HalRequestSoftwareInterrupt(DISPATCH_LEVEL); - } - - /* FIXME: Do DPC rate adjustments */ + + /* Set the last DPC Count and request rate */ + Prcb->DpcLastCount = Prcb->DpcData[0].DpcCount; + Prcb->DpcRequestRate = ((Prcb->DpcData[0].DpcCount - Prcb->DpcLastCount) + + Prcb->DpcRequestRate) / 2; + + /* Check if we should request a DPC */ + if ((Prcb->DpcData[0].DpcQueueDepth) && !(Prcb->DpcRoutineActive)) + { + /* Request one */ + HalRequestSoftwareInterrupt(DISPATCH_LEVEL); + + /* Update the depth if needed */ + if ((Prcb->DpcRequestRate < KiIdealDpcRate) && + (Prcb->MaximumDpcQueueDepth > 1)) + { + /* Decrease the maximum depth by one */ + Prcb->MaximumDpcQueueDepth--; + } + } + else + { + /* Decrease the adjustment threshold */ + if (!(--Prcb->AdjustDpcThreshold)) + { + /* We've hit 0, reset it */ + Prcb->AdjustDpcThreshold = KiAdjustDpcThreshold; + + /* Check if we've hit queue maximum */ + if (KiMaximumDpcQueueDepth != Prcb->MaximumDpcQueueDepth) + { + /* Increase maximum by one */ + Prcb->MaximumDpcQueueDepth++; + } + } + } /* * If we're at end of quantum request software interrupt. The rest @@ -315,11 +334,11 @@ * we don't care about the quantum value anymore after the QuantumEnd * flag is set. */ - if ((CurrentThread->Quantum -= 3) <= 0) - { - Prcb->QuantumEnd = TRUE; - HalRequestSoftwareInterrupt(DISPATCH_LEVEL); - } + if ((CurrentThread->Quantum -= 3) <= 0) + { + Prcb->QuantumEnd = TRUE; + HalRequestSoftwareInterrupt(DISPATCH_LEVEL); + } } @@ -333,51 +352,56 @@ */ VOID STDCALL -KeUpdateSystemTime( - IN PKTRAP_FRAME TrapFrame, - IN KIRQL Irql - ) -/* - * FUNCTION: Handles a timer interrupt - */ -{ - LARGE_INTEGER Time; - - ASSERT(KeGetCurrentIrql() == PROFILE_LEVEL); - - KiRawTicks++; - - if (KiClockSetupComplete == FALSE) return; - - /* - * Increment the number of timers ticks - */ - (*(PULONGLONG)&KeTickCount)++; - SharedUserData->TickCountLowDeprecated++; - - Time.u.LowPart = SharedUserData->InterruptTime.LowPart; - Time.u.HighPart = SharedUserData->InterruptTime.High1Time; - Time.QuadPart += CLOCK_INCREMENT; - SharedUserData->InterruptTime.High2Time = Time.u.HighPart; - SharedUserData->InterruptTime.LowPart = Time.u.LowPart; - SharedUserData->InterruptTime.High1Time = Time.u.HighPart; - - Time.u.LowPart = SharedUserData->SystemTime.LowPart; - Time.u.HighPart = SharedUserData->SystemTime.High1Time; - Time.QuadPart += CLOCK_INCREMENT; - SharedUserData->SystemTime.High2Time = Time.u.HighPart; - SharedUserData->SystemTime.LowPart = Time.u.LowPart; - SharedUserData->SystemTime.High1Time = Time.u.HighPart; - - /* FIXME: Here we should check for remote debugger break-ins */ - - /* Update process and thread times */ - KeUpdateRunTime(TrapFrame, Irql); - - /* - * Queue a DPC that will expire timers - */ - KeInsertQueueDpc(&KiExpireTimerDpc, (PVOID)TrapFrame->Eip, 0); +KeUpdateSystemTime(IN PKTRAP_FRAME TrapFrame, + IN KIRQL Irql) +{ + LONG OldOffset; + LARGE_INTEGER Time; + ASSERT(KeGetCurrentIrql() == PROFILE_LEVEL); + if (!KiClockSetupComplete) return; + + /* Update interrupt time */ + Time.LowPart = SharedUserData->InterruptTime.LowPart; + Time.HighPart = SharedUserData->InterruptTime.High1Time; + Time.QuadPart += CLOCK_INCREMENT; + SharedUserData->InterruptTime.High2Time = Time.u.HighPart; + SharedUserData->InterruptTime.LowPart = Time.u.LowPart; + SharedUserData->InterruptTime.High1Time = Time.u.HighPart; + + /* Increase the tick offset */ + KiTickOffset -= CLOCK_INCREMENT; + OldOffset = KiTickOffset; + + /* Check if this isn't a tick yet */ + if (KiTickOffset > 0) + { + /* Expire timers */ + KeInsertQueueDpc(&KiExpireTimerDpc, (PVOID)TrapFrame->Eip, 0); + } + else + { + /* This was a tick, calculate the next one */ + KiTickOffset += CLOCK_INCREMENT; + + /* Setup time structure for system time */ + Time.LowPart = SharedUserData->SystemTime.LowPart; + Time.HighPart = SharedUserData->SystemTime.High1Time; + Time.QuadPart += CLOCK_INCREMENT; + SharedUserData->SystemTime.High2Time = Time.HighPart; + SharedUserData->SystemTime.LowPart = Time.LowPart; + SharedUserData->SystemTime.High1Time = Time.HighPart; + + /* Update tick count */ + (*(PULONGLONG)&KeTickCount)++; + SharedUserData->TickCountLowDeprecated++; + KiRawTicks++; + + /* Queue a DPC that will expire timers */ + KeInsertQueueDpc(&KiExpireTimerDpc, (PVOID)TrapFrame->Eip, 0); + } + + /* Update process and thread times */ + if (OldOffset <= 0) KeUpdateRunTime(TrapFrame, Irql); } /* Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=2303… ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c Thu Jul 13 10:23:34 2006 @@ -25,6 +25,10 @@ #pragma alloc_text(INIT, KeInitDpc) #endif +ULONG KiMaximumDpcQueueDepth = 4; +ULONG KiMinimumDpcRate = 3; +ULONG KiAdjustDpcThreshold = 20; +ULONG KiIdealDpcRate = 20; /* TYPES *******************************************************************/ @@ -49,8 +53,8 @@ KeInitializeEvent(Prcb->DpcEvent, 0, 0); #endif KeInitializeSpinLock(&Prcb->DpcData[0].DpcLock); - Prcb->MaximumDpcQueueDepth = 4; - Prcb->MinimumDpcRate = 3; + Prcb->MaximumDpcQueueDepth = KiMaximumDpcQueueDepth; + Prcb->MinimumDpcRate = KiMinimumDpcRate; Prcb->DpcData[0].DpcQueueDepth = 0; }

1 0

← Newer
1
...
33
34
35
36
37
38
39
...
67
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 July 2006