Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-06 09:50:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

[BASESRV]

Browse source 
Remove a temporary DPRINT1.

[CSRSRV]
- Shut down debug output.
- Fix some misspellings.
- Fix a bug in CsrMoveSatisfiedWaits ("satisfied" waits are waits where WaitFunction was put to NULL during a previous call to CsrNotifyWait, but still not dereferenced, and which can be dereferenced by a call to CsrDereferenceWait).

svn path=/branches/ros-csrss/; revision=58103
This commit is contained in:
Hermès Bélusca-Maïto 2013-01-03 17:18:19 +00:00
parent dd5a9c5231
commit 0345e745fd
5 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
subsystems/win/basesrv/server.c
View file

@ -83,7 +83,7 @@ CSR_API(BaseSrvCreateProcess)
} }
if ((Flags & 2) == 0) if ((Flags & 2) == 0)
{ {
DPRINT1("BaseSrvCreateProcess - Launching a Console process\n"); /* We are launching a console process */
DebugFlags |= CsrProcessIsConsoleApp; DebugFlags |= CsrProcessIsConsoleApp;
} }

6
subsystems/win32/csrsrv/api.c
View file

@ -11,7 +11,7 @@
#include "srv.h" #include "srv.h"
//#define NDEBUG #define NDEBUG
#include <debug.h> #include <debug.h>
/* GLOBALS ********************************************************************/ /* GLOBALS ********************************************************************/
@ -1329,7 +1329,7 @@ CsrReleaseCapturedArguments(IN PCSR_API_MESSAGE ApiMessage)
* @param ElementSize * @param ElementSize
* Size of each element. * Size of each element.
* *
* @return TRUE if validation suceeded, FALSE otherwise. * @return TRUE if validation succeeded, FALSE otherwise.
* *
* @remarks None. * @remarks None.
* *
@ -1447,7 +1447,7 @@ Win32CsrValidateBuffer(PCSR_PROCESS ProcessData, PVOID Buffer,
* @param MessageString * @param MessageString
* Pointer to the buffer containing the string to validate. * Pointer to the buffer containing the string to validate.
* *
* @return TRUE if validation suceeded, FALSE otherwise. * @return TRUE if validation succeeded, FALSE otherwise.
* *
* @remarks None. * @remarks None.
* *

2
subsystems/win32/csrsrv/init.c
View file

@ -25,7 +25,7 @@ PCSR_THREAD CsrSbApiRequestThreadPtr;
HANDLE CsrSmApiPort = NULL; HANDLE CsrSmApiPort = NULL;
HANDLE hSbApiPort = NULL; HANDLE hSbApiPort = NULL;
HANDLE CsrApiPort = NULL; HANDLE CsrApiPort = NULL;
ULONG CsrDebug = 0xFFFFFFFF; // 0; ULONG CsrDebug = 0; // 0xFFFFFFFF;
ULONG CsrMaxApiRequestThreads; ULONG CsrMaxApiRequestThreads;
ULONG CsrTotalPerProcessDataLength; ULONG CsrTotalPerProcessDataLength;
ULONG SessionId; ULONG SessionId;

2
subsystems/win32/csrsrv/procsup.c
View file

@ -1007,7 +1007,7 @@ CsrGetProcessLuid(IN HANDLE hProcess OPTIONAL,
* @param CsrThread * @param CsrThread
* Pointer to the CSR Thread to impersonate. * Pointer to the CSR Thread to impersonate.
* *
* @return TRUE if impersionation suceeded, false otherwise. * @return TRUE if impersonation succeeded, false otherwise.
* *
* @remarks Impersonation can be recursive. * @remarks Impersonation can be recursive.
* *

32
subsystems/win32/csrsrv/wait.c
View file

@ -127,13 +127,13 @@ CsrNotifyWaitBlock(IN PCSR_WAIT_BLOCK WaitBlock,
IN BOOLEAN DereferenceThread) IN BOOLEAN DereferenceThread)
{ {
/* Call the wait function */ /* Call the wait function */
if ((WaitBlock->WaitFunction)(WaitList, if (WaitBlock->WaitFunction(WaitList,
WaitBlock->WaitThread, WaitBlock->WaitThread,
&WaitBlock->WaitApiMessage, &WaitBlock->WaitApiMessage,
WaitBlock->WaitContext, WaitBlock->WaitContext,
WaitArgument1, WaitArgument1,
WaitArgument2, WaitArgument2,
WaitFlags)) WaitFlags))
{ {
/* The wait is done, clear the block */ /* The wait is done, clear the block */
WaitBlock->WaitThread->WaitBlock = NULL; WaitBlock->WaitThread->WaitBlock = NULL;
@ -175,11 +175,11 @@ CsrNotifyWaitBlock(IN PCSR_WAIT_BLOCK WaitBlock,
/* The wait is complete, but the thread is being kept alive */ /* The wait is complete, but the thread is being kept alive */
WaitBlock->WaitFunction = NULL; WaitBlock->WaitFunction = NULL;
} }
/* The wait suceeded */ /* The wait succeeded */
return TRUE; return TRUE;
} }
/* The wait failed */ /* The wait failed */
return FALSE; return FALSE;
} }
@ -297,8 +297,8 @@ CsrDereferenceWait(IN PLIST_ENTRY WaitList)
/* Move to the next entry */ /* Move to the next entry */
NextEntry = NextEntry->Flink; NextEntry = NextEntry->Flink;
/* Check if there's no Wait Routine */ /* Check if there's no Wait Routine (satisfied wait) */
if (!WaitBlock->WaitFunction) if (WaitBlock->WaitFunction == NULL)
{ {
/* Remove it from the Wait List */ /* Remove it from the Wait List */
if (WaitBlock->WaitList.Flink) if (WaitBlock->WaitList.Flink)
@ -366,8 +366,8 @@ CsrMoveSatisfiedWait(IN PLIST_ENTRY NewEntry,
/* Go to the next entry */ /* Go to the next entry */
NextEntry = NextEntry->Flink; NextEntry = NextEntry->Flink;
/* Check if there is a Wait Callback */ /* Check if there's no Wait Routine (satisfied wait) */
if (WaitBlock->WaitFunction) if (WaitBlock->WaitFunction == NULL)
{ {
/* Remove it from the Wait Block Queue */ /* Remove it from the Wait Block Queue */
RemoveEntryList(&WaitBlock->WaitList); RemoveEntryList(&WaitBlock->WaitList);
@ -427,8 +427,8 @@ CsrNotifyWait(IN PLIST_ENTRY WaitList,
/* Go to the next entry */ /* Go to the next entry */
NextEntry = NextEntry->Flink; NextEntry = NextEntry->Flink;
/* Check if there is a Wait Callback */ /* Check if there is a Wait Routine */
if (WaitBlock->WaitFunction) if (WaitBlock->WaitFunction != NULL)
{ {
/* Notify the Waiter */ /* Notify the Waiter */
NotifySuccess |= CsrNotifyWaitBlock(WaitBlock, NotifySuccess |= CsrNotifyWaitBlock(WaitBlock,