Use IDL file to generate shobjidl.h

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

mingw-w64-headers/Makefile.am

@@ -55,6 +55,7 @@ if HAVE_WIDL
 
 IDL_SRCS = \
   include/oaidl.idl \
+  include/shobjidl.idl \
   include/unknwn.idl \
   include/wtypes.idl
 

mingw-w64-headers/Makefile.in

@@ -244,6 +244,7 @@ EXTRA_HEADERS = \
 BUILT_SOURCES = _mingw_directx.h _mingw_ddk.h $(am__append_1)
 @HAVE_WIDL_TRUE@IDL_SRCS = \
 @HAVE_WIDL_TRUE@  include/oaidl.idl \
+@HAVE_WIDL_TRUE@  include/shobjidl.idl \
 @HAVE_WIDL_TRUE@  include/unknwn.idl \
 @HAVE_WIDL_TRUE@  include/wtypes.idl
 

mingw-w64-headers/include/shobjidl.h

@@ -1,28 +1,30 @@
-/**
- * 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.
- */
+/*** Autogenerated by WIDL 1.0 from include/shobjidl.idl - Do not edit ***/
+
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
 #endif
 
-#include <_mingw_unicode.h>
-#include "rpc.h"
-#include "rpcndr.h"
-
-#ifndef __RPCNDR_H_VERSION__
-#error This stub requires an updated version of <rpcndr.h>
-#endif
+#include <rpc.h>
+#include <rpcndr.h>
 
 #ifndef COM_NO_WINDOWS_H
-#include "windows.h"
-#include "ole2.h"
+#include <windows.h>
+#include <ole2.h>
 #endif
 
-#ifndef __shobjidl_h__
-#define __shobjidl_h__
+#ifndef __WIDL_SHOBJIDL_H
+#define __WIDL_SHOBJIDL_H
 
+/* Forward declarations */
+
+/* Headers for imported files */
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <_mingw_unicode.h>
 #ifndef __IPersistFolder_FWD_DEFINED__
 #define __IPersistFolder_FWD_DEFINED__
 typedef struct IPersistFolder IPersistFolder;
@@ -679,11 +681,6 @@ typedef interface IFileOpenDialog IFileOpenDialog;
 #include "propsys.h"
 #include "objectarray.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);
@@ -6669,8 +6666,13 @@ DEFINE_GUID(CLSID_FileSaveDialog, 0xc0b4e2f3, 0xba21, 0x4773, 0x8d,0xba, 0x33,0x
   unsigned char *__RPC_API VARIANT_UserMarshal(unsigned long *,unsigned char *,VARIANT *);
   unsigned char *__RPC_API VARIANT_UserUnmarshal(unsigned long *,unsigned char *,VARIANT *);
   void __RPC_API VARIANT_UserFree(unsigned long *,VARIANT *);
+/* Begin additional prototypes for all interfaces */
+
+
+/* End additional prototypes */
 
 #ifdef __cplusplus
 }
 #endif
-#endif
+
+#endif /* __WIDL_SHOBJIDL_H */