Update irot.idl
authorHervé Poussineau <hpoussin@reactos.org>
Mon, 7 Jan 2008 15:17:48 +0000 (15:17 +0000)
committerHervé Poussineau <hpoussin@reactos.org>
Mon, 7 Jan 2008 15:17:48 +0000 (15:17 +0000)
Misc cleanup

svn path=/trunk/; revision=31644

reactos/include/reactos/idl/idl.rbuild
reactos/include/reactos/idl/wtypes.idl
reactos/include/reactos/wine/irot.idl
reactos/include/reactos/wine/wineheaders.rbuild

index 7a03c27..093f1c3 100644 (file)
@@ -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>
index 5ffa084..e0d2216 100644 (file)
@@ -11,4 +11,4 @@
 #define LPDWORD unsigned long*
 #define PBOOL unsigned long*
 
-#define NTSTATUS long
\ No newline at end of file
+#define NTSTATUS long
index 7cea28f..e1a6239 100644 (file)
@@ -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);
 
index 9abd146..8b9a00e 100644 (file)
@@ -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>