From 64923f3feead5ed89f00ccd124f8ac67e6946267 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Thu, 2 May 2024 09:22:40 +0200
Subject: [PATCH] widl: Default to fully interpreted stubs mode.

---
 dlls/actxprxy/Makefile.in       | 2 --
 dlls/avifil32/Makefile.in       | 2 --
 dlls/combase/Makefile.in        | 2 --
 dlls/dispex/Makefile.in         | 2 --
 dlls/ia2comproxy/Makefile.in    | 2 --
 dlls/ieproxy/Makefile.in        | 2 --
 dlls/msctfp/Makefile.in         | 2 --
 dlls/msdaps/Makefile.in         | 1 -
 dlls/msi/Makefile.in            | 2 +-
 dlls/mstask/Makefile.in         | 2 --
 dlls/netapi32/Makefile.in       | 2 --
 dlls/ntoskrnl.exe/Makefile.in   | 2 --
 dlls/ole32/Makefile.in          | 2 --
 dlls/oleacc/Makefile.in         | 2 --
 dlls/oleaut32/Makefile.in       | 2 --
 dlls/qmgrprxy/Makefile.in       | 2 --
 dlls/quartz/Makefile.in         | 2 --
 dlls/rpcrt4/Makefile.in         | 2 --
 dlls/rpcrt4/tests/Makefile.in   | 2 +-
 dlls/schedsvc/Makefile.in       | 2 --
 dlls/schedsvc/tests/Makefile.in | 2 --
 dlls/sechost/Makefile.in        | 2 --
 dlls/sti/Makefile.in            | 1 -
 dlls/taskschd/Makefile.in       | 1 -
 dlls/urlmon/Makefile.in         | 2 --
 dlls/windowscodecs/Makefile.in  | 2 --
 programs/plugplay/Makefile.in   | 1 -
 programs/rpcss/Makefile.in      | 1 -
 programs/services/Makefile.in   | 1 -
 tools/widl/widl.c               | 2 +-
 tools/widl/widl.man.in          | 2 +-
 31 files changed, 4 insertions(+), 52 deletions(-)

diff --git a/dlls/actxprxy/Makefile.in b/dlls/actxprxy/Makefile.in
index 9ce0b442586..0397f7c3a93 100644
--- a/dlls/actxprxy/Makefile.in
+++ b/dlls/actxprxy/Makefile.in
@@ -1,8 +1,6 @@
 MODULE    = actxprxy.dll
 IMPORTS   = uuid oleaut32 ole32 rpcrt4
 
-EXTRAIDLFLAGS = -Oicf
-
 SOURCES = \
 	actxprxy_activscp.idl \
 	actxprxy_comcat.idl \
diff --git a/dlls/avifil32/Makefile.in b/dlls/avifil32/Makefile.in
index 7a08f06717b..fd19511712c 100644
--- a/dlls/avifil32/Makefile.in
+++ b/dlls/avifil32/Makefile.in
@@ -2,8 +2,6 @@ MODULE    = avifil32.dll
 IMPORTLIB = avifil32
 IMPORTS   = uuid msacm32 msvfw32 winmm ole32 user32 advapi32 rpcrt4
 
-EXTRAIDLFLAGS = -Oicf
-
 SOURCES = \
 	acmstream.c \
 	api.c \
diff --git a/dlls/combase/Makefile.in b/dlls/combase/Makefile.in
index 7fd47cdb104..f0acc33751f 100644
--- a/dlls/combase/Makefile.in
+++ b/dlls/combase/Makefile.in
@@ -4,8 +4,6 @@ IMPORTLIB = combase
 IMPORTS   = advapi32 ole32 user32 gdi32 uuid rpcrt4
 DELAYIMPORTS = oleaut32
 
-EXTRAIDLFLAGS = -Oicf
-
 SOURCES = \
 	apartment.c \
 	combase.c \
diff --git a/dlls/dispex/Makefile.in b/dlls/dispex/Makefile.in
index 1fbdc7bc226..d8a542acb71 100644
--- a/dlls/dispex/Makefile.in
+++ b/dlls/dispex/Makefile.in
@@ -1,8 +1,6 @@
 MODULE    = dispex.dll
 IMPORTS   = uuid oleaut32 ole32 rpcrt4 advapi32
 
-EXTRAIDLFLAGS = -Oicf
-
 SOURCES = \
 	disp_ex.idl \
 	usrmarshal.c
diff --git a/dlls/ia2comproxy/Makefile.in b/dlls/ia2comproxy/Makefile.in
index f7783098bb8..3e8380c6f7d 100644
--- a/dlls/ia2comproxy/Makefile.in
+++ b/dlls/ia2comproxy/Makefile.in
@@ -1,8 +1,6 @@
 MODULE    = ia2comproxy.dll
 IMPORTS   = uuid oleacc oleaut32 ole32 rpcrt4
 
-EXTRAIDLFLAGS = -Oicf
-
 SOURCES = \
 	ia2_classes.idl \
 	oleacc_classes.idl
diff --git a/dlls/ieproxy/Makefile.in b/dlls/ieproxy/Makefile.in
index cdafc418a71..7b1db81a3d1 100644
--- a/dlls/ieproxy/Makefile.in
+++ b/dlls/ieproxy/Makefile.in
@@ -1,8 +1,6 @@
 MODULE = ieproxy.dll
 IMPORTS = uuid ole32 rpcrt4
 
-EXTRAIDLFLAGS = -Oicf
-
 SOURCES = \
 	ieproxy_ieautomation.idl \
 	ieproxy_perhist.idl
diff --git a/dlls/msctfp/Makefile.in b/dlls/msctfp/Makefile.in
index 9f338d2fc13..b3d3f0ed932 100644
--- a/dlls/msctfp/Makefile.in
+++ b/dlls/msctfp/Makefile.in
@@ -1,8 +1,6 @@
 MODULE    = msctfp.dll
 IMPORTS   = rpcrt4 ole32 oleaut32
 
-EXTRAIDLFLAGS = -Oicf
-
 SOURCES = \
 	msctfp.idl
 
diff --git a/dlls/msdaps/Makefile.in b/dlls/msdaps/Makefile.in
index e2070f7aa98..bf1e5c8b3b4 100644
--- a/dlls/msdaps/Makefile.in
+++ b/dlls/msdaps/Makefile.in
@@ -9,6 +9,5 @@ SOURCES = \
 	usrmarshal.c
 
 dlldata_EXTRADEFS  = -DWINE_REGISTER_DLL -DPROXY_CLSID=CLSID_PSFactoryBuffer -DENTRY_PREFIX=msdaps_
-EXTRAIDLFLAGS = -Oicf
 i386_EXTRAIDLFLAGS = --packing=2
 arm_EXTRAIDLFLAGS  = --packing=2
diff --git a/dlls/msi/Makefile.in b/dlls/msi/Makefile.in
index f58b8793790..21420909a92 100644
--- a/dlls/msi/Makefile.in
+++ b/dlls/msi/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = msi.dll
 IMPORTLIB = msi
 IMPORTS   = uuid urlmon wininet comctl32 shell32 shlwapi cabinet oleaut32 ole32 version user32 gdi32 advapi32 rpcrt4 sxs imagehlp mspatcha odbccp32 wintrust crypt32
 
-EXTRAIDLFLAGS = -Oicf --prefix-server=s_
+EXTRAIDLFLAGS = --prefix-server=s_
 
 SOURCES = \
 	action.c \
diff --git a/dlls/mstask/Makefile.in b/dlls/mstask/Makefile.in
index 0581beaffda..bb6ed7638dc 100644
--- a/dlls/mstask/Makefile.in
+++ b/dlls/mstask/Makefile.in
@@ -1,8 +1,6 @@
 MODULE    = mstask.dll
 IMPORTS   = rpcrt4 ole32 oleaut32
 
-EXTRAIDLFLAGS = -Oicf
-
 SOURCES = \
 	atsvc.idl \
 	factory.c \
diff --git a/dlls/netapi32/Makefile.in b/dlls/netapi32/Makefile.in
index 0729c34eb0a..055e8dd04d4 100644
--- a/dlls/netapi32/Makefile.in
+++ b/dlls/netapi32/Makefile.in
@@ -3,8 +3,6 @@ UNIXLIB   = netapi32.so
 IMPORTLIB = netapi32
 IMPORTS   = rpcrt4 iphlpapi ws2_32 advapi32 dnsapi
 
