Ros-diffs August 2006

ros-diffs@reactos.org

19 participants
447 discussions

[greatlrd] 23719: bug 1769 : from w3seek : Implement some new functions

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Aug 26 18:28:34 2006 New Revision: 23719 URL: http://svn.reactos.org/svn/reactos?rev=23719&view=rev Log: bug 1769 : from w3seek : Implement some new functions Modified: trunk/reactos/dll/win32/kernel32/kernel32.def trunk/reactos/dll/win32/kernel32/kernel32.rbuild 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 trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/dll/win32/kernel32/kernel32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.def (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.def Sat Aug 26 18:28:34 2006 @@ -109,6 +109,8 @@ CreateDirectoryW@8 CreateEventA@16 CreateEventW@16 +CreateEventExA@16 +CreateEventExW@16 CreateFiber@12 CreateFiberEx@20 CreateFileA@28 @@ -126,6 +128,8 @@ CreateMemoryResourceNotification@4 CreateMutexA@12 CreateMutexW@12 +CreateMutexExA@16 +CreateMutexExW@16 CreateNamedPipeA@32 CreateNamedPipeW@32 CreateNlsSecurityDescriptor@12 @@ -137,6 +141,8 @@ CreateRemoteThread@28 CreateSemaphoreA@16 CreateSemaphoreW@16 +CreateSemaphoreExA@24 +CreateSemaphoreExW@24 CreateSocketHandle@0 CreateSymbolicLinkA@12 CreateSymbolicLinkW@12 @@ -148,6 +154,8 @@ CreateVirtualBuffer@12 CreateWaitableTimerA@12 CreateWaitableTimerW@12 +CreateWaitableTimerExA@16 +CreateWaitableTimerExW@16 DeactivateActCtx@8 DebugActiveProcess@4 DebugActiveProcessStop@4 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 Sat Aug 26 18:28:34 2006 @@ -8,7 +8,12 @@ <define name="_WIN32_WINNT">0x0502</define> <define name="__NO_CTYPE_INLINES" /> <define name="WINVER">0x502</define> + <directory name="debug"> <file>debugger.c</file> <file>output.c</file> 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 Sat Aug 26 18:28:34 2006 @@ -8,6 +8,10 @@ /* INCLUDES *****************************************************************/ +/* File contains Vista Semantics */ +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 + #include <k32.h> #define NDEBUG @@ -17,10 +21,10 @@ HANDLE WINAPI -CreateEventA(IN LPSECURITY_ATTRIBUTES lpEventAttributes OPTIONAL, - IN BOOL bManualReset, - IN BOOL bInitialState, - IN LPCSTR lpName OPTIONAL) +CreateEventExA(IN LPSECURITY_ATTRIBUTES lpEventAttributes OPTIONAL, + IN LPCSTR lpName OPTIONAL, + IN DWORD dwFlags, + IN DWORD dwDesiredAccess) { NTSTATUS Status; ANSI_STRING AnsiName; @@ -48,27 +52,39 @@ } /* 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) + return CreateEventExW(lpEventAttributes, + UnicodeName, + dwFlags, + dwDesiredAccess); + +} + +HANDLE +WINAPI +CreateEventExW(IN LPSECURITY_ATTRIBUTES lpEventAttributes OPTIONAL, + IN LPCWSTR lpName OPTIONAL, + IN DWORD dwFlags, + IN DWORD dwDesiredAccess) { NTSTATUS Status; OBJECT_ATTRIBUTES LocalAttributes; POBJECT_ATTRIBUTES ObjectAttributes; HANDLE Handle; UNICODE_STRING ObjectName; + BOOLEAN InitialState; + EVENT_TYPE EventType; /* Now check if we got a name */ if (lpName) RtlInitUnicodeString(&ObjectName, lpName); + + if (dwFlags & ~(CREATE_EVENT_INITIAL_SET | CREATE_EVENT_MANUAL_RESET)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + InitialState = (dwFlags & CREATE_EVENT_INITIAL_SET) != 0; + EventType = (dwFlags & CREATE_EVENT_MANUAL_RESET) ? NotificationEvent : SynchronizationEvent; /* Now convert the object attributes */ ObjectAttributes = BasepConvertObjectAttributes(&LocalAttributes, @@ -77,11 +93,10 @@ /* Create the event */ Status = NtCreateEvent(&Handle, - EVENT_ALL_ACCESS, + (ACCESS_MASK)dwDesiredAccess, ObjectAttributes, - bManualReset ? - NotificationEvent : SynchronizationEvent, - (BOOLEAN)bInitialState); + EventType, + InitialState); if (NT_SUCCESS(Status)) { /* Check if the object already existed */ @@ -105,6 +120,49 @@ SetLastErrorByStatus(Status); return NULL; } + +} + +HANDLE +WINAPI +CreateEventA(IN LPSECURITY_ATTRIBUTES lpEventAttributes OPTIONAL, + IN BOOL bManualReset, + IN BOOL bInitialState, + IN LPCSTR lpName OPTIONAL) +{ + DWORD dwFlags = 0; + + if (bManualReset) + dwFlags |= CREATE_EVENT_MANUAL_RESET; + + if (bInitialState) + dwFlags |= CREATE_EVENT_INITIAL_SET; + + return CreateEventExA(lpEventAttributes, + lpName, + dwFlags, + EVENT_ALL_ACCESS); +} + +HANDLE +WINAPI +CreateEventW(IN LPSECURITY_ATTRIBUTES lpEventAttributes OPTIONAL, + IN BOOL bManualReset, + IN BOOL bInitialState, + IN LPCWSTR lpName OPTIONAL) +{ + DWORD dwFlags = 0; + + if (bManualReset) + dwFlags |= CREATE_EVENT_MANUAL_RESET; + + if (bInitialState) + dwFlags |= CREATE_EVENT_INITIAL_SET; + + return CreateEventExW(lpEventAttributes, + lpName, + dwFlags, + EVENT_ALL_ACCESS); } HANDLE 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 Sat Aug 26 18:28:34 2006 @@ -8,6 +8,10 @@ /* INCLUDES *****************************************************************/ +/* File contains Vista Semantics */ +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 + #include <k32.h> #define NDEBUG @@ -20,9 +24,10 @@ */ HANDLE WINAPI -CreateMutexA(IN LPSECURITY_ATTRIBUTES lpMutexAttributes OPTIONAL, - IN BOOL bInitialOwner, - IN LPCSTR lpName OPTIONAL) +CreateMutexExA(IN LPSECURITY_ATTRIBUTES lpMutexAttributes OPTIONAL, + IN LPCSTR lpName OPTIONAL, + IN DWORD dwFlags, + IN DWORD dwDesiredAccess) { NTSTATUS Status; ANSI_STRING AnsiName; @@ -50,28 +55,39 @@ } /* 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) + return CreateMutexExW(lpMutexAttributes, + UnicodeName, + dwFlags, + dwDesiredAccess); +} + +/* + * @implemented + */ +HANDLE +WINAPI +CreateMutexExW(IN LPSECURITY_ATTRIBUTES lpMutexAttributes OPTIONAL, + IN LPCWSTR lpName OPTIONAL, + IN DWORD dwFlags, + IN DWORD dwDesiredAccess) { NTSTATUS Status; OBJECT_ATTRIBUTES LocalAttributes; POBJECT_ATTRIBUTES ObjectAttributes; HANDLE Handle; UNICODE_STRING ObjectName; + BOOLEAN InitialOwner; /* Now check if we got a name */ if (lpName) RtlInitUnicodeString(&ObjectName, lpName); + + if (dwFlags & ~(CREATE_MUTEX_INITIAL_OWNER)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + InitialOwner = (dwFlags & CREATE_MUTEX_INITIAL_OWNER) != 0; /* Now convert the object attributes */ ObjectAttributes = BasepConvertObjectAttributes(&LocalAttributes, @@ -80,9 +96,9 @@ /* Create the mutant */ Status = NtCreateMutant(&Handle, - MUTANT_ALL_ACCESS, + (ACCESS_MASK)dwDesiredAccess, ObjectAttributes, - (BOOLEAN)bInitialOwner); + InitialOwner); if (NT_SUCCESS(Status)) { /* Check if the object already existed */ @@ -106,6 +122,47 @@ SetLastErrorByStatus(Status); return NULL; } + +} + +/* + * @implemented + */ +HANDLE +WINAPI +CreateMutexA(IN LPSECURITY_ATTRIBUTES lpMutexAttributes OPTIONAL, + IN BOOL bInitialOwner, + IN LPCSTR lpName OPTIONAL) +{ + DWORD dwFlags = 0; + + if (bInitialOwner) + dwFlags |= CREATE_MUTEX_INITIAL_OWNER; + + return CreateMutexExA(lpMutexAttributes, + lpName, + dwFlags, + MUTANT_ALL_ACCESS); +} + +/* + * @implemented + */ +HANDLE +WINAPI +CreateMutexW(IN LPSECURITY_ATTRIBUTES lpMutexAttributes OPTIONAL, + IN BOOL bInitialOwner, + IN LPCWSTR lpName OPTIONAL) +{ + DWORD dwFlags = 0; + + if (bInitialOwner) + dwFlags |= CREATE_MUTEX_INITIAL_OWNER; + + return CreateMutexExW(lpMutexAttributes, + lpName, + dwFlags, + MUTANT_ALL_ACCESS); } /* 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 Sat Aug 26 18:28:34 2006 @@ -8,6 +8,10 @@ /* INCLUDES *****************************************************************/ +/* File contains Vista Semantics */ +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 + #include <k32.h> #define NDEBUG @@ -20,10 +24,12 @@ */ HANDLE WINAPI -CreateSemaphoreA(IN LPSECURITY_ATTRIBUTES lpSemaphoreAttributes OPTIONAL, - IN LONG lInitialCount, - IN LONG lMaximumCount, - IN LPCSTR lpName OPTIONAL) +CreateSemaphoreExA(IN LPSECURITY_ATTRIBUTES lpSemaphoreAttributes OPTIONAL, + IN LONG lInitialCount, + IN LONG lMaximumCount, + IN LPCSTR lpName OPTIONAL, + IN DWORD dwFlags, + IN DWORD dwDesiredAccess) { NTSTATUS Status; ANSI_STRING AnsiName; @@ -51,21 +57,25 @@ } /* 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) + return CreateSemaphoreExW(lpSemaphoreAttributes, + lInitialCount, + lMaximumCount, + UnicodeName, + dwFlags, + dwDesiredAccess); +} + +/* + * @implemented + */ +HANDLE +WINAPI +CreateSemaphoreExW(IN LPSECURITY_ATTRIBUTES lpSemaphoreAttributes OPTIONAL, + IN LONG lInitialCount, + IN LONG lMaximumCount, + IN LPCWSTR lpName OPTIONAL, + IN DWORD dwFlags, + IN DWORD dwDesiredAccess) { NTSTATUS Status; OBJECT_ATTRIBUTES LocalAttributes; @@ -76,6 +86,12 @@ /* Now check if we got a name */ if (lpName) RtlInitUnicodeString(&ObjectName, lpName); + if (dwFlags != 0) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + /* Now convert the object attributes */ ObjectAttributes = BasepConvertObjectAttributes(&LocalAttributes, lpSemaphoreAttributes, @@ -83,7 +99,7 @@ /* Create the semaphore */ Status = NtCreateSemaphore(&Handle, - SEMAPHORE_ALL_ACCESS, + (ACCESS_MASK)dwDesiredAccess, ObjectAttributes, lInitialCount, lMaximumCount); @@ -110,6 +126,44 @@ SetLastErrorByStatus(Status); return NULL; } + +} + + +/* + * @implemented + */ +HANDLE +WINAPI +CreateSemaphoreA(IN LPSECURITY_ATTRIBUTES lpSemaphoreAttributes OPTIONAL, + IN LONG lInitialCount, + IN LONG lMaximumCount, + IN LPCSTR lpName OPTIONAL) +{ + return CreateSemaphoreExA(lpSemaphoreAttributes, + lInitialCount, + lMaximumCount, + lpName, + 0, + SEMAPHORE_ALL_ACCESS); +} + +/* + * @implemented + */ +HANDLE +WINAPI +CreateSemaphoreW(IN LPSECURITY_ATTRIBUTES lpSemaphoreAttributes OPTIONAL, + IN LONG lInitialCount, + IN LONG lMaximumCount, + IN LPCWSTR lpName OPTIONAL) +{ + return CreateSemaphoreExW(lpSemaphoreAttributes, + lInitialCount, + lMaximumCount, + lpName, + 0, + SEMAPHORE_ALL_ACCESS); } /* 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 Sat Aug 26 18:28:34 2006 @@ -8,6 +8,10 @@ /* INCLUDES *****************************************************************/ +/* File contains Vista Semantics */ +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 + #include <k32.h> #define NDEBUG @@ -20,18 +24,70 @@ */ HANDLE WINAPI -CreateWaitableTimerW(IN LPSECURITY_ATTRIBUTES lpTimerAttributes OPTIONAL, - IN BOOL bManualReset, - IN LPCWSTR lpTimerName OPTIONAL) +CreateWaitableTimerExA(IN LPSECURITY_ATTRIBUTES lpTimerAttributes OPTIONAL, + IN LPCSTR lpTimerName OPTIONAL, + IN DWORD dwFlags, + IN DWORD dwDesiredAccess) +{ + 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 CreateWaitableTimerExW(lpTimerAttributes, + UnicodeName, + dwFlags, + dwDesiredAccess); +} + +/* + * @implemented + */ +HANDLE +WINAPI +CreateWaitableTimerExW(IN LPSECURITY_ATTRIBUTES lpTimerAttributes OPTIONAL, + IN LPCWSTR lpTimerName OPTIONAL, + IN DWORD dwFlags, + IN DWORD dwDesiredAccess) { NTSTATUS Status; OBJECT_ATTRIBUTES LocalAttributes; POBJECT_ATTRIBUTES ObjectAttributes; HANDLE Handle; UNICODE_STRING ObjectName; + TIMER_TYPE TimerType; /* Now check if we got a name */ if (lpTimerName) RtlInitUnicodeString(&ObjectName, lpTimerName); + + if (dwFlags & ~(CREATE_WAITABLE_TIMER_MANUAL_RESET)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + TimerType = (dwFlags & CREATE_WAITABLE_TIMER_MANUAL_RESET) ? NotificationTimer : SynchronizationTimer; /* Now convert the object attributes */ ObjectAttributes = BasepConvertObjectAttributes(&LocalAttributes, @@ -40,10 +96,9 @@ /* Create the timer */ Status = NtCreateTimer(&Handle, - TIMER_ALL_ACCESS, + (ACCESS_MASK)dwDesiredAccess, ObjectAttributes, - bManualReset ? - NotificationTimer : SynchronizationTimer); + TimerType); if (NT_SUCCESS(Status)) { /* Check if the object already existed */ @@ -67,6 +122,27 @@ SetLastErrorByStatus(Status); return NULL; } + +} + +/* + * @implemented + */ +HANDLE +WINAPI +CreateWaitableTimerW(IN LPSECURITY_ATTRIBUTES lpTimerAttributes OPTIONAL, + IN BOOL bManualReset, + IN LPCWSTR lpTimerName OPTIONAL) +{ + DWORD dwFlags = 0; + + if (bManualReset) + dwFlags |= CREATE_WAITABLE_TIMER_MANUAL_RESET; + + return CreateWaitableTimerExW(lpTimerAttributes, + lpTimerName, + dwFlags, + TIMER_ALL_ACCESS); } /* @@ -78,10 +154,72 @@ IN BOOL bManualReset, IN LPCSTR lpTimerName OPTIONAL) { + DWORD dwFlags = 0; + + if (bManualReset) + dwFlags |= CREATE_WAITABLE_TIMER_MANUAL_RESET; + + return CreateWaitableTimerExA(lpTimerAttributes, + lpTimerName, + dwFlags, + TIMER_ALL_ACCESS); +} + +/* + * @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; + } + + /* 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; - LPCWSTR UnicodeName = NULL; /* Check for a name */ if (lpTimerName) @@ -98,88 +236,6 @@ 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; - } - - /* 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 { 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 Sat Aug 26 18:28:34 2006 @@ -7,6 +7,10 @@ */ /* INCLUDES *****************************************************************/ + +/* File contains Vista Semantics */ +#undef _WIN32_WINNT +#define _WIN32_WINNT 0x0600 #include <k32.h> Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h (original) +++ trunk/reactos/include/psdk/winbase.h Sat Aug 26 18:28:34 2006 @@ -534,6 +534,12 @@ #define GET_MODULE_HANDLE_EX_FLAG_PIN 0x1 #define GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT 0x2 #define GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS 0x4 +#endif +#if (_WIN32_WINNT >= 0x0600) +#define CREATE_EVENT_MANUAL_RESET 0x1 +#define CREATE_EVENT_INITIAL_SET 0x2 +#define CREATE_MUTEX_INITIAL_OWNER 0x1 +#define CREATE_WAITABLE_TIMER_MANUAL_RESET 0x1 #endif #ifndef RC_INVOKED @@ -1179,6 +1185,10 @@ BOOL WINAPI CreateDirectoryExW(LPCWSTR,LPCWSTR,LPSECURITY_ATTRIBUTES); HANDLE WINAPI CreateEventA(LPSECURITY_ATTRIBUTES,BOOL,BOOL,LPCSTR); HANDLE WINAPI CreateEventW(LPSECURITY_ATTRIBUTES,BOOL,BOOL,LPCWSTR); +#if (_WIN32_WINNT >= 0x0600) +HANDLE WINAPI CreateEventExA(LPSECURITY_ATTRIBUTES,LPCSTR,DWORD,DWORD); +HANDLE WINAPI CreateEventExW(LPSECURITY_ATTRIBUTES,LPCWSTR,DWORD,DWORD); +#endif LPVOID WINAPI CreateFiber(SIZE_T,LPFIBER_START_ROUTINE,LPVOID); #if (_WIN32_WINNT >= 0x0400) LPVOID WINAPI CreateFiberEx(SIZE_T,SIZE_T,DWORD,LPFIBER_START_ROUTINE,LPVOID); @@ -1205,6 +1215,10 @@ #endif HANDLE WINAPI CreateMutexA(LPSECURITY_ATTRIBUTES,BOOL,LPCSTR); HANDLE WINAPI CreateMutexW(LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR); +#if (_WIN32_WINNT >= 0x0600) +HANDLE WINAPI CreateMutexExA(LPSECURITY_ATTRIBUTES,LPCSTR,DWORD,DWORD); +HANDLE WINAPI CreateMutexExW(LPSECURITY_ATTRIBUTES,LPCWSTR,DWORD,DWORD); +#endif HANDLE WINAPI CreateNamedPipeA(LPCSTR,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPSECURITY_ATTRIBUTES); HANDLE WINAPI CreateNamedPipeW(LPCWSTR,DWORD,DWORD,DWORD,DWORD,DWORD,DWORD,LPSECURITY_ATTRIBUTES); BOOL WINAPI CreatePipe(PHANDLE,PHANDLE,LPSECURITY_ATTRIBUTES,DWORD); @@ -1216,6 +1230,10 @@ HANDLE WINAPI CreateRemoteThread(HANDLE,LPSECURITY_ATTRIBUTES,DWORD,LPTHREAD_START_ROUTINE,LPVOID,DWORD,LPDWORD); HANDLE WINAPI CreateSemaphoreA(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCSTR); HANDLE WINAPI CreateSemaphoreW(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCWSTR); +#if (_WIN32_WINNT >= 0x0600) +HANDLE WINAPI CreateSemaphoreExA(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCSTR,DWORD,DWORD); +HANDLE WINAPI CreateSemaphoreExW(LPSECURITY_ATTRIBUTES,LONG,LONG,LPCWSTR,DWORD,DWORD); +#endif DWORD WINAPI CreateTapePartition(HANDLE,DWORD,DWORD,DWORD); #if (_WIN32_WINNT >= 0x0500) HANDLE WINAPI CreateTimerQueue(void); @@ -1224,6 +1242,10 @@ HANDLE WINAPI CreateThread(LPSECURITY_ATTRIBUTES,DWORD,LPTHREAD_START_ROUTINE,PVOID,DWORD,PDWORD); HANDLE WINAPI CreateWaitableTimerA(LPSECURITY_ATTRIBUTES,BOOL,LPCSTR); HANDLE WINAPI CreateWaitableTimerW(LPSECURITY_ATTRIBUTES,BOOL,LPCWSTR); +#if (_WIN32_WINNT >= 0x0600) +HANDLE WINAPI CreateWaitableTimerExA(LPSECURITY_ATTRIBUTES,LPCSTR,DWORD,DWORD); +HANDLE WINAPI CreateWaitableTimerExW(LPSECURITY_ATTRIBUTES,LPCWSTR,DWORD,DWORD); +#endif #if (_WIN32_WINNT >= 0x0501) BOOL WINAPI CreateWellKnownSid(WELL_KNOWN_SID_TYPE,PSID,PSID,DWORD*); BOOL WINAPI DeactivateActCtx(DWORD,ULONG_PTR);

