Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbirr] 20607: Fixed the register saving in ExfInterlockedCompareExchange64.
by hbirr＠svn.reactos.org 06 Jan '06

06 Jan '06

Fixed the register saving in ExfInterlockedCompareExchange64. Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S _____ Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S --- trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S 2006-01-06 08:37:46 UTC (rev 20606) +++ trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S 2006-01-06 11:36:43 UTC (rev 20607) @@ -611,8 +611,8 @@ @ExfInterlockedCompareExchange64@12: /* Save registers */ + push ebx push ebp - push ebp /* Get desination pointer, exchange value and comperand value/address */ mov ebp, ecx

1 0

[ion] 20606: - Fix Status/WaitStatus/Thread->WaitStatus confusion/mess and reduce to a signle variable.
by ion＠svn.reactos.org 06 Jan '06

06 Jan '06

- Fix Status/WaitStatus/Thread->WaitStatus confusion/mess and reduce to a signle variable. Modified: trunk/reactos/ntoskrnl/ke/wait.c _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2006-01-06 08:00:09 UTC (rev 20605) +++ trunk/reactos/ntoskrnl/ke/wait.c 2006-01-06 08:37:46 UTC (rev 20606) @@ -105,7 +105,7 @@ PKWAIT_BLOCK TimerWaitBlock; PKTIMER ThreadTimer; PKTHREAD CurrentThread = KeGetCurrentThread(); - NTSTATUS Status; + NTSTATUS WaitStatus; DPRINT("Entering KeDelayExecutionThread\n"); /* Check if the lock is already held */ @@ -138,8 +138,11 @@ } /* Chceck if we can do an alertable wait, if requested */ - if (KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status)) break; + if (KiCheckAlertability(Alertable, CurrentThread, WaitMode, &WaitStatus)) break; + /* Set status */ + CurrentThread->WaitStatus = STATUS_WAIT_0; + /* Set Timer */ ThreadTimer = &CurrentThread->Timer; @@ -159,7 +162,7 @@ if (!KiInsertTimer(ThreadTimer, *Interval)) { /* FIXME: The timer already expired, we should find a new ready thread */ - Status = STATUS_SUCCESS; + WaitStatus = STATUS_SUCCESS; break; } @@ -179,16 +182,16 @@ /* Find a new thread to run */ DPRINT("Swapping threads\n"); - Status = KiSwapThread(); + WaitStatus = KiSwapThread(); /* Check if we were executing an APC or if we timed out */ - if (Status != STATUS_KERNEL_APC) + if (WaitStatus != STATUS_KERNEL_APC) { /* This is a good thing */ - if (Status == STATUS_TIMEOUT) Status = STATUS_SUCCESS; + if (WaitStatus == STATUS_TIMEOUT) WaitStatus = STATUS_SUCCESS; /* Return Status */ - return Status; + return WaitStatus; } /* FIXME: Fixup interval */ @@ -204,7 +207,7 @@ DPRINT("Returning from KeDelayExecutionThread(), %x. Status: %d\n", KeGetCurrentThread(), Status); KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); - return Status; + return WaitStatus; } /* @@ -235,7 +238,6 @@ PKWAIT_BLOCK TimerWaitBlock; PKTIMER ThreadTimer; PKTHREAD CurrentThread = KeGetCurrentThread(); - NTSTATUS Status; NTSTATUS WaitStatus; DPRINT("Entering KeWaitForSingleObject\n"); @@ -265,8 +267,8 @@ goto SkipWait; } - /* Get the current Wait Status */ - WaitStatus = CurrentThread->WaitStatus; + /* Set default status */ + CurrentThread->WaitStatus = STATUS_WAIT_0; /* Append wait block to the KTHREAD wait block list */ CurrentThread->WaitBlockList = WaitBlock = &CurrentThread->WaitBlock[0]; @@ -286,7 +288,7 @@ { /* It has a normal signal state, so unwait it and return */ KiSatisfyMutantWait(CurrentObject, CurrentThread); - Status = STATUS_WAIT_0; + WaitStatus = CurrentThread->WaitStatus; goto DontWait; } else @@ -301,23 +303,20 @@ { /* Another satisfied object */ KiSatisfyNonMutantWait(CurrentObject, CurrentThread); - Status = STATUS_WAIT_0; + WaitStatus = STATUS_WAIT_0; goto DontWait; } /* Set up the Wait Block */ WaitBlock->Object = CurrentObject; WaitBlock->Thread = CurrentThread; - WaitBlock->WaitKey = (USHORT)(STATUS_WAIT_0); + WaitBlock->WaitKey = (USHORT)(STATUS_SUCCESS); WaitBlock->WaitType = WaitAny; WaitBlock->NextWaitBlock = WaitBlock; /* Make sure we can satisfy the Alertable request */ - if (KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status)) break; + if (KiCheckAlertability(Alertable, CurrentThread, WaitMode, &WaitStatus)) break; - /* Set the Wait Status */ - CurrentThread->WaitStatus = Status; - /* Enable the Timeout Timer if there was any specified */ if (Timeout) { @@ -325,7 +324,7 @@ if (!Timeout->QuadPart) { /* Return a timeout */ - Status = STATUS_TIMEOUT; + WaitStatus = STATUS_TIMEOUT; goto DontWait; } @@ -352,7 +351,7 @@ if (!KiInsertTimer(ThreadTimer, *Timeout)) { /* Return a timeout if we couldn't insert the timer */ - Status = STATUS_TIMEOUT; + WaitStatus = STATUS_TIMEOUT; goto DontWait; } } @@ -377,13 +376,13 @@ /* Find a new thread to run */ DPRINT("Swapping threads\n"); - Status = KiSwapThread(); + WaitStatus = KiSwapThread(); /* Check if we were executing an APC */ - if (Status != STATUS_KERNEL_APC) + if (WaitStatus != STATUS_KERNEL_APC) { /* Return Status */ - return Status; + return WaitStatus; } /* Check if we had a timeout */ @@ -401,9 +400,9 @@ /* Release the Lock, we are done */ DPRINT("Returning from KeWaitForMultipleObjects(), %x. Status: %d\n", - KeGetCurrentThread(), Status); + KeGetCurrentThread(), WaitStatus); KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); - return Status; + return WaitStatus; DontWait: /* Adjust the Quantum */ @@ -411,15 +410,16 @@ /* Release & Return */ DPRINT("Quick-return from KeWaitForMultipleObjects(), %x. Status: %d\n.", - KeGetCurrentThread(), Status); + KeGetCurrentThread(), WaitStatus); KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); - return Status; + return WaitStatus; } /* * @implemented */ -NTSTATUS STDCALL +NTSTATUS +STDCALL KeWaitForMultipleObjects(ULONG Count, PVOID Object[], WAIT_TYPE WaitType, @@ -436,7 +436,6 @@ PKTHREAD CurrentThread = KeGetCurrentThread(); ULONG AllObjectsSignaled; ULONG WaitIndex; - NTSTATUS Status; NTSTATUS WaitStatus; DPRINT("Entering KeWaitForMultipleObjects(Count %lu Object[] %p) " "PsGetCurrentThread() %x, Timeout %x\n", @@ -486,12 +485,12 @@ goto SkipWait; } - /* Get the current Wait Status */ - WaitStatus = CurrentThread->WaitStatus; - /* Append wait block to the KTHREAD wait block list */ CurrentThread->WaitBlockList = WaitBlock = WaitBlockArray; + /* Set default wait status */ + CurrentThread->WaitStatus = STATUS_WAIT_0; + /* Check if the wait is (already) satisfied */ AllObjectsSignaled = TRUE; @@ -516,7 +515,7 @@ { /* Normal signal state, so unwait it and return */ KiSatisfyMutantWait(CurrentObject, CurrentThread); - Status = STATUS_WAIT_0 | WaitIndex; + WaitStatus = CurrentThread->WaitStatus | WaitIndex; goto DontWait; } else @@ -531,7 +530,7 @@ { /* Another signaled object, unwait and return */ KiSatisfyNonMutantWait(CurrentObject, CurrentThread); - Status = WaitIndex; + WaitStatus = WaitIndex; goto DontWait; } } @@ -585,16 +584,13 @@ /* Satisfy their Waits and return to the caller */ KiSatisifyMultipleObjectWaits(WaitBlock); - Status = STATUS_WAIT_0; + WaitStatus = CurrentThread->WaitStatus; goto DontWait; } /* Make sure we can satisfy the Alertable request */ - if (KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status)) break; + if (KiCheckAlertability(Alertable, CurrentThread, WaitMode, &WaitStatus)) break; - /* Set the Wait Status */ - CurrentThread->WaitStatus = Status; - /* Enable the Timeout Timer if there was any specified */ if (Timeout) { @@ -602,7 +598,7 @@ if (!Timeout->QuadPart) { /* Return a timeout */ - Status = STATUS_TIMEOUT; + WaitStatus = STATUS_TIMEOUT; goto DontWait; } @@ -627,7 +623,7 @@ if (!KiInsertTimer(ThreadTimer, *Timeout)) { /* Return a timeout if we couldn't insert the timer */ - Status = STATUS_TIMEOUT; + WaitStatus = STATUS_TIMEOUT; goto DontWait; } } @@ -664,14 +660,14 @@ /* Find a new thread to run */ DPRINT("Swapping threads\n"); - Status = KiSwapThread(); + WaitStatus = KiSwapThread(); /* Check if we were executing an APC */ DPRINT("Thread is back\n"); - if (Status != STATUS_KERNEL_APC) + if (WaitStatus != STATUS_KERNEL_APC) { /* Return Status */ - return Status; + return WaitStatus; } /* Check if we had a timeout */ @@ -688,9 +684,9 @@ while (TRUE); /* Release the Lock, we are done */ - DPRINT("Returning, %x. Status: %d\n", KeGetCurrentThread(), Status); + DPRINT("Returning, %x. Status: %d\n", KeGetCurrentThread(), WaitStatus); KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); - return Status; + return WaitStatus; DontWait: /* Adjust the Quantum */ @@ -698,9 +694,9 @@ /* Release & Return */ DPRINT("Returning, %x. Status: %d\n. We did not wait.", - KeGetCurrentThread(), Status); + KeGetCurrentThread(), WaitStatus); KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); - return Status; + return WaitStatus; } VOID

