[ros-diffs] [hbelusca] 58103: [BASESRV] Remove a temporary DPRINT1. [CSRSRV] - Shut down debug output. - Fix some misspellings. - Fix a bug in CsrMoveSatisfiedWaits ("satisfied" waits are waits where WaitFunct...

Author: hbelusca
Date: Thu Jan  3 17:18:19 2013
New Revision: 58103

URL: http://svn.reactos.org/svn/reactos?rev=58103&view=rev
Log:
[BASESRV]
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).

Modified:
    branches/ros-csrss/subsystems/win/basesrv/server.c
    branches/ros-csrss/subsystems/win32/csrsrv/api.c
    branches/ros-csrss/subsystems/win32/csrsrv/init.c
    branches/ros-csrss/subsystems/win32/csrsrv/procsup.c
    branches/ros-csrss/subsystems/win32/csrsrv/wait.c

Modified: branches/ros-csrss/subsystems/win/basesrv/server.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win/basesr…
==============================================================================
--- branches/ros-csrss/subsystems/win/basesrv/server.c [iso-8859-1] (original)
+++ branches/ros-csrss/subsystems/win/basesrv/server.c [iso-8859-1] Thu Jan  3 17:18:19
2013
@@ -83,7 +83,7 @@
     }
     if ((Flags & 2) == 0)
     {
-        DPRINT1("BaseSrvCreateProcess - Launching a Console process\n");
+        /* We are launching a console process */
         DebugFlags |= CsrProcessIsConsoleApp;
     }
 

Modified: branches/ros-csrss/subsystems/win32/csrsrv/api.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs…
==============================================================================
--- branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] (original)
+++ branches/ros-csrss/subsystems/win32/csrsrv/api.c [iso-8859-1] Thu Jan  3 17:18:19
2013
@@ -11,7 +11,7 @@
 
 #include "srv.h"
 
-//#define NDEBUG
+#define NDEBUG
 #include <debug.h>
 
 /* GLOBALS ********************************************************************/
@@ -1329,7 +1329,7 @@
  * @param ElementSize
  *        Size of each element.
  *
- * @return TRUE if validation suceeded, FALSE otherwise.
+ * @return TRUE if validation succeeded, FALSE otherwise.
  *
  * @remarks None.
  *
@@ -1447,7 +1447,7 @@
  * @param MessageString
  *        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.
  *

Modified: branches/ros-csrss/subsystems/win32/csrsrv/init.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs…
==============================================================================
--- branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] (original)
+++ branches/ros-csrss/subsystems/win32/csrsrv/init.c [iso-8859-1] Thu Jan  3 17:18:19
2013
@@ -25,7 +25,7 @@
 HANDLE CsrSmApiPort = NULL;
 HANDLE hSbApiPort = NULL;
 HANDLE CsrApiPort = NULL;
-ULONG CsrDebug = 0xFFFFFFFF; // 0;
+ULONG CsrDebug = 0; // 0xFFFFFFFF;
 ULONG CsrMaxApiRequestThreads;
 ULONG CsrTotalPerProcessDataLength;
 ULONG SessionId;

Modified: branches/ros-csrss/subsystems/win32/csrsrv/procsup.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs…
==============================================================================
--- branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] (original)
+++ branches/ros-csrss/subsystems/win32/csrsrv/procsup.c [iso-8859-1] Thu Jan  3 17:18:19
2013
@@ -1007,7 +1007,7 @@
  * @param CsrThread
  *        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.
  *

Modified: branches/ros-csrss/subsystems/win32/csrsrv/wait.c
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/subsystems/win32/csrs…
==============================================================================
--- branches/ros-csrss/subsystems/win32/csrsrv/wait.c [iso-8859-1] (original)
+++ branches/ros-csrss/subsystems/win32/csrsrv/wait.c [iso-8859-1] Thu Jan  3 17:18:19
2013
@@ -127,13 +127,13 @@
                    IN BOOLEAN DereferenceThread)
 {
     /* Call the wait function */
-    if ((WaitBlock->WaitFunction)(WaitList,
-                                  WaitBlock->WaitThread,
-                                  &WaitBlock->WaitApiMessage,
-                                  WaitBlock->WaitContext,
-                                  WaitArgument1,
-                                  WaitArgument2,
-                                  WaitFlags))
+    if (WaitBlock->WaitFunction(WaitList,
+                                WaitBlock->WaitThread,
+                                &WaitBlock->WaitApiMessage,
+                                WaitBlock->WaitContext,
+                                WaitArgument1,
+                                WaitArgument2,
+                                WaitFlags))
     {
         /* The wait is done, clear the block */
         WaitBlock->WaitThread->WaitBlock = NULL;
@@ -175,11 +175,11 @@
             /* The wait is complete, but the thread is being kept alive */
             WaitBlock->WaitFunction = NULL;
         }
-    
-        /* The wait suceeded */
+
+        /* The wait succeeded */
         return TRUE;
     }
-    
+
     /* The wait failed */
     return FALSE;
 }
@@ -297,8 +297,8 @@
         /* Move to the next entry */
         NextEntry = NextEntry->Flink;
 
-        /* Check if there's no Wait Routine */
-        if (!WaitBlock->WaitFunction)
+        /* Check if there's no Wait Routine (satisfied wait) */
+        if (WaitBlock->WaitFunction == NULL)
         {
             /* Remove it from the Wait List */
             if (WaitBlock->WaitList.Flink)
@@ -366,8 +366,8 @@
         /* Go to the next entry */
         NextEntry = NextEntry->Flink;
 
-        /* Check if there is a Wait Callback */
-        if (WaitBlock->WaitFunction)
+        /* Check if there's no Wait Routine (satisfied wait) */
+        if (WaitBlock->WaitFunction == NULL)
         {
             /* Remove it from the Wait Block Queue */
             RemoveEntryList(&WaitBlock->WaitList);
@@ -427,8 +427,8 @@
         /* Go to the next entry */
         NextEntry = NextEntry->Flink;
 
-        /* Check if there is a Wait Callback */
-        if (WaitBlock->WaitFunction)
+        /* Check if there is a Wait Routine */
+        if (WaitBlock->WaitFunction != NULL)
         {
             /* Notify the Waiter */
             NotifySuccess |= CsrNotifyWaitBlock(WaitBlock,