From f93d8a3db9f5fe9cdb79a67ffd8ba9a1eba77975 Mon Sep 17 00:00:00 2001
From: Vincent Povirk <vincent@codeweavers.com>
Date: Tue, 5 Oct 2010 11:54:13 -0500
Subject: [PATCH 3/8] include: Rename cor.h to cor.idl.

---
 .gitignore          |    1 +
 include/Makefile.in |    1 +
 include/cor.h       |   43 -------------------------------------------
 include/cor.idl     |   38 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 40 insertions(+), 43 deletions(-)
 delete mode 100644 include/cor.h
 create mode 100644 include/cor.idl

diff --git a/.gitignore b/.gitignore
index c15e617..ae62612 100644
--- a/.gitignore
+++ b/.gitignore
@@ -158,6 +158,7 @@ include/comcat.h
 include/commoncontrols.h
 include/config.h
 include/control.h
+include/cor.h
 include/ctfutb.h
 include/ctxtcall.h
 include/d3d10.h
diff --git a/include/Makefile.in b/include/Makefile.in
index 1f434c7..bb07fea 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -17,6 +17,7 @@ PUBLIC_IDL_H_SRCS = \
 	comcat.idl \
 	commoncontrols.idl \
 	control.idl \
+	cor.idl \
 	ctfutb.idl \
 	ctxtcall.idl \
 	d3d10.idl \
diff --git a/include/cor.h b/include/cor.h
deleted file mode 100644
index cdf89dd..0000000
--- a/include/cor.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) 2007 Francois Gouget
- *
- * 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
- */
-
-#ifndef __WINE_COR_H
-#define __WINE_COR_H
-
-#include "ole2.h"
-/* FIXME: #include "specstrings.h" */
-/* FIXME: #include "corerror.h" */
-/* FIXME: #include "corhdr.h" */
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-BOOL        WINAPI _CorDllMain(HINSTANCE,DWORD,LPVOID);
-__int32     WINAPI _CorExeMain(void);
-__int32     WINAPI _CorExeMain2(PBYTE,DWORD,LPWSTR,LPWSTR,LPWSTR);
-VOID        WINAPI _CorImageUnloading(PVOID);
-HRESULT     WINAPI _CorValidateImage(PVOID*,LPCWSTR);
-HRESULT     WINAPI CoInitializeCor(DWORD);
-void        WINAPI CoUninitializeCor(void);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif  /* __WINE_COR_H */
diff --git a/include/cor.idl b/include/cor.idl
new file mode 100644
index 0000000..4662ef7
--- /dev/null
+++ b/include/cor.idl
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2007 Francois Gouget
+ *
+ * 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
+ */
+
+cpp_quote("#include \"ole2.h\"")
+/* FIXME: #include "specstrings.h" */
+/* FIXME: #include "corerror.h" */
+/* FIXME: #include "corhdr.h" */
+
+cpp_quote("#ifdef __cplusplus")
+cpp_quote(" extern \"C\" {")
+cpp_quote("#endif")
+
+cpp_quote("BOOL        WINAPI _CorDllMain(HINSTANCE,DWORD,LPVOID);")
+cpp_quote("__int32     WINAPI _CorExeMain(void);")
+cpp_quote("__int32     WINAPI _CorExeMain2(PBYTE,DWORD,LPWSTR,LPWSTR,LPWSTR);")
+cpp_quote("VOID        WINAPI _CorImageUnloading(PVOID);")
+cpp_quote("HRESULT     WINAPI _CorValidateImage(PVOID*,LPCWSTR);")
+cpp_quote("HRESULT     WINAPI CoInitializeCor(DWORD);")
+cpp_quote("void        WINAPI CoUninitializeCor(void);")
+
+cpp_quote("#ifdef __cplusplus")
+cpp_quote("}")
+cpp_quote("#endif")
-- 
1.7.1