1 0

[ion] 20605: - Invert CONFIG_SMP defines as requested by Hartmut
by ion＠svn.reactos.org 06 Jan '06

06 Jan '06

- Invert CONFIG_SMP defines as requested by Hartmut - Remove KiBlockThread and replace by more elegant KiSwapThread which will also make moving to the new scheduler easier. - Handle special case where we have kernel apcs pending and your previous irql was below apc_level during the wait code. - Remove hack to manually unwait a thread during a status of kernel apc. Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/ke/gate.c Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ke/queue.c Modified: trunk/reactos/ntoskrnl/ke/wait.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2006-01-06 06:38:47 UTC (rev 20604) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2006-01-06 08:00:09 UTC (rev 20605) @@ -48,13 +48,7 @@ * On UP machines, we don't actually have a spinlock, we merely raise * IRQL to DPC level. */ -#ifndef CONFIG_SMP -#define KeInitializeDispatcher() -#define KeAcquireDispatcherDatabaseLock() KeRaiseIrqlToDpcLevel(); -#define KeReleaseDispatcherDatabaseLock(OldIrql) KiExitDispatcher(OldIrql); -#define KeAcquireDispatcherDatabaseLockAtDpcLevel() -#define KeReleaseDispatcherDatabaseLockFromDpcLevel() -#else +#ifdef CONFIG_SMP #define KeInitializeDispatcher() KeInitializeSpinLock(&DispatcherDatabaseLock); #define KeAcquireDispatcherDatabaseLock() KfAcquireSpinLock(&DispatcherDatabaseLock); #define KeAcquireDispatcherDatabaseLockAtDpcLevel() \ @@ -64,6 +58,12 @@ #define KeReleaseDispatcherDatabaseLock(OldIrql) \ KeReleaseSpinLockFromDpcLevel(&DispatcherDatabaseLock); \ KiExitDispatcher(OldIrql); +#else +#define KeInitializeDispatcher() +#define KeAcquireDispatcherDatabaseLock() KeRaiseIrqlToDpcLevel(); +#define KeReleaseDispatcherDatabaseLock(OldIrql) KiExitDispatcher(OldIrql); +#define KeAcquireDispatcherDatabaseLockAtDpcLevel() +#define KeReleaseDispatcherDatabaseLockFromDpcLevel() #endif /* The following macro initializes a dispatcher object's header */ @@ -232,14 +232,11 @@ STDCALL KiDispatchThread(ULONG NewThreadStatus); -/* Puts a Thread into a block state. */ -VOID -STDCALL -KiBlockThread( - PNTSTATUS Status, - UCHAR Alertable, - ULONG WaitMode, - UCHAR WaitReason +/* Finds a new thread to run */ +NTSTATUS +NTAPI +KiSwapThread( + VOID ); /* Removes a thread out of a block state. */ _____ Modified: trunk/reactos/ntoskrnl/ke/gate.c --- trunk/reactos/ntoskrnl/ke/gate.c 2006-01-06 06:38:47 UTC (rev 20604) +++ trunk/reactos/ntoskrnl/ke/gate.c 2006-01-06 08:00:09 UTC (rev 20605) @@ -78,13 +78,16 @@ KiWakeQueue(CurrentThread->Queue); } - /* Block the Thread */ - DPRINT("Blocking the Thread: %x\n", CurrentThread); - KiBlockThread(&Status, - CurrentThread->Alertable, - WaitMode, - WaitReason); + /* Setup the wait information */ + CurrentThread->WaitMode = WaitMode; + CurrentThread->WaitReason = WaitReason; + CurrentThread->WaitTime = 0; + CurrentThread->State = Waiting; + /* Find a new thread to run */ + DPRINT("Swapping threads\n"); + Status = KiSwapThread(); + /* Check if we were executing an APC */ if (Status != STATUS_KERNEL_APC) return; _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2006-01-06 06:38:47 UTC (rev 20604) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2006-01-06 08:00:09 UTC (rev 20605) @@ -172,48 +172,22 @@ KEBUGCHECK(0); } -VOID -STDCALL -KiBlockThread(PNTSTATUS Status, - UCHAR Alertable, - ULONG WaitMode, - UCHAR WaitReason) +NTSTATUS +NTAPI +KiSwapThread(VOID) { - PKTHREAD Thread = KeGetCurrentThread(); - PKWAIT_BLOCK WaitBlock; + PKTHREAD CurrentThread = KeGetCurrentThread(); - if (Thread->ApcState.KernelApcPending) { + /* Find a new thread to run */ + DPRINT("Dispatching Thread as blocked\n"); + KiDispatchThreadNoLock(Waiting); - DPRINT("Dispatching Thread as ready (APC!)\n"); + /* Lower IRQL back */ + DPRINT("Lowering IRQL \n"); + KfLowerIrql(CurrentThread->WaitIrql); - /* Remove Waits */ - WaitBlock = Thread->WaitBlockList; - do { - RemoveEntryList (&WaitBlock->WaitListEntry); - WaitBlock = WaitBlock->NextWaitBlock; - } while (WaitBlock != Thread->WaitBlockList); - Thread->WaitBlockList = NULL; - - /* Dispatch it and return status */ - KiDispatchThreadNoLock (Ready); - if (Status != NULL) *Status = STATUS_KERNEL_APC; - - } else { - - /* Set the Thread Data as Requested */ - DPRINT("Dispatching Thread as blocked: %d\n", Thread->WaitStatus); - Thread->Alertable = Alertable; - Thread->WaitMode = (UCHAR)WaitMode; - Thread->WaitReason = WaitReason; - - /* Dispatch it and return status */ - KiDispatchThreadNoLock(Waiting); - DPRINT("Dispatching Thread as blocked: %d\n", Thread->WaitStatus); - if (Status != NULL) *Status = Thread->WaitStatus; - } - - DPRINT("Releasing Dispatcher Lock\n"); - KfLowerIrql(Thread->WaitIrql); + /* Return the wait status */ + return CurrentThread->WaitStatus; } VOID _____ Modified: trunk/reactos/ntoskrnl/ke/queue.c --- trunk/reactos/ntoskrnl/ke/queue.c 2006-01-06 06:38:47 UTC (rev 20604) +++ trunk/reactos/ntoskrnl/ke/queue.c 2006-01-06 08:00:09 UTC (rev 20605) @@ -286,13 +286,17 @@ InsertTailList(&Queue->Header.WaitListHead, &WaitBlock->WaitListEntry); - /* Block the Thread */ - DPRINT("Blocking the Thread: %x %x!\n", KeGetCurrentThread(), Thread); - KiBlockThread(&Status, - FALSE, - WaitMode, - WrQueue); + /* Setup the wait information */ + Thread->WaitMode = WaitMode; + Thread->WaitReason = WrQueue; + Thread->Alertable = FALSE; + Thread->WaitTime = 0; + Thread->State = Waiting; + /* Find a new thread to run */ + DPRINT("Swapping threads\n"); + Status = KiSwapThread(); + /* Reset the wait reason */ Thread->WaitReason = 0; _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2006-01-06 06:38:47 UTC (rev 20604) +++ trunk/reactos/ntoskrnl/ke/wait.c 2006-01-06 08:00:09 UTC (rev 20605) @@ -106,7 +106,6 @@ PKTIMER ThreadTimer; PKTHREAD CurrentThread = KeGetCurrentThread(); NTSTATUS Status; - DPRINT("Entering KeDelayExecutionThread\n"); /* Check if the lock is already held */ @@ -129,6 +128,15 @@ /* Start Wait Loop */ do { + /* Check if a kernel APC is pending and we were below APC_LEVEL */ + if ((CurrentThread->ApcState.KernelApcPending) && + (CurrentThread->WaitIrql < APC_LEVEL)) + { + /* Unlock the dispatcher */ + KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); + goto SkipWait; + } + /* Chceck if we can do an alertable wait, if requested */ if (KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status)) break; @@ -162,14 +170,17 @@ KiWakeQueue(CurrentThread->Queue); } - /* Block the Thread */ - DPRINT("Blocking the Thread: %d, %d, %x\n", - Alertable, WaitMode, KeGetCurrentThread()); - KiBlockThread(&Status, - Alertable, - WaitMode, - DelayExecution); + /* Setup the wait information */ + CurrentThread->Alertable = Alertable; + CurrentThread->WaitMode = WaitMode; + CurrentThread->WaitReason = DelayExecution; + CurrentThread->WaitTime = 0; + CurrentThread->State = Waiting; + /* Find a new thread to run */ + DPRINT("Swapping threads\n"); + Status = KiSwapThread(); + /* Check if we were executing an APC or if we timed out */ if (Status != STATUS_KERNEL_APC) { @@ -180,7 +191,11 @@ return Status; } - DPRINT("Looping Again\n"); // FIXME: Need to modify interval + /* FIXME: Fixup interval */ + + /* Acquire again the lock */ +SkipWait: + DPRINT("Looping again\n"); CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock(); } while (TRUE); @@ -241,6 +256,15 @@ /* Start the actual Loop */ do { + /* Check if a kernel APC is pending and we were below APC_LEVEL */ + if ((CurrentThread->ApcState.KernelApcPending) && + (CurrentThread->WaitIrql < APC_LEVEL)) + { + /* Unlock the dispatcher */ + KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); + goto SkipWait; + } + /* Get the current Wait Status */ WaitStatus = CurrentThread->WaitStatus; @@ -344,14 +368,17 @@ KiWakeQueue(CurrentThread->Queue); } - /* Block the Thread */ - DPRINT("Blocking the Thread: %d, %d, %d, %x\n", - Alertable, WaitMode, WaitReason, KeGetCurrentThread()); - KiBlockThread(&Status, - Alertable, - WaitMode, - (UCHAR)WaitReason); + /* Setup the wait information */ + CurrentThread->Alertable = Alertable; + CurrentThread->WaitMode = WaitMode; + CurrentThread->WaitReason = WaitReason; + CurrentThread->WaitTime = 0; + CurrentThread->State = Waiting; + /* Find a new thread to run */ + DPRINT("Swapping threads\n"); + Status = KiSwapThread(); + /* Check if we were executing an APC */ if (Status != STATUS_KERNEL_APC) { @@ -359,8 +386,15 @@ return Status; } - /* Loop again and acquire the dispatcher lock */ - DPRINT("Looping Again\n"); // FIXME: Change interval + /* Check if we had a timeout */ + if (Timeout) + { + /* FIXME: Fixup interval */ + } + + /* Acquire again the lock */ +SkipWait: + DPRINT("Looping again\n"); CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock(); } while (TRUE); @@ -443,6 +477,15 @@ /* Start the actual Loop */ do { + /* Check if a kernel APC is pending and we were below APC_LEVEL */ + if ((CurrentThread->ApcState.KernelApcPending) && + (CurrentThread->WaitIrql < APC_LEVEL)) + { + /* Unlock the dispatcher */ + KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); + goto SkipWait; + } + /* Get the current Wait Status */ WaitStatus = CurrentThread->WaitStatus; @@ -612,14 +655,17 @@ KiWakeQueue(CurrentThread->Queue); } - /* Block the Thread */ - DPRINT("Blocking the Thread: %d, %d, %d, %x\n", - Alertable, WaitMode, WaitReason, KeGetCurrentThread()); - KiBlockThread(&Status, - Alertable, - WaitMode, - (UCHAR)WaitReason); + /* Setup the wait information */ + CurrentThread->Alertable = Alertable; + CurrentThread->WaitMode = WaitMode; + CurrentThread->WaitReason = WaitReason; + CurrentThread->WaitTime = 0; + CurrentThread->State = Waiting; + /* Find a new thread to run */ + DPRINT("Swapping threads\n"); + Status = KiSwapThread(); + /* Check if we were executing an APC */ DPRINT("Thread is back\n"); if (Status != STATUS_KERNEL_APC) @@ -628,8 +674,15 @@ return Status; } - /* Loop again and re-acquire the dispatcher lock */ - DPRINT("Looping Again\n"); // FIXME: Fix-up the interval */ + /* Check if we had a timeout */ + if (Timeout) + { + /* FIXME: Fixup interval */ + } + + /* Acquire again the lock */ +SkipWait: + DPRINT("Looping again\n"); CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock(); } while (TRUE);

