Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 38772: - Move SetThreadExecutionState to power.c - Implement IsSystemResumeAutomatic - Implement SetThreadExecutionState
by dchapyshev＠svn.reactos.org 15 Jan '09

15 Jan '09

Author: dchapyshev Date: Thu Jan 15 11:07:01 2009 New Revision: 38772 URL: http://svn.reactos.org/svn/reactos?rev=38772&view=rev Log: - Move SetThreadExecutionState to power.c - Implement IsSystemResumeAutomatic - Implement SetThreadExecutionState Modified: trunk/reactos/dll/win32/kernel32/misc/power.c trunk/reactos/dll/win32/kernel32/misc/stubs.c Modified: trunk/reactos/dll/win32/kernel32/misc/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/po… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/power.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/power.c [iso-8859-1] Thu Jan 15 11:07:01 2009 @@ -34,6 +34,19 @@ IN LATENCY_TIME latency ); +NTSYSAPI +BOOLEAN +NTAPI +NtIsSystemResumeAutomatic(VOID); + +NTSYSAPI +NTSTATUS +NTAPI +NtSetThreadExecutionState( + IN EXECUTION_STATE esFlags, + OUT EXECUTION_STATE *PreviousFlags +); + /* PUBLIC FUNCTIONS ***********************************************************/ /* @@ -181,8 +194,7 @@ WINAPI IsSystemResumeAutomatic(VOID) { - STUB; - return 0; + return NtIsSystemResumeAutomatic(); } /* @@ -196,3 +208,24 @@ STUB; return 0; } + +/* + * @implemented + */ +EXECUTION_STATE +WINAPI +SetThreadExecutionState(EXECUTION_STATE esFlags) +{ + EXECUTION_STATE OldFlags; + NTSTATUS Status; + + Status = NtSetThreadExecutionState(esFlags, &OldFlags); + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return 0; + } + + return OldFlags; +} Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Thu Jan 15 11:07:01 2009 @@ -559,26 +559,6 @@ ) { STUB; -} - -/* - * @unimplemented - */ -EXECUTION_STATE -WINAPI -SetThreadExecutionState( - EXECUTION_STATE esFlags - ) -{ - static EXECUTION_STATE current = - ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED | ES_USER_PRESENT; - EXECUTION_STATE old = current; - - DPRINT1("(0x%x): stub, harmless.\n", esFlags); - - if (!(current & ES_CONTINUOUS) || (esFlags & ES_CONTINUOUS)) - current = esFlags; - return old; } /*

1 0

[fireball] 38771: - Revert 38770's modifications to NDK. - Temporary move Nt power function prototypes inside power.c file.
by fireball＠svn.reactos.org 15 Jan '09

15 Jan '09

Author: fireball Date: Thu Jan 15 10:52:50 2009 New Revision: 38771 URL: http://svn.reactos.org/svn/reactos?rev=38771&view=rev Log: - Revert 38770's modifications to NDK. - Temporary move Nt power function prototypes inside power.c file. Modified: trunk/reactos/dll/win32/kernel32/misc/power.c trunk/reactos/include/ndk/pofuncs.h Modified: trunk/reactos/dll/win32/kernel32/misc/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/po… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/power.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/power.c [iso-8859-1] Thu Jan 15 10:52:50 2009 @@ -18,6 +18,21 @@ #define STUB \ SetLastError(ERROR_CALL_NOT_IMPLEMENTED); \ DPRINT1("%s() is UNIMPLEMENTED!\n", __FUNCTION__) + +NTSYSAPI +NTSTATUS +NTAPI +NtGetDevicePowerState( + IN HANDLE Device, + IN PDEVICE_POWER_STATE PowerState +); + +NTSYSAPI +NTSTATUS +NTAPI +NtRequestWakeupLatency( + IN LATENCY_TIME latency +); /* PUBLIC FUNCTIONS ***********************************************************/ Modified: trunk/reactos/include/ndk/pofuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pofuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pofuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/pofuncs.h [iso-8859-1] Thu Jan 15 10:52:50 2009 @@ -86,20 +86,4 @@ IN SYSTEM_POWER_STATE MinSystemState, IN ULONG Flags ); - -NTSYSAPI -NTSTATUS -NTAPI -NtGetDevicePowerState( - IN HANDLE Device, - IN PDEVICE_POWER_STATE PowerState -); - -NTSYSAPI -NTSTATUS -NTAPI -NtRequestWakeupLatency( - IN LATENCY_TIME latency -); - #endif

1 0

[dchapyshev] 38770: - Implement GetDevicePowerState - Implement RequestWakeupLatency - Add prototypes for GetDevicePowerState and RequestWakeupLatency to pofuncs.h
by dchapyshev＠svn.reactos.org 15 Jan '09

15 Jan '09

