Use W32API.

svn path=/trunk/; revision=15952

diff --git a/reactos/include/sm/api.h b/reactos/include/sm/api.h
index 9b4944b..db6a98f 100644 (file)
--- 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 a65e853..3cb9aa8 100644 (file)
--- 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">\r
        <importlibrary definition="smdll.def" />\r
        <include base="smdll">.</include>\r
+       <define name="__USE_W32API" />\r
        <define name="_DISABLE_TIDENTS" />\r
        <library>smlib</library>\r
        <library>ntdll</library>\r

diff --git a/reactos/lib/smlib/smlib.xml b/reactos/lib/smlib/smlib.xml
index 1946df6..0ffd994 100644 (file)
--- 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>