18 years, 4 months

[janderwald] 23718: * show selected static control via DrawFocusRect

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Aug 26 17:43:15 2006 New Revision: 23718 URL: http://svn.reactos.org/svn/reactos?rev=23718&view=rev Log: * show selected static control via DrawFocusRect Modified: trunk/reactos/dll/win32/console/colors.c Modified: trunk/reactos/dll/win32/console/colors.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/console/colors.c… ============================================================================== --- trunk/reactos/dll/win32/console/colors.c (original) +++ trunk/reactos/dll/win32/console/colors.c Sat Aug 26 17:43:15 2006 @@ -47,6 +47,10 @@ FillRect(drawItem->hDC, &drawItem->rcItem, hBrush); DeleteObject((HGDIOBJ)hBrush); + if (pConInfo->ActiveStaticControl == index) + { + DrawFocusRect(drawItem->hDC, &drawItem->rcItem); + } return TRUE; } @@ -213,7 +217,6 @@ { DWORD index = LOWORD(wParam) - IDC_STATIC_COLOR1; - pConInfo->ActiveStaticControl = index; SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_RED, GetRValue(s_Colors[index]), FALSE); SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_GREEN, GetGValue(s_Colors[index]), FALSE); SetDlgItemInt(hwndDlg, IDC_EDIT_COLOR_BLUE, GetBValue(s_Colors[index]), FALSE); @@ -235,8 +238,11 @@ { pConInfo->PopupBackground = s_Colors[index]; } + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + pConInfo->ActiveStaticControl), NULL, TRUE); + InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_COLOR1 + index), NULL, TRUE); InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_SCREEN_COLOR), NULL, TRUE); InvalidateRect(GetDlgItem(hwndDlg, IDC_STATIC_POPUP_COLOR), NULL, TRUE); + pConInfo->ActiveStaticControl = index; break; } }

18 years, 4 months

[greatlrd] 23717: do right typecast for ReadFile so it compiles on gcc 4.x

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Aug 26 14:01:03 2006 New Revision: 23717 URL: http://svn.reactos.org/svn/reactos?rev=23717&view=rev Log: do right typecast for ReadFile so it compiles on gcc 4.x Modified: trunk/reactos/base/applications/network/net/process.c Modified: trunk/reactos/base/applications/network/net/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/process.c (original) +++ trunk/reactos/base/applications/network/net/process.c Sat Aug 26 14:01:03 2006 @@ -102,7 +102,7 @@ for (;;) { long dwRead; - if( !ReadFile( hStdoutRd, chBuf, 1, &dwRead, NULL) || dwRead == 0) + if( !ReadFile( hStdoutRd, chBuf, 1, (LPDWORD)&dwRead, NULL) || dwRead == 0) { break; } @@ -129,7 +129,7 @@ for (;;) { LONG dwRead; - if( !ReadFile( hStdoutRd, chBuf, 1, (LONG *)&dwRead, NULL) || dwRead == 0) + if( !ReadFile( hStdoutRd, chBuf, 1, (LPDWORD)&dwRead, NULL) || dwRead == 0) { break; }

18 years, 4 months

[greatlrd] 23716: fixed one waring that thomas got with gcc 4.x

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sat Aug 26 13:57:38 2006 New Revision: 23716 URL: http://svn.reactos.org/svn/reactos?rev=23716&view=rev Log: fixed one waring that thomas got with gcc 4.x Modified: trunk/reactos/base/applications/network/net/process.c Modified: trunk/reactos/base/applications/network/net/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/process.c (original) +++ trunk/reactos/base/applications/network/net/process.c Sat Aug 26 13:57:38 2006 @@ -117,8 +117,10 @@ LONG ReadPipe(HANDLE hStdoutWr, HANDLE hStdoutRd, CHAR *srvlst, LONG size) { CHAR chBuf[2]; - long pos=0; - + LONG pos; + + pos=0; + if (!CloseHandle(hStdoutWr)) { return 0; /* fail */ @@ -126,8 +128,8 @@ for (;;) { - long dwRead; - if( !ReadFile( hStdoutRd, chBuf, 1, &dwRead, NULL) || dwRead == 0) + LONG dwRead; + if( !ReadFile( hStdoutRd, chBuf, 1, (LONG *)&dwRead, NULL) || dwRead == 0) { break; }

18 years, 4 months

[hpoussin] 23715: Fix a missing referencing in PsImpersonateClient (dereferenced in PsRevertThreadToSelf) PspWriteTebImpersonationInfo may be used to set or to clear impersonation info => remove an extra assignment

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Aug 26 12:46:18 2006 New Revision: 23715 URL: http://svn.reactos.org/svn/reactos?rev=23715&view=rev Log: Fix a missing referencing in PsImpersonateClient (dereferenced in PsRevertThreadToSelf) PspWriteTebImpersonationInfo may be used to set or to clear impersonation info => remove an extra assignment Modified: trunk/reactos/ntoskrnl/ps/security.c Modified: trunk/reactos/ntoskrnl/ps/security.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/security.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ps/security.c (original) +++ trunk/reactos/ntoskrnl/ps/security.c Sat Aug 26 12:46:18 2006 @@ -149,9 +149,6 @@ Teb->ImpersonationLocale = 0; Teb->IsImpersonating = 0; } - - /* Set new flag */ - Thread->ActiveImpersonationInfo = TRUE; /* Check if we're in a different thread */ if (Thread != CurrentThread) @@ -638,6 +635,7 @@ Impersonation->CopyOnOpen = CopyOnOpen; Impersonation->EffectiveOnly = EffectiveOnly; Impersonation->Token = Token; + ObReferenceObject(Token); /* Unlock the thread */ PspUnlockThreadSecurityExclusive(Thread);

