From 001fd0006686a08e5880173acbaf9dde07e8832d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Herv=C3=A9=20Poussineau?= <hpoussin@reactos.org>
Date: Mon, 7 Jan 2008 15:17:48 +0000
Subject: [PATCH] Update irot.idl Misc cleanup

svn path=/trunk/; revision=31644
---
 reactos/include/reactos/idl/idl.rbuild          | 16 ----------------
 reactos/include/reactos/idl/wtypes.idl          |  2 +-
 reactos/include/reactos/wine/irot.idl           |  9 ++++++---
 reactos/include/reactos/wine/wineheaders.rbuild |  1 -
 4 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/reactos/include/reactos/idl/idl.rbuild b/reactos/include/reactos/idl/idl.rbuild
index 7a03c27a8b6..093f1c35d3a 100644
--- a/reactos/include/reactos/idl/idl.rbuild
+++ b/reactos/include/reactos/idl/idl.rbuild
@@ -2,43 +2,27 @@
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <group>
 <module name="pnp_server" type="rpcserver" allowwarnings="true">
-	<include base="ReactOS">.</include>
-	<include base="ReactOS">w32api/include</include>
 	<file>pnp.idl</file>
 </module>
 <module name="pnp_client" type="rpcclient">
-	<include base="ReactOS">.</include>
-	<include base="ReactOS">w32api/include</include>
 	<file>pnp.idl</file>
 </module>
 <module name="scm_server" type="rpcserver">
-	<include base="ReactOS">.</include>
-	<include base="ReactOS">w32api/include</include>
 	<file switches="--oldnames">svcctl.idl</file>
 </module>
 <module name="scm_client" type="rpcclient">
-	<include base="ReactOS">.</include>
-	<include base="ReactOS">w32api/include</include>
 	<file switches="--oldnames">svcctl.idl</file>
 </module>
 <module name="eventlog_server" type="rpcserver" allowwarnings="true">
-	<include base="ReactOS">.</include>
-	<include base="ReactOS">w32api/include</include>
 	<file switches="--oldnames">eventlogrpc.idl</file>
 </module>
 <module name="eventlog_client" type="rpcclient" >
-	<include base="ReactOS">.</include>
-	<include base="ReactOS">w32api/include</include>
 	<file switches="--oldnames">eventlogrpc.idl</file>
 </module>
 <module name="lsa_server" type="rpcserver">
-	<include base="ReactOS">.</include>
-	<include base="ReactOS">w32api/include</include>
 	<file switches="--oldnames">lsa.idl</file>
 </module>
 <module name="lsa_client" type="rpcclient">
-	<include base="ReactOS">.</include>
-	<include base="ReactOS">w32api/include</include>
 	<file switches="--oldnames">lsa.idl</file>
 </module>
 </group>
diff --git a/reactos/include/reactos/idl/wtypes.idl b/reactos/include/reactos/idl/wtypes.idl
index 5ffa08428a6..e0d2216f6ce 100644
--- a/reactos/include/reactos/idl/wtypes.idl
+++ b/reactos/include/reactos/idl/wtypes.idl
@@ -11,4 +11,4 @@
 #define LPDWORD unsigned long*
 #define PBOOL unsigned long*
 
-#define NTSTATUS long
\ No newline at end of file
+#define NTSTATUS long
diff --git a/reactos/include/reactos/wine/irot.idl b/reactos/include/reactos/wine/irot.idl
index 7cea28fca73..e1a62398327 100644
--- a/reactos/include/reactos/wine/irot.idl
+++ b/reactos/include/reactos/wine/irot.idl
@@ -18,8 +18,8 @@
 
 import "wtypes.idl";
 
-cpp_quote("#define IROT_PROTSEQ {'n','c','a','l','r','p','c',0}");
-cpp_quote("#define IROT_ENDPOINT {'i','r','o','t',0}");
+cpp_quote("#define IROT_PROTSEQ {'n','c','a','l','r','p','c',0}")
+cpp_quote("#define IROT_ENDPOINT {'i','r','o','t',0}")
 
 typedef struct tagMonikerComparisonData {
         ULONG ulCntData;
@@ -51,6 +51,7 @@ interface Irot
         typedef DWORD IrotCookie;
 
         typedef handle_t IrotHandle;
+        typedef [context_handle] void *IrotContextHandle;
 
         HRESULT IrotRegister(
                 [in]  IrotHandle h,
@@ -59,11 +60,13 @@ interface Irot
                 [in]  const InterfaceData *moniker,
                 [in]  const FILETIME *time,
                 [in]  DWORD grfFlags,
-                [out] IrotCookie *cookie);
+                [out] IrotCookie *cookie,
+                [out] IrotContextHandle *ctxt_handle);
 
         HRESULT IrotRevoke(
                 [in]  IrotHandle h,
                 [in]  IrotCookie cookie,
+                [in, out] IrotContextHandle *ctxt_handle,
                 [out] PInterfaceData *object,
                 [out] PInterfaceData *moniker);
 
diff --git a/reactos/include/reactos/wine/wineheaders.rbuild b/reactos/include/reactos/wine/wineheaders.rbuild
index 9abd14615d9..8b9a00e3855 100644
--- a/reactos/include/reactos/wine/wineheaders.rbuild
+++ b/reactos/include/reactos/wine/wineheaders.rbuild
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="wineheaders" type="idlheader">
-	<file>irot.idl</file>
 	<file>itss.idl</file>
 </module>
-- 
2.17.1