Jacek Caban : inputscope.idl: Imported from mingw-w64.
Alexandre Julliard
julliard at winehq.org
Thu Aug 15 13:12:46 CDT 2013
Module: wine
Branch: master
Commit: b25983ff7ea98ab14c22810006f5f222bbf7733e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b25983ff7ea98ab14c22810006f5f222bbf7733e
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Aug 5 13:14:50 2013 +0200
inputscope.idl: Imported from mingw-w64.
---
.gitignore | 1 +
dlls/msctf/msctf.c | 5 ++-
include/Makefile.in | 1 +
include/inputscope.idl | 93 ++++++++++++++++++++++++++++++++++++++++++++++++
include/msctf.idl | 2 -
5 files changed, 98 insertions(+), 4 deletions(-)
diff --git a/.gitignore b/.gitignore
index 8c51c2a..5147285 100644
--- a/.gitignore
+++ b/.gitignore
@@ -194,6 +194,7 @@ include/iextag.h
include/imnact.h
include/imnxport.h
include/indexsrv.h
+include/inputscope.h
include/mediaobj.h
include/metahost.h
include/mimeinfo.h
diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c
index 2a8b0e1..78992f7 100644
--- a/dlls/msctf/msctf.c
+++ b/dlls/msctf/msctf.c
@@ -35,6 +35,7 @@
#include "comcat.h"
#include "rpcproxy.h"
#include "msctf.h"
+#include "inputscope.h"
#include "msctf_internal.h"
@@ -602,7 +603,7 @@ HRESULT WINAPI TF_GetThreadMgr(ITfThreadMgr **pptim)
/***********************************************************************
* SetInputScope(MSCTF.@)
*/
-HRESULT WINAPI SetInputScope(HWND hwnd, INT inputscope)
+HRESULT WINAPI SetInputScope(HWND hwnd, InputScope inputscope)
{
FIXME("STUB: %p %i\n",hwnd,inputscope);
return S_OK;
@@ -611,7 +612,7 @@ HRESULT WINAPI SetInputScope(HWND hwnd, INT inputscope)
/***********************************************************************
* SetInputScopes(MSCTF.@)
*/
-HRESULT WINAPI SetInputScopes(HWND hwnd, const INT *pInputScopes,
+HRESULT WINAPI SetInputScopes(HWND hwnd, const InputScope *pInputScopes,
UINT cInputScopes, WCHAR **ppszPhraseList,
UINT cPhrases, WCHAR *pszRegExp, WCHAR *pszSRGS)
{
diff --git a/include/Makefile.in b/include/Makefile.in
index 7f26dca..b1e48fa 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -49,6 +49,7 @@ PUBLIC_IDL_H_SRCS = \
imnact.idl \
imnxport.idl \
indexsrv.idl \
+ inputscope.idl \
mediaobj.idl \
metahost.idl \
mimeinfo.idl \
diff --git a/include/inputscope.idl b/include/inputscope.idl
new file mode 100644
index 0000000..059b6f8
--- /dev/null
+++ b/include/inputscope.idl
@@ -0,0 +1,93 @@
+/**
+ * This file has no copyright assigned and is placed in the Public Domain.
+ * This file is part of the mingw-w64 runtime package.
+ * No warranty is given.
+ */
+
+import "oaidl.idl";
+import "ocidl.idl";
+
+typedef enum {
+ IS_DEFAULT = 0,
+ IS_URL = 1,
+ IS_FILE_FULLFILEPATH = 2,
+ IS_FILE_FILENAME = 3,
+ IS_EMAIL_USERNAME = 4,
+ IS_EMAIL_SMTPEMAILADDRESS = 5,
+ IS_LOGINNAME = 6,
+ IS_PERSONALNAME_FULLNAME = 7,
+ IS_PERSONALNAME_PREFIX = 8,
+ IS_PERSONALNAME_GIVENNAME = 9,
+ IS_PERSONALNAME_MIDDLENAME = 10,
+ IS_PERSONALNAME_SURNAME = 11,
+ IS_PERSONALNAME_SUFFIX = 12,
+ IS_ADDRESS_FULLPOSTALADDRESS = 13,
+ IS_ADDRESS_POSTALCODE = 14,
+ IS_ADDRESS_STREET = 15,
+ IS_ADDRESS_STATEORPROVINCE = 16,
+ IS_ADDRESS_CITY = 17,
+ IS_ADDRESS_COUNTRYNAME = 18,
+ IS_ADDRESS_COUNTRYSHORTNAME = 19,
+ IS_CURRENCY_AMOUNTANDSYMBOL = 20,
+ IS_CURRENCY_AMOUNT = 21,
+ IS_DATE_FULLDATE = 22,
+ IS_DATE_MONTH = 23,
+ IS_DATE_DAY = 24,
+ IS_DATE_YEAR = 25,
+ IS_DATE_MONTHNAME = 26,
+ IS_DATE_DAYNAME = 27,
+ IS_DIGITS = 28,
+ IS_NUMBER = 29,
+ IS_ONECHAR = 30,
+ IS_PASSWORD = 31,
+ IS_TELEPHONE_FULLTELEPHONENUMBER = 32,
+ IS_TELEPHONE_COUNTRYCODE = 33,
+ IS_TELEPHONE_AREACODE = 34,
+ IS_TELEPHONE_LOCALNUMBER = 35,
+ IS_TIME_FULLTIME = 36,
+ IS_TIME_HOUR = 37,
+ IS_TIME_MINORSEC = 38,
+ IS_NUMBER_FULLWIDTH = 39,
+ IS_ALPHANUMERIC_HALFWIDTH = 40,
+ IS_ALPHANUMERIC_FULLWIDTH = 41,
+ IS_CURRENCY_CHINESE = 42,
+ IS_BOPOMOFO = 43,
+ IS_HIRAGANA = 44,
+ IS_KATAKANA_HALFWIDTH = 45,
+ IS_KATAKANA_FULLWIDTH = 46,
+ IS_HANJA = 47,
+ IS_HANGUL_HALFWIDTH = 48,
+ IS_HANGUL_FULLWIDTH = 49,
+ IS_SEARCH = 50,
+ IS_FORMULA = 51,
+ IS_SEARCH_INCREMENTAL = 52,
+ IS_CHINESE_HALFWIDTH = 53,
+ IS_CHINESE_FULLWIDTH = 54,
+ IS_NATIVE_SCRIPT = 55,
+
+ IS_PHRASELIST = -1,
+ IS_REGULAREXPRESSION = -2,
+ IS_SRGS = -3,
+ IS_XML = -4,
+ IS_ENUMSTRING = -5
+} InputScope;
+
+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 SetInputScopeXML(HWND hwnd,WCHAR *pszXML);")
+
+cpp_quote("DEFINE_GUID(GUID_PROP_INPUTSCOPE,0x1713dd5a,0x68e7,0x4a5b,0x9a,0xf6,0x59,0x2a,0x59,0x5c,0x77,0x8d);")
+
+[
+ object,
+ uuid(fde1eaee-6924-4cdf-91e7-da38cff5559d),
+ pointer_default(unique)
+]
+interface ITfInputScope : IUnknown
+{
+ HRESULT GetInputScopes([out, size_is(,*pcCount)] InputScope **pprgInputScopes, [out] UINT *pcCount);
+ HRESULT GetPhrase([out, size_is(,*pcCount)] BSTR **ppbstrPhrases, [out] UINT *pcCount);
+ HRESULT GetRegularExpression([out] BSTR *pbstrRegExp);
+ HRESULT GetSRGS([out] BSTR *pbstrSRGS);
+ HRESULT GetXML([out] BSTR *pbstrXML);
+}
diff --git a/include/msctf.idl b/include/msctf.idl
index e17132b..a3db32e 100644
--- a/include/msctf.idl
+++ b/include/msctf.idl
@@ -29,8 +29,6 @@ cpp_quote("#define TF_E_DISCONNECTED MAKE_HRESULT(SEVERITY_ERROR, FACILITY_IT
cpp_quote("#define TF_E_ALREADY_EXISTS MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0506)")
cpp_quote("#define TF_E_NOLOCK MAKE_HRESULT(SEVERITY_ERROR, FACILITY_ITF, 0x0201)")
-cpp_quote("HRESULT WINAPI SetInputScope(HWND hwnd, INT inputscope);")
-cpp_quote("HRESULT WINAPI SetInputScopes(HWND hwnd, const INT *pInputScopes, UINT cInputScopes, WCHAR **ppszPhraseList, UINT cPhrases, WCHAR *pszRegExp, WCHAR *pszSRGS);")
cpp_quote("HRESULT WINAPI TF_CreateThreadMgr(ITfThreadMgr **pptim);")
cpp_quote("HRESULT WINAPI TF_GetThreadMgr(ITfThreadMgr **pptim);")
cpp_quote("HRESULT WINAPI TF_CreateInputProcessorProfiles(ITfInputProcessorProfiles **ppipr);")
More information about the wine-cvs
mailing list