18 years, 4 months

[ion] 23714: - Transform TRAP_PROLOG into a GAS macro. - Remove code in the page fault handler which was corrupting the trap frame. - Remove some ROS hacks that dealt with the fact the trap frame was getting corrupted, since now it isn't anymore. - Enable code that checks for Teb->GdiBatchCount during win32k system calls. The bugs that were mentionned in the #if 0 are fixed.

by ion＠svn.reactos.org

Author: ion Date: Sat Aug 26 10:14:32 2006 New Revision: 23714 URL: http://svn.reactos.org/svn/reactos?rev=23714&view=rev Log: - Transform TRAP_PROLOG into a GAS macro. - Remove code in the page fault handler which was corrupting the trap frame. - Remove some ROS hacks that dealt with the fact the trap frame was getting corrupted, since now it isn't anymore. - Enable code that checks for Teb->GdiBatchCount during win32k system calls. The bugs that were mentionned in the #if 0 are fixed. Modified: trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/mm/i386/pfault.c Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=2371… ============================================================================== --- trunk/reactos/include/ndk/asm.h (original) +++ trunk/reactos/include/ndk/asm.h Sat Aug 26 10:14:32 2006 @@ -327,6 +327,7 @@ #define TEB_EXCEPTION_CODE 0x1A4 #define TEB_ACTIVATION_CONTEXT_STACK_POINTER 0x1A8 #define TEB_DEALLOCATION_STACK 0xE0C +#define TEB_GDI_BATCH_COUNT 0xF70 #define TEB_GUARANTEED_STACK_BYTES 0xF78 #define TEB_FLS_DATA 0xFB4 Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Sat Aug 26 10:14:32 2006 @@ -266,63 +266,64 @@ // /* Handle trap */ // <Your Trap Code Here> // -#define TRAP_PROLOG(Label) \ - /* Just to be safe, clear out the HIWORD, since it's reserved */ \ - mov word ptr [esp+2], 0; \ -\ - /* Save the non-volatiles */ \ - push ebp; \ - push ebx; \ - push esi; \ - push edi; \ -\ - /* Save FS and set it to PCR */ \ - push fs; \ - mov ebx, KGDT_R0_PCR; \ - mov fs, bx; \ -\ - /* Save exception list and bogus previous mode */ \ - push fs:[KPCR_EXCEPTION_LIST]; \ - push -1; \ -\ - /* Save volatiles and segment registers */ \ - push eax; \ - push ecx; \ - push edx; \ - push ds; \ - push es; \ - push gs; \ -\ - /* Set the R3 data segment */ \ - mov ax, KGDT_R3_DATA + RPL_MASK; \ -\ - /* Skip debug registers and debug stuff */ \ - sub esp, 0x30; \ -\ - /* Load the segment registers */ \ - mov ds, ax; \ - mov es, ax; \ -\ - /* Set up frame */ \ - mov ebp, esp; \ -\ - /* Check if this was from V86 Mode */ \ - /* test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK; */ \ - /* jnz V86_Label; */ \ -\ - /* Get current thread */ \ - mov ecx, [fs:KPCR_CURRENT_THREAD]; \ - cld; \ -\ - /* Flush DR7 */ \ - and dword ptr [ebp+KTRAP_FRAME_DR7], 0; \ -\ - /* Check if the thread was being debugged */ \ - /* test byte ptr [ecx+KTHREAD_DEBUG_ACTIVE], 0xFF; */ \ - /* jnz Dr_Label; */ \ -\ - /* Set the Trap Frame Debug Header */ \ +.macro TRAP_PROLOG Label + /* Just to be safe, clear out the HIWORD, since it's reserved */ + mov word ptr [esp+2], 0 + + /* Save the non-volatiles */ + push ebp + push ebx + push esi + push edi + + /* Save FS and set it to PCR */ + push fs + mov ebx, KGDT_R0_PCR + mov fs, bx + + /* Save exception list and bogus previous mode */ + push fs:[KPCR_EXCEPTION_LIST] + push -1 + + /* Save volatiles and segment registers */ + push eax + push ecx + push edx + push ds + push es + push gs + + /* Set the R3 data segment */ + mov ax, KGDT_R3_DATA + RPL_MASK + + /* Skip debug registers and debug stuff */ + sub esp, 0x30 + + /* Load the segment registers */ + mov ds, ax + mov es, ax + + /* Set up frame */ + mov ebp, esp + + /* Check if this was from V86 Mode */ + /* test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK; */ + /* jnz V86_Label; */ + + /* Get current thread */ + mov ecx, [fs:KPCR_CURRENT_THREAD] + cld + + /* Flush DR7 */ + and dword ptr [ebp+KTRAP_FRAME_DR7], 0 + + /* Check if the thread was being debugged */ + /* test byte ptr [ecx+KTHREAD_DEBUG_ACTIVE], 0xFF; */ + /* jnz Dr_Label; */ + + /* Set the Trap Frame Debug Header */ SET_TF_DEBUG_HEADER +.endm // // @name INT_PROLOG @@ -507,23 +508,6 @@ /* Set the trap frame debug header */ SET_TF_DEBUG_HEADER -#ifdef DBG // FIXME: Is this for GDB? Can it be moved in the stub? - /* - * We want to know the address from where the syscall stub was called. - * If PrevMode is KernelMode, that address is stored in our own (kernel) - * stack, at location KTRAP_FRAME_ESP. - * If we're coming from UserMode, we load the usermode stack pointer - * and go back two frames (first frame is the syscall stub, second call - * is the caller of the stub). - */ - mov edi, [ebp+KTRAP_FRAME_ESP] - test byte ptr [esi+KTHREAD_PREVIOUS_MODE], 0x01 - jz 0f - mov edi, [edi+4] -0: - mov [ebp+KTRAP_FRAME_DEBUGEIP], edi -#endif - /* Enable interrupts */ sti .endm @@ -754,20 +738,9 @@ #if DBG 0: -#if 0 - /* Print a message */ - mov esi, [esp+KTRAP_FRAME_DEBUGARGMARK] - mov edi, [esp+KTRAP_FRAME_DEBUGARGMARK-4] - push edi - push esi - push offset Broken - call _DbgPrint - add esp, 12 -#endif - jmp 2b // ros hack - /* Fix up the mask */ add dword ptr [esp+KTRAP_FRAME_DEBUGARGMARK], 0xBADB0D00 + 6: int 3 jmp 5b Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s Sat Aug 26 10:14:32 2006 @@ -187,23 +187,6 @@ /* Set the trap frame debug header */ SET_TF_DEBUG_HEADER -#ifdef DBG // FIXME: Is this for GDB? Can it be moved in the stub? - /* - * We want to know the address from where the syscall stub was called. - * If PrevMode is KernelMode, that address is stored in our own (kernel) - * stack, at location KTRAP_FRAME_ESP. - * If we're coming from UserMode, we load the usermode stack pointer - * and go back two frames (first frame is the syscall stub, second call - * is the caller of the stub). - */ - mov edi, [ebp+KTRAP_FRAME_ESP] - test byte ptr [esi+KTHREAD_PREVIOUS_MODE], 0x01 - jz PrevWasKernelMode - mov edi, [edi+4] -PrevWasKernelMode: - mov [ebp+KTRAP_FRAME_DEBUGEIP], edi -#endif - /* Enable interrupts */ sti @@ -229,9 +212,6 @@ /* Invalid ID, try to load Win32K Table */ jnb KiBBTUnexpectedRange -#if 0 // <== Disabled for two reasons: We don't save TEB in 0x18, but KPCR. - // <== We don't have a KeGdiFlushUserBatch callback yet (needs to be - // sent through the PsInitializeWin32Callouts structure) /* Check if this was Win32K */ cmp ecx, SERVICE_TABLE_TEST jnz NotWin32K @@ -242,15 +222,14 @@ /* Check if we should flush the User Batch */ xor ebx, ebx or ebx, [ecx+TEB_GDI_BATCH_COUNT] - jz NoWin32K + jz NotWin32K /* Flush it */ push edx push eax - call [_KeGdiFlushUserBatch] + //call [_KeGdiFlushUserBatch] pop eax pop edx -#endif NotWin32K: /* Increase total syscall count */ Modified: trunk/reactos/ntoskrnl/mm/i386/pfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/pfault.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/pfault.c (original) +++ trunk/reactos/ntoskrnl/mm/i386/pfault.c Sat Aug 26 10:14:32 2006 @@ -36,9 +36,6 @@ ASSERT(ExceptionNr == 14); - /* Store the exception number in an unused field in the trap frame. */ - Tf->DbgArgMark = 14; - /* get the faulting address */ cr2 = Ke386GetCr2(); Tf->DbgArgPointer = cr2;

18 years, 4 months

[turner] 23713: * Implement: /low, /normal, /high, /realtime, /belownormal, and /abovenormal * Correctly build the string used to create the process.

by turner＠svn.reactos.org

Author: turner Date: Sat Aug 26 03:12:50 2006 New Revision: 23713 URL: http://svn.reactos.org/svn/reactos?rev=23713&view=rev Log: * Implement: /low, /normal, /high, /realtime, /belownormal, and /abovenormal * Correctly build the string used to create the process. Modified: trunk/reactos/base/shell/cmd/start.c Modified: trunk/reactos/base/shell/cmd/start.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/start.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/start.c (original) +++ trunk/reactos/base/shell/cmd/start.c Sat Aug 26 03:12:50 2006 @@ -23,6 +23,7 @@ TCHAR first[CMDLINE_LENGTH]; TCHAR *rest = NULL; TCHAR *param = NULL; + TCHAR RestWithoutArgs[CMDLINE_LENGTH]; INT size; LPTSTR comspec; BOOL bWait = FALSE; @@ -31,15 +32,63 @@ TCHAR szFullCmdLine [CMDLINE_LENGTH]; PROCESS_INFORMATION prci; STARTUPINFO stui; - + LPTSTR *arg; + INT argc = 0; + INT i = 0; + DWORD Priority = 0; - - if (_tcsncmp (Rest, _T("/?"), 2) == 0) - { - ConOutResPaging(TRUE,STRING_START_HELP1); - return 0; - } - + RestWithoutArgs[0] = _T('\0'); + _tcscpy(first,First); + arg = split (Rest, &argc, FALSE); + + + for (i = 0; i < argc; i++) + { + if (!_tcsncmp (arg[i], _T("/?"), 2)) + { + freep(arg); + ConOutResPaging(TRUE,STRING_START_HELP1); + return 0; + } + else if(!_tcsicmp(arg[i], "/LOW")) + { + Priority = IDLE_PRIORITY_CLASS; + } + else if(!_tcsicmp(arg[i], "/NORMAL")) + { + Priority = NORMAL_PRIORITY_CLASS; + } + else if(!_tcsicmp(arg[i], "/HIGH")) + { + Priority = HIGH_PRIORITY_CLASS; + } + else if(!_tcsicmp(arg[i], "/REALTIME")) + { + Priority = REALTIME_PRIORITY_CLASS; + } + else if(!_tcsicmp(arg[i], "/ABOVENORMAL")) + { + Priority = ABOVE_NORMAL_PRIORITY_CLASS; + } + else if(!_tcsicmp(arg[i], "/BELOWNORMAL")) + { + Priority = BELOW_NORMAL_PRIORITY_CLASS; + } + else + { + if(RestWithoutArgs[0] != _T('\0')) + { + _tcscat(RestWithoutArgs,_T(" ")); + } + _tcscat(RestWithoutArgs,arg[i]); + } + } + + + + + freep (arg); + /* get comspec */ comspec = malloc ( MAX_PATH * sizeof(TCHAR)); if (comspec == NULL) @@ -51,7 +100,10 @@ size = GetEnvironmentVariable (_T("COMSPEC"), comspec, 512); if(GetLastError() == ERROR_ENVVAR_NOT_FOUND) { - Rest = _T("cmd"); + RestWithoutArgs[0] = _T('c'); + RestWithoutArgs[1] = _T('m'); + RestWithoutArgs[2] = _T('d'); + RestWithoutArgs[3] = _T('\0'); } else { @@ -68,14 +120,14 @@ nErrorLevel = 0; - if( !*Rest ) - { - _tcscpy(Rest,_T("\"")); - _tcscat(Rest,comspec); - _tcscat(Rest,_T("\"")); - } - - rest = malloc ( _tcslen(Rest) + 1 * sizeof(TCHAR)); + if(!_tcslen(RestWithoutArgs)) + { + _tcscpy(RestWithoutArgs,_T("\"")); + _tcscat(RestWithoutArgs,comspec); + _tcscat(RestWithoutArgs,_T("\"")); + } + + rest = malloc ( _tcslen(RestWithoutArgs) + 1 * sizeof(TCHAR)); if (rest == NULL) { if(comspec != NULL) @@ -84,7 +136,7 @@ return 1; } - param =malloc ( _tcslen(Rest) + 1 * sizeof(TCHAR)); + param =malloc ( _tcslen(RestWithoutArgs) + 1 * sizeof(TCHAR)); if (rest == NULL) { if(comspec != NULL) @@ -97,12 +149,11 @@ param[0] = _T('\0'); - _tcscpy(rest,Rest); + _tcscpy(rest,RestWithoutArgs); /* Parsing the command that gets called by start, and it's parameters */ if(!_tcschr(rest,_T('\"'))) { - INT i = 0; INT count = _tcslen(rest); /* find the end of the command and start of the args */ @@ -111,7 +162,7 @@ if(rest[i] == _T(' ')) { - _tcscpy(param,&rest[i]); + _tcscpy(param,&rest[i+1]); rest[i] = _T('\0'); break; } @@ -119,7 +170,6 @@ } else { - INT i = 0; INT count = _tcslen(rest); BOOL bInside = FALSE; @@ -130,7 +180,7 @@ bInside = !bInside; if((rest[i] == _T(' ')) && !bInside) { - _tcscpy(param,&rest[i]); + _tcscpy(param,&rest[i+1]); rest[i] = _T('\0'); break; } @@ -233,12 +283,12 @@ if (bBat == TRUE) { bCreate = CreateProcess (NULL, szFullCmdLine, NULL, NULL, FALSE, - CREATE_NEW_CONSOLE, NULL, NULL, &stui, &prci); + CREATE_NEW_CONSOLE | Priority, NULL, NULL, &stui, &prci); } else { bCreate = CreateProcess (szFullName, szFullCmdLine, NULL, NULL, FALSE, - CREATE_NEW_CONSOLE, NULL, NULL, &stui, &prci); + CREATE_NEW_CONSOLE | Priority, NULL, NULL, &stui, &prci); } if (bCreate)