1 0

[jimtabor] 20604: Need extra proto.
by jimtabor＠svn.reactos.org 06 Jan '06

06 Jan '06

Need extra proto. Modified: trunk/reactos/subsys/win32k/ntuser/menu.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/menu.c --- trunk/reactos/subsys/win32k/ntuser/menu.c 2006-01-06 06:32:05 UTC (rev 20603) +++ trunk/reactos/subsys/win32k/ntuser/menu.c 2006-01-06 06:38:47 UTC (rev 20604) @@ -33,7 +33,11 @@ #define NDEBUG #include <debug.h> +PMENU_OBJECT FASTCALL +IntGetSystemMenu(PWINDOW_OBJECT Window, BOOL bRevert, BOOL RetMenu); + + /* STATIC FUNCTION ***********************************************************/ static

1 0

[jimtabor] 20603: Implement NtUserGetMenuBarInfo. Tested with MPlayerC with OBJID_MENU only, the rest looked easy enough.
by jimtabor＠svn.reactos.org 06 Jan '06

06 Jan '06

Implement NtUserGetMenuBarInfo. Tested with MPlayerC with OBJID_MENU only, the rest looked easy enough. Modified: trunk/reactos/subsys/win32k/ntuser/menu.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/menu.c --- trunk/reactos/subsys/win32k/ntuser/menu.c 2006-01-06 05:27:48 UTC (rev 20602) +++ trunk/reactos/subsys/win32k/ntuser/menu.c 2006-01-06 06:32:05 UTC (rev 20603) @@ -1636,7 +1636,7 @@ /* - * @unimplemented + * @implemented */ BOOL STDCALL NtUserGetMenuBarInfo( @@ -1645,29 +1645,209 @@ LONG idItem, PMENUBARINFO pmbi) { - UNIMPLEMENTED + BOOL Res = TRUE; + PMENU_OBJECT MenuObject; + PMENU_ITEM mi; + PWINDOW_OBJECT WindowObject; + HMENU hMenu; + POINT Offset; + RECT Rect; + MENUBARINFO kmbi; + DECLARE_RETURN(BOOL); + + DPRINT("Enter NtUserGetMenuBarInfo\n"); + UserEnterShared(); + + if (!(WindowObject = UserGetWindowObject(hwnd))) + { + SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE); + RETURN(FALSE); + } + hMenu = (HMENU)WindowObject->IDMenu; + + if (!(MenuObject = UserGetMenuObject(hMenu))) + { + SetLastWin32Error(ERROR_INVALID_MENU_HANDLE); + RETURN(FALSE); + } + + if (pmbi->cbSize != sizeof(MENUBARINFO)) + { + SetLastWin32Error(ERROR_INVALID_PARAMETER); + RETURN(FALSE); + } + + kmbi.cbSize = sizeof(MENUBARINFO); + kmbi.fBarFocused = FALSE; + kmbi.fFocused = FALSE; + kmbi.hwndMenu = NULL; + switch (idObject) { - case OBJID_CLIENT: + case OBJID_MENU: { - DPRINT1("OBJID_CLIENT, idItem = %d\n",idItem); + PMENU_OBJECT SubMenuObject; + kmbi.hMenu = hMenu; + if (idItem) /* Non-Zero-Based. */ + { + if (IntGetMenuItemByFlag(MenuObject, idItem-1, MF_BYPOSITION, &mi, NULL) > -1) + kmbi.rcBar = mi->Rect; + else + { + Res = FALSE; + break; + } + } + else + { + /* If items is zero we assume info for the menu itself. */ + if (!(IntGetClientOrigin(WindowObject, &Offset))) + { + Res = FALSE; + break; + } + Rect.left = Offset.x; + Rect.right = Offset.x + MenuObject->MenuInfo.Width; + Rect.top = Offset.y; + Rect.bottom = Offset.y + MenuObject->MenuInfo.Height; + kmbi.rcBar = Rect; + DPRINT("Rect top = %d bottom = %d left = %d right = %d \n", + Rect.top, Rect.bottom, Rect.left, Rect.right); + } + if (idItem) + { + if (idItem-1 == MenuObject->MenuInfo.FocusedItem) + kmbi.fFocused = TRUE; + } + if (MenuObject->MenuInfo.FocusedItem != NO_SELECTED_ITEM) + kmbi.fBarFocused = TRUE; + SubMenuObject = UserGetMenuObject(MenuObject->MenuItemList->hSubMenu); + if(SubMenuObject) kmbi.hwndMenu = SubMenuObject->MenuInfo.Wnd; + DPRINT("OBJID_MENU, idItem = %d\n",idItem); break; } - case OBJID_MENU: + case OBJID_CLIENT: { - DPRINT1("OBJID_MENU, idItem = %d\n",idItem); + PMENU_OBJECT SubMenuObject, XSubMenuObject; + SubMenuObject = UserGetMenuObject(MenuObject->MenuItemList->hSubMenu); + if(SubMenuObject) kmbi.hMenu = SubMenuObject->MenuInfo.Self; + else + { + Res = FALSE; + DPRINT1("OBJID_CLIENT, No SubMenu!\n"); + break; + } + if (idItem) + { + if (IntGetMenuItemByFlag(SubMenuObject, idItem-1, MF_BYPOSITION, &mi, NULL) > -1) + kmbi.rcBar = mi->Rect; + else + { + Res = FALSE; + break; + } + } + else + { + PWINDOW_OBJECT SubWinObj; + if (!(SubWinObj = UserGetWindowObject(SubMenuObject->MenuInfo.Wnd))) + { + Res = FALSE; + break; + } + if (!(IntGetClientOrigin(SubWinObj, &Offset))) + { + Res = FALSE; + break; + } + Rect.left = Offset.x; + Rect.right = Offset.x + SubMenuObject->MenuInfo.Width; + Rect.top = Offset.y; + Rect.bottom = Offset.y + SubMenuObject->MenuInfo.Height; + kmbi.rcBar = Rect; + } + if (idItem) + { + if (idItem-1 == SubMenuObject->MenuInfo.FocusedItem) + kmbi.fFocused = TRUE; + } + if (SubMenuObject->MenuInfo.FocusedItem != NO_SELECTED_ITEM) + kmbi.fBarFocused = TRUE; + XSubMenuObject = UserGetMenuObject(SubMenuObject->MenuItemList->hSubMenu); + if (XSubMenuObject) kmbi.hwndMenu = XSubMenuObject->MenuInfo.Wnd; + DPRINT("OBJID_CLIENT, idItem = %d\n",idItem); break; } case OBJID_SYSMENU: { - DPRINT1("OBJID_SYSMENU, idItem = %d\n",idItem); + PMENU_OBJECT SysMenuObject, SubMenuObject; + if(!(SysMenuObject = IntGetSystemMenu(WindowObject, FALSE, FALSE))) + { + Res = FALSE; + break; + } + kmbi.hMenu = SysMenuObject->MenuInfo.Self; + if (idItem) + { + if (IntGetMenuItemByFlag(SysMenuObject, idItem-1, MF_BYPOSITION, &mi, NULL) > -1) + kmbi.rcBar = mi->Rect; + else + { + Res = FALSE; + break; + } + } + else + { + PWINDOW_OBJECT SysWinObj; + if (!(SysWinObj = UserGetWindowObject(SysMenuObject->MenuInfo.Wnd))) + { + Res = FALSE; + break; + } + if (!(IntGetClientOrigin(SysWinObj, &Offset))) + { + Res = FALSE; + break; + } + Rect.left = Offset.x; + Rect.right = Offset.x + SysMenuObject->MenuInfo.Width; + Rect.top = Offset.y; + Rect.bottom = Offset.y + SysMenuObject->MenuInfo.Height; + kmbi.rcBar = Rect; + } + if (idItem) + { + if (idItem-1 == SysMenuObject->MenuInfo.FocusedItem) + kmbi.fFocused = TRUE; + } + if (SysMenuObject->MenuInfo.FocusedItem != NO_SELECTED_ITEM) + kmbi.fBarFocused = TRUE; + SubMenuObject = UserGetMenuObject(SysMenuObject->MenuItemList->hSubMenu); + if(SubMenuObject) kmbi.hwndMenu = SubMenuObject->MenuInfo.Wnd; + DPRINT("OBJID_SYSMENU, idItem = %d\n",idItem); break; } default: + Res = FALSE; DPRINT1("Unknown idObject = %d, idItem = %d\n",idObject,idItem); } - return 0; + if (Res) + { + NTSTATUS Status = MmCopyToCaller(pmbi, &kmbi, sizeof(MENUBARINFO)); + if (! NT_SUCCESS(Status)) + { + SetLastNtError(Status); + RETURN(FALSE); + } + } + RETURN(Res); + +CLEANUP: + DPRINT("Leave NtUserGetMenuBarInfo, ret=%i\n",_ret_); + UserLeave(); + END_CLEANUP; }