Author: dchapyshev Date: Thu Jan 15 10:09:03 2009 New Revision: 38770 URL: http://svn.reactos.org/svn/reactos?rev=38770&view=rev Log: - Implement GetDevicePowerState - Implement RequestWakeupLatency - Add prototypes for GetDevicePowerState and RequestWakeupLatency to pofuncs.h Modified: trunk/reactos/dll/win32/kernel32/misc/power.c trunk/reactos/include/ndk/pofuncs.h Modified: trunk/reactos/dll/win32/kernel32/misc/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/po… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/power.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/power.c [iso-8859-1] Thu Jan 15 10:09:03 2009 @@ -91,14 +91,30 @@ } /* - * @unimplemented + * @implemented */ BOOL WINAPI GetDevicePowerState(HANDLE hDevice, BOOL *pfOn) { - STUB; - return 0; + DEVICE_POWER_STATE DevicePowerState; + NTSTATUS Status; + + Status = NtGetDevicePowerState(hDevice, &DevicePowerState); + + if (NT_SUCCESS(Status)) + { + if ((DevicePowerState != PowerDeviceUnspecified) && + (DevicePowerState != PowerDeviceD0)) + *pfOn = FALSE; + else + *pfOn = TRUE; + + return TRUE; + } + + SetLastErrorByStatus(Status); + return FALSE; } /* @@ -113,14 +129,23 @@ } /* - * @unimplemented + * @implemented */ BOOL WINAPI RequestWakeupLatency(LATENCY_TIME latency) { - STUB; - return 0; + NTSTATUS Status; + + Status = NtRequestWakeupLatency(latency); + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + return TRUE; } /* Modified: trunk/reactos/include/ndk/pofuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pofuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pofuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/pofuncs.h [iso-8859-1] Thu Jan 15 10:09:03 2009 @@ -86,4 +86,20 @@ IN SYSTEM_POWER_STATE MinSystemState, IN ULONG Flags ); + +NTSYSAPI +NTSTATUS +NTAPI +NtGetDevicePowerState( + IN HANDLE Device, + IN PDEVICE_POWER_STATE PowerState +); + +NTSYSAPI +NTSTATUS +NTAPI +NtRequestWakeupLatency( + IN LATENCY_TIME latency +); + #endif

1 0

[dchapyshev] 38769: - Add power.c file for power management functions - Move GetSystemPowerStatus, SetSystemPowerState, GetDevicePowerState, RequestDeviceWakeup, RequestWakeupLatency, CancelDeviceWakeupRequest, IsSystemResumeAutomatic, and SetMessageWaitingIndicator to power.c - Implement GetSystemPowerStatus
by dchapyshev＠svn.reactos.org 15 Jan '09

15 Jan '09

Author: dchapyshev Date: Thu Jan 15 09:32:30 2009 New Revision: 38769 URL: http://svn.reactos.org/svn/reactos?rev=38769&view=rev Log: - Add power.c file for power management functions - Move GetSystemPowerStatus, SetSystemPowerState, GetDevicePowerState, RequestDeviceWakeup, RequestWakeupLatency, CancelDeviceWakeupRequest, IsSystemResumeAutomatic, and SetMessageWaitingIndicator to power.c - Implement GetSystemPowerStatus Added: trunk/reactos/dll/win32/kernel32/misc/power.c (with props) Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/dll/win32/kernel32/misc/stubs.c Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Thu Jan 15 09:32:30 2009 @@ -80,6 +80,7 @@ <file>muldiv.c</file> <file>nls.c</file> <file>perfcnt.c</file> + <file>power.c</file> <file>recovery.c</file> <file>res.c</file> <file>sortkey.c</file> Added: trunk/reactos/dll/win32/kernel32/misc/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/po… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/power.c (added) +++ trunk/reactos/dll/win32/kernel32/misc/power.c [iso-8859-1] Thu Jan 15 09:32:30 2009 @@ -1,0 +1,158 @@ +/* + * + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS system libraries + * FILE: dll/win32/kernel32/misc/power.c + * PURPOSE: Power Management Functions + * PROGRAMMER: Dmitry Chapyshev <dmitry(a)reactos.org> + * + * UPDATE HISTORY: + * 01/15/2009 Created + */ + +#include <k32.h> + +#define NDEBUG +#include <debug.h> + +#define STUB \ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); \ + DPRINT1("%s() is UNIMPLEMENTED!\n", __FUNCTION__) + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/* + * @implemented + */ +BOOL +WINAPI +GetSystemPowerStatus(LPSYSTEM_POWER_STATUS PowerStatus) +{ + NTSTATUS Status; + SYSTEM_BATTERY_STATE SysBatState; + + Status = NtPowerInformation(SystemBatteryState, + NULL, + 0, + &SysBatState, + sizeof(SYSTEM_BATTERY_STATE)); + + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + RtlZeroMemory(PowerStatus, sizeof(LPSYSTEM_POWER_STATUS)); + + PowerStatus->BatteryLifeTime = BATTERY_LIFE_UNKNOWN; + PowerStatus->BatteryFullLifeTime = BATTERY_LIFE_UNKNOWN; + + PowerStatus->BatteryLifePercent = BATTERY_PERCENTAGE_UNKNOWN; + if (SysBatState.MaxCapacity) + { + if (SysBatState.MaxCapacity >= SysBatState.RemainingCapacity) + PowerStatus->BatteryLifePercent = (SysBatState.RemainingCapacity / SysBatState.MaxCapacity) * 100; + else + PowerStatus->BatteryLifePercent = 100; /* 100% */ + + if (PowerStatus->BatteryLifePercent <= 32) + PowerStatus->BatteryFlag |= BATTERY_FLAG_LOW; + + if (PowerStatus->BatteryLifePercent >= 67) + PowerStatus->BatteryFlag |= BATTERY_FLAG_HIGH; + } + + if (!SysBatState.BatteryPresent) + PowerStatus->BatteryFlag |= BATTERY_FLAG_NO_BATTERY; + + if (SysBatState.Charging) + PowerStatus->BatteryFlag |= BATTERY_FLAG_CHARGING; + + if (!SysBatState.AcOnLine && SysBatState.BatteryPresent) + PowerStatus->ACLineStatus = AC_LINE_OFFLINE; + else + PowerStatus->ACLineStatus = AC_LINE_ONLINE; + + if (SysBatState.EstimatedTime) + PowerStatus->BatteryLifeTime = SysBatState.EstimatedTime; + + return TRUE; +} + +/* + * @unimplemented + */ +BOOL WINAPI +SetSystemPowerState(BOOL fSuspend, BOOL fForce) +{ + STUB; + return FALSE; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +GetDevicePowerState(HANDLE hDevice, BOOL *pfOn) +{ + STUB; + return 0; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +RequestDeviceWakeup(HANDLE hDevice) +{ + STUB; + return 0; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +RequestWakeupLatency(LATENCY_TIME latency) +{ + STUB; + return 0; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +CancelDeviceWakeupRequest(HANDLE hDevice) +{ + STUB; + return 0; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +IsSystemResumeAutomatic(VOID) +{ + STUB; + return 0; +} + +/* + * @unimplemented + */ +BOOL +WINAPI +SetMessageWaitingIndicator(HANDLE hMsgIndicator, + ULONG ulMsgCount) +{ + STUB; + return 0; +} Propchange: trunk/reactos/dll/win32/kernel32/misc/power.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/misc/stubs.c [iso-8859-1] Thu Jan 15 09:32:30 2009 @@ -150,26 +150,6 @@ { STUB; return 0; -} - - -/* - * @unimplemented - */ -BOOL -WINAPI -GetSystemPowerStatus ( - LPSYSTEM_POWER_STATUS PowerStatus - ) -{ - STUB; - PowerStatus->ACLineStatus = 1; - PowerStatus->BatteryFlag = 128; - PowerStatus->BatteryLifePercent = 255; - PowerStatus->Reserved1 = 0; - PowerStatus->BatteryLifeTime = -1; - PowerStatus->BatteryFullLifeTime = -1; - return TRUE; } @@ -243,20 +223,6 @@ /* * @unimplemented */ -BOOL WINAPI -SetSystemPowerState ( - BOOL fSuspend, - BOOL fForce - ) -{ - STUB; - return FALSE; -} - - -/* - * @unimplemented - */ BOOL WINAPI SetVDMCurrentDirectories ( @@ -372,19 +338,6 @@ */ BOOL WINAPI -CancelDeviceWakeupRequest( - HANDLE hDevice - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL -WINAPI CreateJobSet ( ULONG NumJob, PJOB_SET_ARRAY UserJobSet, @@ -416,20 +369,6 @@ HANDLE hProcess, PULONG_PTR NumberOfPages, PULONG_PTR PageArray - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -GetDevicePowerState( - HANDLE hDevice, - BOOL *pfOn ) { STUB; @@ -505,19 +444,6 @@ HEAP_INFORMATION_CLASS HeapInformationClass, PVOID HeapInformation OPTIONAL, SIZE_T HeapInformationLength OPTIONAL - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -IsSystemResumeAutomatic( - VOID ) { STUB; @@ -612,32 +538,6 @@ /* * @unimplemented */ -BOOL -WINAPI -RequestDeviceWakeup( - HANDLE hDevice - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -RequestWakeupLatency( - LATENCY_TIME latency - ) -{ - STUB; - return 0; -} - -/* - * @unimplemented - */ UINT WINAPI ResetWriteWatch( @@ -659,20 +559,6 @@ ) { STUB; -} - -/* - * @unimplemented - */ -BOOL -WINAPI -SetMessageWaitingIndicator( - HANDLE hMsgIndicator, - ULONG ulMsgCount - ) -{ - STUB; - return 0; } /*

