Ros-diffs

ros-diffs@reactos.org

81390 discussions

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

13 Jul '06

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

1 0

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

13 Jul '06

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

1 0

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

13 Jul '06

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

1 0

[ion] 23038: - Add ASSERT_QUEUE macro. - Cleanup queue.c - Add some ASSERTs - Properly check for SPecialApcDisable before aborting a wait. - Fix a bug in KiWaitQueue which was causing us not to remove the queue from the thread's wait list.
by ion＠svn.reactos.org 13 Jul '06

13 Jul '06

Author: ion Date: Thu Jul 13 09:20:43 2006 New Revision: 23038 URL: http://svn.reactos.org/svn/reactos?rev=23038&view=rev Log: - Add ASSERT_QUEUE macro. - Cleanup queue.c - Add some ASSERTs - Properly check for SPecialApcDisable before aborting a wait. - Fix a bug in KiWaitQueue which was causing us not to remove the queue from the thread's wait list. Modified: trunk/reactos/include/ddk/ntifs.h trunk/reactos/ntoskrnl/ke/queue.c Modified: trunk/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=23… ============================================================================== --- trunk/reactos/include/ddk/ntifs.h (original) +++ trunk/reactos/include/ddk/ntifs.h Thu Jul 13 09:20:43 2006 @@ -1279,6 +1279,8 @@ LIST_ENTRY ThreadListHead; } KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE; +#define ASSERT_QUEUE(Q) ASSERT(((Q)->Header.Type & KOBJECT_TYPE_MASK) == QueueObject); + typedef struct _MBCB { CSHORT NodeTypeCode; CSHORT NodeIsInZone; Modified: trunk/reactos/ntoskrnl/ke/queue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/queue.c?rev=23… ============================================================================== --- trunk/reactos/ntoskrnl/ke/queue.c (original) +++ trunk/reactos/ntoskrnl/ke/queue.c Thu Jul 13 09:20:43 2006 @@ -1,38 +1,160 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/ke/queue.c * PURPOSE: Implements kernel queues - * - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) * Gunnar Dalsnes * Eric Kohl (ekohl(a)rz-online.de) */ -/* INCLUDES *****************************************************************/ +/* INCLUDES ******************************************************************/ #include <ntoskrnl.h> #define NDEBUG #include <internal/debug.h> -/* FUNCTIONS *****************************************************************/ - -LONG STDCALL KiInsertQueue(IN PKQUEUE Queue, IN PLIST_ENTRY Entry, BOOLEAN Head); - -/* - * @implemented +/* PRIVATE FUNCTIONS *********************************************************/ + +/* + * Called when a thread which has a queue entry is entering a wait state */ VOID -STDCALL +FASTCALL +KiWakeQueue(IN PKQUEUE Queue) +{ + PLIST_ENTRY QueueEntry; + PLIST_ENTRY WaitEntry; + PKWAIT_BLOCK WaitBlock; + PKTHREAD Thread; + ASSERT_QUEUE(Queue); + + /* Decrement the number of active threads */ + Queue->CurrentCount--; + + /* Make sure the counts are OK */ + if (Queue->CurrentCount < Queue->MaximumCount) + { + /* Get the Queue Entry */ + QueueEntry = Queue->EntryListHead.Flink; + + /* Get the Wait Entry */ + WaitEntry = Queue->Header.WaitListHead.Blink; + + /* Make sure that the Queue entries are not part of empty lists */ + if ((WaitEntry != &Queue->Header.WaitListHead) && + (QueueEntry != &Queue->EntryListHead)) + { + /* Remove this entry */ + RemoveEntryList(QueueEntry); + QueueEntry->Flink = NULL; + + /* Decrease the Signal State */ + Queue->Header.SignalState--; + + /* Unwait the Thread */ + WaitBlock = CONTAINING_RECORD(WaitEntry, + KWAIT_BLOCK, + WaitListEntry); + Thread = WaitBlock->Thread; + KiAbortWaitThread(Thread, (NTSTATUS)QueueEntry, IO_NO_INCREMENT); + } + } +} + +/* + * Returns the previous number of entries in the queue + */ +LONG +NTAPI +KiInsertQueue(IN PKQUEUE Queue, + IN PLIST_ENTRY Entry, + BOOLEAN Head) +{ + ULONG InitialState; + PKTHREAD Thread = KeGetCurrentThread(); + PKWAIT_BLOCK WaitBlock; + PLIST_ENTRY WaitEntry; + ASSERT_QUEUE(Queue); + + /* Save the old state */ + InitialState = Queue->Header.SignalState; + + /* Get the Entry */ + WaitEntry = Queue->Header.WaitListHead.Blink; + + /* + * Why the KeGetCurrentThread()->Queue != Queue? + * KiInsertQueue might be called from an APC for the current thread. + * -Gunnar + */ + if ((Queue->CurrentCount < Queue->MaximumCount) && + (WaitEntry != &Queue->Header.WaitListHead) && + ((Thread->Queue != Queue) || + (Thread->WaitReason != WrQueue))) + { + /* Remove the wait entry */ + RemoveEntryList(WaitEntry); + + /* Get the Wait Block and Thread */ + WaitBlock = CONTAINING_RECORD(WaitEntry, KWAIT_BLOCK, WaitListEntry); + Thread = WaitBlock->Thread; + + /* Remove the queue from the thread's wait list */ + Thread->WaitStatus = (NTSTATUS)Entry; + RemoveEntryList(&Thread->WaitListEntry); + Thread->WaitReason = 0; + + /* Increase the active threads and set the status*/ + Queue->CurrentCount++; + + /* Check if there's a Thread Timer */ + if (Thread->Timer.Header.Inserted) + { + /* Cancel the Thread Timer with the no-lock fastpath */ + Thread->Timer.Header.Inserted = FALSE; + RemoveEntryList(&Thread->Timer.TimerListEntry); + } + + /* Reschedule the Thread */ + KiUnblockThread(Thread, NULL, 0); + } + else + { + /* Increase the Entries */ + Queue->Header.SignalState++; + + /* Check which mode we're using */ + if (Head) + { + /* Insert in the head */ + InsertHeadList(&Queue->EntryListHead, Entry); + } + else + { + /* Insert at the end */ + InsertTailList(&Queue->EntryListHead, Entry); + } + } + + /* Return the previous state */ + return InitialState; +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +VOID +NTAPI KeInitializeQueue(IN PKQUEUE Queue, IN ULONG Count OPTIONAL) { - DPRINT("KeInitializeQueue %x\n", Queue); - /* Initialize the Header */ KeInitializeDispatcherHeader(&Queue->Header, QueueObject, - sizeof(KQUEUE)/sizeof(ULONG), + sizeof(KQUEUE) / sizeof(ULONG), 0); /* Initialize the Lists */ @@ -48,14 +170,14 @@ * @implemented */ LONG -STDCALL +NTAPI KeInsertHeadQueue(IN PKQUEUE Queue, IN PLIST_ENTRY Entry) { LONG PreviousState; KIRQL OldIrql; - - DPRINT("KeInsertHeadQueue %x\n", Queue); + ASSERT_QUEUE(Queue); + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Lock the Dispatcher Database */ OldIrql = KeAcquireDispatcherDatabaseLock(); @@ -73,14 +195,15 @@ /* * @implemented */ -LONG STDCALL +LONG +NTAPI KeInsertQueue(IN PKQUEUE Queue, IN PLIST_ENTRY Entry) { LONG PreviousState; KIRQL OldIrql; - - DPRINT("KeInsertQueue %x\n", Queue); + ASSERT_QUEUE(Queue); + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Lock the Dispatcher Database */ OldIrql = KeAcquireDispatcherDatabaseLock(); @@ -101,18 +224,19 @@ * Returns number of entries in the queue */ LONG -STDCALL +NTAPI KeReadStateQueue(IN PKQUEUE Queue) { /* Returns the Signal State */ - return(Queue->Header.SignalState); + ASSERT_QUEUE(Queue); + return Queue->Header.SignalState; } /* * @implemented */ PLIST_ENTRY -STDCALL +NTAPI KeRemoveQueue(IN PKQUEUE Queue, IN KPROCESSOR_MODE WaitMode, IN PLARGE_INTEGER Timeout OPTIONAL) @@ -124,50 +248,49 @@ PKQUEUE PreviousQueue; PKWAIT_BLOCK WaitBlock; PKTIMER Timer; - DPRINT("KeRemoveQueue %x\n", Queue); + ASSERT_QUEUE(Queue); + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); /* Check if the Lock is already held */ if (Thread->WaitNext) { - DPRINT("Lock is already held\n"); + /* It is, so next time don't do expect this */ Thread->WaitNext = FALSE; } else { /* Lock the Dispatcher Database */ - DPRINT("Lock not held, acquiring\n"); OldIrql = KeAcquireDispatcherDatabaseLock(); Thread->WaitIrql = OldIrql; } - /* This is needed so that we can set the new queue right here, before additional processing */ + /* + * This is needed so that we can set the new queue right here, + * before additional processing + */ PreviousQueue = Thread->Queue; Thread->Queue = Queue; /* Check if this is a different queue */ if (Queue != PreviousQueue) { - DPRINT("Different Queue\n"); + /* Get the current entry */ QueueEntry = &Thread->QueueListEntry; if (PreviousQueue) { /* Remove from this list */ - DPRINT("Removing Old Queue\n"); 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, QueueEntry); } else { /* Same queue, decrement waiting threads */ - DPRINT("Same Queue!\n"); Queue->CurrentCount--; } @@ -179,10 +302,6 @@ if ((Queue->CurrentCount < Queue->MaximumCount) && (QueueEntry != &Queue->EntryListHead)) { - /* Remove the Entry and Save it */ - DPRINT("Removing Queue Entry. CurrentCount: %d, Maximum Count: %d\n", - Queue->CurrentCount, Queue->MaximumCount); - /* Decrease the number of entries */ Queue->Header.SignalState--; @@ -204,119 +323,110 @@ } else { - /* Do the wait */ - DPRINT("Waiting on Queue Entry. CurrentCount: %d, Maximum Count: %d\n", - Queue->CurrentCount, Queue->MaximumCount); - /* Use the Thread's Wait Block, it's big enough */ Thread->WaitBlockList = &Thread->WaitBlock[0]; - /* Check if a kernel APC is pending and we were below APC_LEVEL */ + /* Check if a kernel APC is pending and we're below APC_LEVEL */ if ((Thread->ApcState.KernelApcPending) && - (Thread->WaitIrql < APC_LEVEL)) + !(Thread->SpecialApcDisable) && (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)) + else { - /* Return the status and increase the pending threads */ - QueueEntry = (PLIST_ENTRY)STATUS_USER_APC; - Queue->CurrentCount++; - - /* Nothing to wait on */ - break; - } - - /* Build the Wait Block */ - WaitBlock = &Thread->WaitBlock[0]; - WaitBlock->Object = (PVOID)Queue; - WaitBlock->WaitKey = STATUS_SUCCESS; - WaitBlock->WaitType = WaitAny; - WaitBlock->Thread = Thread; - Thread->WaitStatus = STATUS_WAIT_0; - - /* We need to wait for the object... check if we have a timeout */ - if (Timeout) - { - /* If it's zero, then don't do any waiting */ - if (!Timeout->QuadPart) + /* Fail if there's a User APC Pending */ + if ((WaitMode != KernelMode) && + (Thread->ApcState.UserApcPending)) { - /* Instant Timeout, return the status and increase the pending threads */ - DPRINT("Queue Wait has timed out\n"); - QueueEntry = (PLIST_ENTRY)STATUS_TIMEOUT; + /* Return the status and increase the pending threads */ + QueueEntry = (PLIST_ENTRY)STATUS_USER_APC; Queue->CurrentCount++; - - /* Nothing to wait on */ break; } - /* - * Set up the Timer. We'll use the internal function so that we can - * hold on to the dispatcher lock. - */ - Timer = &Thread->Timer; - WaitBlock->NextWaitBlock = &Thread->WaitBlock[1]; - WaitBlock = &Thread->WaitBlock[1]; - - /* Set up the Timer Wait Block */ - WaitBlock->Object = (PVOID)Timer; + /* Build the Wait Block */ + WaitBlock = &Thread->WaitBlock[0]; + WaitBlock->Object = (PVOID)Queue; + WaitBlock->WaitKey = STATUS_SUCCESS; + WaitBlock->WaitType = WaitAny; WaitBlock->Thread = Thread; - WaitBlock->WaitKey = STATUS_TIMEOUT; - WaitBlock->WaitType = WaitAny; - - /* Link the timer to this Wait Block */ - Timer->Header.WaitListHead.Flink = &WaitBlock->WaitListEntry; - Timer->Header.WaitListHead.Blink = &WaitBlock->WaitListEntry; - - /* Create Timer */ - DPRINT("Creating Timer with timeout %I64d\n", *Timeout); - KiInsertTimer(Timer, *Timeout); + Thread->WaitStatus = STATUS_WAIT_0; + + /* We need to wait for the object... check for a timeout */ + if (Timeout) + { + /* Check if it's zero */ + if (!Timeout->QuadPart) + { + /* Don't wait. Return and increase pending threads */ + QueueEntry = (PLIST_ENTRY)STATUS_TIMEOUT; + Queue->CurrentCount++; + break; + } + + /* + * Set up the Timer. We'll use the internal function so + * that we can hold on to the dispatcher lock. + */ + Timer = &Thread->Timer; + WaitBlock->NextWaitBlock = &Thread->WaitBlock[1]; + WaitBlock = &Thread->WaitBlock[1]; + + /* Set up the Timer Wait Block */ + WaitBlock->Object = (PVOID)Timer; + WaitBlock->Thread = Thread; + WaitBlock->WaitKey = STATUS_TIMEOUT; + WaitBlock->WaitType = WaitAny; + + /* Link the timer to this Wait Block */ + Timer->Header.WaitListHead.Flink = + &WaitBlock->WaitListEntry; + Timer->Header.WaitListHead.Blink = + &WaitBlock->WaitListEntry; + + /* Create Timer */ + KiInsertTimer(Timer, *Timeout); + } + + /* Close the loop */ + WaitBlock->NextWaitBlock = &Thread->WaitBlock[0]; + + /* Insert the wait block into the Queues's wait list */ + WaitBlock = &Thread->WaitBlock[0]; + InsertTailList(&Queue->Header.WaitListHead, + &WaitBlock->WaitListEntry); + + /* Setup the wait information */ + Thread->WaitMode = WaitMode; + Thread->WaitReason = WrQueue; + Thread->Alertable = FALSE; + Thread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart; + Thread->State = Waiting; + + /* Find a new thread to run */ + Status = KiSwapThread(); + + /* Reset the wait reason */ + Thread->WaitReason = 0; + + /* Check if we were executing an APC */ + if (Status != STATUS_KERNEL_APC) + { + /* Done Waiting */ + return (PLIST_ENTRY)Status; + } + + /* Check if we had a timeout */ + if (Timeout) + { + /* FIXME: Fixup interval */ + DPRINT1("FIXME!!!\n"); + } } - /* Close the loop */ - WaitBlock->NextWaitBlock = &Thread->WaitBlock[0]; - - /* Insert the wait block into the Queues's wait list */ - WaitBlock = &Thread->WaitBlock[0]; - InsertTailList(&Queue->Header.WaitListHead, - &WaitBlock->WaitListEntry); - - /* Setup the wait information */ - Thread->WaitMode = WaitMode; - Thread->WaitReason = WrQueue; - Thread->Alertable = FALSE; - Thread->WaitTime = ((PLARGE_INTEGER)&KeTickCount)->LowPart; - Thread->State = Waiting; - - /* Find a new thread to run */ - DPRINT("Swapping threads\n"); - Status = KiSwapThread(); - - /* Reset the wait reason */ - Thread->WaitReason = 0; - - /* Check if we were executing an 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"); + /* Reacquire the lock */ OldIrql = KeAcquireDispatcherDatabaseLock(); /* Save the new IRQL and decrease number of waiting threads */ @@ -327,8 +437,6 @@ /* Unlock Database and return */ KeReleaseDispatcherDatabaseLock(Thread->WaitIrql); - DPRINT("Returning. CurrentCount: %d, Maximum Count: %d\n", - Queue->CurrentCount, Queue->MaximumCount); return QueueEntry; } @@ -336,15 +444,16 @@ * @implemented */ PLIST_ENTRY -STDCALL +NTAPI KeRundownQueue(IN PKQUEUE Queue) { PLIST_ENTRY EnumEntry; PLIST_ENTRY FirstEntry = NULL; PKTHREAD Thread; KIRQL OldIrql; - - DPRINT("KeRundownQueue(Queue %x)\n", Queue); + ASSERT_QUEUE(Queue); + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); + ASSERT(IsListEmpty(&Queue->Header.WaitListHead)); /* Get the Dispatcher Lock */ OldIrql = KeAcquireDispatcherDatabaseLock(); @@ -374,137 +483,4 @@ return FirstEntry; } -/* - * Called when a thread which has a queue entry is entering a wait state - */ -VOID -FASTCALL -KiWakeQueue(IN PKQUEUE Queue) -{ - 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) - { - /* Get the Queue Entry */ - QueueEntry = Queue->EntryListHead.Flink; - - /* Get the Wait Entry */ - WaitEntry = Queue->Header.WaitListHead.Blink; - DPRINT("Queue Count is ok; entries: %p, %p\n", QueueEntry, WaitEntry); - - /* 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); - QueueEntry->Flink = NULL; - - /* Decrease the Signal State */ - Queue->Header.SignalState--; - - /* Unwait the Thread */ - WaitBlock = CONTAINING_RECORD(WaitEntry, - KWAIT_BLOCK, - WaitListEntry); - Thread = WaitBlock->Thread; - DPRINT1("Unwaiting Thread: %d\n", Thread->State); - KiAbortWaitThread(Thread, (NTSTATUS)QueueEntry, IO_NO_INCREMENT); - } - } -} - -/* - * Returns the previous number of entries in the queue - */ -LONG -STDCALL -KiInsertQueue(IN PKQUEUE Queue, - IN PLIST_ENTRY Entry, - BOOLEAN Head) -{ - ULONG InitialState; - PKTHREAD Thread = KeGetCurrentThread(); - PKWAIT_BLOCK WaitBlock; - PLIST_ENTRY WaitEntry; - DPRINT("KiInsertQueue(Queue %x, Entry %x)\n", Queue, Entry); - - /* Save the old state */ - InitialState = Queue->Header.SignalState; - - /* Get the Entry */ - WaitEntry = Queue->Header.WaitListHead.Blink; - DPRINT("Initial State, WaitEntry: %d, %x\n", InitialState, WaitEntry); - - /* - * Why the KeGetCurrentThread()->Queue != Queue? - * KiInsertQueue might be called from an APC for the current thread. - * -Gunnar - */ - if ((Queue->CurrentCount < Queue->MaximumCount) && - (WaitEntry != &Queue->Header.WaitListHead) && - ((Thread->Queue != Queue) || (Thread->WaitReason != WrQueue))) - { - /* Remove the wait entry */ - DPRINT("Removing Entry\n"); - RemoveEntryList(WaitEntry); - - /* Get the Wait Block and Thread */ - WaitBlock = CONTAINING_RECORD(WaitEntry, KWAIT_BLOCK, WaitListEntry); - DPRINT("Got wait block: %x\n", WaitBlock); - Thread = WaitBlock->Thread; - - /* Reset the wait reason */ - Thread->WaitReason = 0; - - /* Increase the active threads and set the status*/ - Queue->CurrentCount++; - Thread->WaitStatus = (NTSTATUS)Entry; - - /* Check if there's a Thread Timer */ - 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; - RemoveEntryList(&Thread->Timer.TimerListEntry); - } - - /* Reschedule the Thread */ - DPRINT("Unblocking the Thread\n"); - KiUnblockThread(Thread, (PNTSTATUS)&Entry, 0); - } - else - { - /* Increase the Entries */ - DPRINT("Adding new Queue Entry: %d %d\n", Head, Queue->Header.SignalState); - Queue->Header.SignalState++; - - /* Check which mode we're using */ - if (Head) - { - /* Insert in the head */ - InsertHeadList(&Queue->EntryListHead, Entry); - } - else - { - /* Insert at the end */ - InsertTailList(&Queue->EntryListHead, Entry); - } - } - - /* Return the previous state */ - DPRINT("Returning\n"); - return InitialState; -} - /* EOF */

