[ros-diffs] [ion] 55614: [CSRSRV2]: Fix some bugs.

Author: ion
Date: Wed Feb 15 19:47:28 2012
New Revision: 55614

URL: http://svn.reactos.org/svn/reactos?rev=55614&view=rev
Log:
[CSRSRV2]: Fix some bugs.

Modified:
    trunk/reactos/subsystems/csr/csrsrv/api.c
    trunk/reactos/subsystems/csr/csrsrv/init.c

Modified: trunk/reactos/subsystems/csr/csrsrv/api.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/api.c...
==============================================================================
--- trunk/reactos/subsystems/csr/csrsrv/api.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/csr/csrsrv/api.c [iso-8859-1] Wed Feb 15 19:47:28 2012
@@ -153,15 +153,15 @@
     InitializeObjectAttributes(&ObjectAttributes,
                                &CsrSbApiPortName,
                                0,
-                               PortSd,
-                               NULL);
+                               NULL,
+                               PortSd);

/* Create the Port Object */
     Status = NtCreatePort(&CsrSbApiPort,
                           &ObjectAttributes,
                           sizeof(SB_CONNECTION_INFO),
-                          sizeof(PSB_API_MSG),
-                          32 * sizeof(PSB_API_MSG));
+                          sizeof(SB_API_MSG),
+                          32 * sizeof(SB_API_MSG));
     if (PortSd) RtlFreeHeap(CsrHeap, 0, PortSd);

if (NT_SUCCESS(Status))

Modified: trunk/reactos/subsystems/csr/csrsrv/init.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/init....
==============================================================================
--- trunk/reactos/subsystems/csr/csrsrv/init.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/csr/csrsrv/init.c [iso-8859-1] Wed Feb 15 19:47:28 2012
@@ -771,8 +771,8 @@
  *--*/
 NTSTATUS
 NTAPI
-CsrServerInitialization(ULONG ArgumentCount,
-                        PCHAR Arguments[])
+CsrServerInitialization(IN ULONG ArgumentCount,
+                        IN PCHAR Arguments[])
 {
     NTSTATUS Status = STATUS_SUCCESS;
     ULONG i = 0;
@@ -865,7 +865,7 @@
         ServerDll = CsrLoadedServerDll[i];

/* Is it loaded, and does it have per process data? */
-        if (ServerDll && ServerDll->SizeOfProcessData)
+        if ((ServerDll) && (ServerDll->SizeOfProcessData))
         {
             /* It does, give it part of our allocated heap */
             CsrRootProcess->ServerData[i] = ProcessData;
@@ -888,10 +888,10 @@
         ServerDll = CsrLoadedServerDll[i];

/* Is it loaded, and does it a callback for new processes? */
-        if (ServerDll && ServerDll->NewProcessCallback)
+        if ((ServerDll) && (ServerDll->NewProcessCallback))
         {
             /* Call the callback */
-            (*ServerDll->NewProcessCallback)(NULL, CsrRootProcess);
+            ServerDll->NewProcessCallback(NULL, CsrRootProcess);
         }
     }