Ros-diffs January 2006

ros-diffs@reactos.org

23 participants
586 discussions

[ion] 20573: - Implemented Queued and In-Stack Queued Spinlocks (at DPC-Level). See "Windows Internals II" Chapter 4, Pages 25-27.

by ion＠svn.reactos.org

- Implemented Queued and In-Stack Queued Spinlocks (at DPC-Level). See "Windows Internals II" Chapter 4, Pages 25-27. Modified: trunk/reactos/ntoskrnl/ke/spinlock.c _____ Modified: trunk/reactos/ntoskrnl/ke/spinlock.c --- trunk/reactos/ntoskrnl/ke/spinlock.c 2006-01-05 12:48:33 UTC (rev 20572) +++ trunk/reactos/ntoskrnl/ke/spinlock.c 2006-01-05 13:12:48 UTC (rev 20573) @@ -18,6 +18,9 @@ #undef KefReleaseSpinLockFromDpcLevel #undef KeReleaseSpinLockFromDpcLevel +#define LQ_WAIT 1 +#define LQ_OWN 2 + /* FUNCTIONS ***************************************************************/ /* @@ -190,25 +193,98 @@ #endif } +VOID +FASTCALL +KeAcquireQueuedSpinLockAtDpcLevel(IN PKLOCK_QUEUE_HANDLE LockHandle) +{ +#ifdef CONFIG_SMP + PKSPIN_LOCK_QUEUE Prev; + + /* Set the new lock */ + Prev = (PKSPIN_LOCK_QUEUE) + InterlockedExchange((PLONG)LockHandle->LockQueue.Lock, + (LONG)LockHandle); + if (!Prev) + { + /* There was nothing there before. We now own it */ + *(ULONG_PTR*)&LockHandle->LockQueue.Lock |= LQ_OWN; + return; + } + + /* Set the wait flag */ + *(ULONG_PTR*)&LockHandle->LockQueue.Lock |= LQ_WAIT; + + /* Link us */ + Prev->Next = (PKSPIN_LOCK_QUEUE)LockHandle; + + /* Loop and wait */ + while ( *(ULONG_PTR*)&LockHandle->LockQueue.Lock & LQ_WAIT) YieldProcessor(); + return; +#endif +} + +VOID +FASTCALL +KeReleaseQueuedSpinLockFromDpcLevel(IN PKLOCK_QUEUE_HANDLE LockHandle) +{ +#ifdef CONFIG_SMP + KSPIN_LOCK LockVal; + PKSPIN_LOCK_QUEUE Waiter; + + /* Remove own and wait flags */ + *(ULONG_PTR*)&LockHandle->LockQueue.Lock &= ~(LQ_OWN | LQ_WAIT); + LockVal = *LockHandle->LockQueue.Lock; + + /* Check if we already own it */ + if (LockVal == (KSPIN_LOCK)LockHandle) + { + /* Disown it */ + LockVal = (KSPIN_LOCK) + InterlockedCompareExchangePointer(LockHandle->LockQueue.Lock, + NULL, + LockHandle); + } + if (LockVal == (KSPIN_LOCK)LockHandle) return; + + /* Need to wait for it */ + Waiter = LockHandle->LockQueue.Next; + while (!Waiter) + { + YieldProcessor(); + Waiter = LockHandle->LockQueue.Next; + } + + /* It's gone */ + *(ULONG_PTR*)&Waiter->Lock ^= (LQ_OWN | LQ_WAIT); + LockHandle->LockQueue.Next = NULL; +#endif +} + /* - * @unimplemented + * @implemented */ VOID FASTCALL KeAcquireInStackQueuedSpinLockAtDpcLevel(IN PKSPIN_LOCK SpinLock, IN PKLOCK_QUEUE_HANDLE LockHandle) { - UNIMPLEMENTED; + /* Set it up properly */ + LockHandle->LockQueue.Next = NULL; + LockHandle->LockQueue.Lock = SpinLock; + KeAcquireQueuedSpinLockAtDpcLevel((PKLOCK_QUEUE_HANDLE) + &LockHandle->LockQueue.Next); } /* - * @unimplemented + * @implemented */ VOID FASTCALL KeReleaseInStackQueuedSpinLockFromDpcLevel(IN PKLOCK_QUEUE_HANDLE LockHandle) { - UNIMPLEMENTED; + /* Call the internal function */ + KeReleaseQueuedSpinLockFromDpcLevel((PKLOCK_QUEUE_HANDLE) + &LockHandle->LockQueue.Next); } /* EOF */

18 years, 10 months

[hbirr] 20572: KefReleaseSpinLockFromDpcLevel needs the address of a spinlock and not its value.

by hbirr＠svn.reactos.org

KefReleaseSpinLockFromDpcLevel needs the address of a spinlock and not its value. Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S _____ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2006-01-05 12:27:03 UTC (rev 20571) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2006-01-05 12:48:33 UTC (rev 20572) @@ -247,7 +247,7 @@ /* Return */ //#ifdef CONFIG_SMP - mov ecx, _DispatcherDatabaseLock + mov ecx, offset _DispatcherDatabaseLock call @KefReleaseSpinLockFromDpcLevel@4 //#endif ret

18 years, 10 months

[hpoussin] 20571: Add prototypes for Nt/ZwReplyWaitReceivePortEx, Nt/ZwImpersonateAnonymousToken

by hpoussin＠svn.reactos.org

