wine/ include/objbase.h tools/widl/header.c

[Alexandre Julliard]

ChangeSet ID:	21631
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	[e-mail]	2005/12/02 07:15:53

Modified files:
    include        : objbase.h 
    tools/widl     : header.c

Log message:
    Vincent Béron 
    Use the typedef'd declaration of IRpcStubBuffer and IRpcChannelBuffer
    in RPC _Stubs.
    Add IRpcStubBuffer and IRpcChannelBuffer declarations to objbase.h.

Patch: http://cvs.winehq.org/patch.py?id=21631

Old revision  New revision  Changes     Path
 1.63          1.64          +9 -0       wine/include/objbase.h
 1.40          1.41          +2 -2       wine/tools/widl/header.c

Index: wine/include/objbase.h
diff -u -p wine/include/objbase.h:1.63 wine/include/objbase.h:1.64
--- wine/include/objbase.h:1.63	2 Dec 2005 13:15:53 -0000
+++ wine/include/objbase.h	2 Dec 2005 13:15:53 -0000
@@ -272,6 +272,15 @@

#endif  /* __cplusplus && !CINTERFACE */

+#ifndef __IRpcStubBuffer_FWD_DEFINED__
+#define __IRpcStubBuffer_FWD_DEFINED__
+typedef interface IRpcStubBuffer IRpcStubBuffer;
+#endif
+#ifndef __IRpcChannelBuffer_FWD_DEFINED__
+#define __IRpcChannelBuffer_FWD_DEFINED__
+typedef interface IRpcChannelBuffer IRpcChannelBuffer;
+#endif
+
 #include <objidl.h>

#ifndef RC_INVOKED
Index: wine/tools/widl/header.c
diff -u -p wine/tools/widl/header.c:1.40 wine/tools/widl/header.c:1.41
--- wine/tools/widl/header.c:1.40	2 Dec 2005 13:15:53 -0000
+++ wine/tools/widl/header.c	2 Dec 2005 13:15:53 -0000
@@ -690,8 +690,8 @@ static void write_method_proto(type_t *i
       fprintf(header, "void __RPC_STUB %s_", iface->name);
       write_name(header,def);
       fprintf(header, "_Stub(\n");
-      fprintf(header, "    interface IRpcStubBuffer* This,\n");
-      fprintf(header, "    interface IRpcChannelBuffer* pRpcChannelBuffer,\n");
+      fprintf(header, "    IRpcStubBuffer* This,\n");
+      fprintf(header, "    IRpcChannelBuffer* pRpcChannelBuffer,\n");
       fprintf(header, "    PRPC_MESSAGE pRpcMessage,\n");
       fprintf(header, "    DWORD* pdwStubPhase);\n");