18 years, 4 months

[hpoussin] 23712: Implement IOCTL_SERIAL_WAIT_ON_MASK Better implementation of IOCTL_SERIAL_SET_WAIT_MASK Remove "Serial:" prefix on debug output

by hpoussin＠svn.reactos.org

Author: hpoussin Date: Sat Aug 26 02:07:10 2006 New Revision: 23712 URL: http://svn.reactos.org/svn/reactos?rev=23712&view=rev Log: Implement IOCTL_SERIAL_WAIT_ON_MASK Better implementation of IOCTL_SERIAL_SET_WAIT_MASK Remove "Serial:" prefix on debug output Modified: trunk/reactos/drivers/base/serial/circularbuffer.c trunk/reactos/drivers/base/serial/cleanup.c trunk/reactos/drivers/base/serial/close.c trunk/reactos/drivers/base/serial/create.c trunk/reactos/drivers/base/serial/devctrl.c trunk/reactos/drivers/base/serial/info.c trunk/reactos/drivers/base/serial/misc.c trunk/reactos/drivers/base/serial/pnp.c trunk/reactos/drivers/base/serial/power.c trunk/reactos/drivers/base/serial/rw.c trunk/reactos/drivers/base/serial/serial.h Modified: trunk/reactos/drivers/base/serial/circularbuffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/circul… ============================================================================== --- trunk/reactos/drivers/base/serial/circularbuffer.c (original) +++ trunk/reactos/drivers/base/serial/circularbuffer.c Sat Aug 26 02:07:10 2006 @@ -15,7 +15,7 @@ IN PCIRCULAR_BUFFER pBuffer, IN ULONG BufferSize) { - DPRINT("Serial: InitializeCircularBuffer(pBuffer %p, BufferSize %lu)\n", pBuffer, BufferSize); + DPRINT("InitializeCircularBuffer(pBuffer %p, BufferSize %lu)\n", pBuffer, BufferSize); ASSERT(pBuffer); pBuffer->Buffer = (PUCHAR)ExAllocatePoolWithTag(NonPagedPool, BufferSize * sizeof(UCHAR), SERIAL_TAG); if (!pBuffer->Buffer) @@ -29,7 +29,7 @@ FreeCircularBuffer( IN PCIRCULAR_BUFFER pBuffer) { - DPRINT("Serial: FreeCircularBuffer(pBuffer %p)\n", pBuffer); + DPRINT("FreeCircularBuffer(pBuffer %p)\n", pBuffer); ASSERT(pBuffer); if (pBuffer->Buffer != NULL) ExFreePoolWithTag(pBuffer->Buffer, SERIAL_TAG); @@ -40,9 +40,18 @@ IsCircularBufferEmpty( IN PCIRCULAR_BUFFER pBuffer) { - DPRINT("Serial: IsCircularBufferEmpty(pBuffer %p)\n", pBuffer); + DPRINT("IsCircularBufferEmpty(pBuffer %p)\n", pBuffer); ASSERT(pBuffer); return (pBuffer->ReadPosition == pBuffer->WritePosition); +} + +ULONG +GetNumberOfElementsInCircularBuffer( + IN PCIRCULAR_BUFFER pBuffer) +{ + DPRINT("GetNumberOfElementsInCircularBuffer(pBuffer %p)\n", pBuffer); + ASSERT(pBuffer); + return (pBuffer->WritePosition + pBuffer->Length - pBuffer->ReadPosition) % pBuffer->Length; } NTSTATUS @@ -51,7 +60,7 @@ IN UCHAR Entry) { ULONG NextPosition; - DPRINT("Serial: PushCircularBufferEntry(pBuffer %p, Entry 0x%x)\n", pBuffer, Entry); + DPRINT("PushCircularBufferEntry(pBuffer %p, Entry 0x%x)\n", pBuffer, Entry); ASSERT(pBuffer); ASSERT(pBuffer->Length); NextPosition = (pBuffer->WritePosition + 1) % pBuffer->Length; @@ -67,7 +76,7 @@ IN PCIRCULAR_BUFFER pBuffer, OUT PUCHAR Entry) { - DPRINT("Serial: PopCircularBufferEntry(pBuffer %p)\n", pBuffer); + DPRINT("PopCircularBufferEntry(pBuffer %p)\n", pBuffer); ASSERT(pBuffer); ASSERT(pBuffer->Length); if (IsCircularBufferEmpty(pBuffer)) @@ -84,7 +93,7 @@ { PUCHAR NewBuffer; - DPRINT("Serial: IncreaseCircularBufferSize(pBuffer %p, NewBufferSize %lu)\n", pBuffer, NewBufferSize); + DPRINT("IncreaseCircularBufferSize(pBuffer %p, NewBufferSize %lu)\n", pBuffer, NewBufferSize); ASSERT(pBuffer); ASSERT(pBuffer->Length); if (pBuffer->Length > NewBufferSize) Modified: trunk/reactos/drivers/base/serial/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/cleanu… ============================================================================== --- trunk/reactos/drivers/base/serial/cleanup.c (original) +++ trunk/reactos/drivers/base/serial/cleanup.c Sat Aug 26 02:07:10 2006 @@ -15,7 +15,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT("Serial: IRP_MJ_CLEANUP\n"); + DPRINT("IRP_MJ_CLEANUP\n"); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); Modified: trunk/reactos/drivers/base/serial/close.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/close.… ============================================================================== --- trunk/reactos/drivers/base/serial/close.c (original) +++ trunk/reactos/drivers/base/serial/close.c Sat Aug 26 02:07:10 2006 @@ -17,7 +17,7 @@ { PSERIAL_DEVICE_EXTENSION pDeviceExtension; - DPRINT("Serial: IRP_MJ_CLOSE\n"); + DPRINT("IRP_MJ_CLOSE\n"); pDeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; pDeviceExtension->IsOpened = FALSE; Modified: trunk/reactos/drivers/base/serial/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/create… ============================================================================== --- trunk/reactos/drivers/base/serial/create.c (original) +++ trunk/reactos/drivers/base/serial/create.c Sat Aug 26 02:07:10 2006 @@ -19,7 +19,7 @@ PSERIAL_DEVICE_EXTENSION DeviceExtension; NTSTATUS Status; - DPRINT("Serial: IRP_MJ_CREATE\n"); + DPRINT("IRP_MJ_CREATE\n"); Stack = IoGetCurrentIrpStackLocation(Irp); DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -32,12 +32,12 @@ if(DeviceExtension->IsOpened) { - DPRINT("Serial: COM%lu is already opened\n", DeviceExtension->ComPort); + DPRINT("COM%lu is already opened\n", DeviceExtension->ComPort); Status = STATUS_ACCESS_DENIED; goto ByeBye; } - DPRINT("Serial: open COM%lu: successfull\n", DeviceExtension->ComPort); + DPRINT("Open COM%lu: successfull\n", DeviceExtension->ComPort); DeviceExtension->IsOpened = TRUE; Status = STATUS_SUCCESS; Modified: trunk/reactos/drivers/base/serial/devctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/devctr… ============================================================================== --- trunk/reactos/drivers/base/serial/devctrl.c (original) +++ trunk/reactos/drivers/base/serial/devctrl.c Sat Aug 26 02:07:10 2006 @@ -65,7 +65,7 @@ if (NT_SUCCESS(Status)) { UCHAR Lcr; - DPRINT("Serial: SerialSetBaudRate(COM%lu, %lu Bauds)\n", DeviceExtension->ComPort, BaudRate); + DPRINT("SerialSetBaudRate(COM%lu, %lu Bauds)\n", DeviceExtension->ComPort, BaudRate); /* Set Bit 7 of LCR to expose baud registers */ Lcr = READ_PORT_UCHAR(SER_LCR(ComPortBase)); WRITE_PORT_UCHAR(SER_LCR(ComPortBase), Lcr | SR_LCR_DLAB); @@ -95,7 +95,7 @@ ASSERT(DeviceExtension); ASSERT(NewSettings); - DPRINT("Serial: SerialSetLineControl(COM%lu, Settings { %lu %lu %lu })\n", + DPRINT("SerialSetLineControl(COM%lu, Settings { %lu %lu %lu })\n", DeviceExtension->ComPort, NewSettings->StopBits, NewSettings->Parity, NewSettings->WordLength); /* Verify parameters */ @@ -289,7 +289,7 @@ PUCHAR ComPortBase; NTSTATUS Status; - DPRINT("Serial: IRP_MJ_DEVICE_CONTROL dispatch\n"); + DPRINT("IRP_MJ_DEVICE_CONTROL dispatch\n"); Stack = IoGetCurrentIrpStackLocation(Irp); LengthIn = Stack->Parameters.DeviceIoControl.InputBufferLength; @@ -305,7 +305,7 @@ { case IOCTL_SERIAL_CLEAR_STATS: { - DPRINT("Serial: IOCTL_SERIAL_CLEAR_STATS\n"); + DPRINT("IOCTL_SERIAL_CLEAR_STATS\n"); KeSynchronizeExecution( DeviceExtension->Interrupt, (PKSYNCHRONIZE_ROUTINE)SerialClearPerfStats, @@ -315,7 +315,7 @@ } case IOCTL_SERIAL_CLR_DTR: { - DPRINT("Serial: IOCTL_SERIAL_CLR_DTR\n"); + DPRINT("IOCTL_SERIAL_CLR_DTR\n"); /* FIXME: If the handshake flow control of the device is configured to * automatically use DTR, return STATUS_INVALID_PARAMETER */ Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); @@ -329,7 +329,7 @@ } case IOCTL_SERIAL_CLR_RTS: { - DPRINT("Serial: IOCTL_SERIAL_CLR_RTS\n"); + DPRINT("IOCTL_SERIAL_CLR_RTS\n"); /* FIXME: If the handshake flow control of the device is configured to * automatically use RTS, return STATUS_INVALID_PARAMETER */ Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); @@ -345,7 +345,7 @@ { /* Obsolete on Microsoft Windows 2000+ */ PULONG pConfigSize; - DPRINT("Serial: IOCTL_SERIAL_CONFIG_SIZE\n"); + DPRINT("IOCTL_SERIAL_CONFIG_SIZE\n"); if (LengthOut != sizeof(ULONG) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -359,7 +359,7 @@ } case IOCTL_SERIAL_GET_BAUD_RATE: { - DPRINT("Serial: IOCTL_SERIAL_GET_BAUD_RATE\n"); + DPRINT("IOCTL_SERIAL_GET_BAUD_RATE\n"); if (LengthOut < sizeof(SERIAL_BAUD_RATE)) Status = STATUS_BUFFER_TOO_SMALL; else if (BufferOut == NULL) @@ -375,23 +375,17 @@ case IOCTL_SERIAL_GET_CHARS: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_GET_CHARS not implemented.\n"); + DPRINT1("IOCTL_SERIAL_GET_CHARS not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_GET_COMMSTATUS: { - DPRINT("Serial: IOCTL_SERIAL_GET_COMMSTATUS\n"); + DPRINT("IOCTL_SERIAL_GET_COMMSTATUS\n"); if (LengthOut < sizeof(SERIAL_STATUS)) - { - DPRINT("Serial: return STATUS_BUFFER_TOO_SMALL\n"); Status = STATUS_BUFFER_TOO_SMALL; - } else if (BufferOut == NULL) - { - DPRINT("Serial: return STATUS_INVALID_PARAMETER\n"); - Status = STATUS_INVALID_PARAMETER; - } + Status = STATUS_INVALID_PARAMETER; else { Status = SerialGetCommStatus((PSERIAL_STATUS)BufferOut, DeviceExtension); @@ -402,7 +396,7 @@ case IOCTL_SERIAL_GET_DTRRTS: { PULONG pDtrRts; - DPRINT("Serial: IOCTL_SERIAL_GET_DTRRTS\n"); + DPRINT("IOCTL_SERIAL_GET_DTRRTS\n"); if (LengthOut != sizeof(ULONG) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -421,13 +415,13 @@ case IOCTL_SERIAL_GET_HANDFLOW: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_GET_HANDFLOW not implemented.\n"); + DPRINT1("IOCTL_SERIAL_GET_HANDFLOW not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_GET_LINE_CONTROL: { - DPRINT("Serial: IOCTL_SERIAL_GET_LINE_CONTROL\n"); + DPRINT("IOCTL_SERIAL_GET_LINE_CONTROL\n"); if (LengthOut < sizeof(SERIAL_LINE_CONTROL)) Status = STATUS_BUFFER_TOO_SMALL; else if (BufferOut == NULL) @@ -443,7 +437,7 @@ case IOCTL_SERIAL_GET_MODEM_CONTROL: { PULONG pMCR; - DPRINT("Serial: IOCTL_SERIAL_GET_MODEM_CONTROL\n"); + DPRINT("IOCTL_SERIAL_GET_MODEM_CONTROL\n"); if (LengthOut != sizeof(ULONG) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -458,7 +452,7 @@ case IOCTL_SERIAL_GET_MODEMSTATUS: { PULONG pMSR; - DPRINT("Serial: IOCTL_SERIAL_GET_MODEMSTATUS\n"); + DPRINT("IOCTL_SERIAL_GET_MODEMSTATUS\n"); if (LengthOut != sizeof(ULONG) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -472,17 +466,11 @@ } case IOCTL_SERIAL_GET_PROPERTIES: { - DPRINT("Serial: IOCTL_SERIAL_GET_PROPERTIES\n"); + DPRINT("IOCTL_SERIAL_GET_PROPERTIES\n"); if (LengthOut < sizeof(SERIAL_COMMPROP)) - { - DPRINT("Serial: return STATUS_BUFFER_TOO_SMALL\n"); Status = STATUS_BUFFER_TOO_SMALL; - } else if (BufferOut == NULL) - { - DPRINT("Serial: return STATUS_INVALID_PARAMETER\n"); - Status = STATUS_INVALID_PARAMETER; - } + Status = STATUS_INVALID_PARAMETER; else { Status = SerialGetCommProp((PSERIAL_COMMPROP)BufferOut, DeviceExtension); @@ -492,17 +480,11 @@ } case IOCTL_SERIAL_GET_STATS: { - DPRINT("Serial: IOCTL_SERIAL_GET_STATS\n"); + DPRINT("IOCTL_SERIAL_GET_STATS\n"); if (LengthOut < sizeof(SERIALPERF_STATS)) - { - DPRINT("Serial: return STATUS_BUFFER_TOO_SMALL\n"); Status = STATUS_BUFFER_TOO_SMALL; - } else if (BufferOut == NULL) - { - DPRINT("Serial: return STATUS_INVALID_PARAMETER\n"); - Status = STATUS_INVALID_PARAMETER; - } + Status = STATUS_INVALID_PARAMETER; else { KeSynchronizeExecution(DeviceExtension->Interrupt, @@ -514,7 +496,7 @@ } case IOCTL_SERIAL_GET_TIMEOUTS: { - DPRINT("Serial: IOCTL_SERIAL_GET_TIMEOUTS\n"); + DPRINT("IOCTL_SERIAL_GET_TIMEOUTS\n"); if (LengthOut != sizeof(SERIAL_TIMEOUTS) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -528,7 +510,7 @@ case IOCTL_SERIAL_GET_WAIT_MASK: { PULONG pWaitMask; - DPRINT("Serial: IOCTL_SERIAL_GET_WAIT_MASK\n"); + DPRINT("IOCTL_SERIAL_GET_WAIT_MASK\n"); if (LengthOut != sizeof(ULONG) || BufferOut == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -543,21 +525,21 @@ case IOCTL_SERIAL_IMMEDIATE_CHAR: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_IMMEDIATE_CHAR not implemented.\n"); + DPRINT1("IOCTL_SERIAL_IMMEDIATE_CHAR not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_LSRMST_INSERT: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_LSRMST_INSERT not implemented.\n"); + DPRINT1("IOCTL_SERIAL_LSRMST_INSERT not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_PURGE: { KIRQL Irql; - DPRINT("Serial: IOCTL_SERIAL_PURGE\n"); + DPRINT("IOCTL_SERIAL_PURGE\n"); /* FIXME: SERIAL_PURGE_RXABORT and SERIAL_PURGE_TXABORT * should stop current request */ if (LengthIn != sizeof(ULONG) || BufferIn == NULL) @@ -607,14 +589,14 @@ case IOCTL_SERIAL_RESET_DEVICE: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_RESET_DEVICE not implemented.\n"); + DPRINT1("IOCTL_SERIAL_RESET_DEVICE not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_SET_BAUD_RATE: { PULONG pNewBaudRate; - DPRINT("Serial: IOCTL_SERIAL_SET_BAUD_RATE\n"); + DPRINT("IOCTL_SERIAL_SET_BAUD_RATE\n"); if (LengthIn != sizeof(ULONG) || BufferIn == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -627,21 +609,21 @@ case IOCTL_SERIAL_SET_BREAK_OFF: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_SET_BREAK_OFF not implemented.\n"); + DPRINT1("IOCTL_SERIAL_SET_BREAK_OFF not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_SET_BREAK_ON: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_SET_BREAK_ON not implemented.\n"); + DPRINT1("IOCTL_SERIAL_SET_BREAK_ON not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_SET_CHARS: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_SET_CHARS not implemented.\n"); + DPRINT1("IOCTL_SERIAL_SET_CHARS not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } @@ -649,7 +631,7 @@ { /* FIXME: If the handshake flow control of the device is configured to * automatically use DTR, return STATUS_INVALID_PARAMETER */ - DPRINT("Serial: IOCTL_SERIAL_SET_DTR\n"); + DPRINT("IOCTL_SERIAL_SET_DTR\n"); if (!(DeviceExtension->MCR & SR_MCR_DTR)) { Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); @@ -666,7 +648,7 @@ } case IOCTL_SERIAL_SET_FIFO_CONTROL: { - DPRINT("Serial: IOCTL_SERIAL_SET_FIFO_CONTROL\n"); + DPRINT("IOCTL_SERIAL_SET_FIFO_CONTROL\n"); if (LengthIn != sizeof(ULONG) || BufferIn == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -683,13 +665,13 @@ case IOCTL_SERIAL_SET_HANDFLOW: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_SET_HANDFLOW not implemented.\n"); + DPRINT1("IOCTL_SERIAL_SET_HANDFLOW not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_SET_LINE_CONTROL: { - DPRINT("Serial: IOCTL_SERIAL_SET_LINE_CONTROL\n"); + DPRINT("IOCTL_SERIAL_SET_LINE_CONTROL\n"); if (LengthIn < sizeof(SERIAL_LINE_CONTROL)) Status = STATUS_BUFFER_TOO_SMALL; else if (BufferIn == NULL) @@ -701,7 +683,7 @@ case IOCTL_SERIAL_SET_MODEM_CONTROL: { PULONG pMCR; - DPRINT("Serial: IOCTL_SERIAL_SET_MODEM_CONTROL\n"); + DPRINT("IOCTL_SERIAL_SET_MODEM_CONTROL\n"); if (LengthIn != sizeof(ULONG) || BufferIn == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -747,7 +729,7 @@ { /* FIXME: If the handshake flow control of the device is configured to * automatically use DTR, return STATUS_INVALID_PARAMETER */ - DPRINT("Serial: IOCTL_SERIAL_SET_RTS\n"); + DPRINT("IOCTL_SERIAL_SET_RTS\n"); if (!(DeviceExtension->MCR & SR_MCR_RTS)) { Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, (PVOID)DeviceExtension->ComPort); @@ -764,7 +746,7 @@ } case IOCTL_SERIAL_SET_TIMEOUTS: { - DPRINT("Serial: IOCTL_SERIAL_SET_TIMEOUTS\n"); + DPRINT("IOCTL_SERIAL_SET_TIMEOUTS\n"); if (LengthIn != sizeof(SERIAL_TIMEOUTS) || BufferIn == NULL) Status = STATUS_INVALID_PARAMETER; else @@ -776,13 +758,18 @@ } case IOCTL_SERIAL_SET_WAIT_MASK: { - PULONG pWaitMask; - DPRINT("Serial: IOCTL_SERIAL_SET_WAIT_MASK\n"); + PULONG pWaitMask = (PULONG)BufferIn; + DPRINT("IOCTL_SERIAL_SET_WAIT_MASK\n"); + if (LengthIn != sizeof(ULONG) || BufferIn == NULL) Status = STATUS_INVALID_PARAMETER; - else - { - pWaitMask = (PULONG)BufferIn; + else if (DeviceExtension->WaitOnMaskIrp) /* FIXME: Race condition ; field may be currently in modification */ + { + DPRINT("An IRP is already currently processed\n"); + Status = STATUS_INVALID_PARAMETER; + } + else + { DeviceExtension->WaitMask = *pWaitMask; Status = STATUS_SUCCESS; } @@ -791,42 +778,75 @@ case IOCTL_SERIAL_SET_XOFF: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_SET_XOFF not implemented.\n"); + DPRINT1("IOCTL_SERIAL_SET_XOFF not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_SET_XON: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_SET_XON not implemented.\n"); + DPRINT1("IOCTL_SERIAL_SET_XON not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } case IOCTL_SERIAL_WAIT_ON_MASK: { - /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_WAIT_ON_MASK not implemented.\n"); - Status = STATUS_NOT_IMPLEMENTED; + PIRP WaitingIrp; + DPRINT("IOCTL_SERIAL_WAIT_ON_MASK\n"); + + if (LengthOut != sizeof(ULONG) || BufferOut == NULL) + Status = STATUS_INVALID_PARAMETER; + else + { + /* FIXME: Race condition here: + * If an interrupt comes before we can mark the Irp + * as pending, it might be possible to complete the + * Irp before pending it, leading to a crash! */ + WaitingIrp = InterlockedCompareExchangePointer( + &DeviceExtension->WaitOnMaskIrp, + Irp, + NULL); + + /* Check if an Irp is already pending */ + if (WaitingIrp != NULL) + { + /* Unable to have a 2nd pending IRP for this IOCTL */ + DPRINT("Unable to pend a second IRP for IOCTL_SERIAL_WAIT_ON_MASK\n"); + Status = STATUS_INVALID_PARAMETER; + } + else + { + Status = STATUS_PENDING; + /* FIXME: immediately return if a wait event already occurred */ + } + } break; } case IOCTL_SERIAL_XOFF_COUNTER: { /* FIXME */ - DPRINT1("Serial: IOCTL_SERIAL_XOFF_COUNTER not implemented.\n"); + DPRINT1("IOCTL_SERIAL_XOFF_COUNTER not implemented.\n"); Status = STATUS_NOT_IMPLEMENTED; break; } default: { /* Pass Irp to lower driver */ - DPRINT("Serial: Unknown IOCTL code 0x%x\n", Stack->Parameters.DeviceIoControl.IoControlCode); + DPRINT("Unknown IOCTL code 0x%x\n", Stack->Parameters.DeviceIoControl.IoControlCode); IoSkipCurrentIrpStackLocation(Irp); return IoCallDriver(DeviceExtension->LowerDevice, Irp); } } - Irp->IoStatus.Information = Information; Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + if (Status == STATUS_PENDING) + { + IoMarkIrpPending(Irp); + } + else + { + Irp->IoStatus.Information = Information; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } return Status; } Modified: trunk/reactos/drivers/base/serial/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/info.c… ============================================================================== --- trunk/reactos/drivers/base/serial/info.c (original) +++ trunk/reactos/drivers/base/serial/info.c Sat Aug 26 02:07:10 2006 @@ -33,7 +33,7 @@ { PFILE_STANDARD_INFORMATION StandardInfo = (PFILE_STANDARD_INFORMATION)SystemBuffer; - DPRINT("Serial: IRP_MJ_QUERY_INFORMATION / FileStandardInformation\n"); + DPRINT("IRP_MJ_QUERY_INFORMATION / FileStandardInformation\n"); if (BufferLength < sizeof(FILE_STANDARD_INFORMATION)) Status = STATUS_BUFFER_OVERFLOW; else if (!StandardInfo) @@ -55,7 +55,7 @@ ASSERT(PositionInfo); - DPRINT("Serial: IRP_MJ_QUERY_INFORMATION / FilePositionInformation\n"); + DPRINT("IRP_MJ_QUERY_INFORMATION / FilePositionInformation\n"); if (BufferLength < sizeof(PFILE_POSITION_INFORMATION)) Status = STATUS_BUFFER_OVERFLOW; else if (!PositionInfo) @@ -69,7 +69,7 @@ } default: { - DPRINT("Serial: IRP_MJ_QUERY_INFORMATION: Unexpected file information class 0x%02x\n", Stack->Parameters.QueryFile.FileInformationClass); + DPRINT("IRP_MJ_QUERY_INFORMATION: Unexpected file information class 0x%02x\n", Stack->Parameters.QueryFile.FileInformationClass); return ForwardIrpAndForget(DeviceObject, Irp); } } Modified: trunk/reactos/drivers/base/serial/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/misc.c… ============================================================================== --- trunk/reactos/drivers/base/serial/misc.c (original) +++ trunk/reactos/drivers/base/serial/misc.c Sat Aug 26 02:07:10 2006 @@ -36,7 +36,7 @@ KeInitializeEvent(&Event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); - DPRINT("Serial: Calling lower device %p [%wZ]\n", LowerDevice, &LowerDevice->DriverObject->DriverName); + DPRINT("Calling lower device %p [%wZ]\n", LowerDevice, &LowerDevice->DriverObject->DriverName); IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); Status = IoCallDriver(LowerDevice, Irp); @@ -84,7 +84,7 @@ while (READ_PORT_UCHAR(SER_LSR(ComPortBase)) & SR_LSR_DATA_RECEIVED) { Byte = READ_PORT_UCHAR(SER_RBR(ComPortBase)); - DPRINT("Serial: Byte received on COM%lu: 0x%02x\n", + DPRINT("Byte received on COM%lu: 0x%02x\n", DeviceExtension->ComPort, Byte); Status = PushCircularBufferEntry(&DeviceExtension->InputBuffer, Byte); if (NT_SUCCESS(Status)) @@ -125,7 +125,7 @@ if (!NT_SUCCESS(Status)) break; WRITE_PORT_UCHAR(SER_THR(ComPortBase), Byte); - DPRINT("Serial: Byte sent to COM%lu: 0x%02x\n", + DPRINT("Byte sent to COM%lu: 0x%02x\n", DeviceExtension->ComPort, Byte); DeviceExtension->SerialPerfStats.TransmittedCount++; } @@ -136,6 +136,16 @@ WRITE_PORT_UCHAR(SER_IER(ComPortBase), IER | SR_IER_THR_EMPTY); } KeReleaseSpinLock(&DeviceExtension->OutputBufferLock, Irql); +} + +VOID NTAPI +SerialCompleteIrp( + IN PKDPC Dpc, + IN PVOID pDeviceExtension, // real type PSERIAL_DEVICE_EXTENSION + IN PVOID pIrp, // real type PIRP + IN PVOID Unused) +{ + IoCompleteRequest((PIRP)pIrp, IO_NO_INCREMENT); } BOOLEAN NTAPI @@ -147,6 +157,10 @@ PSERIAL_DEVICE_EXTENSION DeviceExtension; PUCHAR ComPortBase; UCHAR Iir; + ULONG Events = 0; + BOOLEAN ret = FALSE; + + /* FIXME: sometimes, produce SERIAL_EV_RXFLAG event */ DeviceObject = (PDEVICE_OBJECT)ServiceContext; DeviceExtension = (PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -163,7 +177,7 @@ case SR_IIR_MSR_CHANGE: { UCHAR MSR, IER; - DPRINT("Serial: SR_IIR_MSR_CHANGE\n"); + DPRINT("SR_IIR_MSR_CHANGE\n"); MSR = READ_PORT_UCHAR(SER_MSR(ComPortBase)); if (MSR & SR_MSR_CTS_CHANGED) @@ -172,6 +186,7 @@ KeInsertQueueDpc(&DeviceExtension->SendByteDpc, NULL, NULL); else ; /* FIXME: stop transmission */ + Events |= SERIAL_EV_CTS; } if (MSR & SR_MSR_DSR_CHANGED) { @@ -179,50 +194,103 @@ KeInsertQueueDpc(&DeviceExtension->ReceivedByteDpc, NULL, NULL); else ; /* FIXME: stop reception */ + Events |= SERIAL_EV_DSR; } if (MSR & SR_MSR_RI_CHANGED) { DPRINT("SR_MSR_RI_CHANGED changed: now %d\n", MSR & SI_MSR_RI); + Events |= SERIAL_EV_RING; } if (MSR & SR_MSR_DCD_CHANGED) { DPRINT("SR_MSR_DCD_CHANGED changed: now %d\n", MSR & SR_MSR_DCD); + Events |= SERIAL_EV_RLSD; } IER = READ_PORT_UCHAR(SER_IER(ComPortBase)); WRITE_PORT_UCHAR(SER_IER(ComPortBase), IER | SR_IER_MSR_CHANGE); - return TRUE; + + ret = TRUE; + goto done; } case SR_IIR_THR_EMPTY: { - DPRINT("Serial: SR_IIR_THR_EMPTY\n"); + DPRINT("SR_IIR_THR_EMPTY\n"); KeInsertQueueDpc(&DeviceExtension->SendByteDpc, NULL, NULL); - return TRUE; + Events |= SERIAL_EV_TXEMPTY; + + ret = TRUE; + goto done; } case SR_IIR_DATA_RECEIVED: { - DPRINT("Serial: SR_IIR_DATA_RECEIVED\n"); + ULONG AlreadyReceivedBytes, Limit; + DPRINT("SR_IIR_DATA_RECEIVED\n"); KeInsertQueueDpc(&DeviceExtension->ReceivedByteDpc, NULL, NULL); - return TRUE; + Events |= SERIAL_EV_RXCHAR; + + /* Check if buffer will be 80% full */ + AlreadyReceivedBytes = GetNumberOfElementsInCircularBuffer( + &DeviceExtension->InputBuffer) * 5; + Limit = DeviceExtension->InputBuffer.Length * 4; + if (AlreadyReceivedBytes < Limit && AlreadyReceivedBytes + 1 >= Limit) + { + /* Buffer is full at 80% */ + Events |= SERIAL_EV_RX80FULL; + } + + ret = TRUE; + goto done; } case SR_IIR_ERROR: { UCHAR LSR; - DPRINT("Serial: SR_IIR_ERROR\n"); + DPRINT("SR_IIR_ERROR\n"); LSR = READ_PORT_UCHAR(SER_LSR(ComPortBase)); if (LSR & SR_LSR_OVERRUN_ERROR) + { InterlockedIncrement((PLONG)&DeviceExtension->SerialPerfStats.SerialOverrunErrorCount); + Events |= SERIAL_EV_ERR; + } if (LSR & SR_LSR_PARITY_ERROR) + { InterlockedIncrement((PLONG)&DeviceExtension->SerialPerfStats.ParityErrorCount); + Events |= SERIAL_EV_ERR; + } if (LSR & SR_LSR_FRAMING_ERROR) + { InterlockedIncrement((PLONG)&DeviceExtension->SerialPerfStats.FrameErrorCount); + Events |= SERIAL_EV_ERR; + } if (LSR & SR_LSR_BREAK_INT) + { InterlockedIncrement((PLONG)&DeviceExtension->BreakInterruptErrorCount); - - return TRUE; - } - } - return FALSE; -} + Events |= SERIAL_EV_BREAK; + } + + ret = TRUE; + goto done; + } + } + +done: + if (!ret) + return FALSE; + if (DeviceExtension->WaitOnMaskIrp && (Events & DeviceExtension->WaitMask)) + { + /* Finish pending IRP */ + PULONG pEvents = (PULONG)DeviceExtension->WaitOnMaskIrp->AssociatedIrp.SystemBuffer; + + DeviceExtension->WaitOnMaskIrp->IoStatus.Status = STATUS_SUCCESS; + DeviceExtension->WaitOnMaskIrp->IoStatus.Information = sizeof(ULONG); + *pEvents = Events; + KeInsertQueueDpc(&DeviceExtension->CompleteIrpDpc, DeviceExtension->WaitOnMaskIrp, NULL); + + /* We are now ready to handle another IRP, even if this one is not completed */ + DeviceExtension->WaitOnMaskIrp = NULL; + return STATUS_SUCCESS; + } + return TRUE; +} Modified: trunk/reactos/drivers/base/serial/pnp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/pnp.c?… ============================================================================== --- trunk/reactos/drivers/base/serial/pnp.c (original) +++ trunk/reactos/drivers/base/serial/pnp.c Sat Aug 26 02:07:10 2006 @@ -28,7 +28,7 @@ static ULONG DeviceNumber = 0; static ULONG ComPortNumber = 1; - DPRINT("Serial: SerialAddDeviceInternal called\n"); + DPRINT("SerialAddDeviceInternal()\n"); ASSERT(DriverObject); ASSERT(Pdo); @@ -45,7 +45,7 @@ &Fdo); if (!NT_SUCCESS(Status)) { - DPRINT("Serial: IoCreateDevice() failed with status 0x%08x\n", Status); + DPRINT("IoCreateDevice() failed with status 0x%08x\n", Status); Fdo = NULL; goto ByeBye; } @@ -56,7 +56,7 @@ Status = IoRegisterDeviceInterface(Pdo, &GUID_DEVINTERFACE_COMPORT, NULL, &DeviceExtension->SerialInterfaceName); if (!NT_SUCCESS(Status)) { - DPRINT("Serial: IoRegisterDeviceInterface() failed with status 0x%08x\n", Status); + DPRINT("IoRegisterDeviceInterface() failed with status 0x%08x\n", Status); goto ByeBye; } @@ -78,11 +78,12 @@ KeInitializeEvent(&DeviceExtension->InputBufferNotEmpty, NotificationEvent, FALSE); KeInitializeDpc(&DeviceExtension->ReceivedByteDpc, SerialReceiveByte, DeviceExtension); KeInitializeDpc(&DeviceExtension->SendByteDpc, SerialSendByte, DeviceExtension); + KeInitializeDpc(&DeviceExtension->CompleteIrpDpc, SerialCompleteIrp, DeviceExtension); Fdo->Flags |= DO_POWER_PAGABLE; Status = IoAttachDeviceToDeviceStackSafe(Fdo, Pdo, &DeviceExtension->LowerDevice); if (!NT_SUCCESS(Status)) { - DPRINT("Serial: IoAttachDeviceToDeviceStackSafe() failed with status 0x%08x\n", Status); + DPRINT("IoAttachDeviceToDeviceStackSafe() failed with status 0x%08x\n", Status); goto ByeBye; } Fdo->Flags |= DO_BUFFERED_IO; @@ -185,7 +186,7 @@ } } } - DPRINT("Serial: New COM port. Base = 0x%lx, Irql = %u\n", + DPRINT("New COM port. Base = 0x%lx, Irql = %u\n", DeviceExtension->BaseAddress, Dirql); if (!DeviceExtension->BaseAddress) return STATUS_INSUFFICIENT_RESOURCES; @@ -212,7 +213,7 @@ Status = SerialSetBaudRate(DeviceExtension, DeviceExtension->BaudRate); if (!NT_SUCCESS(Status)) { - DPRINT("Serial: SerialSetBaudRate() failed with status 0x%08x\n", Status); + DPRINT("SerialSetBaudRate() failed with status 0x%08x\n", Status); return Status; } @@ -223,7 +224,7 @@ Status = SerialSetLineControl(DeviceExtension, &DeviceExtension->SerialLineControl); if (!NT_SUCCESS(Status)) { - DPRINT("Serial: SerialSetLineControl() failed with status 0x%08x\n", Status); + DPRINT("SerialSetLineControl() failed with status 0x%08x\n", Status); return Status; } @@ -245,7 +246,7 @@ Status = IoCreateSymbolicLink(&LinkName, &DeviceName); if (!NT_SUCCESS(Status)) { - DPRINT("Serial: IoCreateSymbolicLink() failed with status 0x%08x\n", Status); + DPRINT("IoCreateSymbolicLink() failed with status 0x%08x\n", Status); return Status; } @@ -258,7 +259,7 @@ Affinity, FALSE); if (!NT_SUCCESS(Status)) { - DPRINT("Serial: IoConnectInterrupt() failed with status 0x%08x\n", Status); + DPRINT("IoConnectInterrupt() failed with status 0x%08x\n", Status); IoSetDeviceInterfaceState(&DeviceExtension->SerialInterfaceName, FALSE); IoDeleteSymbolicLink(&LinkName); return Status; @@ -313,7 +314,7 @@ IRP_MN_QUERY_REMOVE_DEVICE 0x1 IRP_MN_REMOVE_DEVICE 0x2 { - DPRINT("Serial: IRP_MJ_PNP / IRP_MN_REMOVE_DEVICE\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_REMOVE_DEVICE\n"); IoAcquireRemoveLock IoReleaseRemoveLockAndWait pass request to DeviceExtension-LowerDriver @@ -336,7 +337,7 @@ */ case IRP_MN_START_DEVICE: /* 0x0 */ { - DPRINT("Serial: IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_START_DEVICE\n"); ASSERT(((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->PnpState == dsStopped); @@ -345,7 +346,7 @@ */ if (Stack->Parameters.StartDevice.AllocatedResources == NULL) { - DPRINT1("Serial: no allocated resources. Can't start COM%lu\n", + DPRINT1("No allocated resources. Can't start COM%lu\n", ((PSERIAL_DEVICE_EXTENSION)DeviceObject->DeviceExtension)->ComPort); Status = STATUS_INSUFFICIENT_RESOURCES; break; @@ -366,16 +367,16 @@ { case BusRelations: { - DPRINT("Serial: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / BusRelations\n"); return ForwardIrpAndForget(DeviceObject, Irp); } case RemovalRelations: { - DPRINT("Serial: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n"); + DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / RemovalRelations\n"); return ForwardIrpAndForget(DeviceObject, Irp); } default: - DPRINT1("Serial: IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", + DPRINT1("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / Unknown type 0x%lx\n", Stack->Parameters.QueryDeviceRelations.Type); return ForwardIrpAndForget(DeviceObject, Irp); } @@ -383,7 +384,7 @@ } default: { - DPRINT1("Serial: unknown minor function 0x%x\n", MinorFunction); + DPRINT1("Unknown minor function 0x%x\n", MinorFunction); return ForwardIrpAndForget(DeviceObject, Irp); } } Modified: trunk/reactos/drivers/base/serial/power.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/power.… ============================================================================== --- trunk/reactos/drivers/base/serial/power.c (original) +++ trunk/reactos/drivers/base/serial/power.c Sat Aug 26 02:07:10 2006 @@ -15,7 +15,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - DPRINT("Serial: IRP_MJ_POWER dispatch\n"); + DPRINT("IRP_MJ_POWER dispatch\n"); Irp->IoStatus.Information = 0; Irp->IoStatus.Status = STATUS_SUCCESS; IoCompleteRequest(Irp, IO_NO_INCREMENT); Modified: trunk/reactos/drivers/base/serial/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/rw.c?r… ============================================================================== --- trunk/reactos/drivers/base/serial/rw.c (original) +++ trunk/reactos/drivers/base/serial/rw.c Sat Aug 26 02:07:10 2006 @@ -44,10 +44,10 @@ Length = IoGetCurrentIrpStackLocation(Irp)->Parameters.Read.Length; Buffer = SerialGetUserBuffer(Irp); - DPRINT("Serial: UseIntervalTimeout = %s, IntervalTimeout = %lu\n", + DPRINT("UseIntervalTimeout = %s, IntervalTimeout = %lu\n", WorkItemData->UseIntervalTimeout ? "YES" : "NO", WorkItemData->UseIntervalTimeout ? WorkItemData->IntervalTimeout.QuadPart : 0); - DPRINT("Serial: UseTotalTimeout = %s\n", + DPRINT("UseTotalTimeout = %s\n", WorkItemData->UseTotalTimeout ? "YES" : "NO"); ObjectCount = 1; @@ -69,7 +69,7 @@ && Length > 0) { PopCircularBufferEntry(&DeviceExtension->InputBuffer, &ReceivedByte); - DPRINT("Serial: reading byte from buffer: 0x%02x\n", ReceivedByte); + DPRINT("Reading byte from buffer: 0x%02x\n", ReceivedByte); Buffer[Information++] = ReceivedByte; Length--; @@ -80,7 +80,7 @@ if (WorkItemData->DontWait && !(WorkItemData->ReadAtLeastOneByte && Information == 0)) { - DPRINT("Serial: buffer empty. Don't wait more bytes\n"); + DPRINT("Buffer empty. Don't wait more bytes\n"); break; } @@ -97,7 +97,7 @@ if (Status == STATUS_TIMEOUT /* interval timeout */ || Status == STATUS_WAIT_1) /* total timeout */ { - DPRINT("Serial: timeout when reading bytes. Status = 0x%08lx\n", Status); + DPRINT("Timeout when reading bytes. Status = 0x%08lx\n", Status); break; } } @@ -121,7 +121,7 @@ PWORKITEM_DATA WorkItemData; PIRP Irp; - DPRINT("Serial: SerialReadWorkItem() called\n"); + DPRINT("SerialReadWorkItem() called\n"); WorkItemData = (PWORKITEM_DATA)pWorkItemData; Irp = WorkItemData->Irp; @@ -147,7 +147,7 @@ PIO_WORKITEM WorkItem; NTSTATUS Status; - DPRINT("Serial: IRP_MJ_READ\n"); + DPRINT("IRP_MJ_READ\n"); Stack = IoGetCurrentIrpStackLocation(Irp); Length = Stack->Parameters.Read.Length; @@ -259,7 +259,7 @@ KIRQL Irql; NTSTATUS Status = STATUS_SUCCESS; - DPRINT("Serial: IRP_MJ_WRITE\n"); + DPRINT("IRP_MJ_WRITE\n"); /* FIXME: pend operation if possible */ /* FIXME: use write timeouts */ @@ -296,7 +296,7 @@ } else { - DPRINT("Serial: buffer overrun on COM%lu\n", DeviceExtension->ComPort); + DPRINT("Buffer overrun on COM%lu\n", DeviceExtension->ComPort); DeviceExtension->SerialPerfStats.BufferOverrunErrorCount++; break; } Modified: trunk/reactos/drivers/base/serial/serial.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/serial/serial… ============================================================================== --- trunk/reactos/drivers/base/serial/serial.h (original) +++ trunk/reactos/drivers/base/serial/serial.h Sat Aug 26 02:07:10 2006 @@ -81,10 +81,12 @@ PKINTERRUPT Interrupt; KDPC ReceivedByteDpc; KDPC SendByteDpc; + KDPC CompleteIrpDpc; SERIAL_LINE_CONTROL SerialLineControl; UART_TYPE UartType; ULONG WaitMask; + PIRP WaitOnMaskIrp; ULONG BreakInterruptErrorCount; SERIALPERF_STATS SerialPerfStats; @@ -204,6 +206,10 @@ IsCircularBufferEmpty( IN PCIRCULAR_BUFFER pBuffer); +ULONG +GetNumberOfElementsInCircularBuffer( + IN PCIRCULAR_BUFFER pBuffer); + NTSTATUS PushCircularBufferEntry( IN PCIRCULAR_BUFFER pBuffer, @@ -286,8 +292,8 @@ SerialReceiveByte( IN PKDPC Dpc, IN PVOID pDeviceExtension, // real type PSERIAL_DEVICE_EXTENSION - IN PVOID pByte, // real type UCHAR - IN PVOID Unused); + IN PVOID Unused1, + IN PVOID Unused2); VOID NTAPI SerialSendByte( @@ -296,6 +302,13 @@ IN PVOID Unused1, IN PVOID Unused2); +VOID NTAPI +SerialCompleteIrp( + IN PKDPC Dpc, + IN PVOID pDeviceExtension, // real type PSERIAL_DEVICE_EXTENSION + IN PVOID pIrp, // real type PIRP + IN PVOID Unused); + BOOLEAN NTAPI SerialInterruptService( IN PKINTERRUPT Interrupt,

18 years, 4 months

[greatlrd] 23710: forget this file thx christ

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Aug 25 22:26:26 2006 New Revision: 23710 URL: http://svn.reactos.org/svn/reactos?rev=23710&view=rev Log: forget this file thx christ Added: trunk/reactos/base/applications/network/net/net.rbuild Added: trunk/reactos/base/applications/network/net/net.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/net.rbuild (added) +++ trunk/reactos/base/applications/network/net/net.rbuild Fri Aug 25 22:26:26 2006 @@ -1,0 +1,16 @@ +<?xml version="1.0"?> +<module name="net" type="win32cui" installbase="system32" installname="net.exe"> + <include base="ping">.</include> + <define name="__USE_W32API" /> + <define name="__USE_W32_SOCKETS" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <library>kernel32</library> + <library>ws2_32</library> + <file>main.c</file> + <file>cmdstart.c</file> + <file>cmdStop.c</file> + <file>help.c</file> + <file>process.c</file> + +</module>

18 years, 4 months

[greatlrd] 23709: Add frist version of ReactOS net command. I finish frist step early that I calc, you need samba-tng rpcclient to use net command in your path. net command only support follow command "net start, net start serivce_display name, net stop", more will follow later. The help text I need some help with to fill in the info how thuse command work and design the help text better.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Aug 25 21:50:26 2006 New Revision: 23709 URL: http://svn.reactos.org/svn/reactos?rev=23709&view=rev Log: Add frist version of ReactOS net command. I finish frist step early that I calc, you need samba-tng rpcclient to use net command in your path. net command only support follow command "net start, net start serivce_display name, net stop", more will follow later. The help text I need some help with to fill in the info how thuse command work and design the help text better. Added: trunk/reactos/base/applications/network/net/ trunk/reactos/base/applications/network/net/cmdStop.c (with props) trunk/reactos/base/applications/network/net/cmdstart.c (with props) trunk/reactos/base/applications/network/net/help.c (with props) trunk/reactos/base/applications/network/net/main.c (with props) trunk/reactos/base/applications/network/net/net.h (with props) trunk/reactos/base/applications/network/net/process.c (with props) Modified: trunk/reactos/base/applications/network/network.rbuild Added: trunk/reactos/base/applications/network/net/cmdStop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdStop.c (added) +++ trunk/reactos/base/applications/network/net/cmdStop.c Fri Aug 25 21:50:26 2006 @@ -1,0 +1,107 @@ + +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS net command + * FILE: + * PURPOSE: + * + * PROGRAMMERS: Magnus Olsen (greatlord(a)reactos.org) + */ + +#include "net.h" + +INT cmdStop(INT argc, CHAR **argv ) +{ + char *string; + long size = 100*sizeof(char); + + if (argc>4) + { + help(); + return 0; + } + + if (argc==2) + { + string = (char *) malloc(size); + if (string != NULL) + { + sprintf(string,"rpcclient -c \"service enum\""); + system(string); + free(string); + } + return 0; + } + + if (argc==3) + { + stop_service(argv[1]); + return 0; + } + + return 0; +} + + +INT stop_service(CHAR *service) +{ + + CHAR *srvlst; + LONG pos=0; + LONG old_pos=0; + LONG row_size=0; + LONG size=0; + + CHAR *row; /* we assume display name can max be 20 row and each row is 80 char */ + + + /* Get the size for srvlst */ + myCreateProcessStartGetSzie("rpcclient -c \"service enum\"", &size); + if (size==0) + { + return 0; + } + + srvlst = (CHAR *) malloc(size); + if (srvlst == NULL) + { + return 0; + } + /* Get the server list */ + myCreateProcessStart("rpcclient -c \"service enum\"", srvlst, size); + + + /* scan after display name */ + while (pos<size) + { + old_pos = pos; + + if (1 == row_scanner_service(srvlst, &pos, size, service, NULL)) + { + row_size = (pos - old_pos)+32; /* 32 buffer for command */ + pos = old_pos; + row = (CHAR *) malloc(row_size*sizeof(CHAR)); + if (row == NULL) + { + return 0; + } + memset(row,0,row_size*sizeof(CHAR)); + if (1 == row_scanner_service(srvlst, &pos, size, service, &row[27])) + { + /* + display name found + now we can start the service + */ + + memcpy(row,"rpcclient -c \"service stop %s\"\"",27*sizeof(CHAR)); + row_size = strlen(row); + row[row_size] = '\"'; + system(row); + } + free(row); + } + } + + free(srvlst); + return 0; +} Propchange: trunk/reactos/base/applications/network/net/cmdStop.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/network/net/cmdstart.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/cmdstart.c (added) +++ trunk/reactos/base/applications/network/net/cmdstart.c Fri Aug 25 21:50:26 2006 @@ -1,0 +1,107 @@ + +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS net command + * FILE: + * PURPOSE: + * + * PROGRAMMERS: Magnus Olsen (greatlord(a)reactos.org) + */ + +#include "net.h" + +INT cmdStart(INT argc, CHAR **argv ) +{ + char *string; + long size = 100*sizeof(char); + + if (argc>4) + { + help(); + return 0; + } + + if (argc==2) + { + string = (char *) malloc(size); + if (string != NULL) + { + sprintf(string,"rpcclient -c \"service enum\""); + system(string); + free(string); + } + return 0; + } + + if (argc==3) + { + start_service(argv[1]); + return 0; + } + + return 0; +} + + +INT start_service(CHAR *service) +{ + + CHAR *srvlst; + LONG pos=0; + LONG old_pos=0; + LONG row_size=0; + LONG size=0; + + CHAR *row; /* we assume display name can max be 20 row and each row is 80 char */ + + + /* Get the size for srvlst */ + myCreateProcessStartGetSzie("rpcclient -c \"service enum\"", &size); + if (size==0) + { + return 0; + } + + srvlst = (CHAR *) malloc(size); + if (srvlst == NULL) + { + return 0; + } + /* Get the server list */ + myCreateProcessStart("rpcclient -c \"service enum\"", srvlst, size); + + + /* scan after display name */ + while (pos<size) + { + old_pos = pos; + + if (1 == row_scanner_service(srvlst, &pos, size, service, NULL)) + { + row_size = (pos - old_pos)+32; /* 32 buffer for command */ + pos = old_pos; + row = (CHAR *) malloc(row_size*sizeof(CHAR)); + if (row == NULL) + { + return 0; + } + memset(row,0,row_size*sizeof(CHAR)); + if (1 == row_scanner_service(srvlst, &pos, size, service, &row[28])) + { + /* + display name found + now we can start the service + */ + + memcpy(row,"rpcclient -c \"service start %s\"\"",28*sizeof(CHAR)); + row_size = strlen(row); + row[row_size] = '\"'; + system(row); + } + free(row); + } + } + + free(srvlst); + return 0; +} Propchange: trunk/reactos/base/applications/network/net/cmdstart.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/network/net/help.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/help.c (added) +++ trunk/reactos/base/applications/network/net/help.c Fri Aug 25 21:50:26 2006 @@ -1,0 +1,199 @@ + +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS net command + * FILE: + * PURPOSE: + * + * PROGRAMMERS: Magnus Olsen (greatlord(a)reactos.org) + */ + +#include "net.h" + +INT cmdHelp(INT argc, CHAR **argv) +{ + if (argc>3) + { + return 0; + } + + if (strcmp(argv[0],"ACCOUNTS")==0) + { + printf("ACCOUNTS\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"COMPUTER")==0) + { + printf("COMPUTER\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"CONFIG")==0) + { + printf("CONFIG\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"CONTINUE")==0) + { + printf("CONTINUE\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"FILE")==0) + { + printf("FILE\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"GROUP")==0) + { + printf("GROUP\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"HELP")==0) + { + printf("HELP\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"HELPMSG")==0) + { + printf("HELPMSG\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"LOCALGROUP")==0) + { + printf("LOCALGROUP\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"NAME")==0) + { + printf("NAME\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"PRINT")==0) + { + printf("PRINT\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"SEND")==0) + { + printf("SEND\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"SESSION")==0) + { + printf("SESSION\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"SHARE")==0) + { + printf("SHARE\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"START")==0) + { + printf("START\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"STATISTICS")==0) + { + printf("STATISTICS\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"STOP")==0) + { + printf("STOP\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"TIME")==0) + { + printf("TIME\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"USE")==0) + { + printf("USE\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"USER")==0) + { + printf("USER\n"); + printf("help text\n"); + return 0; + } + + if (strcmp(argv[0],"VIEW")==0) + { + printf("VIEW\n"); + printf("help text\n"); + return 0; + } + + help(); + return 0; +} + +void help() +{ + printf("NET ACCOUNTS\n"); + printf("NET COMPUTER\n"); + printf("NET CONFIG\n"); + printf("NET CONFIG SERVER\n"); + printf("NET CONFIG WORKSTATION\n"); + printf("NET CONTINUE\n"); + printf("NET FILE\n"); + printf("NET GROUP\n"); + + printf("NET HELP\n"); + printf("NET HELPMSG\n"); + printf("NET LOCALGROUP\n"); + printf("NET NAME\n"); + printf("NET PAUSE\n"); + printf("NET PRINT\n"); + printf("NET SEND\n"); + printf("NET SESSION\n"); + + printf("NET SHARE\n"); + printf("NET START\n"); + printf("NET STATISTICS\n"); + printf("NET STOP\n"); + printf("NET TIME\n"); + printf("NET USE\n"); + printf("NET USER\n"); + printf("NET VIEW\n"); +} Propchange: trunk/reactos/base/applications/network/net/help.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/network/net/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/main.c (added) +++ trunk/reactos/base/applications/network/net/main.c Fri Aug 25 21:50:26 2006 @@ -1,0 +1,138 @@ + +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS net command + * FILE: + * PURPOSE: + * + * PROGRAMMERS: Magnus Olsen (greatlord(a)reactos.org) + */ + +#include "net.h" + + + +int main(int argc, char **argv) +{ + if (argc<2) + { + help(); + return 1; + } + + if (stricmp(argv[1],"ACCOUNTS")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"COMPUTER")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"CONFIG")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"CONTINUE")==0) + { + return unimplement(); + } + + if (stricmp(argv[1],"FILE")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"GROUP")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"HELP")==0) + { + return cmdHelp(argc,&argv[1]); + } + if (stricmp(argv[1],"HELPMSG")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"LOCALGROUP")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"NAME")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"PRINT")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"SEND")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"SESSION")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"SHARE")==0) + { + return unimplement(); + } + + if (stricmp(argv[1],"START")==0) + { + return cmdStart(argc, &argv[1]); + } + if (stricmp(argv[1],"STATISTICS")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"STOP")==0) + { + return cmdStop(argc, &argv[1]); + } + if (stricmp(argv[1],"TIME")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"USE")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"USER")==0) + { + return unimplement(); + } + if (stricmp(argv[1],"VIEW")==0) + { + return unimplement(); + } + + help(); + return 1; +} + + +int unimplement() +{ + printf("This command is not implement yet\n"); + return 1; +} + + + + + + + + + + + + + + + + + + + Propchange: trunk/reactos/base/applications/network/net/main.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/network/net/net.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/net.h (added) +++ trunk/reactos/base/applications/network/net/net.h Fri Aug 25 21:50:26 2006 @@ -1,0 +1,35 @@ + +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS net command + * FILE: + * PURPOSE: + * + * PROGRAMMERS: Magnus Olsen (greatlord(a)reactos.org) + */ + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <windows.h> + +void help(); +int unimplement(); + + +INT cmdHelp(INT argc, CHAR **argv); + +INT cmdStart(INT argc, CHAR **argv ); +INT start_service(CHAR *service); + +INT cmdStop(INT argc, CHAR **argv ); +INT stop_service(CHAR *service); + +/* Control and start rpcclient */ +BOOL myCreateProcessStartGetSzie(CHAR *cmdline, LONG *size); +BOOL myCreateProcessStart(CHAR *cmdline, CHAR *srvlst, LONG size); +BOOL myCreateProcess(HANDLE hChildStdoutWr, HANDLE hChildStdinRd, CHAR *cmdline); +LONG ReadPipe(HANDLE hStdoutWr, HANDLE hStdoutRd, CHAR *srvlst, LONG size); +LONG ReadPipeSize(HANDLE hStdoutWr, HANDLE hStdoutRd); +INT row_scanner_service(CHAR *buffer, LONG* pos, LONG size, CHAR *name,CHAR *save); + Propchange: trunk/reactos/base/applications/network/net/net.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/network/net/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/net/process.c (added) +++ trunk/reactos/base/applications/network/net/process.c Fri Aug 25 21:50:26 2006 @@ -1,0 +1,227 @@ + +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS net command + * FILE: + * PURPOSE: + * + * PROGRAMMERS: Magnus Olsen (greatlord(a)reactos.org) + */ + +#include "net.h" + +BOOL myCreateProcessStartGetSzie(CHAR *cmdline, LONG *size) +{ + HANDLE hChildStdinRd; + HANDLE hChildStdinWr; + HANDLE hChildStdoutRd; + HANDLE hChildStdoutWr; + SECURITY_ATTRIBUTES saAttr; + + saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); + saAttr.bInheritHandle = TRUE; + saAttr.lpSecurityDescriptor = NULL; + + if (! CreatePipe(&hChildStdoutRd, &hChildStdoutWr, &saAttr, 0)) + { + return FALSE; + } + + if (! CreatePipe(&hChildStdinRd, &hChildStdinWr, &saAttr, 0)) + { + return FALSE; + } + + myCreateProcess(hChildStdoutWr, hChildStdinRd,"rpcclient -c \"service enum\""); + *size = ReadPipeSize(hChildStdoutWr, hChildStdoutRd); + return TRUE; +} + +BOOL myCreateProcessStart(CHAR *cmdline, CHAR *srvlst, LONG size) +{ + HANDLE hChildStdinRd; + HANDLE hChildStdinWr; + HANDLE hChildStdoutRd; + HANDLE hChildStdoutWr; + SECURITY_ATTRIBUTES saAttr; + + saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); + saAttr.bInheritHandle = TRUE; + saAttr.lpSecurityDescriptor = NULL; + + if (! CreatePipe(&hChildStdoutRd, &hChildStdoutWr, &saAttr, 0)) + { + return FALSE; + } + + if (! CreatePipe(&hChildStdinRd, &hChildStdinWr, &saAttr, 0)) + { + return FALSE; + } + + myCreateProcess(hChildStdoutWr, hChildStdinRd,"rpcclient -c \"service enum\""); + + return ReadPipe(hChildStdoutWr, hChildStdoutRd, srvlst, size); +} + +BOOL myCreateProcess(HANDLE hStdoutWr, HANDLE hStdinRd, CHAR *cmdline) +{ + PROCESS_INFORMATION piProcInfo; + STARTUPINFO siStartInfo; + BOOL status = FALSE; + + ZeroMemory( &piProcInfo, sizeof(PROCESS_INFORMATION) ); + ZeroMemory( &siStartInfo, sizeof(STARTUPINFO) ); + siStartInfo.cb = sizeof(STARTUPINFO); + siStartInfo.hStdError = hStdoutWr; + siStartInfo.hStdOutput = hStdoutWr; + siStartInfo.hStdInput = hStdinRd; + siStartInfo.dwFlags |= STARTF_USESTDHANDLES; + status = CreateProcess(NULL, cmdline, NULL, NULL, + TRUE, 0, NULL, NULL, &siStartInfo, &piProcInfo); + + if (status != 0) + { + CloseHandle(piProcInfo.hProcess); + CloseHandle(piProcInfo.hThread); + return status; + } + return status; +} + +LONG ReadPipeSize(HANDLE hStdoutWr, HANDLE hStdoutRd) +{ + CHAR chBuf[2]; + LONG pos=0; + + if (!CloseHandle(hStdoutWr)) + { + return 0; /* fail */ + } + + for (;;) + { + long dwRead; + if( !ReadFile( hStdoutRd, chBuf, 1, &dwRead, NULL) || dwRead == 0) + { + break; + } + else + { + pos+=dwRead; + } + } + return pos; +} + +LONG ReadPipe(HANDLE hStdoutWr, HANDLE hStdoutRd, CHAR *srvlst, LONG size) +{ + CHAR chBuf[2]; + long pos=0; + + if (!CloseHandle(hStdoutWr)) + { + return 0; /* fail */ + } + + for (;;) + { + long dwRead; + if( !ReadFile( hStdoutRd, chBuf, 1, &dwRead, NULL) || dwRead == 0) + { + break; + } + else + { + srvlst[pos++] = chBuf[0] ; + } + } + return 0; +} + +INT row_scanner_service(CHAR *buffer, LONG* pos, LONG size, + CHAR *name,CHAR *save) +{ + LONG get_semi; + LONG t; + LONG row_size=0; + LONG start_pos; + + start_pos = *pos; + + if (*pos>=size) + { + return 0; + } + + + /* get row start */ + for (t=start_pos;t<size;t++) + { + if (buffer[t]=='\n') + { + buffer[t]='\0'; + if (buffer[t-1]==0x09) + { + buffer[t-1]='\0'; + } + if (buffer[t-1]==0x0d) + { + buffer[t-1]='\0'; + } + *pos = t+1; + row_size = t; + break; + } + } + + /* get : */ + get_semi=-1; + for (t=start_pos;t<row_size;t++) + { + if (buffer[t]==':') + { + get_semi=t; + break; + } + } + + if (get_semi==-1) + { + return 0; + } + + /* lock for space */ + for (t=get_semi+1;t<row_size;t++) + { + if (!isspace(buffer[t])) + { + break; + } + } + if (t==0) + { + /* : not found next row*/ + return 0; + } + + /* Compare now */ + if (strnicmp(name,&buffer[t],strlen(&buffer[t]))==0) + { + if (save != NULL) + { + /* lock for space */ + for (t=start_pos;t<get_semi;t++) + { + if (!isspace(buffer[t])) + { + break; + } + } + + memcpy(save,&buffer[t],get_semi-t); + } + return 1; + } + return 0; +} Propchange: trunk/reactos/base/applications/network/net/process.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/network/network.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… ============================================================================== --- trunk/reactos/base/applications/network/network.rbuild (original) +++ trunk/reactos/base/applications/network/network.rbuild Fri Aug 25 21:50:26 2006 @@ -12,6 +12,9 @@ </directory> <directory name="ipconfig"> <xi:include href="ipconfig/ipconfig.rbuild" /> +</directory> +<directory name="net"> + <xi:include href="net/net.rbuild" /> </directory> <directory name="netstat"> <xi:include href="netstat/netstat.rbuild" />

18 years, 4 months

← Newer
1
...
11
12
13
14
15
16
17
...
45
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2006