1 0

[jimtabor] 23036: -User32: Consolidated InsertMenu and ModifyMenu A&W flags processing. Misc changes too, some based on wine.
by jimtabor＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: jimtabor Date: Thu Jul 13 02:43:45 2006 New Revision: 23036 URL: http://svn.reactos.org/svn/reactos?rev=23036&view=rev Log: -User32: Consolidated InsertMenu and ModifyMenu A&W flags processing. Misc changes too, some based on wine. Modified: trunk/reactos/dll/win32/user32/windows/menu.c Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c Thu Jul 13 02:43:45 2006 @@ -234,7 +234,7 @@ if (MENU_ITEM_TYPE(ItemInfo->fType) == MF_STRING && ItemInfo->dwTypeData != NULL) { - ItemInfo->cch = wcslen(ItemInfo->dwTypeData); + ItemInfo->cch = strlenW(ItemInfo->dwTypeData); } ItemInfo->fMask = MIIM_BITMAP | MIIM_CHECKMARKS | MIIM_DATA | MIIM_FTYPE | MIIM_ID | MIIM_STATE | MIIM_STRING | MIIM_SUBMENU | MIIM_TYPE; @@ -1044,7 +1044,7 @@ /* Align the text on a word boundary. */ res += (~((int)res - 1)) & 1; mii.dwTypeData = (LPWSTR) res; - res += (1 + wcslen(mii.dwTypeData)) * sizeof(WCHAR); + res += (1 + strlenW(mii.dwTypeData)) * sizeof(WCHAR); /* Align the following fields on a dword boundary. */ res += (~((int)res - 1)) & 3; @@ -1109,7 +1109,7 @@ if(!unicode) res += strlen(str) + 1; else - res += (wcslen((LPCWSTR)str) + 1) * sizeof(WCHAR); + res += (strlenW((LPCWSTR)str) + 1) * sizeof(WCHAR); if (flags & MF_POPUP) { hSubMenu = CreatePopupMenu(); @@ -1314,7 +1314,7 @@ SIZE Size; GetTextExtentPoint32W(Dc, (LPWSTR) ItemInfo->dwTypeData, - wcslen((LPWSTR) ItemInfo->dwTypeData), &Size); + strlenW((LPWSTR) ItemInfo->dwTypeData), &Size); ItemInfo->Rect.right += Size.cx; ItemInfo->Rect.bottom += max(Size.cy, GetSystemMetrics(SM_CYMENU) - 1); @@ -3119,7 +3119,7 @@ } if (! ForceMenuChar) { - Key = towupper(Key); + Key = toupperW(Key); ItemInfo = Items; for (i = 0; i < MenuInfo->MenuItemCount; i++, ItemInfo++) { @@ -3128,10 +3128,10 @@ WCHAR *p = (WCHAR *) ItemInfo->dwTypeData - 2; do { - p = wcschr(p + 2, '&'); + p = strchrW(p + 2, '&'); } while (NULL != p && L'&' == p[1]); - if (NULL != p && (towupper(p[1]) == Key)) + if (NULL != p && (toupperW(p[1]) == Key)) { return i; } @@ -3570,6 +3570,110 @@ { } + +static +BOOL +FASTCALL +MenuSetItemData( + LPMENUITEMINFOW mii, + UINT Flags, + UINT_PTR IDNewItem, + LPCWSTR NewItem, + BOOL Unicode) +{ + if(Flags & MF_BITMAP) + { + mii->fType |= MFT_BITMAP; + mii->fMask |= MIIM_BITMAP; + mii->hbmpItem = (HBITMAP) NewItem; + } + else if(Flags & MF_OWNERDRAW) + { + mii->fType |= MFT_OWNERDRAW; + mii->fMask |= MIIM_DATA; + mii->dwItemData = (DWORD) NewItem; + } + else /* Default action MF_STRING. */ + { + /* + if(mii->dwTypeData != NULL) + { + HeapFree(GetProcessHeap(),0, mii.dwTypeData); + }*/ + /* Item beginning with a backspace is a help item */ + if (NewItem != NULL) + { + if (Unicode) + { + if (*NewItem == '\b') + { + mii->fType |= MF_HELP; + NewItem++; + } + } + else + { + LPCSTR NewItemA = (LPCSTR) NewItem; + if (*NewItemA == '\b') + { + mii->fType |= MF_HELP; + NewItemA++; + NewItem = (LPCWSTR) NewItemA; + } + } + } + else + { + mii->fType |= MFT_SEPARATOR; + } + mii->fMask |= MIIM_TYPE; + mii->dwTypeData = (LPWSTR)NewItem; + if (Unicode) + mii->cch = (NULL == NewItem ? 0 : strlenW(NewItem)); + else + mii->cch = (NULL == NewItem ? 0 : strlen((LPCSTR)NewItem)); + mii->hbmpItem = NULL; + } + + if(Flags & MF_RIGHTJUSTIFY) + { + mii->fType |= MFT_RIGHTJUSTIFY; + } + if(Flags & MF_MENUBREAK) + { + mii->fType |= MFT_MENUBREAK; + } + if(Flags & MF_MENUBARBREAK) + { + mii->fType |= MFT_MENUBARBREAK; + } + if(Flags & MF_DISABLED) + { + mii->fState |= MFS_DISABLED; + } + if(Flags & MF_GRAYED) + { + mii->fState |= MFS_GRAYED; + } + + if ((mii->fType & MF_POPUP) && (Flags & MF_POPUP) && (mii->hSubMenu != (HMENU)IDNewItem)) + NtUserDestroyMenu( mii->hSubMenu ); /* ModifyMenu() spec */ + + if(Flags & MF_POPUP) + { + mii->fType |= MF_POPUP; + mii->fMask |= MIIM_SUBMENU; + mii->hSubMenu = (HMENU)IDNewItem; + } + else + { + mii->fMask |= MIIM_ID; + mii->wID = (UINT)IDNewItem; + } + return TRUE; +} + + /* FUNCTIONS *****************************************************************/ /*static BOOL @@ -4101,6 +4205,7 @@ } + /* * @implemented */ @@ -4119,59 +4224,15 @@ mii.fType = 0; mii.fState = MFS_ENABLED; - if(uFlags & MF_BITMAP) - { - mii.fType |= MFT_BITMAP; - mii.fMask |= MIIM_BITMAP; - mii.hbmpItem = (HBITMAP) lpNewItem; - } - else if(uFlags & MF_OWNERDRAW) - { - mii.fType |= MFT_OWNERDRAW; - mii.fMask |= MIIM_DATA; - mii.dwItemData = (DWORD) lpNewItem; - } - else - { - mii.fMask |= MIIM_TYPE; - mii.dwTypeData = (LPSTR)lpNewItem; - mii.cch = (NULL == lpNewItem ? 0 : strlen(lpNewItem)); - } - - if(uFlags & MF_RIGHTJUSTIFY) - { - mii.fType |= MFT_RIGHTJUSTIFY; - } - if(uFlags & MF_MENUBREAK) - { - mii.fType |= MFT_MENUBREAK; - } - if(uFlags & MF_MENUBARBREAK) - { - mii.fType |= MFT_MENUBARBREAK; - } - if(uFlags & MF_DISABLED) - { - mii.fState |= MFS_DISABLED; - } - if(uFlags & MF_GRAYED) - { - mii.fState |= MFS_GRAYED; - } - - if(uFlags & MF_POPUP) - { - mii.fType |= MF_POPUP; - mii.fMask |= MIIM_SUBMENU; - mii.hSubMenu = (HMENU)uIDNewItem; - } - else - { - mii.fMask |= MIIM_ID; - mii.wID = (UINT)uIDNewItem; - } + MenuSetItemData((LPMENUITEMINFOW) &mii, + uFlags, + uIDNewItem, + (LPCWSTR) lpNewItem, + FALSE); + return InsertMenuItemA(hMenu, uPosition, (BOOL)((MF_BYPOSITION & uFlags) > 0), &mii); } + /* @@ -4278,57 +4339,12 @@ mii.fType = 0; mii.fState = MFS_ENABLED; - if(uFlags & MF_BITMAP) - { - mii.fType |= MFT_BITMAP; - mii.fMask |= MIIM_BITMAP; - mii.hbmpItem = (HBITMAP) lpNewItem; - } - else if(uFlags & MF_OWNERDRAW) - { - mii.fType |= MFT_OWNERDRAW; - mii.fMask |= MIIM_DATA; - mii.dwItemData = (DWORD) lpNewItem; - } - else - { - mii.fMask |= MIIM_TYPE; - mii.dwTypeData = (LPWSTR)lpNewItem; - mii.cch = (NULL == lpNewItem ? 0 : wcslen(lpNewItem)); - } - - if(uFlags & MF_RIGHTJUSTIFY) - { - mii.fType |= MFT_RIGHTJUSTIFY; - } - if(uFlags & MF_MENUBREAK) - { - mii.fType |= MFT_MENUBREAK; - } - if(uFlags & MF_MENUBARBREAK) - { - mii.fType |= MFT_MENUBARBREAK; - } - if(uFlags & MF_DISABLED) - { - mii.fState |= MFS_DISABLED; - } - if(uFlags & MF_GRAYED) - { - mii.fState |= MFS_GRAYED; - } - - if(uFlags & MF_POPUP) - { - mii.fType |= MF_POPUP; - mii.fMask |= MIIM_SUBMENU; - mii.hSubMenu = (HMENU)uIDNewItem; - } - else - { - mii.fMask |= MIIM_ID; - mii.wID = (UINT)uIDNewItem; - } + MenuSetItemData( &mii, + uFlags, + uIDNewItem, + lpNewItem, + TRUE); + return InsertMenuItemW(hMenu, uPosition, (BOOL)((MF_BYPOSITION & uFlags) > 0), &mii); } @@ -4469,73 +4485,11 @@ (BOOL)(MF_BYPOSITION & uFlags), &mii)) return FALSE; - if(uFlags & MF_BITMAP) - { - mii.fType |= MFT_BITMAP; - mii.fMask |= MIIM_BITMAP; - mii.hbmpItem = (HBITMAP) lpNewItem; - } - else if(uFlags & MF_OWNERDRAW) - { - mii.fType |= MFT_OWNERDRAW; - mii.fMask |= MIIM_DATA; - mii.dwItemData = (DWORD) lpNewItem; - } - else /* Default action MF_STRING. */ - { - if(mii.dwTypeData != NULL) - { - HeapFree(GetProcessHeap(),0, mii.dwTypeData); - } - /* Item beginning with a backspace is a help item */ - if (lpNewItem != NULL) - { - if (*lpNewItem == '\b') - { - mii.fType |= MF_HELP; - lpNewItem++; - } - } - mii.fMask |= MIIM_TYPE; - mii.dwTypeData = (LPSTR)lpNewItem; - mii.cch = (NULL == lpNewItem ? 0 : strlen(lpNewItem)); - } - - if(uFlags & MF_RIGHTJUSTIFY) - { - mii.fType |= MFT_RIGHTJUSTIFY; - } - if(uFlags & MF_MENUBREAK) - { - mii.fType |= MFT_MENUBREAK; - } - if(uFlags & MF_MENUBARBREAK) - { - mii.fType |= MFT_MENUBARBREAK; - } - if(uFlags & MF_DISABLED) - { - mii.fState |= MFS_DISABLED; - } - if(uFlags & MF_GRAYED) - { - mii.fState |= MFS_GRAYED; - } - - if ((mii.fType & MF_POPUP) && (uFlags & MF_POPUP) && (mii.hSubMenu != (HMENU)uIDNewItem)) - NtUserDestroyMenu( mii.hSubMenu ); /* ModifyMenu() spec */ - - if(uFlags & MF_POPUP) - { - mii.fType |= MF_POPUP; - mii.fMask |= MIIM_SUBMENU; - mii.hSubMenu = (HMENU)uIDNewItem; - } - else - { - mii.fMask |= MIIM_ID; - mii.wID = (UINT)uIDNewItem; - } + MenuSetItemData((LPMENUITEMINFOW) &mii, + uFlags, + uIDNewItem, + (LPCWSTR) lpNewItem, + FALSE); return SetMenuItemInfoA( hMnu, uPosition, @@ -4568,73 +4522,11 @@ (PROSMENUITEMINFO) &mii, FALSE)) return FALSE; - if(uFlags & MF_BITMAP) - { - mii.fType |= MFT_BITMAP; - mii.fMask |= MIIM_BITMAP; - mii.hbmpItem = (HBITMAP) lpNewItem; - } - else if(uFlags & MF_OWNERDRAW) - { - mii.fType |= MFT_OWNERDRAW; - mii.fMask |= MIIM_DATA; - mii.dwItemData = (DWORD) lpNewItem; - } - else - { - /* - if(mii.dwTypeData != NULL) - { - HeapFree(GetProcessHeap(),0, mii.dwTypeData); - } */ - if (lpNewItem != NULL) - { - if (*lpNewItem == '\b') - { - mii.fType |= MF_HELP; - lpNewItem++; - } - } - mii.fMask |= MIIM_TYPE; - mii.dwTypeData = (LPWSTR)lpNewItem; - mii.cch = (NULL == lpNewItem ? 0 : wcslen(lpNewItem)); - } - - if(uFlags & MF_RIGHTJUSTIFY) - { - mii.fType |= MFT_RIGHTJUSTIFY; - } - if(uFlags & MF_MENUBREAK) - { - mii.fType |= MFT_MENUBREAK; - } - if(uFlags & MF_MENUBARBREAK) - { - mii.fType |= MFT_MENUBARBREAK; - } - if(uFlags & MF_DISABLED) - { - mii.fState |= MFS_DISABLED; - } - if(uFlags & MF_GRAYED) - { - mii.fState |= MFS_GRAYED; - } - - if ((mii.fType & MF_POPUP) && (uFlags & MF_POPUP) && (mii.hSubMenu != (HMENU)uIDNewItem)) - NtUserDestroyMenu( mii.hSubMenu ); - - if(uFlags & MF_POPUP) - { - mii.fType |= MF_POPUP; - mii.fMask |= MIIM_SUBMENU; - mii.hSubMenu = (HMENU)uIDNewItem; - } - else - { - mii.fMask |= MIIM_ID; - mii.wID = (UINT)uIDNewItem; - } + MenuSetItemData( &mii, + uFlags, + uIDNewItem, + lpNewItem, + TRUE); return SetMenuItemInfoW( hMnu, uPosition, @@ -4792,7 +4684,7 @@ RtlCopyMemory(&MenuItemInfoW, lpmii, min(lpmii->cbSize, sizeof(MENUITEMINFOW))); if (0 != (MenuItemInfoW.fMask & MIIM_STRING)) { - MenuItemInfoW.cch = wcslen(MenuItemInfoW.dwTypeData); + MenuItemInfoW.cch = strlenW(MenuItemInfoW.dwTypeData); } return NtUserMenuItemInfo(hMenu, uItem, fByPosition,

