Vincent Povirk : include: Rename cor.h to cor.idl.
Alexandre Julliard
julliard at winehq.org
Thu Nov 11 12:05:51 CST 2010
Module: wine
Branch: master
Commit: 498752dd109340004dfa83945e889bd0a900707e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=498752dd109340004dfa83945e889bd0a900707e
Author: Vincent Povirk <vincent at codeweavers.com>
Date: Tue Oct 5 11:54:13 2010 -0500
include: Rename cor.h to cor.idl.
---
.gitignore | 1 +
include/Makefile.in | 2 +-
include/{cor.h => cor.idl} | 29 ++++++++---------------------
3 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/.gitignore b/.gitignore
index b57ea54..a340baf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -159,6 +159,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..3f4f9de 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 \
@@ -142,7 +143,6 @@ SRCDIR_INCLUDES = \
commctrl.rh \
commdlg.h \
compobj.h \
- cor.h \
corerror.h \
corhdr.h \
cpl.h \
diff --git a/include/cor.h b/include/cor.idl
similarity index 63%
rename from include/cor.h
rename to include/cor.idl
index cdf89dd..4c5e639 100644
--- a/include/cor.h
+++ b/include/cor.idl
@@ -16,28 +16,15 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#ifndef __WINE_COR_H
-#define __WINE_COR_H
-
-#include "ole2.h"
+cpp_quote("#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 */
+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);")
More information about the wine-cvs
mailing list