Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 55625: [CSRSRV]: Move the newly ported process APIs to procsup.c where they belong more. No functional change.
by ion＠svn.reactos.org 16 Feb '12

16 Feb '12

Author: ion Date: Thu Feb 16 06:45:25 2012 New Revision: 55625 URL: http://svn.reactos.org/svn/reactos?rev=55625&view=rev Log: [CSRSRV]: Move the newly ported process APIs to procsup.c where they belong more. No functional change. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c trunk/reactos/subsystems/win32/csrss/include/api.h Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] Thu Feb 16 06:45:25 2012 @@ -12,319 +12,13 @@ #define NDEBUG #include <debug.h> - -#define CSR_SERVER_DLL_MAX 4 -#define LOCK RtlEnterCriticalSection(&ProcessDataLock) -#define UNLOCK RtlLeaveCriticalSection(&ProcessDataLock) -#define CsrAcquireProcessLock() LOCK -#define CsrReleaseProcessLock() UNLOCK -#define ProcessStructureListLocked() \ - (ProcessDataLock.OwningThread == NtCurrentTeb()->ClientId.UniqueThread) extern NTSTATUS CallProcessInherit(PCSR_PROCESS, PCSR_PROCESS); extern NTSTATUS CallProcessDeleted(PCSR_PROCESS); /* GLOBALS *******************************************************************/ -RTL_CRITICAL_SECTION ProcessDataLock, CsrWaitListsLock; -extern PCSR_PROCESS CsrRootProcess; -extern LIST_ENTRY CsrThreadHashTable[256]; -extern ULONG CsrTotalPerProcessDataLength; -LONG CsrProcessSequenceCount = 5; - /* FUNCTIONS *****************************************************************/ - -/*++ - * @name CsrAllocateProcess - * @implemented NT4 - * - * The CsrAllocateProcess routine allocates a new CSR Process object. - * - * @return Pointer to the newly allocated CSR Process. - * - * @remarks None. - * - *--*/ -PCSR_PROCESS -NTAPI -CsrAllocateProcess(VOID) -{ - PCSR_PROCESS CsrProcess; - ULONG TotalSize; - - /* Calculate the amount of memory this should take */ - TotalSize = sizeof(CSR_PROCESS) + - (CSR_SERVER_DLL_MAX * sizeof(PVOID)) + - CsrTotalPerProcessDataLength; - - /* Allocate a Process */ - CsrProcess = RtlAllocateHeap(CsrHeap, HEAP_ZERO_MEMORY, TotalSize); - if (!CsrProcess) return NULL; - - /* Handle the Sequence Number and protect against overflow */ - CsrProcess->SequenceNumber = CsrProcessSequenceCount++; - if (CsrProcessSequenceCount < 5) CsrProcessSequenceCount = 5; - - /* Increase the reference count */ - CsrProcess->ReferenceCount++; - - /* Initialize the Thread List */ - InitializeListHead(&CsrProcess->ThreadList); - - /* Return the Process */ - return CsrProcess; -} - -/*++ - * @name CsrLockedReferenceProcess - * - * The CsrLockedReferenceProcess refences a CSR Process while the - * Process Lock is already being held. - * - * @param CsrProcess - * Pointer to the CSR Process to be referenced. - * - * @return None. - * - * @remarks This routine will return with the Process Lock held. - * - *--*/ -VOID -NTAPI -CsrLockedReferenceProcess(IN PCSR_PROCESS CsrProcess) -{ - /* Increment the reference count */ - ++CsrProcess->ReferenceCount; -} - -/*++ - * @name CsrServerInitialization - * @implemented NT4 - * - * The CsrInitializeProcessStructure routine sets up support for CSR Processes - * and CSR Threads. - * - * @param None. - * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. - * - * @remarks None. - * - *--*/ -NTSTATUS -NTAPI -CsrInitializeProcessStructure(VOID) -{ - NTSTATUS Status; - ULONG i; - - /* Initialize the Lock */ - Status = RtlInitializeCriticalSection(&ProcessDataLock); - if (!NT_SUCCESS(Status)) return Status; - - /* Set up the Root Process */ - CsrRootProcess = CsrAllocateProcess(); - if (!CsrRootProcess) return STATUS_NO_MEMORY; - - /* Set up the minimal information for it */ - InitializeListHead(&CsrRootProcess->ListLink); - CsrRootProcess->ProcessHandle = (HANDLE)-1; - CsrRootProcess->ClientId = NtCurrentTeb()->ClientId; - - /* Initialize the Thread Hash List */ - for (i = 0; i < 256; i++) InitializeListHead(&CsrThreadHashTable[i]); - - /* Initialize the Wait Lock */ - return RtlInitializeCriticalSection(&CsrWaitListsLock); -} - -/*++ - * @name CsrDeallocateProcess - * - * The CsrDeallocateProcess frees the memory associated with a CSR Process. - * - * @param CsrProcess - * Pointer to the CSR Process to be freed. - * - * @return None. - * - * @remarks Do not call this routine. It is reserved for the internal - * thread management routines when a CSR Process has been cleanly - * dereferenced and killed. - * - *--*/ -VOID -NTAPI -CsrDeallocateProcess(IN PCSR_PROCESS CsrProcess) -{ - /* Free the process object from the heap */ - RtlFreeHeap(CsrHeap, 0, CsrProcess); -} - -/*++ - * @name CsrRemoveProcess - * - * The CsrRemoveProcess function undoes a CsrInsertProcess operation and - * removes the CSR Process from the Process List and notifies Server DLLs - * of this removal. - * - * @param CsrProcess - * Pointer to the CSR Process to remove. - * - * @return None. - * - * @remarks None. - * - *--*/ -VOID -NTAPI -CsrRemoveProcess(IN PCSR_PROCESS CsrProcess) -{ -#if 0 - PCSR_SERVER_DLL ServerDll; - ULONG i; -#endif - ASSERT(ProcessStructureListLocked()); - - /* Remove us from the Process List */ - RemoveEntryList(&CsrProcess->ListLink); - - /* Release the lock */ - CsrReleaseProcessLock(); -#if 0 - /* Loop every Server DLL */ - for (i = 0; i < CSR_SERVER_DLL_MAX; i++) - { - /* Get the Server DLL */ - ServerDll = CsrLoadedServerDll[i]; - - /* Check if it's valid and if it has a Disconnect Callback */ - if (ServerDll && ServerDll->DisconnectCallback) - { - /* Call it */ - (ServerDll->DisconnectCallback)(CsrProcess); - } - } -#endif -} - -/*++ - * @name CsrInsertProcess - * - * The CsrInsertProcess routine inserts a CSR Process into the Process List - * and notifies Server DLLs of the creation of a new CSR Process. - * - * @param Parent - * Optional pointer to the CSR Process creating this CSR Process. - * - * @param CurrentProcess - * Optional pointer to the current CSR Process. - * - * @param CsrProcess - * Pointer to the CSR Process which is to be inserted. - * - * @return None. - * - * @remarks None. - * - *--*/ -VOID -NTAPI -CsrInsertProcess(IN PCSR_PROCESS Parent OPTIONAL, - IN PCSR_PROCESS CurrentProcess OPTIONAL, - IN PCSR_PROCESS CsrProcess) -{ -#if 0 - PCSR_SERVER_DLL ServerDll; - ULONG i; -#endif - ASSERT(ProcessStructureListLocked()); - - /* Set the parent */ - CsrProcess->Parent = Parent; - - /* Insert it into the Root List */ - InsertTailList(&CsrRootProcess->ListLink, &CsrProcess->ListLink); -#if 0 - /* Notify the Server DLLs */ - for (i = 0; i < CSR_SERVER_DLL_MAX; i++) - { - /* Get the current Server DLL */ - ServerDll = CsrLoadedServerDll[i]; - - /* Make sure it's valid and that it has callback */ - if ((ServerDll) && (ServerDll->NewProcessCallback)) - { - ServerDll->NewProcessCallback(CurrentProcess, CsrProcess); - } - } -#endif -} - -/*++ - * @name CsrLockProcessByClientId - * @implemented NT4 - * - * The CsrLockProcessByClientId routine locks the CSR Process corresponding - * to the given Process ID and optionally returns it. - * - * @param Pid - * Process ID corresponding to the CSR Process which will be locked. - * - * @param CsrProcess - * Optional pointer to a CSR Process pointer which will hold the - * CSR Process corresponding to the given Process ID. - * - * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL - * othwerwise. - * - * @remarks Locking a CSR Process is defined as acquiring an extra - * reference to it and returning with the Process Lock held. - * - *--*/ -NTSTATUS -NTAPI -CsrLockProcessByClientId(IN HANDLE Pid, - OUT PCSR_PROCESS *CsrProcess) -{ - PLIST_ENTRY NextEntry; - PCSR_PROCESS CurrentProcess = NULL; - - /* Acquire the lock */ - CsrAcquireProcessLock(); - - /* Assume failure */ - ASSERT(CsrProcess != NULL); - *CsrProcess = NULL; - - /* Setup the List Pointers */ - NextEntry = CsrRootProcess->ListLink.Flink; - while (NextEntry != &CsrRootProcess->ListLink) - { - /* Get the Process */ - CurrentProcess = CONTAINING_RECORD(NextEntry, CSR_PROCESS, ListLink); - - /* Check for PID Match */ - if (CurrentProcess->ClientId.UniqueProcess == Pid) break; - - /* Next entry */ - NextEntry = NextEntry->Flink; - } - - /* Check if we didn't find it in the list */ - if (NextEntry == &CsrRootProcess->ListLink) - { - /* Nothing found, release the lock */ - CsrReleaseProcessLock(); - return STATUS_UNSUCCESSFUL; - } - - /* Lock the found process and return it */ - CsrLockedReferenceProcess(CurrentProcess); - *CsrProcess = CurrentProcess; - return STATUS_SUCCESS; -} PCSR_PROCESS WINAPI CsrGetProcessData(HANDLE ProcessId) { Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c [iso-8859-1] Thu Feb 16 06:45:25 2012 @@ -14,15 +14,9 @@ #define NDEBUG #include <debug.h> -#define LOCK RtlEnterCriticalSection(&ProcessDataLock) -#define UNLOCK RtlLeaveCriticalSection(&ProcessDataLock) - -#define CsrAcquireProcessLock() LOCK -#define CsrReleaseProcessLock() UNLOCK - /* GLOBALS ********************************************************************/ -extern RTL_CRITICAL_SECTION ProcessDataLock; +RTL_CRITICAL_SECTION ProcessDataLock, CsrWaitListsLock; PCSR_PROCESS CsrRootProcess; SECURITY_QUALITY_OF_SERVICE CsrSecurityQos = { @@ -31,6 +25,8 @@ SECURITY_STATIC_TRACKING, FALSE }; +LONG CsrProcessSequenceCount = 5; +extern ULONG CsrTotalPerProcessDataLength; /* FUNCTIONS ******************************************************************/ @@ -398,4 +394,327 @@ return STATUS_SUCCESS; } +/*++ + * @name CsrSetBackgroundPriority + * @implemented NT4 + * + * The CsrSetBackgroundPriority routine sets the priority for the given CSR + * Process as a Background priority. + * + * @param CsrProcess + * Pointer to the CSR Process whose priority will be modified. + * + * @return None. + * + * @remarks None. + * + *--*/ +VOID +NTAPI +CsrSetBackgroundPriority(IN PCSR_PROCESS CsrProcess) +{ + PROCESS_PRIORITY_CLASS PriorityClass; + + /* Set the Foreground bit off */ + PriorityClass.Foreground = FALSE; + + /* Set the new Priority */ + NtSetInformationProcess(CsrProcess->ProcessHandle, + ProcessPriorityClass, + &PriorityClass, + sizeof(PriorityClass)); +} + +/*++ + * @name CsrAllocateProcess + * @implemented NT4 + * + * The CsrAllocateProcess routine allocates a new CSR Process object. + * + * @return Pointer to the newly allocated CSR Process. + * + * @remarks None. + * + *--*/ +PCSR_PROCESS +NTAPI +CsrAllocateProcess(VOID) +{ + PCSR_PROCESS CsrProcess; + ULONG TotalSize; + + /* Calculate the amount of memory this should take */ + TotalSize = sizeof(CSR_PROCESS) + + (CSR_SERVER_DLL_MAX * sizeof(PVOID)) + + CsrTotalPerProcessDataLength; + + /* Allocate a Process */ + CsrProcess = RtlAllocateHeap(CsrHeap, HEAP_ZERO_MEMORY, TotalSize); + if (!CsrProcess) return NULL; + + /* Handle the Sequence Number and protect against overflow */ + CsrProcess->SequenceNumber = CsrProcessSequenceCount++; + if (CsrProcessSequenceCount < 5) CsrProcessSequenceCount = 5; + + /* Increase the reference count */ + CsrProcess->ReferenceCount++; + + /* Initialize the Thread List */ + InitializeListHead(&CsrProcess->ThreadList); + + /* Return the Process */ + return CsrProcess; +} + +/*++ + * @name CsrLockedReferenceProcess + * + * The CsrLockedReferenceProcess refences a CSR Process while the + * Process Lock is already being held. + * + * @param CsrProcess + * Pointer to the CSR Process to be referenced. + * + * @return None. + * + * @remarks This routine will return with the Process Lock held. + * + *--*/ +VOID +NTAPI +CsrLockedReferenceProcess(IN PCSR_PROCESS CsrProcess) +{ + /* Increment the reference count */ + ++CsrProcess->ReferenceCount; +} + +/*++ + * @name CsrServerInitialization + * @implemented NT4 + * + * The CsrInitializeProcessStructure routine sets up support for CSR Processes + * and CSR Threads. + * + * @param None. + * + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL + * othwerwise. + * + * @remarks None. + * + *--*/ +NTSTATUS +NTAPI +CsrInitializeProcessStructure(VOID) +{ + NTSTATUS Status; + ULONG i; + + /* Initialize the Lock */ + Status = RtlInitializeCriticalSection(&ProcessDataLock); + if (!NT_SUCCESS(Status)) return Status; + + /* Set up the Root Process */ + CsrRootProcess = CsrAllocateProcess(); + if (!CsrRootProcess) return STATUS_NO_MEMORY; + + /* Set up the minimal information for it */ + InitializeListHead(&CsrRootProcess->ListLink); + CsrRootProcess->ProcessHandle = (HANDLE)-1; + CsrRootProcess->ClientId = NtCurrentTeb()->ClientId; + + /* Initialize the Thread Hash List */ + for (i = 0; i < 256; i++) InitializeListHead(&CsrThreadHashTable[i]); + + /* Initialize the Wait Lock */ + return RtlInitializeCriticalSection(&CsrWaitListsLock); +} + +/*++ + * @name CsrDeallocateProcess + * + * The CsrDeallocateProcess frees the memory associated with a CSR Process. + * + * @param CsrProcess + * Pointer to the CSR Process to be freed. + * + * @return None. + * + * @remarks Do not call this routine. It is reserved for the internal + * thread management routines when a CSR Process has been cleanly + * dereferenced and killed. + * + *--*/ +VOID +NTAPI +CsrDeallocateProcess(IN PCSR_PROCESS CsrProcess) +{ + /* Free the process object from the heap */ + RtlFreeHeap(CsrHeap, 0, CsrProcess); +} + +/*++ + * @name CsrRemoveProcess + * + * The CsrRemoveProcess function undoes a CsrInsertProcess operation and + * removes the CSR Process from the Process List and notifies Server DLLs + * of this removal. + * + * @param CsrProcess + * Pointer to the CSR Process to remove. + * + * @return None. + * + * @remarks None. + * + *--*/ +VOID +NTAPI +CsrRemoveProcess(IN PCSR_PROCESS CsrProcess) +{ +#if 0 + PCSR_SERVER_DLL ServerDll; + ULONG i; +#endif + ASSERT(ProcessStructureListLocked()); + + /* Remove us from the Process List */ + RemoveEntryList(&CsrProcess->ListLink); + + /* Release the lock */ + CsrReleaseProcessLock(); +#if 0 + /* Loop every Server DLL */ + for (i = 0; i < CSR_SERVER_DLL_MAX; i++) + { + /* Get the Server DLL */ + ServerDll = CsrLoadedServerDll[i]; + + /* Check if it's valid and if it has a Disconnect Callback */ + if (ServerDll && ServerDll->DisconnectCallback) + { + /* Call it */ + (ServerDll->DisconnectCallback)(CsrProcess); + } + } +#endif +} + +/*++ + * @name CsrInsertProcess + * + * The CsrInsertProcess routine inserts a CSR Process into the Process List + * and notifies Server DLLs of the creation of a new CSR Process. + * + * @param Parent + * Optional pointer to the CSR Process creating this CSR Process. + * + * @param CurrentProcess + * Optional pointer to the current CSR Process. + * + * @param CsrProcess + * Pointer to the CSR Process which is to be inserted. + * + * @return None. + * + * @remarks None. + * + *--*/ +VOID +NTAPI +CsrInsertProcess(IN PCSR_PROCESS Parent OPTIONAL, + IN PCSR_PROCESS CurrentProcess OPTIONAL, + IN PCSR_PROCESS CsrProcess) +{ +#if 0 + PCSR_SERVER_DLL ServerDll; + ULONG i; +#endif + ASSERT(ProcessStructureListLocked()); + + /* Set the parent */ + CsrProcess->Parent = Parent; + + /* Insert it into the Root List */ + InsertTailList(&CsrRootProcess->ListLink, &CsrProcess->ListLink); +#if 0 + /* Notify the Server DLLs */ + for (i = 0; i < CSR_SERVER_DLL_MAX; i++) + { + /* Get the current Server DLL */ + ServerDll = CsrLoadedServerDll[i]; + + /* Make sure it's valid and that it has callback */ + if ((ServerDll) && (ServerDll->NewProcessCallback)) + { + ServerDll->NewProcessCallback(CurrentProcess, CsrProcess); + } + } +#endif +} + +/*++ + * @name CsrLockProcessByClientId + * @implemented NT4 + * + * The CsrLockProcessByClientId routine locks the CSR Process corresponding + * to the given Process ID and optionally returns it. + * + * @param Pid + * Process ID corresponding to the CSR Process which will be locked. + * + * @param CsrProcess + * Optional pointer to a CSR Process pointer which will hold the + * CSR Process corresponding to the given Process ID. + * + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL + * othwerwise. + * + * @remarks Locking a CSR Process is defined as acquiring an extra + * reference to it and returning with the Process Lock held. + * + *--*/ +NTSTATUS +NTAPI +CsrLockProcessByClientId(IN HANDLE Pid, + OUT PCSR_PROCESS *CsrProcess) +{ + PLIST_ENTRY NextEntry; + PCSR_PROCESS CurrentProcess = NULL; + + /* Acquire the lock */ + CsrAcquireProcessLock(); + + /* Assume failure */ + ASSERT(CsrProcess != NULL); + *CsrProcess = NULL; + + /* Setup the List Pointers */ + NextEntry = CsrRootProcess->ListLink.Flink; + while (NextEntry != &CsrRootProcess->ListLink) + { + /* Get the Process */ + CurrentProcess = CONTAINING_RECORD(NextEntry, CSR_PROCESS, ListLink); + + /* Check for PID Match */ + if (CurrentProcess->ClientId.UniqueProcess == Pid) break; + + /* Next entry */ + NextEntry = NextEntry->Flink; + } + + /* Check if we didn't find it in the list */ + if (NextEntry == &CsrRootProcess->ListLink) + { + /* Nothing found, release the lock */ + CsrReleaseProcessLock(); + return STATUS_UNSUCCESSFUL; + } + + /* Lock the found process and return it */ + CsrLockedReferenceProcess(CurrentProcess); + *CsrProcess = CurrentProcess; + return STATUS_SUCCESS; +} + /* EOF */ Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c [iso-8859-1] Thu Feb 16 06:45:25 2012 @@ -14,21 +14,12 @@ #define NDEBUG #include <debug.h> -#define LOCK RtlEnterCriticalSection(&ProcessDataLock) -#define UNLOCK RtlLeaveCriticalSection(&ProcessDataLock) -#define CsrHeap RtlGetProcessHeap() #define CsrHashThread(t) \ (HandleToUlong(t)&(256 - 1)) -#define CsrAcquireProcessLock() LOCK -#define CsrReleaseProcessLock() UNLOCK - /* GLOBALS ********************************************************************/ LIST_ENTRY CsrThreadHashTable[256]; -extern PCSR_PROCESS CsrRootProcess; -extern RTL_CRITICAL_SECTION ProcessDataLock; -extern PCSR_PROCESS ProcessData[256]; /* FUNCTIONS ******************************************************************/ Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Thu Feb 16 06:45:25 2012 @@ -13,6 +13,14 @@ #include <ndk/rtlfuncs.h> #include <csrss/csrss.h> + +#define CSR_SERVER_DLL_MAX 4 +#define LOCK RtlEnterCriticalSection(&ProcessDataLock) +#define UNLOCK RtlLeaveCriticalSection(&ProcessDataLock) +#define CsrAcquireProcessLock() LOCK +#define CsrReleaseProcessLock() UNLOCK +#define ProcessStructureListLocked() \ + (ProcessDataLock.OwningThread == NtCurrentTeb()->ClientId.UniqueThread) typedef enum _CSR_THREAD_FLAGS { @@ -137,9 +145,32 @@ CSR_API(CsrGetShutdownParameters); CSR_API(CsrSetShutdownParameters); +VOID +NTAPI +CsrSetBackgroundPriority(IN PCSR_PROCESS CsrProcess); + PCSR_THREAD NTAPI CsrAllocateThread(IN PCSR_PROCESS CsrProcess); + +PCSR_PROCESS +NTAPI +CsrAllocateProcess(VOID); + +VOID +NTAPI +CsrDeallocateProcess(IN PCSR_PROCESS CsrProcess); + +VOID +NTAPI +CsrRemoveProcess(IN PCSR_PROCESS CsrProcess); + +VOID +NTAPI +CsrInsertProcess(IN PCSR_PROCESS Parent OPTIONAL, + IN PCSR_PROCESS CurrentProcess OPTIONAL, + IN PCSR_PROCESS CsrProcess); + /* api/wapi.c */ NTSTATUS FASTCALL CsrApiRegisterDefinitions(PCSRSS_API_DEFINITION NewDefinitions); @@ -149,6 +180,18 @@ VOID NTAPI ClientConnectionThread(HANDLE ServerPort); extern HANDLE CsrSbApiPort; +extern LIST_ENTRY CsrThreadHashTable[256]; +extern PCSR_PROCESS CsrRootProcess; +extern RTL_CRITICAL_SECTION ProcessDataLock, CsrWaitListsLock; + +BOOLEAN +NTAPI +ProtectHandle(IN HANDLE ObjectHandle); + +VOID +NTAPI +CsrInsertThread(IN PCSR_PROCESS Process, +IN PCSR_THREAD Thread); /* api/process.c */ typedef NTSTATUS (WINAPI *CSRSS_ENUM_PROCESS_PROC)(PCSR_PROCESS ProcessData,

