commit 3412cd4fa80a68ac1321ca68a9afa70ac8c85313
author Biswapriyo Nath <nathbappai@gmail.com> Tue Apr 28 21:27:14 2020 +0530
committer Liu Hao <lh_mouse@126.com> Wed Apr 29 22:22:36 2020 +0800
tree ae13a4ba8b0d3cc26be56e045b7248e62530bc63
parent bfd33f6c0ec5e652cc9911857dd1492ece8d8383

headers/inputscope.idl: add winapifamily conditions and ITfInputScope2 interface

Signed-off-by: Biswapriyo Nath <nathbappai@gmail.com>
Signed-off-by: Liu Hao <lh_mouse@126.com>

mingw-w64-headers/include/inputscope.idl

diff --git a/mingw-w64-headers/include/inputscope.idl b/mingw-w64-headers/include/inputscope.idl
index a89d41d..068ce48 100644
--- a/mingw-w64-headers/include/inputscope.idl
+++ b/mingw-w64-headers/include/inputscope.idl
@@ -7,6 +7,10 @@
 import "oaidl.idl";
 import "ocidl.idl";
 
+cpp_quote("#include <winapifamily.h>")
+
+cpp_quote("#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)")
+
 typedef enum {
     IS_DEFAULT                       = 0,
     IS_URL                           = 1,
@@ -85,10 +89,19 @@
     IS_ENUMSTRING        = -5
 } InputScope;
 
+cpp_quote("#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */")
+
+cpp_quote("#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)")
+
 cpp_quote("HRESULT WINAPI SetInputScope(HWND hwnd,InputScope inputscope);")
 cpp_quote("HRESULT WINAPI SetInputScopes(HWND hwnd,const InputScope *pInputScopes,UINT cInputScopes,WCHAR **ppszPhraseList,UINT cPhrases,WCHAR *pszRegExp,WCHAR *pszSRGS);")
+cpp_quote("HRESULT WINAPI SetInputScopes2(HWND hwnd,const InputScope *pInputScopes,UINT cInputScopes,IEnumString *pEnumString,PWSTR pszRegExp,PWSTR pszSRGS);")
 cpp_quote("HRESULT WINAPI SetInputScopeXML(HWND hwnd,WCHAR *pszXML);")
 
+cpp_quote("#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP) */")
+
+cpp_quote("#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)")
+
 cpp_quote("DEFINE_GUID(GUID_PROP_INPUTSCOPE,0x1713dd5a,0x68e7,0x4a5b,0x9a,0xf6,0x59,0x2a,0x59,0x5c,0x77,0x8d);")
 
 [
@@ -104,3 +117,15 @@
     HRESULT GetSRGS([out] BSTR *pbstrSRGS);
     HRESULT GetXML([out] BSTR *pbstrXML);
 }
+
+[
+    object,
+    uuid(5731eaa0-6bc2-4681-a532-92fbb74d7c41),
+    pointer_default(unique)
+]
+interface ITfInputScope2 : ITfInputScope
+{
+    HRESULT EnumWordList([out] IEnumString **ppEnumString);
+};
+
+cpp_quote("#endif /* WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) */")