[hpoussin] 31644: Update irot.idl Misc cleanup

Author: hpoussin
Date: Mon Jan  7 18:17:48 2008
New Revision: 31644

URL: http://svn.reactos.org/svn/reactos?rev=31644&view=rev
Log:
Update irot.idl
Misc cleanup

Modified:
    trunk/reactos/include/reactos/idl/idl.rbuild
    trunk/reactos/include/reactos/idl/wtypes.idl
    trunk/reactos/include/reactos/wine/irot.idl
    trunk/reactos/include/reactos/wine/wineheaders.rbuild

Modified: trunk/reactos/include/reactos/idl/idl.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/idl.rbu...
==============================================================================
--- trunk/reactos/include/reactos/idl/idl.rbuild (original)
+++ trunk/reactos/include/reactos/idl/idl.rbuild Mon Jan  7 18:17:48 2008
@@ -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>

Modified: trunk/reactos/include/reactos/idl/wtypes.idl
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/wtypes....
==============================================================================
--- trunk/reactos/include/reactos/idl/wtypes.idl (original)
+++ trunk/reactos/include/reactos/idl/wtypes.idl Mon Jan  7 18:17:48 2008
@@ -11,4 +11,4 @@
 #define LPDWORD unsigned long*
 #define PBOOL unsigned long*

-#define NTSTATUS long
+#define NTSTATUS long

Modified: trunk/reactos/include/reactos/wine/irot.idl
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/irot.i...
==============================================================================
--- trunk/reactos/include/reactos/wine/irot.idl (original)
+++ trunk/reactos/include/reactos/wine/irot.idl Mon Jan  7 18:17:48 2008
@@ -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 @@
         typedef DWORD IrotCookie;

typedef handle_t IrotHandle;
+        typedef [context_handle] void *IrotContextHandle;

HRESULT IrotRegister(
                 [in]  IrotHandle h,
@@ -59,11 +60,13 @@
                 [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);

Modified: trunk/reactos/include/reactos/wine/wineheaders.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/winehe...
==============================================================================
--- trunk/reactos/include/reactos/wine/wineheaders.rbuild (original)
+++ trunk/reactos/include/reactos/wine/wineheaders.rbuild Mon Jan  7 18:17:48 2008
@@ -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>