1 0

[ion] 55624: [CSRSRV]: Port the alloc/dealloc/insert/remove CsrProcess management functions from CSRSRV2. There is no longer a hash table being used but instead a linked list just like in real CSRS...
by ion＠svn.reactos.org 16 Feb '12

16 Feb '12

Author: ion Date: Thu Feb 16 03:41:18 2012 New Revision: 55624 URL: http://svn.reactos.org/svn/reactos?rev=55624&view=rev Log: [CSRSRV]: Port the alloc/dealloc/insert/remove CsrProcess management functions from CSRSRV2. There is no longer a hash table being used but instead a linked list just like in real CSRSRV(2 for us). This brings us closer to the CSRSRV2 model and makes some of the older ported code cleaner too. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c trunk/reactos/subsystems/win32/csrss/csrsrv/init.c trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c trunk/reactos/subsystems/win32/csrss/include/api.h Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] Thu Feb 16 03:41:18 2012 @@ -13,191 +13,428 @@ #define NDEBUG #include <debug.h> +#define CSR_SERVER_DLL_MAX 4 #define LOCK RtlEnterCriticalSection(&ProcessDataLock) #define UNLOCK RtlLeaveCriticalSection(&ProcessDataLock) #define CsrAcquireProcessLock() LOCK #define CsrReleaseProcessLock() UNLOCK - +#define ProcessStructureListLocked() \ + (ProcessDataLock.OwningThread == NtCurrentTeb()->ClientId.UniqueThread) + extern NTSTATUS CallProcessInherit(PCSR_PROCESS, PCSR_PROCESS); extern NTSTATUS CallProcessDeleted(PCSR_PROCESS); /* GLOBALS *******************************************************************/ -static ULONG NrProcess; -PCSR_PROCESS ProcessData[256]; -RTL_CRITICAL_SECTION ProcessDataLock; +RTL_CRITICAL_SECTION ProcessDataLock, CsrWaitListsLock; extern PCSR_PROCESS CsrRootProcess; extern LIST_ENTRY CsrThreadHashTable[256]; +extern ULONG CsrTotalPerProcessDataLength; +LONG CsrProcessSequenceCount = 5; /* FUNCTIONS *****************************************************************/ -VOID WINAPI CsrInitProcessData(VOID) -{ +/*++ + * @name CsrAllocateProcess + * @implemented NT4 + * + * The CsrAllocateProcess routine allocates a new CSR Process object. + * + * @return Pointer to the newly allocated CSR Process. + * + * @remarks None. + * + *--*/ +PCSR_PROCESS +NTAPI +CsrAllocateProcess(VOID) +{ + PCSR_PROCESS CsrProcess; + ULONG TotalSize; + + /* Calculate the amount of memory this should take */ + TotalSize = sizeof(CSR_PROCESS) + + (CSR_SERVER_DLL_MAX * sizeof(PVOID)) + + CsrTotalPerProcessDataLength; + + /* Allocate a Process */ + CsrProcess = RtlAllocateHeap(CsrHeap, HEAP_ZERO_MEMORY, TotalSize); + if (!CsrProcess) return NULL; + + /* Handle the Sequence Number and protect against overflow */ + CsrProcess->SequenceNumber = CsrProcessSequenceCount++; + if (CsrProcessSequenceCount < 5) CsrProcessSequenceCount = 5; + + /* Increase the reference count */ + CsrProcess->ReferenceCount++; + + /* Initialize the Thread List */ + InitializeListHead(&CsrProcess->ThreadList); + + /* Return the Process */ + return CsrProcess; +} + +/*++ + * @name CsrLockedReferenceProcess + * + * The CsrLockedReferenceProcess refences a CSR Process while the + * Process Lock is already being held. + * + * @param CsrProcess + * Pointer to the CSR Process to be referenced. + * + * @return None. + * + * @remarks This routine will return with the Process Lock held. + * + *--*/ +VOID +NTAPI +CsrLockedReferenceProcess(IN PCSR_PROCESS CsrProcess) +{ + /* Increment the reference count */ + ++CsrProcess->ReferenceCount; +} + +/*++ + * @name CsrServerInitialization + * @implemented NT4 + * + * The CsrInitializeProcessStructure routine sets up support for CSR Processes + * and CSR Threads. + * + * @param None. + * + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL + * othwerwise. + * + * @remarks None. + * + *--*/ +NTSTATUS +NTAPI +CsrInitializeProcessStructure(VOID) +{ + NTSTATUS Status; ULONG i; - RtlZeroMemory (ProcessData, sizeof ProcessData); - NrProcess = sizeof ProcessData / sizeof ProcessData[0]; - RtlInitializeCriticalSection( &ProcessDataLock ); + + /* Initialize the Lock */ + Status = RtlInitializeCriticalSection(&ProcessDataLock); + if (!NT_SUCCESS(Status)) return Status; + + /* Set up the Root Process */ + CsrRootProcess = CsrAllocateProcess(); + if (!CsrRootProcess) return STATUS_NO_MEMORY; + + /* Set up the minimal information for it */ + InitializeListHead(&CsrRootProcess->ListLink); + CsrRootProcess->ProcessHandle = (HANDLE)-1; + CsrRootProcess->ClientId = NtCurrentTeb()->ClientId; + + /* Initialize the Thread Hash List */ + for (i = 0; i < 256; i++) InitializeListHead(&CsrThreadHashTable[i]); + + /* Initialize the Wait Lock */ + return RtlInitializeCriticalSection(&CsrWaitListsLock); +} + +/*++ + * @name CsrDeallocateProcess + * + * The CsrDeallocateProcess frees the memory associated with a CSR Process. + * + * @param CsrProcess + * Pointer to the CSR Process to be freed. + * + * @return None. + * + * @remarks Do not call this routine. It is reserved for the internal + * thread management routines when a CSR Process has been cleanly + * dereferenced and killed. + * + *--*/ +VOID +NTAPI +CsrDeallocateProcess(IN PCSR_PROCESS CsrProcess) +{ + /* Free the process object from the heap */ + RtlFreeHeap(CsrHeap, 0, CsrProcess); +} + +/*++ + * @name CsrRemoveProcess + * + * The CsrRemoveProcess function undoes a CsrInsertProcess operation and + * removes the CSR Process from the Process List and notifies Server DLLs + * of this removal. + * + * @param CsrProcess + * Pointer to the CSR Process to remove. + * + * @return None. + * + * @remarks None. + * + *--*/ +VOID +NTAPI +CsrRemoveProcess(IN PCSR_PROCESS CsrProcess) +{ +#if 0 + PCSR_SERVER_DLL ServerDll; + ULONG i; +#endif + ASSERT(ProcessStructureListLocked()); + + /* Remove us from the Process List */ + RemoveEntryList(&CsrProcess->ListLink); + + /* Release the lock */ + CsrReleaseProcessLock(); +#if 0 + /* Loop every Server DLL */ + for (i = 0; i < CSR_SERVER_DLL_MAX; i++) + { + /* Get the Server DLL */ + ServerDll = CsrLoadedServerDll[i]; + + /* Check if it's valid and if it has a Disconnect Callback */ + if (ServerDll && ServerDll->DisconnectCallback) + { + /* Call it */ + (ServerDll->DisconnectCallback)(CsrProcess); + } + } +#endif +} + +/*++ + * @name CsrInsertProcess + * + * The CsrInsertProcess routine inserts a CSR Process into the Process List + * and notifies Server DLLs of the creation of a new CSR Process. + * + * @param Parent + * Optional pointer to the CSR Process creating this CSR Process. + * + * @param CurrentProcess + * Optional pointer to the current CSR Process. + * + * @param CsrProcess + * Pointer to the CSR Process which is to be inserted. + * + * @return None. + * + * @remarks None. + * + *--*/ +VOID +NTAPI +CsrInsertProcess(IN PCSR_PROCESS Parent OPTIONAL, + IN PCSR_PROCESS CurrentProcess OPTIONAL, + IN PCSR_PROCESS CsrProcess) +{ +#if 0 + PCSR_SERVER_DLL ServerDll; + ULONG i; +#endif + ASSERT(ProcessStructureListLocked()); + + /* Set the parent */ + CsrProcess->Parent = Parent; + + /* Insert it into the Root List */ + InsertTailList(&CsrRootProcess->ListLink, &CsrProcess->ListLink); +#if 0 + /* Notify the Server DLLs */ + for (i = 0; i < CSR_SERVER_DLL_MAX; i++) + { + /* Get the current Server DLL */ + ServerDll = CsrLoadedServerDll[i]; + + /* Make sure it's valid and that it has callback */ + if ((ServerDll) && (ServerDll->NewProcessCallback)) + { + ServerDll->NewProcessCallback(CurrentProcess, CsrProcess); + } + } +#endif +} + +/*++ + * @name CsrLockProcessByClientId + * @implemented NT4 + * + * The CsrLockProcessByClientId routine locks the CSR Process corresponding + * to the given Process ID and optionally returns it. + * + * @param Pid + * Process ID corresponding to the CSR Process which will be locked. + * + * @param CsrProcess + * Optional pointer to a CSR Process pointer which will hold the + * CSR Process corresponding to the given Process ID. + * + * @return STATUS_SUCCESS in case of success, STATUS_UNSUCCESSFUL + * othwerwise. + * + * @remarks Locking a CSR Process is defined as acquiring an extra + * reference to it and returning with the Process Lock held. + * + *--*/ +NTSTATUS +NTAPI +CsrLockProcessByClientId(IN HANDLE Pid, + OUT PCSR_PROCESS *CsrProcess) +{ + PLIST_ENTRY NextEntry; + PCSR_PROCESS CurrentProcess = NULL; + + /* Acquire the lock */ + CsrAcquireProcessLock(); + + /* Assume failure */ + ASSERT(CsrProcess != NULL); + *CsrProcess = NULL; + + /* Setup the List Pointers */ + NextEntry = CsrRootProcess->ListLink.Flink; + while (NextEntry != &CsrRootProcess->ListLink) + { + /* Get the Process */ + CurrentProcess = CONTAINING_RECORD(NextEntry, CSR_PROCESS, ListLink); + + /* Check for PID Match */ + if (CurrentProcess->ClientId.UniqueProcess == Pid) break; + + /* Next entry */ + NextEntry = NextEntry->Flink; + } + + /* Check if we didn't find it in the list */ + if (NextEntry == &CsrRootProcess->ListLink) + { + /* Nothing found, release the lock */ + CsrReleaseProcessLock(); + return STATUS_UNSUCCESSFUL; + } + + /* Lock the found process and return it */ + CsrLockedReferenceProcess(CurrentProcess); + *CsrProcess = CurrentProcess; + return STATUS_SUCCESS; +} + +PCSR_PROCESS WINAPI CsrGetProcessData(HANDLE ProcessId) +{ + PCSR_PROCESS CsrProcess; + NTSTATUS Status; + + Status = CsrLockProcessByClientId(ProcessId, &CsrProcess); + if (!NT_SUCCESS(Status)) return NULL; + + UNLOCK; + return CsrProcess; +} + +PCSR_PROCESS WINAPI CsrCreateProcessData(HANDLE ProcessId) +{ + PCSR_PROCESS pProcessData; + OBJECT_ATTRIBUTES ObjectAttributes; + CLIENT_ID ClientId; + NTSTATUS Status; + + LOCK; - CsrRootProcess = CsrCreateProcessData(NtCurrentTeb()->ClientId.UniqueProcess); - - /* Initialize the Thread Hash List */ - for (i = 0; i < 256; i++) InitializeListHead(&CsrThreadHashTable[i]); -} - -PCSR_PROCESS WINAPI CsrGetProcessData(HANDLE ProcessId) -{ - ULONG hash; - PCSR_PROCESS pProcessData; - - hash = ((ULONG_PTR)ProcessId >> 2) % (sizeof(ProcessData) / sizeof(*ProcessData)); - - LOCK; - - pProcessData = ProcessData[hash]; - - while (pProcessData && pProcessData->ClientId.UniqueProcess != ProcessId) - { - pProcessData = pProcessData->next; - } - UNLOCK; - return pProcessData; -} - -PCSR_PROCESS WINAPI CsrCreateProcessData(HANDLE ProcessId) -{ - ULONG hash; - PCSR_PROCESS pProcessData; - OBJECT_ATTRIBUTES ObjectAttributes; - CLIENT_ID ClientId; - NTSTATUS Status; - - hash = ((ULONG_PTR)ProcessId >> 2) % (sizeof(ProcessData) / sizeof(*ProcessData)); - - LOCK; - - pProcessData = ProcessData[hash]; - - while (pProcessData && pProcessData->ClientId.UniqueProcess != ProcessId) - { - pProcessData = pProcessData->next; - } - if (pProcessData == NULL) - { - pProcessData = RtlAllocateHeap(CsrHeap, - HEAP_ZERO_MEMORY, - sizeof(CSR_PROCESS)); - if (pProcessData) - { - pProcessData->ClientId.UniqueProcess = ProcessId; - pProcessData->next = ProcessData[hash]; - ProcessData[hash] = pProcessData; - - ClientId.UniqueThread = NULL; - ClientId.UniqueProcess = pProcessData->ClientId.UniqueProcess; - InitializeObjectAttributes(&ObjectAttributes, - NULL, - 0, - NULL, - NULL); - - /* using OpenProcess is not optimal due to HANDLE vs. DWORD PIDs... */ - Status = NtOpenProcess(&pProcessData->ProcessHandle, - PROCESS_ALL_ACCESS, - &ObjectAttributes, - &ClientId); - DPRINT("CSR Process: %p Handle: %p\n", pProcessData, pProcessData->ProcessHandle); - if (!NT_SUCCESS(Status)) - { - ProcessData[hash] = pProcessData->next; - RtlFreeHeap(CsrHeap, 0, pProcessData); - pProcessData = NULL; - } - else - { - RtlInitializeCriticalSection(&pProcessData->HandleTableLock); - } - } - } - else - { - DPRINT1("Process data for pid %d already exist\n", ProcessId); - } - UNLOCK; - if (pProcessData == NULL) - { - DPRINT1("CsrCreateProcessData() failed\n"); - } - else - { - pProcessData->Flags = ~CsrProcessTerminated; - - /* Set default shutdown parameters */ - pProcessData->ShutdownLevel = 0x280; - pProcessData->ShutdownFlags = 0; - } - - pProcessData->ThreadCount = 0; - InitializeListHead(&pProcessData->ThreadList); - return pProcessData; + pProcessData = CsrAllocateProcess(); + ASSERT(pProcessData != NULL); + + pProcessData->ClientId.UniqueProcess = ProcessId; + + ClientId.UniqueThread = NULL; + ClientId.UniqueProcess = pProcessData->ClientId.UniqueProcess; + InitializeObjectAttributes(&ObjectAttributes, + NULL, + 0, + NULL, + NULL); + + /* using OpenProcess is not optimal due to HANDLE vs. DWORD PIDs... */ + Status = NtOpenProcess(&pProcessData->ProcessHandle, + PROCESS_ALL_ACCESS, + &ObjectAttributes, + &ClientId); + DPRINT("CSR Process: %p Handle: %p\n", pProcessData, pProcessData->ProcessHandle); + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed\n"); + CsrDeallocateProcess(pProcessData); + CsrReleaseProcessLock(); + return NULL; + } + else + { + RtlInitializeCriticalSection(&pProcessData->HandleTableLock); + } + + /* Set default shutdown parameters */ + pProcessData->ShutdownLevel = 0x280; + pProcessData->ShutdownFlags = 0; + + /* Insert the Process */ + CsrInsertProcess(NULL, NULL, pProcessData); + + /* Release lock and return */ + CsrReleaseProcessLock(); + return pProcessData; } NTSTATUS WINAPI CsrFreeProcessData(HANDLE Pid) { - ULONG hash; - PCSR_PROCESS pProcessData, *pPrevLink; - HANDLE Process; - PLIST_ENTRY NextEntry; - PCSR_THREAD Thread; - - hash = ((ULONG_PTR)Pid >> 2) % (sizeof(ProcessData) / sizeof(*ProcessData)); - pPrevLink = &ProcessData[hash]; - - LOCK; - - while ((pProcessData = *pPrevLink) && pProcessData->ClientId.UniqueProcess != Pid) - { - pPrevLink = &pProcessData->next; - } - - if (pProcessData) - { - DPRINT("CsrFreeProcessData pid: %d\n", Pid); - Process = pProcessData->ProcessHandle; - CallProcessDeleted(pProcessData); - - /* Dereference all process threads */ - NextEntry = pProcessData->ThreadList.Flink; - while (NextEntry != &pProcessData->ThreadList) - { + PCSR_PROCESS pProcessData; + HANDLE Process; + PLIST_ENTRY NextEntry; + PCSR_THREAD Thread; + + pProcessData = CsrGetProcessData(Pid); + if (!pProcessData) return STATUS_INVALID_PARAMETER; + + LOCK; + + Process = pProcessData->ProcessHandle; + CallProcessDeleted(pProcessData); + + /* Dereference all process threads */ + NextEntry = pProcessData->ThreadList.Flink; + while (NextEntry != &pProcessData->ThreadList) + { Thread = CONTAINING_RECORD(NextEntry, CSR_THREAD, Link); NextEntry = NextEntry->Flink; CsrThreadRefcountZero(Thread); - } - - if (pProcessData->ClientViewBase) - { - NtUnmapViewOfSection(NtCurrentProcess(), (PVOID)pProcessData->ClientViewBase); - } - - if (pProcessData->ClientPort) - { - NtClose(pProcessData->ClientPort); - } - - *pPrevLink = pProcessData->next; - - RtlFreeHeap(CsrHeap, 0, pProcessData); - UNLOCK; - if (Process) - { - NtClose(Process); - } - return STATUS_SUCCESS; - } - - UNLOCK; - return STATUS_INVALID_PARAMETER; + } + + if (pProcessData->ClientViewBase) + { + NtUnmapViewOfSection(NtCurrentProcess(), (PVOID)pProcessData->ClientViewBase); + } + + if (pProcessData->ClientPort) + { + NtClose(pProcessData->ClientPort); + } + + CsrRemoveProcess(pProcessData); + + CsrDeallocateProcess(pProcessData); + + if (Process) + { + NtClose(Process); + } + + return STATUS_SUCCESS; } /********************************************************************** @@ -251,12 +488,7 @@ CurrentThread = NtCurrentTeb()->CsrClientThread; CsrProcess = CurrentThread->Process; -// DPRINT1("Current thread: %p %p\n", CurrentThread, CsrProcess); -// DPRINT1("Request CID: %lx %lx %lx\n", -// CsrProcess->ClientId.UniqueProcess, -// NtCurrentTeb()->ClientId.UniqueProcess, - // Request->Data.CreateThreadRequest.ClientId.UniqueProcess); - + if (CsrProcess->ClientId.UniqueProcess != Request->Data.CreateThreadRequest.ClientId.UniqueProcess) { if (Request->Data.CreateThreadRequest.ClientId.UniqueProcess == NtCurrentTeb()->ClientId.UniqueProcess) @@ -266,15 +498,9 @@ Status = CsrLockProcessByClientId(Request->Data.CreateThreadRequest.ClientId.UniqueProcess, &CsrProcess); - // DPRINT1("Found matching process: %p\n", CsrProcess); if (!NT_SUCCESS(Status)) return Status; } -// DPRINT1("PIDs: %lx %lx\n", CurrentThread->Process->ClientId.UniqueProcess, CsrProcess->ClientId.UniqueProcess); -// DPRINT1("Thread handle is: %lx Process Handle is: %lx %lx\n", - // Request->Data.CreateThreadRequest.ThreadHandle, - // CurrentThread->Process->ProcessHandle, - // CsrProcess->Process); Status = NtDuplicateObject(CsrProcess->ProcessHandle, Request->Data.CreateThreadRequest.ThreadHandle, NtCurrentProcess(), @@ -282,7 +508,6 @@ 0, 0, DUPLICATE_SAME_ACCESS); - //DPRINT1("Duplicate status: %lx\n", Status); if (!NT_SUCCESS(Status)) { Status = NtDuplicateObject(CurrentThread->Process->ProcessHandle, @@ -292,7 +517,6 @@ 0, 0, DUPLICATE_SAME_ACCESS); - // DPRINT1("Duplicate status: %lx\n", Status); } Status = STATUS_SUCCESS; // hack @@ -301,7 +525,6 @@ Status = CsrCreateThread(CsrProcess, ThreadHandle, &Request->Data.CreateThreadRequest.ClientId); - // DPRINT1("Create status: %lx\n", Status); } if (CsrProcess != CurrentThread->Process) CsrReleaseProcessLock(); Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Thu Feb 16 03:41:18 2012 @@ -1117,6 +1117,15 @@ return Status; } + /* Set up Process Support */ + Status = CsrInitializeProcessStructure(); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CSRSRV:%s: CsrInitializeProcessStructure failed (Status=%08lx)\n", + __FUNCTION__, Status); + return Status; + } + /* Parse the command line */ Status = CsrParseServerCommandLine(ArgumentCount, Arguments); if (!NT_SUCCESS(Status)) @@ -1125,8 +1134,6 @@ __FUNCTION__, Status); return Status; } - - CsrInitProcessData(); Status = CsrApiRegisterDefinitions(NativeDefinitions); if (!NT_SUCCESS(Status)) Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c [iso-8859-1] Thu Feb 16 03:41:18 2012 @@ -23,7 +23,6 @@ /* GLOBALS ********************************************************************/ extern RTL_CRITICAL_SECTION ProcessDataLock; -extern PCSR_PROCESS ProcessData[256]; PCSR_PROCESS CsrRootProcess; SECURITY_QUALITY_OF_SERVICE CsrSecurityQos = { @@ -225,63 +224,63 @@ NTAPI FindProcessForShutdown(IN PLUID CallerLuid) { - ULONG Hash; PCSR_PROCESS CsrProcess, ReturnCsrProcess = NULL; NTSTATUS Status; ULONG Level = 0; LUID ProcessLuid; LUID SystemLuid = SYSTEM_LUID; BOOLEAN IsSystemLuid = FALSE, IsOurLuid = FALSE; - - for (Hash = 0; Hash < (sizeof(ProcessData) / sizeof(*ProcessData)); Hash++) - { - /* Get this process hash bucket */ - CsrProcess = ProcessData[Hash]; - while (CsrProcess) - { - /* Skip this process if it's already been processed*/ - if (CsrProcess->Flags & CsrProcessSkipShutdown) goto Next; + PLIST_ENTRY NextEntry; + + /* Set the List Pointers */ + NextEntry = CsrRootProcess->ListLink.Flink; + while (NextEntry != &CsrRootProcess->ListLink) + { + /* Get the process */ + CsrProcess = CONTAINING_RECORD(NextEntry, CSR_PROCESS, ListLink); + + /* Move to the next entry */ + NextEntry = NextEntry->Flink; - /* Get the LUID of this Process */ - Status = CsrGetProcessLuid(CsrProcess->ProcessHandle, &ProcessLuid); - - /* Check if we didn't get access to the LUID */ - if (Status == STATUS_ACCESS_DENIED) - { - /* FIXME:Check if we have any threads */ - } - - if (!NT_SUCCESS(Status)) - { - /* We didn't have access, so skip it */ - CsrProcess->Flags |= CsrProcessSkipShutdown; - goto Next; - } - - /* Check if this is the System LUID */ - if ((IsSystemLuid = RtlEqualLuid(&ProcessLuid, &SystemLuid))) - { - /* Mark this process */ - CsrProcess->ShutdownFlags |= CsrShutdownSystem; - } - else if (!(IsOurLuid = RtlEqualLuid(&ProcessLuid, CallerLuid))) - { - /* Our LUID doesn't match with the caller's */ - CsrProcess->ShutdownFlags |= CsrShutdownOther; - } - - /* Check if we're past the previous level */ - if (CsrProcess->ShutdownLevel > Level) - { - /* Update the level */ - Level = CsrProcess->ShutdownLevel; - - /* Set the final process */ - ReturnCsrProcess = CsrProcess; - } -Next: - /* Next process */ - CsrProcess = CsrProcess->next; + /* Skip this process if it's already been processed */ + if (CsrProcess->Flags & CsrProcessSkipShutdown) continue; + + /* Get the LUID of this Process */ + Status = CsrGetProcessLuid(CsrProcess->ProcessHandle, &ProcessLuid); + + /* Check if we didn't get access to the LUID */ + if (Status == STATUS_ACCESS_DENIED) + { + /* FIXME:Check if we have any threads */ + } + + if (!NT_SUCCESS(Status)) + { + /* We didn't have access, so skip it */ + CsrProcess->Flags |= CsrProcessSkipShutdown; + continue; + } + + /* Check if this is the System LUID */ + if ((IsSystemLuid = RtlEqualLuid(&ProcessLuid, &SystemLuid))) + { + /* Mark this process */ + CsrProcess->ShutdownFlags |= CsrShutdownSystem; + } + else if (!(IsOurLuid = RtlEqualLuid(&ProcessLuid, CallerLuid))) + { + /* Our LUID doesn't match with the caller's */ + CsrProcess->ShutdownFlags |= CsrShutdownOther; + } + + /* Check if we're past the previous level */ + if (CsrProcess->ShutdownLevel > Level) + { + /* Update the level */ + Level = CsrProcess->ShutdownLevel; + + /* Set the final process */ + ReturnCsrProcess = CsrProcess; } } @@ -306,28 +305,27 @@ PCSR_PROCESS CsrProcess = NULL; NTSTATUS Status = STATUS_UNSUCCESSFUL; BOOLEAN FirstTry; + PLIST_ENTRY NextEntry; ULONG Result = 0; - ULONG Hash; /* Acquire process lock */ CsrAcquireProcessLock(); - - /* Start the loop */ - for (Hash = 0; Hash < (sizeof(ProcessData) / sizeof(*ProcessData)); Hash++) + + /* Get the list pointers */ + NextEntry = CsrRootProcess->ListLink.Flink; + while (NextEntry != &CsrRootProcess->ListLink) { /* Get the Process */ - CsrProcess = ProcessData[Hash]; - while (CsrProcess) - { - /* Remove the skip flag, set shutdown flags to 0*/ - CsrProcess->Flags &= ~CsrProcessSkipShutdown; - CsrProcess->ShutdownFlags = 0; - - /* Move to the next */ - CsrProcess = CsrProcess->next; - } - } - + CsrProcess = CONTAINING_RECORD(NextEntry, CSR_PROCESS, ListLink); + + /* Remove the skip flag, set shutdown flags to 0*/ + CsrProcess->Flags &= ~CsrProcessSkipShutdown; + CsrProcess->ShutdownFlags = 0; + + /* Move to the next */ + NextEntry = NextEntry->Flink; + } + /* Set shudown Priority */ CsrSetToShutdownPriority(); @@ -390,48 +388,6 @@ NTSTATUS NTAPI -CsrLockProcessByClientId(IN HANDLE Pid, - OUT PCSR_PROCESS *CsrProcess OPTIONAL) -{ - ULONG Hash; - PCSR_PROCESS CurrentProcess = NULL; - NTSTATUS Status = STATUS_UNSUCCESSFUL; - - /* Acquire the lock */ - CsrAcquireProcessLock(); - - /* Start the loop */ - for (Hash = 0; Hash < (sizeof(ProcessData) / sizeof(*ProcessData)); Hash++) - { - /* Get the Process */ - CurrentProcess = ProcessData[Hash]; - while (CurrentProcess) - { - /* Check for PID match */ - if (CurrentProcess->ClientId.UniqueProcess == Pid) - { - /* Get out of here with success */ -// DPRINT1("Found %p for PID %lx\n", CurrentProcess, Pid); - Status = STATUS_SUCCESS; - goto Found; - } - - /* Move to the next */ - CurrentProcess = CurrentProcess->next; - } - } - - /* Nothing found, release the lock */ -Found: - if (!CurrentProcess) CsrReleaseProcessLock(); - - /* Return the status and process */ - if (CsrProcess) *CsrProcess = CurrentProcess; - return Status; -} - -NTSTATUS -NTAPI CsrUnlockProcess(IN PCSR_PROCESS CsrProcess) { /* Dereference the process */ Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Thu Feb 16 03:41:18 2012 @@ -84,7 +84,6 @@ ULONG ShutdownLevel; ULONG ShutdownFlags; // PVOID ServerData[ANYSIZE_ARRAY]; - struct _CSR_PROCESS* next; CSRSS_CON_PROCESS_DATA; } CSR_PROCESS, *PCSR_PROCESS; @@ -154,7 +153,7 @@ /* api/process.c */ typedef NTSTATUS (WINAPI *CSRSS_ENUM_PROCESS_PROC)(PCSR_PROCESS ProcessData, PVOID Context); -VOID WINAPI CsrInitProcessData(VOID); +NTSTATUS WINAPI CsrInitializeProcessStructure(VOID); PCSR_PROCESS WINAPI CsrGetProcessData(HANDLE ProcessId); PCSR_PROCESS WINAPI CsrCreateProcessData(HANDLE ProcessId); NTSTATUS WINAPI CsrFreeProcessData( HANDLE Pid );

