[ros-diffs] [ea] 13689: SM_ missing updated headers

SM_ missing updated headers
Modified: trunk/reactos/include/sm/api.h
Modified: trunk/reactos/include/sm/helper.h
  _____  

Modified: trunk/reactos/include/sm/api.h
--- trunk/reactos/include/sm/api.h	2005-02-20 16:37:58 UTC (rev
13688)
+++ trunk/reactos/include/sm/api.h	2005-02-20 16:46:10 UTC (rev
13689)
@@ -8,6 +8,29 @@

 
 #pragma pack(push,4)
 
+/*** DATA TYPES ******************************************************/
+
+#define SM_SB_NAME_MAX_LENGTH 120
+
+#pragma pack(push,4)
+
+/* SmConnectApiPort */
+typedef struct _SM_CONNECT_DATA
+{
+  ULONG  Subsystem;
+  WCHAR  SbName [SM_SB_NAME_MAX_LENGTH];
+
+} SM_CONNECT_DATA, *PSM_CONNECT_DATA;
+
+/* SmpConnectSbApiPort */
+typedef struct _SB_CONNECT_DATA
+{
+  ULONG SmApiMax;
+} SB_CONNECT_DATA, *PSB_CONNECT_DATA;
+
+
+/*** SM API ***/
+
 /*** 1
****************************************************************/
 
 #define SM_API_COMPLETE_SESSION	1	/* complete a session
initialization */
@@ -65,8 +88,9 @@
 
 /*** MACRO ***********************************************************/
 
-#define SM_PORT_DATA_SIZE(c)
(sizeof(DWORD)+sizeof(NTSTATUS)+sizeof(c))
-#define SM_PORT_MESSAGE_SIZE  (sizeof(SM_PORT_MESSAGE))
+#define SM_CONNECT_DATA_SIZE(m)  ((m).Header.DataSize-sizeof(ULONG))
+#define SM_PORT_DATA_SIZE(c)
(sizeof(DWORD)+sizeof(NTSTATUS)+sizeof(c))
+#define SM_PORT_MESSAGE_SIZE     (sizeof(SM_PORT_MESSAGE))
 
 
 #endif /* !def __SM_API_H */
  _____  

Modified: trunk/reactos/include/sm/helper.h
--- trunk/reactos/include/sm/helper.h	2005-02-20 16:37:58 UTC (rev
13688)
+++ trunk/reactos/include/sm/helper.h	2005-02-20 16:46:10 UTC (rev
13689)
@@ -1,32 +1,8 @@

 #ifndef INCLUDE_SM_HELPER_H
 #define INCLUDE_SM_HELPER_H
+#define _SM_HELPER_H
+/* $Id$ */
 
-/*** DATA TYPES ******************************************************/
-
-#define SM_SB_NAME_MAX_LENGTH 120
-
-#pragma pack(push,4)
-
-/* SmConnectApiPort */
-typedef struct _SM_CONNECT_DATA
-{
-  ULONG  Subsystem;
-  WCHAR  SbName [SM_SB_NAME_MAX_LENGTH];
-
-} SM_CONNECT_DATA, *PSM_CONNECT_DATA;
-
-/* SmpConnectSbApiPort */
-typedef struct _SB_CONNECT_DATA
-{
-  ULONG SmApiMax;
-} SB_CONNECT_DATA, *PSB_CONNECT_DATA;
-
-#pragma pack(pop)
-
-
-/*** PROTOTYPES ******************************************************/
-
-
 /* smdll/connect.c */
 NTSTATUS STDCALL
 SmConnectApiPort (IN      PUNICODE_STRING  pSbApiPortName  OPTIONAL,