oleaut32: Use widl to generate oaidl_p.c.

.gitignore

@@ -338,6 +338,8 @@ dlls/ole32/version16.res
 dlls/oleacc/liboleacc.def
 dlls/oleaut32/liboleaut32.def
 dlls/oleaut32/oleaut32.res
+dlls/oleaut32/oleaut32_oaidl.h
+dlls/oleaut32/oleaut32_oaidl_p.c
 dlls/oleaut32/tests/*.ok
 dlls/oleaut32/tests/oleaut32_crosstest.exe
 dlls/oleaut32/tests/test_tlb.tlb

dlls/oleaut32/Makefile.in

@@ -13,7 +13,6 @@ C_SRCS = \
 	connpt.c \
 	dispatch.c \
 	hash.c \
-	oaidl_p.c \
 	oleaut.c \
 	olefont.c \
 	olepicture.c \
@@ -40,6 +39,9 @@ SPEC_SRCS16 = \
 
 RC_SRCS = oleaut32.rc
 
+IDL_P_SRCS = \
+	oleaut32_oaidl.idl
+
 @MAKE_DLL_RULES@
 
 @DEPENDENCIES@  # everything below this line is overwritten by make depend

dlls/oleaut32/oleaut32_oaidl.idl

@@ -0,0 +1,25 @@
+/*
+ * Copyright 2007 Google (Dan Hipschman)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+/* The header file generated from this includes rpc.h, which ends up
+   including oaidl.h at some point.  This will cause all sorts of errors
+   so the easiest thing to do is just comment out our entire header.  */
+
+cpp_quote("#if 0    /* oleaut32_oaidl.idl hack */")
+#include "oaidl.idl"
+cpp_quote("#endif   /* oleaut32_oaidl.idl hack */")

dlls/oleaut32/usrmarshal.c

@@ -49,10 +49,10 @@ static CStdPSFactoryBuffer PSFactoryBuffer;
 
 CSTDSTUBBUFFERRELEASE(&PSFactoryBuffer)
 
-extern const ExtendedProxyFileInfo oaidl_ProxyFileInfo;
+extern const ExtendedProxyFileInfo oleaut32_oaidl_ProxyFileInfo;
 
 static const ProxyFileInfo *OLEAUT32_ProxyFileList[] = {
-  &oaidl_ProxyFileInfo,
+  &oleaut32_oaidl_ProxyFileInfo,
   NULL
 };