[ros-diffs] [ion] 55646: [CSRSRV2]: Bug fixes.

Author: ion
Date: Thu Feb 16 19:15:00 2012
New Revision: 55646

URL: http://svn.reactos.org/svn/reactos?rev=55646&view=rev
Log:
[CSRSRV2]: Bug fixes.

Modified:
    trunk/reactos/subsystems/csr/csrsrv/server.c

Modified: trunk/reactos/subsystems/csr/csrsrv/server.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/serve...
==============================================================================
--- trunk/reactos/subsystems/csr/csrsrv/server.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/csr/csrsrv/server.c [iso-8859-1] Thu Feb 16 19:15:00 2012
@@ -173,7 +173,7 @@
     if (NT_SUCCESS(Status))
     {
         /* Get the result from the Server DLL */
-        Status = (*ServerDllInitProcedure)(ServerDll);
+        Status = ServerDllInitProcedure(ServerDll);

/* Check for Success */
         if (NT_SUCCESS(Status))
@@ -283,7 +283,7 @@
     {
         return STATUS_TOO_MANY_NAMES;
     }
-    else if (!(CsrLoadedServerDll[ClientConnect->ServerId]))
+    else if (!CsrLoadedServerDll[ClientConnect->ServerId])
     {
         return STATUS_INVALID_PARAMETER;
     }
@@ -305,9 +305,9 @@
     if (ServerDll->ConnectCallback)
     {
         /* Call the callback */
-        Status = (ServerDll->ConnectCallback)(CurrentProcess,
-                                              ClientConnect->ConnectionInfo,
-                                              &ClientConnect->ConnectionInfoSize);
+        Status = ServerDll->ConnectCallback(CurrentProcess,
+                                            ClientConnect->ConnectionInfo,
+                                            &ClientConnect->ConnectionInfoSize);
     }
     else
     {
@@ -347,7 +347,7 @@
     PPEB Peb = NtCurrentPeb();

/* If there's no parameter, fail */
-    if (ParameterValue) return STATUS_INVALID_PARAMETER;
+    if (!ParameterValue) return STATUS_INVALID_PARAMETER;

/* Find the first comma, and null terminate */
     while (*SizeValue)
@@ -400,7 +400,7 @@
     {
         /* Fail */
         NtClose(CsrSrvSharedSection);
-        return(Status);
+        return Status;
     }

/* FIXME: Write the value to registry */