1 0

[gedmurphy] 23035: DIALOG -> DIALOGEX to correctly handle MS Shell Dlg
by gedmurphy＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: gedmurphy Date: Thu Jul 13 01:52:08 2006 New Revision: 23035 URL: http://svn.reactos.org/svn/reactos?rev=23035&view=rev Log: DIALOG -> DIALOGEX to correctly handle MS Shell Dlg Modified: trunk/reactos/dll/win32/newdev/De.rc trunk/reactos/dll/win32/newdev/En.rc trunk/reactos/dll/win32/newdev/Es.rc trunk/reactos/dll/win32/newdev/Fr.rc trunk/reactos/dll/win32/newdev/Hu.rc trunk/reactos/dll/win32/newdev/Ru.rc Modified: trunk/reactos/dll/win32/newdev/De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/De.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/newdev/De.rc (original) +++ trunk/reactos/dll/win32/newdev/De.rc Thu Jul 13 01:52:08 2006 @@ -1,6 +1,6 @@ LANGUAGE LANG_GERMAN, SUBLANG_GERMAN -IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hardwareinstallation" @@ -18,7 +18,7 @@ "Button",BS_AUTORADIOBUTTON,120,133,164,14 END -IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hardwareinstallation" @@ -33,7 +33,7 @@ BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 END -IDD_INSTALLFAILED DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hardwareinstallation" @@ -45,7 +45,7 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11 END -IDD_CHSOURCE DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hardwareinstallation" FONT 8, "MS Shell Dlg" @@ -63,7 +63,7 @@ WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL END -IDD_SEARCHDRV DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hardwareinstallation" FONT 8, "MS Shell Dlg" @@ -71,7 +71,7 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,51,20,169,16 END -IDD_INSTALLDRV DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hardwareinstallation" FONT 8, "MS Shell Dlg" @@ -79,7 +79,7 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,51,20,169,16 END -IDD_NEEDREBOOT DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" @@ -93,7 +93,7 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 END -IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hardwareinstallation" Modified: trunk/reactos/dll/win32/newdev/En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/En.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/newdev/En.rc (original) +++ trunk/reactos/dll/win32/newdev/En.rc Thu Jul 13 01:52:08 2006 @@ -1,6 +1,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" @@ -18,7 +18,7 @@ "Button",BS_AUTORADIOBUTTON,120,133,164,14 END -IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" @@ -33,7 +33,7 @@ BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 END -IDD_INSTALLFAILED DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" @@ -45,7 +45,7 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11 END -IDD_CHSOURCE DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" FONT 8, "MS Shell Dlg" @@ -63,7 +63,7 @@ WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL END -IDD_SEARCHDRV DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" FONT 8, "MS Shell Dlg" @@ -71,7 +71,7 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,51,20,169,16 END -IDD_INSTALLDRV DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" FONT 8, "MS Shell Dlg" @@ -79,7 +79,7 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,51,20,169,16 END -IDD_NEEDREBOOT DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" @@ -93,7 +93,7 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 END -IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" Modified: trunk/reactos/dll/win32/newdev/Es.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/Es.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/newdev/Es.rc (original) +++ trunk/reactos/dll/win32/newdev/Es.rc Thu Jul 13 01:52:08 2006 @@ -1,6 +1,6 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL -IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalación de Dispositivos" @@ -18,7 +18,7 @@ "Button",BS_AUTORADIOBUTTON,120,133,164,14 END -IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalación de Dispositivos" @@ -33,7 +33,7 @@ BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 END -IDD_INSTALLFAILED DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" @@ -45,7 +45,7 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11 END -IDD_CHSOURCE DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Instalación de Dispositivos" FONT 8, "MS Shell Dlg" @@ -63,7 +63,7 @@ WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL END -IDD_SEARCHDRV DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" FONT 8, "MS Shell Dlg" @@ -71,7 +71,7 @@ LTEXT "DISPOSITIVO DESCONOCIDO",IDC_DEVICE,51,20,169,16 END -IDD_INSTALLDRV DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" FONT 8, "MS Shell Dlg" @@ -79,7 +79,7 @@ LTEXT "DISPOSITIVO DESCONOCIDO",IDC_DEVICE,51,20,169,16 END -IDD_NEEDREBOOT DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" @@ -93,7 +93,7 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 END -IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" Modified: trunk/reactos/dll/win32/newdev/Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/Fr.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/newdev/Fr.rc (original) +++ trunk/reactos/dll/win32/newdev/Fr.rc Thu Jul 13 01:52:08 2006 @@ -1,6 +1,6 @@ LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL -IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installation de matériel" @@ -18,7 +18,7 @@ "Button",BS_AUTORADIOBUTTON,115,133,164,14 END -IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installation de matériel" @@ -33,7 +33,7 @@ BS_AUTOCHECKBOX | WS_TABSTOP,114,170,180,11 END -IDD_INSTALLFAILED DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installation de matériel" @@ -45,7 +45,7 @@ LTEXT "Matériel inconnu",IDC_DEVICE,134,55,164,11 END -IDD_CHSOURCE DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installation de matériel" FONT 8, "MS Shell Dlg" @@ -63,7 +63,7 @@ WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL END -IDD_SEARCHDRV DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installation de matériel" FONT 8, "MS Shell Dlg" @@ -71,7 +71,7 @@ LTEXT "MATERIEL INCONNU",IDC_DEVICE,51,20,169,16 END -IDD_INSTALLDRV DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installation de matériel" FONT 8, "MS Shell Dlg" @@ -79,7 +79,7 @@ LTEXT "MATERIEL INCONNU",IDC_DEVICE,51,20,169,16 END -IDD_NEEDREBOOT DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" @@ -93,7 +93,7 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 END -IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Installation de matériel" Modified: trunk/reactos/dll/win32/newdev/Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/Hu.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/newdev/Hu.rc (original) +++ trunk/reactos/dll/win32/newdev/Hu.rc Thu Jul 13 01:52:08 2006 @@ -1,7 +1,7 @@ // Hungarian resource file by Robert Horvath - talley at cubeclub.hu LANGUAGE LANG_HUNGARIAN, SUBLANG_NEUTRAL -IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hardver telepítõ" @@ -19,7 +19,7 @@ "Button",BS_AUTORADIOBUTTON,120,133,164,14 END -IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hardver telepítõ" @@ -34,7 +34,7 @@ BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 END -IDD_INSTALLFAILED DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" @@ -46,7 +46,7 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11 END -IDD_CHSOURCE DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hardver telepítõ" FONT 8, "MS Shell Dlg" @@ -64,7 +64,7 @@ WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL END -IDD_SEARCHDRV DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hardver telepítõ" FONT 8, "MS Shell Dlg" @@ -72,7 +72,7 @@ LTEXT "Ismeretlen eszköz!",IDC_DEVICE,51,20,169,16 END -IDD_INSTALLDRV DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hardver telepítõ" FONT 8, "MS Shell Dlg" @@ -80,7 +80,7 @@ LTEXT "Ismeretlen eszköz!",IDC_DEVICE,51,20,169,16 END -IDD_NEEDREBOOT DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" @@ -94,7 +94,7 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 END -IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Hardver telepítõ" Modified: trunk/reactos/dll/win32/newdev/Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/Ru.rc?rev… ============================================================================== --- trunk/reactos/dll/win32/newdev/Ru.rc (original) +++ trunk/reactos/dll/win32/newdev/Ru.rc Thu Jul 13 01:52:08 2006 @@ -1,6 +1,6 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT -IDD_WELCOMEPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_WELCOMEPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Óñòàíîâêà îáîðóäîâàíèÿ" @@ -18,7 +18,7 @@ "Button",BS_AUTORADIOBUTTON,120,133,164,14 END -IDD_NODRIVER DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_NODRIVER DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Óñòàíîâêà îáîðóäîâàíèÿ" @@ -33,7 +33,7 @@ BS_AUTOCHECKBOX | WS_TABSTOP,120,170,180,11 END -IDD_INSTALLFAILED DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_INSTALLFAILED DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" @@ -45,7 +45,7 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,134,55,164,11 END -IDD_CHSOURCE DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_CHSOURCE DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Óñòàíîâêà îáîðóäîâàíèÿ" FONT 8, "MS Shell Dlg" @@ -63,7 +63,7 @@ WS_VSCROLL | WS_TABSTOP | CBS_AUTOHSCROLL END -IDD_SEARCHDRV DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_SEARCHDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Óñòàíîâêà îáîðóäîâàíèÿ" FONT 8, "MS Shell Dlg" @@ -71,7 +71,7 @@ LTEXT "Íåèçâåñòíîå óñòðîéñòâî",IDC_DEVICE,51,20,169,16 END -IDD_INSTALLDRV DIALOG DISCARDABLE 0, 0, 317, 143 +IDD_INSTALLDRV DIALOGEX DISCARDABLE 0, 0, 317, 143 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Óñòàíîâêà îáîðóäîâàíèÿ" FONT 8, "MS Shell Dlg" @@ -79,7 +79,7 @@ LTEXT "Íåèçâåñòíîå óñòðîéñòâî",IDC_DEVICE,51,20,169,16 END -IDD_NEEDREBOOT DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_NEEDREBOOT DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Device installation" @@ -93,7 +93,7 @@ LTEXT "UNKNOWN DEVICE",IDC_DEVICE,148,53,147,12 END -IDD_FINISHPAGE DIALOG DISCARDABLE 0, 0, 317, 193 +IDD_FINISHPAGE DIALOGEX DISCARDABLE 0, 0, 317, 193 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Óñòàíîâêà îáîðóäîâàíèÿ"