1 0

[ion] 55623: [CSRSRV2]: Formatting fix.
by ion＠svn.reactos.org 16 Feb '12

16 Feb '12

Author: ion Date: Thu Feb 16 03:38:21 2012 New Revision: 55623 URL: http://svn.reactos.org/svn/reactos?rev=55623&view=rev Log: [CSRSRV2]: Formatting fix. Modified: trunk/reactos/subsystems/csr/csrsrv/process.c Modified: trunk/reactos/subsystems/csr/csrsrv/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/proc… ============================================================================== --- trunk/reactos/subsystems/csr/csrsrv/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/csr/csrsrv/process.c [iso-8859-1] Thu Feb 16 03:38:21 2012 @@ -249,9 +249,9 @@ ServerDll = CsrLoadedServerDll[i]; /* Make sure it's valid and that it has callback */ - if (ServerDll && ServerDll->NewProcessCallback) + if ((ServerDll) && (ServerDll->NewProcessCallback)) { - (*ServerDll->NewProcessCallback)(CurrentProcess, CsrProcess); + ServerDll->NewProcessCallback(CurrentProcess, CsrProcess); } } }

1 0

[ion] 55622: [CSRSRV]: Fix \Local symbolic link. Thanks to vicmarcal (and the new awesome testman).
by ion＠svn.reactos.org 16 Feb '12

16 Feb '12

