Use IDL file to generate oleidl.h

git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@4928 4407c894-4637-0410-b4f5-ada5f102cad1

mingw-w64-headers/Makefile.am

@@ -63,6 +63,8 @@ IDL_SRCS = \
   include/msctf.idl \
   include/objectarray.idl \
   include/objidl.idl \
+  include/oleidl.idl \
+  include/optary.idl \
   include/shobjidl.idl \
   include/shtypes.idl \
   include/tpcshrd.idl \

mingw-w64-headers/Makefile.in

@@ -252,6 +252,8 @@ BUILT_SOURCES = _mingw_directx.h _mingw_ddk.h $(am__append_1)
 @HAVE_WIDL_TRUE@  include/msctf.idl \
 @HAVE_WIDL_TRUE@  include/objectarray.idl \
 @HAVE_WIDL_TRUE@  include/objidl.idl \
+@HAVE_WIDL_TRUE@  include/oleidl.idl \
+@HAVE_WIDL_TRUE@  include/optary.idl \
 @HAVE_WIDL_TRUE@  include/shobjidl.idl \
 @HAVE_WIDL_TRUE@  include/shtypes.idl \
 @HAVE_WIDL_TRUE@  include/tpcshrd.idl \

mingw-w64-headers/include/ocidl.h

@@ -20,6 +20,7 @@
 /* Headers for imported files */
 
 #include <oaidl.h>
+#include <oleidl.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -220,7 +221,6 @@ typedef struct IAdviseSinkEx IAdviseSinkEx;
 typedef struct IQuickActivate IQuickActivate;
 #endif
 
-#include "oleidl.h"
 #include "servprov.h"
 #include "urlmon.h"
 

mingw-w64-headers/include/ocidl.idl

@@ -5,6 +5,7 @@
  */
 
 import "oaidl.idl";
+import "oleidl.idl";
 
 cpp_quote("#ifndef __IEnumConnections_FWD_DEFINED__")
 cpp_quote("#define __IEnumConnections_FWD_DEFINED__")
@@ -201,7 +202,6 @@ cpp_quote("#define __IQuickActivate_FWD_DEFINED__")
 cpp_quote("typedef struct IQuickActivate IQuickActivate;")
 cpp_quote("#endif")
 cpp_quote("")
-cpp_quote("#include \"oleidl.h\"")
 cpp_quote("#include \"servprov.h\"")
 cpp_quote("#include \"urlmon.h\"")
 cpp_quote("")

mingw-w64-headers/include/oleidl.h

@@ -1,27 +1,30 @@
-/**
+/*** Autogenerated by WIDL 1.0 from include/oleidl.idl - Do not edit ***/
- * This file has no copyright assigned and is placed in the Public Domain.
+
- * This file is part of the w64 mingw-runtime package.
- * No warranty is given; refer to the file DISCLAIMER.PD within this package.
- */
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
 #endif
 
-#include "rpc.h"
+#include <rpc.h>
-#include "rpcndr.h"
+#include <rpcndr.h>
-
-#ifndef __RPCNDR_H_VERSION__
-#error This stub requires an updated version of <rpcndr.h>
-#endif
 
 #ifndef COM_NO_WINDOWS_H
-#include "windows.h"
+#include <windows.h>
-#include "ole2.h"
+#include <ole2.h>
 #endif
 
 #ifndef __oleidl_h__
 #define __oleidl_h__
 
+/* Forward declarations */
+
+/* Headers for imported files */
+
+#include <objidl.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef __IOleAdviseHolder_FWD_DEFINED__
 #define __IOleAdviseHolder_FWD_DEFINED__
 typedef struct IOleAdviseHolder IOleAdviseHolder;
@@ -132,12 +135,6 @@ typedef struct IDropTarget IDropTarget;
 typedef struct IEnumOLEVERB IEnumOLEVERB;
 #endif
 
-#include "objidl.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef __MIDL_user_allocate_free_DEFINED__
 #define __MIDL_user_allocate_free_DEFINED__
   void *__RPC_API MIDL_user_allocate(size_t);
@@ -1535,8 +1532,13 @@ extern "C" {
   HRESULT WINAPI IViewObject_GetAdvise_Stub(IViewObject *This,DWORD *pAspects,DWORD *pAdvf,IAdviseSink **ppAdvSink);
   HRESULT WINAPI IEnumOLEVERB_Next_Proxy(IEnumOLEVERB *This,ULONG celt,LPOLEVERB rgelt,ULONG *pceltFetched);
   HRESULT WINAPI IEnumOLEVERB_Next_Stub(IEnumOLEVERB *This,ULONG celt,LPOLEVERB rgelt,ULONG *pceltFetched);
+/* Begin additional prototypes for all interfaces */
+
+
+/* End additional prototypes */
 
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* __oleidl_h__ */

mingw-w64-headers/include/optary.h

@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL from optary.idl - Do not edit ***/
+/*** Autogenerated by WIDL 1.0 from include/optary.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475

mingw-w64-headers/include/shobjidl.h

@@ -37,6 +37,7 @@ typedef struct ShellLibrary ShellLibrary;
 #include <objidl.h>
 #include <oaidl.h>
 #include <shtypes.h>
+#include <oleidl.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -682,7 +683,6 @@ typedef interface IFileSaveDialog IFileSaveDialog;
 typedef interface IFileOpenDialog IFileOpenDialog;
 #endif
 
-#include "oleidl.h"
 #include "servprov.h"
 #include "comcat.h"
 #include "propidl.h"

mingw-w64-headers/include/shobjidl.idl

@@ -7,6 +7,7 @@
 import "objidl.idl";
 import "oaidl.idl";
 import "shtypes.idl";
+import "oleidl.idl";
 
 cpp_quote("#include <_mingw_unicode.h>")
 
@@ -649,7 +650,6 @@ cpp_quote("#define __IFileOpenDialog_FWD_DEFINED__")
 cpp_quote("typedef interface IFileOpenDialog IFileOpenDialog;")
 cpp_quote("#endif")
 cpp_quote("")
-cpp_quote("#include \"oleidl.h\"")
 cpp_quote("#include \"servprov.h\"")
 cpp_quote("#include \"comcat.h\"")
 cpp_quote("#include \"propidl.h\"")