[ros-diffs] [hbelusca] 57643: [NTDLL/CSR/SM] - Clean some headers. - Code formatting.

Author: hbelusca
Date: Sun Oct 28 22:56:13 2012
New Revision: 57643

URL: http://svn.reactos.org/svn/reactos?rev=57643&view=rev
Log:
[NTDLL/CSR/SM]
- Clean some headers.
- Code formatting.

Removed:
    branches/ros-csrss/include/reactos/subsys/csr/csrss.h
Modified:
    branches/ros-csrss/   (props changed)
    branches/ros-csrss/dll/ntdll/include/ntdll.h
    branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h
    branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h
    branches/ros-csrss/include/reactos/subsys/sm/api.h   (props changed)
    branches/ros-csrss/include/reactos/subsys/sm/helper.h   (contents, props changed)
    branches/ros-csrss/include/reactos/subsys/sm/ns.h   (contents, props changed)
    branches/ros-csrss/include/reactos/subsys/win/base.h

Propchange: branches/ros-csrss/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Oct 28 22:56:13 2012
@@ -13,4 +13,4 @@

/branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859
 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567
 /branches/wlan-bringup:54809-54998
-/trunk/reactos:57561-57634
+/trunk/reactos:57561-57641

Modified: branches/ros-csrss/dll/ntdll/include/ntdll.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/dll/ntdll/include/ntd…
==============================================================================
--- branches/ros-csrss/dll/ntdll/include/ntdll.h [iso-8859-1] (original)
+++ branches/ros-csrss/dll/ntdll/include/ntdll.h [iso-8859-1] Sun Oct 28 22:56:13 2012
@@ -41,7 +41,8 @@
 /* Internal NTDLL */
 #include "ntdllp.h"
 
-/* CSRSS Header */
+/* CSRSS Headers */
+#include <csr/csrsrv.h>
 #include <csr/csr.h>
 
 /* PSEH */

Modified: branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy…
==============================================================================
--- branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] (original)
+++ branches/ros-csrss/include/reactos/subsys/csr/csrmsg.h [iso-8859-1] Sun Oct 28
22:56:13 2012
@@ -97,9 +97,6 @@
     ULONG_PTR PointerArray[1];
 } CSR_CAPTURE_BUFFER, *PCSR_CAPTURE_BUFFER;
 
-
-#include "csrss.h" // remove it when the data structures are not used anymore.
-
 /* Keep in sync with definition below. */
 // #define CSRSS_HEADER_SIZE (sizeof(PORT_MESSAGE) + sizeof(ULONG) + sizeof(NTSTATUS))
 
@@ -118,17 +115,8 @@
             union
             {
                 CSR_CLIENT_CONNECT CsrClientConnect;
-
                 CSR_SET_PRIORITY_CLASS SetPriorityClass;
                 CSR_IDENTIFY_ALTERTABLE_THREAD IdentifyAlertableThread;
-
-            /*** win32csr thingies to remove. ***/
-#if 1
-                CSRSS_CREATE_DESKTOP CreateDesktopRequest;
-                CSRSS_SHOW_DESKTOP ShowDesktopRequest;
-                CSRSS_HIDE_DESKTOP HideDesktopRequest;
-#endif
-            /************************************/
             } Data;
         };
     };

Modified: branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy…
==============================================================================
--- branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] (original)
+++ branches/ros-csrss/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] Sun Oct 28
22:56:13 2012
@@ -22,6 +22,9 @@
 #include "csrmsg.h"
 
 /* TYPES **********************************************************************/