Author: ion Date: Thu Feb 16 01:27:11 2012 New Revision: 55622 URL: http://svn.reactos.org/svn/reactos?rev=55622&view=rev Log: [CSRSRV]: Fix \Local symbolic link. Thanks to vicmarcal (and the new awesome testman). Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Thu Feb 16 01:27:11 2012 @@ -650,7 +650,7 @@ /* Make local point back to \Sessions\x\BNO */ RtlInitUnicodeString(&DirectoryName, L"Local"); - RtlInitUnicodeString(&SymlinkName, Buffer); + ASSERT(SessionId == 0); InitializeObjectAttributes(&ObjectAttributes, &DirectoryName, OBJ_OPENIF | OBJ_PERMANENT | OBJ_CASE_INSENSITIVE,

1 0

[khornicek] 55621: [ROSAUTOTEST] Some bug fixing.
by khornicek＠svn.reactos.org 16 Feb '12

16 Feb '12

Author: khornicek Date: Thu Feb 16 00:52:20 2012 New Revision: 55621 URL: http://svn.reactos.org/svn/reactos?rev=55621&view=rev Log: [ROSAUTOTEST] Some bug fixing. Modified: trunk/rostests/rosautotest/tools.cpp Modified: trunk/rostests/rosautotest/tools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/tools.cpp?rev… ============================================================================== --- trunk/rostests/rosautotest/tools.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/tools.cpp [iso-8859-1] Thu Feb 16 00:52:20 2012 @@ -119,10 +119,10 @@ /* Try to print whole lines but obey the 512 bytes chunk size limit*/ if(NewString[curr_pos - 1] == '\n' || (curr_pos - start) == DBGPRINT_BUFSIZE) { - if((curr_pos - start) > DBGPRINT_BUFSIZE || NewString[curr_pos - 1] != '\n') + if((curr_pos - start) >= DBGPRINT_BUFSIZE) { - /* No newlines, print what we have and start over*/ - if(NewString[curr_pos - 1] != '\n') + /* No newlines so far, or the string just fits */ + if(last_newline <= start || (curr_pos - start) == DBGPRINT_BUFSIZE) { size = curr_pos - start; memcpy(DbgString, NewString.c_str() + start, size);

1 0

[ion] 55620: [CSRSRV]: Add a new linked list for console processes, as ListLink is used for all CSR_PROCESSes.
by ion＠svn.reactos.org 15 Feb '12

15 Feb '12

Author: ion Date: Wed Feb 15 22:15:33 2012 New Revision: 55620 URL: http://svn.reactos.org/svn/reactos?rev=55620&view=rev Log: [CSRSRV]: Add a new linked list for console processes, as ListLink is used for all CSR_PROCESSes. Modified: trunk/reactos/subsystems/win32/csrss/include/api.h trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c trunk/reactos/subsystems/win32/csrss/win32csr/console.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c trunk/reactos/subsystems/win32/csrss/win32csr/handle.c Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Wed Feb 15 22:15:33 2012 @@ -55,6 +55,7 @@ ULONG HandleTableSize; struct _CSRSS_HANDLE *HandleTable; PCONTROLDISPATCHER CtrlDispatcher; + LIST_ENTRY ConsoleLink; } CSRSS_CON_PROCESS_DATA, *PCSRSS_CON_PROCESS_DATA; typedef struct _CSR_PROCESS Modified: trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c [iso-8859-1] Wed Feb 15 22:15:33 2012 @@ -373,7 +373,7 @@ current_entry = Console->ProcessList.Flink; while (current_entry != &Console->ProcessList) { - current = CONTAINING_RECORD(current_entry, CSR_PROCESS, ListLink); + current = CONTAINING_RECORD(current_entry, CSR_PROCESS, ConsoleLink); current_entry = current_entry->Flink; ConioConsoleCtrlEvent((DWORD)CTRL_C_EVENT, current); } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1] Wed Feb 15 22:15:33 2012 @@ -215,7 +215,7 @@ /* initialize list head */ InitializeListHead(&Console->ProcessList); /* insert process data required for GUI initialization */ - InsertHeadList(&Console->ProcessList, &ProcessData->ListLink); + InsertHeadList(&Console->ProcessList, &ProcessData->ConsoleLink); /* Initialize the Console */ Status = CsrInitConsole(Console, Request->Data.AllocConsoleRequest.ShowCmd); if (!NT_SUCCESS(Status)) @@ -307,7 +307,7 @@ if (!NewConsole) { /* Insert into the list if it has not been added */ - InsertHeadList(&ProcessData->Console->ProcessList, &ProcessData->ListLink); + InsertHeadList(&ProcessData->Console->ProcessList, &ProcessData->ConsoleLink); } RtlLeaveCriticalSection(&ProcessData->HandleTableLock); @@ -786,7 +786,7 @@ current_entry != &Console->ProcessList; current_entry = current_entry->Flink) { - current = CONTAINING_RECORD(current_entry, CSR_PROCESS, ListLink); + current = CONTAINING_RECORD(current_entry, CSR_PROCESS, ConsoleLink); if (++nItems <= Request->Data.GetProcessListRequest.nMaxIds) { *Buffer++ = HandleToUlong(current->ClientId.UniqueProcess); @@ -822,7 +822,7 @@ current_entry != &Console->ProcessList; current_entry = current_entry->Flink) { - current = CONTAINING_RECORD(current_entry, CSR_PROCESS, ListLink); + current = CONTAINING_RECORD(current_entry, CSR_PROCESS, ConsoleLink); if (Group == 0 || current->ProcessGroupId == Group) { ConioConsoleCtrlEvent(Request->Data.GenerateCtrlEvent.Event, current); Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Wed Feb 15 22:15:33 2012 @@ -400,7 +400,7 @@ DPRINT("GuiConsoleWriteUserSettings: No Process!!!\n"); return; } - ProcessData = CONTAINING_RECORD(Console->ProcessList.Flink, CSR_PROCESS, ListLink); + ProcessData = CONTAINING_RECORD(Console->ProcessList.Flink, CSR_PROCESS, ConsoleLink); if (!GuiConsoleOpenUserSettings(GuiData, PtrToUlong(ProcessData->ClientId.UniqueProcess), &hKey, KEY_READ | KEY_WRITE, TRUE)) { return; @@ -704,7 +704,7 @@ GuiConsoleUseDefaults(Console, GuiData, Console->ActiveBuffer); if (Console->ProcessList.Flink != &Console->ProcessList) { - ProcessData = CONTAINING_RECORD(Console->ProcessList.Flink, CSR_PROCESS, ListLink); + ProcessData = CONTAINING_RECORD(Console->ProcessList.Flink, CSR_PROCESS, ConsoleLink); if (GuiConsoleOpenUserSettings(GuiData, PtrToUlong(ProcessData->ClientId.UniqueProcess), &hKey, KEY_READ, FALSE)) { GuiConsoleReadUserSettings(hKey, Console, GuiData, Console->ActiveBuffer); @@ -1272,7 +1272,7 @@ current_entry = Console->ProcessList.Flink; while (current_entry != &Console->ProcessList) { - current = CONTAINING_RECORD(current_entry, CSR_PROCESS, ListLink); + current = CONTAINING_RECORD(current_entry, CSR_PROCESS, ConsoleLink); current_entry = current_entry->Flink; /* FIXME: Windows will wait up to 5 seconds for the thread to exit. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/handle.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/handle.c [iso-8859-1] Wed Feb 15 22:15:33 2012 @@ -154,7 +154,7 @@ { ProcessData->Console = NULL; EnterCriticalSection(&Console->Lock); - RemoveEntryList(&ProcessData->ListLink); + RemoveEntryList(&ProcessData->ConsoleLink); LeaveCriticalSection(&Console->Lock); if (_InterlockedDecrement(&Console->ReferenceCount) == 0) ConioDeleteConsole(&Console->Header);

1 0

[tkreuzer] 55619: [COMDLG32] Really fix msvc build
by tkreuzer＠svn.reactos.org 15 Feb '12

15 Feb '12

Author: tkreuzer Date: Wed Feb 15 21:57:13 2012 New Revision: 55619 URL: http://svn.reactos.org/svn/reactos?rev=55619&view=rev Log: [COMDLG32] Really fix msvc build Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Ru.rc Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Ru.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Ru… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_Ru.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_Ru.rc [iso-8859-1] Wed Feb 15 21:57:13 2012 @@ -55,7 +55,7 @@ PD32_VALUE_UREADABLE "ÐÐµÑÐ¸ÑÐ°ÐµÐ¼ÑÐ¹ ÑÐ»ÐµÐ¼ÐµÐ½Ñ" PD32_INVALID_PAGE_RANGE "ÐÑÐ¾ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð½Ðµ Ð»ÐµÐ¶Ð¸Ñ Ð²Ð½ÑÑÑÐ¸ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½Ð° ÑÑÑÐ°Ð½Ð¸Ñ.\n\ ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ðµ Ð¼ÐµÐ¶Ð´Ñ %1!%d! Ð¸ %2!d!." - PD32_FROM_NOT_ABOVE_TO "ÐÐ½Ð°ÑÐµÐ½Ð¸Ðµ \"Ð¾Ñ\" Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð¿ÑÐµÐ²ÑÑÐ°ÑÑ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ \"Ð´Ð¾\"." + PD32_FROM_NOT_ABOVE_TO "ÐÐ½Ð°ÑÐµÐ½Ð¸Ðµ 'Ð¾Ñ' Ð½Ðµ Ð´Ð¾Ð»Ð¶Ð½Ð¾ Ð¿ÑÐµÐ²ÑÑÐ°ÑÑ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ 'Ð´Ð¾'." PD32_MARGINS_OVERLAP "ÐÑÐ°Ð½Ð¸ÑÑ Ð¿ÐµÑÐµÐºÑÑÐ²Ð°ÑÑ Ð¸Ð»Ð¸ Ð¿ÑÐµÐ²ÑÑÐ°ÑÑ ÑÐ°Ð·Ð¼ÐµÑÑ Ð±ÑÐ¼Ð°Ð³Ð¸.\n\ ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð¸Ñ Ð·Ð°Ð½Ð¾Ð²Ð¾." PD32_NR_OF_COPIES_EMPTY "Ð§Ð¸ÑÐ»Ð¾ ÐºÐ¾Ð¿Ð¸Ð¹ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¿ÑÑÑÑÐ¼."

1 0

[khornicek] 55618: [ROSAUTOTEST] Try to print whole lines so the output from tests doesn't get mixed with debug output from other reactos components.
by khornicek＠svn.reactos.org 15 Feb '12

15 Feb '12

Author: khornicek Date: Wed Feb 15 21:18:13 2012 New Revision: 55618 URL: http://svn.reactos.org/svn/reactos?rev=55618&view=rev Log: [ROSAUTOTEST] Try to print whole lines so the output from tests doesn't get mixed with debug output from other reactos components. Modified: trunk/rostests/rosautotest/tools.cpp Modified: trunk/rostests/rosautotest/tools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/tools.cpp?rev… ============================================================================== --- trunk/rostests/rosautotest/tools.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/tools.cpp [iso-8859-1] Wed Feb 15 21:18:13 2012 @@ -96,7 +96,7 @@ StringOut(const string& String) { char DbgString[DBGPRINT_BUFSIZE + 1]; - size_t i; + size_t i, start = 0, last_newline = 0, size = 0, curr_pos = 0; string NewString; /* Unify the line endings (the piped output of the tests may use CRLF) */ @@ -113,26 +113,44 @@ /* Otherwise copy the string */ NewString += String[i]; } - } - - /* Output the string. - For DbgPrint, this must be done in chunks of 512 bytes. */ + + curr_pos = NewString.size(); + + /* Try to print whole lines but obey the 512 bytes chunk size limit*/ + if(NewString[curr_pos - 1] == '\n' || (curr_pos - start) == DBGPRINT_BUFSIZE) + { + if((curr_pos - start) > DBGPRINT_BUFSIZE || NewString[curr_pos - 1] != '\n') + { + /* No newlines, print what we have and start over*/ + if(NewString[curr_pos - 1] != '\n') + { + size = curr_pos - start; + memcpy(DbgString, NewString.c_str() + start, size); + start = curr_pos; + } + else + { + size = last_newline - start; + memcpy(DbgString, NewString.c_str() + start, size); + start = last_newline; + } + + DbgString[size] = 0; + DbgPrint(DbgString); + } + + last_newline = curr_pos; + } + } + + /* The rest of the string is <= DBGPRINT_BUFSIZE so just print it*/ + size = curr_pos - start; + memcpy(DbgString, NewString.c_str() + start, size); + DbgString[size] = 0; + DbgPrint(DbgString); + + /* Output the string */ cout << NewString; - - for(i = 0; i < NewString.size(); i += DBGPRINT_BUFSIZE) - { - size_t BytesToCopy; - - if(NewString.size() - i > DBGPRINT_BUFSIZE) - BytesToCopy = DBGPRINT_BUFSIZE; - else - BytesToCopy = NewString.size() - i; - - memcpy(DbgString, NewString.c_str() + i, BytesToCopy); - DbgString[BytesToCopy] = 0; - - DbgPrint(DbgString); - } } /**

1 0

[ion] 55617: [CSRSRV/WIN32CSR]: No code change, but rename CSRSS_PROCESS_DATA to CSR_PROCESS and all the right fields -- put ReactOS-specific fields at the end. Do all the right renames needed for ...
by ion＠svn.reactos.org 15 Feb '12

15 Feb '12