1 0

[greatlrd] 23034: patch from w3seek :Bug #: 1669 : Probing macros improvements and fixes
by greatlrd＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: greatlrd Date: Thu Jul 13 01:42:08 2006 New Revision: 23034 URL: http://svn.reactos.org/svn/reactos?rev=23034&view=rev Log: patch from w3seek :Bug #: 1669 : Probing macros improvements and fixes Modified: trunk/reactos/include/reactos/probe.h Modified: trunk/reactos/include/reactos/probe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/probe.h?re… ============================================================================== --- trunk/reactos/include/reactos/probe.h (original) +++ trunk/reactos/include/reactos/probe.h Thu Jul 13 01:42:08 2006 @@ -40,20 +40,19 @@ #define ProbeForWriteInt(Ptr) ProbeForWriteGenericType(Ptr, INT) #define ProbeForWriteUlonglong(Ptr) ProbeForWriteGenericType(Ptr, ULONGLONG) #define ProbeForWriteLonglong(Ptr) ProbeForWriteGenericType(Ptr, LONGLONG) -#define ProbeForWriteLonglong(Ptr) ProbeForWriteGenericType(Ptr, LONGLONG) #define ProbeForWritePointer(Ptr) ProbeForWriteGenericType(Ptr, PVOID) #define ProbeForWriteHandle(Ptr) ProbeForWriteGenericType(Ptr, HANDLE) #define ProbeForWriteLangid(Ptr) ProbeForWriteGenericType(Ptr, LANGID) #define ProbeForWriteSize_t(Ptr) ProbeForWriteGenericType(Ptr, SIZE_T) -#define ProbeForWriteLargeInteger(Ptr) ProbeForWriteGenericType(&(Ptr)->QuadPart, LONGLONG) -#define ProbeForWriteUlargeInteger(Ptr) ProbeForWriteGenericType(&(Ptr)->QuadPart, ULONGLONG) -#define ProbeForWriteUnicodeString(Ptr) ProbeForWriteGenericType(Ptr, UNICODE_STRING) +#define ProbeForWriteLargeInteger(Ptr) ProbeForWriteGenericType(&((PLARGE_INTEGER)Ptr)->QuadPart, LONGLONG) +#define ProbeForWriteUlargeInteger(Ptr) ProbeForWriteGenericType(&((PULARGE_INTEGER)Ptr)->QuadPart, ULONGLONG) +#define ProbeForWriteUnicodeString(Ptr) ProbeForWriteGenericType((PUNICODE_STRING)Ptr, UNICODE_STRING) #define ProbeForReadGenericType(Ptr, Type, Default) \ (((ULONG_PTR)(Ptr) + sizeof(Type) - 1 < (ULONG_PTR)(Ptr) || \ (ULONG_PTR)(Ptr) + sizeof(Type) - 1 >= (ULONG_PTR)MmUserProbeAddress) ? \ ExRaiseStatus (STATUS_ACCESS_VIOLATION), Default : \ - *(Type *)(Ptr)) + *(const volatile Type *)(Ptr)) #define ProbeForReadBoolean(Ptr) ProbeForReadGenericType(Ptr, BOOLEAN, FALSE) #define ProbeForReadUchar(Ptr) ProbeForReadGenericType(Ptr, UCHAR, 0) @@ -70,9 +69,9 @@ #define ProbeForReadHandle(Ptr) ProbeForReadGenericType(Ptr, HANDLE, NULL) #define ProbeForReadLangid(Ptr) ProbeForReadGenericType(Ptr, LANGID, 0) #define ProbeForReadSize_t(Ptr) ProbeForReadGenericType(Ptr, SIZE_T, 0) -#define ProbeForReadLargeInteger(Ptr) ProbeForReadGenericType(Ptr, LARGE_INTEGER, __emptyLargeInteger) -#define ProbeForReadUlargeInteger(Ptr) ProbeForReadGenericType(Ptr, ULARGE_INTEGER, __emptyULargeInteger) -#define ProbeForReadUnicodeString(Ptr) ProbeForReadGenericType(Ptr, UNICODE_STRING, __emptyUnicodeString) +#define ProbeForReadLargeInteger(Ptr) ProbeForReadGenericType((const LARGE_INTEGER *)(Ptr), LARGE_INTEGER, __emptyLargeInteger) +#define ProbeForReadUlargeInteger(Ptr) ProbeForReadGenericType((const ULARGE_INTEGER *)(Ptr), ULARGE_INTEGER, __emptyULargeInteger) +#define ProbeForReadUnicodeString(Ptr) ProbeForReadGenericType((const UNICODE_STRING *)(Ptr), UNICODE_STRING, __emptyUnicodeString) #define ProbeAndZeroHandle(Ptr) \ do { \ @@ -91,7 +90,7 @@ NTAPI ProbeAndCaptureUnicodeString(OUT PUNICODE_STRING Dest, IN KPROCESSOR_MODE CurrentMode, - IN PUNICODE_STRING UnsafeSrc) + IN const UNICODE_STRING *UnsafeSrc) { NTSTATUS Status = STATUS_SUCCESS; WCHAR *Buffer = NULL;