1 0

[sginsberg] 38768: - DbgkpSendApiMessage/Lpc: Modification of EPROCESS flags must be interlocked, use PspSetProcessFlag. - DbgkMap/UnmapViewOfSection: Don't check for the DeadThread flag, doing so is only necessary during early thread creation. - DbgkCreateThread: Set the StartAddress pointer in the case where we only send the Create Thread message. Also, we should receive the target thread as the first parameter. - NtDebugActiveProcess: Don't allow debugging the current process. - NtDebugContin
by sginsberg＠svn.reactos.org 15 Jan '09

15 Jan '09

Author: sginsberg Date: Thu Jan 15 07:14:37 2009 New Revision: 38768 URL: http://svn.reactos.org/svn/reactos?rev=38768&view=rev Log: - DbgkpSendApiMessage/Lpc: Modification of EPROCESS flags must be interlocked, use PspSetProcessFlag. - DbgkMap/UnmapViewOfSection: Don't check for the DeadThread flag, doing so is only necessary during early thread creation. - DbgkCreateThread: Set the StartAddress pointer in the case where we only send the Create Thread message. Also, we should receive the target thread as the first parameter. - NtDebugActiveProcess: Don't allow debugging the current process. - NtDebugContinue: We should signal the Debug Object, not the Debug Event. Also make sure we pass the correct event to DbgkpWakeTarget. - NtWaitForDebugEvent: Cleanup probe and capture of the input timeout. Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c trunk/reactos/ntoskrnl/dbgk/dbgkutil.c trunk/reactos/ntoskrnl/include/internal/dbgk.h trunk/reactos/ntoskrnl/ps/thread.c Modified: trunk/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkobj.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkobj.c [iso-8859-1] Thu Jan 15 07:14:37 2009 @@ -219,7 +219,7 @@ Message->ReturnedStatus = STATUS_PENDING; /* Set create process reported state */ - PsGetCurrentProcess()->CreateReported = TRUE; + PspSetProcessFlag(PsGetCurrentProcess(), PSF_CREATE_REPORTED_BIT); /* Send the LPC command */ Status = LpcRequestWaitReplyPort(Port, @@ -254,7 +254,7 @@ ApiMsg->ReturnedStatus = STATUS_PENDING; /* Set create process reported state */ - PsGetCurrentProcess()->CreateReported = TRUE; + PspSetProcessFlag(PsGetCurrentProcess(), PSF_CREATE_REPORTED_BIT); /* Send the LPC command */ Status = DbgkpQueueMessage(PsGetCurrentProcess(), @@ -1081,6 +1081,7 @@ BOOLEAN DebugPortCleared = FALSE; PLIST_ENTRY DebugEventList; PDEBUG_EVENT DebugEvent; + PAGED_CODE(); DBGKTRACE(DBGK_OBJECT_DEBUG, "OwnerProcess: %p DebugObject: %p\n", OwnerProcess, DebugObject); @@ -1260,8 +1261,9 @@ else { /* Set the process flags */ - InterlockedOr((PLONG)&Process->Flags, - PSF_NO_DEBUG_INHERIT_BIT | PSF_CREATE_REPORTED_BIT); + PspSetProcessFlag(Process, + PSF_NO_DEBUG_INHERIT_BIT | + PSF_CREATE_REPORTED_BIT); /* Reference the debug object */ ObReferenceObject(DebugObject); @@ -1474,12 +1476,15 @@ &hDebug); if (NT_SUCCESS(Status)) { + /* Enter SEH to protect the write */ _SEH2_TRY { + /* Return the handle */ *DebugHandle = hDebug; } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { + _SEH2_EXCEPT(ExSystemExceptionFilter()) + { + /* Get the exception code */ Status = _SEH2_GetExceptionCode(); } _SEH2_END; } @@ -1570,7 +1575,7 @@ { /* Wake it up and break out */ DebugEvent->Flags &= ~DEBUG_EVENT_INACTIVE; - KeSetEvent(&DebugEvent->ContinueEvent, + KeSetEvent(&DebugObject->EventsPresent, IO_NO_INCREMENT, FALSE); break; @@ -1603,11 +1608,11 @@ if (NeedsWake) { /* Set the continue status */ - DebugEvent->ApiMsg.ReturnedStatus = ContinueStatus; - DebugEvent->Status = STATUS_SUCCESS; + DebugEventToWake->ApiMsg.ReturnedStatus = ContinueStatus; + DebugEventToWake->Status = STATUS_SUCCESS; /* Wake the target */ - DbgkpWakeTarget(DebugEvent); + DbgkpWakeTarget(DebugEventToWake); } else { @@ -1628,7 +1633,7 @@ { PEPROCESS Process; PDEBUG_OBJECT DebugObject; - KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); PETHREAD LastThread; NTSTATUS Status; PAGED_CODE(); @@ -1644,8 +1649,9 @@ NULL); if (!NT_SUCCESS(Status)) return Status; - /* Don't allow debugging the initial system process */ - if (Process == PsInitialSystemProcess) + /* Don't allow debugging the current process or the system process */ + if ((Process == PsGetCurrentProcess()) || + (Process == PsInitialSystemProcess)) { /* Dereference and fail */ ObDereferenceObject(Process); @@ -1700,7 +1706,7 @@ { PEPROCESS Process; PDEBUG_OBJECT DebugObject; - KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status; PAGED_CODE(); DBGKTRACE(DBGK_PROCESS_DEBUG, "Process: %p Handle: %p\n", @@ -1823,7 +1829,7 @@ OUT PDBGUI_WAIT_STATE_CHANGE StateChange) { KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); - LARGE_INTEGER SafeTimeOut; + LARGE_INTEGER LocalTimeOut; PEPROCESS Process; LARGE_INTEGER StartTime; PETHREAD Thread; @@ -1837,44 +1843,46 @@ PAGED_CODE(); DBGKTRACE(DBGK_OBJECT_DEBUG, "Handle: %p\n", DebugHandle); - /* Clear the initial wait state change structure */ + /* Clear the initial wait state change structure and the timeout */ RtlZeroMemory(&WaitStateChange, sizeof(WaitStateChange)); - - /* Protect probe in SEH */ - _SEH2_TRY - { - /* Check if we came with a timeout */ - if (Timeout) - { - /* Check if the call was from user mode */ - if (PreviousMode != KernelMode) + LocalTimeOut.QuadPart = 0; + + /* Check if we were called from user mode */ + if (PreviousMode != KernelMode) + { + /* Protect probe in SEH */ + _SEH2_TRY + { + /* Check if we came with a timeout */ + if (Timeout) { /* Probe it */ ProbeForReadLargeInteger(Timeout); - } - - /* Make a local copy */ - SafeTimeOut = *Timeout; - Timeout = &SafeTimeOut; - - /* Query the current time */ - KeQuerySystemTime(&StartTime); - } - - /* Check if the call was from user mode */ - if (PreviousMode != KernelMode) - { + + /* Make a local copy */ + LocalTimeOut = *Timeout; + Timeout = &LocalTimeOut; + } + /* Probe the state change structure */ ProbeForWrite(StateChange, sizeof(*StateChange), sizeof(ULONG)); } - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - /* Get the exception code */ - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - if (!NT_SUCCESS(Status)) return Status; + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Get the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + if (!NT_SUCCESS(Status)) return Status; + } + else + { + /* Copy directly */ + if (Timeout) LocalTimeOut = *Timeout; + } + + /* If we were passed a timeout, query the current time */ + if (Timeout) KeQuerySystemTime(&StartTime); /* Get the debug object */ Status = ObReferenceObjectByHandle(DebugHandle, @@ -1892,7 +1900,7 @@ /* Wait on the debug object given to us */ while (TRUE) { - Status = KeWaitForSingleObject(DebugObject, + Status = KeWaitForSingleObject(&DebugObject->EventsPresent, Executive, PreviousMode, Alertable, @@ -2002,17 +2010,17 @@ if (!GotEvent) { /* Check if we can wait again */ - if (SafeTimeOut.QuadPart < 0) + if (LocalTimeOut.QuadPart < 0) { /* Query the new time */ KeQuerySystemTime(&NewTime); /* Substract times */ - SafeTimeOut.QuadPart += (NewTime.QuadPart - StartTime.QuadPart); + LocalTimeOut.QuadPart += (NewTime.QuadPart - StartTime.QuadPart); StartTime = NewTime; /* Check if we've timed out */ - if (SafeTimeOut.QuadPart >= 0) + if (LocalTimeOut.QuadPart >= 0) { /* We have, break out of the loop */ Status = STATUS_TIMEOUT; Modified: trunk/reactos/ntoskrnl/dbgk/dbgkutil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/dbgk/dbgkutil.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/dbgk/dbgkutil.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/dbgk/dbgkutil.c [iso-8859-1] Thu Jan 15 07:14:37 2009 @@ -11,8 +11,6 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> - -extern ULONG DbgkpTraceLevel; /* FUNCTIONS *****************************************************************/ @@ -86,9 +84,9 @@ VOID NTAPI -DbgkCreateThread(PVOID StartAddress) -{ - PETHREAD Thread = PsGetCurrentThread(); +DbgkCreateThread(IN PETHREAD Thread, + IN PVOID StartAddress) +{ PEPROCESS Process = PsGetCurrentProcess(); ULONG ProcessFlags; IMAGE_INFO ImageInfo; @@ -106,10 +104,13 @@ PTEB Teb; PAGED_CODE(); + /* Sanity check */ + ASSERT(Thread == PsGetCurrentThread()); + /* Try ORing in the create reported and image notify flags */ - ProcessFlags = InterlockedOr((PLONG)&Process->Flags, - PSF_CREATE_REPORTED_BIT | - PSF_IMAGE_NOTIFY_DONE_BIT); + ProcessFlags = PspSetProcessFlag(Process, + PSF_CREATE_REPORTED_BIT | + PSF_IMAGE_NOTIFY_DONE_BIT); /* Check if we were the first to set them or if another thread raced us */ if (!(ProcessFlags & PSF_IMAGE_NOTIFY_DONE_BIT) && (PsImageNotifyEnabled)) @@ -282,7 +283,7 @@ { /* Otherwise, do it just for the thread */ CreateThread->SubSystemKey = 0; - CreateThread->StartAddress = NULL; + CreateThread->StartAddress = StartAddress; /* Setup the API Message */ ApiMessage.h.u1.Length = sizeof(DBGKM_MSG) << 16 | @@ -385,11 +386,10 @@ DBGKTRACE(DBGK_PROCESS_DEBUG, "Section: %p. Base: %p\n", Section, BaseAddress); - /* Check if this thread is hidden, doesn't have a debug port, or died */ - if ((Thread->HideFromDebugger) || - !(Process->DebugPort) || - (Thread->DeadThread) || - (KeGetPreviousMode() == KernelMode)) + /* Check if this thread is kernel, hidden or doesn't have a debug port */ + if ((ExGetPreviousMode() == KernelMode) || + (Thread->HideFromDebugger) || + !(Process->DebugPort)) { /* Don't notify the debugger */ return; @@ -434,11 +434,10 @@ PETHREAD Thread = PsGetCurrentThread(); PAGED_CODE(); - /* Check if this thread is hidden, doesn't have a debug port, or died */ - if ((Thread->HideFromDebugger) || - !(Process->DebugPort) || - (Thread->DeadThread) || - (KeGetPreviousMode() == KernelMode)) + /* Check if this thread is kernel, hidden or doesn't have a debug port */ + if ((ExGetPreviousMode() == KernelMode) || + (Thread->HideFromDebugger) || + !(Process->DebugPort)) { /* Don't notify the debugger */ return; @@ -456,5 +455,3 @@ /* Send the message */ DbgkpSendApiMessage(&ApiMessage, TRUE); } - -/* EOF */ Modified: trunk/reactos/ntoskrnl/include/internal/dbgk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/dbgk.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/dbgk.h [iso-8859-1] Thu Jan 15 07:14:37 2009 @@ -56,6 +56,7 @@ VOID NTAPI DbgkCreateThread( + IN PETHREAD Thread, IN PVOID StartAddress ); @@ -133,6 +134,7 @@ IN PDEBUG_OBJECT SourceDebugObject ); +extern ULONG DbgkpTraceLevel; extern POBJECT_TYPE DbgkDebugObjectType; /* EOF */ Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] Thu Jan 15 07:14:37 2009 @@ -56,7 +56,7 @@ if (!(Thread->DeadThread) && !(Thread->HideFromDebugger)) { /* We're not, so notify the debugger */ - DbgkCreateThread(StartContext); + DbgkCreateThread(Thread, StartContext); } /* Make sure we're not already dead */

