[3/3] include: ctfutb.idl should import msctf.idl.
Francois Gouget
fgouget at free.fr
Sat May 23 10:18:08 CDT 2015
---
This causes the following import chain which requires the widl patch to
be handled correctly:
ctfutb.idl -> msctf.idl -> ctfutb.idl
Also including msctf.idl is not counted as an import which, coupled with
the above import chain, causes it to be processed twice. So including
msctf.idl does not work but importing it does.
dlls/msctfp/msctfp.idl | 2 +-
include/ctfutb.idl | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/msctfp/msctfp.idl b/dlls/msctfp/msctfp.idl
index c1d7ec0..fddfa85 100644
--- a/dlls/msctfp/msctfp.idl
+++ b/dlls/msctfp/msctfp.idl
@@ -18,7 +18,7 @@
#pragma makedep ident proxy register
-#include "msctf.idl"
+import "msctf.idl";
[
threading(both),
diff --git a/include/ctfutb.idl b/include/ctfutb.idl
index 1a4125b..425740e 100644
--- a/include/ctfutb.idl
+++ b/include/ctfutb.idl
@@ -18,6 +18,7 @@
#ifndef DO_NO_IMPORTS
import "oaidl.idl";
+import "msctf.idl";
#endif
interface ITfLangBarEventSink;
--
2.1.4
More information about the wine-patches
mailing list