From e679471885594331d47f0ab710bd3c4f9208f3ae Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Tue, 28 Aug 2012 11:15:29 +0200
Subject: [PATCH] Always define WIDL_C_INLINE_WRAPPERS.

---
 Maketest.rules.in              | 2 +-
 dlls/fusion/Makefile.in        | 1 -
 dlls/fusion/tests/Makefile.in  | 1 -
 dlls/mshtml/Makefile.in        | 2 +-
 dlls/msi/Makefile.in           | 1 -
 dlls/msxml3/Makefile.in        | 1 -
 dlls/msxml3/tests/Makefile.in  | 1 -
 dlls/sxs/Makefile.in           | 1 -
 dlls/sxs/tests/Makefile.in     | 1 -
 dlls/windowscodecs/Makefile.in | 2 +-
 dlls/winhttp/Makefile.in       | 1 -
 include/unknwn.idl             | 4 ++++
 12 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/Maketest.rules.in b/Maketest.rules.in
index 4833f5a1f97..828c375d82c 100644
--- a/Maketest.rules.in
+++ b/Maketest.rules.in
@@ -10,7 +10,7 @@
 #
 
 DLLFLAGS     = @DLLFLAGS@
-DEFS         = -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION $(EXTRADEFS)
+DEFS         = -DWINE_STRICT_PROTOTYPES -DWINE_NO_NAMELESS_EXTENSION -DWIDL_C_INLINE_WRAPPERS $(EXTRADEFS)
 
 MODULE       = $(TESTDLL:%.dll=%)_test.exe
 TESTRESULTS  = $(C_SRCS:.c=.ok)
diff --git a/dlls/fusion/Makefile.in b/dlls/fusion/Makefile.in
index 2fe64928392..63b1b7398f9 100644
--- a/dlls/fusion/Makefile.in
+++ b/dlls/fusion/Makefile.in
@@ -1,6 +1,5 @@
 MODULE    = fusion.dll
 IMPORTS   = advapi32 dbghelp shlwapi version user32
-EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS
 
 C_SRCS = \
 	asmcache.c \
diff --git a/dlls/fusion/tests/Makefile.in b/dlls/fusion/tests/Makefile.in
index ac360bb4995..0542f0d590b 100644
--- a/dlls/fusion/tests/Makefile.in
+++ b/dlls/fusion/tests/Makefile.in
@@ -1,6 +1,5 @@
 TESTDLL   = fusion.dll
 IMPORTS   = user32
-EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS
 
 C_SRCS = \
 	asmcache.c \
diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in
index 53cd2e9b3bc..26311af3136 100644
--- a/dlls/mshtml/Makefile.in
+++ b/dlls/mshtml/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = mshtml.dll
 IMPORTLIB = mshtml
 IMPORTS   = strmiids uuid urlmon shlwapi shell32 ole32 oleaut32 user32 gdi32 advapi32
-EXTRADEFS = -DCOM_NO_WINDOWS_H -DWIDL_C_INLINE_WRAPPERS
+EXTRADEFS = -DCOM_NO_WINDOWS_H
 DELAYIMPORTS = wininet
 
 C_SRCS = \
diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in
index 9ea0861dcea..140b5f1bf64 100644
--- a/dlls/msi/Makefile.in
+++ b/dlls/msi/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = msi.dll
 IMPORTLIB = msi
 IMPORTS   = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32
 DELAYIMPORTS = odbccp32 wintrust crypt32 imagehlp
-EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS
 
 C_SRCS = \
 	action.c \
diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in
index fcf78b5a3d3..acd571fdb74 100644
--- a/dlls/msxml3/Makefile.in
+++ b/dlls/msxml3/Makefile.in
@@ -1,7 +1,6 @@
 EXTRADEFS = -DCOM_NO_WINDOWS_H
 MODULE    = msxml3.dll
 IMPORTS   = uuid urlmon shlwapi oleaut32 ole32 user32 advapi32
-EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS
 EXTRALIBS = @XML2LIBS@
 EXTRAINCL = @XML2INCL@ @XSLTINCL@
 
diff --git a/dlls/msxml3/tests/Makefile.in b/dlls/msxml3/tests/Makefile.in
index 1762e1f895d..a2765a7fd49 100644
--- a/dlls/msxml3/tests/Makefile.in
+++ b/dlls/msxml3/tests/Makefile.in
@@ -1,6 +1,5 @@
 TESTDLL   = msxml3.dll
 IMPORTS   = oleaut32 ole32 user32
-EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS
 
 C_SRCS = \
 	domdoc.c \
diff --git a/dlls/sxs/Makefile.in b/dlls/sxs/Makefile.in
index a1079280e66..d6d6f2bbbf1 100644
--- a/dlls/sxs/Makefile.in
+++ b/dlls/sxs/Makefile.in
@@ -1,7 +1,6 @@
 MODULE    = sxs.dll
 IMPORTS   = oleaut32 ole32
 IMPORTLIB = sxs
-EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS
 
 C_SRCS = \
 	cache.c \
diff --git a/dlls/sxs/tests/Makefile.in b/dlls/sxs/tests/Makefile.in
index 69305aeb2a0..2f8be9c12e1 100644
--- a/dlls/sxs/tests/Makefile.in
+++ b/dlls/sxs/tests/Makefile.in
@@ -1,6 +1,5 @@
 TESTDLL   = sxs.dll
 IMPORTS   = sxs
-EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS
 
 C_SRCS = \
 	cache.c \
diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in
index b46224951b8..65cd913027c 100644
--- a/dlls/windowscodecs/Makefile.in
+++ b/dlls/windowscodecs/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = windowscodecs.dll
 IMPORTLIB = windowscodecs
 IMPORTS   = uuid ole32 oleaut32 shlwapi advapi32 rpcrt4
 EXTRAINCL = @PNGINCL@
-EXTRADEFS = -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL -DWIDL_C_INLINE_WRAPPERS
+EXTRADEFS = -DENTRY_PREFIX=WIC_ -DPROXY_DELEGATION -DWINE_REGISTER_DLL
 EXTRALIBS = @APPLICATIONSERVICESLIB@
 
 C_SRCS = \
diff --git a/dlls/winhttp/Makefile.in b/dlls/winhttp/Makefile.in
index 130971e70b5..53b5b97d8c1 100644
--- a/dlls/winhttp/Makefile.in
+++ b/dlls/winhttp/Makefile.in
@@ -3,7 +3,6 @@ IMPORTLIB = winhttp
 IMPORTS   = uuid user32 advapi32
 DELAYIMPORTS = oleaut32 ole32 crypt32
 EXTRALIBS = @SOCKETLIBS@
-EXTRADEFS = -DWIDL_C_INLINE_WRAPPERS
 
 C_SRCS = \
 	cookie.c \
diff --git a/include/unknwn.idl b/include/unknwn.idl
index d6799f45b21..78a2d9db181 100644
--- a/include/unknwn.idl
+++ b/include/unknwn.idl
@@ -20,6 +20,10 @@
 import "wtypes.idl";
 #endif
 
+cpp_quote("#ifdef __WINESRC__")
+cpp_quote("#define WIDL_C_INLINE_WRAPPERS")
+cpp_quote("#endif")
+
 cpp_quote("#ifdef WIDL_C_INLINE_WRAPPERS")
 cpp_quote("#define SAVE_WIDL_C_INLINE_WRAPPERS")
 cpp_quote("#undef WIDL_C_INLINE_WRAPPERS")