1 0

[greatlrd] 23033: patch from w3seek : Bug#: 1671 : RTL: Fix checking the SACL data area in the Win64 version of RtlSelfRelativeToAbsoluteSD2
by greatlrd＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: greatlrd Date: Thu Jul 13 01:36:05 2006 New Revision: 23033 URL: http://svn.reactos.org/svn/reactos?rev=23033&view=rev Log: patch from w3seek : Bug#: 1671 : RTL: Fix checking the SACL data area in the Win64 version of RtlSelfRelativeToAbsoluteSD2 Modified: trunk/reactos/lib/rtl/sd.c Modified: trunk/reactos/lib/rtl/sd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/sd.c?rev=23033&r1=… ============================================================================== --- trunk/reactos/lib/rtl/sd.c (original) +++ trunk/reactos/lib/rtl/sd.c Thu Jul 13 01:36:05 2006 @@ -837,7 +837,7 @@ { if (((ULONG_PTR)pSacl < (ULONG_PTR)DataStart) || DataStart == NULL) DataStart = pSacl; - if (((ULONG_PTR)pSacl + DaclLength > (ULONG_PTR)DataEnd) || DataEnd == NULL) + if (((ULONG_PTR)pSacl + SaclLength > (ULONG_PTR)DataEnd) || DataEnd == NULL) DataEnd = (PVOID)((ULONG_PTR)pSacl + SaclLength); }