1 0

[dreimer] 38767: Prettyfy the output of clean.* First try to make options.exe generate a options file fir PS and CMD. Right now the ps1 file isalways empty... No Idea why
by dreimer＠svn.reactos.org 15 Jan '09

15 Jan '09

Author: dreimer Date: Thu Jan 15 05:40:40 2009 New Revision: 38767 URL: http://svn.reactos.org/svn/reactos?rev=38767&view=rev Log: Prettyfy the output of clean.* First try to make options.exe generate a options file fir PS and CMD. Right now the ps1 file isalways empty... No Idea why Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/Clean.ps1 [iso-8859-1] Thu Jan 15 05:40:40 2009 @@ -57,6 +57,10 @@ $_ROSBE_MAKEFILE = "makefile.auto" } + if ($ENV:ROS_ARCH -eq $null) { + $ENV:ROS_ARCH = "i386" + } + if (Test-Path "$_ROSBE_OBJCLEANPATH\.") { "Cleaning ReactOS $ENV:ROS_ARCH source directory..." if (Test-Path "$_ROSBE_OBJCLEANPATH\.") { @@ -71,6 +75,10 @@ "Done cleaning ReactOS $ENV:ROS_ARCH source directory." } else { "ERROR: There is no $ENV:ROS_ARCH compiler output to clean." + } + + if ($ENV:ROS_ARCH -eq "i386") { + $ENV:ROS_ARCH = $null } if (Test-Path "reactos") { Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd [iso-8859-1] Thu Jan 15 05:40:40 2009 @@ -84,6 +84,10 @@ set _ROSBE_MAKEFILE=makefile.auto ) +if "%ROS_ARCH%" == "" ( + set ROS_ARCH=i386 +) + if exist "%_ROSBE_OBJCLEANPATH%\." ( echo Cleaning ReactOS %ROS_ARCH% source directory... if exist "%_ROSBE_OBJCLEANPATH%\." ( @@ -98,6 +102,10 @@ echo Done cleaning ReactOS %ROS_ARCH% source directory. ) else ( echo ERROR: There is no %ROS_ARCH% compiler output to clean. +) + +if "%ROS_ARCH%" == "i386" ( + set ROS_ARCH= ) :ROS Modified: trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Tools/co… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Tools/config/options.c [iso-8859-1] Thu Jan 15 05:40:40 2009 @@ -40,7 +40,7 @@ static const WCHAR* -getConfigFile() +getConfigFileCMD() { static WCHAR filename[MAX_PATH]; if (SHGetSpecialFolderPathW(NULL, filename, CSIDL_APPDATA, FALSE)) @@ -55,6 +55,23 @@ return filename; } +static +const +WCHAR* +getConfigFilePS1() +{ + static WCHAR filename[MAX_PATH]; + if (SHGetSpecialFolderPathW(NULL, filename, CSIDL_APPDATA, FALSE)) + { + if ((wcslen(filename) + wcslen(L"\\RosBE\\rosbe-options.ps1")) < MAX_PATH) + wcscat(filename, L"\\RosBE\\rosbe-options.ps1"); + } + else + { + wcscpy(filename, L"rosbe-options.ps1"); + } + return filename; +} INT WriteSettings(POPTIONS_DLG infoPtr) @@ -64,7 +81,7 @@ WCHAR logdir[MAX_PATH], objdir[MAX_PATH], outdir[MAX_PATH], mingwpath[MAX_PATH], checkmgw[MAX_PATH]; WCHAR msgerror[256]; HANDLE hFile; - FILE *pFile; + FILE *pFilecmd, *pFileps1; showtime = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SHOWBUILDTIME, BM_GETCHECK, 0, 0) == BST_CHECKED); writelog = (SendDlgItemMessage(infoPtr->hwndDlg, ID_SAVELOGS, BM_GETCHECK, 0, 0) == BST_CHECKED); @@ -104,26 +121,49 @@ } CloseHandle(hFile); - pFile = _wfopen(getConfigFile(), L"w"); - if (pFile) - { - fwprintf(pFile, L"::\n"); - fwprintf(pFile, L":: This file has been automatically generated by the ReactOS\n"); - fwprintf(pFile, L":: Build Environment options utility.\n"); - fwprintf(pFile, L"::\n\n"); - fwprintf(pFile, L"color %X%X\n", background, foreground); - fwprintf(pFile, L"set _ROSBE_SHOWTIME=%d\n", showtime); - fwprintf(pFile, L"set _ROSBE_USECCACHE=%d\n", useccache); - fwprintf(pFile, L"set _ROSBE_STRIP=%d\n", strip); - fwprintf(pFile, L"set _ROSBE_NOSTRIP=%d\n", nostrip); - fwprintf(pFile, L"set _ROSBE_WRITELOG=%d\n", writelog); - if (logdir[0] != 0) fwprintf(pFile, L"set _ROSBE_LOGDIR=%s\n", logdir); - if (mingwpath[0] != 0) fwprintf(pFile, L"set _ROSBE_MINGWPATH=%s\n", mingwpath); - if ((objdir[0] != 0) && objstate) fwprintf(pFile, L"set _ROSBE_OBJPATH=%s\n", objdir); - if ((outdir[0] != 0) && outstate) fwprintf(pFile, L"set _ROSBE_OUTPATH=%s\n", outdir); - fclose(pFile); + pFilecmd = _wfopen(getConfigFileCMD(), L"w"); + pFileps1 = _wfopen(getConfigFilePS1(), L"w"); + + if (pFilecmd) + { + fwprintf(pFilecmd, L"::\n"); + fwprintf(pFilecmd, L":: This file has been automatically generated by the ReactOS\n"); + fwprintf(pFilecmd, L":: Build Environment options utility.\n"); + fwprintf(pFilecmd, L"::\n\n"); + fwprintf(pFilecmd, L"color %X%X\n", background, foreground); + fwprintf(pFilecmd, L"set _ROSBE_SHOWTIME=%d\n", showtime); + fwprintf(pFilecmd, L"set _ROSBE_USECCACHE=%d\n", useccache); + fwprintf(pFilecmd, L"set _ROSBE_STRIP=%d\n", strip); + fwprintf(pFilecmd, L"set _ROSBE_NOSTRIP=%d\n", nostrip); + fwprintf(pFilecmd, L"set _ROSBE_WRITELOG=%d\n", writelog); + if (logdir[0] != 0) fwprintf(pFilecmd, L"set _ROSBE_LOGDIR=%s\n", logdir); + if (mingwpath[0] != 0) fwprintf(pFilecmd, L"set _ROSBE_MINGWPATH=%s\n", mingwpath); + if ((objdir[0] != 0) && objstate) fwprintf(pFilecmd, L"set _ROSBE_OBJPATH=%s\n", objdir); + if ((outdir[0] != 0) && outstate) fwprintf(pFilecmd, L"set _ROSBE_OUTPATH=%s\n", outdir); + fclose(pFilecmd); return TRUE; } + + if (pFileps1) + { + fwprintf(pFileps1, L"#\n"); + fwprintf(pFileps1, L"# This file has been automatically generated by the ReactOS\n"); + fwprintf(pFileps1, L"# Build Environment options utility.\n"); + fwprintf(pFileps1, L"#\n\n"); + fwprintf(pFileps1, L"# color %X%X\n", background, foreground); + fwprintf(pFileps1, L"$_ROSBE_SHOWTIME=%d\n", showtime); + fwprintf(pFileps1, L"$_ROSBE_USECCACHE=%d\n", useccache); + fwprintf(pFileps1, L"$_ROSBE_STRIP=%d\n", strip); + fwprintf(pFileps1, L"$_ROSBE_NOSTRIP=%d\n", nostrip); + fwprintf(pFileps1, L"$_ROSBE_WRITELOG=%d\n", writelog); + if (logdir[0] != 0) fwprintf(pFileps1, L"$_ROSBE_LOGDIR=%s\n", logdir); + if (mingwpath[0] != 0) fwprintf(pFileps1, L"$_ROSBE_MINGWPATH=%s\n", mingwpath); + if ((objdir[0] != 0) && objstate) fwprintf(pFileps1, L"$_ROSBE_OBJPATH=%s\n", objdir); + if ((outdir[0] != 0) && outstate) fwprintf(pFileps1, L"$_ROSBE_OUTPATH=%s\n", outdir); + fclose(pFileps1); + return TRUE; + } + LoadString(hInstance, MSG_FILEFAILED, msgerror, 256); MessageBox(infoPtr->hwndDlg, msgerror, NULL, MB_ICONERROR); return FALSE; @@ -137,7 +177,7 @@ WCHAR SBTitle[256]; PSETTINGS LoadedSettings = &infoPtr->Settings; - pFile = _wfopen(getConfigFile(), L"r"); + pFile = _wfopen(getConfigFileCMD(), L"r"); if (pFile) { while (fgetws(WTempLine, 24+MAX_PATH, pFile)) @@ -153,7 +193,7 @@ } else if (wcscmp(ptr, L"set") == 0) { - ptr = wcstok(NULL, L" "); + ptr = wcstok(NULL, L"\0"); ptr = wcstok(ptr, L"="); ptr2 = wcstok(NULL, L"="); if (wcscmp(ptr, L"_ROSBE_SHOWTIME") == 0)

1 0

[dchapyshev] 38766: - Implement FlashWindow
by dchapyshev＠svn.reactos.org 15 Jan '09

15 Jan '09

Author: dchapyshev Date: Thu Jan 15 04:18:10 2009 New Revision: 38766 URL: http://svn.reactos.org/svn/reactos?rev=38766&view=rev Log: - Implement FlashWindow Modified: trunk/reactos/dll/win32/user32/windows/draw.c Modified: trunk/reactos/dll/win32/user32/windows/draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/draw.c [iso-8859-1] Thu Jan 15 04:18:10 2009 @@ -1797,13 +1797,20 @@ } /* - * @unimplemented + * @implemented */ BOOL WINAPI FlashWindow(HWND hWnd, BOOL bInvert) { - UNIMPLEMENTED; - return FALSE; + FLASHWINFO FlashWndInfo; + + FlashWndInfo.cbSize = sizeof(FLASHWINFO); + FlashWndInfo.hwnd = hWnd; + FlashWndInfo.dwFlags = !bInvert ? 0 : (FLASHW_TRAY | FLASHW_CAPTION); + FlashWndInfo.uCount = 1; + FlashWndInfo.dwTimeout = 0; + + return NtUserFlashWindowEx(&FlashWndInfo); } /*

1 0

[janderwald] 38765: - sorry folks
by janderwald＠svn.reactos.org 14 Jan '09

14 Jan '09

Author: janderwald Date: Wed Jan 14 15:47:54 2009 New Revision: 38765 URL: http://svn.reactos.org/svn/reactos?rev=38765&view=rev Log: - sorry folks Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] Wed Jan 14 15:47:54 2009 @@ -119,7 +119,7 @@ if ( ! NT_SUCCESS(status) ) { DPRINT("StartDevice returned a failure code [0x%8x]\n", status); - resource_list->lpVtbl->Release(resource_list); + //resource_list->lpVtbl->Release(resource_list); Irp->IoStatus.Status = status; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -261,14 +261,50 @@ return STATUS_UNSUCCESSFUL; } -/* - * @unimplemented +static +NTSTATUS +NTAPI +IrpCompletionRoutine( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PVOID Context) +{ + KeSetEvent((PRKEVENT)Context, IO_NO_INCREMENT, FALSE); + return STATUS_SUCCESS; +} + + +/* + * @implemented */ NTSTATUS NTAPI PcForwardIrpSynchronous( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} + KEVENT Event; + PCExtension* DeviceExt; + NTSTATUS Status; + + DPRINT1("PcForwardIrpSynchronous\n"); + + DeviceExt = (PCExtension*)DeviceObject->DeviceExtension; + + /* initialize the notification event */ + KeInitializeEvent(&Event, NotificationEvent, FALSE); + + /* setup a completion routine */ + IoSetCompletionRoutine(Irp, IrpCompletionRoutine, (PVOID)&Event, TRUE, FALSE, FALSE); + + /* now call the driver */ + Status = IoCallDriver(DeviceExt->PrevDeviceObject, Irp); + /* did the request complete yet */ + if (Status == STATUS_PENDING) + { + /* not yet, lets wait a bit */ + KeWaitForSingleObject(&Event, Executive, FALSE, FALSE, NULL); + Status = STATUS_SUCCESS; + } + DPRINT1("Returning status %x\n", Status); + return Status; +} Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.h [iso-8859-1] Wed Jan 14 15:47:54 2009 @@ -9,6 +9,7 @@ #include <ntddk.h> #include <portcls.h> +#define YDEBUG #include <debug.h> #include <portcls.h> @@ -102,9 +103,13 @@ typedef struct { PDEVICE_OBJECT PhysicalDeviceObject; + PDEVICE_OBJECT PrevDeviceObject; PCPFNSTARTDEVICE StartDevice; KSDEVICE_HEADER KsDeviceHeader; IAdapterPowerManagement * AdapterPowerManagement; + ULONG MaxSubDevices; + KSOBJECT_CREATE_ITEM * CreateItems; + IResourceList* resources; LIST_ENTRY SubDeviceList;

1 0

[sginsberg] 38764: - Revert 38762 to fix build
by sginsberg＠svn.reactos.org 14 Jan '09

14 Jan '09

Author: sginsberg Date: Wed Jan 14 13:55:51 2009 New Revision: 38764 URL: http://svn.reactos.org/svn/reactos?rev=38764&view=rev Log: - Revert 38762 to fix build Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irp.c [iso-8859-1] Wed Jan 14 13:55:51 2009 @@ -119,7 +119,7 @@ if ( ! NT_SUCCESS(status) ) { DPRINT("StartDevice returned a failure code [0x%8x]\n", status); - //resource_list->lpVtbl->Release(resource_list); + resource_list->lpVtbl->Release(resource_list); Irp->IoStatus.Status = status; IoCompleteRequest(Irp, IO_NO_INCREMENT); @@ -261,50 +261,14 @@ return STATUS_UNSUCCESSFUL; } -static -NTSTATUS -NTAPI -IrpCompletionRoutine( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp, - IN PVOID Context) -{ - KeSetEvent((PRKEVENT)Context, IO_NO_INCREMENT, FALSE); - return STATUS_SUCCESS; -} - - -/* - * @implemented +/* + * @unimplemented */ NTSTATUS NTAPI PcForwardIrpSynchronous( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - KEVENT Event; - PCExtension* DeviceExt; - NTSTATUS Status; - - DPRINT1("PcRegisterSubdevice\n"); - - DeviceExt = (PCExtension*)DeviceObject->DeviceExtension; - - /* initialize the notification event */ - KeInitializeEvent(&Event, NotificationEvent, FALSE); - - /* setup a completion routine */ - IoSetCompletionRoutine(Irp, IrpCompletionRoutine, (PVOID)&Event, TRUE, FALSE, FALSE); - - /* now call the driver */ - Status = IoCallDriver(DeviceExt->PrevDeviceObject, Irp); - /* did the request complete yet */ - if (Status == STATUS_PENDING) - { - /* not yet, lets wait a bit */ - KeWaitForSingleObject(&Event, Executive, FALSE, FALSE, NULL); - Status = STATUS_SUCCESS; - } - - return Status; -} + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +}