1 0

[greatlrd] 20602: fixed working strechblt for all dibxx now. do not say it does not take offset of source and destantion into accunt, it does. left implement CliprRegion. but last no longer black windows with or corupt images showing.
by greatlrd＠svn.reactos.org 06 Jan '06

06 Jan '06

fixed working strechblt for all dibxx now. do not say it does not take offset of source and destantion into accunt, it does. left implement CliprRegion. but last no longer black windows with or corupt images showing. Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib4bpp.c Modified: trunk/reactos/subsys/win32k/dib/dib8bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib1bpp.c --- trunk/reactos/subsys/win32k/dib/dib1bpp.c 2006-01-06 02:25:12 UTC (rev 20601) +++ trunk/reactos/subsys/win32k/dib/dib1bpp.c 2006-01-06 05:27:48 UTC (rev 20602) @@ -502,793 +502,130 @@ CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation, ULONG Mode) { - int SrcSizeY; - int SrcSizeX; - int DesSizeY; - int DesSizeX; - int sx; - int sy; - int DesX; - int DesY; - int color; - int zoomX; - int zoomY; - int count; - int saveX = 0; - int saveY; - BOOLEAN DesIsBiggerY=FALSE; - - SrcSizeY = SourceRect->bottom - SourceRect->top; - SrcSizeX = SourceRect->right - SourceRect->left; + LONG SrcSizeY; + LONG SrcSizeX; + LONG DesSizeY; + LONG DesSizeX; + LONG sx; + LONG sy; + LONG DesX; + LONG DesY; + LONG color; - DesSizeY = DestRect->bottom; - DesSizeX = DestRect->right; + SrcSizeY = SourceRect->bottom - SourceRect->top; + SrcSizeX = SourceRect->right - SourceRect->left; + + DesSizeY = DestRect->bottom - DestRect->top; + DesSizeX = DestRect->right - DestRect->left; - zoomX = DesSizeX / SrcSizeX; - if (zoomX==0) zoomX=1; + switch(SourceSurf->iBitmapFormat) + { + case BMF_1BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; + + color = DIB_1BPP_GetPixel(SourceSurf, sx, sy); + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + } + } - zoomY = DesSizeY / SrcSizeY; - if (zoomY==0) zoomY=1; + break; - if (DesSizeY>SrcSizeY) - DesIsBiggerY = TRUE; - - - switch(SourceSurf->iBitmapFormat) - { - case BMF_1BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - saveX = DesX + zoomX; - - color = DIB_1BPP_GetPixel(SourceSurf, sx, sy); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - - - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - saveX = DesX + zoomX; - - color = DIB_1BPP_GetPixel(SourceSurf, sx, sy); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - - - } - } - } - } - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = DIB_1BPP_GetPixel(SourceSurf, sx, sy); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - else - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = DIB_1BPP_GetPixel(SourceSurf, sx, sy); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, DesX + zoomX, count, color); - - } - } - } - } - break; - case BMF_4BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; + color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - } - - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_4BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - } - break; - case BMF_8BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; + color = DIB_8BPP_GetPixel(SourceSurf, sx, sy); + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - } - - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_8BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - } - break; - case BMF_16BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; + color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_16BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_16BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - } - - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_16BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_16BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - } - break; - case BMF_24BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; + color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - } - - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_24BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - } - break; - case BMF_32BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; + color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); + DIB_1BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, color)); + } + } + break; - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ - - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); - - saveX = DesX + zoomX; - for (count=DesY;count<saveY;count++) - DIB_1BPP_HLine(DestSurf, DesX, saveX, count, color); - } - } - } - } - - else - { - - if (DesSizeX>SrcSizeX) - { - /* Draw one pixel on X - Led to the Des Zoom In*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) SrcSizeX * (ULONG) DesX) / ((ULONG) DesSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - else - { - /* Draw one pixel on X - Led to the Des Zoom Out*/ - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else - sy = (int) ((ULONG) DesSizeY * (ULONG) DesY) / ((ULONG) SrcSizeY); - - if (sy > SourceRect->bottom) break; - - saveY = DesY+zoomY; - - for (DesX=DestRect->right-zoomX; DesX>=DestRect->left; DesX-=zoomX) - { - sx = (int) ((ULONG) DesSizeX * (ULONG) DesX) / ((ULONG) SrcSizeX); - - if (sx > SourceRect->right) break; - - color = XLATEOBJ_iXlate(ColorTranslation, DIB_32BPP_GetPixel(SourceSurf, sx, sy)); - - for (count=DesY;count<saveY;count++) - DIB_1BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - } - break; - default: - //DPRINT1("DIB_4BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); + //DPRINT1("DIB_1BPP_StretchBlt: Unhandled Source BPP: %u\n", BitsPerFormat(SourceSurf->iBitmapFormat)); return FALSE; } _____ Modified: trunk/reactos/subsys/win32k/dib/dib24bpp.c --- trunk/reactos/subsys/win32k/dib/dib24bpp.c 2006-01-06 02:25:12 UTC (rev 20601) +++ trunk/reactos/subsys/win32k/dib/dib24bpp.c 2006-01-06 05:27:48 UTC (rev 20602) @@ -497,797 +497,134 @@ CLIPOBJ *ClipRegion, XLATEOBJ *ColorTranslation, ULONG Mode) { - int SrcSizeY; - int SrcSizeX; - int DesSizeY; - int DesSizeX; - int sx; - int sy; - int DesX; - int DesY; - int color; - int zoomX; - int zoomY; - int count; - int saveX; - int saveY; - BOOLEAN DesIsBiggerY=FALSE; - - SrcSizeY = SourceRect->bottom - SourceRect->top; - SrcSizeX = SourceRect->right - SourceRect->left; + LONG SrcSizeY; + LONG SrcSizeX; + LONG DesSizeY; + LONG DesSizeX; + LONG sx; + LONG sy; + LONG DesX; + LONG DesY; + LONG color; - DesSizeY = DestRect->bottom ; - DesSizeX = DestRect->right; + SrcSizeY = SourceRect->bottom - SourceRect->top; + SrcSizeX = SourceRect->right - SourceRect->left; + + DesSizeY = DestRect->bottom - DestRect->top; + DesSizeX = DestRect->right - DestRect->left; - zoomX = DesSizeX / SrcSizeX; - if (zoomX==0) zoomX=1; + switch(SourceSurf->iBitmapFormat) + { + case BMF_1BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + for (DesY=DestRect->top; DesY<DestRect->bottom; DesY++) + { + sy = (((DesY - DestRect->top) * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=DestRect->left; DesX<DestRect->right; DesX++) + { + sx = (((DesX - DestRect->left) * SrcSizeX) / DesSizeX) + SourceRect->left; + + if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) + { + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 0)); + } + else + { + DIB_24BPP_PutPixel(DestSurf, DesX, DesY, XLATEOBJ_iXlate(ColorTranslation, 1)); + } + } + } - zoomY = DesSizeY / SrcSizeY; - if (zoomY==0) zoomY=1; + break; - if (DesSizeY>SrcSizeY) - DesIsBiggerY = TRUE; - - switch(SourceSurf->iBitmapFormat) - { - case BMF_1BPP: - /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ - /* This is a reference implementation, it hasn't been optimized for speed */ - if (zoomX>1) - { - /* Draw one Hline on X - Led to the Des Zoom In*/ - if (DesSizeX>SrcSizeX) - { - for (DesY=DestRect->bottom-zoomY; DesY>=DestRect->top; DesY-=zoomY) - { - if (DesIsBiggerY) - sy = (int) ((ULONG) SrcSizeY * (ULONG) DesY) / ((ULONG) DesSizeY); - else [truncated at 1000 lines; 1773 more skipped]

1 0

[ion] 20601: - Fix some bugs in Kernel Queue implementation:
by ion＠svn.reactos.org 06 Jan '06

06 Jan '06

- Fix some bugs in Kernel Queue implementation: * KeRemoveQueue did not set Thread->WaitNext = FALSE if it was called with WaitNext = TRUE. * KeRemoveQueue did not handle the case where a kernel-mode APC is pending and the previous IRQL was below APC_LEVEL. * KeRemoveQueue did not set the thread's wait status to 0. * KiInsertQueue did not set the Thread's wait status to the entry being inserted. * KiInsertQueue did not remove the thread from its wait list. * KeRemoveQueue did not properly link the wait blocks. Modified: trunk/reactos/ntoskrnl/ke/queue.c _____ Modified: trunk/reactos/ntoskrnl/ke/queue.c --- trunk/reactos/ntoskrnl/ke/queue.c 2006-01-06 00:01:20 UTC (rev 20600) +++ trunk/reactos/ntoskrnl/ke/queue.c 2006-01-06 02:25:12 UTC (rev 20601) @@ -117,25 +117,23 @@ IN KPROCESSOR_MODE WaitMode, IN PLARGE_INTEGER Timeout OPTIONAL) { - - PLIST_ENTRY ListEntry; + PLIST_ENTRY QueueEntry; NTSTATUS Status; PKTHREAD Thread = KeGetCurrentThread(); KIRQL OldIrql; PKQUEUE PreviousQueue; PKWAIT_BLOCK WaitBlock; - PKWAIT_BLOCK TimerWaitBlock; PKTIMER Timer; - DPRINT("KeRemoveQueue %x\n", Queue); /* Check if the Lock is already held */ - if (Thread->WaitNext) { - + if (Thread->WaitNext) + { DPRINT("Lock is already held\n"); - - } else { - + Thread->WaitNext = FALSE; + } + else + { /* Lock the Dispatcher Database */ DPRINT("Lock not held, acquiring\n"); OldIrql = KeAcquireDispatcherDatabaseLock(); @@ -147,49 +145,43 @@ Thread->Queue = Queue; /* Check if this is a different queue */ - if (Queue != PreviousQueue) { - - /* - * INVESTIGATE: What is the Thread->QueueListEntry used for? It's linked it into the - * Queue->ThreadListHead when the thread registers with the queue and unlinked when - * the thread registers with a new queue. The Thread->Queue already tells us what - * queue the thread is registered with. - * -Gunnar - */ + if (Queue != PreviousQueue) + { DPRINT("Different Queue\n"); - if (PreviousQueue) { - + QueueEntry = &Thread->QueueListEntry; + if (PreviousQueue) + { /* Remove from this list */ DPRINT("Removing Old Queue\n"); - RemoveEntryList(&Thread->QueueListEntry); + RemoveEntryList(QueueEntry); /* Wake the queue */ DPRINT("Activating new thread\n"); KiWakeQueue(PreviousQueue); - } + } /* Insert in this new Queue */ DPRINT("Inserting new Queue!\n"); - InsertTailList(&Queue->ThreadListHead, &Thread->QueueListEntry); - - } else { - + InsertTailList(&Queue->ThreadListHead, QueueEntry); + } + else + { /* Same queue, decrement waiting threads */ DPRINT("Same Queue!\n"); Queue->CurrentCount--; } /* Loop until the queue is processed */ - while (TRUE) { - + while (TRUE) + { /* Check if the counts are valid and if there is still a queued entry */ + QueueEntry = Queue->EntryListHead.Flink; if ((Queue->CurrentCount < Queue->MaximumCount) && - !IsListEmpty(&Queue->EntryListHead)) { - + (QueueEntry != &Queue->EntryListHead)) + { /* Remove the Entry and Save it */ DPRINT("Removing Queue Entry. CurrentCount: %d, Maximum Count: %d\n", Queue->CurrentCount, Queue->MaximumCount); - ListEntry = Queue->EntryListHead.Flink; /* Decrease the number of entries */ Queue->Header.SignalState--; @@ -198,20 +190,20 @@ Queue->CurrentCount++; /* Check if the entry is valid. If not, bugcheck */ - if (!ListEntry->Flink || !ListEntry->Blink) { - + if (!(QueueEntry->Flink) || !(QueueEntry->Blink)) + { KEBUGCHECK(INVALID_WORK_QUEUE_ITEM); } /* Remove the Entry */ - RemoveEntryList(ListEntry); - ListEntry->Flink = NULL; + RemoveEntryList(QueueEntry); + QueueEntry->Flink = NULL; /* Nothing to wait on */ break; - - } else { - + } + else + { /* Do the wait */ DPRINT("Waiting on Queue Entry. CurrentCount: %d, Maximum Count: %d\n", Queue->CurrentCount, Queue->MaximumCount); @@ -219,11 +211,21 @@ /* Use the Thread's Wait Block, it's big enough */ Thread->WaitBlockList = &Thread->WaitBlock[0]; - /* Fail if there's an APC Pending */ - if (WaitMode != KernelMode && Thread->ApcState.UserApcPending) { + /* Check if a kernel APC is pending and we were below APC_LEVEL */ + if ((Thread->ApcState.KernelApcPending) && + (Thread->WaitIrql < APC_LEVEL)) + { + /* Increment the count and unlock the dispatcher */ + Queue->CurrentCount++; + KeReleaseDispatcherDatabaseLock(Thread->WaitIrql); + goto SkipWait; + } + /* Fail if there's a User APC Pending */ + if ((WaitMode != KernelMode) && (Thread->ApcState.UserApcPending)) + { /* Return the status and increase the pending threads */ - ListEntry = (PLIST_ENTRY)STATUS_USER_APC; + QueueEntry = (PLIST_ENTRY)STATUS_USER_APC; Queue->CurrentCount++; /* Nothing to wait on */ @@ -236,19 +238,17 @@ WaitBlock->WaitKey = STATUS_SUCCESS; WaitBlock->WaitType = WaitAny; WaitBlock->Thread = Thread; - WaitBlock->NextWaitBlock = WaitBlock; + Thread->WaitStatus = STATUS_WAIT_0; - Thread->WaitStatus = STATUS_SUCCESS; - /* We need to wait for the object... check if we have a timeout */ - if (Timeout) { - + if (Timeout) + { /* If it's zero, then don't do any waiting */ - if (!Timeout->QuadPart) { - + if (!Timeout->QuadPart) + { /* Instant Timeout, return the status and increase the pending threads */ DPRINT("Queue Wait has timed out\n"); - ListEntry = (PLIST_ENTRY)STATUS_TIMEOUT; + QueueEntry = (PLIST_ENTRY)STATUS_TIMEOUT; Queue->CurrentCount++; /* Nothing to wait on */ @@ -260,27 +260,31 @@ * hold on to the dispatcher lock. */ Timer = &Thread->Timer; - TimerWaitBlock = &Thread->WaitBlock[1]; + WaitBlock->NextWaitBlock = &Thread->WaitBlock[1]; + WaitBlock = &Thread->WaitBlock[1]; /* Set up the Timer Wait Block */ - TimerWaitBlock->Object = (PVOID)Timer; - TimerWaitBlock->Thread = Thread; - TimerWaitBlock->WaitKey = STATUS_TIMEOUT; - TimerWaitBlock->WaitType = WaitAny; - TimerWaitBlock->NextWaitBlock = TimerWaitBlock; + WaitBlock->Object = (PVOID)Timer; + WaitBlock->Thread = Thread; + WaitBlock->WaitKey = STATUS_TIMEOUT; + WaitBlock->WaitType = WaitAny; /* Link the timer to this Wait Block */ InitializeListHead(&Timer->Header.WaitListHead); - InsertTailList(&Timer->Header.WaitListHead, &TimerWaitBlock->WaitListEntry); + InsertTailList(&Timer->Header.WaitListHead, &WaitBlock->WaitListEntry); /* Create Timer */ DPRINT("Creating Timer with timeout %I64d\n", *Timeout); KiInsertTimer(Timer, *Timeout); } + /* Close the loop */ + WaitBlock->NextWaitBlock = &Thread->WaitBlock[0]; + /* Insert the wait block into the Queues's wait list */ - WaitBlock = Thread->WaitBlockList; - InsertTailList(&Queue->Header.WaitListHead, &WaitBlock->WaitListEntry); + WaitBlock = &Thread->WaitBlock[0]; + InsertTailList(&Queue->Header.WaitListHead, + &WaitBlock->WaitListEntry); /* Block the Thread */ DPRINT("Blocking the Thread: %x %x!\n", KeGetCurrentThread(), Thread); @@ -293,14 +297,21 @@ Thread->WaitReason = 0; /* Check if we were executing an APC */ - if (Status != STATUS_KERNEL_APC) { - + if (Status != STATUS_KERNEL_APC) + { /* Done Waiting */ DPRINT("Done waking queue. Thread: %x %x!\n", KeGetCurrentThread(), Thread); return (PLIST_ENTRY)Status; } + /* Check if we had a timeout */ + if (Timeout) + { + /* FIXME: Fixup interval */ + } + /* Acquire again the lock */ +SkipWait: DPRINT("Looping again\n"); OldIrql = KeAcquireDispatcherDatabaseLock(); @@ -314,7 +325,7 @@ KeReleaseDispatcherDatabaseLock(Thread->WaitIrql); DPRINT("Returning. CurrentCount: %d, Maximum Count: %d\n", Queue->CurrentCount, Queue->MaximumCount); - return ListEntry; + return QueueEntry; } /* @@ -335,15 +346,15 @@ OldIrql = KeAcquireDispatcherDatabaseLock(); /* Make sure the list is not empty */ - if (!IsListEmpty(&Queue->EntryListHead)) + if (!IsListEmpty(&Queue->EntryListHead)) { /* Remove it */ FirstEntry = RemoveHeadList(&Queue->EntryListHead); } /* Unlink threads and clear their Thread->Queue */ - while (!IsListEmpty(&Queue->ThreadListHead)) { - + while (!IsListEmpty(&Queue->ThreadListHead)) + { /* Get the Entry and Remove it */ EnumEntry = RemoveHeadList(&Queue->ThreadListHead); @@ -369,25 +380,26 @@ PLIST_ENTRY QueueEntry; PLIST_ENTRY WaitEntry; PKWAIT_BLOCK WaitBlock; + PKTHREAD Thread; /* Decrement the number of active threads */ DPRINT("KiWakeQueue: %x. Thread: %x\n", Queue, KeGetCurrentThread()); Queue->CurrentCount--; /* Make sure the counts are OK */ - if (Queue->CurrentCount < Queue->MaximumCount) { - + if (Queue->CurrentCount < Queue->MaximumCount) + { /* Get the Queue Entry */ QueueEntry = Queue->EntryListHead.Flink; /* Get the Wait Entry */ WaitEntry = Queue->Header.WaitListHead.Blink; - DPRINT("Queue Count is ok, Queue entries: %x, %x\n", QueueEntry, WaitEntry); + DPRINT("Queue Count is ok; entries: %p, %p\n", QueueEntry, WaitEntry); - /* Make sure that the Queue List isn't empty and that this entry is valid */ - if (!IsListEmpty(&Queue->Header.WaitListHead) && - (QueueEntry != &Queue->EntryListHead)) { - + /* Make sure that the Queue entries are not part of empty lists */ + if ((WaitEntry != &Queue->Header.WaitListHead) && + (QueueEntry != &Queue->EntryListHead)) + { /* Remove this entry */ DPRINT("Queue in List, removing it\n"); RemoveEntryList(QueueEntry); @@ -397,9 +409,12 @@ Queue->Header.SignalState--; /* Unwait the Thread */ - DPRINT("Unwaiting Thread\n"); - WaitBlock = CONTAINING_RECORD(WaitEntry, KWAIT_BLOCK, WaitListEntry); - KiAbortWaitThread(WaitBlock->Thread, (NTSTATUS)QueueEntry, IO_NO_INCREMENT); + WaitBlock = CONTAINING_RECORD(WaitEntry, + KWAIT_BLOCK, + WaitListEntry); + Thread = WaitBlock->Thread; + DPRINT1("Unwaiting Thread: %d\n", Thread->State); + KiAbortWaitThread(Thread, (NTSTATUS)QueueEntry, IO_NO_INCREMENT); } } } @@ -417,7 +432,6 @@ PKTHREAD Thread = KeGetCurrentThread(); PKWAIT_BLOCK WaitBlock; PLIST_ENTRY WaitEntry; - DPRINT("KiInsertQueue(Queue %x, Entry %x)\n", Queue, Entry); /* Save the old state */ @@ -434,8 +448,8 @@ */ if ((Queue->CurrentCount < Queue->MaximumCount) && (WaitEntry != &Queue->Header.WaitListHead) && - ((Thread->Queue != Queue) || (Thread->WaitReason != WrQueue))) { - + ((Thread->Queue != Queue) || (Thread->WaitReason != WrQueue))) + { /* Remove the wait entry */ DPRINT("Removing Entry\n"); RemoveEntryList(WaitEntry); @@ -448,12 +462,16 @@ /* Reset the wait reason */ Thread->WaitReason = 0; - /* Increase the waiting threads */ + /* Increase the active threads and set the status*/ Queue->CurrentCount++; + Thread->WaitStatus = (NTSTATUS)Entry; + /* Remove the thread from its wait list */ + RemoveEntryList(&Thread->WaitListEntry); + /* Check if there's a Thread Timer */ - if (Thread->Timer.Header.Inserted) { - + if (Thread->Timer.Header.Inserted) + { /* Cancel the Thread Timer with the no-lock fastpath */ DPRINT("Removing the Thread's Timer\n"); Thread->Timer.Header.Inserted = FALSE; @@ -463,19 +481,22 @@ /* Reschedule the Thread */ DPRINT("Unblocking the Thread\n"); KiUnblockThread(Thread, (PNTSTATUS)&Entry, 0); - - } else { - + } + else + { /* Increase the Entries */ DPRINT("Adding new Queue Entry: %d %d\n", Head, Queue->Header.SignalState); Queue->Header.SignalState++; - if (Head) { - + /* Check which mode we're using */ + if (Head) + { + /* Insert in the head */ InsertHeadList(&Queue->EntryListHead, Entry); - - } else { - + } + else + { + /* Insert at the end */ InsertTailList(&Queue->EntryListHead, Entry); } }

1 0

[gedmurphy] 20600: New icon. Couple of code changes linked to that. Just playing :)
by gedmurphy＠svn.reactos.org 06 Jan '06

06 Jan '06

New icon. Couple of code changes linked to that. Just playing :) Deleted: trunk/reactos/subsys/system/servman/res/applet.ico Added: trunk/reactos/subsys/system/servman/res/system.ico Modified: trunk/reactos/subsys/system/servman/servman.c Modified: trunk/reactos/subsys/system/servman/servman.rc _____ Deleted: trunk/reactos/subsys/system/servman/res/applet.ico (Binary files differ) _____ Added: trunk/reactos/subsys/system/servman/res/system.ico (Binary files differ) Property changes on: trunk/reactos/subsys/system/servman/res/system.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream _____ Modified: trunk/reactos/subsys/system/servman/servman.c --- trunk/reactos/subsys/system/servman/servman.c 2006-01-05 23:43:49 UTC (rev 20599) +++ trunk/reactos/subsys/system/servman/servman.c 2006-01-06 00:01:20 UTC (rev 20600) @@ -91,9 +91,8 @@ GetSystemMetrics(SM_CYSMICON), ILC_MASK, 1, 1); /* Add an icon to each image list */ - hiconItem = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_SM_ICON)); + hiconItem = LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), IMAGE_ICON, 16, 16, 0); ImageList_AddIcon(hSmall, hiconItem); - DestroyIcon(hiconItem); ListView_SetImageList(hListView, hSmall, LVSIL_SMALL); @@ -574,7 +573,7 @@ wc.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); wc.lpszMenuName = MAKEINTRESOURCE(IDR_MAINMENU); wc.lpszClassName = ClassName; - wc.hIconSm = (HICON)LoadImage(GetModuleHandle(NULL), + wc.hIconSm = (HICON)LoadImage(hInstance, MAKEINTRESOURCE(IDI_SM_ICON), IMAGE_ICON, 16, 16, 0); if(!RegisterClassEx(&wc)) _____ Modified: trunk/reactos/subsys/system/servman/servman.rc --- trunk/reactos/subsys/system/servman/servman.rc 2006-01-05 23:43:49 UTC (rev 20599) +++ trunk/reactos/subsys/system/servman/servman.rc 2006-01-06 00:01:20 UTC (rev 20600) @@ -10,7 +10,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDI_SM_ICON ICON "res/applet.ico" +IDI_SM_ICON ICON "res/system.ico" #include "En.rc" #include "De.rc"

1 0

[gedmurphy] 20599: Remove the temp note. Gé is on fire !
by gedmurphy＠svn.reactos.org 05 Jan '06

05 Jan '06

Remove the temp note. Gé is on fire ! Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c _____ Modified: trunk/reactos/apps/utils/net/ipconfig/ipconfig.c --- trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2006-01-05 23:26:43 UTC (rev 20598) +++ trunk/reactos/apps/utils/net/ipconfig/ipconfig.c 2006-01-05 23:43:49 UTC (rev 20599) @@ -145,11 +145,6 @@ pAdapter = pAdapterInfo; - /* temp note until GetAdatersInfo is fixed */ - _tprintf(_T("Note - ipconfig is currently returning incorrect information\n")); - _tprintf(_T("If your adapter is configured correctly, it will usually \n")); - _tprintf(_T("display the loopback, otherwise an error will be displayed\n\n")); - _tprintf(_T("\nReactOS IP Configuration\n\n")); if (bAll)

1 0

[cwittich] 20598: added german translation
by cwittich＠svn.reactos.org 05 Jan '06

05 Jan '06

added german translation Added: trunk/reactos/subsys/system/servman/De.rc Modified: trunk/reactos/subsys/system/servman/servman.rc _____ Added: trunk/reactos/subsys/system/servman/De.rc --- trunk/reactos/subsys/system/servman/De.rc 2006-01-05 23:11:51 UTC (rev 20597) +++ trunk/reactos/subsys/system/servman/De.rc 2006-01-05 23:26:43 UTC (rev 20598) @@ -0,0 +1,63 @@ +LANGUAGE LANG_GERMAN, SUBLANG_GERMAN + +IDR_MAINMENU MENU +BEGIN + POPUP "&File" + BEGIN + MENUITEM "E&xit",ID_FILE_EXIT + END + POPUP "Action" + BEGIN + MENUITEM "Start",ID_START + MENUITEM "Stopp",ID_STOP + MENUITEM "Pause",ID_PAUSE + MENUITEM "Fortsetzen",ID_RESUME + MENUITEM "Neustart",ID_RESTART + MENUITEM SEPARATOR + MENUITEM "Aktualisieren",ID_REFRESH + MENUITEM SEPARATOR + MENUITEM "Eigenschaften",ID_PROP + END + POPUP "Ansicht" + BEGIN + MENUITEM "Anpassen",ID_VIEW_CUSTOMIZE + END + POPUP "Hilfe" + BEGIN + MENUITEM "Info",ID_HELP_ABOUT + END +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_FIRSTCOLUMN "Name" + IDS_SECONDCOLUMN "Beschreibung" + IDS_THIRDCOLUMN "Status" + IDS_FOURTHCOLUMN "Starttyp" + IDS_FITHCOLUMN "Anmelden als" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_STATUS_RUNNING "Gestartet" + IDS_SERVICES_STATUS_STOPPED "Gestoppt" + IDS_SERVICES_YES "Ja" + IDS_SERVICES_UNKNOWN "Unbekannt" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_NUM_SERVICES "Dienste: %d" + IDB_START "res/start.bmp" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLTIP_PROP "Eigenschaften" + IDS_TOOLTIP_REFRESH "Aktualisieren" + IDS_TOOLTIP_EXPORT "Liste exportieren" + IDS_TOOLTIP_START "Dienst starten" + IDS_TOOLTIP_STOP "Dienst beenden" + IDS_TOOLTIP_PAUSE "Diest pausieren" + IDS_TOOLTIP_RESTART "Diest neustarten" +END _____ Modified: trunk/reactos/subsys/system/servman/servman.rc --- trunk/reactos/subsys/system/servman/servman.rc 2006-01-05 23:11:51 UTC (rev 20597) +++ trunk/reactos/subsys/system/servman/servman.rc 2006-01-05 23:26:43 UTC (rev 20598) @@ -13,4 +13,5 @@ IDI_SM_ICON ICON "res/applet.ico" #include "En.rc" +#include "De.rc"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs