Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 22678: Mikhail Zvyozdochkin: Fix compilation of msafd without precompiled header (also fixes compilation process on linux)
by fireball＠svn.reactos.org 28 Jun '06

28 Jun '06

Author: fireball Date: Thu Jun 29 00:27:41 2006 New Revision: 22678 URL: http://svn.reactos.org/svn/reactos?rev=22678&view=rev Log: Mikhail Zvyozdochkin: Fix compilation of msafd without precompiled header (also fixes compilation process on linux) Modified: trunk/reactos/dll/win32/msafd/msafd.rbuild Modified: trunk/reactos/dll/win32/msafd/msafd.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/msafd.rbui… ============================================================================== --- trunk/reactos/dll/win32/msafd/msafd.rbuild (original) +++ trunk/reactos/dll/win32/msafd/msafd.rbuild Thu Jun 29 00:27:41 2006 @@ -1,5 +1,6 @@ <module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}" installbase="system32" installname="msafd.dll"> <importlibrary definition="msafd.def" /> + <include base="msafd">.</include> <include base="msafd">include</include> <include base="ReactOS">include/reactos/drivers</include> <define name="UNICODE" />

1 0

[ion] 22677: [AUDIT] - Unlock these files, they're just lame wrappers around the NT Kernel APIs that handle them and they're tested by WINE tests.
by ion＠svn.reactos.org 28 Jun '06

28 Jun '06

Author: ion Date: Wed Jun 28 23:52:45 2006 New Revision: 22677 URL: http://svn.reactos.org/svn/reactos?rev=22677&view=rev Log: [AUDIT] - Unlock these files, they're just lame wrappers around the NT Kernel APIs that handle them and they're tested by WINE tests. Modified: trunk/reactos/dll/win32/kernel32/synch/event.c (props changed) trunk/reactos/dll/win32/kernel32/synch/mutex.c (props changed) trunk/reactos/dll/win32/kernel32/synch/sem.c (props changed) trunk/reactos/dll/win32/kernel32/synch/timer.c (props changed) trunk/reactos/dll/win32/kernel32/synch/wait.c (props changed) Propchange: trunk/reactos/dll/win32/kernel32/synch/event.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/synch/mutex.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/synch/sem.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/synch/timer.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/dll/win32/kernel32/synch/wait.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[ion] 22676: - Rewrite all synch object wrappers in kernel32 to use a single unified method of implementation: - A->W converstion through static TEB buffer. - Failure if opening without a name. - Special warning code for objects that already exist (fixes some WINE test failures and probably makes a myriad of applications work). - Use BasepConvertObjectAttributes when creating an object to remove code duplication. - InitializeCrticalSectionAndSpinCount shouldn't raise an exception on failure. - O
by ion＠svn.reactos.org 28 Jun '06

28 Jun '06

Author: ion Date: Wed Jun 28 21:08:35 2006 New Revision: 22676 URL: http://svn.reactos.org/svn/reactos?rev=22676&view=rev Log: - Rewrite all synch object wrappers in kernel32 to use a single unified method of implementation: - A->W converstion through static TEB buffer. - Failure if opening without a name. - Special warning code for objects that already exist (fixes some WINE test failures and probably makes a myriad of applications work). - Use BasepConvertObjectAttributes when creating an object to remove code duplication. - InitializeCrticalSectionAndSpinCount shouldn't raise an exception on failure. - Optimize WaitForMultipleObjects to cache 8 objects on the stack instead of only 3. - Reformat and comment all the files to ROS standards. Modified: trunk/reactos/dll/win32/kernel32/synch/critical.c trunk/reactos/dll/win32/kernel32/synch/event.c trunk/reactos/dll/win32/kernel32/synch/mutex.c trunk/reactos/dll/win32/kernel32/synch/sem.c trunk/reactos/dll/win32/kernel32/synch/timer.c trunk/reactos/dll/win32/kernel32/synch/wait.c Modified: trunk/reactos/dll/win32/kernel32/synch/critical.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/c… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/critical.c (original) +++ trunk/reactos/dll/win32/kernel32/synch/critical.c Wed Jun 28 21:08:35 2006 @@ -1,58 +1,58 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/kernel32/sync/critical.c - * PURPOSE: Critical sections - * PROGRAMMER: Filip Navara - * Eric Kohl - * UPDATE HISTORY: - * Created 30/09/98 +/* + * PROJECT: ReactOS Win32 Base API + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/kernel32/synch/critical.c + * PURPOSE: Wrappers for the RTL Critical Section Implementation + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ -/* INCLUDES ******************************************************************/ +/* INCLUDES *****************************************************************/ #include <k32.h> #define NDEBUG -#include "../include/debug.h" - +#include "debug.h" /* FUNCTIONS *****************************************************************/ /* * @implemented */ -VOID STDCALL -InitializeCriticalSection(LPCRITICAL_SECTION lpCriticalSection) +VOID +WINAPI +InitializeCriticalSection(OUT LPCRITICAL_SECTION lpCriticalSection) { - NTSTATUS Status; + NTSTATUS Status; - Status = RtlInitializeCriticalSection((PRTL_CRITICAL_SECTION)lpCriticalSection); - if (!NT_SUCCESS(Status)) - { - RtlRaiseStatus(Status); - } + /* Initialize the critical section and raise an exception if we failed */ + Status = RtlInitializeCriticalSection( + (PRTL_CRITICAL_SECTION)lpCriticalSection); + if (!NT_SUCCESS(Status)) RtlRaiseStatus(Status); } /* * @implemented */ BOOL -STDCALL -InitializeCriticalSectionAndSpinCount( - LPCRITICAL_SECTION lpCriticalSection, - DWORD dwSpinCount - ) +WINAPI +InitializeCriticalSectionAndSpinCount(OUT LPCRITICAL_SECTION lpCriticalSection, + IN DWORD dwSpinCount) { NTSTATUS Status; - Status = RtlInitializeCriticalSectionAndSpinCount((PRTL_CRITICAL_SECTION)lpCriticalSection, dwSpinCount); - if (Status) - { - RtlRaiseStatus(Status); - } - return NT_SUCCESS(Status); + /* Initialize the critical section */ + Status = RtlInitializeCriticalSectionAndSpinCount( + (PRTL_CRITICAL_SECTION)lpCriticalSection, + dwSpinCount); + if (!NT_SUCCESS(Status)) + { + /* Set failure code */ + SetLastErrorByStatus(Status); + return FALSE; + } + + /* Success */ + return TRUE; } /* EOF */ Modified: trunk/reactos/dll/win32/kernel32/synch/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/e… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/event.c (original) +++ trunk/reactos/dll/win32/kernel32/synch/event.c Wed Jun 28 21:08:35 2006 @@ -1,12 +1,9 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/kernel32/synch/event.c - * PURPOSE: Local string functions - * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) - * UPDATE HISTORY: - * Created 01/11/98 +/* + * PROJECT: ReactOS Win32 Base API + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/kernel32/synch/event.c + * PURPOSE: Wrappers for the NT Event Implementation + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -14,228 +11,233 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" - +#include "debug.h" /* FUNCTIONS ****************************************************************/ +HANDLE +WINAPI +CreateEventA(IN LPSECURITY_ATTRIBUTES lpEventAttributes OPTIONAL, + IN BOOL bManualReset, + IN BOOL bInitialState, + IN LPCSTR lpName OPTIONAL) +{ + NTSTATUS Status; + ANSI_STRING AnsiName; + PUNICODE_STRING UnicodeCache; + LPCWSTR UnicodeName = NULL; + + /* Check for a name */ + if (lpName) + { + /* Use TEB Cache */ + UnicodeCache = &NtCurrentTeb()->StaticUnicodeString; + + /* Convert to unicode */ + RtlInitAnsiString(&AnsiName, lpName); + Status = RtlAnsiStringToUnicodeString(UnicodeCache, &AnsiName, FALSE); + if (!NT_SUCCESS(Status)) + { + /* Conversion failed */ + SetLastErrorByStatus(Status); + return NULL; + } + + /* Otherwise, save the buffer */ + UnicodeName = (LPCWSTR)UnicodeCache->Buffer; + } + + /* Call the Unicode API */ + return CreateEventW(lpEventAttributes, + bManualReset, + bInitialState, + UnicodeName); +} + +HANDLE +WINAPI +CreateEventW(IN LPSECURITY_ATTRIBUTES lpEventAttributes OPTIONAL, + IN BOOL bManualReset, + IN BOOL bInitialState, + IN LPCWSTR lpName OPTIONAL) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES LocalAttributes; + POBJECT_ATTRIBUTES ObjectAttributes; + HANDLE Handle; + UNICODE_STRING ObjectName; + + /* Now check if we got a name */ + if (lpName) RtlInitUnicodeString(&ObjectName, lpName); + + /* Now convert the object attributes */ + ObjectAttributes = BasepConvertObjectAttributes(&LocalAttributes, + lpEventAttributes, + lpName ? &ObjectName : NULL); + + /* Create the event */ + Status = NtCreateEvent(&Handle, + EVENT_ALL_ACCESS, + ObjectAttributes, + bManualReset ? + NotificationEvent : SynchronizationEvent, + (BOOLEAN)bInitialState); + if (NT_SUCCESS(Status)) + { + /* Check if the object already existed */ + if (Status == STATUS_OBJECT_NAME_EXISTS) + { + /* Set distinguished Win32 error code */ + SetLastError(ERROR_ALREADY_EXISTS); + } + else + { + /* Otherwise, set success */ + SetLastError(ERROR_SUCCESS); + } + + /* Return the handle */ + return Handle; + } + else + { + /* Convert the NT Status and fail */ + SetLastErrorByStatus(Status); + return NULL; + } +} + +HANDLE +WINAPI +OpenEventA(IN DWORD dwDesiredAccess, + IN BOOL bInheritHandle, + IN LPCSTR lpName) +{ + NTSTATUS Status; + ANSI_STRING AnsiName; + PUNICODE_STRING UnicodeCache; + + /* Check for a name */ + if (lpName) + { + /* Use TEB Cache */ + UnicodeCache = &NtCurrentTeb()->StaticUnicodeString; + + /* Convert to unicode */ + RtlInitAnsiString(&AnsiName, lpName); + Status = RtlAnsiStringToUnicodeString(UnicodeCache, &AnsiName, FALSE); + if (!NT_SUCCESS(Status)) + { + /* Conversion failed */ + SetLastErrorByStatus(Status); + return NULL; + } + } + else + { + /* We need a name */ + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + /* Call the Unicode API */ + return OpenEventW(dwDesiredAccess, + bInheritHandle, + (LPCWSTR)UnicodeCache->Buffer); +} + +HANDLE +WINAPI +OpenEventW(IN DWORD dwDesiredAccess, + IN BOOL bInheritHandle, + IN LPCWSTR lpName) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING ObjectName; + NTSTATUS Status; + HANDLE Handle; + + /* Make sure we got a name */ + if (!lpName) + { + /* Fail without one */ + SetLastErrorByStatus(STATUS_INVALID_PARAMETER); + return NULL; + } + + /* Initialize the object name and attributes */ + RtlInitUnicodeString(&ObjectName, lpName); + InitializeObjectAttributes(&ObjectAttributes, + &ObjectName, + bInheritHandle ? OBJ_INHERIT : 0, + hBaseDir, + NULL); + + /* Open the event */ + Status = NtOpenEvent(&Handle, dwDesiredAccess, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + /* Convert the status and fail */ + SetLastErrorByStatus(Status); + return NULL; + } + + /* Return the handle */ + return Handle; +} + /* * @implemented */ -HANDLE STDCALL -CreateEventA(LPSECURITY_ATTRIBUTES lpEventAttributes, - BOOL bManualReset, - BOOL bInitialState, - LPCSTR lpName) -{ - UNICODE_STRING EventNameU; - ANSI_STRING EventName; - HANDLE EventHandle; - - if (lpName) - { - RtlInitAnsiString(&EventName, - (LPSTR)lpName); - RtlAnsiStringToUnicodeString(&EventNameU, - &EventName, - TRUE); - } - - EventHandle = CreateEventW(lpEventAttributes, - bManualReset, - bInitialState, - (lpName ? EventNameU.Buffer : NULL)); - - if (lpName) - { - RtlFreeUnicodeString(&EventNameU); - } - - return EventHandle; -} - +BOOL +WINAPI +PulseEvent(IN HANDLE hEvent) +{ + NTSTATUS Status; + + /* Pulse the event */ + Status = NtPulseEvent(hEvent, NULL); + if (NT_SUCCESS(Status)) return TRUE; + + /* If we got here, then we failed */ + SetLastErrorByStatus(Status); + return FALSE; +} /* * @implemented */ -HANDLE STDCALL -CreateEventW(LPSECURITY_ATTRIBUTES lpEventAttributes, - BOOL bManualReset, - BOOL bInitialState, - LPCWSTR lpName) -{ - NTSTATUS Status; - HANDLE hEvent; - UNICODE_STRING UnicodeName; - OBJECT_ATTRIBUTES ObjectAttributes; - - if (lpName != NULL) - { - RtlInitUnicodeString(&UnicodeName, (LPWSTR)lpName); - } - - InitializeObjectAttributes(&ObjectAttributes, - (lpName ? &UnicodeName : NULL), - 0, - (lpName ? hBaseDir : NULL), - NULL); - - if (lpEventAttributes != NULL) - { - ObjectAttributes.SecurityDescriptor = lpEventAttributes->lpSecurityDescriptor; - if (lpEventAttributes->bInheritHandle) - { - ObjectAttributes.Attributes |= OBJ_INHERIT; - } - } - - Status = NtCreateEvent(&hEvent, - EVENT_ALL_ACCESS, - &ObjectAttributes, - (bManualReset ? NotificationEvent : SynchronizationEvent), - bInitialState); - DPRINT( "Called\n" ); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return NULL; - } - - return hEvent; -} - +BOOL +WINAPI +ResetEvent(IN HANDLE hEvent) +{ + NTSTATUS Status; + + /* Clear the event */ + Status = NtResetEvent(hEvent, NULL); + if (NT_SUCCESS(Status)) return TRUE; + + /* If we got here, then we failed */ + SetLastErrorByStatus(Status); + return FALSE; +} /* * @implemented */ -HANDLE STDCALL -OpenEventA(DWORD dwDesiredAccess, - BOOL bInheritHandle, - LPCSTR lpName) -{ - UNICODE_STRING EventNameU; - ANSI_STRING EventName; - HANDLE EventHandle; - - if (lpName == NULL) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return NULL; - } - - RtlInitUnicodeString(&EventNameU, - NULL); - - RtlInitAnsiString(&EventName, - (LPSTR)lpName); - RtlAnsiStringToUnicodeString(&EventNameU, - &EventName, - TRUE); - - EventHandle = OpenEventW(dwDesiredAccess, - bInheritHandle, - EventNameU.Buffer); - - RtlFreeUnicodeString(&EventNameU); - - return EventHandle; -} - - -/* - * @implemented - */ -HANDLE STDCALL -OpenEventW(DWORD dwDesiredAccess, - BOOL bInheritHandle, - LPCWSTR lpName) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING EventNameString; - NTSTATUS Status; - HANDLE hEvent = NULL; - - if (lpName == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return NULL; - } - - RtlInitUnicodeString(&EventNameString, (LPWSTR)lpName); - - InitializeObjectAttributes(&ObjectAttributes, - &EventNameString, - (bInheritHandle ? OBJ_INHERIT : 0), - hBaseDir, - NULL); - - Status = NtOpenEvent(&hEvent, - dwDesiredAccess, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return NULL; - } - - return hEvent; -} - - -/* - * @implemented - */ -BOOL STDCALL -PulseEvent(HANDLE hEvent) -{ - NTSTATUS Status; - - Status = NtPulseEvent(hEvent, NULL); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus (Status); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL STDCALL -ResetEvent(HANDLE hEvent) -{ - NTSTATUS Status; - - Status = NtClearEvent(hEvent); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -BOOL STDCALL -SetEvent(HANDLE hEvent) -{ - NTSTATUS Status; - - Status = NtSetEvent(hEvent, NULL); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - - return TRUE; +BOOL +WINAPI +SetEvent(IN HANDLE hEvent) +{ + NTSTATUS Status; + + /* Set the event */ + Status = NtSetEvent(hEvent, NULL); + if (NT_SUCCESS(Status)) return TRUE; + + /* If we got here, then we failed */ + SetLastErrorByStatus(Status); + return FALSE; } /* EOF */ Modified: trunk/reactos/dll/win32/kernel32/synch/mutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/m… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/mutex.c (original) +++ trunk/reactos/dll/win32/kernel32/synch/mutex.c Wed Jun 28 21:08:35 2006 @@ -1,12 +1,9 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/kernel32/synch/mutex.c - * PURPOSE: Mutex functions - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) - * UPDATE HISTORY: - * Created 01/20/2001 +/* + * PROJECT: ReactOS Win32 Base API + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/kernel32/synch/mutex.c + * PURPOSE: Wrappers for the NT Mutant Implementation + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -14,214 +11,204 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" - +#include "debug.h" /* FUNCTIONS *****************************************************************/ /* * @implemented */ -HANDLE STDCALL -CreateMutexA(LPSECURITY_ATTRIBUTES lpMutexAttributes, - BOOL bInitialOwner, - LPCSTR lpName) -{ - UNICODE_STRING NameU; - ANSI_STRING Name; - HANDLE Handle; - - if (lpName != NULL) - { - RtlInitAnsiString(&Name, - (LPSTR)lpName); - - RtlAnsiStringToUnicodeString(&NameU, - &Name, - TRUE); - } - - Handle = CreateMutexW(lpMutexAttributes, - bInitialOwner, - (lpName ? NameU.Buffer : NULL)); - - if (lpName != NULL) - { - RtlFreeUnicodeString(&NameU); - } - - return Handle; -} - - -/* - * @implemented - */ -HANDLE STDCALL -CreateMutexW(LPSECURITY_ATTRIBUTES lpMutexAttributes, - BOOL bInitialOwner, - LPCWSTR lpName) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - NTSTATUS Status; - UNICODE_STRING UnicodeName; - HANDLE MutantHandle; - - if (lpName != NULL) - { - RtlInitUnicodeString(&UnicodeName, - (LPWSTR)lpName); - } - - InitializeObjectAttributes(&ObjectAttributes, - (lpName ? &UnicodeName : NULL), - 0, - (lpName ? hBaseDir : NULL), - NULL); - - if (lpMutexAttributes != NULL) - { - ObjectAttributes.SecurityDescriptor = lpMutexAttributes->lpSecurityDescriptor; - if (lpMutexAttributes->bInheritHandle) - { - ObjectAttributes.Attributes |= OBJ_INHERIT; - } - } - - Status = NtCreateMutant(&MutantHandle, - MUTEX_ALL_ACCESS, - &ObjectAttributes, - (BOOLEAN)bInitialOwner); - if (Status == STATUS_OBJECT_NAME_COLLISION) - { - Status = NtOpenMutant(&MutantHandle, - MUTEX_ALL_ACCESS, - &ObjectAttributes); - if (NT_SUCCESS(Status)) - { - SetLastError(ERROR_ALREADY_EXISTS); - } - } - else if (NT_SUCCESS(Status)) - { - SetLastError(ERROR_SUCCESS); - } - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return NULL; - } - - return MutantHandle; -} - - -/* - * @implemented - */ -HANDLE STDCALL -OpenMutexA(DWORD dwDesiredAccess, - BOOL bInheritHandle, - LPCSTR lpName) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING NameU; - ANSI_STRING Name; - HANDLE Handle; - NTSTATUS Status; - - if (lpName == NULL) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return NULL; - } - - RtlInitAnsiString(&Name, - (LPSTR)lpName); - RtlAnsiStringToUnicodeString(&NameU, - &Name, - TRUE); - - InitializeObjectAttributes(&ObjectAttributes, - &NameU, - (bInheritHandle ? OBJ_INHERIT : 0), - hBaseDir, - NULL); - - Status = NtOpenMutant(&Handle, - (ACCESS_MASK)dwDesiredAccess, - &ObjectAttributes); - - RtlFreeUnicodeString(&NameU); - - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return NULL; - } - - return Handle; -} - - -/* - * @implemented - */ -HANDLE STDCALL -OpenMutexW(DWORD dwDesiredAccess, - BOOL bInheritHandle, - LPCWSTR lpName) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING Name; - HANDLE Handle; - NTSTATUS Status; - - if (lpName == NULL) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return NULL; - } - - RtlInitUnicodeString(&Name, - (LPWSTR)lpName); - - InitializeObjectAttributes(&ObjectAttributes, - &Name, - (bInheritHandle ? OBJ_INHERIT : 0), - hBaseDir, - NULL); - - Status = NtOpenMutant(&Handle, - (ACCESS_MASK)dwDesiredAccess, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return NULL; - } - - return Handle; -} - - -/* - * @implemented - */ -BOOL STDCALL -ReleaseMutex(HANDLE hMutex) -{ - NTSTATUS Status; - - Status = NtReleaseMutant(hMutex, - NULL); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - - return TRUE; +HANDLE +WINAPI +CreateMutexA(IN LPSECURITY_ATTRIBUTES lpMutexAttributes OPTIONAL, + IN BOOL bInitialOwner, + IN LPCSTR lpName OPTIONAL) +{ + NTSTATUS Status; + ANSI_STRING AnsiName; + PUNICODE_STRING UnicodeCache; + LPCWSTR UnicodeName = NULL; + + /* Check for a name */ + if (lpName) + { + /* Use TEB Cache */ + UnicodeCache = &NtCurrentTeb()->StaticUnicodeString; + + /* Convert to unicode */ + RtlInitAnsiString(&AnsiName, lpName); + Status = RtlAnsiStringToUnicodeString(UnicodeCache, &AnsiName, FALSE); + if (!NT_SUCCESS(Status)) + { + /* Conversion failed */ + SetLastErrorByStatus(Status); + return NULL; + } + + /* Otherwise, save the buffer */ + UnicodeName = (LPCWSTR)UnicodeCache->Buffer; + } + + /* Call the Unicode API */ + return CreateMutexW(lpMutexAttributes, + bInitialOwner, + UnicodeName); +} + +/* + * @implemented + */ +HANDLE +WINAPI +CreateMutexW(IN LPSECURITY_ATTRIBUTES lpMutexAttributes OPTIONAL, + IN BOOL bInitialOwner, + IN LPCWSTR lpName OPTIONAL) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES LocalAttributes; + POBJECT_ATTRIBUTES ObjectAttributes; + HANDLE Handle; + UNICODE_STRING ObjectName; + + /* Now check if we got a name */ + if (lpName) RtlInitUnicodeString(&ObjectName, lpName); + + /* Now convert the object attributes */ + ObjectAttributes = BasepConvertObjectAttributes(&LocalAttributes, + lpMutexAttributes, + lpName ? &ObjectName : NULL); + + /* Create the mutant */ + Status = NtCreateMutant(&Handle, + MUTANT_ALL_ACCESS, + ObjectAttributes, + (BOOLEAN)bInitialOwner); + if (NT_SUCCESS(Status)) + { + /* Check if the object already existed */ + if (Status == STATUS_OBJECT_NAME_EXISTS) + { + /* Set distinguished Win32 error code */ + SetLastError(ERROR_ALREADY_EXISTS); + } + else + { + /* Otherwise, set success */ + SetLastError(ERROR_SUCCESS); + } + + /* Return the handle */ + return Handle; + } + else + { + /* Convert the NT Status and fail */ + SetLastErrorByStatus(Status); + return NULL; + } +} + +/* + * @implemented + */ +HANDLE +WINAPI +OpenMutexA(IN DWORD dwDesiredAccess, + IN BOOL bInheritHandle, + IN LPCSTR lpName) +{ + NTSTATUS Status; + ANSI_STRING AnsiName; + PUNICODE_STRING UnicodeCache; + + /* Check for a name */ + if (lpName) + { + /* Use TEB Cache */ + UnicodeCache = &NtCurrentTeb()->StaticUnicodeString; + + /* Convert to unicode */ + RtlInitAnsiString(&AnsiName, lpName); + Status = RtlAnsiStringToUnicodeString(UnicodeCache, &AnsiName, FALSE); + if (!NT_SUCCESS(Status)) + { + /* Conversion failed */ + SetLastErrorByStatus(Status); + return NULL; + } + } + else + { + /* We need a name */ + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + /* Call the Unicode API */ + return OpenMutexW(dwDesiredAccess, + bInheritHandle, + (LPCWSTR)UnicodeCache->Buffer); +} + +/* + * @implemented + */ +HANDLE +WINAPI +OpenMutexW(IN DWORD dwDesiredAccess, + IN BOOL bInheritHandle, + IN LPCWSTR lpName) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING ObjectName; + NTSTATUS Status; + HANDLE Handle; + + /* Make sure we got a name */ + if (!lpName) + { + /* Fail without one */ + SetLastErrorByStatus(STATUS_INVALID_PARAMETER); + return NULL; + } + + /* Initialize the object name and attributes */ + RtlInitUnicodeString(&ObjectName, lpName); + InitializeObjectAttributes(&ObjectAttributes, + &ObjectName, + bInheritHandle ? OBJ_INHERIT : 0, + hBaseDir, + NULL); + + /* Open the mutant */ + Status = NtOpenMutant(&Handle, dwDesiredAccess, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + /* Convert the status and fail */ + SetLastErrorByStatus(Status); + return NULL; + } + + /* Return the handle */ + return Handle; +} + +/* + * @implemented + */ +BOOL +WINAPI +ReleaseMutex(IN HANDLE hMutex) +{ + NTSTATUS Status; + + /* Release the mutant */ + Status = NtReleaseMutant(hMutex, NULL); + if (NT_SUCCESS(Status)) return TRUE; + + /* If we got here, then we failed */ + SetLastErrorByStatus(Status); + return FALSE; } Modified: trunk/reactos/dll/win32/kernel32/synch/sem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/s… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/sem.c (original) +++ trunk/reactos/dll/win32/kernel32/synch/sem.c Wed Jun 28 21:08:35 2006 @@ -1,12 +1,9 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/kernel32/synch/sem.c - * PURPOSE: Semaphore functions - * PROGRAMMER: Eric Kohl (ekohl(a)rz-online.de) - * UPDATE HISTORY: - * Created 01/20/2001 +/* + * PROJECT: ReactOS Win32 Base API + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/kernel32/synch/sem.c + * PURPOSE: Wrappers for the NT Semaphore Implementation + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -14,204 +11,210 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" - +#include "debug.h" /* FUNCTIONS ****************************************************************/ /* * @implemented */ -HANDLE STDCALL -CreateSemaphoreA(LPSECURITY_ATTRIBUTES lpSemaphoreAttributes, - LONG lInitialCount, - LONG lMaximumCount, - LPCSTR lpName) -{ - UNICODE_STRING NameU; - ANSI_STRING Name; - HANDLE Handle; - - if (lpName != NULL) - { - RtlInitAnsiString(&Name, - (LPSTR)lpName); - RtlAnsiStringToUnicodeString(&NameU, - &Name, - TRUE); - } - - Handle = CreateSemaphoreW(lpSemaphoreAttributes, - lInitialCount, - lMaximumCount, - (lpName ? NameU.Buffer : NULL)); - - if (lpName != NULL) - { - RtlFreeUnicodeString (&NameU); - } - - return Handle; -} - - -/* - * @implemented - */ -HANDLE STDCALL -CreateSemaphoreW(LPSECURITY_ATTRIBUTES lpSemaphoreAttributes, - LONG lInitialCount, - LONG lMaximumCount, - LPCWSTR lpName) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - NTSTATUS Status; - UNICODE_STRING UnicodeName; - HANDLE SemaphoreHandle; - - if (lpName != NULL) - { - RtlInitUnicodeString(&UnicodeName, lpName); - } - - InitializeObjectAttributes(&ObjectAttributes, - (lpName ? &UnicodeName : NULL), - 0, - (lpName ? hBaseDir : NULL), - NULL); - - if (lpSemaphoreAttributes != NULL) - { - ObjectAttributes.SecurityDescriptor = lpSemaphoreAttributes->lpSecurityDescriptor; - if (lpSemaphoreAttributes->bInheritHandle) - { - ObjectAttributes.Attributes |= OBJ_INHERIT; - } - } - - Status = NtCreateSemaphore(&SemaphoreHandle, - SEMAPHORE_ALL_ACCESS, - &ObjectAttributes, - lInitialCount, - lMaximumCount); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return NULL; - } - return SemaphoreHandle; -} - - -/* - * @implemented - */ -HANDLE STDCALL -OpenSemaphoreA(DWORD dwDesiredAccess, - BOOL bInheritHandle, - LPCSTR lpName) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING NameU; - ANSI_STRING Name; - HANDLE Handle; - NTSTATUS Status; - - if (lpName == NULL) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return NULL; - } - - RtlInitAnsiString(&Name, - (LPSTR)lpName); - RtlAnsiStringToUnicodeString(&NameU, - &Name, - TRUE); - - InitializeObjectAttributes(&ObjectAttributes, - &NameU, - (bInheritHandle ? OBJ_INHERIT : 0), - hBaseDir, - NULL); - - Status = NtOpenSemaphore(&Handle, - (ACCESS_MASK)dwDesiredAccess, - &ObjectAttributes); - - RtlFreeUnicodeString(&NameU); - - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return NULL; - } - - return Handle; -} - - -/* - * @implemented - */ -HANDLE STDCALL -OpenSemaphoreW(DWORD dwDesiredAccess, - BOOL bInheritHandle, - LPCWSTR lpName) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING Name; - HANDLE Handle; - NTSTATUS Status; - - if (lpName == NULL) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return NULL; - } - - RtlInitUnicodeString(&Name, - (LPWSTR)lpName); - - InitializeObjectAttributes(&ObjectAttributes, - &Name, - (bInheritHandle ? OBJ_INHERIT : 0), - hBaseDir, - NULL); - - Status = NtOpenSemaphore(&Handle, - (ACCESS_MASK)dwDesiredAccess, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return NULL; - } - - return Handle; -} - - -/* - * @implemented - */ -BOOL STDCALL -ReleaseSemaphore(HANDLE hSemaphore, - LONG lReleaseCount, - LPLONG lpPreviousCount) -{ - NTSTATUS Status; - - Status = NtReleaseSemaphore(hSemaphore, - lReleaseCount, - lpPreviousCount); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - - return TRUE; +HANDLE +WINAPI +CreateSemaphoreA(IN LPSECURITY_ATTRIBUTES lpSemaphoreAttributes OPTIONAL, + IN LONG lInitialCount, + IN LONG lMaximumCount, + IN LPCSTR lpName OPTIONAL) +{ + NTSTATUS Status; + ANSI_STRING AnsiName; + PUNICODE_STRING UnicodeCache; + LPCWSTR UnicodeName = NULL; + + /* Check for a name */ + if (lpName) + { + /* Use TEB Cache */ + UnicodeCache = &NtCurrentTeb()->StaticUnicodeString; + + /* Convert to unicode */ + RtlInitAnsiString(&AnsiName, lpName); + Status = RtlAnsiStringToUnicodeString(UnicodeCache, &AnsiName, FALSE); + if (!NT_SUCCESS(Status)) + { + /* Conversion failed */ + SetLastErrorByStatus(Status); + return NULL; + } + + /* Otherwise, save the buffer */ + UnicodeName = (LPCWSTR)UnicodeCache->Buffer; + } + + /* Call the Unicode API */ + return CreateSemaphoreW(lpSemaphoreAttributes, + lInitialCount, + lMaximumCount, + UnicodeName); +} + +/* + * @implemented + */ +HANDLE +WINAPI +CreateSemaphoreW(IN LPSECURITY_ATTRIBUTES lpSemaphoreAttributes OPTIONAL, + IN LONG lInitialCount, + IN LONG lMaximumCount, + IN LPCWSTR lpName OPTIONAL) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES LocalAttributes; + POBJECT_ATTRIBUTES ObjectAttributes; + HANDLE Handle; + UNICODE_STRING ObjectName; + + /* Now check if we got a name */ + if (lpName) RtlInitUnicodeString(&ObjectName, lpName); + + /* Now convert the object attributes */ + ObjectAttributes = BasepConvertObjectAttributes(&LocalAttributes, + lpSemaphoreAttributes, + lpName ? &ObjectName : NULL); + + /* Create the semaphore */ + Status = NtCreateSemaphore(&Handle, + SEMAPHORE_ALL_ACCESS, + ObjectAttributes, + lInitialCount, + lMaximumCount); + if (NT_SUCCESS(Status)) + { + /* Check if the object already existed */ + if (Status == STATUS_OBJECT_NAME_EXISTS) + { + /* Set distinguished Win32 error code */ + SetLastError(ERROR_ALREADY_EXISTS); + } + else + { + /* Otherwise, set success */ + SetLastError(ERROR_SUCCESS); + } + + /* Return the handle */ + return Handle; + } + else + { + /* Convert the NT Status and fail */ + SetLastErrorByStatus(Status); + return NULL; + } +} + +/* + * @implemented + */ +HANDLE +WINAPI +OpenSemaphoreA(IN DWORD dwDesiredAccess, + IN BOOL bInheritHandle, + IN LPCSTR lpName) +{ + NTSTATUS Status; + ANSI_STRING AnsiName; + PUNICODE_STRING UnicodeCache; + + /* Check for a name */ + if (lpName) + { + /* Use TEB Cache */ + UnicodeCache = &NtCurrentTeb()->StaticUnicodeString; + + /* Convert to unicode */ + RtlInitAnsiString(&AnsiName, lpName); + Status = RtlAnsiStringToUnicodeString(UnicodeCache, &AnsiName, FALSE); + if (!NT_SUCCESS(Status)) + { + /* Conversion failed */ + SetLastErrorByStatus(Status); + return NULL; + } + } + else + { + /* We need a name */ + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + /* Call the Unicode API */ + return OpenSemaphoreW(dwDesiredAccess, + bInheritHandle, + (LPCWSTR)UnicodeCache->Buffer); +} + +/* + * @implemented + */ +HANDLE +WINAPI +OpenSemaphoreW(IN DWORD dwDesiredAccess, + IN BOOL bInheritHandle, + IN LPCWSTR lpName) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING ObjectName; + NTSTATUS Status; + HANDLE Handle; + + /* Make sure we got a name */ + if (!lpName) + { + /* Fail without one */ + SetLastErrorByStatus(STATUS_INVALID_PARAMETER); + return NULL; + } + + /* Initialize the object name and attributes */ + RtlInitUnicodeString(&ObjectName, lpName); + InitializeObjectAttributes(&ObjectAttributes, + &ObjectName, + bInheritHandle ? OBJ_INHERIT : 0, + hBaseDir, + NULL); + + /* Open the semaphore */ + Status = NtOpenSemaphore(&Handle, dwDesiredAccess, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + /* Convert the status and fail */ + SetLastErrorByStatus(Status); + return NULL; + } + + /* Return the handle */ + return Handle; +} + +/* + * @implemented + */ +BOOL +WINAPI +ReleaseSemaphore(IN HANDLE hSemaphore, + IN LONG lReleaseCount, + IN LPLONG lpPreviousCount) +{ + NTSTATUS Status; + + /* Release the semaphore */ + Status = NtReleaseSemaphore(hSemaphore, lReleaseCount, lpPreviousCount); + if (NT_SUCCESS(Status)) return TRUE; + + /* If we got here, then we failed */ + SetLastErrorByStatus(Status); + return FALSE; } /* EOF */ Modified: trunk/reactos/dll/win32/kernel32/synch/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/t… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/timer.c (original) +++ trunk/reactos/dll/win32/kernel32/synch/timer.c Wed Jun 28 21:08:35 2006 @@ -1,224 +1,244 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: lib/kernel32/synch/timer.c - * PURPOSE: Implementing timer - * PROGRAMMER: - */ - -/* INCLUDES ******************************************************************/ +/* + * PROJECT: ReactOS Win32 Base API + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/kernel32/synch/timer.c + * PURPOSE: Wrappers for the NT Timer Implementation + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES *****************************************************************/ #include <k32.h> #define NDEBUG -#include "../include/debug.h" - - -/* FUNCTIONS *****************************************************************/ - -/* - * @implemented - */ -HANDLE STDCALL -CreateWaitableTimerW(LPSECURITY_ATTRIBUTES lpTimerAttributes, - BOOL bManualReset, - LPCWSTR lpTimerName) -{ - NTSTATUS Status; - HANDLE TimerHandle; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING UnicodeName; - - if (lpTimerName) - { - RtlInitUnicodeString(&UnicodeName, lpTimerName); - } - - InitializeObjectAttributes(&ObjectAttributes, - (lpTimerName ? &UnicodeName : NULL), - 0, - (lpTimerName ? hBaseDir : NULL), - NULL); - - if (lpTimerAttributes != NULL) - { - ObjectAttributes.SecurityDescriptor = lpTimerAttributes->lpSecurityDescriptor; - if(lpTimerAttributes->bInheritHandle) - { - ObjectAttributes.Attributes |= OBJ_INHERIT; - } - } - - Status = NtCreateTimer(&TimerHandle, - TIMER_ALL_ACCESS, - &ObjectAttributes, - (bManualReset ? NotificationTimer : SynchronizationTimer)); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return NULL; - } - - return TimerHandle; -} - - -/* - * @implemented - */ -HANDLE STDCALL -CreateWaitableTimerA(LPSECURITY_ATTRIBUTES lpTimerAttributes, - BOOL bManualReset, - LPCSTR lpTimerName) -{ - UNICODE_STRING TimerNameU; - ANSI_STRING TimerName; - HANDLE TimerHandle; - - if (lpTimerName != NULL) - { - RtlInitAnsiString (&TimerName, - (LPSTR)lpTimerName); - RtlAnsiStringToUnicodeString (&TimerNameU, - &TimerName, - TRUE); - } - - TimerHandle = CreateWaitableTimerW (lpTimerAttributes, - bManualReset, - (lpTimerName ? TimerNameU.Buffer : NULL)); - - if (lpTimerName != NULL) - { - RtlFreeUnicodeString (&TimerNameU); - } - - return TimerHandle; -} - - -/* - * @implemented - */ -HANDLE STDCALL -OpenWaitableTimerW(DWORD dwDesiredAccess, - BOOL bInheritHandle, - LPCWSTR lpTimerName) -{ - NTSTATUS Status; - HANDLE TimerHandle; - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING UnicodeName; - - if (lpTimerName == NULL) - { - SetLastErrorByStatus(STATUS_INVALID_PARAMETER); - return NULL; - } - - RtlInitUnicodeString(&UnicodeName, - lpTimerName); - InitializeObjectAttributes(&ObjectAttributes, - &UnicodeName, - (bInheritHandle ? OBJ_INHERIT : 0), - hBaseDir, - NULL); - - Status = NtOpenTimer(&TimerHandle, - dwDesiredAccess, - &ObjectAttributes); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return NULL; - } - - return TimerHandle; -} - - -/* - * @implemented - */ -HANDLE STDCALL -OpenWaitableTimerA(DWORD dwDesiredAccess, - BOOL bInheritHandle, - LPCSTR lpTimerName) -{ - UNICODE_STRING TimerNameU; - ANSI_STRING TimerName; - HANDLE TimerHandle; - - if (lpTimerName == NULL) - { +#include "debug.h" + +/* FUNCTIONS ****************************************************************/ + +/* + * @implemented + */ +HANDLE +WINAPI +CreateWaitableTimerW(IN LPSECURITY_ATTRIBUTES lpTimerAttributes OPTIONAL, + IN BOOL bManualReset, + IN LPCWSTR lpTimerName OPTIONAL) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES LocalAttributes; + POBJECT_ATTRIBUTES ObjectAttributes; + HANDLE Handle; + UNICODE_STRING ObjectName; + + /* Now check if we got a name */ + if (lpTimerName) RtlInitUnicodeString(&ObjectName, lpTimerName); + + /* Now convert the object attributes */ + ObjectAttributes = BasepConvertObjectAttributes(&LocalAttributes, + lpTimerAttributes, + lpTimerName ? &ObjectName : NULL); + + /* Create the timer */ + Status = NtCreateTimer(&Handle, + TIMER_ALL_ACCESS, + ObjectAttributes, + bManualReset ? + NotificationTimer : SynchronizationTimer); + if (NT_SUCCESS(Status)) + { + /* Check if the object already existed */ + if (Status == STATUS_OBJECT_NAME_EXISTS) + { + /* Set distinguished Win32 error code */ + SetLastError(ERROR_ALREADY_EXISTS); + } + else + { + /* Otherwise, set success */ + SetLastError(ERROR_SUCCESS); + } + + /* Return the handle */ + return Handle; + } + else + { + /* Convert the NT Status and fail */ + SetLastErrorByStatus(Status); + return NULL; + } +} + +/* + * @implemented + */ +HANDLE +WINAPI +CreateWaitableTimerA(IN LPSECURITY_ATTRIBUTES lpTimerAttributes OPTIONAL, + IN BOOL bManualReset, + IN LPCSTR lpTimerName OPTIONAL) +{ + NTSTATUS Status; + ANSI_STRING AnsiName; + PUNICODE_STRING UnicodeCache; + LPCWSTR UnicodeName = NULL; + + /* Check for a name */ + if (lpTimerName) + { + /* Use TEB Cache */ + UnicodeCache = &NtCurrentTeb()->StaticUnicodeString; + + /* Convert to unicode */ + RtlInitAnsiString(&AnsiName, lpTimerName); + Status = RtlAnsiStringToUnicodeString(UnicodeCache, &AnsiName, FALSE); + if (!NT_SUCCESS(Status)) + { + /* Conversion failed */ + SetLastErrorByStatus(Status); + return NULL; + } + + /* Otherwise, save the buffer */ + UnicodeName = (LPCWSTR)UnicodeCache->Buffer; + } + + /* Call the Unicode API */ + return CreateWaitableTimerW(lpTimerAttributes, + bManualReset, + UnicodeName); +} + +/* + * @implemented + */ +HANDLE +WINAPI +OpenWaitableTimerW(IN DWORD dwDesiredAccess, + IN BOOL bInheritHandle, + IN LPCWSTR lpTimerName) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING ObjectName; + NTSTATUS Status; + HANDLE Handle; + + /* Make sure we got a name */ + if (!lpTimerName) + { + /* Fail without one */ SetLastErrorByStatus(STATUS_INVALID_PARAMETER); return NULL; - } - - RtlInitAnsiString (&TimerName, - (LPSTR)lpTimerName); - RtlAnsiStringToUnicodeString (&TimerNameU, - &TimerName, - TRUE); - - TimerHandle = OpenWaitableTimerW (dwDesiredAccess, - bInheritHandle, - TimerNameU.Buffer); - - RtlFreeUnicodeString (&TimerNameU); - - return TimerHandle; -} - - -/* - * @implemented - */ -BOOL STDCALL -SetWaitableTimer(HANDLE hTimer, - const LARGE_INTEGER *pDueTime, - LONG lPeriod, - PTIMERAPCROUTINE pfnCompletionRoutine, - LPVOID lpArgToCompletionRoutine, - BOOL fResume) -{ - NTSTATUS Status; - BOOLEAN pState; - - Status = NtSetTimer(hTimer, - (LARGE_INTEGER *)pDueTime, - (PTIMER_APC_ROUTINE)pfnCompletionRoutine, - lpArgToCompletionRoutine, - fResume, - lPeriod, - &pState); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - return TRUE; -} - - -/* - * @implemented - */ -BOOL STDCALL -CancelWaitableTimer(HANDLE hTimer) -{ - NTSTATUS Status; - BOOLEAN CurrentState; - - Status = NtCancelTimer(hTimer, - &CurrentState); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus(Status); - return FALSE; - } - return TRUE; + } + + /* Initialize the object name and attributes */ + RtlInitUnicodeString(&ObjectName, lpTimerName); + InitializeObjectAttributes(&ObjectAttributes, + &ObjectName, + bInheritHandle ? OBJ_INHERIT : 0, + hBaseDir, + NULL); + + /* Open the timer */ + Status = NtOpenTimer(&Handle, dwDesiredAccess, &ObjectAttributes); + if (!NT_SUCCESS(Status)) + { + /* Convert the status and fail */ + SetLastErrorByStatus(Status); + return NULL; + } + + /* Return the handle */ + return Handle; +} + +/* + * @implemented + */ +HANDLE +WINAPI +OpenWaitableTimerA(IN DWORD dwDesiredAccess, + IN BOOL bInheritHandle, + IN LPCSTR lpTimerName) +{ + NTSTATUS Status; + ANSI_STRING AnsiName; + PUNICODE_STRING UnicodeCache; + + /* Check for a name */ + if (lpTimerName) + { + /* Use TEB Cache */ + UnicodeCache = &NtCurrentTeb()->StaticUnicodeString; + + /* Convert to unicode */ + RtlInitAnsiString(&AnsiName, lpTimerName); + Status = RtlAnsiStringToUnicodeString(UnicodeCache, &AnsiName, FALSE); + if (!NT_SUCCESS(Status)) + { + /* Conversion failed */ + SetLastErrorByStatus(Status); + return NULL; + } + } + else + { + /* We need a name */ + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + /* Call the Unicode API */ + return OpenWaitableTimerW(dwDesiredAccess, + bInheritHandle, + (LPCWSTR)UnicodeCache->Buffer); +} + +/* + * @implemented + */ +BOOL +WINAPI +SetWaitableTimer(IN HANDLE hTimer, + IN const LARGE_INTEGER *pDueTime, + IN LONG lPeriod, + IN PTIMERAPCROUTINE pfnCompletionRoutine OPTIONAL, + IN OPTIONAL LPVOID lpArgToCompletionRoutine, + IN BOOL fResume) +{ + NTSTATUS Status; + + /* Set the timer */ + Status = NtSetTimer(hTimer, + (PLARGE_INTEGER)pDueTime, + (PTIMER_APC_ROUTINE)pfnCompletionRoutine, + lpArgToCompletionRoutine, + fResume, + lPeriod, + NULL); + if (NT_SUCCESS(Status)) return TRUE; + + /* If we got here, then we failed */ + SetLastErrorByStatus(Status); + return FALSE; +} + +/* + * @implemented + */ +BOOL +WINAPI +CancelWaitableTimer(IN HANDLE hTimer) +{ + NTSTATUS Status; + + /* Cancel the timer */ + Status = NtCancelTimer(hTimer, NULL); + if (NT_SUCCESS(Status)) return TRUE; + + /* If we got here, then we failed */ + SetLastErrorByStatus(Status); + return FALSE; } /* EOF */ Modified: trunk/reactos/dll/win32/kernel32/synch/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/w… ============================================================================== --- trunk/reactos/dll/win32/kernel32/synch/wait.c (original) +++ trunk/reactos/dll/win32/kernel32/synch/wait.c Wed Jun 28 21:08:35 2006 @@ -1,12 +1,9 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/kernel32/synch/wait.c - * PURPOSE: Wait functions - * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) - * UPDATE HISTORY: - * Created 01/11/98 +/* + * PROJECT: ReactOS Win32 Base API + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/kernel32/synch/wait.c + * PURPOSE: Wrappers for the NT Wait Implementation + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -14,296 +11,310 @@ #include <k32.h> #define NDEBUG -#include "../include/debug.h" - - -/* FUNCTIONS ****************************************************************/ - -DWORD STDCALL -GetConsoleInputWaitHandle (VOID); - -/* - * @implemented - */ -DWORD STDCALL -WaitForSingleObject(HANDLE hHandle, - DWORD dwMilliseconds) -{ - return WaitForSingleObjectEx(hHandle, - dwMilliseconds, - FALSE); -} - - -/* - * @implemented - */ -DWORD STDCALL -WaitForSingleObjectEx(HANDLE hHandle, - DWORD dwMilliseconds, - BOOL bAlertable) +#include "debug.h" + +/* FUNCTIONS *****************************************************************/ + +/* + * @implemented + */ +DWORD +WINAPI +WaitForSingleObject(IN HANDLE hHandle, + IN DWORD dwMilliseconds) +{ + /* Call the extended API */ + return WaitForSingleObjectEx(hHandle, dwMilliseconds, FALSE); +} + +/* + * @implemented + */ +DWORD +WINAPI +WaitForSingleObjectEx(IN HANDLE hHandle, + IN DWORD dwMilliseconds, + IN BOOL bAlertable) { PLARGE_INTEGER TimePtr; LARGE_INTEGER Time; NTSTATUS Status; - /* Get real handle */ - switch ((ULONG)hHandle) - { - case STD_INPUT_HANDLE: - hHandle = NtCurrentPeb()->ProcessParameters->StandardInput; - break; - - case STD_OUTPUT_HANDLE: - hHandle = NtCurrentPeb()->ProcessParameters->StandardOutput; - break; - - case STD_ERROR_HANDLE: - hHandle = NtCurrentPeb()->ProcessParameters->StandardError; - break; - } - - /* Check for console handle */ - if (IsConsoleHandle(hHandle)) - { - if (!VerifyConsoleIoHandle(hHandle)) - { - SetLastError (ERROR_INVALID_HANDLE); - return WAIT_FAILED; - } - - hHandle = (HANDLE)GetConsoleInputWaitHandle(); - if (hHandle == NULL || hHandle == INVALID_HANDLE_VALUE) - { - SetLastError (ERROR_INVALID_HANDLE); - return WAIT_FAILED; - - } - } - - if (dwMilliseconds == INFINITE) - { - TimePtr = NULL; - } - else - { - Time.QuadPart = -10000 * (LONGLONG)dwMilliseconds; - TimePtr = &Time; - } - - do - { - Status = NtWaitForSingleObject(hHandle, - (BOOLEAN) bAlertable, - TimePtr); - - if (HIWORD(Status)) - { - SetLastErrorByStatus (Status); - return WAIT_FAILED; - } - - } while (Status == STATUS_ALERTED && bAlertable); - - return Status; -} - - -/* - * @implemented - */ -DWORD STDCALL -WaitForMultipleObjects(DWORD nCount, - CONST HANDLE *lpHandles, - BOOL bWaitAll, - DWORD dwMilliseconds) -{ - return WaitForMultipleObjectsEx(nCount, - lpHandles, - bWaitAll, - dwMilliseconds, - FALSE); -} - - -/* - * @implemented - */ -DWORD STDCALL -WaitForMultipleObjectsEx(DWORD nCount, - CONST HANDLE *lpHandles, - BOOL bWaitAll, - DWORD dwMilliseconds, - BOOL bAlertable) -{ - PLARGE_INTEGER TimePtr; - LARGE_INTEGER Time; - PHANDLE HandleBuffer; - HANDLE Handle[3]; - DWORD i; - NTSTATUS Status; - - DPRINT("nCount %lu\n", nCount); - - if (nCount > 3) - { - HandleBuffer = RtlAllocateHeap(RtlGetProcessHeap(), 0, nCount * sizeof(HANDLE)); - if (HandleBuffer == NULL) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return WAIT_FAILED; - } - } - else - { - HandleBuffer = Handle; - } - for (i = 0; i < nCount; i++) - { - switch ((DWORD)lpHandles[i]) - { - case STD_INPUT_HANDLE: - HandleBuffer[i] = NtCurrentPeb()->ProcessParameters->StandardInput; - break; - - case STD_OUTPUT_HANDLE: - HandleBuffer[i] = NtCurrentPeb()->ProcessParameters->StandardOutput; - break; - - case STD_ERROR_HANDLE: - HandleBuffer[i] = NtCurrentPeb()->ProcessParameters->StandardError; - break; - - default: - HandleBuffer[i] = lpHandles[i]; - break; - } - - /* Check for console handle */ - if (IsConsoleHandle(HandleBuffer[i])) - { - if (!VerifyConsoleIoHandle(HandleBuffer[i])) - { - if (HandleBuffer != Handle) - { - RtlFreeHeap(GetProcessHeap(),0,HandleBuffer); - } - SetLastError (ERROR_INVALID_HANDLE); - return WAIT_FAILED; - } - HandleBuffer[i] = (HANDLE)GetConsoleInputWaitHandle(); - if (HandleBuffer[i] == NULL || HandleBuffer[i] == INVALID_HANDLE_VALUE) - { - if (HandleBuffer != Handle) - { - RtlFreeHeap(GetProcessHeap(),0,HandleBuffer); - } - SetLastError (ERROR_INVALID_HANDLE); - return WAIT_FAILED; - } - } - } - - if (dwMilliseconds == INFINITE) - { - TimePtr = NULL; - } - else - { - Time.QuadPart = -10000 * (LONGLONG)dwMilliseconds; - TimePtr = &Time; - } - - do - { - Status = NtWaitForMultipleObjects (nCount, - HandleBuffer, - bWaitAll ? WaitAll : WaitAny, - (BOOLEAN)bAlertable, - TimePtr); - if (HIWORD(Status)) - { - SetLastErrorByStatus (Status); - Status = WAIT_FAILED; - } - - } while (Status == STATUS_ALERTED && bAlertable); - - if (HandleBuffer != Handle) - { - RtlFreeHeap(RtlGetProcessHeap(), 0, HandleBuffer); - } - - return Status; -} - - -/* - * @implemented - */ -DWORD STDCALL -SignalObjectAndWait(HANDLE hObjectToSignal, - HANDLE hObjectToWaitOn, - DWORD dwMilliseconds, - BOOL bAlertable) -{ - PLARGE_INTEGER TimePtr; - LARGE_INTEGER Time; - NTSTATUS Status; - - /* Get real handle */ - switch ((ULONG)hObjectToWaitOn) - { - case STD_INPUT_HANDLE: - hObjectToWaitOn = NtCurrentPeb()->ProcessParameters->StandardInput; - break; - - case STD_OUTPUT_HANDLE: - hObjectToWaitOn = NtCurrentPeb()->ProcessParameters->StandardOutput; - break; - - case STD_ERROR_HANDLE: - hObjectToWaitOn = NtCurrentPeb()->ProcessParameters->StandardError; - break; - } - - /* Check for console handle */ - if (IsConsoleHandle(hObjectToWaitOn)) - { - if (VerifyConsoleIoHandle(hObjectToWaitOn)) - { - DPRINT1("Console handles are not supported yet!\n"); - SetLastError(ERROR_INVALID_HANDLE); - return WAIT_FAILED; - } - } - - if (dwMilliseconds == INFINITE) - { - TimePtr = NULL; - } - else - { - Time.QuadPart = -10000 * (LONGLONG)dwMilliseconds; - TimePtr = &Time; - } - - do - { - Status = NtSignalAndWaitForSingleObject (hObjectToSignal, - hObjectToWaitOn, - (BOOLEAN)bAlertable, - TimePtr); - if (!NT_SUCCESS(Status)) - { - SetLastErrorByStatus (Status); - return WAIT_FAILED; - } - - } while (Status == STATUS_ALERTED && bAlertable); - - /* STATUS_SUCCESS maps to WAIT_OBJECT_0 */ - return Status; + /* Get real handle */ + switch ((ULONG)hHandle) + { + /* Input handle */ + case STD_INPUT_HANDLE: + + /* Read it from the PEB */ + hHandle = NtCurrentPeb()->ProcessParameters->StandardInput; + break; + + /* Output handle */ + case STD_OUTPUT_HANDLE: + + /* Read it from the PEB */ + hHandle = NtCurrentPeb()->ProcessParameters->StandardOutput; + break; + + /* Error handle */ + case STD_ERROR_HANDLE: + + /* Read it from the PEB */ + hHandle = NtCurrentPeb()->ProcessParameters->StandardError; + break; + } + + /* Check for console handle */ + if ((IsConsoleHandle(hHandle)) && (!VerifyConsoleIoHandle(hHandle))) + { + /* Get the real wait handle */ + hHandle = GetConsoleInputWaitHandle(); + } + + /* Check if this is an infinite wait */ + if (dwMilliseconds == INFINITE) + { + /* Under NT, this means no timer argument */ + TimePtr = NULL; + } + else + { + /* Otherwise, convert the time to NT Format */ + Time.QuadPart = UInt32x32To64(-10000, dwMilliseconds); + TimePtr = &Time; + } + + /* Start wait loop */ + do + { + /* Do the wait */ + Status = NtWaitForSingleObject(hHandle, (BOOLEAN)bAlertable, TimePtr); + if (!NT_SUCCESS(Status)) + { + /* The wait failed */ + SetLastErrorByStatus (Status); + return WAIT_FAILED; + } + } while ((Status == STATUS_ALERTED) && (bAlertable)); + + /* Return wait status */ + return Status; +} + +/* + * @implemented + */ +DWORD +WINAPI +WaitForMultipleObjects(IN DWORD nCount, + IN CONST HANDLE *lpHandles, + IN BOOL bWaitAll, + IN DWORD dwMilliseconds) +{ + /* Call the extended API */ + return WaitForMultipleObjectsEx(nCount, + lpHandles, + bWaitAll, + dwMilliseconds, + FALSE); +} + +/* + * @implemented + */ +DWORD +WINAPI +WaitForMultipleObjectsEx(IN DWORD nCount, + IN CONST HANDLE *lpHandles, + IN BOOL bWaitAll, + IN DWORD dwMilliseconds, + IN BOOL bAlertable) +{ + PLARGE_INTEGER TimePtr; + LARGE_INTEGER Time; + PHANDLE HandleBuffer; + HANDLE Handle[8]; + DWORD i; + NTSTATUS Status; + + /* Check if we have more handles then we locally optimize */ + if (nCount > 8) + { + /* Allocate a buffer for them */ + HandleBuffer = RtlAllocateHeap(RtlGetProcessHeap(), + 0, + nCount * sizeof(HANDLE)); + if (!HandleBuffer) + { + /* No buffer, fail the wait */ + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return WAIT_FAILED; + } + } + else + { + /* Otherwise, use our local buffer */ + HandleBuffer = Handle; + } + + /* Copy the handles into our buffer and loop them all */ + RtlCopyMemory(HandleBuffer, (LPVOID)lpHandles, nCount * sizeof(HANDLE)); + for (i = 0; i < nCount; i++) + { + /* Check what kind of handle this is */ + switch ((ULONG)HandleBuffer[i]) + { + /* Input handle */ + case STD_INPUT_HANDLE: + HandleBuffer[i] = NtCurrentPeb()-> + ProcessParameters->StandardInput; + break; + + /* Output handle */ + case STD_OUTPUT_HANDLE: + HandleBuffer[i] = NtCurrentPeb()-> + ProcessParameters->StandardOutput; + break; + + /* Error handle */ + case STD_ERROR_HANDLE: + HandleBuffer[i] = NtCurrentPeb()-> + ProcessParameters->StandardError; + break; + } + + /* Check for console handle */ + if ((IsConsoleHandle(HandleBuffer[i])) && + (!VerifyConsoleIoHandle(HandleBuffer[i]))) + { + /* Get the real wait handle */ + HandleBuffer[i] = GetConsoleInputWaitHandle(); + } + } + + /* Check if this is an infinite wait */ + if (dwMilliseconds == INFINITE) + { + /* Under NT, this means no timer argument */ + TimePtr = NULL; + } + else + { + /* Otherwise, convert the time to NT Format */ + Time.QuadPart = UInt32x32To64(-10000, dwMilliseconds); + TimePtr = &Time; + } + + /* Start wait loop */ + do + { + /* Do the wait */ + Status = NtWaitForMultipleObjects(nCount, + HandleBuffer, + bWaitAll ? WaitAll : WaitAny, + (BOOLEAN)bAlertable, + TimePtr); + if (!NT_SUCCESS(Status)) + { + /* Wait failed */ + SetLastErrorByStatus (Status); + return WAIT_FAILED; + } + } while ((Status == STATUS_ALERTED) && (bAlertable)); + + /* Check if we didn't use our local buffer */ + if (HandleBuffer != Handle) + { + /* Free the allocated one */ + RtlFreeHeap(RtlGetProcessHeap(), 0, HandleBuffer); + } + + /* Return wait status */ + return Status; +} + +/* + * @implemented + */ +DWORD +WINAPI +SignalObjectAndWait(IN HANDLE hObjectToSignal, + IN HANDLE hObjectToWaitOn, + IN DWORD dwMilliseconds, + IN BOOL bAlertable) +{ + PLARGE_INTEGER TimePtr; + LARGE_INTEGER Time; + NTSTATUS Status; + + /* Get real handle */ + switch ((ULONG)hObjectToWaitOn) + { + /* Input handle */ + case STD_INPUT_HANDLE: + + /* Read it from the PEB */ + hObjectToWaitOn = NtCurrentPeb()-> + ProcessParameters->StandardInput; + break; + + /* Output handle */ + case STD_OUTPUT_HANDLE: + + /* Read it from the PEB */ + hObjectToWaitOn = NtCurrentPeb()-> + ProcessParameters->StandardOutput; + break; + + /* Error handle */ + case STD_ERROR_HANDLE: + + /* Read it from the PEB */ + hObjectToWaitOn = NtCurrentPeb()-> + ProcessParameters->StandardError; + break; + } + + /* Check for console handle */ + if ((IsConsoleHandle(hObjectToWaitOn)) && + (!VerifyConsoleIoHandle(hObjectToWaitOn))) + { + /* Get the real wait handle */ + hObjectToWaitOn = GetConsoleInputWaitHandle(); + } + + /* Check if this is an infinite wait */ + if (dwMilliseconds == INFINITE) + { + /* Under NT, this means no timer argument */ + TimePtr = NULL; + } + else + { + /* Otherwise, convert the time to NT Format */ + Time.QuadPart = UInt32x32To64(-10000, dwMilliseconds); + TimePtr = &Time; + } + + /* Start wait loop */ + do + { + /* Do the wait */ + Status = NtSignalAndWaitForSingleObject(hObjectToSignal, + hObjectToWaitOn, + (BOOLEAN)bAlertable, + TimePtr); + if (!NT_SUCCESS(Status)) + { + /* The wait failed */ + SetLastErrorByStatus (Status); + return WAIT_FAILED; + } + } while ((Status == STATUS_ALERTED) && (bAlertable)); + + /* Return wait status */ + return Status; } /* EOF */

1 0

[ion] 22675: - Implement, export and NDKize: DbgUiGetThreadDebugObject, DbgUiDebugActiveProcess, DbgUiStopDebugging, NtSetInformationDebugObject. - Make CheckRemoteDebuggerPresent fail if no process was specified. - Implement DebugActiveProcess, DebugActiveProcessStop, DebugBreakProcess, DebugSetProcessKillOnExit. - Add *.vcproj to ignore lists.
by ion＠svn.reactos.org 28 Jun '06

28 Jun '06

Author: ion Date: Wed Jun 28 21:02:37 2006 New Revision: 22675 URL: http://svn.reactos.org/svn/reactos?rev=22675&view=rev Log: - Implement, export and NDKize: DbgUiGetThreadDebugObject, DbgUiDebugActiveProcess, DbgUiStopDebugging, NtSetInformationDebugObject. - Make CheckRemoteDebuggerPresent fail if no process was specified. - Implement DebugActiveProcess, DebugActiveProcessStop, DebugBreakProcess, DebugSetProcessKillOnExit. - Add *.vcproj to ignore lists. Removed: trunk/reactos/dll/win32/kernel32/debug/break.c Modified: trunk/reactos/dll/3rdparty/freetype/ (props changed) trunk/reactos/dll/3rdparty/mesa32/ (props changed) trunk/reactos/dll/cpl/access/ (props changed) trunk/reactos/dll/cpl/appwiz/ (props changed) trunk/reactos/dll/cpl/desk/ (props changed) trunk/reactos/dll/cpl/hdwwiz/ (props changed) trunk/reactos/dll/cpl/intl/ (props changed) trunk/reactos/dll/cpl/intl_new/ (props changed) trunk/reactos/dll/cpl/main/ (props changed) trunk/reactos/dll/cpl/mmsys/ (props changed) trunk/reactos/dll/cpl/ncpa/ (props changed) trunk/reactos/dll/cpl/powercfg/ (props changed) trunk/reactos/dll/cpl/sysdm/ (props changed) trunk/reactos/dll/cpl/timedate/ (props changed) trunk/reactos/dll/directx/d3d8thk/ (props changed) trunk/reactos/dll/directx/ddraw/ (props changed) trunk/reactos/dll/directx/devenum/ (props changed) trunk/reactos/dll/directx/dinput/ (props changed) trunk/reactos/dll/directx/dinput8/ (props changed) trunk/reactos/dll/directx/dplay/ (props changed) trunk/reactos/dll/directx/dplayx/ (props changed) trunk/reactos/dll/directx/dsound/ (props changed) trunk/reactos/dll/directx/dxdiagn/ (props changed) trunk/reactos/dll/keyboard/kbdbe/ (props changed) trunk/reactos/dll/keyboard/kbdda/ (props changed) trunk/reactos/dll/keyboard/kbddv/ (props changed) trunk/reactos/dll/keyboard/kbdes/ (props changed) trunk/reactos/dll/keyboard/kbdfr/ (props changed) trunk/reactos/dll/keyboard/kbdgr/ (props changed) trunk/reactos/dll/keyboard/kbdhe/ (props changed) trunk/reactos/dll/keyboard/kbdheb/ (props changed) trunk/reactos/dll/keyboard/kbdhu/ (props changed) trunk/reactos/dll/keyboard/kbdpo/ (props changed) trunk/reactos/dll/keyboard/kbdru/ (props changed) trunk/reactos/dll/keyboard/kbdse/ (props changed) trunk/reactos/dll/keyboard/kbdsg/ (props changed) trunk/reactos/dll/keyboard/kbdsk/ (props changed) trunk/reactos/dll/keyboard/kbduk/ (props changed) trunk/reactos/dll/keyboard/kbdur/ (props changed) trunk/reactos/dll/keyboard/kbdus/ (props changed) trunk/reactos/dll/ntdll/ (props changed) trunk/reactos/dll/ntdll/dbg/dbgui.c (contents, props changed) trunk/reactos/dll/ntdll/def/ntdll.def trunk/reactos/dll/win32/acledit/ (props changed) trunk/reactos/dll/win32/aclui/ (props changed) trunk/reactos/dll/win32/advapi32/ (props changed) trunk/reactos/dll/win32/advpack/ (props changed) trunk/reactos/dll/win32/authz/ (props changed) trunk/reactos/dll/win32/avifil32/ (props changed) trunk/reactos/dll/win32/cabinet/ (props changed) trunk/reactos/dll/win32/cards/ (props changed) trunk/reactos/dll/win32/cfgmgr32/ (props changed) trunk/reactos/dll/win32/comctl32/ (props changed) trunk/reactos/dll/win32/comdlg32/ (props changed) trunk/reactos/dll/win32/crtdll/ (props changed) trunk/reactos/dll/win32/crypt32/ (props changed) trunk/reactos/dll/win32/cryptdll/ (props changed) trunk/reactos/dll/win32/dbghelp/ (props changed) trunk/reactos/dll/win32/devmgr/ (props changed) trunk/reactos/dll/win32/dhcpcsvc/ (props changed) trunk/reactos/dll/win32/dnsapi/ (props changed) trunk/reactos/dll/win32/fmifs/ (props changed) trunk/reactos/dll/win32/gdi32/ (props changed) trunk/reactos/dll/win32/gdiplus/ (props changed) trunk/reactos/dll/win32/glu32/ (props changed) trunk/reactos/dll/win32/hid/ (props changed) trunk/reactos/dll/win32/icmp/ (props changed) trunk/reactos/dll/win32/imagehlp/ (props changed) trunk/reactos/dll/win32/imm32/ (props changed) trunk/reactos/dll/win32/iphlpapi/ (props changed) trunk/reactos/dll/win32/kernel32/ (props changed) trunk/reactos/dll/win32/kernel32/debug/debugger.c trunk/reactos/dll/win32/kernel32/include/kernel32.h trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/dll/win32/kernel32/misc/console.c trunk/reactos/dll/win32/kernel32/tests/ (props changed) trunk/reactos/dll/win32/lsasrv/ (props changed) trunk/reactos/dll/win32/lzexpand/ (props changed) trunk/reactos/dll/win32/mapi32/ (props changed) trunk/reactos/dll/win32/mmdrv/ (props changed) trunk/reactos/dll/win32/mpr/ (props changed) trunk/reactos/dll/win32/msacm/ (props changed) trunk/reactos/dll/win32/msafd/ (props changed) trunk/reactos/dll/win32/msgina/ (props changed) trunk/reactos/dll/win32/msi/ (props changed) trunk/reactos/dll/win32/msimg32/ (props changed) trunk/reactos/dll/win32/msvcrt/ (props changed) trunk/reactos/dll/win32/msvcrt20/ (props changed) trunk/reactos/dll/win32/msvideo/ (props changed) trunk/reactos/dll/win32/mswsock/ (props changed) trunk/reactos/dll/win32/netapi32/ (props changed) trunk/reactos/dll/win32/netcfgx/ (props changed) trunk/reactos/dll/win32/newdev/ (props changed) trunk/reactos/dll/win32/ntmarta/ (props changed) trunk/reactos/dll/win32/objsel/ (props changed) trunk/reactos/dll/win32/ole32/ (props changed) trunk/reactos/dll/win32/oleacc/ (props changed) trunk/reactos/dll/win32/oleaut32/ (props changed) trunk/reactos/dll/win32/oledlg/ (props changed) trunk/reactos/dll/win32/olepro32/ (props changed) trunk/reactos/dll/win32/opengl32/ (props changed) trunk/reactos/dll/win32/powrprof/ (props changed) trunk/reactos/dll/win32/psapi/ (props changed) trunk/reactos/dll/win32/riched20/ (props changed) trunk/reactos/dll/win32/richedit/ (props changed) trunk/reactos/dll/win32/rpcrt4/ (props changed) trunk/reactos/dll/win32/samlib/ (props changed) trunk/reactos/dll/win32/samsrv/ (props changed) trunk/reactos/dll/win32/secur32/ (props changed) trunk/reactos/dll/win32/security/ (props changed) trunk/reactos/dll/win32/serialui/ (props changed) trunk/reactos/dll/win32/setupapi/ (props changed) trunk/reactos/dll/win32/shdocvw/ (props changed) trunk/reactos/dll/win32/shell32/ (props changed) trunk/reactos/dll/win32/shellext/slayer/ (props changed) trunk/reactos/dll/win32/shfolder/ (props changed) trunk/reactos/dll/win32/shlwapi/ (props changed) trunk/reactos/dll/win32/smdll/ (props changed) trunk/reactos/dll/win32/snmpapi/ (props changed) trunk/reactos/dll/win32/syssetup/ (props changed) trunk/reactos/dll/win32/twain/ (props changed) trunk/reactos/dll/win32/urlmon/ (props changed) trunk/reactos/dll/win32/user32/ (props changed) trunk/reactos/dll/win32/userenv/ (props changed) trunk/reactos/dll/win32/uxtheme/ (props changed) trunk/reactos/dll/win32/vdmdbg/ (props changed) trunk/reactos/dll/win32/version/ (props changed) trunk/reactos/dll/win32/wininet/ (props changed) trunk/reactos/dll/win32/winmm/ (props changed) trunk/reactos/dll/win32/winmm/midimap/ (props changed) trunk/reactos/dll/win32/winmm/wavemap/ (props changed) trunk/reactos/dll/win32/winspool/ (props changed) trunk/reactos/dll/win32/wintrust/ (props changed) trunk/reactos/dll/win32/ws2_32/ (props changed) trunk/reactos/dll/win32/ws2help/ (props changed) trunk/reactos/dll/win32/wshirda/ (props changed) trunk/reactos/dll/win32/wsock32/ (props changed) trunk/reactos/include/ndk/dbgkfuncs.h trunk/reactos/include/ndk/umfuncs.h trunk/reactos/include/reactos/idl/ (props changed) trunk/reactos/ntoskrnl/ (props changed) trunk/reactos/tools/nci/sysfuncs.lst Propchange: trunk/reactos/dll/3rdparty/freetype/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -8,3 +8,4 @@ doxy-doc freetype.coff GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/3rdparty/mesa32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/cpl/access/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -12,3 +12,4 @@ Debug Release GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/cpl/appwiz/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -12,3 +12,4 @@ Debug Release GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/cpl/desk/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -12,3 +12,4 @@ Debug Release GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/cpl/hdwwiz/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/cpl/intl/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -7,3 +7,4 @@ *.map *.tmp GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/cpl/intl_new/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/dll/cpl/main/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -7,3 +7,4 @@ *.map *.tmp GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/cpl/mmsys/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -7,3 +7,4 @@ *.map *.tmp GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/cpl/ncpa/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -14,3 +14,4 @@ Debug Release GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/cpl/powercfg/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/dll/cpl/sysdm/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -7,3 +7,4 @@ *.map *.tmp GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/cpl/timedate/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -7,3 +7,4 @@ *.map *.tmp GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/directx/d3d8thk/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -9,3 +9,4 @@ *.tmp *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/directx/ddraw/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/directx/devenum/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -9,3 +9,4 @@ devenum.spec.def devenum.stubs.c GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/directx/dinput/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -12,3 +12,4 @@ *.bmp *.cur GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/directx/dinput8/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -12,3 +12,4 @@ *.bmp *.cur GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/directx/dplay/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/directx/dplayx/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/directx/dsound/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -9,3 +9,4 @@ dsound.spec.def dsound.stubs.c GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/directx/dxdiagn/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/keyboard/kbdbe/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/keyboard/kbdda/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -11,3 +11,4 @@ *.map *.d GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/keyboard/kbddv/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -11,3 +11,4 @@ *.map *.d GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/keyboard/kbdes/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -16,3 +16,4 @@ *.bak *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/keyboard/kbdfr/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -10,3 +10,4 @@ *.map *.d GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/keyboard/kbdgr/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -11,3 +11,4 @@ *.map *.d GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/keyboard/kbdhe/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/keyboard/kbdheb/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/keyboard/kbdhu/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/keyboard/kbdpo/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/dll/keyboard/kbdru/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -9,3 +9,4 @@ *.map *.d GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/keyboard/kbdse/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -11,3 +11,4 @@ *.map *.d GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/keyboard/kbdsg/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -10,3 +10,4 @@ *.map *.d GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/keyboard/kbdsk/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/keyboard/kbduk/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -11,3 +11,4 @@ *.map *.d GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/keyboard/kbdur/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/keyboard/kbdus/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -11,3 +11,4 @@ *.map *.d GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/ntdll/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -11,3 +11,4 @@ *.map doxy-doc GNUmakefile +*.vcproj Modified: trunk/reactos/dll/ntdll/dbg/dbgui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dbg/dbgui.c?rev=… ============================================================================== --- trunk/reactos/dll/ntdll/dbg/dbgui.c (original) +++ trunk/reactos/dll/ntdll/dbg/dbgui.c Wed Jun 28 21:02:37 2006 @@ -1,9 +1,9 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: lib/ntdll/dbg/dbgui.c - * PURPOSE: User-Mode DbgUI Support - * PROGRAMMER: Alex Ionescu (alex(a)relsoft.net) + * PROJECT: ReactOS NT Layer/System API + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/ntdll/dbg/dbgui.c + * PURPOSE: Native Wrappers for the NT Debug Implementation + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) */ /* INCLUDES *****************************************************************/ @@ -135,4 +135,52 @@ return Status; } +/* + * @implemented + */ +HANDLE +NTAPI +DbgUiGetThreadDebugObject(VOID) +{ + /* Just return the handle from the TEB */ + return NtCurrentTeb()->DbgSsReserved[0]; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +DbgUiDebugActiveProcess(IN HANDLE Process) +{ + NTSTATUS Status; + + /* Tell the kernel to start debugging */ + Status = NtDebugActiveProcess(Process, NtCurrentTeb()->DbgSsReserved[0]); + if (NT_SUCCESS(Status)) + { + /* Now break-in the process */ + Status = DbgUiIssueRemoteBreakin(Process); + if (!NT_SUCCESS(Status)) + { + /* We couldn't break-in, cancel debugging */ + DbgUiStopDebugging(Process); + } + } + + /* Return status */ + return Status; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +DbgUiStopDebugging(IN HANDLE Process) +{ + /* Call the kernel to remove the debug object */ + return NtRemoveProcessDebug(Process, NtCurrentTeb()->DbgSsReserved[0]); +} + /* EOF */ Propchange: trunk/reactos/dll/ntdll/dbg/dbgui.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Modified: trunk/reactos/dll/ntdll/def/ntdll.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll.def?re… ============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll.def (original) +++ trunk/reactos/dll/ntdll/def/ntdll.def Wed Jun 28 21:02:37 2006 @@ -24,10 +24,13 @@ DbgPrint DbgPrintEx DbgPrompt@12 +DbgUiDebugActiveProcess@4 DbgUiConnectToDbg@0 DbgUiContinue@8 +DbgUiGetThreadDebugObject@0 DbgUiIssueRemoteBreakin@4 DbgUiRemoteBreakin@0 +DbgUiStopDebugging@4 DbgUiWaitStateChange@8 DbgUserBreakPoint@0 KiRaiseUserExceptionDispatcher@0 @@ -230,6 +233,7 @@ NtSetEvent@8 NtSetHighEventPair@4 NtSetHighWaitLowEventPair@4 +NtSetInformationDebugObject@20 NtSetInformationFile@20 NtSetInformationJobObject@16 NtSetInformationKey@16 Propchange: trunk/reactos/dll/win32/acledit/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -7,3 +7,4 @@ *.map *.tmp GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/aclui/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -8,3 +8,4 @@ *.tmp *.gch GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/advapi32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -10,3 +10,4 @@ *.gch *.d GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/advpack/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -7,3 +7,4 @@ *.map *.tmp GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/authz/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -8,3 +8,4 @@ *.tmp *.gch GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/avifil32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/cabinet/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -9,3 +9,4 @@ cabinet.spec.def cabinet.stubs.c GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/cards/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -9,3 +9,4 @@ *.tmp *.o GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/cfgmgr32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -16,3 +16,4 @@ *.bak *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/comctl32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -12,3 +12,4 @@ *.spec.def *.stubs.c GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/comdlg32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -13,3 +13,4 @@ *.stubs.c *.ico GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/crtdll/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -8,3 +8,4 @@ *.tmp *.gch GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/crypt32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/cryptdll/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/dll/win32/dbghelp/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -26,3 +26,4 @@ dbghelp.spec.def dbghelp.stubs.c GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/devmgr/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/dhcpcsvc/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/dnsapi/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -11,3 +11,4 @@ *.txt *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/fmifs/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -7,3 +7,4 @@ *.d *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/gdi32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -5,3 +5,4 @@ *.a *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/gdiplus/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -5,3 +5,4 @@ *.a *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/glu32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -8,3 +8,4 @@ *.tmp *.o GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/hid/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -7,3 +7,4 @@ *.map *.tmp GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/icmp/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/imagehlp/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -11,3 +11,4 @@ *.txt *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/imm32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/iphlpapi/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -20,3 +20,4 @@ iphlpapi.spec.def iphlpapi.stubs.c GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/kernel32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -13,3 +13,4 @@ *.pch *.map GNUmakefile +*.vcproj Removed: trunk/reactos/dll/win32/kernel32/debug/break.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/debug/b… ============================================================================== --- trunk/reactos/dll/win32/kernel32/debug/break.c (original) +++ trunk/reactos/dll/win32/kernel32/debug/break.c (removed) @@ -1,32 +1,0 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/kernel32/debug/debugger.c - * PURPOSE: DebugBreakProcess() - * PROGRAMMER: KJK::Hyperion <noog(a)libero.it> - */ - -/* INCLUDES ******************************************************************/ - -#include <k32.h> - -/* FUNCTIONS *****************************************************************/ - -/* - * @implemented - */ -WINBASEAPI BOOL WINAPI DebugBreakProcess(HANDLE Process) -{ - NTSTATUS nErrCode = DbgUiIssueRemoteBreakin(Process); - - if(!NT_SUCCESS(nErrCode)) - { - SetLastErrorByStatus(nErrCode); - return FALSE; - } - - return TRUE; -} - -/* EOF */ Modified: trunk/reactos/dll/win32/kernel32/debug/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/debug/d… ============================================================================== --- trunk/reactos/dll/win32/kernel32/debug/debugger.c (original) +++ trunk/reactos/dll/win32/kernel32/debug/debugger.c Wed Jun 28 21:02:37 2006 @@ -1,147 +1,261 @@ -/* $Id$ - * - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS system libraries - * FILE: lib/kernel32/debug/debugger.c - * PURPOSE: Win32 Debugger API - * PROGRAMMER: Thomas Weidenmueller - * KJK::Hyperion - */ - -/* INCLUDES ******************************************************************/ +/* + * PROJECT: ReactOS Win32 Base API + * LICENSE: GPL - See COPYING in the top level directory + * FILE: dll/win32/kernel32/debug/debugger.c + * PURPOSE: Wrappers for the NT Debug Implementation + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES *****************************************************************/ #include <k32.h> +#define NDEBUG +#include "debug.h" + /* FUNCTIONS *****************************************************************/ /* * @implemented */ -BOOL WINAPI -CheckRemoteDebuggerPresent ( - HANDLE hProcess, - PBOOL pbDebuggerPresent - ) -{ - HANDLE DebugPort; - NTSTATUS Status; - - if (pbDebuggerPresent == NULL) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - Status = NtQueryInformationProcess(hProcess, - ProcessDebugPort, - (PVOID)&DebugPort, - sizeof(HANDLE), - NULL); - if (NT_SUCCESS(Status)) - { - *pbDebuggerPresent = ((DebugPort != NULL) ? TRUE : FALSE); - return TRUE; - } - - SetLastErrorByStatus(Status); - return FALSE; -} - - -/* - * @implemented - */ -BOOL WINAPI -ContinueDebugEvent ( - DWORD dwProcessId, - DWORD dwThreadId, - DWORD dwContinueStatus - ) -{ - CLIENT_ID ClientId; - NTSTATUS Status; - - ClientId.UniqueProcess = (HANDLE)dwProcessId; - ClientId.UniqueThread = (HANDLE)dwThreadId; - - Status = DbgUiContinue(&ClientId, dwContinueStatus); - if (!NT_SUCCESS(Status)) - { +BOOL +WINAPI +CheckRemoteDebuggerPresent(IN HANDLE hProcess, + OUT PBOOL pbDebuggerPresent) +{ + HANDLE DebugPort; + NTSTATUS Status; + + /* Make sure we have an output and process*/ + if (!(pbDebuggerPresent) || !(hProcess)) + { + /* Fail */ + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* Check if the process has a debug object/port */ + Status = NtQueryInformationProcess(hProcess, + ProcessDebugPort, + (PVOID)&DebugPort, + sizeof(HANDLE), + NULL); + if (NT_SUCCESS(Status)) + { + /* Return the current state */ + *pbDebuggerPresent = (DebugPort) ? TRUE : FALSE; + return TRUE; + } + + /* Otherwise, fail */ SetLastErrorByStatus(Status); return FALSE; - } - - return TRUE; -} - - -/* - * NOTE: I'm not sure if the function is complete. - * +} + +/* + * @implemented + */ +BOOL +WINAPI +ContinueDebugEvent(IN DWORD dwProcessId, + IN DWORD dwThreadId, + IN DWORD dwContinueStatus) +{ + CLIENT_ID ClientId; + NTSTATUS Status; + + /* Set the Client ID */ + ClientId.UniqueProcess = (HANDLE)dwProcessId; + ClientId.UniqueThread = (HANDLE)dwThreadId; + + /* Continue debugging */ + Status = DbgUiContinue(&ClientId, dwContinueStatus); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + SetLastErrorByStatus(Status); + return FALSE; + } + + /* Succes */ + return TRUE; +} + +HANDLE +ProcessIdToHandle(IN DWORD dwProcessId) +{ + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE Handle; + CLIENT_ID ClientId; + + /* If we don't have a PID, look it up */ + if (dwProcessId == 0xFFFFFFFF) dwProcessId = (DWORD)CsrGetProcessId(); + + /* Open a handle to the process */ + ClientId.UniqueProcess = (HANDLE)dwProcessId; + InitializeObjectAttributes(&ObjectAttributes, NULL, 0, NULL, NULL); + Status = NtOpenProcess(&Handle, + PROCESS_ALL_ACCESS, + &ObjectAttributes, + &ClientId); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + SetLastErrorByStatus(Status); + return 0; + } + + /* Return the handle */ + return Handle; +} + +/* + * @implemented + */ +BOOL +WINAPI +DebugActiveProcess(IN DWORD dwProcessId) +{ + NTSTATUS Status; + HANDLE Handle; + + /* Connect to the debugger */ + Status = DbgUiConnectToDbg(); + if (!NT_SUCCESS(Status)) + { + SetLastErrorByStatus(Status); + return FALSE; + } + + /* Get the process handle */ + Handle = ProcessIdToHandle(dwProcessId); + if (!Handle) return FALSE; + + /* Now debug the process */ + Status = DbgUiDebugActiveProcess(Handle); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + SetLastErrorByStatus(Status); + return FALSE; + } + + /* Success */ + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +DebugActiveProcessStop(IN DWORD dwProcessId) +{ + NTSTATUS Status; + HANDLE Handle; + + /* Get the process handle */ + Handle = ProcessIdToHandle(dwProcessId); + if (!Handle) return FALSE; + + /* Now stop debgging the process */ + Status = DbgUiStopDebugging(Handle); + NtClose(Handle); + + /* Check for failure */ + if (!NT_SUCCESS(Status)) + { + /* Fail */ + SetLastError(ERROR_ACCESS_DENIED); + return FALSE; + } + + /* Success */ + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +DebugBreakProcess(IN HANDLE Process) +{ + NTSTATUS Status; + + /* Send the breakin request */ + Status = DbgUiIssueRemoteBreakin(Process); + if(!NT_SUCCESS(Status)) + { + /* Failure */ + SetLastErrorByStatus(Status); + return FALSE; + } + + /* Success */ + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +DebugSetProcessKillOnExit(IN BOOL KillOnExit) +{ + HANDLE Handle; + NTSTATUS Status; + ULONG State; + + /* Get the debug object */ + Handle = DbgUiGetThreadDebugObject(); + if (!Handle) + { + /* Fail */ + SetLastErrorByStatus(STATUS_INVALID_HANDLE); + return FALSE; + } + + /* Now set the kill-on-exit state */ + State = KillOnExit; + Status = NtSetInformationDebugObject(Handle, + DebugObjectKillProcessOnExitInformation, + &State, + sizeof(State), + NULL); + if (!NT_SUCCESS(Status)) + { + /* Fail */ + SetLastError(Status); + return FALSE; + } + + /* Success */ + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +IsDebuggerPresent (VOID) +{ + return (BOOL)NtCurrentPeb()->BeingDebugged; +} + +/* * @unimplemented */ BOOL WINAPI -DebugActiveProcess( - DWORD dwProcessId - ) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL -WINAPI -DebugActiveProcessStop ( - DWORD dwProcessId - ) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/* - * @unimplemented - */ -BOOL -WINAPI -DebugSetProcessKillOnExit ( - BOOL KillOnExit - ) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; -} - - -/* - * @implemented - */ -BOOL -WINAPI -IsDebuggerPresent (VOID) -{ - return (BOOL)NtCurrentPeb()->BeingDebugged; -} - - -/* - * @unimplemented - */ -BOOL -WINAPI -WaitForDebugEvent ( - LPDEBUG_EVENT lpDebugEvent, - DWORD dwMilliseconds - ) -{ - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; +WaitForDebugEvent(IN LPDEBUG_EVENT lpDebugEvent, + DWORD dwMilliseconds) +{ + /* FIXME: TODO */ + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return FALSE; } /* EOF */ Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… ============================================================================== --- trunk/reactos/dll/win32/kernel32/include/kernel32.h (original) +++ trunk/reactos/dll/win32/kernel32/include/kernel32.h Wed Jun 28 21:02:37 2006 @@ -62,6 +62,9 @@ BOOL STDCALL VerifyConsoleIoHandle(HANDLE Handle); BOOL STDCALL CloseConsoleHandle(HANDLE Handle); + +HANDLE STDCALL +GetConsoleInputWaitHandle (VOID); HANDLE STDCALL OpenConsoleW (LPWSTR wsName, DWORD dwDesiredAccess, 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 (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.rbuild Wed Jun 28 21:02:37 2006 @@ -10,7 +10,6 @@ <define name="WINVER">0x502</define> <pch>k32.h</pch> <directory name="debug"> - <file>break.c</file> <file>debugger.c</file> <file>output.c</file> </directory> Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c Wed Jun 28 21:02:37 2006 @@ -567,7 +567,7 @@ /* * @implemented */ -DWORD STDCALL +HANDLE STDCALL GetConsoleInputWaitHandle (VOID) /* * Undocumented @@ -585,7 +585,7 @@ SetLastErrorByStatus(Status); return 0; } - return (DWORD) Request.Data.GetConsoleInputWaitHandle.InputWaitHandle; + return Request.Data.GetConsoleInputWaitHandle.InputWaitHandle; } Propchange: trunk/reactos/dll/win32/kernel32/tests/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -7,3 +7,4 @@ *.a *.pch GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/lsasrv/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -12,3 +12,4 @@ *.map *.sys GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/lzexpand/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -5,3 +5,4 @@ *.coff *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/mapi32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/mmdrv/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -8,3 +8,4 @@ *.tmp temp.exp GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/mpr/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -12,3 +12,4 @@ *.bmp *.cur GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/msacm/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -10,3 +10,4 @@ msacm32.spec.def msacm32.stubs.c GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/msafd/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -7,3 +7,4 @@ *.o *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/msgina/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -7,3 +7,4 @@ *.map *.tmp GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/msi/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -12,3 +12,4 @@ *.bmp *.cur GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/msimg32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -9,3 +9,4 @@ *.spec.def *.stubs.c GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/msvcrt/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -11,3 +11,4 @@ *.map *.gch GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/msvcrt20/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -10,3 +10,4 @@ *.opt *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/msvideo/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -9,3 +9,4 @@ msvfw32.spec.def msvfw32.stubs.c GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/mswsock/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -8,3 +8,4 @@ *.tmp temp.exp GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/netapi32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/netcfgx/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,2 +1,3 @@ GNUmakefile *.bak +*.vcproj Propchange: trunk/reactos/dll/win32/newdev/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/ntmarta/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -8,3 +8,4 @@ *.tmp *.gch GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/objsel/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/ole32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -10,3 +10,4 @@ *.spec.def *.stubs.c GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/oleacc/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/oleaut32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -12,3 +12,4 @@ *.bmp *.cur GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/oledlg/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -12,3 +12,4 @@ *.bmp *.cur GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/olepro32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -12,3 +12,4 @@ *.bmp *.cur GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/opengl32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -9,3 +9,4 @@ *.tmp *.o GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/powrprof/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,0 +1,1 @@ +*.vcproj Propchange: trunk/reactos/dll/win32/psapi/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -10,3 +10,4 @@ *.gch misc GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/riched20/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -9,3 +9,4 @@ *.spec.def *.stubs.c GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/richedit/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -12,3 +12,4 @@ *.bmp *.cur GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/rpcrt4/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -12,3 +12,4 @@ *.bmp *.cur GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/samlib/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -5,3 +5,4 @@ *.a *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/samsrv/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/secur32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -6,3 +6,4 @@ *.d *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/security/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/serialui/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -8,3 +8,4 @@ *.a *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/setupapi/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -12,3 +12,4 @@ pnp_c.c GNUmakefile *.bak +*.vcproj Propchange: trunk/reactos/dll/win32/shdocvw/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -12,3 +12,4 @@ *.bmp *.cur GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/shell32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -10,3 +10,4 @@ *.stubs.c *.ico GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/shellext/slayer/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -8,3 +8,4 @@ *.map *.tmp GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/shfolder/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/shlwapi/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -12,3 +12,4 @@ *.bmp *.cur GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/smdll/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -12,3 +12,4 @@ *.map *.sys GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/snmpapi/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -18,3 +18,4 @@ *.tmp *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/syssetup/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -6,3 +6,4 @@ *.map *.d GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/twain/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -5,3 +5,4 @@ *.map *.coff GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/urlmon/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -12,3 +12,4 @@ *.bmp *.cur GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/user32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -7,3 +7,4 @@ *.map *.tmp GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/userenv/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -10,3 +10,4 @@ *.o *.gch GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/uxtheme/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -10,3 +10,4 @@ *.stubs.c *.ico GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/vdmdbg/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/version/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -6,3 +6,4 @@ *.a *.d GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/wininet/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/winmm/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -12,3 +12,4 @@ *.bmp *.cur GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/winmm/midimap/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -12,3 +12,4 @@ *.bmp *.cur GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/winmm/wavemap/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -12,3 +12,4 @@ *.bmp *.cur GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/winspool/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -10,3 +10,4 @@ *.map *.tmp GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/wintrust/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,1 +1,2 @@ GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/ws2_32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -8,3 +8,4 @@ *.tmp temp.exp GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/ws2help/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -18,3 +18,4 @@ *.tmp *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/wshirda/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -18,3 +18,4 @@ *.tmp *.map GNUmakefile +*.vcproj Propchange: trunk/reactos/dll/win32/wsock32/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -8,3 +8,4 @@ *.tmp temp.exp GNUmakefile +*.vcproj Modified: trunk/reactos/include/ndk/dbgkfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/dbgkfuncs.h?re… ============================================================================== --- trunk/reactos/include/ndk/dbgkfuncs.h (original) +++ trunk/reactos/include/ndk/dbgkfuncs.h Wed Jun 28 21:02:37 2006 @@ -23,10 +23,19 @@ // Dependencies // #include <umtypes.h> +#include <dbgktypes.h> // // Native calls // +NTSYSCALLAPI +NTSTATUS +NTAPI +NtDebugActiveProcess( + IN HANDLE Process, + IN HANDLE DebugObject +); + NTSYSCALLAPI NTSTATUS NTAPI @@ -56,6 +65,33 @@ OUT PDBGUI_WAIT_STATE_CHANGE StateChange ); +NTSYSCALLAPI +NTSTATUS +NTAPI +NtRemoveProcessDebug( + IN HANDLE Process, + IN HANDLE DebugObject +); + +NTSYSCALLAPI +NTSTATUS +NTAPI +NtSetInformationDebugObject( + IN HANDLE DebugObject, + IN DEBUGOBJECTINFOCLASS InformationClass, + IN PVOID Information, + IN ULONG InformationLength, + OUT PULONG ReturnLength OPTIONAL +); + +NTSYSAPI +NTSTATUS +NTAPI +ZwDebugActiveProcess( + IN HANDLE Process, + IN HANDLE DebugObject +); + NTSYSAPI NTSTATUS NTAPI @@ -78,10 +114,29 @@ NTSYSAPI NTSTATUS NTAPI +ZwRemoveProcessDebug( + IN HANDLE Process, + IN HANDLE DebugObject +); + +NTSYSAPI +NTSTATUS +NTAPI ZwWaitForDebugEvent( IN HANDLE DebugObject, IN BOOLEAN Alertable, IN PLARGE_INTEGER Timeout OPTIONAL, OUT PDBGUI_WAIT_STATE_CHANGE StateChange ); + +NTSYSAPI +NTSTATUS +NTAPI +ZwSetInformationDebugObject( + IN HANDLE DebugObject, + IN DEBUGOBJECTINFOCLASS InformationClass, + IN PVOID Information, + IN ULONG InformationLength, + OUT PULONG ReturnLength OPTIONAL +); #endif Modified: trunk/reactos/include/ndk/umfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/umfuncs.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/umfuncs.h (original) +++ trunk/reactos/include/ndk/umfuncs.h Wed Jun 28 21:02:37 2006 @@ -89,6 +89,12 @@ struct _CSR_CAPTURE_BUFFER *CaptureBuffer ); +HANDLE +NTAPI +CsrGetProcessId( + VOID +); + NTSTATUS NTAPI CsrNewThread(VOID); @@ -141,6 +147,18 @@ NTSTATUS NTAPI +DbgUiDebugActiveProcess( + IN HANDLE Process +); + +NTSTATUS +NTAPI +DbgUiStopDebugging( + IN HANDLE Process +); + +NTSTATUS +NTAPI DbgUiWaitStateChange( IN PDBGUI_WAIT_STATE_CHANGE DbgUiWaitStateCange, IN PLARGE_INTEGER TimeOut @@ -156,6 +174,12 @@ NTAPI DbgUiIssueRemoteBreakin( IN HANDLE Process +); + +HANDLE +NTAPI +DbgUiGetThreadDebugObject( + VOID ); // Propchange: trunk/reactos/include/reactos/idl/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -1,2 +1,3 @@ makefile *.h +*.vcproj Propchange: trunk/reactos/ntoskrnl/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Jun 28 21:02:37 2006 @@ -14,3 +14,4 @@ *.exe doxy-doc GNUmakefile +*.vcproj Modified: trunk/reactos/tools/nci/sysfuncs.lst URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/sysfuncs.lst?rev… ============================================================================== --- trunk/reactos/tools/nci/sysfuncs.lst (original) +++ trunk/reactos/tools/nci/sysfuncs.lst Wed Jun 28 21:02:37 2006 @@ -42,6 +42,7 @@ NtCreateTimer 4 NtCreateToken 13 NtCreateWaitablePort 5 +NtDebugActiveProcess 2 NtDebugContinue 3 NtDelayExecution 2 NtDeleteAtom 1 @@ -162,6 +163,7 @@ NtReleaseMutant 2 NtReleaseSemaphore 3 NtRemoveIoCompletion 5 +NtRemoveProcessDebug 2 NtReplaceKey 3 NtReplyPort 2 NtReplyWaitReceivePort 4 @@ -188,6 +190,7 @@ NtSetEvent 2 NtSetHighEventPair 1 NtSetHighWaitLowEventPair 1 +NtSetInformationDebugObject 5 NtSetInformationFile 5 NtSetInformationKey 4 NtSetInformationJobObject 4

1 0

[fireball] 22674: [FORMATTING] - Amend file header slightly - Add functions headers
by fireball＠svn.reactos.org 28 Jun '06

28 Jun '06

Author: fireball Date: Wed Jun 28 19:56:09 2006 New Revision: 22674 URL: http://svn.reactos.org/svn/reactos?rev=22674&view=rev Log: [FORMATTING] - Amend file header slightly - Add functions headers Modified: trunk/reactos/ntoskrnl/ex/error.c Modified: trunk/reactos/ntoskrnl/ex/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/error.c?rev=22… ============================================================================== --- trunk/reactos/ntoskrnl/ex/error.c (original) +++ trunk/reactos/ntoskrnl/ex/error.c Wed Jun 28 19:56:09 2006 @@ -1,6 +1,6 @@ /* - * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory * FILE: ntoskrnl/ex/error.c * PURPOSE: Error Functions and Status/Exception Dispatching/Raising * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) @@ -22,6 +22,34 @@ /* FUNCTIONS ****************************************************************/ +/*++ + * @name ExpRaiseHardError + * + * For now it's a stub + * + * @param ErrorStatus + * FILLME + * + * @param NumberOfParameters + * FILLME + * + * @param UnicodeStringParameterMask + * FILLME + * + * @param Parameters + * FILLME + * + * @param ValidResponseOptions + * FILLME + * + * @param Response + * FILLME + * + * @return None + * + * @remarks None + * + *--*/ VOID NTAPI ExpRaiseHardError(IN NTSTATUS ErrorStatus, @@ -34,9 +62,21 @@ UNIMPLEMENTED; } -/* - * @implemented - */ +/*++ + * @name ExRaiseAccessViolation + * @implemented + * + * The ExRaiseAccessViolation routine can be used with structured exception + * handling to throw a driver-determined exception for a memory access + * violation that occurs when a driver processes I/O requests. + * See: http://msdn.microsoft.com/library/en-us/Kernel_r/hh/Kernel_r/k102_71b4c053-… + * http://www.osronline.com/ddkx/kmarch/k102_814i.htm + * + * @return None + * + * @remarks None + * + *--*/ VOID NTAPI ExRaiseAccessViolation(VOID) @@ -45,20 +85,39 @@ RtlRaiseStatus(STATUS_ACCESS_VIOLATION); } -/* - * @implemented - */ +/*++ + * @name ExRaiseDatatypeMisalignment + * @implemented + * + * ExRaiseDatatypeMisalignment raises an exception with the exception + * code set to STATUS_DATATYPE_MISALIGNMENT + * See: MSDN / DDK + * http://www.osronline.com/ddkx/kmarch/k102_814i.htm + * + * @return None + * + * @remarks None + * + *--*/ VOID NTAPI -ExRaiseDatatypeMisalignment (VOID) +ExRaiseDatatypeMisalignment(VOID) { /* Raise the Right Status */ RtlRaiseStatus(STATUS_DATATYPE_MISALIGNMENT); } -/* - * @implemented - */ +/*++ + * @name ExSystemExceptionFilter + * @implemented + * + * TODO: Add description + * + * @return FILLME + * + * @remarks None + * + *--*/ LONG NTAPI ExSystemExceptionFilter(VOID) @@ -67,9 +126,35 @@ EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH; } -/* - * @unimplemented - */ +/*++ + * @name ExRaiseHardError + * @implemented + * + * See NtRaiseHardError + * + * @param ErrorStatus + * Error Code + * + * @param NumberOfParameters + * Number of optional parameters in Parameters array + * + * @param UnicodeStringParameterMask + * Optional string parameter (can be only one per error code) + * + * @param Parameters + * Array of DWORD parameters for use in error message string + * + * @param ValidResponseOptions + * See HARDERROR_RESPONSE_OPTION for possible values description + * + * @param Response + * Pointer to HARDERROR_RESPONSE enumeration + * + * @return None + * + * @remarks None + * + *--*/ VOID NTAPI ExRaiseHardError(IN NTSTATUS ErrorStatus, @@ -90,6 +175,38 @@ Response); } +/*++ + * @name NtRaiseHardError + * @implemented + * + * This function sends HARDERROR_MSG LPC message to listener + * (typically CSRSS.EXE). See NtSetDefaultHardErrorPort for more information + * See: http://undocumented.ntinternals.net/UserMode/Undocumented%20Functions/Error… + * + * @param ErrorStatus + * Error Code + * + * @param NumberOfParameters + * Number of optional parameters in Parameters array + * + * @param UnicodeStringParameterMask + * Optional string parameter (can be only one per error code) + * + * @param Parameters + * Array of DWORD parameters for use in error message string + * + * @param ValidResponseOptions + * See HARDERROR_RESPONSE_OPTION for possible values description + * + * @param Response + * Pointer to HARDERROR_RESPONSE enumeration + * + * @return Status + * + * @remarks NtRaiseHardError is easy way to display message in GUI + * without loading Win32 API libraries + * + *--*/ NTSTATUS NTAPI NtRaiseHardError(IN NTSTATUS ErrorStatus, @@ -258,6 +375,24 @@ return Status; } +/*++ + * @name NtSetDefaultHardErrorPort + * @implemented + * + * NtSetDefaultHardErrorPort is typically called only once. After call, + * kernel set BOOLEAN flag named _ExReadyForErrors to TRUE, and all other + * tries to change default port are broken with STATUS_UNSUCCESSFUL error code + * See: http://www.windowsitlibrary.com/Content/356/08/2.html + * http://undocumented.ntinternals.net/UserMode/Undocumented%20Functions/Error… + * + * @param PortHandle + * Handle to named port object + * + * @return Status + * + * @remarks Privileges: SE_TCB_PRIVILEGE + * + *--*/ NTSTATUS NTAPI NtSetDefaultHardErrorPort(IN HANDLE PortHandle)

1 0

[fireball] 22673: [FORMATTING] - Amend file header slightly - Add function header - STDCALL -> NTAPI
by fireball＠svn.reactos.org 28 Jun '06

28 Jun '06

Author: fireball Date: Wed Jun 28 18:02:39 2006 New Revision: 22673 URL: http://svn.reactos.org/svn/reactos?rev=22673&view=rev Log: [FORMATTING] - Amend file header slightly - Add function header - STDCALL -> NTAPI Modified: trunk/reactos/ntoskrnl/ex/dbgctrl.c Modified: trunk/reactos/ntoskrnl/ex/dbgctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/dbgctrl.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ex/dbgctrl.c (original) +++ trunk/reactos/ntoskrnl/ex/dbgctrl.c Wed Jun 28 18:02:39 2006 @@ -1,10 +1,9 @@ /* - * 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/ex/dbgctrl.c * PURPOSE: System debug control - * - * PROGRAMMERS: No programmer listed. + * PROGRAMMERS: Alex Ionescu */ /* INCLUDES *****************************************************************/ @@ -15,8 +14,45 @@ /* FUNCTIONS *****************************************************************/ +/*++ + * @name NtSystemDebugControl + * @implemented + * + * Perform various queries to debugger. + * This API is subject to test-case creation to further evaluate its + * abilities (if needed to at all) + * + * See: http://www.osronline.com/showthread.cfm?link=93915 + * http://void.ru/files/Ntexapi.h + * http://www.codeguru.com/code/legacy/system/ntexapi.zip + * http://www.securityfocus.com/bid/9694 + * + * @param ControlCode + * Description of the parameter. Wrapped to more lines on ~70th + * column. + * + * @param InputBuffer + * FILLME + * + * @param InputBufferLength + * FILLME + * + * @param OutputBuffer + * FILLME + * + * @param OutputBufferLength + * FILLME + * + * @param ReturnLength + * FILLME + * + * @return STATUS_SUCCESS in case of success, proper error code otherwise + * + * @remarks None + * + *--*/ NTSTATUS -STDCALL +NTAPI NtSystemDebugControl(SYSDBG_COMMAND ControlCode, PVOID InputBuffer, ULONG InputBufferLength,

1 0

[fireball] 22672: [AUDIT] - Add proper function headers, including links to publically-available documentation - One internal function is subject to further review/audit
by fireball＠svn.reactos.org 28 Jun '06

28 Jun '06

Author: fireball Date: Wed Jun 28 17:53:30 2006 New Revision: 22672 URL: http://svn.reactos.org/svn/reactos?rev=22672&view=rev Log: [AUDIT] - Add proper function headers, including links to publically-available documentation - One internal function is subject to further review/audit Modified: trunk/reactos/ntoskrnl/ex/callback.c (contents, props changed) Modified: trunk/reactos/ntoskrnl/ex/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/callback.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/callback.c (original) +++ trunk/reactos/ntoskrnl/ex/callback.c Wed Jun 28 17:53:30 2006 @@ -1,9 +1,10 @@ /* - * 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/ex/callback.c * PURPOSE: Executive callbacks - * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) + * PROGRAMMERS: Filip Navara + * Alex Ionescu (alex(a)relsoft.net) */ /* INCLUDES *****************************************************************/ @@ -63,433 +64,441 @@ /* FUNCTIONS *****************************************************************/ -/* - * ExpInitializeCallbacks - * - * FUNCTION: +/*++ + * @name ExpInitializeCallbacks + * * Creates the Callback Object as a valid Object Type in the Kernel. - * - * ARGUMENTS: - * None - * - * RETURNS: - * TRUE if the Callback Object Type was successfully created. - */ + * Internal function, subject to further review + * + * @return TRUE if the Callback Object Type was successfully created. + * + * @remarks None + * + *--*/ VOID INIT_FUNCTION -STDCALL +NTAPI ExpInitializeCallbacks(VOID) { - OBJECT_ATTRIBUTES ObjectAttributes; - NTSTATUS Status; - UNICODE_STRING DirName = RTL_CONSTANT_STRING(L"\\Callback"); - UNICODE_STRING CallbackName; - UNICODE_STRING Name; - OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; - HANDLE DirectoryHandle; - ULONG i; - - /* Initialize the Callback Object type */ - RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); - RtlInitUnicodeString(&Name, L"Callback"); - ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); - ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(CALLBACK_OBJECT); - ObjectTypeInitializer.GenericMapping = ExpCallbackMapping; - ObjectTypeInitializer.PoolType = NonPagedPool; - - Status = ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExCallbackObjectType); - - /* Fail if it wasn't created successfully */ - if (!NT_SUCCESS(Status)) - { - return; - } - - /* Initialize the Object */ - InitializeObjectAttributes( - &ObjectAttributes, - &DirName, - OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, - NULL, - NULL - ); - - /* Create the Object Directory */ - Status = NtCreateDirectoryObject( - &DirectoryHandle, - DIRECTORY_ALL_ACCESS, - &ObjectAttributes + OBJECT_ATTRIBUTES ObjectAttributes; + NTSTATUS Status; + UNICODE_STRING DirName = RTL_CONSTANT_STRING(L"\\Callback"); + UNICODE_STRING CallbackName; + UNICODE_STRING Name; + OBJECT_TYPE_INITIALIZER ObjectTypeInitializer; + HANDLE DirectoryHandle; + ULONG i; + + /* Initialize the Callback Object type */ + RtlZeroMemory(&ObjectTypeInitializer, sizeof(ObjectTypeInitializer)); + RtlInitUnicodeString(&Name, L"Callback"); + ObjectTypeInitializer.Length = sizeof(ObjectTypeInitializer); + ObjectTypeInitializer.DefaultNonPagedPoolCharge = sizeof(CALLBACK_OBJECT); + ObjectTypeInitializer.GenericMapping = ExpCallbackMapping; + ObjectTypeInitializer.PoolType = NonPagedPool; + + Status = ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &ExCallbackObjectType); + + /* Fail if it wasn't created successfully */ + if (!NT_SUCCESS(Status)) + { + return; + } + + /* Initialize the Object */ + InitializeObjectAttributes( + &ObjectAttributes, + &DirName, + OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, + NULL, + NULL + ); + + /* Create the Object Directory */ + Status = NtCreateDirectoryObject( + &DirectoryHandle, + DIRECTORY_ALL_ACCESS, + &ObjectAttributes + ); + + /* Fail if couldn't create */ + if (!NT_SUCCESS(Status)) + { + return; + } + + /* Close Handle... */ + NtClose(DirectoryHandle); + + /* Initialize Event used when unregistering */ + KeInitializeEvent(&ExpCallbackEvent, NotificationEvent, 0); + + /* Default NT Kernel Callbacks. */ + for (i=0; ExpInitializeCallback[i].CallbackObject; i++) + { + /* Create the name from the structure */ + RtlInitUnicodeString(&CallbackName, ExpInitializeCallback[i].Name); + + /* Initialize the Object Attributes Structure */ + InitializeObjectAttributes( + &ObjectAttributes, + &CallbackName, + OBJ_PERMANENT | OBJ_CASE_INSENSITIVE, + NULL, + NULL ); - /* Fail if couldn't create */ - if (!NT_SUCCESS(Status)) - { - return; - } - - /* Close Handle... */ - NtClose(DirectoryHandle); - - /* Initialize Event used when unregistering */ - KeInitializeEvent(&ExpCallbackEvent, NotificationEvent, 0); - - /* Default NT Kernel Callbacks. */ - for (i=0; ExpInitializeCallback[i].CallbackObject; i++) - { - /* Create the name from the structure */ - RtlInitUnicodeString(&CallbackName, ExpInitializeCallback[i].Name); - - /* Initialize the Object Attributes Structure */ - InitializeObjectAttributes( - &ObjectAttributes, - &CallbackName, - OBJ_PERMANENT | OBJ_CASE_INSENSITIVE, - NULL, - NULL - ); - - /* Create the Callback Object */ - Status = ExCreateCallback( - (PCALLBACK_OBJECT*)&(ExpInitializeCallback[i].CallbackObject), - &ObjectAttributes, - TRUE, - TRUE - ); - - /* Make sure Global Callbacks have been created */ - if (!NT_SUCCESS(Status)) - { - return; - } - } - /* Everything successful */ + /* Create the Callback Object */ + Status = ExCreateCallback( + (PCALLBACK_OBJECT*)&(ExpInitializeCallback[i].CallbackObject), + &ObjectAttributes, + TRUE, + TRUE + ); + + /* Make sure Global Callbacks have been created */ + if (!NT_SUCCESS(Status)) + { + return; + } + } + /* Everything successful */ } -/* - * ExCreateCallback - * - * FUNCTION: +/*++ + * @name ExCreateCallback + * @implemented + * * Opens or creates a Callback Object. Creates only if Create is true. - * Allows multiple Callback Functions to be registred only if AllowMultipleCallbacks - * is true. - * - * ARGUMENTS: - * CallbackObject = Pointer that will receive the Callback Object. - * CallbackName = Name of Callback - * Create = Determines if the object will be created if it doesn't exit - * AllowMultipleCallbacks = Determines if more then one registered callback function - * can be attached to this Callback Object. - * - * RETURNS: - * STATUS_SUCESS if not failed. - * + * Allows multiple Callback Functions to be registred only if + * AllowMultipleCallbacks is true. + * See: http://www.osronline.com/ddkx/kmarch/k102_967m.htm + * http://www.osronline.com/article.cfm?id=24 + * + * @param CallbackObject + * Pointer that will receive the Callback Object. + * + * @param CallbackName + * Name of Callback + * + * @param Create + * Determines if the object will be created if it doesn't exit + * + * @param AllowMultipleCallbacks + * Determines if more then one registered callback function + * can be attached to this Callback Object. + * + * @return STATUS_SUCESS if not failed. + * + * @remarks Must be called at IRQL = PASSIVE_LEVEL + * + *--*/ +NTSTATUS +NTAPI +ExCreateCallback(OUT PCALLBACK_OBJECT *CallbackObject, + IN POBJECT_ATTRIBUTES ObjectAttributes, + IN BOOLEAN Create, + IN BOOLEAN AllowMultipleCallbacks) +{ + PCALLBACK_OBJECT Callback; + NTSTATUS Status; + HANDLE Handle; + + PAGED_CODE(); + + /* Open a handle to the callback if it exists */ + if (ObjectAttributes->ObjectName) + { + Status = ObOpenObjectByName(ObjectAttributes, + ExCallbackObjectType, + KernelMode, + NULL, + 0, + NULL, + &Handle); + } + else + { + Status = STATUS_UNSUCCESSFUL; + } + + /* We weren't able to open it...should we create it? */ + if(!NT_SUCCESS(Status) && Create ) + { + Status = ObCreateObject(KernelMode, + ExCallbackObjectType, + ObjectAttributes, + KernelMode, + NULL, + sizeof(CALLBACK_OBJECT), + 0, + 0, + (PVOID *)&Callback ); + + /* We Created it...let's initialize the structure now */ + if(NT_SUCCESS(Status)) + { + KeInitializeSpinLock(&Callback->Lock); /* SpinLock */ + InitializeListHead(&Callback->RegisteredCallbacks); /* Callback Entries */ + Callback->AllowMultipleCallbacks = AllowMultipleCallbacks; /* Multiple Callbacks */ + /* Create the object */ + Status = ObInsertObject(Callback, + NULL, + FILE_READ_DATA, + 0, + NULL, + &Handle ); + } + } + + if(NT_SUCCESS(Status)) + { + /* Get a pointer to the new object from the handle we just got */ + Status = ObReferenceObjectByHandle(Handle, + 0, + ExCallbackObjectType, + KernelMode, + (PVOID)&Callback, + NULL); + /* Close the Handle, since we now have the pointer */ + ZwClose(Handle); + } + + /* Everything went fine, so return a pointer to the Object */ + if (NT_SUCCESS(Status)) + { + *CallbackObject = (PCALLBACK_OBJECT)Callback; + } + return Status; +} + +/*++ + * @name ExNotifyCallback * @implemented - */ -NTSTATUS -STDCALL -ExCreateCallback( - OUT PCALLBACK_OBJECT *CallbackObject, - IN POBJECT_ATTRIBUTES ObjectAttributes, - IN BOOLEAN Create, - IN BOOLEAN AllowMultipleCallbacks -) -{ - PCALLBACK_OBJECT Callback; - NTSTATUS Status; - HANDLE Handle; - - PAGED_CODE(); - - /* Open a handle to the callback if it exists */ - if (ObjectAttributes->ObjectName) - { - Status = ObOpenObjectByName(ObjectAttributes, - ExCallbackObjectType, - KernelMode, - NULL, - 0, - NULL, - &Handle); - } - else - { - Status = STATUS_UNSUCCESSFUL; - } - - /* We weren't able to open it...should we create it? */ - if(!NT_SUCCESS(Status) && Create ) - { - Status = ObCreateObject(KernelMode, - ExCallbackObjectType, - ObjectAttributes, - KernelMode, - NULL, - sizeof(CALLBACK_OBJECT), - 0, - 0, - (PVOID *)&Callback ); - - /* We Created it...let's initialize the structure now */ - if(NT_SUCCESS(Status)) - { - KeInitializeSpinLock (&Callback->Lock); /* SpinLock */ - InitializeListHead(&Callback->RegisteredCallbacks); /* Callback Entries */ - Callback->AllowMultipleCallbacks = AllowMultipleCallbacks; /* Multiple Callbacks */ - Status = ObInsertObject ( /* Create the object */ - Callback, - NULL, - FILE_READ_DATA, - 0, - NULL, - &Handle ); - } - } - if(NT_SUCCESS(Status)) - { - - /* Get a pointer to the new object from the handle we just got */ - Status = ObReferenceObjectByHandle ( - Handle, - 0, - ExCallbackObjectType, - KernelMode, - (PVOID)&Callback, - NULL - ); - /* Close the Handle, since we now have the pointer */ - ZwClose(Handle); - } - - /* Everything went fine, so return a pointer to the Object */ - if (NT_SUCCESS(Status)) - { - *CallbackObject = (PCALLBACK_OBJECT)Callback; - } - return Status; -} - -/* - * ExNotifyCallback - * - * FUNCTION: + * * Calls a function pointer (a registered callback) - * - * ARGUMENTS: - * CallbackObject - Which callback to call - * Argument1 - Pointer/data to send to callback function - * Argument2 - Pointer/data to send to callback function - * - * RETURNS: - * Nothing - * - * @implemented - */ + * See: http://www.osronline.com/ddkx/kmarch/k102_2f5e.htm + * http://msdn.microsoft.com/library/en-us/Kernel_d/hh/Kernel_d/Synchro_e954f5… + * http://vmsone.com/~decuslib/vmssig/vmslt99b/nt/wdm-callback.txt + * + * @param CallbackObject + * Which callback to call + * + * @param Argument1 + * Pointer/data to send to callback function + * + * @param Argument2 + * Pointer/data to send to callback function + * + * @return None + * + * @remarks None + * + *--*/ VOID -STDCALL -ExNotifyCallback( - IN PCALLBACK_OBJECT OpaqueCallbackObject, - IN PVOID Argument1, - IN PVOID Argument2 -) -{ - PCALLBACK_OBJECT CallbackObject = (PCALLBACK_OBJECT)OpaqueCallbackObject; - PLIST_ENTRY RegisteredCallbacks; - PCALLBACK_REGISTRATION CallbackRegistration; - KIRQL OldIrql; - - /* Acquire the Lock */ - OldIrql = KfAcquireSpinLock(&CallbackObject->Lock); - - /* Enumerate through all the registered functions */ - for (RegisteredCallbacks = CallbackObject->RegisteredCallbacks.Flink; +NTAPI +ExNotifyCallback(IN PCALLBACK_OBJECT OpaqueCallbackObject, + IN PVOID Argument1, + IN PVOID Argument2) +{ + PCALLBACK_OBJECT CallbackObject = (PCALLBACK_OBJECT)OpaqueCallbackObject; + PLIST_ENTRY RegisteredCallbacks; + PCALLBACK_REGISTRATION CallbackRegistration; + KIRQL OldIrql; + + /* Acquire the Lock */ + OldIrql = KfAcquireSpinLock(&CallbackObject->Lock); + + /* Enumerate through all the registered functions */ + for (RegisteredCallbacks = CallbackObject->RegisteredCallbacks.Flink; RegisteredCallbacks != &CallbackObject->RegisteredCallbacks; RegisteredCallbacks = RegisteredCallbacks->Flink) - { - - /* Get a pointer to a Callback Registration from the List Entries */ - CallbackRegistration = CONTAINING_RECORD ( RegisteredCallbacks, - CALLBACK_REGISTRATION, - RegisteredCallbacks); - - /* Don't bother doing Callback Notification if it's pending to be deleted */ - if (!CallbackRegistration->PendingDeletion) - { - - /* Mark the Callback in use, so it won't get deleted while we are calling it */ - CallbackRegistration->InUse += 1; - - /* Release the Spinlock before making the call */ - KfReleaseSpinLock(&CallbackObject->Lock, OldIrql); - - /* Call the Registered Function */ - CallbackRegistration->CallbackFunction ( - CallbackRegistration->CallbackContext, - Argument1, - Argument2 - ); - - /* Get SpinLock back */ - OldIrql = KfAcquireSpinLock(&CallbackObject->Lock); - - /* We are not in use anymore */ - CallbackRegistration->InUse -= 1; - - /* If another instance of this function isn't running and deletion is pending, signal the event */ - if (CallbackRegistration->PendingDeletion && CallbackRegistration->InUse == 0) - { - KeSetEvent(&ExpCallbackEvent, 0, FALSE); - } - } - } - /* Unsynchronize and release the Callback Object */ - KfReleaseSpinLock(&CallbackObject->Lock, OldIrql); + { + /* Get a pointer to a Callback Registration from the List Entries */ + CallbackRegistration = CONTAINING_RECORD(RegisteredCallbacks, + CALLBACK_REGISTRATION, + RegisteredCallbacks); + + /* Don't bother doing Callback Notification if it's pending to be deleted */ + if (!CallbackRegistration->PendingDeletion) + { + /* Mark the Callback in use, so it won't get deleted while we are calling it */ + CallbackRegistration->InUse += 1; + + /* Release the Spinlock before making the call */ + KfReleaseSpinLock(&CallbackObject->Lock, OldIrql); + + /* Call the Registered Function */ + CallbackRegistration->CallbackFunction( + CallbackRegistration->CallbackContext, + Argument1, + Argument2 + ); + + /* Get SpinLock back */ + OldIrql = KfAcquireSpinLock(&CallbackObject->Lock); + + /* We are not in use anymore */ + CallbackRegistration->InUse -= 1; + + /* If another instance of this function isn't running and deletion is pending, signal the event */ + if (CallbackRegistration->PendingDeletion && CallbackRegistration->InUse == 0) + { + KeSetEvent(&ExpCallbackEvent, 0, FALSE); + } + } + } + /* Unsynchronize and release the Callback Object */ + KfReleaseSpinLock(&CallbackObject->Lock, OldIrql); } -/* - * ExRegisterCallback - * - * FUNCTION: - * Allows a function to associate a callback pointer (Function) - * to a created Callback object - * - * ARGUMENTS: - * CallbackObject = The Object Created with ExCreateCallBack - * CallBackFunction = Pointer to the function to be called back - * CallBackContext = Block of memory that can contain user-data - * which will be passed on to the callback - * - * RETURNS: - * A handle to a Callback Registration Structure (MSDN Documentation) - * +/*++ + * @name ExRegisterCallback * @implemented - */ + * + * Allows a function to associate a callback pointer (Function) to + * a created Callback object + * See: DDK, OSR, links in ExNotifyCallback + * + * @param CallbackObject + * The Object Created with ExCreateCallBack + * + * @param CallBackFunction + * Pointer to the function to be called back + * + * @param CallBackContext + * Block of memory that can contain user-data which will be + * passed on to the callback + * + * @return A handle to a Callback Registration Structure (MSDN Documentation) + * + * @remarks None + * + *--*/ PVOID -STDCALL -ExRegisterCallback( - IN PCALLBACK_OBJECT OpaqueCallbackObject, - IN PCALLBACK_FUNCTION CallbackFunction, - IN PVOID CallbackContext -) -{ - PCALLBACK_OBJECT CallbackObject = (PCALLBACK_OBJECT)OpaqueCallbackObject; - PCALLBACK_REGISTRATION CallbackRegistration = NULL; - KIRQL OldIrql; - - PAGED_CODE(); - - /* Create reference to Callback Object */ - ObReferenceObject (CallbackObject); - - /* Allocate memory for the structure */ - CallbackRegistration = ExAllocatePoolWithTag( - NonPagedPool, - sizeof(CallbackRegistration), - CALLBACK_TAG - ); - /* Fail if memory allocation failed */ - if(!CallbackRegistration) - { - ObDereferenceObject (CallbackObject); - return NULL; - } - - /* Create Callback Registration */ - CallbackRegistration->CallbackObject = CallbackObject; /* When unregistering, drivers send a handle to the Registration, not the object... */ - CallbackRegistration->CallbackFunction = CallbackFunction; /* NotifyCallback uses Objects, so this needs to be here in order to call the registered functions */ - CallbackRegistration->CallbackContext = CallbackContext; /* The documented NotifyCallback returns the Context, so we must save this somewhere */ - - /* Acquire SpinLock */ - OldIrql = KfAcquireSpinLock (&CallbackObject->Lock); - - /* Add Callback if 1) No Callbacks registered or 2) Multiple Callbacks allowed */ - if(CallbackObject->AllowMultipleCallbacks || IsListEmpty(&CallbackObject->RegisteredCallbacks)) - { - InsertTailList(&CallbackObject->RegisteredCallbacks,&CallbackRegistration->RegisteredCallbacks); - } - else - { - ExFreePool(CallbackRegistration); - CallbackRegistration = NULL; - } - - /* Release SpinLock */ - KfReleaseSpinLock(&CallbackObject->Lock, OldIrql); - - /* Return handle to Registration Object */ - return (PVOID) CallbackRegistration; +NTAPI +ExRegisterCallback(IN PCALLBACK_OBJECT OpaqueCallbackObject, + IN PCALLBACK_FUNCTION CallbackFunction, + IN PVOID CallbackContext) +{ + PCALLBACK_OBJECT CallbackObject = (PCALLBACK_OBJECT)OpaqueCallbackObject; + PCALLBACK_REGISTRATION CallbackRegistration = NULL; + KIRQL OldIrql; + + PAGED_CODE(); + + /* Create reference to Callback Object */ + ObReferenceObject (CallbackObject); + + /* Allocate memory for the structure */ + CallbackRegistration = ExAllocatePoolWithTag( + NonPagedPool, + sizeof(CallbackRegistration), + CALLBACK_TAG + ); + /* Fail if memory allocation failed */ + if(!CallbackRegistration) + { + ObDereferenceObject (CallbackObject); + return NULL; + } + + /* Create Callback Registration */ + CallbackRegistration->CallbackObject = CallbackObject; /* When unregistering, drivers send a handle to the Registration, not the object... */ + CallbackRegistration->CallbackFunction = CallbackFunction; /* NotifyCallback uses Objects, so this needs to be here in order to call the registered functions */ + CallbackRegistration->CallbackContext = CallbackContext; /* The documented NotifyCallback returns the Context, so we must save this somewhere */ + + /* Acquire SpinLock */ + OldIrql = KfAcquireSpinLock (&CallbackObject->Lock); + + /* Add Callback if 1) No Callbacks registered or 2) Multiple Callbacks allowed */ + if(CallbackObject->AllowMultipleCallbacks || IsListEmpty(&CallbackObject->RegisteredCallbacks)) + { + InsertTailList(&CallbackObject->RegisteredCallbacks,&CallbackRegistration->RegisteredCallbacks); + } + else + { + ExFreePool(CallbackRegistration); + CallbackRegistration = NULL; + } + + /* Release SpinLock */ + KfReleaseSpinLock(&CallbackObject->Lock, OldIrql); + + /* Return handle to Registration Object */ + return (PVOID)CallbackRegistration; } -/* - * ExUnregisterCallback - * - * FUNCTION: +/*++ + * @name ExUnregisterCallback + * @implemented + * * Deregisters a CallBack - * - * ARGUMENTS: - * CallbackRegistration = Callback Registration Handle - * - * RETURNS: - * Nothing - * - * @implemented - */ -VOID STDCALL -ExUnregisterCallback( - IN PVOID CallbackRegistrationHandle -) -{ - PCALLBACK_REGISTRATION CallbackRegistration; - PCALLBACK_OBJECT CallbackObject; - KIRQL OldIrql; - - PAGED_CODE(); - - /* Convert Handle to valid Structure Pointer */ - CallbackRegistration = (PCALLBACK_REGISTRATION) CallbackRegistrationHandle; - - /* Get the Callback Object */ - CallbackObject = CallbackRegistration->CallbackObject; - - /* Lock the Object */ - OldIrql = KfAcquireSpinLock (&CallbackObject->Lock); - - /* We can't Delete the Callback if it's in use, because this would create a call towards a null pointer => crash */ - while (CallbackRegistration->InUse) - { - - /* Similarly, we also don't want to wait ages for all pending callbacks to be called */ - CallbackRegistration->PendingDeletion = TRUE; - - /* We are going to wait for the event, so the Lock isn't necessary */ - KfReleaseSpinLock (&CallbackObject->Lock, OldIrql); - - /* Make sure the event is cleared */ - KeClearEvent (&ExpCallbackEvent); - - /* Wait for the Event */ - KeWaitForSingleObject ( - &ExpCallbackEvent, - Executive, - KernelMode, - FALSE, - NULL - ); - - /* We need the Lock again */ - OldIrql = KfAcquireSpinLock(&CallbackObject->Lock); - } - - /* Remove the Callback */ - RemoveEntryList(&CallbackRegistration->RegisteredCallbacks); - - /* It's now safe to release the lock */ - KfReleaseSpinLock(&CallbackObject->Lock, OldIrql); - - /* Delete this registration */ - ExFreePool(CallbackRegistration); - - /* Remove the reference */ - ObDereferenceObject(CallbackObject); + * See: DDK, OSR, links in ExNotifyCallback + * + * @param CallbackRegistration + * Callback Registration Handle + * + * @return None + * + * @remarks None + * + *--*/ +VOID +NTAPI +ExUnregisterCallback(IN PVOID CallbackRegistrationHandle) +{ + PCALLBACK_REGISTRATION CallbackRegistration; + PCALLBACK_OBJECT CallbackObject; + KIRQL OldIrql; + + PAGED_CODE(); + + /* Convert Handle to valid Structure Pointer */ + CallbackRegistration = (PCALLBACK_REGISTRATION) CallbackRegistrationHandle; + + /* Get the Callback Object */ + CallbackObject = CallbackRegistration->CallbackObject; + + /* Lock the Object */ + OldIrql = KfAcquireSpinLock (&CallbackObject->Lock); + + /* We can't Delete the Callback if it's in use, because this would create a call towards a null pointer => crash */ + while (CallbackRegistration->InUse) + { + /* Similarly, we also don't want to wait ages for all pending callbacks to be called */ + CallbackRegistration->PendingDeletion = TRUE; + + /* We are going to wait for the event, so the Lock isn't necessary */ + KfReleaseSpinLock (&CallbackObject->Lock, OldIrql); + + /* Make sure the event is cleared */ + KeClearEvent (&ExpCallbackEvent); + + /* Wait for the Event */ + KeWaitForSingleObject ( + &ExpCallbackEvent, + Executive, + KernelMode, + FALSE, + NULL + ); + + /* We need the Lock again */ + OldIrql = KfAcquireSpinLock(&CallbackObject->Lock); + } + + /* Remove the Callback */ + RemoveEntryList(&CallbackRegistration->RegisteredCallbacks); + + /* It's now safe to release the lock */ + KfReleaseSpinLock(&CallbackObject->Lock, OldIrql); + + /* Delete this registration */ + ExFreePool(CallbackRegistration); + + /* Remove the reference */ + ObDereferenceObject(CallbackObject); } /* EOF */ Propchange: trunk/reactos/ntoskrnl/ex/callback.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[fireball] 22671: [AUDIT] - Add proper function headers, including links to documentation - All exported functions have publically-available information sources - The only internal function is actually quite self-explanatory by its name - Implementation is partly wrong as pointed by Gunnar
by fireball＠svn.reactos.org 28 Jun '06

28 Jun '06

Author: fireball Date: Wed Jun 28 16:52:08 2006 New Revision: 22671 URL: http://svn.reactos.org/svn/reactos?rev=22671&view=rev Log: [AUDIT] - Add proper function headers, including links to documentation - All exported functions have publically-available information sources - The only internal function is actually quite self-explanatory by its name - Implementation is partly wrong as pointed by Gunnar Modified: trunk/reactos/ntoskrnl/ex/atom.c (contents, props changed) Modified: trunk/reactos/ntoskrnl/ex/atom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/atom.c?rev=226… ============================================================================== --- trunk/reactos/ntoskrnl/ex/atom.c (original) +++ trunk/reactos/ntoskrnl/ex/atom.c Wed Jun 28 16:52:08 2006 @@ -1,6 +1,6 @@ /* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel + * PROJECT: ReactOS Kernel + * COPYRIGHT: GPL - See COPYING in the top level directory * FILE: ntoskrnl/ex/atom.c * PURPOSE: Executive Atom Functions * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) @@ -28,6 +28,17 @@ /* PRIVATE FUNCTIONS *********************************************************/ +/*++ + * @name ExpGetGlobalAtomTable + * + * Gets pointer to a global atom table, creates it if not already created + * + * @return Pointer to the RTL_ATOM_TABLE, or NULL if it's impossible + * to create atom table + * + * @remarks Internal function + * + *--*/ PRTL_ATOM_TABLE NTAPI ExpGetGlobalAtomTable(VOID) @@ -49,9 +60,29 @@ /* FUNCTIONS ****************************************************************/ -/* +/*++ + * @name NtAddAtom * @implemented - */ + * + * Function NtAddAtom creates new Atom in Global Atom Table. If Atom + * with the same name already exist, internal Atom counter is incremented. + * See: http://undocumented.ntinternals.net/UserMode/Undocumented%20Functions/Atoms… + * + * @param AtomName + * Atom name in Unicode + * + * @param AtomNameLength + * Length of the atom name + * + * @param Atom + * Pointer to RTL_ATOM + * + * @return STATUS_SUCCESS in case of success, proper error code + * othwerwise. + * + * @remarks None + * + *--*/ NTSTATUS NTAPI NtAddAtom(IN PWSTR AtomName, @@ -151,9 +182,24 @@ return Status; } -/* +/*++ + * @name NtDeleteAtom * @implemented - */ + * + * Removes Atom from Global Atom Table. If Atom's reference counter + * is greater then 1, function decrements this counter, but Atom + * stayed in Global Atom Table. + * See: http://undocumented.ntinternals.net/UserMode/Undocumented%20Functions/Atoms… + * + * @param Atom + * Atom identifier + * + * @return STATUS_SUCCESS in case of success, proper error code + * othwerwise. + * + * @remarks None + * + *--*/ NTSTATUS NTAPI NtDeleteAtom(IN RTL_ATOM Atom) @@ -168,9 +214,29 @@ return RtlDeleteAtomFromAtomTable(AtomTable, Atom); } -/* +/*++ + * @name NtFindAtom * @implemented - */ + * + * Retrieves existing Atom's identifier without incrementing Atom's + * internal counter + * See: http://undocumented.ntinternals.net/UserMode/Undocumented%20Functions/Atoms… + * + * @param AtomName + * Atom name in Unicode + * + * @param AtomNameLength + * Length of the atom name + * + * @param Atom + * Pointer to RTL_ATOM + * + * @return STATUS_SUCCESS in case of success, proper error code + * othwerwise. + * + * @remarks None + * + *--*/ NTSTATUS NTAPI NtFindAtom(IN PWSTR AtomName, @@ -270,9 +336,36 @@ return Status; } -/* +/*++ + * @name NtQueryInformationAtom * @implemented - */ + * + * Gets single Atom properties or reads Global Atom Table + * See: http://undocumented.ntinternals.net/UserMode/Undocumented%20Functions/Atoms… + * + * @param Atom + * Atom to query. If AtomInformationClass parameter is + * AtomTableInformation, Atom parameter is not used. + * + * @param AtomInformationClass + * See ATOM_INFORMATION_CLASS enumeration type for details + * + * @param AtomInformation + * Result of call - pointer to user's allocated buffer for data + * + * @param AtomInformationLength + * Size of AtomInformation buffer, in bytes + * + * @param ReturnLength + * Pointer to ULONG value containing required AtomInformation + * buffer size + * + * @return STATUS_SUCCESS in case of success, proper error code + * othwerwise. + * + * @remarks None + * + *--*/ NTSTATUS NTAPI NtQueryInformationAtom(RTL_ATOM Atom, Propchange: trunk/reactos/ntoskrnl/ex/atom.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[arty] 22670: Woot. We're deep into freeldr. Printf is working, etc. Forgot .bss. TODO: retrieve .bss size in build step.
by arty＠svn.reactos.org 28 Jun '06

28 Jun '06

Author: arty Date: Wed Jun 28 05:14:23 2006 New Revision: 22670 URL: http://svn.reactos.org/svn/reactos?rev=22670&view=rev Log: Woot. We're deep into freeldr. Printf is working, etc. Forgot .bss. TODO: retrieve .bss size in build step. Modified: branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Modified: branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/bo… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s (original) +++ branches/powerpc/reactos/boot/freeldr/bootsect/ofwboot.s Wed Jun 28 05:14:23 2006 @@ -34,7 +34,9 @@ addi %r4,%r4,_binary_freeldr_tmp_end@l lis %r5,_binary_freeldr_tmp_start@ha addi %r5,%r5,_binary_freeldr_tmp_start@l + /* Make sufficient room for .bss */ sub %r4,%r4,%r5 + addi %r4,%r4,0x6000 xor %r5,%r5,%r5 li %r5,0x1000 Modified: branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/arch/powerpc/mach.c Wed Jun 28 05:14:23 2006 @@ -284,14 +284,26 @@ chosen_package = ofw_finddevice( "/chosen" ); + ofw_print_string("Chosen package: "); + ofw_print_number(chosen_package); + ofw_print_string("\n"); + ofw_getprop( chosen_package, "stdin", (char *)&stdin_handle, sizeof(stdin_handle) ); - stdin_handle = REV(stdin_handle); + ofw_print_string("ofw_getprop done\n"); + + /* stdin_handle = REV(stdin_handle); */ + + ofw_print_string("Populating MachVtbl: "); + ofw_print_number((int)&MachVtbl); + ofw_print_string("\n"); MachVtbl.ConsPutChar = PpcPutChar; MachVtbl.ConsKbHit = PpcConsKbHit; MachVtbl.ConsGetCh = PpcConsGetCh; + + ofw_print_string("About to do printf\n"); printf( "stdin_handle is %x\n", stdin_handle );

1 0

[arty] 22669: Working up to it. We get the first banner.
by arty＠svn.reactos.org 27 Jun '06

27 Jun '06

Author: arty Date: Wed Jun 28 03:47:38 2006 New Revision: 22669 URL: http://svn.reactos.org/svn/reactos?rev=22669&view=rev Log: Working up to it. We get the first banner. Modified: branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr Modified: branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/boot/freeldr/fr… ============================================================================== --- branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild (original) +++ branches/powerpc/reactos/boot/freeldr/freeldr/freeldr_arch.rbuild Wed Jun 28 03:47:38 2006 @@ -61,6 +61,9 @@ <compilerflag>-fno-inline</compilerflag> <compilerflag>-fno-zero-initialized-in-bss</compilerflag> <compilerflag>-Os</compilerflag> + <compilerflag>-fPIC</compilerflag> + <compilerflag>-mno-toc</compilerflag> + <compilerflag>-meabi</compilerflag> <file>boot.s</file> <file>ofw.c</file> <file>mach.c</file> Modified: branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc.lost%… ============================================================================== --- branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr (original) +++ branches/powerpc/reactos/tools/ppc.lost+found/link-freeldr Wed Jun 28 03:47:38 2006 @@ -2,7 +2,7 @@ export PATH=$PATH:/usr/local/pkg/reactos-powerpc/bin ld -EL -g -nostartfiles -nostdlib -N -Ttext=0x8000 -o freeldr.elf obj-ppc/boot/freeldr/freeldr/arch/powerpc/boot.o obj-ppc/boot/freeldr/freeldr/cache/blocklist.o obj-ppc/boot/freeldr/freeldr/cache/cache.o obj-ppc/boot/freeldr/freeldr/comm/rs232.o obj-ppc/boot/freeldr/freeldr/disk/disk.o obj-ppc/boot/freeldr/freeldr/disk/partition.o obj-ppc/boot/freeldr/freeldr/fs/ext2.o obj-ppc/boot/freeldr/freeldr/fs/fat.o obj-ppc/boot/freeldr/freeldr/fs/fs.o obj-ppc/boot/freeldr/freeldr/fs/fsrec.o obj-ppc/boot/freeldr/freeldr/fs/iso.o obj-ppc/boot/freeldr/freeldr/fs/ntfs.o obj-ppc/boot/freeldr/freeldr/inifile/ini_init.o obj-ppc/boot/freeldr/freeldr/inifile/inifile.o obj-ppc/boot/freeldr/freeldr/inifile/parse.o obj-ppc/boot/freeldr/freeldr/math/libgcc2.o obj-ppc/boot/freeldr/freeldr/mm/meminit.o obj-ppc/boot/freeldr/freeldr/mm/mm.o obj-ppc/boot/freeldr/freeldr/reactos/registry.o obj-ppc/boot/freeldr/freeldr/reactos/arcname.o obj-ppc/boot/freeldr/freeldr/reactos/binhive.o obj-ppc/boot/freeldr/freeldr/reactos/reactos.o obj-ppc/boot/freeldr/freeldr/rtl/list.o obj-ppc/boot/freeldr/freeldr/ui/gui.o obj-ppc/boot/freeldr/freeldr/ui/tui.o obj-ppc/boot/freeldr/freeldr/ui/tuimenu.o obj-ppc/boot/freeldr/freeldr/ui/ui.o obj-ppc/boot/freeldr/freeldr/video/bank.o obj-ppc/boot/freeldr/freeldr/video/fade.o obj-ppc/boot/freeldr/freeldr/video/palette.o obj-ppc/boot/freeldr/freeldr/video/pixel.o obj-ppc/boot/freeldr/freeldr/video/video.o obj-ppc/boot/freeldr/freeldr/freeldr.o obj-ppc/boot/freeldr/freeldr/debug.o obj-ppc/boot/freeldr/freeldr/version.o obj-ppc/boot/freeldr/freeldr/cmdline.o obj-ppc/boot/freeldr/freeldr/machine.o obj-ppc/boot/freeldr/freeldr/arch/powerpc/mach.o obj-ppc/boot/freeldr/freeldr/arch/powerpc/ofw.o obj-ppc/boot/freeldr/freeldr/arch/powerpc/mboot.o obj-ppc/boot/freeldr/freeldr/bootmgr.o obj-ppc/boot/freeldr/freeldr/drivemap.o obj-ppc/boot/freeldr/freeldr/miscboot.o obj-ppc/boot/freeldr/freeldr/options.o obj-ppc/boot/freeldr/freeldr/linuxboot.o obj-ppc/boot/freeldr/freeldr/oslist.o obj-ppc/boot/freeldr/freeldr/custom.o obj-ppc/lib/rossym/rossym.a obj-ppc/lib/string/string.a obj-ppc/lib/rtl/rtl.a /usr/local/pkg/reactos-powerpc/lib/libgcc.a -objcopy -O binary --only-section=.text --only-section=.data --only-section=.bss freeldr.elf freeldr.tmp.le +objcopy -O binary freeldr.elf freeldr.tmp.le output-ppc/tools/ppc-le2be freeldr.tmp.le freeldr.tmp objcopy -I binary -B powerpc:common -O elf32-powerpc freeldr.tmp ofwldr.payload reactos-powerpc-as -mbig -o ofwboot.o boot/freeldr/bootsect/ofwboot.s boot/freeldr/bootsect/ofw_util.s boot/freeldr/bootsect/ofw.s

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