oleaut32 [2/2]: Use widl to generate oaidl_p.c

[Dan Hipschman]

This patch sets up the oleaut32 Makefile and shuffles some files
around so we can use widl to generate oaidl_p.c.  The patch is *very*
large since it contains a diff for all of oaidl_p.c (which was
removed), and also two for oaidl.idl (which was moved).  Hence, I'm
attaching the patch compressed.  The fundamental changes are pretty
trivial, so I'll include everything from the patch that's relevant
inline, so you can see it more easily.  In fact, you should be able to
achieve the same effect as applying the attached patch by running the
following commands:

patch -p1 < inlined-patch.txt
git-add dlls/oleaut32/oaidl.idl
git-rm dlls/oleaut32/oaidl_p.c
git-mv include/oaidl.idl include/wine
cp dlls/oleaut32/oaidl.idl include
git-add include/oaidl.idl

I also tried a make install after doing this, and that worked fine.

---
 dlls/oleaut32/Makefile.in |    4 +-
 dlls/oleaut32/oaidl.idl   |   19 +
 dlls/oleaut32/oaidl_p.c   |13781 ---------------------------------------------
 include/oaidl.idl         | 1615 +------
 include/wine/oaidl.idl    | 1630 ++++++
 5 files changed, 1654 insertions(+), 15395 deletions(-)
 create mode 100644 dlls/oleaut32/oaidl.idl
 delete mode 100644 dlls/oleaut32/oaidl_p.c
 create mode 100644 include/wine/oaidl.idl

diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in
index 0d2f99d..bb5fbcf 100644
--- a/dlls/oleaut32/Makefile.in
+++ b/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 = \
+       oaidl.idl
+
 @MAKE_DLL_RULES@

 @DEPENDENCIES@  # everything below this line is overwritten by make depend
diff --git a/dlls/oleaut32/oaidl.idl b/dlls/oleaut32/oaidl.idl
new file mode 100644
index 0000000..c8a92d9
--- /dev/null
+++ b/dlls/oleaut32/oaidl.idl
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2007 Dan Hipschman (Google)
+ *
+ * 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
+ */
+
+#include "wine/oaidl.idl"
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-oleaut32-Use-widl-to-generate-oaidl_p.c.patch.bz2
Type: application/octet-stream
Size: 29950 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20071023/a9781b9b/attachment-0001.obj