1 0

[mkupfer] 38763: Mario Kacmar <kario AT szm DOT sk> - Fix Switch-To Button, enable only if one selected application. - See issue #4028 for more details.
by mkupfer＠svn.reactos.org 14 Jan '09

14 Jan '09

Author: mkupfer Date: Wed Jan 14 12:12:43 2009 New Revision: 38763 URL: http://svn.reactos.org/svn/reactos?rev=38763&view=rev Log: Mario Kacmar <kario AT szm DOT sk> - Fix Switch-To Button, enable only if one selected application. - See issue #4028 for more details. Modified: trunk/reactos/base/applications/taskmgr/applpage.c Modified: trunk/reactos/base/applications/taskmgr/applpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/applpage.c [iso-8859-1] Wed Jan 14 12:12:43 2009 @@ -429,16 +429,23 @@ if (ListView_GetSelectedCount(hApplicationPageListCtrl)) { EnableWindow(hApplicationPageEndTaskButton, TRUE); + } + else + { + EnableWindow(hApplicationPageEndTaskButton, FALSE); + } + /* Enable "Switch To" button only if one app is selected */ + if (ListView_GetSelectedCount(hApplicationPageListCtrl) == 1 ) + { EnableWindow(hApplicationPageSwitchToButton, TRUE); } else { - EnableWindow(hApplicationPageEndTaskButton, FALSE); - EnableWindow(hApplicationPageSwitchToButton, FALSE); - } - - /* If we are on the applications tab the the windows menu will */ - /* be present on the menu bar so enable & disable the menu items */ + EnableWindow(hApplicationPageSwitchToButton, FALSE); + } + + /* If we are on the applications tab the windows menu will be */ + /* present on the menu bar so enable & disable the menu items */ if (TabCtrl_GetCurSel(hTabWnd) == 0) { HMENU hMenu;

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