1 0

[fireball] 23032: - Fix a mistake with outputting always non-initialized buffer in a DPRINT1 - Add a branch for stopping the screensaver - Prettify the tracing debug message (it shows now if it's a start or a stop request) - Add a success-check for RegOpenKeyExW too
by fireball＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: fireball Date: Thu Jul 13 01:33:14 2006 New Revision: 23032 URL: http://svn.reactos.org/svn/reactos?rev=23032&view=rev Log: - Fix a mistake with outputting always non-initialized buffer in a DPRINT1 - Add a branch for stopping the screensaver - Prettify the tracing debug message (it shows now if it's a start or a stop request) - Add a success-check for RegOpenKeyExW too Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Thu Jul 13 01:33:14 2006 @@ -3326,22 +3326,23 @@ } CSR_API(CsrStartScreenSaver) -{ - - DPRINT("CsrStartScreenSaver : Start Screen Saver \n"); - +{ + + DPRINT("CsrStartScreenSaver : %s Screen Saver \n", + (Request->Data.StartScreenSaver.Start) ? "Start" : "Stop"); + if (Request->Data.StartScreenSaver.Start == TRUE) { STARTUPINFOW si; PROCESS_INFORMATION pi; WCHAR szCmdline[MAX_PATH]; - + HKEY hKey; WCHAR szBuffer[MAX_PATH]; DWORD bufferSize = sizeof(szBuffer); DWORD varType = REG_SZ; LONG result; - + /* FIXME : 1. Make it unicode and ansi compatible with TCHAR @@ -3356,32 +3357,43 @@ 4. Move the code to winlogon SAS and screen saver must run in the secuar desktop. But current our Winlogon does not working well with SAS and with Secure desktop, So I (Magnus Olsen aka GreatLord) - add the code here as w3seek recomandete + add the code here as w3seek recommended */ - - - RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\Desktop", 0, KEY_ALL_ACCESS, &hKey); - result = RegQueryValueExW(hKey, L"SCRNSAVE.EXE", 0, &varType, (LPBYTE)szBuffer, &bufferSize); - if(result == ERROR_SUCCESS) - { - swprintf(szCmdline, L"%s /s",szBuffer); - DPRINT1("CsrStartScreenSaver : OK %S\n",szCmdline); - ZeroMemory( &si, sizeof(si) ); - si.cb = sizeof(si); - ZeroMemory( &pi, sizeof(pi) ); - if(CreateProcessW( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL,NULL,&si, &pi )) - { - CloseHandle( pi.hProcess ); - CloseHandle( pi.hThread ); - } - } - else - { - DPRINT1("CsrStartScreenSaver : FAIL %S\n",szBuffer); - } - RegCloseKey(hKey); - } - return Request->Status = STATUS_SUCCESS; + + result = RegOpenKeyExW(HKEY_CURRENT_USER, L"Control Panel\\Desktop", 0, KEY_ALL_ACCESS, &hKey); + if (result == ERROR_SUCCESS) + { + result = RegQueryValueExW(hKey, L"SCRNSAVE.EXE", 0, &varType, (LPBYTE)szBuffer, &bufferSize); + if(result == ERROR_SUCCESS) + { + swprintf(szCmdline, L"%s /s",szBuffer); + DPRINT1("CsrStartScreenSaver : OK %S, Name %S\n", szCmdline, szBuffer); + ZeroMemory( &si, sizeof(si) ); + si.cb = sizeof(si); + ZeroMemory( &pi, sizeof(pi) ); + if(CreateProcessW( NULL, szCmdline, NULL, NULL, FALSE, 0, NULL,NULL,&si, &pi )) + { + CloseHandle( pi.hProcess ); + CloseHandle( pi.hThread ); + } + } + else + { + DPRINT1("CsrStartScreenSaver : failed 0x%08X\n", result); + } + RegCloseKey(hKey); + } + else + { + DPRINT1("CsrStartScreenSaver : failed to RegOpenKeyExW 0x%08X\n", result); + } + return Request->Status = STATUS_SUCCESS; + } + else + { + /* TODO: Stopping the screensaver */ + return Request->Status = STATUS_NOT_IMPLEMENTED; + } } /* EOF */

1 0

[janderwald] 23031: conio.c: * create a CSRSS_SCREEN_BUFFER object before TuiInit/GuiInit -> required for variable screen buffer sizes * improve error handling in CsrCreateScreenBuffer guiconsole.c: * directly store WindowSize in CSRSS_CONSOLE struct * read ScreenBufferSize value from registry and store result in CSRSS_SCREEN_BUFFER * use default values for ScreenBufferSize / WindowSize tuiconsole.c: * set screenbuffer size to size of physical console size in init
by janderwald＠svn.reactos.org 12 Jul '06

12 Jul '06

Author: janderwald Date: Thu Jul 13 01:06:21 2006 New Revision: 23031 URL: http://svn.reactos.org/svn/reactos?rev=23031&view=rev Log: conio.c: * create a CSRSS_SCREEN_BUFFER object before TuiInit/GuiInit -> required for variable screen buffer sizes * improve error handling in CsrCreateScreenBuffer guiconsole.c: * directly store WindowSize in CSRSS_CONSOLE struct * read ScreenBufferSize value from registry and store result in CSRSS_SCREEN_BUFFER * use default values for ScreenBufferSize / WindowSize tuiconsole.c: * set screenbuffer size to size of physical console size in init Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.c Thu Jul 13 01:06:21 2006 @@ -108,14 +108,13 @@ CsrInitConsoleScreenBuffer(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER Buffer) { + DPRINT("CsrInitConsoleScreenBuffer Size X %d Size Y %d\n", Buffer->MaxX, Buffer->MaxY); + Buffer->Header.Type = CONIO_SCREEN_BUFFER_MAGIC; Buffer->Header.ReferenceCount = 0; - Buffer->MaxX = Console->Size.X; - Buffer->MaxY = Console->Size.Y; Buffer->ShowX = 0; Buffer->ShowY = 0; - //FIXME - Buffer->Buffer = HeapAlloc(Win32CsrApiHeap, 0, Buffer->MaxX * Buffer->MaxY * 2); + Buffer->Buffer = HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, Buffer->MaxX * Buffer->MaxY * sizeof(WCHAR)); if (NULL == Buffer->Buffer) { return STATUS_INSUFFICIENT_RESOURCES; @@ -176,37 +175,46 @@ } Console->PrivateData = NULL; InitializeCriticalSection(&Console->Header.Lock); + GuiMode = DtbgIsDesktopVisible(); - if (! GuiMode) - { - Status = TuiInitConsole(Console); - if (! NT_SUCCESS(Status)) - { - DPRINT1("Failed to open text-mode console, switching to gui-mode\n"); - GuiMode = TRUE; - } - } - if (GuiMode) - { - Status = GuiInitConsole(Console); - if (! NT_SUCCESS(Status)) - { - RtlFreeUnicodeString(&Console->Title); - DeleteCriticalSection(&Console->Header.Lock); - CloseHandle(Console->ActiveEvent); - return Status; - } - } - - NewBuffer = HeapAlloc(Win32CsrApiHeap, 0, sizeof(CSRSS_SCREEN_BUFFER)); + + /* allocate console screen buffer */ + NewBuffer = HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, sizeof(CSRSS_SCREEN_BUFFER)); + /* make console active, and insert into console list */ + Console->ActiveBuffer = (PCSRSS_SCREEN_BUFFER) NewBuffer; + /* add a reference count because the buffer is tied to the console */ + InterlockedIncrement(&Console->ActiveBuffer->Header.ReferenceCount); if (NULL == NewBuffer) { - ConioCleanupConsole(Console); RtlFreeUnicodeString(&Console->Title); DeleteCriticalSection(&Console->Header.Lock); CloseHandle(Console->ActiveEvent); return STATUS_INSUFFICIENT_RESOURCES; } + + if (! GuiMode) + { + Status = TuiInitConsole(Console); + if (! NT_SUCCESS(Status)) + { + DPRINT1("Failed to open text-mode console, switching to gui-mode\n"); + GuiMode = TRUE; + } + } + if (GuiMode) + { + Status = GuiInitConsole(Console); + if (! NT_SUCCESS(Status)) + { + HeapFree(Win32CsrApiHeap,0, NewBuffer); + RtlFreeUnicodeString(&Console->Title); + DeleteCriticalSection(&Console->Header.Lock); + CloseHandle(Console->ActiveEvent); + DPRINT1("GuiInitConsole: failed\n"); + return Status; + } + } + Status = CsrInitConsoleScreenBuffer(Console, NewBuffer); if (! NT_SUCCESS(Status)) { @@ -215,12 +223,11 @@ DeleteCriticalSection(&Console->Header.Lock); CloseHandle(Console->ActiveEvent); HeapFree(Win32CsrApiHeap, 0, NewBuffer); + DPRINT1("CsrInitConsoleScreenBuffer: failed\n"); return Status; } - Console->ActiveBuffer = NewBuffer; - /* add a reference count because the buffer is tied to the console */ - InterlockedIncrement(&Console->ActiveBuffer->Header.ReferenceCount); - /* make console active, and insert into console list */ + + /* copy buffer contents to screen */ ConioDrawConsole(Console); @@ -2201,24 +2208,38 @@ Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); - Buff = HeapAlloc(Win32CsrApiHeap, 0, sizeof(CSRSS_SCREEN_BUFFER)); - if (NULL == Buff) + Buff = HeapAlloc(Win32CsrApiHeap, HEAP_ZERO_MEMORY, sizeof(CSRSS_SCREEN_BUFFER)); + + if (Buff != NULL) + { + if (Console->ActiveBuffer) + { + Buff->MaxX = Console->ActiveBuffer->MaxX; + Buff->MaxY = Console->ActiveBuffer->MaxY; + } + + if (Buff->MaxX == 0) + Buff->MaxX = 80; + + if (Buff->MaxY == 0) + Buff->MaxY = 25; + + Status = CsrInitConsoleScreenBuffer(Console, Buff); + if(! NT_SUCCESS(Status)) + { + Request->Status = Status; + } + else + { + Request->Status = Win32CsrInsertObject(ProcessData, &Request->Data.CreateScreenBufferRequest.OutputHandle, &Buff->Header); + } + } + else { Request->Status = STATUS_INSUFFICIENT_RESOURCES; } - Status = CsrInitConsoleScreenBuffer(Console, Buff); - if(! NT_SUCCESS(Status)) - { - Request->Status = Status; - } - else - { - Request->Status = Win32CsrInsertObject(ProcessData, &Request->Data.CreateScreenBufferRequest.OutputHandle, &Buff->Header); - } - ConioUnlockConsole(Console); - return Request->Status; } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c Thu Jul 13 01:06:21 2006 @@ -40,7 +40,6 @@ DWORD FullScreen; DWORD QuickEdit; DWORD InsertMode; - DWORD WindowSize; } GUI_CONSOLE_DATA, *PGUI_CONSOLE_DATA; #ifndef WM_APP @@ -215,7 +214,7 @@ return FALSE; } static void FASTCALL -GuiConsoleReadUserSettings(HKEY hKey, PGUI_CONSOLE_DATA GuiData) +GuiConsoleReadUserSettings(HKEY hKey, PCSRSS_CONSOLE Console, PGUI_CONSOLE_DATA GuiData, PCSRSS_SCREEN_BUFFER Buffer) { DWORD dwNumSubKeys = 0; DWORD dwIndex; @@ -274,7 +273,16 @@ } else if (!wcscmp(szValueName, L"WindowSize")) { - GuiData->WindowSize = Value; + Console->Size.X = LOWORD(Value); + Console->Size.Y = HIWORD(Value); + } + else if (!wcscmp(szValueName, L"ScreenBufferSize")) + { + if( Buffer) + { + Buffer->MaxX = LOWORD(Value); + Buffer->MaxY = HIWORD(Value); + } } else if (!wcscmp(szValueName, L"FullScreen")) { @@ -291,7 +299,7 @@ } } static VOID FASTCALL -GuiConsoleUseDefaults(PGUI_CONSOLE_DATA GuiData) +GuiConsoleUseDefaults(PCSRSS_CONSOLE Console, PGUI_CONSOLE_DATA GuiData, PCSRSS_SCREEN_BUFFER Buffer) { /* * init guidata with default properties @@ -299,13 +307,21 @@ wcscpy(GuiData->FontName, L"Bitstream Vera Sans Mono"); GuiData->FontSize = 0x0008000C; // font is 8x12 - GuiData->WindowSize = 0x00190050; // default window size is 25x80 GuiData->FontWeight = FW_NORMAL; GuiData->CursorSize = 0; GuiData->HistoryNoDup = FALSE; GuiData->FullScreen = FALSE; GuiData->QuickEdit = FALSE; GuiData->InsertMode = TRUE; + + Console->Size.X = 80; + Console->Size.Y = 25; + + if (Buffer) + { + Buffer->MaxX = 80; + Buffer->MaxY = 25; + } } @@ -328,19 +344,16 @@ return FALSE; } - GuiConsoleUseDefaults(GuiData); + GuiConsoleUseDefaults(Console, GuiData, Console->ActiveBuffer); if (Console->ProcessList.Flink != &Console->ProcessList) { ProcessData = CONTAINING_RECORD(Console->ProcessList.Flink, CSRSS_PROCESS_DATA, ProcessEntry); if (GuiConsoleOpenUserSettings(hWnd, PtrToUlong(ProcessData->ProcessId), &hKey, KEY_READ)) { - GuiConsoleReadUserSettings(hKey, GuiData); + GuiConsoleReadUserSettings(hKey, Console, GuiData, Console->ActiveBuffer); RegCloseKey(hKey); } } - - Console->Size.X = LOWORD(GuiData->WindowSize); - Console->Size.Y = HIWORD(GuiData->WindowSize); InitializeCriticalSection(&GuiData->Lock); @@ -656,37 +669,40 @@ if (Console != NULL && GuiData != NULL && Console->ActiveBuffer != NULL) { - EnterCriticalSection(&GuiData->Lock); - - GuiConsolePaint(Console, - GuiData, - hDC, - &ps.rcPaint); - - if (GuiData->Selection.left != -1) + if (Console->ActiveBuffer->Buffer != NULL) { - RECT rc = GuiData->Selection; - - rc.left *= GuiData->CharWidth; - rc.top *= GuiData->CharHeight; - rc.right *= GuiData->CharWidth; - rc.bottom *= GuiData->CharHeight; - - /* invert the selection */ - if (IntersectRect(&rc, - &ps.rcPaint, - &rc)) + EnterCriticalSection(&GuiData->Lock); + + GuiConsolePaint(Console, + GuiData, + hDC, + &ps.rcPaint); + + if (GuiData->Selection.left != -1) { - PatBlt(hDC, - rc.left, - rc.top, - rc.right - rc.left, - rc.bottom - rc.top, - DSTINVERT); + RECT rc = GuiData->Selection; + + rc.left *= GuiData->CharWidth; + rc.top *= GuiData->CharHeight; + rc.right *= GuiData->CharWidth; + rc.bottom *= GuiData->CharHeight; + + /* invert the selection */ + if (IntersectRect(&rc, + &ps.rcPaint, + &rc)) + { + PatBlt(hDC, + rc.left, + rc.top, + rc.right - rc.left, + rc.bottom - rc.top, + DSTINVERT); + } } + + LeaveCriticalSection(&GuiData->Lock); } - - LeaveCriticalSection(&GuiData->Lock); } EndPaint(hWnd, &ps); @@ -1563,7 +1579,7 @@ /* wait untill initialization has finished */ WaitForSingleObject(GuiData->hGuiInitEvent, INFINITE); - DPRINT("received event Console %p GuiData %p X %d Y %d\n", Console, Console->PrivateData, Console->Size.X, Console->Size.Y); + DPRINT1("received event Console %p GuiData %p X %d Y %d\n", Console, Console->PrivateData, Console->Size.X, Console->Size.Y); CloseHandle(GuiData->hGuiInitEvent); GuiData->hGuiInitEvent = NULL; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/tuiconsole.c Thu Jul 13 01:06:21 2006 @@ -242,6 +242,8 @@ Console->Vtbl = &TuiVtbl; Console->hWindow = (HWND) NULL; Console->Size = PhysicalConsoleSize; + Console->ActiveBuffer->MaxX = PhysicalConsoleSize.X; + Console->ActiveBuffer->MaxY = PhysicalConsoleSize.Y; EnterCriticalSection(&ActiveConsoleLock); if (NULL != ActiveConsole)

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