-EXTRAIDLFLAGS = -Oicf
-
 SOURCES = \
 	atsvc.idl \
 	nbcmdqueue.c \
diff --git a/dlls/ntoskrnl.exe/Makefile.in b/dlls/ntoskrnl.exe/Makefile.in
index ebeb3ad3406..a04a75e7f52 100644
--- a/dlls/ntoskrnl.exe/Makefile.in
+++ b/dlls/ntoskrnl.exe/Makefile.in
@@ -3,8 +3,6 @@ IMPORTLIB = ntoskrnl
 IMPORTS   = advapi32 hal msvcrt
 DELAYIMPORTS = rpcrt4 setupapi
 
-EXTRAIDLFLAGS = -Oicf
-
 SOURCES = \
 	instr.c \
 	ntoskrnl.c \
diff --git a/dlls/ole32/Makefile.in b/dlls/ole32/Makefile.in
index 2b3423e60a7..ee0fcc41f7d 100644
--- a/dlls/ole32/Makefile.in
+++ b/dlls/ole32/Makefile.in
@@ -4,8 +4,6 @@ IMPORTLIB = ole32
 IMPORTS   = uuid advapi32 user32 gdi32 combase rpcrt4 kernelbase coml2
 DELAYIMPORTS = oleaut32
 
-EXTRAIDLFLAGS = -Oicf
-
 SOURCES = \
 	antimoniker.c \
 	bindctx.c \
diff --git a/dlls/oleacc/Makefile.in b/dlls/oleacc/Makefile.in
index 4f511ebabcb..4bd7438aec5 100644
--- a/dlls/oleacc/Makefile.in
+++ b/dlls/oleacc/Makefile.in
@@ -2,8 +2,6 @@ MODULE    = oleacc.dll
 IMPORTLIB = oleacc
 IMPORTS   = uuid oleaut32 ole32 user32 rpcrt4
 
-EXTRAIDLFLAGS = -Oicf
-
 SOURCES = \
 	client.c \
 	main.c \
diff --git a/dlls/oleaut32/Makefile.in b/dlls/oleaut32/Makefile.in
index 033d3d76e83..04dfcaa2bd3 100644
--- a/dlls/oleaut32/Makefile.in
+++ b/dlls/oleaut32/Makefile.in
@@ -4,8 +4,6 @@ IMPORTLIB = oleaut32
 IMPORTS   = uuid ole32 rpcrt4 user32 gdi32 advapi32
 DELAYIMPORTS = comctl32 urlmon windowscodecs
 
-EXTRAIDLFLAGS = -Oicf
-
 SOURCES = \
 	connpt.c \
 	dispatch.c \
diff --git a/dlls/qmgrprxy/Makefile.in b/dlls/qmgrprxy/Makefile.in
index 19cea6611ef..a222c51a5b1 100644
--- a/dlls/qmgrprxy/Makefile.in
+++ b/dlls/qmgrprxy/Makefile.in
@@ -1,8 +1,6 @@
 MODULE    = qmgrprxy.dll
 IMPORTS   = rpcrt4
 
-EXTRAIDLFLAGS = -Oicf
-
 SOURCES = \
 	qmgrprxy.idl
 
diff --git a/dlls/quartz/Makefile.in b/dlls/quartz/Makefile.in
index 2a10d8d3f13..1456d281cb8 100644
--- a/dlls/quartz/Makefile.in
+++ b/dlls/quartz/Makefile.in
@@ -3,8 +3,6 @@ IMPORTLIB    = quartz
 IMPORTS      = strmiids dxguid strmbase uuid dsound msacm32 msvfw32 ole32 oleaut32 rpcrt4 user32 gdi32 advapi32 winmm
 DELAYIMPORTS = ddraw
 
-EXTRAIDLFLAGS = -Oicf
-
 SOURCES = \
 	acmwrapper.c \
 	avidec.c \
diff --git a/dlls/rpcrt4/Makefile.in b/dlls/rpcrt4/Makefile.in
index c2262170e9c..69f6961eff3 100644
--- a/dlls/rpcrt4/Makefile.in
+++ b/dlls/rpcrt4/Makefile.in
@@ -4,8 +4,6 @@ IMPORTLIB = rpcrt4
 IMPORTS   = uuid advapi32
 DELAYIMPORTS = iphlpapi wininet secur32 user32 ws2_32 ole32 oleaut32
 
-EXTRAIDLFLAGS = -Oicf
-
 SOURCES = \
 	cproxy.c \
 	cpsf.c \
diff --git a/dlls/rpcrt4/tests/Makefile.in b/dlls/rpcrt4/tests/Makefile.in
index a079ea0a19a..512ae34e43e 100644
--- a/dlls/rpcrt4/tests/Makefile.in
+++ b/dlls/rpcrt4/tests/Makefile.in
@@ -2,7 +2,7 @@ TESTDLL   = rpcrt4.dll
 IMPORTS   = oleaut32 ole32 rpcrt4 secur32 advapi32
 EXTRADEFS = -DPROXY_DELEGATION
 
-EXTRAIDLFLAGS = -Oicf --prefix-server=s_
+EXTRAIDLFLAGS = --prefix-server=s_
 server_EXTRAIDLFLAGS = -Os --prefix-client=mixed_
 server_interp_EXTRAIDLFLAGS = -Oicf --prefix-client=interp_
 
diff --git a/dlls/schedsvc/Makefile.in b/dlls/schedsvc/Makefile.in
index 1aeb43574e9..40dee0b48df 100644
--- a/dlls/schedsvc/Makefile.in
+++ b/dlls/schedsvc/Makefile.in
@@ -1,8 +1,6 @@
 MODULE    = schedsvc.dll
 IMPORTS   = rpcrt4 advapi32 ole32 xmllite
 
-EXTRAIDLFLAGS = -Oicf
-
 SOURCES = \
 	atsvc.c \
 	atsvc.idl \
diff --git a/dlls/schedsvc/tests/Makefile.in b/dlls/schedsvc/tests/Makefile.in
index 6ecfa8483ac..d78da177906 100644
--- a/dlls/schedsvc/tests/Makefile.in
+++ b/dlls/schedsvc/tests/Makefile.in
@@ -1,8 +1,6 @@
 TESTDLL   = schedsvc.dll
 IMPORTS   = advapi32 rpcrt4 ole32
 
-EXTRAIDLFLAGS = -Oicf
-
 SOURCES = \
 	atsvc.idl \
 	atsvcapi.c \
diff --git a/dlls/sechost/Makefile.in b/dlls/sechost/Makefile.in
index eeb20370e71..ec1eb100683 100644
--- a/dlls/sechost/Makefile.in
+++ b/dlls/sechost/Makefile.in
@@ -3,8 +3,6 @@ IMPORTLIB = sechost
 IMPORTS   = kernelbase
 DELAYIMPORTS = rpcrt4
 
-EXTRAIDLFLAGS = -Oicf
-
 SOURCES = \
 	plugplay.idl \
 	security.c \
diff --git a/dlls/sti/Makefile.in b/dlls/sti/Makefile.in
index ed695590a37..cbdc42ea2d0 100644
--- a/dlls/sti/Makefile.in
+++ b/dlls/sti/Makefile.in
@@ -3,7 +3,6 @@ IMPORTLIB = sti
 IMPORTS   = uuid ole32 oleaut32 rpcrt4 advapi32
 
 EXTRADLLFLAGS = -Wb,--prefer-native
-EXTRAIDLFLAGS = -Oicf
 
 SOURCES = \
 	sti.c \
diff --git a/dlls/taskschd/Makefile.in b/dlls/taskschd/Makefile.in
index 1910b0699df..fcc39fd6f04 100644
--- a/dlls/taskschd/Makefile.in
+++ b/dlls/taskschd/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = taskschd.dll
 IMPORTS   = oleaut32 ole32 advapi32 xmllite rpcrt4
 
 EXTRADLLFLAGS = -Wb,--prefer-native
-EXTRAIDLFLAGS = -Oicf
 
 SOURCES = \
 	folder.c \
diff --git a/dlls/urlmon/Makefile.in b/dlls/urlmon/Makefile.in
index 9c9e9ef5a0e..ba6f1db87ad 100644
--- a/dlls/urlmon/Makefile.in
+++ b/dlls/urlmon/Makefile.in
@@ -3,8 +3,6 @@ IMPORTLIB = urlmon
 IMPORTS   = uuid ole32 oleaut32 shell32 rpcrt4 shlwapi wininet user32 advapi32
 DELAYIMPORTS = advpack
 
-EXTRAIDLFLAGS = -Oicf
-
 SOURCES = \
 	axinstall.c \
 	bindctx.c \
diff --git a/dlls/windowscodecs/Makefile.in b/dlls/windowscodecs/Makefile.in
index 0be0e750dbb..511d45170d3 100644
--- a/dlls/windowscodecs/Makefile.in
+++ b/dlls/windowscodecs/Makefile.in
@@ -3,8 +3,6 @@ IMPORTLIB = windowscodecs
 IMPORTS   = $(TIFF_PE_LIBS) $(JPEG_PE_LIBS) $(PNG_PE_LIBS) windowscodecs uuid ole32 oleaut32 propsys rpcrt4 shlwapi user32 gdi32 advapi32
 EXTRAINCL = $(TIFF_PE_CFLAGS) $(JPEG_PE_CFLAGS) $(PNG_PE_CFLAGS)
 
-EXTRAIDLFLAGS = -Oicf
-
 SOURCES = \
 	bitmap.c \
 	bmpdecode.c \
diff --git a/programs/plugplay/Makefile.in b/programs/plugplay/Makefile.in
index e39c39bf1aa..ce595a6d759 100644
--- a/programs/plugplay/Makefile.in
+++ b/programs/plugplay/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = plugplay.exe
 IMPORTS   = advapi32 rpcrt4 user32
 
 EXTRADLLFLAGS = -mconsole -municode
-EXTRAIDLFLAGS = -Oicf
 
 SOURCES = \
 	main.c \
diff --git a/programs/rpcss/Makefile.in b/programs/rpcss/Makefile.in
index 92c88324232..e643f66f38d 100644
--- a/programs/rpcss/Makefile.in
+++ b/programs/rpcss/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = rpcss.exe
 IMPORTS   = rpcrt4 advapi32
 
 EXTRADLLFLAGS = -mconsole -municode
-EXTRAIDLFLAGS = -Oicf
 
 SOURCES = \
 	epm.idl \
diff --git a/programs/services/Makefile.in b/programs/services/Makefile.in
index a10fae8622d..c314b467d0a 100644
--- a/programs/services/Makefile.in
+++ b/programs/services/Makefile.in
@@ -2,7 +2,6 @@ MODULE    = services.exe
 IMPORTS   = rpcrt4 advapi32 userenv setupapi
 
 EXTRADLLFLAGS = -mwindows
-EXTRAIDLFLAGS = -Oicf
 
 SOURCES = \
 	rpc.c \
diff --git a/tools/widl/widl.c b/tools/widl/widl.c
index 30907eca69b..ef68259157b 100644
--- a/tools/widl/widl.c
+++ b/tools/widl/widl.c
@@ -109,7 +109,7 @@ static int no_preprocess = 0;
 int old_names = 0;
 int old_typelib = 0;
 int winrt_mode = 0;
-int interpreted_mode = 0;
+int interpreted_mode = 1;
 int use_abi_namespace = 0;
 static int stdinc = 1;
 
diff --git a/tools/widl/widl.man.in b/tools/widl/widl.man.in
index 2210ffda48c..2ff88124483 100644
--- a/tools/widl/widl.man.in
+++ b/tools/widl/widl.man.in
@@ -78,7 +78,7 @@ Generate inline stubs.
 .IP "\fB-Oi\fR"
 Generate old-style interpreted stubs.
 .IP "\fB-Oif, -Oic, -Oicf\fR"
-Generate new-style fully interpreted stubs.
+Generate new-style fully interpreted stubs. This is the default.
 .IP "\fB-p\fR"
 Generate a proxy. The default output filename is \fIinfile\fB_p.c\fR.
 .IP "\fB--prefix-all=\fIprefix\fR"
-- 
2.11.4.GIT