Add prototypes for Nt/ZwReplyWaitReceivePortEx, Nt/ZwImpersonateAnonymousToken Modified: trunk/reactos/include/ndk/lpcfuncs.h Modified: trunk/reactos/include/ndk/sefuncs.h _____ Modified: trunk/reactos/include/ndk/lpcfuncs.h --- trunk/reactos/include/ndk/lpcfuncs.h 2006-01-05 09:22:09 UTC (rev 20570) +++ trunk/reactos/include/ndk/lpcfuncs.h 2006-01-05 12:27:03 UTC (rev 20571) @@ -124,13 +124,23 @@ NTAPI NtReplyWaitReceivePort( IN HANDLE PortHandle, - IN PVOID *PortContext OPTIONAL, + OUT PVOID *PortContext OPTIONAL, IN PPORT_MESSAGE ReplyMessage OPTIONAL, OUT PPORT_MESSAGE ReceiveMessage ); NTSTATUS NTAPI +NtReplyWaitReceivePortEx( + IN HANDLE PortHandle, + OUT PVOID *PortContext OPTIONAL, + IN PPORT_MESSAGE ReplyMessage OPTIONAL, + OUT PPORT_MESSAGE ReceiveMessage, + IN PLARGE_INTEGER Timeout OPTIONAL +); + +NTSTATUS +NTAPI NtReplyWaitReplyPort( IN HANDLE PortHandle, OUT PPORT_MESSAGE ReplyMessage @@ -275,13 +285,23 @@ NTAPI ZwReplyWaitReceivePort( IN HANDLE PortHandle, - IN PVOID *PortContext OPTIONAL, + OUT PVOID *PortContext OPTIONAL, IN PPORT_MESSAGE ReplyMessage OPTIONAL, OUT PPORT_MESSAGE ReceiveMessage ); NTSTATUS NTAPI +ZwReplyWaitReceivePortEx( + IN HANDLE PortHandle, + OUT PVOID *PortContext OPTIONAL, + IN PPORT_MESSAGE ReplyMessage OPTIONAL, + OUT PPORT_MESSAGE ReceiveMessage, + IN PLARGE_INTEGER Timeout OPTIONAL +); + +NTSTATUS +NTAPI ZwReplyWaitReplyPort( IN HANDLE PortHandle, OUT PPORT_MESSAGE ReplyMessage _____ Modified: trunk/reactos/include/ndk/sefuncs.h --- trunk/reactos/include/ndk/sefuncs.h 2006-01-05 09:22:09 UTC (rev 20570) +++ trunk/reactos/include/ndk/sefuncs.h 2006-01-05 12:27:03 UTC (rev 20571) @@ -181,6 +181,13 @@ NTSYSCALLAPI NTSTATUS NTAPI +NtImpersonateAnonymousToken( + IN HANDLE Thread +); + +NTSYSCALLAPI +NTSTATUS +NTAPI NtOpenObjectAuditAlarm( IN PUNICODE_STRING SubsystemName, IN PVOID HandleId, @@ -353,6 +360,13 @@ NTSYSCALLAPI NTSTATUS NTAPI +ZwImpersonateAnonymousToken( + IN HANDLE Thread +); + +NTSYSCALLAPI +NTSTATUS +NTAPI ZwOpenObjectAuditAlarm( IN PUNICODE_STRING SubsystemName, IN PVOID HandleId,

18 years, 10 months

[gvg] 20570: - Disable NtQuerySecurityObject for now

by gvg＠svn.reactos.org

- Disable NtQuerySecurityObject for now - Add some registry entries for TinyWeb (patch by Dr.Fred) Fixes 1214 Modified: trunk/reactos/bootdata/hivecls.inf Modified: trunk/reactos/lib/advapi32/reg/reg.c _____ Modified: trunk/reactos/bootdata/hivecls.inf --- trunk/reactos/bootdata/hivecls.inf 2006-01-05 06:24:07 UTC (rev 20569) +++ trunk/reactos/bootdata/hivecls.inf 2006-01-05 09:22:09 UTC (rev 20570) @@ -62,6 +62,13 @@ HKCR,"Msi.Package\shell\Repair\command","",0x00020000,"%SystemRoot%\Syst em32\msiexec /f %1" HKCR,"Msi.Package\shell\Uninstall\command","",0x00020000,"%SystemRoot%\S ystem32\msiexec /x %1" +; set MIME type for .html and .htm because Tiny webserver needs it +HKCR,".htm","",0x00000000,"html" +HKCR,".htm","Content Type",0x00000000,"text/html" + +HKCR,".html","",0x00000000,"html" +HKCR,".html","Content Type",0x00000000,"text/html" + HKCR,"CLSID",,0x00000012 ; For Shell32.dll _____ Modified: trunk/reactos/lib/advapi32/reg/reg.c --- trunk/reactos/lib/advapi32/reg/reg.c 2006-01-05 06:24:07 UTC (rev 20569) +++ trunk/reactos/lib/advapi32/reg/reg.c 2006-01-05 09:22:09 UTC (rev 20570) @@ -2507,7 +2507,7 @@ TRACE("MapDefaultKey() failed (Status %lx)\n", Status); return RtlNtStatusToDosError (Status); } -#ifndef __REACTOS__ +#if 0 Status = NtQuerySecurityObject(KeyHandle, SecurityInformation, pSecurityDescriptor, @@ -3185,7 +3185,7 @@ { *lpcbMaxValueLen = FullInfo->MaxValueDataLen; } -#ifndef __REACTOS__ +#if 0 if (lpcbSecurityDescriptor != NULL) { Status = NtQuerySecurityObject(KeyHandle,

18 years, 10 months

[ion] 20569: Fix stack corruption. Thanks to Waxdragon and the fact he uses an -O2 build (hint hint nudge nudge)

by ion＠svn.reactos.org

Fix stack corruption. Thanks to Waxdragon and the fact he uses an -O2 build (hint hint nudge nudge) Modified: trunk/reactos/ntoskrnl/ex/work.c _____ Modified: trunk/reactos/ntoskrnl/ex/work.c --- trunk/reactos/ntoskrnl/ex/work.c 2006-01-05 04:26:55 UTC (rev 20568) +++ trunk/reactos/ntoskrnl/ex/work.c 2006-01-05 06:24:07 UTC (rev 20569) @@ -425,7 +425,7 @@ KTIMER Timer; LARGE_INTEGER Timeout; NTSTATUS Status; - PVOID WaitEvents[2]; + PVOID WaitEvents[3]; PAGED_CODE(); UNREFERENCED_PARAMETER(Context);

18 years, 10 months

[ion] 20568: - Optimized the dispatcher lock. It is now gone on non-SMP systems and IRQL is raised or lowered instead.

by ion＠svn.reactos.org

- Optimized the dispatcher lock. It is now gone on non-SMP systems and IRQL is raised or lowered instead. - Made inlined functions in ke/wait.c macros, because they weren't being inlined. - Created separate cases for satisfying mutant, non-mutant and generic objects, to optimize wait satisfaction. - Fixed some places which werne't setting the dispatcher header's size member correctly. - Fixed formatting in ke/wait.c - Fixed a case in KiCheckAlertability: we also need to check if the thread is alerted in Kernel-Mode, even if the wait mode given was user and user-mode is not alerted. - Fixed signaling checks across the wait code and removed KiCheckIfObjectSignaled. We must not consider the mutant as signaled if SignalState is = 1. - Fix code to check if the wait blocks' status is STATUS_TIMEOUT, because we do not need to check for signal state in that case. - Removed the exports for internal dispatcher lock routines. ** Thanks to Waxdragon for stress-testing this for an hour :) Modified: trunk/reactos/ntoskrnl/include/internal/ke.h Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Modified: trunk/reactos/ntoskrnl/ke/kthread.c Modified: trunk/reactos/ntoskrnl/ke/wait.c Modified: trunk/reactos/ntoskrnl/ntoskrnl.def Modified: trunk/reactos/ntoskrnl/ps/psmgr.c _____ Modified: trunk/reactos/ntoskrnl/include/internal/ke.h --- trunk/reactos/ntoskrnl/include/internal/ke.h 2006-01-05 01:49:00 UTC (rev 20567) +++ trunk/reactos/ntoskrnl/include/internal/ke.h 2006-01-05 04:26:55 UTC (rev 20568) @@ -44,31 +44,174 @@ /* MACROS ************************************************************************ */ -#define KeEnterCriticalRegion() \ -{ \ - PKTHREAD _Thread = KeGetCurrentThread(); \ - if (_Thread) _Thread->KernelApcDisable--; \ +/* + * 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 KeAcquireDispatcherDatabaseLockAtDpcLevel() +#define KeReleaseDispatcherDatabaseLockFromDpcLevel() +#else +#define KeInitializeDispatcher() KeInitializeSpinLock(&DispatcherDatabaseLock); +#define KeAcquireDispatcherDatabaseLock() KfAcquireSpinLock(&DispatcherDatabaseLock); +#define KeAcquireDispatcherDatabaseLockAtDpcLevel() \ + KeAcquireSpinLockAtDpcLevel (&DispatcherDatabaseLock); +#define KeReleaseDispatcherDatabaseLockFromDpcLevel() \ + KeReleaseSpinLockFromDpcLevel(&DispatcherDatabaseLock); +#endif + +/* The following macro initializes a dispatcher object's header */ +#define KeInitializeDispatcherHeader(Header, t, s, State) \ +{ \ + (Header)->Type = t; \ + (Header)->Absolute = 0; \ + (Header)->Inserted = 0; \ + (Header)->Size = s; \ + (Header)->SignalState = State; \ + InitializeListHead(&((Header)->WaitListHead)); \ } -#define KeLeaveCriticalRegion() \ -{ \ - PKTHREAD _Thread = KeGetCurrentThread(); \ - if((_Thread) && (++_Thread->KernelApcDisable == 0)) \ - { \ - if (!IsListEmpty(&_Thread->ApcState.ApcListHead[KernelMode]) && \ - (_Thread->SpecialApcDisable == 0)) \ - { \ - KiCheckForKernelApcDelivery(); \ - } \ - } \ +/* The following macro satisfies the wait of any dispatcher object */ +#define KiSatisfyObjectWait(Object, Thread) \ +{ \ + /* Special case for Mutants */ \ + if ((Object)->Header.Type == MutantObject) \ + { \ + /* Decrease the Signal State */ \ + (Object)->Header.SignalState--; \ + \ + /* Check if it's now non-signaled */ \ + if (!(Object)->Header.SignalState) \ + { \ + /* Set the Owner Thread */ \ + (Object)->OwnerThread = Thread; \ + \ + /* Disable APCs if needed */ \ + Thread->KernelApcDisable -= (Object)->ApcDisable; \ + \ + /* Check if it's abandoned */ \ + if ((Object)->Abandoned) \ + { \ + /* Unabandon it */ \ + (Object)->Abandoned = FALSE; \ + \ + /* Return Status */ \ + Thread->WaitStatus = STATUS_ABANDONED; \ + } \ + \ + /* Insert it into the Mutant List */ \ + InsertHeadList(&Thread->MutantListHead, \ + &(Object)->MutantListEntry); \ + } \ + } \ + else if (((Object)->Header.Type & TIMER_OR_EVENT_TYPE) == \ + EventSynchronizationObject) \ + { \ + /* Synchronization Timers and Events just get un-signaled */ \ + (Object)->Header.SignalState = 0; \ + } \ + else if ((Object)->Header.Type == SemaphoreObject) \ + { \ + /* These ones can have multiple states, so we only decrease it */ \ + (Object)->Header.SignalState--; \ + } \ } -#define KEBUGCHECKWITHTF(a,b,c,d,e,f) \ - DbgPrint("KeBugCheckWithTf at %s:%i\n",__FILE__,__LINE__), KeBugCheckWithTf(a,b,c,d,e,f) +/* The following macro satisfies the wait of a mutant dispatcher object */ +#define KiSatisfyMutantWait(Object, Thread) \ +{ \ + /* Decrease the Signal State */ \ + (Object)->Header.SignalState--; \ + \ + /* Check if it's now non-signaled */ \ + if (!(Object)->Header.SignalState) \ + { \ + /* Set the Owner Thread */ \ + (Object)->OwnerThread = Thread; \ + \ + /* Disable APCs if needed */ \ + Thread->KernelApcDisable -= (Object)->ApcDisable; \ + \ + /* Check if it's abandoned */ \ + if ((Object)->Abandoned) \ + { \ + /* Unabandon it */ \ + (Object)->Abandoned = FALSE; \ + \ + /* Return Status */ \ + Thread->WaitStatus = STATUS_ABANDONED; \ + } \ + \ + /* Insert it into the Mutant List */ \ + InsertHeadList(&Thread->MutantListHead, \ + &(Object)->MutantListEntry); \ + } \ +} -#define MAXIMUM_PROCESSORS 32 +/* The following macro satisfies the wait of any nonmutant dispatcher object */ +#define KiSatisfyNonMutantWait(Object, Thread) \ +{ \ + if (((Object)->Header.Type & TIMER_OR_EVENT_TYPE) == \ + EventSynchronizationObject) \ + { \ + /* Synchronization Timers and Events just get un-signaled */ \ + (Object)->Header.SignalState = 0; \ + } \ + else if ((Object)->Header.Type == SemaphoreObject) \ + { \ + /* These ones can have multiple states, so we only decrease it */ \ + (Object)->Header.SignalState--; \ + } \ +} +/* The following macro satisfies multiple objects in a wait state */ +#define KiSatisifyMultipleObjectWaits(FirstBlock) \ +{ \ + PKWAIT_BLOCK WaitBlock = FirstBlock; \ + PKTHREAD WaitThread = WaitBlock->Thread; \ + \ + /* Loop through all the Wait Blocks, and wake each Object */ \ + do \ + { \ + /* Make sure it hasn't timed out */ \ + if (WaitBlock->WaitKey != STATUS_TIMEOUT) \ + { \ + /* Wake the Object */ \ + KiSatisfyObjectWait((PKMUTANT)WaitBlock->Object, WaitThread); \ + } \ + \ + /* Move to the next block */ \ + WaitBlock = WaitBlock->NextWaitBlock; \ + } while (WaitBlock != FirstBlock); \ +} +extern KSPIN_LOCK DispatcherDatabaseLock; + +#define KeEnterCriticalRegion() \ +{ \ + PKTHREAD _Thread = KeGetCurrentThread(); \ + if (_Thread) _Thread->KernelApcDisable--; \ +} + +#define KeLeaveCriticalRegion() \ +{ \ + PKTHREAD _Thread = KeGetCurrentThread(); \ + if((_Thread) && (++_Thread->KernelApcDisable == 0)) \ + { \ + if (!IsListEmpty(&_Thread->ApcState.ApcListHead[KernelMode]) && \ + (_Thread->SpecialApcDisable == 0)) \ + { \ + KiCheckForKernelApcDelivery(); \ + } \ + } \ +} + +#define KEBUGCHECKWITHTF(a,b,c,d,e,f) \ + DbgPrint("KeBugCheckWithTf at %s:%i\n",__FILE__,__LINE__), \ + KeBugCheckWithTf(a,b,c,d,e,f) + /* INTERNAL KERNEL FUNCTIONS ************************************************/ /* threadsch.c ********************************************************************/ @@ -243,27 +386,11 @@ PVOID SystemArgument2 ); -KIRQL -__inline -FASTCALL -KeAcquireDispatcherDatabaseLock(VOID); - VOID -__inline FASTCALL -KeAcquireDispatcherDatabaseLockAtDpcLevel(VOID); - -VOID -__inline -FASTCALL KeReleaseDispatcherDatabaseLock(KIRQL Irql); VOID -__inline -FASTCALL -KeReleaseDispatcherDatabaseLockFromDpcLevel(VOID); - -VOID STDCALL KeInitializeThread( struct _KPROCESS* Process, @@ -313,16 +440,6 @@ ); VOID -__inline -FASTCALL -KeInitializeDispatcherHeader( - DISPATCHER_HEADER* Header, - ULONG Type, - ULONG Size, - ULONG SignalState -); - -VOID NTAPI KeDumpStackFrames(PULONG Frame); @@ -362,14 +479,6 @@ LARGE_INTEGER DueTime ); -VOID -__inline -FASTCALL -KiSatisfyObjectWait( - PDISPATCHER_HEADER Object, - PKTHREAD Thread -); - BOOLEAN __inline FASTCALL @@ -379,14 +488,9 @@ ); VOID -__inline FASTCALL -KiSatisifyMultipleObjectWaits(PKWAIT_BLOCK WaitBlock); - -VOID -FASTCALL KiWaitTest( - PDISPATCHER_HEADER Object, + PVOID Object, KPRIORITY Increment ); @@ -507,11 +611,6 @@ KeInitDispatcher(VOID); VOID -__inline -FASTCALL -KeInitializeDispatcher(VOID); - -VOID NTAPI KiInitializeSystemClock(VOID); _____ Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2006-01-05 01:49:00 UTC (rev 20567) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S 2006-01-05 04:26:55 UTC (rev 20568) @@ -21,6 +21,8 @@ /* GLOBALS ****************************************************************/ +.extern _DispatcherDatabaseLock + /* FUNCTIONS ****************************************************************/ /*++ @@ -244,7 +246,10 @@ pop [ebx+KPCR_EXCEPTION_LIST] /* Return */ - call @KeReleaseDispatcherDatabaseLockFromDpcLevel@0 +//#ifdef CONFIG_SMP + mov ecx, _DispatcherDatabaseLock + call @KefReleaseSpinLockFromDpcLevel@4 +//#endif ret /*++ _____ Modified: trunk/reactos/ntoskrnl/ke/kthread.c --- trunk/reactos/ntoskrnl/ke/kthread.c 2006-01-05 01:49:00 UTC (rev 20567) +++ trunk/reactos/ntoskrnl/ke/kthread.c 2006-01-05 04:26:55 UTC (rev 20568) @@ -819,7 +819,7 @@ DPRINT("Initializing Dispatcher Header for New Thread: %x in Process: %x\n", Thread, Process); KeInitializeDispatcherHeader(&Thread->DispatcherHeader, ThreadObject, - sizeof(KTHREAD), + sizeof(KTHREAD) / sizeof(LONG), FALSE); DPRINT("Thread Header Created. SystemRoutine: %x, StartRoutine: %x with Context: %x\n", _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2006-01-05 01:49:00 UTC (rev 20567) +++ trunk/reactos/ntoskrnl/ke/wait.c 2006-01-05 04:26:55 UTC (rev 20568) @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Kernel * FILE: ntoskrnl/ke/wait.c - * PURPOSE: Manages dispatch level wait-related code + * PURPOSE: Manages waiting for Dispatcher Objects * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * Gunnar Dalsnes */ @@ -16,7 +16,7 @@ /* GLOBALS ******************************************************************/ -static KSPIN_LOCK DispatcherDatabaseLock; +KSPIN_LOCK DispatcherDatabaseLock; /* Tells us if the Timer or Event is a Syncronization or Notification Object */ #define TIMER_OR_EVENT_TYPE 0x7L @@ -30,38 +30,58 @@ __inline FASTCALL KiCheckAlertability(BOOLEAN Alertable, - PKTHREAD CurrentThread, + PKTHREAD Thread, KPROCESSOR_MODE WaitMode, PNTSTATUS Status) { - /* At this point, we have to do a wait, so make sure we can make the thread Alertable if requested */ - if (Alertable) { - + /* + * At this point, we have to do a wait, so make sure we can make + * the thread Alertable if requested. + */ + if (Alertable) + { /* If the Thread is Alerted, set the Wait Status accordingly */ - if (CurrentThread->Alerted[(int)WaitMode]) { - - CurrentThread->Alerted[(int)WaitMode] = FALSE; - DPRINT("Thread was Alerted\n"); + if (Thread->Alerted[(int)WaitMode]) + { + Thread->Alerted[(int)WaitMode] = FALSE; + DPRINT("Thread was Alerted in the specified Mode\n"); *Status = STATUS_ALERTED; return TRUE; - - /* If there are User APCs Pending, then we can't really be alertable */ - } else if ((!IsListEmpty(&CurrentThread->ApcState.ApcListHead[UserMode])) && - (WaitMode != KernelMode)) { - + } + else if ((WaitMode != KernelMode) && + (!IsListEmpty(&Thread->ApcState.ApcListHead[UserMode]))) + { + /* If there are User APCs Pending, then we can't really be alertable */ DPRINT("APCs are Pending\n"); - CurrentThread->ApcState.UserApcPending = TRUE; + Thread->ApcState.UserApcPending = TRUE; *Status = STATUS_USER_APC; return TRUE; } - - /* If there are User APCs Pending and we are waiting in usermode, then we must notify the caller */ - } else if ((CurrentThread->ApcState.UserApcPending) && (WaitMode != KernelMode)) { - DPRINT("APCs are Pending\n"); - *Status = STATUS_USER_APC; + else if (Thread->Alerted[KernelMode]) + { + /* + * The thread is not alerted in the mode given, but it is alerted + * in kernel-mode. + */ + Thread->Alerted[KernelMode] = FALSE; + DPRINT("Thread was Alerted in Kernel-Mode\n"); + *Status = STATUS_ALERTED; return TRUE; + } } + else if ((WaitMode != KernelMode) && + (Thread->ApcState.UserApcPending)) + { + /* + * If there are User APCs Pending and we are waiting in usermode, + * then we must notify the caller + */ + DPRINT("APCs are Pending\n"); + *Status = STATUS_USER_APC; + return TRUE; + } + /* Stay in the loop */ return FALSE; } @@ -90,14 +110,14 @@ DPRINT("Entering KeDelayExecutionThread\n"); /* Check if the lock is already held */ - if (CurrentThread->WaitNext) { - + if (CurrentThread->WaitNext) + { /* Lock is held, disable Wait Next */ DPRINT("Lock is held\n"); CurrentThread->WaitNext = FALSE; - - } else { - + } + else + { /* Lock not held, acquire it */ DPRINT("Lock is not held, acquiring\n"); CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock(); @@ -107,12 +127,11 @@ TimerWaitBlock = &CurrentThread->WaitBlock[TIMER_WAIT_BLOCK]; /* Start Wait Loop */ - do { + do + { + /* Chceck if we can do an alertable wait, if requested */ + if (KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status)) break; - /* We are going to wait no matter what (that's the point), so test Alertability */ - if (KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status)) - break; - /* Set Timer */ ThreadTimer = &CurrentThread->Timer; @@ -129,30 +148,31 @@ InsertTailList(&ThreadTimer->Header.WaitListHead, &TimerWaitBlock->WaitListEntry); /* Insert the Timer into the Timer Lists and enable it */ - if (!KiInsertTimer(ThreadTimer, *Interval)) { - + if (!KiInsertTimer(ThreadTimer, *Interval)) + { /* FIXME: The timer already expired, we should find a new ready thread */ Status = STATUS_SUCCESS; break; } /* Handle Kernel Queues */ - if (CurrentThread->Queue) { - + if (CurrentThread->Queue) + { DPRINT("Waking Queue\n"); KiWakeQueue(CurrentThread->Queue); } /* Block the Thread */ - DPRINT("Blocking the Thread: %d, %d, %x\n", Alertable, WaitMode, KeGetCurrentThread()); + DPRINT("Blocking the Thread: %d, %d, %x\n", + Alertable, WaitMode, KeGetCurrentThread()); KiBlockThread(&Status, Alertable, WaitMode, DelayExecution); /* Check if we were executing an APC or if we timed out */ - if (Status != STATUS_KERNEL_APC) { - + if (Status != STATUS_KERNEL_APC) + { /* This is a good thing */ if (Status == STATUS_TIMEOUT) Status = STATUS_SUCCESS; @@ -160,13 +180,14 @@ return Status; } - DPRINT("Looping Again\n"); + DPRINT("Looping Again\n"); // FIXME: Need to modify interval CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock(); + } + while (TRUE); - } while (TRUE); - /* Release the Lock, we are done */ - DPRINT("Returning from KeDelayExecutionThread(), %x. Status: %d\n", KeGetCurrentThread(), Status); + DPRINT("Returning from KeDelayExecutionThread(), %x. Status: %d\n", + KeGetCurrentThread(), Status); KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); return Status; } @@ -194,33 +215,32 @@ BOOLEAN Alertable, PLARGE_INTEGER Timeout) { - PDISPATCHER_HEADER CurrentObject; + PKMUTANT CurrentObject; PKWAIT_BLOCK WaitBlock; PKWAIT_BLOCK TimerWaitBlock; PKTIMER ThreadTimer; PKTHREAD CurrentThread = KeGetCurrentThread(); NTSTATUS Status; NTSTATUS WaitStatus; - DPRINT("Entering KeWaitForSingleObject\n"); /* Check if the lock is already held */ - if (CurrentThread->WaitNext) { - + if (CurrentThread->WaitNext) + { /* Lock is held, disable Wait Next */ DPRINT("Lock is held\n"); CurrentThread->WaitNext = FALSE; - - } else { - + } + else + { /* Lock not held, acquire it */ DPRINT("Lock is not held, acquiring\n"); CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock(); } /* Start the actual Loop */ - do { - + do + { /* Get the current Wait Status */ WaitStatus = CurrentThread->WaitStatus; @@ -228,30 +248,38 @@ CurrentThread->WaitBlockList = WaitBlock = &CurrentThread->WaitBlock[0]; /* Get the Current Object */ - CurrentObject = (PDISPATCHER_HEADER)Object; + CurrentObject = (PKMUTANT)Object; - /* Check if the Object is Signaled */ - if (KiIsObjectSignaled(CurrentObject, CurrentThread)) { - - /* Just unwait this guy and exit */ - if (CurrentObject->SignalState != (LONG)MINLONG) { - - /* It has a normal signal state, so unwait it and return */ - KiSatisfyObjectWait(CurrentObject, CurrentThread); - Status = STATUS_WAIT_0; - goto DontWait; - - } else { - - /* Is this a Mutant? */ - if (CurrentObject->Type == MutantObject) { - + /* Check if it's a mutant */ + if (CurrentObject->Header.Type == MutantObject) + { + /* Check its signal state or if we own it */ + if ((CurrentObject->Header.SignalState > 0) || + (CurrentThread == CurrentObject->OwnerThread)) + { + /* Just unwait this guy and exit */ + if (CurrentObject->Header.SignalState != (LONG)MINLONG) + { + /* It has a normal signal state, so unwait it and return */ + KiSatisfyMutantWait(CurrentObject, CurrentThread); + Status = STATUS_WAIT_0; + goto DontWait; + } + else + { /* According to wasm.ru, we must raise this exception (tested and true) */ KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); ExRaiseStatus(STATUS_MUTANT_LIMIT_EXCEEDED); } } } + else if (CurrentObject->Header.SignalState > 0) + { + /* Another satisfied object */ + KiSatisfyNonMutantWait(CurrentObject, CurrentThread); + Status = STATUS_WAIT_0; + goto DontWait; + } /* Set up the Wait Block */ WaitBlock->Object = CurrentObject; @@ -261,18 +289,17 @@ WaitBlock->NextWaitBlock = WaitBlock; /* Make sure we can satisfy the Alertable request */ - if (KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status)) - break; + if (KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status)) break; /* Set the Wait Status */ CurrentThread->WaitStatus = Status; /* Enable the Timeout Timer if there was any specified */ - if (Timeout != NULL) { - - /* However if 0 timeout was specified, then we must fail since we need to peform a wait */ - if (!Timeout->QuadPart) { - + if (Timeout) + { + /* Fail if the timeout interval is actually 0 */ + if (!Timeout->QuadPart) + { /* Return a timeout */ Status = STATUS_TIMEOUT; goto DontWait; @@ -294,48 +321,53 @@ /* Link the timer to this Wait Block */ InitializeListHead(&ThreadTimer->Header.WaitListHead); - InsertTailList(&ThreadTimer->Header.WaitListHead, &TimerWaitBlock->WaitListEntry); + InsertTailList(&ThreadTimer->Header.WaitListHead, + &TimerWaitBlock->WaitListEntry); /* Insert the Timer into the Timer Lists and enable it */ - if (!KiInsertTimer(ThreadTimer, *Timeout)) { - - /* Return a timeout if we couldn't insert the timer for some reason */ + if (!KiInsertTimer(ThreadTimer, *Timeout)) + { + /* Return a timeout if we couldn't insert the timer */ Status = STATUS_TIMEOUT; goto DontWait; } } /* Link the Object to this Wait Block */ - InsertTailList(&CurrentObject->WaitListHead, &WaitBlock->WaitListEntry); + InsertTailList(&CurrentObject->Header.WaitListHead, + &WaitBlock->WaitListEntry); /* Handle Kernel Queues */ - if (CurrentThread->Queue) { - + if (CurrentThread->Queue) + { DPRINT("Waking Queue\n"); KiWakeQueue(CurrentThread->Queue); } /* Block the Thread */ - DPRINT("Blocking the Thread: %d, %d, %d, %x\n", Alertable, WaitMode, WaitReason, KeGetCurrentThread()); + DPRINT("Blocking the Thread: %d, %d, %d, %x\n", + Alertable, WaitMode, WaitReason, KeGetCurrentThread()); KiBlockThread(&Status, Alertable, WaitMode, (UCHAR)WaitReason); /* Check if we were executing an APC */ - if (Status != STATUS_KERNEL_APC) { - + if (Status != STATUS_KERNEL_APC) + { /* Return Status */ return Status; } - DPRINT("Looping Again\n"); + /* Loop again and acquire the dispatcher lock */ + DPRINT("Looping Again\n"); // FIXME: Change interval CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock(); + } + while (TRUE); - } while (TRUE); - /* Release the Lock, we are done */ - DPRINT("Returning from KeWaitForMultipleObjects(), %x. Status: %d\n", KeGetCurrentThread(), Status); + DPRINT("Returning from KeWaitForMultipleObjects(), %x. Status: %d\n", + KeGetCurrentThread(), Status); KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); return Status; @@ -344,7 +376,8 @@ KiAdjustQuantumThread(CurrentThread); /* Release & Return */ - DPRINT("Returning from KeWaitForMultipleObjects(), %x. Status: %d\n. We did not wait.", KeGetCurrentThread(), Status); + DPRINT("Quick-return from KeWaitForMultipleObjects(), %x. Status: %d\n.", + KeGetCurrentThread(), Status); KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); return Status; } @@ -362,7 +395,7 @@ PLARGE_INTEGER Timeout, PKWAIT_BLOCK WaitBlockArray) { - PDISPATCHER_HEADER CurrentObject; + PKMUTANT CurrentObject; PKWAIT_BLOCK WaitBlock; PKWAIT_BLOCK TimerWaitBlock; PKTIMER ThreadTimer; @@ -371,51 +404,45 @@ ULONG WaitIndex; NTSTATUS Status; NTSTATUS WaitStatus; - DPRINT("Entering KeWaitForMultipleObjects(Count %lu Object[] %p) " - "PsGetCurrentThread() %x, Timeout %x\n", Count, Object, PsGetCurrentThread(), Timeout); + "PsGetCurrentThread() %x, Timeout %x\n", + Count, Object, PsGetCurrentThread(), Timeout); /* Set the Current Thread */ CurrentThread = KeGetCurrentThread(); /* Check if the lock is already held */ - if (CurrentThread->WaitNext) { - + if (CurrentThread->WaitNext) + { /* Lock is held, disable Wait Next */ DPRINT("Lock is held\n"); CurrentThread->WaitNext = FALSE; - - } else { - + } + else + { /* Lock not held, acquire it */ DPRINT("Lock is not held, acquiring\n"); CurrentThread->WaitIrql = KeAcquireDispatcherDatabaseLock(); } /* Make sure the Wait Count is valid for the Thread and Maximum Wait Objects */ - if (!WaitBlockArray) { - + if (!WaitBlockArray) + { /* Check in regards to the Thread Object Limit */ - if (Count > THREAD_WAIT_OBJECTS) { + if (Count > THREAD_WAIT_OBJECTS) KEBUGCHECK(MAXIMUM_WAIT_OBJECTS_EXCEEDED); - KEBUGCHECK(MAXIMUM_WAIT_OBJECTS_EXCEEDED); - } - /* Use the Thread's Wait Block */ WaitBlockArray = &CurrentThread->WaitBlock[0]; - - } else { - + } + else + { /* Using our own Block Array. Check in regards to System Object Limit */ - if (Count > MAXIMUM_WAIT_OBJECTS) { - - KEBUGCHECK(MAXIMUM_WAIT_OBJECTS_EXCEEDED); - } + if (Count > MAXIMUM_WAIT_OBJECTS) KEBUGCHECK(MAXIMUM_WAIT_OBJECTS_EXCEEDED); } /* Start the actual Loop */ - do { - + do + { /* Get the current Wait Status */ WaitStatus = CurrentThread->WaitStatus; @@ -426,47 +453,76 @@ AllObjectsSignaled = TRUE; /* First, we'll try to satisfy the wait directly */ - for (WaitIndex = 0; WaitIndex < Count; WaitIndex++) { - + for (WaitIndex = 0; WaitIndex < Count; WaitIndex++) + { /* Get the Current Object */ - CurrentObject = (PDISPATCHER_HEADER)Object[WaitIndex]; + CurrentObject = (PKMUTANT)Object[WaitIndex]; - /* Check if the Object is Signaled */ - if (KiIsObjectSignaled(CurrentObject, CurrentThread)) { - - /* Check what kind of wait this is */ - if (WaitType == WaitAny) { - - /* This is a Wait Any, so just unwait this guy and exit */ - if (CurrentObject->SignalState != (LONG)MINLONG) { - - /* It has a normal signal state, so unwait it and return */ - KiSatisfyObjectWait(CurrentObject, CurrentThread); - Status = STATUS_WAIT_0 | WaitIndex; - goto DontWait; - - } else { - - /* Is this a Mutant? */ - if (CurrentObject->Type == MutantObject) { - + /* Check the type of wait */ + if (WaitType == WaitAny) + { + /* Check if the Object is a mutant */ + if (CurrentObject->Header.Type == MutantObject) + { + /* Check if it's signaled */ + if ((CurrentObject->Header.SignalState > 0) || + (CurrentThread == CurrentObject->OwnerThread)) + { + /* This is a Wait Any, so just unwait this and exit */ + if (CurrentObject->Header.SignalState != (LONG)MINLONG) + { + /* Normal signal state, so unwait it and return */ + KiSatisfyMutantWait(CurrentObject, CurrentThread); + Status = STATUS_WAIT_0 | WaitIndex; + goto DontWait; + } + else + { /* According to wasm.ru, we must raise this exception (tested and true) */ KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); ExRaiseStatus(STATUS_MUTANT_LIMIT_EXCEEDED); } } } - - } else { - - /* One of the objects isn't signaled... if this is a WaitAll, we will fail later */ - AllObjectsSignaled = FALSE; + else if (CurrentObject->Header.SignalState > 0) + { + /* Another signaled object, unwait and return */ + KiSatisfyNonMutantWait(CurrentObject, CurrentThread); + Status = WaitIndex; + goto DontWait; + } } + else + { + /* Check if we're dealing with a mutant again */ + if (CurrentObject->Header.Type == MutantObject) + { + /* Check if it has an invalid count */ + if ((CurrentThread == CurrentObject->OwnerThread) && + (CurrentObject->Header.SignalState == MINLONG)) + { + /* Raise an exception */ + KeReleaseDispatcherDatabaseLock(CurrentThread->WaitIrql); + ExRaiseStatus(STATUS_MUTANT_LIMIT_EXCEEDED); + } + else if ((CurrentObject->Header.SignalState <= 0) && + (CurrentThread != CurrentObject->OwnerThread)) + { + /* We don't own it, can't satisfy the wait */ + AllObjectsSignaled = FALSE; + } + } + else if (CurrentObject->Header.SignalState <= 0) + { + /* Not signaled, can't satisfy */ + AllObjectsSignaled = FALSE; + } + } /* Set up a Wait Block for this Object */ WaitBlock->Object = CurrentObject; WaitBlock->Thread = CurrentThread; - WaitBlock->WaitKey = (USHORT)(STATUS_WAIT_0 + WaitIndex); + WaitBlock->WaitKey = (USHORT)WaitIndex; WaitBlock->WaitType = (USHORT)WaitType; WaitBlock->NextWaitBlock = WaitBlock + 1; @@ -479,8 +535,8 @@ WaitBlock->NextWaitBlock = WaitBlockArray; /* Check if this is a Wait All and all the objects are signaled */ - if ((WaitType == WaitAll) && (AllObjectsSignaled)) { - + if ((WaitType == WaitAll) && (AllObjectsSignaled)) + { /* Return to the Root Wait Block */ WaitBlock = CurrentThread->WaitBlockList; @@ -491,18 +547,17 @@ } /* Make sure we can satisfy the Alertable request */ - if (KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status)) - break; + if (KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status)) break; /* Set the Wait Status */ CurrentThread->WaitStatus = Status; /* Enable the Timeout Timer if there was any specified */ - if (Timeout != NULL) { - - /* However if 0 timeout was specified, then we must fail since we need to peform a wait */ - if (!Timeout->QuadPart) { - + if (Timeout) + { + /* Make sure the timeout interval isn't actually 0 */ + if (!Timeout->QuadPart) + { /* Return a timeout */ Status = STATUS_TIMEOUT; goto DontWait; @@ -526,9 +581,9 @@ InitializeListHead(&ThreadTimer->Header.WaitListHead); /* Insert the Timer into the Timer Lists and enable it */ - if (!KiInsertTimer(ThreadTimer, *Timeout)) { - - /* Return a timeout if we couldn't insert the timer for some reason */ + if (!KiInsertTimer(ThreadTimer, *Timeout)) + { + /* Return a timeout if we couldn't insert the timer */ Status = STATUS_TIMEOUT; goto DontWait; } @@ -536,28 +591,30 @@ /* Insert into Object's Wait List*/ WaitBlock = CurrentThread->WaitBlockList; - do { - + do + { /* Get the Current Object */ CurrentObject = WaitBlock->Object; /* Link the Object to this Wait Block */ - InsertTailList(&CurrentObject->WaitListHead, &WaitBlock->WaitListEntry); + InsertTailList(&CurrentObject->Header.WaitListHead, + &WaitBlock->WaitListEntry); /* Move to the next Wait Block */ WaitBlock = WaitBlock->NextWaitBlock; - } while (WaitBlock != WaitBlockArray); + } + while (WaitBlock != WaitBlockArray); /* Handle Kernel Queues */ - if (CurrentThread->Queue) { - + if (CurrentThread->Queue) + { DPRINT("Waking Queue\n"); KiWakeQueue(CurrentThread->Queue); } /* Block the Thread */ - DPRINT("Blocking the Thread: %d, %d, %d, %x\n", Alertable, WaitMode, - WaitReason, KeGetCurrentThread()); + DPRINT("Blocking the Thread: %d, %d, %d, %x\n", + Alertable, WaitMode, WaitReason, KeGetCurrentThread()); KiBlockThread(&Status, Alertable, WaitMode, @@ -565,17 +622,18 @@ /* Check if we were executing an APC */ DPRINT("Thread is back\n"); - if (Status != STATUS_KERNEL_APC) { - + if (Status != STATUS_KERNEL_APC) + { /* Return Status */ return Status; } [truncated at 1000 lines; 408 more skipped]

18 years, 10 months

[greatlrd] 20567: fix new strechblt code for dib32, left todo dib1, dib4, dib24

by greatlrd＠svn.reactos.org

fix new strechblt code for dib32, left todo dib1, dib4, dib24 Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c _____ Modified: trunk/reactos/subsys/win32k/dib/dib32bpp.c --- trunk/reactos/subsys/win32k/dib/dib32bpp.c 2006-01-05 00:56:44 UTC (rev 20566) +++ trunk/reactos/subsys/win32k/dib/dib32bpp.c 2006-01-05 01:49:00 UTC (rev 20567) @@ -528,7 +528,6 @@ return TRUE; } - //NOTE: If you change something here, please do the same in other dibXXbpp.c files! BOOLEAN DIB_32BPP_StretchBlt(SURFOBJ *DestSurf, SURFOBJ *SourceSurf, RECTL* DestRect, RECTL *SourceRect, @@ -537,21 +536,18 @@ 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; + LONG SrcSizeY; + LONG SrcSizeX; + LONG DesSizeY; + LONG DesSizeX; + LONG sx; + LONG sy; + LONG DesX; + LONG DesY; + LONG color; + PULONG DestBits; + LONG DifflDelta; + DPRINT("DIB_32BPP_StretchBlt: Source BPP: %u, srcRect: (%d,%d)-(%d,%d), dstRect: (%d,%d)-(%d,%d)\n", BitsPerFormat(SourceSurf->iBitmapFormat), SourceRect->left, SourceRect->top, SourceRect->right, @@ -560,654 +556,136 @@ SrcSizeY = SourceRect->bottom - SourceRect->top; SrcSizeX = SourceRect->right - SourceRect->left; - DesSizeY = DestRect->bottom ; - DesSizeX = DestRect->right; + DesSizeY = DestRect->bottom - DestRect->top; + DesSizeX = DestRect->right - DestRect->left; - zoomX = DesSizeX / SrcSizeX; - if (zoomX==0) zoomX=1; - - zoomY = DesSizeY / SrcSizeY; - if (zoomY==0) zoomY=1; - 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; + case BMF_1BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 2) + + DestRect->top * DestSurf->lDelta); + + DifflDelta = DestSurf->lDelta - (DesSizeX << 1); + + for (DesY=0; DesY<DesSizeY; DesY++) + { + sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=0; DesX<DesSizeX; DesX++, DestBits++ ) + { + sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; + + if(DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) + { + *DestBits = XLATEOBJ_iXlate(ColorTranslation, 0); + } + else + { + *DestBits = XLATEOBJ_iXlate(ColorTranslation, 1); + } + } + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); + } - saveY = DesY+zoomY; + break; - 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; + case BMF_4BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 2) + + DestRect->top * DestSurf->lDelta); + + DifflDelta = DestSurf->lDelta - (DesSizeX << 1); + + for (DesY=0; DesY<DesSizeY; DesY++) + { + sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=0; DesX<DesSizeX; DesX++, DestBits++ ) + { + sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; + color = DIB_4BPP_GetPixel(SourceSurf, sx, sy); + *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); + } + + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); + } + break; - if (DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) - for (count=DesY;count<saveY;count++) - DIB_32BPP_HLine(DestSurf, DesX, saveX, count, 0); - else - for (count=DesY;count<saveY;count++) - DIB_32BPP_HLine(DestSurf, DesX, saveX, count, 1); - - } - } - } - else - { - /* Draw one Hline on X - Led to the Des Zoom Out*/ + case BMF_8BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 2) + + DestRect->top * DestSurf->lDelta); + + DifflDelta = DestSurf->lDelta - (DesSizeX << 1); + + for (DesY=0; DesY<DesSizeY; DesY++) + { + sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=0; DesX<DesSizeX; DesX++, DestBits++) + { + sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; + color = DIB_32BPP_GetPixel(SourceSurf, sx, sy); + *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); + } + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); + } + break; - 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; - - if (DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) - for (count=DesY;count<saveY;count++) - DIB_32BPP_HLine(DestSurf, DesX, saveX, count, 0); - else - for (count=DesY;count<saveY;count++) - DIB_32BPP_HLine(DestSurf, DesX, saveX, count, 1); - - } - } - } - } - 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; - - if (DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) - for (count=DesY;count<saveY;count++) - DIB_32BPP_PutPixel(DestSurf, DesX, count, 0); - else - for (count=DesY;count<saveY;count++) - DIB_32BPP_PutPixel(DestSurf, DesX, count, 1); - - - } - } - } - 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; - - if (DIB_1BPP_GetPixel(SourceSurf, sx, sy) == 0) - for (count=DesY;count<saveY;count++) - DIB_32BPP_PutPixel(DestSurf, DesX, count, 0); - else - for (count=DesY;count<saveY;count++) - DIB_32BPP_PutPixel(DestSurf, DesX, count, 1); - - } - } - } - } - 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; - - 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_32BPP_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_32BPP_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_32BPP_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_32BPP_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; - - 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_32BPP_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_32BPP_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_32BPP_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_32BPP_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 */ + + DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 2) + + DestRect->top * DestSurf->lDelta); + + DifflDelta = DestSurf->lDelta - (DesSizeX << 1); + + for (DesY=0; DesY<DesSizeY; DesY++) + { + sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=0; DesX<DesSizeX; DesX++, DestBits++) + { + sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; + color = DIB_16BPP_GetPixel(SourceSurf, sx, sy); + *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); + } + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); + } + break; - saveY = DesY+zoomY; + case BMF_24BPP: + /* FIXME : MaskOrigin, BrushOrigin, ClipRegion, Mode ? */ + /* This is a reference implementation, it hasn't been optimized for speed */ + + DestBits = (PULONG)((PBYTE)DestSurf->pvScan0 + (DestRect->left << 2) + + DestRect->top * DestSurf->lDelta); + + DifflDelta = DestSurf->lDelta - (DesSizeX << 1); + + for (DesY=0; DesY<DesSizeY; DesY++) + { + sy = ((DesY * SrcSizeY) / DesSizeY) + SourceRect->top; + + for (DesX=0; DesX<DesSizeX; DesX++, DestBits++) + { + sx = ((DesX * SrcSizeX) / DesSizeX) + SourceRect->left; + color = DIB_24BPP_GetPixel(SourceSurf, sx, sy); + *DestBits = XLATEOBJ_iXlate(ColorTranslation, color); + } + DestBits = (PULONG)((ULONG_PTR)DestBits + DifflDelta); + } + break; - 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_32BPP_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_32BPP_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_32BPP_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_32BPP_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; - - 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_32BPP_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_32BPP_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_32BPP_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_32BPP_PutPixel(DestSurf, DesX, count, color); - } - } - } - } - break; - case BMF_32BPP: return ScaleRectAvg32(DestSurf, SourceSurf, DestRect, SourceRect, MaskOrigin, BrushOrigin, ClipRegion, ColorTranslation, Mode);

18 years, 10 months

[ion] 20566: - fix build on dbg=0. Thanks to Andrew

by ion＠svn.reactos.org

- fix build on dbg=0. Thanks to Andrew Modified: trunk/reactos/ntoskrnl/ex/pushlock.c _____ Modified: trunk/reactos/ntoskrnl/ex/pushlock.c --- trunk/reactos/ntoskrnl/ex/pushlock.c 2006-01-04 23:48:15 UTC (rev 20565) +++ trunk/reactos/ntoskrnl/ex/pushlock.c 2006-01-05 00:56:44 UTC (rev 20566) @@ -164,8 +164,10 @@ /* Sanity check */ ASSERT(!WaitBlock->Signaled); +#ifdef DBG /* We are about to get signaled */ WaitBlock->Signaled = TRUE; +#endif /* Set the Wait Bit in the Wait Block */ if (!InterlockedBitTestAndReset(&WaitBlock->Flags, 1))

18 years, 10 months

[gvg] 20565: Avoid using uninitialized variables

by gvg＠svn.reactos.org

Avoid using uninitialized variables Modified: trunk/reactos/apps/utils/net/ftp/ftp.c _____ Modified: trunk/reactos/apps/utils/net/ftp/ftp.c --- trunk/reactos/apps/utils/net/ftp/ftp.c 2006-01-04 23:28:10 UTC (rev 20564) +++ trunk/reactos/apps/utils/net/ftp/ftp.c 2006-01-04 23:48:15 UTC (rev 20565) @@ -211,13 +211,16 @@ int n, aflag = 0; user = pass = acct = 0; - if (ruserpass(host, &puser, &ppass, &pacct) < 0) { + n = ruserpass(host, &puser, &ppass, &pacct); + if (n < 0) { code = -1; return(0); } - user = puser; - pass = ppass; - acct = pacct; + if (0 != n) { + user = puser; + pass = ppass; + acct = pacct; + } while (user == NULL) { const char *myname = "none"; // This needs to become the usename env

18 years, 10 months

[gvg] 20564: Only use the Folder class handler if we're actually executing a folder.

by gvg＠svn.reactos.org

Only use the Folder class handler if we're actually executing a folder. Fixes bug 1235. Modified: trunk/reactos/lib/shell32/shlexec.c _____ Modified: trunk/reactos/lib/shell32/shlexec.c --- trunk/reactos/lib/shell32/shlexec.c 2006-01-04 22:46:45 UTC (rev 20563) +++ trunk/reactos/lib/shell32/shlexec.c 2006-01-04 23:28:10 UTC (rev 20564) @@ -1200,7 +1200,9 @@ UINT_PTR retval = 31; WCHAR wcmd[1024]; WCHAR buffer[MAX_PATH]; + WCHAR target[MAX_PATH]; BOOL done; + DWORD attribs; /* make a local copy of the LPSHELLEXECUTEINFO structure and work with this from now on */ memcpy(&sei_tmp, sei, sizeof(sei_tmp)); @@ -1315,9 +1317,20 @@ strcpyW(wszApplicationName, wExplorer); sei_tmp.fMask &= ~SEE_MASK_INVOKEIDLIST; - } else if (HCR_GetExecuteCommandW(0, wszFolder, sei_tmp.lpVerb?sei_tmp.lpVerb:wszOpen, buffer, sizeof(buffer))) { - SHELL_ArgifyW(wszApplicationName, sizeof(wszApplicationName)/sizeof(WCHAR), buffer, NULL, sei_tmp.lpIDList, NULL); - + } else { + /* Check if we're executing a directory and if so use the + handler for the Folder class */ + strcpyW(target, buffer); + attribs = GetFileAttributesW(buffer); + if (attribs != INVALID_FILE_ATTRIBUTES && + 0 != (attribs & FILE_ATTRIBUTE_DIRECTORY) && + HCR_GetExecuteCommandW(0, wszFolder, + sei_tmp.lpVerb?sei_tmp.lpVerb:wszOpen, + buffer, sizeof(buffer))) { + SHELL_ArgifyW(wszApplicationName, + sizeof(wszApplicationName)/sizeof(WCHAR), + buffer, target, sei_tmp.lpIDList, NULL); + } sei_tmp.fMask &= ~SEE_MASK_INVOKEIDLIST; } }

18 years, 10 months

← Newer
1
...
49
50
51
52
53
54
55
...
59
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2006