+
+// Used in ntdll/csr/connect.c
+#define CSR_CSRSS_SECTION_SIZE    (65536)
 
 typedef struct _CSR_NT_SESSION
 {

Removed: branches/ros-csrss/include/reactos/subsys/csr/csrss.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy…
==============================================================================
--- branches/ros-csrss/include/reactos/subsys/csr/csrss.h [iso-8859-1] (original)
+++ branches/ros-csrss/include/reactos/subsys/csr/csrss.h (removed)
@@ -1,33 +1,0 @@
-/*****************************  CSRSS Data  ***********************************/
-
-#ifndef __INCLUDE_CSRSS_CSRSS_H
-#define __INCLUDE_CSRSS_CSRSS_H
-
-// Used in ntdll/csr/connect.c
-#define CSR_CSRSS_SECTION_SIZE    (65536)
-
-
-/*** win32csr thingies to remove. ***/
-#if 1
-
-typedef struct
-{
-    HDESK DesktopHandle;
-} CSRSS_CREATE_DESKTOP, *PCSRSS_CREATE_DESKTOP;
-
-typedef struct
-{
-    HWND DesktopWindow;
-    ULONG Width;
-    ULONG Height;
-} CSRSS_SHOW_DESKTOP, *PCSRSS_SHOW_DESKTOP;
-
-typedef struct
-{
-    HWND DesktopWindow;
-} CSRSS_HIDE_DESKTOP, *PCSRSS_HIDE_DESKTOP;
-
-#endif
-/************************************/
-
-#endif /* __INCLUDE_CSRSS_CSRSS_H */

Propchange: branches/ros-csrss/include/reactos/subsys/sm/api.h
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords (removed)
@@ -1,1 +1,0 @@
-author date id revision

Modified: branches/ros-csrss/include/reactos/subsys/sm/helper.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy…
==============================================================================
--- branches/ros-csrss/include/reactos/subsys/sm/helper.h [iso-8859-1] (original)
+++ branches/ros-csrss/include/reactos/subsys/sm/helper.h [iso-8859-1] Sun Oct 28 22:56:13
2012
@@ -5,36 +5,33 @@
 #include <sm/api.h>
 #endif
 
-/* $Id$ */
-
 /* smlib/connect.c */
 NTSTATUS WINAPI
-SmConnectApiPort (IN      PUNICODE_STRING  pSbApiPortName  OPTIONAL,
-		  IN      HANDLE           hSbApiPort      OPTIONAL,
-		  IN      WORD             wSubsystem      OPTIONAL, /* pe.h */
-		  IN OUT  PHANDLE          phSmApiPort);
+SmConnectApiPort(IN      PUNICODE_STRING  pSbApiPortName  OPTIONAL,
+                 IN      HANDLE           hSbApiPort      OPTIONAL,
+                 IN      WORD             wSubsystem      OPTIONAL, /* pe.h */
+                 IN OUT  PHANDLE          phSmApiPort);
 /* smlib/compses.c */
 NTSTATUS WINAPI
-SmCompleteSession (IN     HANDLE  hSmApiPort,
-		   IN     HANDLE  hSbApiPort,
-		   IN     HANDLE  hApiPort);
+SmCompleteSession(IN     HANDLE  hSmApiPort,
+                  IN     HANDLE  hSbApiPort,
+                  IN     HANDLE  hApiPort);
 /* smlib/execpgm.c */
 NTSTATUS WINAPI
-SmExecuteProgram (IN     HANDLE           hSmApiPort,
-		  IN     PUNICODE_STRING  Pgm
-		  );
+SmExecuteProgram(IN     HANDLE           hSmApiPort,
+                 IN     PUNICODE_STRING  Pgm);
 /* smdll/query.c */
 NTSTATUS WINAPI
-SmQueryInformation (IN      HANDLE                SmApiPort,
-		    IN      SM_INFORMATION_CLASS  SmInformationClass,
-		    IN OUT  PVOID                 Data,
-		    IN      ULONG                 DataLength,
-		    IN OUT  PULONG                ReturnedDataLength OPTIONAL);
+SmQueryInformation(IN      HANDLE                SmApiPort,
+                   IN      SM_INFORMATION_CLASS  SmInformationClass,
+                   IN OUT  PVOID                 Data,
+                   IN      ULONG                 DataLength,
+                   IN OUT  PULONG                ReturnedDataLength OPTIONAL);
 /* smlib/lookupss.c */
 NTSTATUS WINAPI
-SmLookupSubsystem (IN     PWSTR   Name,
-		   IN OUT PWSTR   Data,
-		   IN OUT PULONG  DataLength,
-		   IN OUT PULONG  DataType,
-		   IN     PVOID   Environment OPTIONAL);
+SmLookupSubsystem(IN     PWSTR   Name,
+                  IN OUT PWSTR   Data,
+                  IN OUT PULONG  DataLength,
+                  IN OUT PULONG  DataType,
+                  IN     PVOID   Environment OPTIONAL);
 #endif /* ndef INCLUDE_SM_HELPER_H */

Propchange: branches/ros-csrss/include/reactos/subsys/sm/helper.h
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords (removed)
@@ -1,1 +1,0 @@
-author date id revision

Modified: branches/ros-csrss/include/reactos/subsys/sm/ns.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy…
==============================================================================
--- branches/ros-csrss/include/reactos/subsys/sm/ns.h [iso-8859-1] (original)
+++ branches/ros-csrss/include/reactos/subsys/sm/ns.h [iso-8859-1] Sun Oct 28 22:56:13
2012
@@ -1,9 +1,7 @@
 #if !defined(INCLUDE_SM_NS_H)
 #define INCLUDE_SM_NS_H
 
-/* $Id$ */
-
-#define SM_REGISTRY_ROOT_NAME	     L"\\Session Manager"
+#define SM_REGISTRY_ROOT_NAME        L"\\Session Manager"
 #define SM_REGISTRY_SUBSYSTEMS_NAME  L"SubSystems"
 
 #define SM_API_PORT_NAME    L"\\SmApiPort"

Propchange: branches/ros-csrss/include/reactos/subsys/sm/ns.h
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords (removed)
@@ -1,1 +1,0 @@
-id author date revision

Modified: branches/ros-csrss/include/reactos/subsys/win/base.h
URL:
http://svn.reactos.org/svn/reactos/branches/ros-csrss/include/reactos/subsy…
==============================================================================
--- branches/ros-csrss/include/reactos/subsys/win/base.h [iso-8859-1] (original)
+++ branches/ros-csrss/include/reactos/subsys/win/base.h [iso-8859-1] Sun Oct 28 22:56:13
2012
@@ -13,7 +13,7 @@
 
 typedef VOID (CALLBACK * BASE_PROCESS_CREATE_NOTIFY_ROUTINE)(PVOID);
 
-NTSTATUS WINAPI BaseSetProcessCreateNotify (BASE_PROCESS_CREATE_NOTIFY_ROUTINE);
+NTSTATUS WINAPI BaseSetProcessCreateNotify(BASE_PROCESS_CREATE_NOTIFY_ROUTINE);
 // CSR_SERVER_DLL_INIT(ServerDllInitialization);
 
 typedef struct _NLS_USER_INFO