From 05061cedaa828985d99845b1aaf7ba4d327703e0 Mon Sep 17 00:00:00 2001
From: Filip Navara <filip.navara@gmail.com>
Date: Fri, 17 Jun 2005 08:05:58 +0000
Subject: [PATCH] Use W32API.

svn path=/trunk/; revision=15952
---
 reactos/include/sm/api.h    | 36 +++++++++++++++++++-----------------
 reactos/lib/smdll/smdll.xml |  1 +
 reactos/lib/smlib/smlib.xml |  1 +
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/reactos/include/sm/api.h b/reactos/include/sm/api.h
index 9b4944b5f5f..db6a98f9977 100644
--- a/reactos/include/sm/api.h
+++ b/reactos/include/sm/api.h
@@ -109,29 +109,31 @@ typedef struct _SM_PORT_MESSAGE_QRYINFO
 
 /*** | ****************************************************************/
 
-typedef struct _SM_PORT_MESSAGE
+typedef union _SM_PORT_MESSAGE
 {
   /*** LPC common header ***/
   LPC_MESSAGE Header;
-  /*** SM common header ***/
   struct {
-    DWORD       ApiIndex;
-    NTSTATUS    Status;
-  } SmHeader;
-  /*** SM per API arguments ***/
-  union {
+    UCHAR LpcHeader[LPC_MESSAGE_BASE_SIZE];
+    /*** SM common header ***/
+    struct {
+      DWORD       ApiIndex;
+      NTSTATUS    Status;
+    } SmHeader;
+    /*** SM per API arguments ***/
     union {
-      SM_PORT_MESSAGE_COMPSES      CompSes;
-      SM_PORT_MESSAGE_EXECPGM      ExecPgm;
-      SM_PORT_MESSAGE_QRYINFO      QryInfo;
-    } Request;
-    union {
-      SM_PORT_MESSAGE_COMPSES      CompSes;
-      SM_PORT_MESSAGE_EXECPGM      ExecPgm;
-      SM_PORT_MESSAGE_QRYINFO      QryInfo;
-    } Reply;
+      union {
+        SM_PORT_MESSAGE_COMPSES      CompSes;
+        SM_PORT_MESSAGE_EXECPGM      ExecPgm;
+        SM_PORT_MESSAGE_QRYINFO      QryInfo;
+      } Request;
+      union {
+        SM_PORT_MESSAGE_COMPSES      CompSes;
+        SM_PORT_MESSAGE_EXECPGM      ExecPgm;
+        SM_PORT_MESSAGE_QRYINFO      QryInfo;
+      } Reply;
+    };
   };
-
 } SM_PORT_MESSAGE, * PSM_PORT_MESSAGE;
 
 #pragma pack(pop)
diff --git a/reactos/lib/smdll/smdll.xml b/reactos/lib/smdll/smdll.xml
index a65e85378a4..3cb9aa851a3 100644
--- a/reactos/lib/smdll/smdll.xml
+++ b/reactos/lib/smdll/smdll.xml
@@ -1,6 +1,7 @@
 <module name="smdll" type="nativedll" baseaddress="${BASEADDRESS_SMDLL}" installbase="system32" installname="smdll.dll">
 	<importlibrary definition="smdll.def" />
 	<include base="smdll">.</include>
+	<define name="__USE_W32API" />
 	<define name="_DISABLE_TIDENTS" />
 	<library>smlib</library>
 	<library>ntdll</library>
diff --git a/reactos/lib/smlib/smlib.xml b/reactos/lib/smlib/smlib.xml
index 1946df69463..0ffd9947703 100644
--- a/reactos/lib/smlib/smlib.xml
+++ b/reactos/lib/smlib/smlib.xml
@@ -1,5 +1,6 @@
 <module name="smlib" type="staticlibrary">
 	<include base="smlib">.</include>
+	<define name="__USE_W32API" />
 	<define name="_DISABLE_TIDENTS" />
 	<file>connect.c</file>
 	<file>execpgm.c</file>