Author: ion Date: Wed Feb 15 20:29:08 2012 New Revision: 55617 URL: http://svn.reactos.org/svn/reactos?rev=55617&view=rev Log: [CSRSRV/WIN32CSR]: No code change, but rename CSRSS_PROCESS_DATA to CSR_PROCESS and all the right fields -- put ReactOS-specific fields at the end. Do all the right renames needed for compilation. No functionality change. Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c trunk/reactos/subsystems/win32/csrss/csrsrv/init.c trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c trunk/reactos/subsystems/win32/csrss/include/api.h trunk/reactos/subsystems/win32/csrss/include/csrplugin.h trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c trunk/reactos/subsystems/win32/csrss/win32csr/conio.h trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c trunk/reactos/subsystems/win32/csrss/win32csr/console.c trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c trunk/reactos/subsystems/win32/csrss/win32csr/handle.c trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.h Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/process.c [iso-8859-1] Wed Feb 15 20:29:08 2012 @@ -18,15 +18,15 @@ #define CsrAcquireProcessLock() LOCK #define CsrReleaseProcessLock() UNLOCK -extern NTSTATUS CallProcessInherit(PCSRSS_PROCESS_DATA, PCSRSS_PROCESS_DATA); -extern NTSTATUS CallProcessDeleted(PCSRSS_PROCESS_DATA); +extern NTSTATUS CallProcessInherit(PCSR_PROCESS, PCSR_PROCESS); +extern NTSTATUS CallProcessDeleted(PCSR_PROCESS); /* GLOBALS *******************************************************************/ static ULONG NrProcess; -PCSRSS_PROCESS_DATA ProcessData[256]; +PCSR_PROCESS ProcessData[256]; RTL_CRITICAL_SECTION ProcessDataLock; -extern PCSRSS_PROCESS_DATA CsrRootProcess; +extern PCSR_PROCESS CsrRootProcess; extern LIST_ENTRY CsrThreadHashTable[256]; /* FUNCTIONS *****************************************************************/ @@ -44,10 +44,10 @@ for (i = 0; i < 256; i++) InitializeListHead(&CsrThreadHashTable[i]); } -PCSRSS_PROCESS_DATA WINAPI CsrGetProcessData(HANDLE ProcessId) +PCSR_PROCESS WINAPI CsrGetProcessData(HANDLE ProcessId) { ULONG hash; - PCSRSS_PROCESS_DATA pProcessData; + PCSR_PROCESS pProcessData; hash = ((ULONG_PTR)ProcessId >> 2) % (sizeof(ProcessData) / sizeof(*ProcessData)); @@ -55,7 +55,7 @@ pProcessData = ProcessData[hash]; - while (pProcessData && pProcessData->ProcessId != ProcessId) + while (pProcessData && pProcessData->ClientId.UniqueProcess != ProcessId) { pProcessData = pProcessData->next; } @@ -63,10 +63,10 @@ return pProcessData; } -PCSRSS_PROCESS_DATA WINAPI CsrCreateProcessData(HANDLE ProcessId) +PCSR_PROCESS WINAPI CsrCreateProcessData(HANDLE ProcessId) { ULONG hash; - PCSRSS_PROCESS_DATA pProcessData; + PCSR_PROCESS pProcessData; OBJECT_ATTRIBUTES ObjectAttributes; CLIENT_ID ClientId; NTSTATUS Status; @@ -77,7 +77,7 @@ pProcessData = ProcessData[hash]; - while (pProcessData && pProcessData->ProcessId != ProcessId) + while (pProcessData && pProcessData->ClientId.UniqueProcess != ProcessId) { pProcessData = pProcessData->next; } @@ -85,15 +85,15 @@ { pProcessData = RtlAllocateHeap(CsrHeap, HEAP_ZERO_MEMORY, - sizeof(CSRSS_PROCESS_DATA)); + sizeof(CSR_PROCESS)); if (pProcessData) { - pProcessData->ProcessId = ProcessId; + pProcessData->ClientId.UniqueProcess = ProcessId; pProcessData->next = ProcessData[hash]; ProcessData[hash] = pProcessData; ClientId.UniqueThread = NULL; - ClientId.UniqueProcess = pProcessData->ProcessId; + ClientId.UniqueProcess = pProcessData->ClientId.UniqueProcess; InitializeObjectAttributes(&ObjectAttributes, NULL, 0, @@ -101,11 +101,11 @@ NULL); /* using OpenProcess is not optimal due to HANDLE vs. DWORD PIDs... */ - Status = NtOpenProcess(&pProcessData->Process, + Status = NtOpenProcess(&pProcessData->ProcessHandle, PROCESS_ALL_ACCESS, &ObjectAttributes, &ClientId); - DPRINT("CSR Process: %p Handle: %p\n", pProcessData, pProcessData->Process); + DPRINT("CSR Process: %p Handle: %p\n", pProcessData, pProcessData->ProcessHandle); if (!NT_SUCCESS(Status)) { ProcessData[hash] = pProcessData->next; @@ -129,7 +129,7 @@ } else { - pProcessData->Terminated = FALSE; + pProcessData->Flags = ~CsrProcessTerminated; /* Set default shutdown parameters */ pProcessData->ShutdownLevel = 0x280; @@ -144,7 +144,7 @@ NTSTATUS WINAPI CsrFreeProcessData(HANDLE Pid) { ULONG hash; - PCSRSS_PROCESS_DATA pProcessData, *pPrevLink; + PCSR_PROCESS pProcessData, *pPrevLink; HANDLE Process; PLIST_ENTRY NextEntry; PCSR_THREAD Thread; @@ -154,7 +154,7 @@ LOCK; - while ((pProcessData = *pPrevLink) && pProcessData->ProcessId != Pid) + while ((pProcessData = *pPrevLink) && pProcessData->ClientId.UniqueProcess != Pid) { pPrevLink = &pProcessData->next; } @@ -162,7 +162,7 @@ if (pProcessData) { DPRINT("CsrFreeProcessData pid: %d\n", Pid); - Process = pProcessData->Process; + Process = pProcessData->ProcessHandle; CallProcessDeleted(pProcessData); /* Dereference all process threads */ @@ -175,14 +175,14 @@ CsrThreadRefcountZero(Thread); } - if (pProcessData->CsrSectionViewBase) + if (pProcessData->ClientViewBase) { - NtUnmapViewOfSection(NtCurrentProcess(), pProcessData->CsrSectionViewBase); + NtUnmapViewOfSection(NtCurrentProcess(), (PVOID)pProcessData->ClientViewBase); } - if (pProcessData->ServerCommunicationPort) + if (pProcessData->ClientPort) { - NtClose(pProcessData->ServerCommunicationPort); + NtClose(pProcessData->ClientPort); } *pPrevLink = pProcessData->next; @@ -206,7 +206,7 @@ CSR_API(CsrCreateProcess) { - PCSRSS_PROCESS_DATA NewProcessData; + PCSR_PROCESS NewProcessData; Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); @@ -229,11 +229,11 @@ if (Request->Data.CreateProcessRequest.Flags & CREATE_NEW_PROCESS_GROUP) { - NewProcessData->ProcessGroup = (DWORD)(ULONG_PTR)NewProcessData->ProcessId; + NewProcessData->ProcessGroupId = (DWORD)(ULONG_PTR)NewProcessData->ClientId.UniqueProcess; } else { - NewProcessData->ProcessGroup = ProcessData->ProcessGroup; + NewProcessData->ProcessGroupId = ProcessData->ProcessGroupId; } return(STATUS_SUCCESS); @@ -244,7 +244,7 @@ PCSR_THREAD CurrentThread; HANDLE ThreadHandle; NTSTATUS Status; - PCSRSS_PROCESS_DATA CsrProcess; + PCSR_PROCESS CsrProcess; Request->Header.u1.s1.TotalLength = sizeof(CSR_API_MESSAGE); Request->Header.u1.s1.DataLength = sizeof(CSR_API_MESSAGE) - sizeof(PORT_MESSAGE); @@ -253,11 +253,11 @@ CsrProcess = CurrentThread->Process; // DPRINT1("Current thread: %p %p\n", CurrentThread, CsrProcess); // DPRINT1("Request CID: %lx %lx %lx\n", -// CsrProcess->ProcessId, +// CsrProcess->ClientId.UniqueProcess, // NtCurrentTeb()->ClientId.UniqueProcess, // Request->Data.CreateThreadRequest.ClientId.UniqueProcess); - if (CsrProcess->ProcessId != Request->Data.CreateThreadRequest.ClientId.UniqueProcess) + if (CsrProcess->ClientId.UniqueProcess != Request->Data.CreateThreadRequest.ClientId.UniqueProcess) { if (Request->Data.CreateThreadRequest.ClientId.UniqueProcess == NtCurrentTeb()->ClientId.UniqueProcess) { @@ -270,12 +270,12 @@ if (!NT_SUCCESS(Status)) return Status; } -// DPRINT1("PIDs: %lx %lx\n", CurrentThread->Process->ProcessId, CsrProcess->ProcessId); +// DPRINT1("PIDs: %lx %lx\n", CurrentThread->Process->ClientId.UniqueProcess, CsrProcess->ClientId.UniqueProcess); // DPRINT1("Thread handle is: %lx Process Handle is: %lx %lx\n", // Request->Data.CreateThreadRequest.ThreadHandle, - // CurrentThread->Process->Process, + // CurrentThread->Process->ProcessHandle, // CsrProcess->Process); - Status = NtDuplicateObject(CsrProcess->Process, + Status = NtDuplicateObject(CsrProcess->ProcessHandle, Request->Data.CreateThreadRequest.ThreadHandle, NtCurrentProcess(), &ThreadHandle, @@ -285,7 +285,7 @@ //DPRINT1("Duplicate status: %lx\n", Status); if (!NT_SUCCESS(Status)) { - Status = NtDuplicateObject(CurrentThread->Process->Process, + Status = NtDuplicateObject(CurrentThread->Process->ProcessHandle, Request->Data.CreateThreadRequest.ThreadHandle, NtCurrentProcess(), &ThreadHandle, @@ -327,7 +327,7 @@ } - ProcessData->Terminated = TRUE; + ProcessData->Flags |= CsrProcessTerminated; return STATUS_SUCCESS; } Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/api/wapi.c [iso-8859-1] Wed Feb 15 20:29:08 2012 @@ -72,7 +72,7 @@ VOID FASTCALL -CsrApiCallHandler(PCSRSS_PROCESS_DATA ProcessData, +CsrApiCallHandler(PCSR_PROCESS ProcessData, PCSR_API_MESSAGE Request) { unsigned DefIndex; @@ -108,13 +108,13 @@ } BOOL -CallHardError(IN PCSRSS_PROCESS_DATA ProcessData, +CallHardError(IN PCSR_PROCESS ProcessData, IN PHARDERROR_MSG HardErrorMessage); static VOID NTAPI -CsrHandleHardError(IN PCSRSS_PROCESS_DATA ProcessData, +CsrHandleHardError(IN PCSR_PROCESS ProcessData, IN OUT PHARDERROR_MSG Message) { DPRINT1("CSR: received hard error %lx\n", Message->Status); @@ -275,7 +275,7 @@ *--*/ NTSTATUS NTAPI -CsrSrvAttachSharedSection(IN PCSRSS_PROCESS_DATA CsrProcess OPTIONAL, +CsrSrvAttachSharedSection(IN PCSR_PROCESS CsrProcess OPTIONAL, OUT PCSR_CONNECTION_INFO ConnectInfo) { NTSTATUS Status; @@ -285,9 +285,9 @@ if (CsrProcess) { /* Map the section into this process */ - DPRINT("CSR Process Handle: %p. CSR Process: %p\n", CsrProcess->Process, CsrProcess); + DPRINT("CSR Process Handle: %p. CSR Process: %p\n", CsrProcess->ProcessHandle, CsrProcess); Status = NtMapViewOfSection(CsrSrvSharedSection, - CsrProcess->Process, + CsrProcess->ProcessHandle, &CsrSrvSharedSectionBase, 0, 0, @@ -701,7 +701,7 @@ { NTSTATUS Status; HANDLE ServerPort = NULL, ServerThread = NULL; - PCSRSS_PROCESS_DATA ProcessData = NULL; + PCSR_PROCESS ProcessData = NULL; REMOTE_PORT_VIEW LpcRead; CLIENT_ID ClientId; BOOLEAN AllowConnection = FALSE; @@ -728,7 +728,7 @@ } } - if (ProcessData->Process == NULL) + if (ProcessData->ProcessHandle == NULL) { OBJECT_ATTRIBUTES ObjectAttributes; @@ -739,11 +739,11 @@ NULL); DPRINT1("WARNING: CSR PROCESS WITH NO CSR PROCESS HANDLE???\n"); ClientId.UniqueThread = 0; - Status = NtOpenProcess(&ProcessData->Process, + Status = NtOpenProcess(&ProcessData->ProcessHandle, PROCESS_ALL_ACCESS, &ObjectAttributes, &Request->ClientId); - DPRINT1("Status: %lx. Handle: %lx\n", Status, ProcessData->Process); + DPRINT1("Status: %lx. Handle: %lx\n", Status, ProcessData->ProcessHandle); } if (ProcessData) @@ -773,9 +773,9 @@ return Status; } - ProcessData->CsrSectionViewBase = LpcRead.ViewBase; - ProcessData->CsrSectionViewSize = LpcRead.ViewSize; - ProcessData->ServerCommunicationPort = ServerPort; + ProcessData->ClientViewBase = (ULONG_PTR)LpcRead.ViewBase; + ProcessData->ClientViewBounds = LpcRead.ViewSize; + ProcessData->ClientPort = ServerPort; if (AllowConnection) Status = NtCompleteConnectPort(ServerPort); if (!NT_SUCCESS(Status)) @@ -866,7 +866,7 @@ BYTE RawRequest[LPC_MAX_DATA_LENGTH]; PCSR_API_MESSAGE Request = (PCSR_API_MESSAGE)RawRequest; PCSR_API_MESSAGE Reply; - PCSRSS_PROCESS_DATA ProcessData; + PCSR_PROCESS ProcessData; PCSR_THREAD ServerThread; DPRINT("CSR: %s called\n", __FUNCTION__); @@ -947,7 +947,7 @@ Request->Header.ClientId.UniqueProcess); break; } - if (ProcessData->Terminated) + if (ProcessData->Flags & CsrProcessTerminated) { DPRINT1("Message %d: process %d already terminated\n", Request->Type, Request->Header.ClientId.UniqueProcess); @@ -963,7 +963,7 @@ else { PCSR_THREAD Thread; - PCSRSS_PROCESS_DATA Process = NULL; + PCSR_PROCESS Process = NULL; //DPRINT1("locate thread %lx/%lx\n", Request->Header.ClientId.UniqueProcess, Request->Header.ClientId.UniqueThread); Thread = CsrLocateThreadByClientId(&Process, &Request->Header.ClientId); Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/init.c [iso-8859-1] Wed Feb 15 20:29:08 2012 @@ -65,7 +65,7 @@ } BOOL -CallHardError(IN PCSRSS_PROCESS_DATA ProcessData, +CallHardError(IN PCSR_PROCESS ProcessData, IN PHARDERROR_MSG HardErrorMessage) { BOOL Ok; @@ -83,8 +83,8 @@ } NTSTATUS -CallProcessInherit(IN PCSRSS_PROCESS_DATA SourceProcessData, - IN PCSRSS_PROCESS_DATA TargetProcessData) +CallProcessInherit(IN PCSR_PROCESS SourceProcessData, + IN PCSR_PROCESS TargetProcessData) { NTSTATUS Status = STATUS_SUCCESS; unsigned i; @@ -98,7 +98,7 @@ } NTSTATUS -CallProcessDeleted(IN PCSRSS_PROCESS_DATA ProcessData) +CallProcessDeleted(IN PCSR_PROCESS ProcessData) { NTSTATUS Status = STATUS_SUCCESS; unsigned i; Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/procsup.c [iso-8859-1] Wed Feb 15 20:29:08 2012 @@ -23,8 +23,8 @@ /* GLOBALS ********************************************************************/ extern RTL_CRITICAL_SECTION ProcessDataLock; -extern PCSRSS_PROCESS_DATA ProcessData[256]; -PCSRSS_PROCESS_DATA CsrRootProcess; +extern PCSR_PROCESS ProcessData[256]; +PCSR_PROCESS CsrRootProcess; SECURITY_QUALITY_OF_SERVICE CsrSecurityQos = { sizeof(SECURITY_QUALITY_OF_SERVICE), @@ -221,12 +221,12 @@ return NT_SUCCESS(Status); } -PCSRSS_PROCESS_DATA +PCSR_PROCESS NTAPI FindProcessForShutdown(IN PLUID CallerLuid) { ULONG Hash; - PCSRSS_PROCESS_DATA CsrProcess, ReturnCsrProcess = NULL; + PCSR_PROCESS CsrProcess, ReturnCsrProcess = NULL; NTSTATUS Status; ULONG Level = 0; LUID ProcessLuid; @@ -243,7 +243,7 @@ if (CsrProcess->Flags & CsrProcessSkipShutdown) goto Next; /* Get the LUID of this Process */ - Status = CsrGetProcessLuid(CsrProcess->Process, &ProcessLuid); + Status = CsrGetProcessLuid(CsrProcess->ProcessHandle, &ProcessLuid); /* Check if we didn't get access to the LUID */ if (Status == STATUS_ACCESS_DENIED) @@ -303,7 +303,7 @@ { PVOID* RealContext = (PVOID*)Context; PLUID CallerLuid = RealContext[0]; - PCSRSS_PROCESS_DATA CsrProcess = NULL; + PCSR_PROCESS CsrProcess = NULL; NTSTATUS Status = STATUS_UNSUCCESSFUL; BOOLEAN FirstTry; ULONG Result = 0; @@ -349,7 +349,7 @@ LoopAgain: /* Release the lock, make the callback, and acquire it back */ - //DPRINT1("Found process: %lx\n", CsrProcess->ProcessId); + //DPRINT1("Found process: %lx\n", CsrProcess->ClientId.UniqueProcess); CsrReleaseProcessLock(); Result = (ULONG)EnumProc(CsrProcess, (PVOID)((ULONG_PTR)Context | FirstTry)); CsrAcquireProcessLock(); @@ -391,10 +391,10 @@ NTSTATUS NTAPI CsrLockProcessByClientId(IN HANDLE Pid, - OUT PCSRSS_PROCESS_DATA *CsrProcess OPTIONAL) + OUT PCSR_PROCESS *CsrProcess OPTIONAL) { ULONG Hash; - PCSRSS_PROCESS_DATA CurrentProcess = NULL; + PCSR_PROCESS CurrentProcess = NULL; NTSTATUS Status = STATUS_UNSUCCESSFUL; /* Acquire the lock */ @@ -408,7 +408,7 @@ while (CurrentProcess) { /* Check for PID match */ - if (CurrentProcess->ProcessId == Pid) + if (CurrentProcess->ClientId.UniqueProcess == Pid) { /* Get out of here with success */ // DPRINT1("Found %p for PID %lx\n", CurrentProcess, Pid); @@ -432,7 +432,7 @@ NTSTATUS NTAPI -CsrUnlockProcess(IN PCSRSS_PROCESS_DATA CsrProcess) +CsrUnlockProcess(IN PCSR_PROCESS CsrProcess) { /* Dereference the process */ //CsrLockedDereferenceProcess(CsrProcess); Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/thredsup.c [iso-8859-1] Wed Feb 15 20:29:08 2012 @@ -26,9 +26,9 @@ /* GLOBALS ********************************************************************/ LIST_ENTRY CsrThreadHashTable[256]; -extern PCSRSS_PROCESS_DATA CsrRootProcess; +extern PCSR_PROCESS CsrRootProcess; extern RTL_CRITICAL_SECTION ProcessDataLock; -extern PCSRSS_PROCESS_DATA ProcessData[256]; +extern PCSR_PROCESS ProcessData[256]; /* FUNCTIONS ******************************************************************/ @@ -112,7 +112,7 @@ PCSR_THREAD NTAPI -CsrAllocateThread(IN PCSRSS_PROCESS_DATA CsrProcess) +CsrAllocateThread(IN PCSR_PROCESS CsrProcess) { PCSR_THREAD CsrThread; @@ -133,7 +133,7 @@ PCSR_THREAD NTAPI -CsrLocateThreadByClientId(OUT PCSRSS_PROCESS_DATA *Process OPTIONAL, +CsrLocateThreadByClientId(OUT PCSR_PROCESS *Process OPTIONAL, IN PCLIENT_ID ClientId) { ULONG i; @@ -174,7 +174,7 @@ PCSR_THREAD NTAPI -CsrLocateThreadInProcess(IN PCSRSS_PROCESS_DATA CsrProcess OPTIONAL, +CsrLocateThreadInProcess(IN PCSR_PROCESS CsrProcess OPTIONAL, IN PCLIENT_ID Cid) { PLIST_ENTRY ListHead, NextEntry; @@ -208,7 +208,7 @@ VOID NTAPI -CsrInsertThread(IN PCSRSS_PROCESS_DATA Process, +CsrInsertThread(IN PCSR_PROCESS Process, IN PCSR_THREAD Thread) { ULONG i; @@ -295,12 +295,12 @@ NTSTATUS NTAPI -CsrCreateThread(IN PCSRSS_PROCESS_DATA CsrProcess, +CsrCreateThread(IN PCSR_PROCESS CsrProcess, IN HANDLE hThread, IN PCLIENT_ID ClientId) { PCSR_THREAD CsrThread; - //PCSRSS_PROCESS_DATA CurrentProcess; + //PCSR_PROCESS CurrentProcess; //PCSR_THREAD CurrentThread = NtCurrentTeb()->CsrClientThread; //CLIENT_ID CurrentCid; KERNEL_USER_TIMES KernelTimes; Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Wed Feb 15 20:29:08 2012 @@ -45,31 +45,47 @@ CsrProcessIsConsoleApp = 0x800 } CSR_PROCESS_FLAGS, *PCSR_PROCESS_FLAGS; -typedef struct _CSRSS_PROCESS_DATA +typedef struct _CSRSS_CON_PROCESS_DATA { - struct tagCSRSS_CONSOLE *Console; - struct tagCSRSS_CONSOLE *ParentConsole; - BOOL bInheritHandles; - RTL_CRITICAL_SECTION HandleTableLock; - ULONG HandleTableSize; - struct _CSRSS_HANDLE *HandleTable; - HANDLE ProcessId; - DWORD ProcessGroup; - HANDLE Process; - ULONG ShutdownLevel; - ULONG ShutdownFlags; - HANDLE ConsoleEvent; - PVOID CsrSectionViewBase; - ULONG CsrSectionViewSize; - HANDLE ServerCommunicationPort; - struct _CSRSS_PROCESS_DATA * next; - LIST_ENTRY ProcessEntry; - PCONTROLDISPATCHER CtrlDispatcher; - BOOL Terminated; - ULONG Flags; - ULONG ThreadCount; - LIST_ENTRY ThreadList; -} CSRSS_PROCESS_DATA, *PCSRSS_PROCESS_DATA; + HANDLE ConsoleEvent; + struct tagCSRSS_CONSOLE *Console; + struct tagCSRSS_CONSOLE *ParentConsole; + BOOL bInheritHandles; + RTL_CRITICAL_SECTION HandleTableLock; + ULONG HandleTableSize; + struct _CSRSS_HANDLE *HandleTable; + PCONTROLDISPATCHER CtrlDispatcher; +} CSRSS_CON_PROCESS_DATA, *PCSRSS_CON_PROCESS_DATA; + +typedef struct _CSR_PROCESS +{ + CLIENT_ID ClientId; + LIST_ENTRY ListLink; + LIST_ENTRY ThreadList; + struct _CSR_PROCESS *Parent; +// PCSR_NT_SESSION NtSession; + ULONG ExpectedVersion; + HANDLE ClientPort; + ULONG_PTR ClientViewBase; + ULONG_PTR ClientViewBounds; + HANDLE ProcessHandle; + ULONG SequenceNumber; + ULONG Flags; + ULONG DebugFlags; + CLIENT_ID DebugCid; + ULONG ReferenceCount; + ULONG ProcessGroupId; + ULONG ProcessGroupSequence; + ULONG fVDM; + ULONG ThreadCount; + ULONG PriorityClass; + ULONG Reserved; + ULONG ShutdownLevel; + ULONG ShutdownFlags; +// PVOID ServerData[ANYSIZE_ARRAY]; + struct _CSR_PROCESS* next; + CSRSS_CON_PROCESS_DATA; +} CSR_PROCESS, *PCSR_PROCESS; typedef struct _CSR_THREAD { @@ -77,7 +93,7 @@ LIST_ENTRY Link; LIST_ENTRY HashLinks; CLIENT_ID ClientId; - PCSRSS_PROCESS_DATA Process; + PCSR_PROCESS Process; //struct _CSR_WAIT_BLOCK *WaitBlock; HANDLE ThreadHandle; ULONG Flags; @@ -85,7 +101,7 @@ ULONG ImpersonationCount; } CSR_THREAD, *PCSR_THREAD; -typedef NTSTATUS (WINAPI *CSRSS_API_PROC)(PCSRSS_PROCESS_DATA ProcessData, +typedef NTSTATUS (WINAPI *CSRSS_API_PROC)(PCSR_PROCESS ProcessData, PCSR_API_MESSAGE Request); typedef struct _CSRSS_API_DEFINITION @@ -106,7 +122,7 @@ } CSRSS_LISTEN_DATA, *PCSRSS_LISTEN_DATA; #define CSR_API(n) NTSTATUS WINAPI n (\ -PCSRSS_PROCESS_DATA ProcessData,\ +PCSR_PROCESS ProcessData,\ PCSR_API_MESSAGE Request) /* init.c */ @@ -123,11 +139,11 @@ PCSR_THREAD NTAPI -CsrAllocateThread(IN PCSRSS_PROCESS_DATA CsrProcess); +CsrAllocateThread(IN PCSR_PROCESS CsrProcess); /* api/wapi.c */ NTSTATUS FASTCALL CsrApiRegisterDefinitions(PCSRSS_API_DEFINITION NewDefinitions); -VOID FASTCALL CsrApiCallHandler(PCSRSS_PROCESS_DATA ProcessData, +VOID FASTCALL CsrApiCallHandler(PCSR_PROCESS ProcessData, PCSR_API_MESSAGE Request); VOID WINAPI CsrSbApiRequestThread (PVOID PortHandle); VOID NTAPI ClientConnectionThread(HANDLE ServerPort); @@ -135,19 +151,19 @@ extern HANDLE CsrSbApiPort; /* api/process.c */ -typedef NTSTATUS (WINAPI *CSRSS_ENUM_PROCESS_PROC)(PCSRSS_PROCESS_DATA ProcessData, +typedef NTSTATUS (WINAPI *CSRSS_ENUM_PROCESS_PROC)(PCSR_PROCESS ProcessData, PVOID Context); VOID WINAPI CsrInitProcessData(VOID); -PCSRSS_PROCESS_DATA WINAPI CsrGetProcessData(HANDLE ProcessId); -PCSRSS_PROCESS_DATA WINAPI CsrCreateProcessData(HANDLE ProcessId); +PCSR_PROCESS WINAPI CsrGetProcessData(HANDLE ProcessId); +PCSR_PROCESS WINAPI CsrCreateProcessData(HANDLE ProcessId); NTSTATUS WINAPI CsrFreeProcessData( HANDLE Pid ); NTSTATUS WINAPI CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, PVOID Context); PCSR_THREAD NTAPI CsrAddStaticServerThread(IN HANDLE hThread, IN PCLIENT_ID ClientId, IN ULONG ThreadFlags); -PCSR_THREAD NTAPI CsrLocateThreadInProcess(IN PCSRSS_PROCESS_DATA CsrProcess OPTIONAL, IN PCLIENT_ID Cid); -PCSR_THREAD NTAPI CsrLocateThreadByClientId(OUT PCSRSS_PROCESS_DATA *Process OPTIONAL, IN PCLIENT_ID ClientId); -NTSTATUS NTAPI CsrLockProcessByClientId(IN HANDLE Pid, OUT PCSRSS_PROCESS_DATA *CsrProcess OPTIONAL); -NTSTATUS NTAPI CsrCreateThread(IN PCSRSS_PROCESS_DATA CsrProcess, IN HANDLE hThread, IN PCLIENT_ID ClientId); -NTSTATUS NTAPI CsrUnlockProcess(IN PCSRSS_PROCESS_DATA CsrProcess); +PCSR_THREAD NTAPI CsrLocateThreadInProcess(IN PCSR_PROCESS CsrProcess OPTIONAL, IN PCLIENT_ID Cid); +PCSR_THREAD NTAPI CsrLocateThreadByClientId(OUT PCSR_PROCESS *Process OPTIONAL, IN PCLIENT_ID ClientId); +NTSTATUS NTAPI CsrLockProcessByClientId(IN HANDLE Pid, OUT PCSR_PROCESS *CsrProcess OPTIONAL); +NTSTATUS NTAPI CsrCreateThread(IN PCSR_PROCESS CsrProcess, IN HANDLE hThread, IN PCLIENT_ID ClientId); +NTSTATUS NTAPI CsrUnlockProcess(IN PCSR_PROCESS CsrProcess); //hack VOID NTAPI CsrThreadRefcountZero(IN PCSR_THREAD CsrThread); Modified: trunk/reactos/subsystems/win32/csrss/include/csrplugin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/csrplugin.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/csrplugin.h [iso-8859-1] Wed Feb 15 20:29:08 2012 @@ -31,13 +31,13 @@ typedef BOOL (WINAPI *CSRPLUGIN_INIT_COMPLETE_PROC)(void); -typedef BOOL (WINAPI *CSRPLUGIN_HARDERROR_PROC)(IN PCSRSS_PROCESS_DATA ProcessData, +typedef BOOL (WINAPI *CSRPLUGIN_HARDERROR_PROC)(IN PCSR_PROCESS ProcessData, IN PHARDERROR_MSG HardErrorMessage); -typedef NTSTATUS (WINAPI *CSRPLUGIN_PROCESS_INHERIT_PROC)(IN PCSRSS_PROCESS_DATA SourceProcessData, - IN PCSRSS_PROCESS_DATA TargetProcessData); +typedef NTSTATUS (WINAPI *CSRPLUGIN_PROCESS_INHERIT_PROC)(IN PCSR_PROCESS SourceProcessData, + IN PCSR_PROCESS TargetProcessData); -typedef NTSTATUS (WINAPI *CSRPLUGIN_PROCESS_DELETED_PROC)(IN PCSRSS_PROCESS_DATA ProcessData); +typedef NTSTATUS (WINAPI *CSRPLUGIN_PROCESS_DELETED_PROC)(IN PCSR_PROCESS ProcessData); typedef struct tagCSRSS_SERVER_PROCS { Modified: trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/coninput.c [iso-8859-1] Wed Feb 15 20:29:08 2012 @@ -367,13 +367,13 @@ (er.Event.KeyEvent.wVirtualKeyCode == 'C')) && (er.Event.KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED) || KeyState[VK_CONTROL] & 0x80)) { - PCSRSS_PROCESS_DATA current; + PCSR_PROCESS current; PLIST_ENTRY current_entry; DPRINT1("Console_Api Ctrl-C\n"); current_entry = Console->ProcessList.Flink; while (current_entry != &Console->ProcessList) { - current = CONTAINING_RECORD(current_entry, CSRSS_PROCESS_DATA, ProcessEntry); + current = CONTAINING_RECORD(current_entry, CSR_PROCESS, ListLink); current_entry = current_entry->Flink; ConioConsoleCtrlEvent((DWORD)CTRL_C_EVENT, current); } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conio.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conio.h [iso-8859-1] Wed Feb 15 20:29:08 2012 @@ -141,13 +141,13 @@ #define ConioResizeBuffer(Console, Buff, Size) (Console)->Vtbl->ResizeBuffer(Console, Buff, Size) /* console.c */ -NTSTATUS FASTCALL ConioConsoleFromProcessData(PCSRSS_PROCESS_DATA ProcessData, PCSRSS_CONSOLE *Console); +NTSTATUS FASTCALL ConioConsoleFromProcessData(PCSR_PROCESS ProcessData, PCSRSS_CONSOLE *Console); VOID WINAPI ConioDeleteConsole(Object_t *Object); VOID WINAPI CsrInitConsoleSupport(VOID); VOID FASTCALL ConioPause(PCSRSS_CONSOLE Console, UINT Flags); VOID FASTCALL ConioUnpause(PCSRSS_CONSOLE Console, UINT Flags); -VOID FASTCALL ConioConsoleCtrlEvent(DWORD Event, PCSRSS_PROCESS_DATA ProcessData); -VOID FASTCALL ConioConsoleCtrlEventTimeout(DWORD Event, PCSRSS_PROCESS_DATA ProcessData, +VOID FASTCALL ConioConsoleCtrlEvent(DWORD Event, PCSR_PROCESS ProcessData); +VOID FASTCALL ConioConsoleCtrlEventTimeout(DWORD Event, PCSR_PROCESS ProcessData, DWORD Timeout); CSR_API(CsrAllocConsole); CSR_API(CsrFreeConsole); Modified: trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/conoutput.c [iso-8859-1] Wed Feb 15 20:29:08 2012 @@ -389,7 +389,7 @@ if (Console->UnpauseEvent) { Status = NtDuplicateObject(GetCurrentProcess(), Console->UnpauseEvent, - ProcessData->Process, &Request->Data.WriteConsoleRequest.UnpauseEvent, + ProcessData->ProcessHandle, &Request->Data.WriteConsoleRequest.UnpauseEvent, SYNCHRONIZE, 0, 0); ConioUnlockScreenBuffer(Buff); return NT_SUCCESS(Status) ? STATUS_PENDING : Status; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1] Wed Feb 15 20:29:08 2012 @@ -15,7 +15,7 @@ /* FUNCTIONS *****************************************************************/ NTSTATUS FASTCALL -ConioConsoleFromProcessData(PCSRSS_PROCESS_DATA ProcessData, PCSRSS_CONSOLE *Console) +ConioConsoleFromProcessData(PCSR_PROCESS ProcessData, PCSRSS_CONSOLE *Console) { PCSRSS_CONSOLE ProcessConsole; @@ -38,16 +38,16 @@ } VOID FASTCALL -ConioConsoleCtrlEventTimeout(DWORD Event, PCSRSS_PROCESS_DATA ProcessData, DWORD Timeout) +ConioConsoleCtrlEventTimeout(DWORD Event, PCSR_PROCESS ProcessData, DWORD Timeout) { HANDLE Thread; - DPRINT("ConioConsoleCtrlEvent Parent ProcessId = %x\n", ProcessData->ProcessId); + DPRINT("ConioConsoleCtrlEvent Parent ProcessId = %x\n", ProcessData->ClientId.UniqueProcess); if (ProcessData->CtrlDispatcher) { - Thread = CreateRemoteThread(ProcessData->Process, NULL, 0, + Thread = CreateRemoteThread(ProcessData->ProcessHandle, NULL, 0, (LPTHREAD_START_ROUTINE) ProcessData->CtrlDispatcher, UlongToPtr(Event), 0, NULL); if (NULL == Thread) @@ -61,7 +61,7 @@ } VOID FASTCALL -ConioConsoleCtrlEvent(DWORD Event, PCSRSS_PROCESS_DATA ProcessData) +ConioConsoleCtrlEvent(DWORD Event, PCSR_PROCESS ProcessData) { ConioConsoleCtrlEventTimeout(Event, ProcessData, 0); } @@ -215,7 +215,7 @@ /* initialize list head */ InitializeListHead(&Console->ProcessList); /* insert process data required for GUI initialization */ - InsertHeadList(&Console->ProcessList, &ProcessData->ProcessEntry); + InsertHeadList(&Console->ProcessList, &ProcessData->ListLink); /* Initialize the Console */ Status = CsrInitConsole(Console, Request->Data.AllocConsoleRequest.ShowCmd); if (!NT_SUCCESS(Status)) @@ -280,7 +280,7 @@ /* Duplicate the Event */ if (!DuplicateHandle(GetCurrentProcess(), ProcessData->Console->ActiveEvent, - ProcessData->Process, + ProcessData->ProcessHandle, &ProcessData->ConsoleEvent, EVENT_ALL_ACCESS, FALSE, @@ -307,7 +307,7 @@ if (!NewConsole) { /* Insert into the list if it has not been added */ - InsertHeadList(&ProcessData->Console->ProcessList, &ProcessData->ProcessEntry); + InsertHeadList(&ProcessData->Console->ProcessList, &ProcessData->ListLink); } RtlLeaveCriticalSection(&ProcessData->HandleTableLock); @@ -762,7 +762,7 @@ { PDWORD Buffer; PCSRSS_CONSOLE Console; - PCSRSS_PROCESS_DATA current; + PCSR_PROCESS current; PLIST_ENTRY current_entry; ULONG nItems = 0; NTSTATUS Status; @@ -786,10 +786,10 @@ current_entry != &Console->ProcessList; current_entry = current_entry->Flink) { - current = CONTAINING_RECORD(current_entry, CSRSS_PROCESS_DATA, ProcessEntry); + current = CONTAINING_RECORD(current_entry, CSR_PROCESS, ListLink); if (++nItems <= Request->Data.GetProcessListRequest.nMaxIds) { - *Buffer++ = HandleToUlong(current->ProcessId); + *Buffer++ = HandleToUlong(current->ClientId.UniqueProcess); } } @@ -802,7 +802,7 @@ CSR_API(CsrGenerateCtrlEvent) { PCSRSS_CONSOLE Console; - PCSRSS_PROCESS_DATA current; + PCSR_PROCESS current; PLIST_ENTRY current_entry; DWORD Group; NTSTATUS Status; @@ -822,8 +822,8 @@ current_entry != &Console->ProcessList; current_entry = current_entry->Flink) { - current = CONTAINING_RECORD(current_entry, CSRSS_PROCESS_DATA, ProcessEntry); - if (Group == 0 || current->ProcessGroup == Group) + current = CONTAINING_RECORD(current_entry, CSR_PROCESS, ListLink); + if (Group == 0 || current->ProcessGroupId == Group) { ConioConsoleCtrlEvent(Request->Data.GenerateCtrlEvent.Event, current); Status = STATUS_SUCCESS; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Wed Feb 15 20:29:08 2012 @@ -278,7 +278,7 @@ /* Ensure that a captured buffer is safe to access */ BOOL FASTCALL -Win32CsrValidateBuffer(PCSRSS_PROCESS_DATA ProcessData, PVOID Buffer, +Win32CsrValidateBuffer(PCSR_PROCESS ProcessData, PVOID Buffer, SIZE_T NumElements, SIZE_T ElementSize) { /* Check that the following conditions are true: @@ -289,14 +289,14 @@ * instead of division; remember that 2147483648 * 2 = 0.) * 3. The buffer is DWORD-aligned. */ - ULONG_PTR Offset = (BYTE *)Buffer - (BYTE *)ProcessData->CsrSectionViewBase; - if (Offset >= ProcessData->CsrSectionViewSize - || NumElements > (ProcessData->CsrSectionViewSize - Offset) / ElementSize + ULONG_PTR Offset = (BYTE *)Buffer - (BYTE *)ProcessData->ClientViewBase; + if (Offset >= ProcessData->ClientViewBounds + || NumElements > (ProcessData->ClientViewBounds - Offset) / ElementSize || (Offset & (sizeof(DWORD) - 1)) != 0) { DPRINT1("Invalid buffer %p(%u*%u); section view is %p(%u)\n", Buffer, NumElements, ElementSize, - ProcessData->CsrSectionViewBase, ProcessData->CsrSectionViewSize); + ProcessData->ClientViewBase, ProcessData->ClientViewBounds); return FALSE; } return TRUE; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/exitros.c [iso-8859-1] Wed Feb 15 20:29:08 2012 @@ -462,7 +462,7 @@ } static BOOL FASTCALL -NotifyAndTerminateProcess(PCSRSS_PROCESS_DATA ProcessData, +NotifyAndTerminateProcess(PCSR_PROCESS ProcessData, PSHUTDOWN_SETTINGS ShutdownSettings, UINT Flags) { @@ -481,7 +481,7 @@ } else { - Context.ProcessId = (DWORD_PTR) ProcessData->ProcessId; + Context.ProcessId = (DWORD_PTR) ProcessData->ClientId.UniqueProcess; Context.wParam = 0; Context.lParam = (0 != (Flags & EWX_INTERNAL_FLAG_LOGOFF) ? ENDSESSION_LOGOFF : 0); @@ -527,10 +527,10 @@ /* Terminate this process */ Process = OpenProcess(PROCESS_TERMINATE, FALSE, - (DWORD_PTR) ProcessData->ProcessId); + (DWORD_PTR) ProcessData->ClientId.UniqueProcess); if (NULL == Process) { - DPRINT1("Unable to open process %d, error %d\n", ProcessData->ProcessId, + DPRINT1("Unable to open process %d, error %d\n", ProcessData->ClientId.UniqueProcess, GetLastError()); return TRUE; } @@ -543,35 +543,35 @@ typedef struct tagPROCESS_ENUM_CONTEXT { UINT ProcessCount; - PCSRSS_PROCESS_DATA *ProcessData; + PCSR_PROCESS *ProcessData; TOKEN_ORIGIN TokenOrigin; DWORD ShellProcess; DWORD CsrssProcess; } PROCESS_ENUM_CONTEXT, *PPROCESS_ENUM_CONTEXT; static NTSTATUS WINAPI -ExitReactosProcessEnum(PCSRSS_PROCESS_DATA ProcessData, PVOID Data) +ExitReactosProcessEnum(PCSR_PROCESS ProcessData, PVOID Data) { HANDLE Process; HANDLE Token; TOKEN_ORIGIN Origin; DWORD ReturnLength; PPROCESS_ENUM_CONTEXT Context = (PPROCESS_ENUM_CONTEXT) Data; - PCSRSS_PROCESS_DATA *NewData; + PCSR_PROCESS *NewData; /* Do not kill winlogon or csrss */ - if ((DWORD_PTR) ProcessData->ProcessId == Context->CsrssProcess || - ProcessData->ProcessId == LogonProcess) + if ((DWORD_PTR) ProcessData->ClientId.UniqueProcess == Context->CsrssProcess || + ProcessData->ClientId.UniqueProcess == LogonProcess) { return STATUS_SUCCESS; } /* Get the login session of this process */ Process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, - (DWORD_PTR) ProcessData->ProcessId); + (DWORD_PTR) ProcessData->ClientId.UniqueProcess); if (NULL == Process) { - DPRINT1("Unable to open process %d, error %d\n", ProcessData->ProcessId, + DPRINT1("Unable to open process %d, error %d\n", ProcessData->ClientId.UniqueProcess, GetLastError()); return STATUS_UNSUCCESSFUL; } @@ -579,7 +579,7 @@ if (! OpenProcessToken(Process, TOKEN_QUERY, &Token)) { DPRINT1("Unable to open token for process %d, error %d\n", - ProcessData->ProcessId, GetLastError()); + ProcessData->ClientId.UniqueProcess, GetLastError()); CloseHandle(Process); return STATUS_UNSUCCESSFUL; } @@ -589,7 +589,7 @@ sizeof(TOKEN_ORIGIN), &ReturnLength)) { DPRINT1("GetTokenInformation failed for process %d with error %d\n", - ProcessData->ProcessId, GetLastError()); + ProcessData->ClientId.UniqueProcess, GetLastError()); CloseHandle(Token); return STATUS_UNSUCCESSFUL; } @@ -600,12 +600,12 @@ &(Origin.OriginatingLogonSession))) { /* Kill the shell process last */ - if ((DWORD_PTR) ProcessData->ProcessId == Context->ShellProcess) + if ((DWORD_PTR) ProcessData->ClientId.UniqueProcess == Context->ShellProcess) { ProcessData->ShutdownLevel = 0; } NewData = HeapAlloc(Win32CsrApiHeap, 0, (Context->ProcessCount + 1) - * sizeof(PCSRSS_PROCESS_DATA)); + * sizeof(PCSR_PROCESS)); if (NULL == NewData) { return STATUS_NO_MEMORY; @@ -613,7 +613,7 @@ if (0 != Context->ProcessCount) { memcpy(NewData, Context->ProcessData, - Context->ProcessCount * sizeof(PCSRSS_PROCESS_DATA)); + Context->ProcessCount * sizeof(PCSR_PROCESS)); HeapFree(Win32CsrApiHeap, 0, Context->ProcessData); } Context->ProcessData = NewData; @@ -627,8 +627,8 @@ static int ProcessDataCompare(const void *Elem1, const void *Elem2) { - const PCSRSS_PROCESS_DATA *ProcessData1 = (PCSRSS_PROCESS_DATA *) Elem1; - const PCSRSS_PROCESS_DATA *ProcessData2 = (PCSRSS_PROCESS_DATA *) Elem2; + const PCSR_PROCESS *ProcessData1 = (PCSR_PROCESS *) Elem1; + const PCSR_PROCESS *ProcessData2 = (PCSR_PROCESS *) Elem2; if ((*ProcessData1)->ShutdownLevel < (*ProcessData2)->ShutdownLevel) { @@ -638,11 +638,11 @@ { return -1; } - else if ((*ProcessData1)->ProcessId < (*ProcessData2)->ProcessId) + else if ((*ProcessData1)->ClientId.UniqueProcess < (*ProcessData2)->ClientId.UniqueProcess) { return +1; } - else if ((*ProcessData2)->ProcessId < (*ProcessData1)->ProcessId) + else if ((*ProcessData2)->ClientId.UniqueProcess < (*ProcessData1)->ClientId.UniqueProcess) { return -1; } @@ -864,7 +864,7 @@ return Status; } - qsort(Context.ProcessData, Context.ProcessCount, sizeof(PCSRSS_PROCESS_DATA), + qsort(Context.ProcessData, Context.ProcessCount, sizeof(PCSR_PROCESS), ProcessDataCompare); /* Terminate processes, stop if we find one kicking and screaming it doesn't Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Wed Feb 15 20:29:08 2012 @@ -393,15 +393,15 @@ GuiConsoleWriteUserSettings(PCSRSS_CONSOLE Console, PGUI_CONSOLE_DATA GuiData) { HKEY hKey; - PCSRSS_PROCESS_DATA ProcessData; + PCSR_PROCESS ProcessData; if (Console->ProcessList.Flink == &Console->ProcessList) { DPRINT("GuiConsoleWriteUserSettings: No Process!!!\n"); return; } - ProcessData = CONTAINING_RECORD(Console->ProcessList.Flink, CSRSS_PROCESS_DATA, ProcessEntry); - if (!GuiConsoleOpenUserSettings(GuiData, PtrToUlong(ProcessData->ProcessId), &hKey, KEY_READ | KEY_WRITE, TRUE)) + ProcessData = CONTAINING_RECORD(Console->ProcessList.Flink, CSR_PROCESS, ListLink); + if (!GuiConsoleOpenUserSettings(GuiData, PtrToUlong(ProcessData->ClientId.UniqueProcess), &hKey, KEY_READ | KEY_WRITE, TRUE)) { return; } @@ -690,7 +690,7 @@ HFONT OldFont; TEXTMETRICW Metrics; SIZE CharSize; - PCSRSS_PROCESS_DATA ProcessData; + PCSR_PROCESS ProcessData; HKEY hKey; Console->hWindow = hWnd; @@ -704,8 +704,8 @@ GuiConsoleUseDefaults(Console, GuiData, Console->ActiveBuffer); if (Console->ProcessList.Flink != &Console->ProcessList) { - ProcessData = CONTAINING_RECORD(Console->ProcessList.Flink, CSRSS_PROCESS_DATA, ProcessEntry); - if (GuiConsoleOpenUserSettings(GuiData, PtrToUlong(ProcessData->ProcessId), &hKey, KEY_READ, FALSE)) + ProcessData = CONTAINING_RECORD(Console->ProcessList.Flink, CSR_PROCESS, ListLink); + if (GuiConsoleOpenUserSettings(GuiData, PtrToUlong(ProcessData->ClientId.UniqueProcess), &hKey, KEY_READ, FALSE)) { GuiConsoleReadUserSettings(hKey, Console, GuiData, Console->ActiveBuffer); RegCloseKey(hKey); @@ -1263,7 +1263,7 @@ PCSRSS_CONSOLE Console; PGUI_CONSOLE_DATA GuiData; PLIST_ENTRY current_entry; - PCSRSS_PROCESS_DATA current; + PCSR_PROCESS current; GuiConsoleGetDataPointers(hWnd, &Console, &GuiData); @@ -1272,7 +1272,7 @@ current_entry = Console->ProcessList.Flink; while (current_entry != &Console->ProcessList) { - current = CONTAINING_RECORD(current_entry, CSRSS_PROCESS_DATA, ProcessEntry); + current = CONTAINING_RECORD(current_entry, CSR_PROCESS, ListLink); current_entry = current_entry->Flink; /* FIXME: Windows will wait up to 5 seconds for the thread to exit. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/handle.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/handle.c [iso-8859-1] Wed Feb 15 20:29:08 2012 @@ -73,7 +73,7 @@ NTSTATUS FASTCALL Win32CsrReleaseObject( - PCSRSS_PROCESS_DATA ProcessData, + PCSR_PROCESS ProcessData, HANDLE Handle) { ULONG_PTR h = (ULONG_PTR)Handle >> 2; @@ -93,7 +93,7 @@ NTSTATUS FASTCALL -Win32CsrLockObject(PCSRSS_PROCESS_DATA ProcessData, +Win32CsrLockObject(PCSR_PROCESS ProcessData, HANDLE Handle, Object_t **Object, DWORD Access, @@ -135,7 +135,7 @@ NTSTATUS WINAPI Win32CsrReleaseConsole( - PCSRSS_PROCESS_DATA ProcessData) + PCSR_PROCESS ProcessData) { PCSRSS_CONSOLE Console; ULONG i; @@ -154,7 +154,7 @@ { ProcessData->Console = NULL; EnterCriticalSection(&Console->Lock); - RemoveEntryList(&ProcessData->ProcessEntry); + RemoveEntryList(&ProcessData->ListLink); LeaveCriticalSection(&Console->Lock); if (_InterlockedDecrement(&Console->ReferenceCount) == 0) ConioDeleteConsole(&Console->Header); @@ -170,7 +170,7 @@ NTSTATUS FASTCALL Win32CsrInsertObject( - PCSRSS_PROCESS_DATA ProcessData, + PCSR_PROCESS ProcessData, PHANDLE Handle, Object_t *Object, DWORD Access, @@ -219,8 +219,8 @@ NTSTATUS WINAPI Win32CsrDuplicateHandleTable( - PCSRSS_PROCESS_DATA SourceProcessData, - PCSRSS_PROCESS_DATA TargetProcessData) + PCSR_PROCESS SourceProcessData, + PCSR_PROCESS TargetProcessData) { ULONG i; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/harderror.c [iso-8859-1] Wed Feb 15 20:29:08 2012 @@ -503,7 +503,7 @@ BOOL WINAPI Win32CsrHardError( - IN PCSRSS_PROCESS_DATA ProcessData, + IN PCSR_PROCESS ProcessData, IN PHARDERROR_MSG Message) { ULONG_PTR Parameters[MAXIMUM_HARDERROR_PARAMETERS]; Modified: trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h [iso-8859-1] Wed Feb 15 20:29:08 2012 @@ -26,7 +26,7 @@ BOOL WINAPI Win32CsrHardError( - IN PCSRSS_PROCESS_DATA ProcessData, + IN PCSR_PROCESS ProcessData, IN PHARDERROR_MSG Message); /* EOF */ Modified: trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/win32csr.h [iso-8859-1] Wed Feb 15 20:29:08 2012 @@ -40,30 +40,30 @@ } CSRSS_OBJECT_DEFINITION, *PCSRSS_OBJECT_DEFINITION; /* handle.c */ -NTSTATUS FASTCALL Win32CsrInsertObject(PCSRSS_PROCESS_DATA ProcessData, +NTSTATUS FASTCALL Win32CsrInsertObject(PCSR_PROCESS ProcessData, PHANDLE Handle, Object_t *Object, DWORD Access, BOOL Inheritable, DWORD ShareMode); -NTSTATUS FASTCALL Win32CsrLockObject(PCSRSS_PROCESS_DATA ProcessData, +NTSTATUS FASTCALL Win32CsrLockObject(PCSR_PROCESS ProcessData, HANDLE Handle, Object_t **Object, DWORD Access, long Type); VOID FASTCALL Win32CsrUnlockObject(Object_t *Object); -NTSTATUS FASTCALL Win32CsrReleaseObject(PCSRSS_PROCESS_DATA ProcessData, +NTSTATUS FASTCALL Win32CsrReleaseObject(PCSR_PROCESS ProcessData, HANDLE Object); -NTSTATUS WINAPI Win32CsrReleaseConsole(PCSRSS_PROCESS_DATA ProcessData); -NTSTATUS WINAPI Win32CsrDuplicateHandleTable(PCSRSS_PROCESS_DATA SourceProcessData, - PCSRSS_PROCESS_DATA TargetProcessData); +NTSTATUS WINAPI Win32CsrReleaseConsole(PCSR_PROCESS ProcessData); +NTSTATUS WINAPI Win32CsrDuplicateHandleTable(PCSR_PROCESS SourceProcessData, + PCSR_PROCESS TargetProcessData); CSR_API(CsrGetHandle); CSR_API(CsrCloseHandle); CSR_API(CsrVerifyHandle); CSR_API(CsrDuplicateHandle); CSR_API(CsrGetInputWaitHandle); -BOOL FASTCALL Win32CsrValidateBuffer(PCSRSS_PROCESS_DATA ProcessData, +BOOL FASTCALL Win32CsrValidateBuffer(PCSR_PROCESS ProcessData, PVOID Buffer, SIZE_T NumElements, SIZE_T ElementSize);

1 0

[rharabien] 55616: - Fix MSVC build
by rharabien＠svn.reactos.org 15 Feb '12

15 Feb '12

Author: rharabien Date: Wed Feb 15 20:25:35 2012 New Revision: 55616 URL: http://svn.reactos.org/svn/reactos?rev=55616&view=rev Log: - Fix MSVC build Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Cn.rc trunk/reactos/dll/win32/comdlg32/cdlg_Cs.rc trunk/reactos/dll/win32/comdlg32/cdlg_Da.rc trunk/reactos/dll/win32/comdlg32/cdlg_Eo.rc trunk/reactos/dll/win32/comdlg32/cdlg_Hu.rc trunk/reactos/dll/win32/comdlg32/cdlg_No.rc trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc trunk/reactos/dll/win32/comdlg32/cdlg_Ro.rc trunk/reactos/dll/win32/comdlg32/cdlg_Sr.rc trunk/reactos/dll/win32/comdlg32/cdlg_Zh.rc Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Cn.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Cn… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_Cn.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_Cn.rc [iso-8859-1] Wed Feb 15 20:25:35 2012 @@ -64,10 +64,7 @@ PD32_PRINT_ERROR "å°è¡¨æ©é¯èª¤ã" PD32_NO_DEFAULT_PRINTER "æ²æé»èªå°è¡¨æ©ã" PD32_CANT_FIND_PRINTER "æ¾ä¸å°å°è¡¨æ©ã" - PD32_OUT_OF_MEMORY "#-#-#-#-# zh_TW.po (Wine) #-#-#-#-#\n\ -å§åæº¢åºã\n\ -#-#-#-#-# zh_TW.po (Wine) #-#-#-#-#\n\ -å§åä¸å¤ ã" + PD32_OUT_OF_MEMORY "å§åä¸å¤ ã" PD32_GENERIC_ERROR "åºç¾ä¸äºé¯èª¤ã" PD32_DRIVER_UNKNOWN "æ¾ä¸å°å°è¡¨æ©é©åå¨ã" PD32_NO_DEVICES "å¨ä½¿ç¨èå°è¡¨æ©æéåè½(çé¢è¨å®, åå°æªæ¡)ä¹å, ä½ å¿é åè£å°è¡¨æ©ãè«è£ä¸åå°è¡¨æ©åè©¦ã" Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Cs.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Cs… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_Cs.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_Cs.rc [iso-8859-1] Wed Feb 15 20:25:35 2012 @@ -64,10 +64,7 @@ PD32_PRINT_ERROR "Nastala chyba tisku." PD32_NO_DEFAULT_PRINTER "VÃ½chozÃ tiskÃ¡rna neexistuje." PD32_CANT_FIND_PRINTER "Nemohu najÃt tiskÃ¡rnu." - PD32_OUT_OF_MEMORY "#-#-#-#-# cs.po (Wine) #-#-#-#-#\n\ -DoÅ¡la pamÄÅ¥.\n\ -#-#-#-#-# cs.po (Wine) #-#-#-#-#\n\ -DostupnÃ¡ pamÄÅ¥ byla vyÄerpÃ¡na." + PD32_OUT_OF_MEMORY "DostupnÃ¡ pamÄÅ¥ byla vyÄerpÃ¡na." PD32_GENERIC_ERROR "Vyskytla se chyba." PD32_DRIVER_UNKNOWN "NeznÃ¡mÃ½ ovladaÄ tiskÃ¡rny." PD32_NO_DEVICES "" Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Da.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Da… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_Da.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_Da.rc [iso-8859-1] Wed Feb 15 20:25:35 2012 @@ -64,10 +64,7 @@ PD32_PRINT_ERROR "Der opstod en printer fejl." PD32_NO_DEFAULT_PRINTER "Ingen standard printer defineret." PD32_CANT_FIND_PRINTER "Kan ikke finde printeren." - PD32_OUT_OF_MEMORY "#-#-#-#-# da.po (Wine) #-#-#-#-#\n\ -Ikke nok hukommelse.\n\ -#-#-#-#-# da.po (Wine) #-#-#-#-#\n\ -Ikke mere hukommelse." + PD32_OUT_OF_MEMORY "Ikke mere hukommelse." PD32_GENERIC_ERROR "Der opstod en fejl." PD32_DRIVER_UNKNOWN "Ukendt printer driver." PD32_NO_DEVICES "FÃ¸r du kan udfÃ¸re printer-relaterede opgaver, som f.eks sideopsÃ¦tning eller udskrivning af dokumenter, skal du installere en printer. Installer venligst en og prÃ¸v igen." Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Eo.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Eo… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_Eo.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_Eo.rc [iso-8859-1] Wed Feb 15 20:25:35 2012 @@ -477,10 +477,7 @@ CAPTION "Malfermu" FONT 8, "MS Shell Dlg" { - LTEXT "#-#-#-#-# eo.po (Wine) #-#-#-#-#\n\ -Dosiero\n\ -#-#-#-#-# eo.po (Wine) #-#-#-#-#\n\ -&Dosiero", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT + LTEXT "&Dosiero", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Dosier&speco:", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Hu.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Hu… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_Hu.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_Hu.rc [iso-8859-1] Wed Feb 15 20:25:35 2012 @@ -64,10 +64,7 @@ PD32_PRINT_ERROR "NyomtatÃ¡si hiba tÃ¶rtÃ©nt." PD32_NO_DEFAULT_PRINTER "Nincs alapÃ©rtelmezett nyomtatÃ³ megadva." PD32_CANT_FIND_PRINTER "Nem talÃ¡lom a nyomtatÃ³t." - PD32_OUT_OF_MEMORY "#-#-#-#-# hu.po (Wine) #-#-#-#-#\n\ -RendkÃvÃ¼l kevÃ©s a memÃ³ria\n\ -#-#-#-#-# hu.po (Wine) #-#-#-#-#\n\ -Elfogyott a memÃ³ria." + PD32_OUT_OF_MEMORY "Elfogyott a memÃ³ria." PD32_GENERIC_ERROR "Hiba tÃ¶rtÃ©nt." PD32_DRIVER_UNKNOWN "Ismeretlen nyomtatÃ³ eszkÃ¶zmeghajtÃ³." PD32_NO_DEVICES "mielÃµtt nyomtatÃ¡si feladatokat hajtana vÃ©gre mint pÃ©ldÃ¡ul oldalbeÃ¡llÃtÃ¡s vagy dokumentum nyomtatÃ¡sa, Ãnnek telepÃtenie kell egy nyomtatÃ³t. Please install one and retry." Modified: trunk/reactos/dll/win32/comdlg32/cdlg_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_No… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_No.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_No.rc [iso-8859-1] Wed Feb 15 20:25:35 2012 @@ -64,10 +64,7 @@ PD32_PRINT_ERROR "En skriverfeil har oppstÃ¥tt." PD32_NO_DEFAULT_PRINTER "Ingen standardskriver er definert." PD32_CANT_FIND_PRINTER "Kunne ikke finne skriveren." - PD32_OUT_OF_MEMORY "#-#-#-#-# nb_NO.po (Wine) #-#-#-#-#\n\ -Ikke nok minne.\n\ -#-#-#-#-# nb_NO.po (Wine) #-#-#-#-#\n\ -Ikke mer minne." + PD32_OUT_OF_MEMORY "Ikke mer minne." PD32_GENERIC_ERROR "En feil har oppstÃ¥tt." PD32_DRIVER_UNKNOWN "Ukjent skriverdriver." PD32_NO_DEVICES "Du mÃ¥ installere en skriver fÃ¸r du kan gjÃ¸re skriver-relaterte oppgaver som Ã¥ endre sideoppsettet og skrive ut et dokument. Installer en og prÃ¸v pÃ¥ nytt." @@ -122,10 +119,7 @@ IDS_COLOR_OLIVE "Oliven" IDS_COLOR_NAVY "MarineblÃ¥" IDS_COLOR_PURPLE "Purpur" - IDS_COLOR_TEAL "#-#-#-#-# nb_NO.po (Wine) #-#-#-#-#\n\ -BlÃ¥grÃ¸nn\n\ -#-#-#-#-# nb_NO.po (Wine) #-#-#-#-#\n\ -Teal" + IDS_COLOR_TEAL "Teal" IDS_COLOR_GRAY "GrÃ¥" IDS_COLOR_SILVER "SÃ¸lv" IDS_COLOR_RED "RÃ¸d" @@ -133,10 +127,7 @@ IDS_COLOR_YELLOW "Gul" IDS_COLOR_BLUE "BlÃ¥" IDS_COLOR_FUCHSIA "Fuchsia" - IDS_COLOR_AQUA "#-#-#-#-# nb_NO.po (Wine) #-#-#-#-#\n\ -Turkis\n\ -#-#-#-#-# nb_NO.po (Wine) #-#-#-#-#\n\ -Aqua" + IDS_COLOR_AQUA "Aqua" IDS_COLOR_WHITE "Hvit" } Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Pt… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_Pt.rc [iso-8859-1] Wed Feb 15 20:25:35 2012 @@ -64,10 +64,7 @@ PD32_PRINT_ERROR "Ocorreu um erro de impressÃ£o." PD32_NO_DEFAULT_PRINTER "NÃ£o existe uma impressora predefinida." PD32_CANT_FIND_PRINTER "NÃ£o Ã© possÃvel encontrar uma impressora." - PD32_OUT_OF_MEMORY "#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -Sem memÃ³ria.\n\ -#-#-#-#-# pt_PT.po (Wine) #-#-#-#-#\n\ -MemÃ³ria insuficiente." + PD32_OUT_OF_MEMORY "MemÃ³ria insuficiente." PD32_GENERIC_ERROR "Ocorreu algum erro." PD32_DRIVER_UNKNOWN "Controlador de impressora desconhecido." PD32_NO_DEVICES "Antes de realizar tarefas relacionadas com a impressora tais como configuraÃ§Ã£o de pÃ¡ginas ou imprimir um documento, precisa instalar uma impressora. Por favor instale uma e tente novamente." Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Ro… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_Ro.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_Ro.rc [iso-8859-1] Wed Feb 15 20:25:35 2012 @@ -75,10 +75,7 @@ PD32_MARGINS_IN_MILLIMETERS "Margini [mm]" PD32_MILLIMETERS "mm" - PD32_PRINTER_STATUS_READY "#-#-#-#-# ro.po (Wine) #-#-#-#-#\n\ -PregÄtit\n\ -#-#-#-#-# ro.po (Wine) #-#-#-#-#\n\ -Gata" + PD32_PRINTER_STATUS_READY "Gata" PD32_PRINTER_STATUS_PAUSED "PauzÄ; " PD32_PRINTER_STATUS_ERROR "Eroare; " PD32_PRINTER_STATUS_PENDING_DELETION "AÈtept stergerea; " @@ -119,39 +116,18 @@ IDS_COLOR_BLACK "Negru" IDS_COLOR_MAROON "Maro" IDS_COLOR_GREEN "Verde" - IDS_COLOR_OLIVE "#-#-#-#-# ro.po (Wine) #-#-#-#-#\n\ -Oliv\n\ -#-#-#-#-# ro.po (Wine) #-#-#-#-#\n\ -Oliviu" - IDS_COLOR_NAVY "#-#-#-#-# ro.po (Wine) #-#-#-#-#\n\ -Bleumarin\n\ -#-#-#-#-# ro.po (Wine) #-#-#-#-#\n\ -Ultramarin" + IDS_COLOR_OLIVE "Oliviu" + IDS_COLOR_NAVY "Ultramarin" IDS_COLOR_PURPLE "Violet" - IDS_COLOR_TEAL "#-#-#-#-# ro.po (Wine) #-#-#-#-#\n\ -Verde-albÄstrui\n\ -#-#-#-#-# ro.po (Wine) #-#-#-#-#\n\ -Verde-albastru" - IDS_COLOR_GRAY "#-#-#-#-# ro.po (Wine) #-#-#-#-#\n\ -Gri\n\ -#-#-#-#-# ro.po (Wine) #-#-#-#-#\n\ -Griu" + IDS_COLOR_TEAL "Verde-albastru" + IDS_COLOR_GRAY "Griu" IDS_COLOR_SILVER "Argintiu" IDS_COLOR_RED "RoÈu" - IDS_COLOR_LIME "#-#-#-#-# ro.po (Wine) #-#-#-#-#\n\ -LÄmÃ¢ie verde\n\ -#-#-#-#-# ro.po (Wine) #-#-#-#-#\n\ -Verde deschis" + IDS_COLOR_LIME "Verde deschis" IDS_COLOR_YELLOW "Galben" IDS_COLOR_BLUE "Albastru" - IDS_COLOR_FUCHSIA "#-#-#-#-# ro.po (Wine) #-#-#-#-#\n\ -Fuchsia\n\ -#-#-#-#-# ro.po (Wine) #-#-#-#-#\n\ -Roz" - IDS_COLOR_AQUA "#-#-#-#-# ro.po (Wine) #-#-#-#-#\n\ -Culoarea apei\n\ -#-#-#-#-# ro.po (Wine) #-#-#-#-#\n\ -Azur" + IDS_COLOR_FUCHSIA "Roz" + IDS_COLOR_AQUA "Azur" IDS_COLOR_WHITE "Alb" } Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Sr… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_Sr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_Sr.rc [iso-8859-1] Wed Feb 15 20:25:35 2012 @@ -50,10 +50,7 @@ STRINGTABLE { - PD32_PRINT_TITLE "#-#-#-#-# sr_RS(a)latin.po (Wine) #-#-#-#-#\n\ -Å tampaj\n\ -#-#-#-#-# sr_RS(a)latin.po (Wine) #-#-#-#-#\n\ -Å tampanje" + PD32_PRINT_TITLE "Å tampanje" PD32_VALUE_UREADABLE "Unos je neÄitljiv" PD32_INVALID_PAGE_RANGE "Ova vrednost ne leÅ¾i na opsegu strane.\n\ @@ -194,25 +191,16 @@ PRINT DIALOG 36, 24, 264, 134 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "#-#-#-#-# sr_RS(a)latin.po (Wine) #-#-#-#-#\n\ -Å tampaj\n\ -#-#-#-#-# sr_RS(a)latin.po (Wine) #-#-#-#-#\n\ -Å tampanje" -FONT 8, "MS Shell Dlg" -{ - LTEXT "#-#-#-#-# sr_RS(a)latin.po (Wine) #-#-#-#-#\n\ -Å tampaj\n\ -#-#-#-#-# sr_RS(a)latin.po (Wine) #-#-#-#-#\n\ -Å tampanje", stc1, 6, 6, 40, 9 +CAPTION "Å tampanje" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Å tampanje", stc1, 6, 6, 40, 9 LTEXT "", stc2, 60, 6, 150, 9 GROUPBOX "&Å tampaj objekat", grp1, 6, 30, 160, 65, BS_GROUPBOX RADIOBUTTON "", rad1, 16, 45, 60, 12 RADIOBUTTON "Odabir teksta", rad2, 16, 60, 60, 12 RADIOBUTTON "Nagore", rad3, 16, 75, 60, 12 - DEFPUSHBUTTON "#-#-#-#-# sr_RS(a)latin.po (Wine) #-#-#-#-#\n\ -Å tampaj\n\ -#-#-#-#-# sr_RS(a)latin.po (Wine) #-#-#-#-#\n\ -Å tampanje", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + DEFPUSHBUTTON "Å tampanje", IDOK, 206, 6, 56, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "OtkaÅ¾i", IDCANCEL, 206, 24, 56, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "Postavke strane", psh1, 206, 46, 56, 14, WS_GROUP | WS_TABSTOP LTEXT "", stc3, 60, 80, 30, 9 @@ -229,10 +217,7 @@ CAPTION "Postavke &Å¡tampe..." FONT 8, "MS Shell Dlg" { - GROUPBOX "#-#-#-#-# sr_RS(a)latin.po (Wine) #-#-#-#-#\n\ -Å tampaj\n\ -#-#-#-#-# sr_RS(a)latin.po (Wine) #-#-#-#-#\n\ -Å tampanje", grp1, 6, 6, 180, 72, BS_GROUPBOX + GROUPBOX "Å tampanje", grp1, 6, 6, 180, 72, BS_GROUPBOX RADIOBUTTON "Podrazumevani Å¡tampaÄ; ", rad1, 16, 16, 150, 12 LTEXT "", stc1, 35, 30, 120, 9 RADIOBUTTON "", rad2, 16, 44, 150, 12 @@ -361,20 +346,14 @@ PRINT32 DIALOG 32, 32, 288, 186 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_CONTEXTHELP | DS_3DLOOK -CAPTION "#-#-#-#-# sr_RS(a)latin.po (Wine) #-#-#-#-#\n\ -Å tampaj\n\ -#-#-#-#-# sr_RS(a)latin.po (Wine) #-#-#-#-#\n\ -Å tampanje" +CAPTION "Å tampanje" FONT 8, "MS Shell Dlg" { DEFPUSHBUTTON "U redu", IDOK, 176,164, 50,14, WS_GROUP | BS_DEFPUSHBUTTON PUSHBUTTON "OtkaÅ¾i", IDCANCEL, 230,164, 50,14, WS_GROUP PUSHBUTTON "&PomoÄ", pshHelp, 50, 161, 50,14, WS_GROUP - GROUPBOX "#-#-#-#-# sr_RS(a)latin.po (Wine) #-#-#-#-#\n\ -Å tampaj\n\ -#-#-#-#-# sr_RS(a)latin.po (Wine) #-#-#-#-#\n\ -Å tampanje", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Å tampanje", grp4, 8, 4, 272,84, WS_GROUP CONTROL "Å tampanje na datoteku", chx1, "Button",BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP,185,36,90,16 PUSHBUTTON "&Svojstva", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Naziv:", stc6, 16, 20, 36,8 @@ -397,10 +376,7 @@ GROUPBOX "&Å tampaj objekat", grp1, 8,92, 144,64, WS_GROUP CONTROL "", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 CONTROL "", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 - CONTROL "#-#-#-#-# sr_RS(a)latin.po (Wine) #-#-#-#-#\n\ -&Izbor\n\ -#-#-#-#-# sr_RS(a)latin.po (Wine) #-#-#-#-#\n\ -&Izaberi", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 + CONTROL "&Izaberi", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 EDITTEXT edt1, 73,122, 26,12, WS_GROUP | ES_NUMBER EDITTEXT edt2, 120,122, 26,12, WS_GROUP | ES_NUMBER RTEXT "", stc2, 52,124, 20,8 @@ -416,10 +392,7 @@ PUSHBUTTON "OtkaÅ¾i",IDCANCEL,230,156,50,14 /* PUSHBUTTON "Network...", psh5, 284,156,48,14 */ - GROUPBOX "#-#-#-#-# sr_RS(a)latin.po (Wine) #-#-#-#-#\n\ -Å tampaj\n\ -#-#-#-#-# sr_RS(a)latin.po (Wine) #-#-#-#-#\n\ -Å tampanje", grp4, 8, 4, 272,84, WS_GROUP + GROUPBOX "Å tampanje", grp4, 8, 4, 272,84, WS_GROUP PUSHBUTTON "&Svojstva", psh2, 212, 17, 60,14, WS_GROUP LTEXT "&Naziv:", stc6, 16, 20, 36,8 COMBOBOX cmb1, 52, 18, 152,152,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP @@ -488,10 +461,7 @@ LTEXT "&Datoteka",IDC_FILENAMESTATIC,5,112,56,16, SS_NOTIFY EDITTEXT IDC_FILENAME,63,110,150,12,ES_AUTOHSCROLL - LTEXT "#-#-#-#-# sr_RS(a)latin.po (Wine) #-#-#-#-#\n\ -&Datoteka\n\ -#-#-#-#-# sr_RS(a)latin.po (Wine) #-#-#-#-#\n\ -&Fajl",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY + LTEXT "&Fajl",IDC_FILETYPESTATIC,5,130,56,16, SS_NOTIFY COMBOBOX IDC_FILETYPE,63,128,150,53,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP CONTROL "",IDC_OPENREADONLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,63,148,150,10 @@ -510,10 +480,7 @@ LTEXT "&Datoteka", IDC_FILENAMESTATIC, 160, 240, 60, 9, SS_RIGHT EDITTEXT IDC_FILENAME, 226, 240, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP - LTEXT "#-#-#-#-# sr_RS(a)latin.po (Wine) #-#-#-#-#\n\ -&Datoteka\n\ -#-#-#-#-# sr_RS(a)latin.po (Wine) #-#-#-#-#\n\ -&Fajl", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT + LTEXT "&Fajl", IDC_FILETYPESTATIC, 160, 256, 60, 9, SS_RIGHT COMBOBOX IDC_FILETYPE, 226, 256, 100, 12, WS_CHILD | WS_VISIBLE | WS_TABSTOP | CBS_HASSTRINGS | CBS_DROPDOWNLIST Modified: trunk/reactos/dll/win32/comdlg32/cdlg_Zh.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comdlg32/cdlg_Zh… ============================================================================== --- trunk/reactos/dll/win32/comdlg32/cdlg_Zh.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/comdlg32/cdlg_Zh.rc [iso-8859-1] Wed Feb 15 20:25:35 2012 @@ -64,10 +64,7 @@ PD32_PRINT_ERROR "æå°æºéè¯¯ã" PD32_NO_DEFAULT_PRINTER "æ²¡æé»è®¤æå°æºã" PD32_CANT_FIND_PRINTER "æ¾ä¸å°æå°æºã" - PD32_OUT_OF_MEMORY "#-#-#-#-# zh_CN.po (Wine) #-#-#-#-#\n\ -ååæº¢åºã\n\ -#-#-#-#-# zh_CN.po (Wine) #-#-#-#-#\n\ -ååä¸å¤ã" + PD32_OUT_OF_MEMORY "ååä¸å¤ã" PD32_GENERIC_ERROR "åºç°äºéè¯¯ã" PD32_DRIVER_UNKNOWN "æ¾ä¸å°æå°æºé©±å¨ç¨åºã" PD32_NO_DEVICES "å¨å®è£æå°æºåæè½ä½¿ç¨åæå°æºç¸å³çåè½ãè¯·å®è£ååè¯ã"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs