February 2010 - Wine-Commits

Roderick Colenbrander : winex11: Fix xrender mono->mono blit.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: 5b29189da4e0cb8c36d79ab7baff3ccf332d4409 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b29189da4e0cb8c36d79ab7b… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Feb 17 16:09:51 2010 +0100 winex11: Fix xrender mono->mono blit. Use plain xrender_blit for mono -> mono copies, masking in combination with PictOpOver doesn't make sense and doesn't work. --- dlls/winex11.drv/xrender.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index 214be7b..a5cd65a 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -2166,7 +2166,7 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE } /* mono -> color */ - if(physDevSrc->depth == 1) + if(physDevSrc->depth == 1 && physDevDst->depth > 1) { XRenderColor col; get_xrender_color(dst_format, physDevDst->textPixel, &col); @@ -2189,7 +2189,7 @@ BOOL X11DRV_XRender_GetSrcAreaStretch(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE wine_tsx11_unlock(); LeaveCriticalSection( &xrender_cs ); } - else /* color -> color but with different depths */ + else /* color -> color (can be at different depths) or mono -> mono */ { src_pict = get_xrender_picture_source(physDevSrc);

1 0

Nikolay Sivov : msxml3/tests: Fix leaks and wrong pointer use.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: 16785efc27998babbc197f7a9200e279164f7988 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16785efc27998babbc197f7a9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Feb 17 14:07:14 2010 +0300 msxml3/tests: Fix leaks and wrong pointer use. --- dlls/msxml3/tests/domdoc.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6d4cf18..e7c9008 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -1826,6 +1826,7 @@ static void test_create(void) ok( r == S_OK, "returns %08x\n", r ); ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); IXMLDOMComment_Release(comment); + SysFreeString(str); node = (IXMLDOMNode*)0x1; r = IXMLDOMDocument_createNode( doc, var, _bstr_("blah"), NULL, &node ); @@ -1840,6 +1841,7 @@ static void test_create(void) ok( r == S_OK, "returns %08x\n", r ); ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); IXMLDOMComment_Release(comment); + SysFreeString(str); /* NODE_TEXT */ V_VT(&var) = VT_I1; @@ -1857,7 +1859,7 @@ static void test_create(void) r = IXMLDOMText_get_data(text, &str); ok( r == S_OK, "returns %08x\n", r ); ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); - IXMLDOMText_Release(comment); + IXMLDOMText_Release(text); SysFreeString(str); node = (IXMLDOMNode*)0x1; @@ -1873,6 +1875,7 @@ static void test_create(void) ok( r == S_OK, "returns %08x\n", r ); ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); IXMLDOMText_Release(text); + SysFreeString(str); node = (IXMLDOMNode*)0x1; r = IXMLDOMDocument_createNode( doc, var, _bstr_("blah"), NULL, &node ); @@ -1887,6 +1890,7 @@ static void test_create(void) ok( r == S_OK, "returns %08x\n", r ); ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); IXMLDOMText_Release(text); + SysFreeString(str); /* NODE_CDATA_SECTION */ V_VT(&var) = VT_I1; @@ -1920,12 +1924,13 @@ static void test_create(void) ok( r == S_OK, "returns %08x\n", r ); ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); IXMLDOMCDATASection_Release(cdata); + SysFreeString(str); node = (IXMLDOMNode*)0x1; r = IXMLDOMDocument_createNode( doc, var, _bstr_("blah"), NULL, &node ); ok( r == S_OK, "returns %08x\n", r ); - r = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMCDATASection, (void**)&text); + r = IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMCDATASection, (void**)&cdata); ok( r == S_OK, "returns %08x\n", r ); IXMLDOMNode_Release(node); @@ -1934,11 +1939,11 @@ static void test_create(void) ok( r == S_OK, "returns %08x\n", r ); ok( str && SysStringLen(str) == 0, "expected empty comment, %p\n", str); IXMLDOMCDATASection_Release(cdata); + SysFreeString(str); /* NODE_ATTRIBUTE */ V_VT(&var) = VT_I1; V_I1(&var) = NODE_ATTRIBUTE; - str = SysAllocString( szlc ); node = (IXMLDOMNode*)0x1; r = IXMLDOMDocument_createNode( doc, var, NULL, NULL, &node ); ok( r == E_FAIL, "returns %08x\n", r ); @@ -1957,6 +1962,7 @@ static void test_create(void) r = IXMLDOMDocument_createNode( doc, var, str, NULL, &node ); ok( r == S_OK, "returns %08x\n", r ); if( SUCCEEDED(r) ) IXMLDOMNode_Release( node ); + SysFreeString(str); /* NODE_PROCESSING_INSTRUCTION */ V_VT(&var) = VT_I1; @@ -1981,7 +1987,6 @@ static void test_create(void) /* NODE_ENTITY_REFERENCE */ V_VT(&var) = VT_I1; V_I1(&var) = NODE_ENTITY_REFERENCE; - str = SysAllocString( szlc ); node = (IXMLDOMNode*)0x1; r = IXMLDOMDocument_createNode( doc, var, NULL, NULL, &node ); ok( r == E_FAIL, "returns %08x\n", r ); @@ -1997,7 +2002,6 @@ static void test_create(void) /* NODE_ELEMENT */ V_VT(&var) = VT_I1; V_I1(&var) = NODE_ELEMENT; - str = SysAllocString( szlc ); node = (IXMLDOMNode*)0x1; r = IXMLDOMDocument_createNode( doc, var, NULL, NULL, &node ); ok( r == E_FAIL, "returns %08x\n", r ); @@ -5263,7 +5267,7 @@ static void test_put_nodeValue(void) V_VT(&data) = VT_BSTR; V_BSTR(&data) = _bstr_("one two three"); - hr = IXMLDOMEntityReference_put_nodeValue(node, data); + hr = IXMLDOMEntityReference_put_nodeValue(entityref, data); ok(hr == E_FAIL, "ret %08x\n", hr ); hr = IXMLDOMEntityReference_QueryInterface(entityref, &IID_IXMLDOMNode, (void**)&node);

1 0

Paul Vriens : winspool.drv/tests: Skip non supported levels on Win9x/WinMe.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: 5e3e9e03f2c6c4b71e17fd51309e741f4d37f95e URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3e9e03f2c6c4b71e17fd513… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Feb 17 10:50:09 2010 +0100 winspool.drv/tests: Skip non supported levels on Win9x/WinMe. --- dlls/winspool.drv/tests/info.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 2ea5f54..7739a2b 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2275,6 +2275,13 @@ static void test_GetPrinter(void) SetLastError(0xdeadbeef); needed = (DWORD)-1; ret = GetPrinter(hprn, level, NULL, 0, &needed); + if (ret) + { + win_skip("Level %d is not supported on Win9x/WinMe\n", level); + ok(GetLastError() == ERROR_SUCCESS, "wrong error %d\n", GetLastError()); + ok(needed == 0,"Expected 0, got %d\n", needed); + continue; + } ok(!ret, "level %d: GetPrinter should fail\n", level); /* Not all levels are supported on all Windows-Versions */ if (GetLastError() == ERROR_INVALID_LEVEL ||

1 0

Paul Vriens : winspool.drv/tests: Fix some test failures on Win9x/WinMe.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: f5d40cb8c5d6f33b7b34c5b0c1943b9dd50e8bc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5d40cb8c5d6f33b7b34c5b0c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Feb 17 10:38:31 2010 +0100 winspool.drv/tests: Fix some test failures on Win9x/WinMe. --- dlls/winspool.drv/tests/info.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 712b00b..2ea5f54 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2277,7 +2277,12 @@ static void test_GetPrinter(void) ret = GetPrinter(hprn, level, NULL, 0, &needed); ok(!ret, "level %d: GetPrinter should fail\n", level); /* Not all levels are supported on all Windows-Versions */ - if(GetLastError() == ERROR_INVALID_LEVEL) continue; + if (GetLastError() == ERROR_INVALID_LEVEL || + GetLastError() == ERROR_NOT_SUPPORTED /* Win9x/WinMe */) + { + skip("Level %d not supported\n", level); + continue; + } ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "wrong error %d\n", GetLastError()); ok(needed > 0,"not expected needed buffer size %d\n", needed);

1 0

Paul Vriens : winspool.drv/tests: Fix a test failure on Win9x/WinMe.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: 387f050f681f2a9397d599fb68940a77f609b3db URL: http://source.winehq.org/git/wine.git/?a=commit;h=387f050f681f2a9397d599fb6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Wed Feb 17 10:59:18 2010 +0100 winspool.drv/tests: Fix a test failure on Win9x/WinMe. --- dlls/winspool.drv/tests/info.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 7739a2b..1b552fe 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -2448,7 +2448,9 @@ static void test_GetPrinterDriver(void) { ret = GetPrinterDriver(hprn, NULL, level, buf, needed - 2, &filled); ok(!ret, "level %d: GetPrinterDriver succeeded with less buffer than it should\n", level); - ok(di_2->pDataFile == NULL, "Even on failure, GetPrinterDriver clears the buffer to zeros\n"); + ok(di_2->pDataFile == NULL || + broken(di_2->pDataFile != NULL), /* Win9x/WinMe */ + "Even on failure, GetPrinterDriver clears the buffer to zeros\n"); } }

1 0

Alexandre Julliard : kernel32/tests: Fix a test failure on xp64.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: fb950a6da5f2c1be38c185c19b198e94e734e5e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb950a6da5f2c1be38c185c19… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 17 12:04:42 2010 +0100 kernel32/tests: Fix a test failure on xp64. --- dlls/kernel32/tests/heap.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index edc0a64..43db787 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -554,7 +554,8 @@ static void test_heap_checks( DWORD flags ) ok( p2 == NULL, "HeapReAlloc succeeded\n" ); ret = HeapFree( GetProcessHeap(), 0, p ); - ok( !ret, "HeapFree succeeded\n" ); + ok( !ret || broken(sizeof(void*) == 8), /* not caught on xp64 */ + "HeapFree succeeded\n" ); } p[17] = old;

1 0

Piotr Caban : oleaut32: Return TYPE_E_NAMECONFLICT in ICreateTypeLib2:: CreateTypeInfo.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: 1f2590be9be377bf130bbb25d5427c23669e90d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f2590be9be377bf130bbb25d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 17 13:02:06 2010 +0100 oleaut32: Return TYPE_E_NAMECONFLICT in ICreateTypeLib2::CreateTypeInfo. --- dlls/oleaut32/tests/typelib.c | 10 ++++++++++ dlls/oleaut32/typelib2.c | 5 +++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 843af08..ff85320 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -969,9 +969,12 @@ if(use_midl_tlb) { } static void test_CreateTypeLib(void) { + static OLECHAR interface1W[] = {'i','n','t','e','r','f','a','c','e','1',0}; + char filename[MAX_PATH]; WCHAR filenameW[MAX_PATH]; ICreateTypeLib2 *createtl; + ICreateTypeInfo *createti; ITypeLib *tl; HRESULT hres; @@ -983,6 +986,13 @@ static void test_CreateTypeLib(void) { hres = CreateTypeLib2(SYS_WIN32, filenameW, &createtl); ok(hres == S_OK, "got %08x\n", hres); + hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); + ok(hres == S_OK, "got %08x\n", hres); + ICreateTypeInfo_Release(createti); + + hres = ICreateTypeLib_CreateTypeInfo(createtl, interface1W, TKIND_INTERFACE, &createti); + ok(hres == TYPE_E_NAMECONFLICT, "got %08x\n", hres); + hres = ICreateTypeLib2_SaveAllChanges(createtl); ok(hres == S_OK, "got %08x\n", hres); ICreateTypeLib2_Release(createtl); diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 0f641d4..4c90f61 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -3073,9 +3073,14 @@ static HRESULT WINAPI ICreateTypeLib2_fnCreateTypeInfo( ICreateTypeInfo **ppCTInfo) { ICreateTypeLib2Impl *This = (ICreateTypeLib2Impl *)iface; + char *name; TRACE("(%p,%s,%d,%p)\n", iface, debugstr_w(szName), tkind, ppCTInfo); + ctl2_encode_name(This, szName, &name); + if(ctl2_find_name(This, name) != -1) + return TYPE_E_NAMECONFLICT; + *ppCTInfo = (ICreateTypeInfo *)ICreateTypeInfo2_Constructor(This, szName, tkind); if (!*ppCTInfo) return E_OUTOFMEMORY;

1 0

Hwang YunSong : jscript: Add Korean translation.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: 1442a18e3aebd80bd24fd196d29c971f5c1d7d96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1442a18e3aebd80bd24fd196d… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Tue Feb 16 09:25:44 2010 +0900 jscript: Add Korean translation. --- dlls/jscript/Makefile.in | 1 + dlls/jscript/jscript_Ko.rc | 51 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 587825a..e185bc7 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -9,6 +9,7 @@ RC_SRCS = \ jscript_De.rc \ jscript_En.rc \ jscript_Fr.rc \ + jscript_Ko.rc \ jscript_Lt.rc \ jscript_Nl.rc \ jscript_Pt.rc \ diff --git a/dlls/jscript/jscript_Ko.rc b/dlls/jscript/jscript_Ko.rc new file mode 100644 index 0000000..164d6be --- /dev/null +++ b/dlls/jscript/jscript_Ko.rc @@ -0,0 +1,51 @@ +/* + * Copyright 2009 Piotr Caban + * Copyright 2010 YunSong Hwang + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "resource.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT + +STRINGTABLE DISCARDABLE +{ + IDS_TO_PRIMITIVE "객페를 기본 형식으로 변환하는 중에 에러 발생" + IDS_INVALID_CALL_ARG "올바르지 않은 프로시져 호출이나 인수" + IDS_CREATE_OBJ_ERROR "자동화 서버가 객체를 만들 수 없습니다" + IDS_NO_PROPERTY "객체는 이 속성이나 메소드를 지원하지 않습니다" + IDS_ARG_NOT_OPT "인수는 옵션이 아닙니다" + IDS_SYNTAX_ERROR "문법 에러" + IDS_SEMICOLON "';' 가 필요합니다" + IDS_LBRACKET "'(' 가 필요합니다" + IDS_RBRACKET "')' 가 필요합니다" + IDS_UNTERMINATED_STR "띁나지 않은 문자열 상수" + IDS_NOT_FUNC "함수가 필요합니다" + IDS_NOT_DATE "'[객체]' 는 날짜 객체가 아닙니다" + IDS_NOT_NUM "숫자가 필요합니다" + IDS_OBJECT_EXPECTED "객체가 필요합니다" + IDS_ILLEGAL_ASSIGN "잘못된 할당" + IDS_UNDEFINED "'|' 는 정의되지 않았습니다" + IDS_NOT_BOOL "볼린 객제가 필요합니다" + IDS_JSCRIPT_EXPECTED "JScript 객체가 필요합니다" + IDS_REGEXP_SYNTAX_ERROR "정규 표현식에 문법에러가 있습니다" + IDS_URI_INVALID_CHAR "URI 는 올바르지 않은 문자를 포함해서 인코딩되었습니다" + IDS_INVALID_LENGTH "배열 길이는 반드시 한정된 양의 정수이어야 합니다" + IDS_ARRAY_EXPECTED "배열 객체가 필요합니다" +}

1 0

Justin Chevrier : include: Add ITfLangBarMgr Interface.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: a0499b0ad552b597679e39af1ba8969dc8ec2eba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0499b0ad552b597679e39af1… Author: Justin Chevrier <jchevrier(a)gmail.com> Date: Tue Feb 16 21:31:02 2010 -0500 include: Add ITfLangBarMgr Interface. --- .gitignore | 1 + include/Makefile.in | 1 + include/ctfutb.idl | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++ include/msctf.idl | 4 ++- 4 files changed, 78 insertions(+), 1 deletions(-) diff --git a/.gitignore b/.gitignore index e496cae..5be3433 100644 --- a/.gitignore +++ b/.gitignore @@ -136,6 +136,7 @@ include/comcat.h include/commoncontrols.h include/config.h include/control.h +include/ctfutb.h include/ctxtcall.h include/d3d10.h include/ddstream.h diff --git a/include/Makefile.in b/include/Makefile.in index 1ce4a04..514cebe 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -22,6 +22,7 @@ PUBLIC_IDL_H_SRCS = \ comcat.idl \ commoncontrols.idl \ control.idl \ + ctfutb.idl \ ctxtcall.idl \ d3d10.idl \ ddstream.idl \ diff --git a/include/ctfutb.idl b/include/ctfutb.idl new file mode 100644 index 0000000..6d80b38 --- /dev/null +++ b/include/ctfutb.idl @@ -0,0 +1,73 @@ +/* + * Copyright 2010 Justin Chevrier + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef DO_NO_IMPORTS +import "oaidl.idl"; +#endif + +interface ITfLangBarEventSink; +interface ITfLangBarItemMgr; +interface ITfInputProcessorProfiles; + +[ + object, + uuid(87955690-e627-11d2-8ddb-00105a2799b5), + pointer_default(unique) +] +interface ITfLangBarMgr: IUnknown +{ + HRESULT AdviseEventSink( + [in] ITfLangBarEventSink *pSink, + [in] HWND hwnd, + [in] DWORD dwflags, + [in] DWORD *pdwCookie); + + HRESULT UnAdviseEventSink( + [in] DWORD dwCookie); + + HRESULT GetThreadMarshalInterface( + [in] DWORD dwThreadId, + [in] DWORD dwType, + [in] REFIID riid, + [out] IUnknown **ppunk); + + HRESULT GetThreadLangBarItemMgr( + [in] DWORD dwThreadId, + [out] ITfLangBarItemMgr **pplbie, + [out] DWORD *pdwThreadid); + + HRESULT GetInputProcessorProfiles( + [in] DWORD dwThreadId, + [out] ITfInputProcessorProfiles **ppaip, + [out] DWORD *pdwThreadid); + + HRESULT RestoreLastFocus( + [out] DWORD *dwThreadId, + [in] BOOL fPrev); + + HRESULT SetModalInput( + [in] ITfLangBarEventSink *pSink, + [in] DWORD dwThreadId, + [in] DWORD dwFlags); + + HRESULT ShowFloating( + [in] DWORD dwFlags); + + HRESULT GetShowFloatingStatus( + [out] DWORD *pdwFlags); +}; diff --git a/include/msctf.idl b/include/msctf.idl index f78289b..fcb568e 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -20,7 +20,7 @@ import "oaidl.idl"; import "comcat.idl"; import "textstor.idl"; -/* import "ctfutb.idl"; */ +import "ctfutb.idl"; #endif cpp_quote("#include <winuser.h>") @@ -32,6 +32,7 @@ cpp_quote("#define TF_E_NOLOCK MAKE_HRESULT(SEVERITY_ERROR, FACILITY_IT cpp_quote("HRESULT WINAPI TF_CreateThreadMgr(ITfThreadMgr **pptim);") cpp_quote("HRESULT WINAPI TF_GetThreadMgr(ITfThreadMgr **pptim);") cpp_quote("HRESULT WINAPI TF_CreateInputProcessorProfiles(ITfInputProcessorProfiles **ppipr);") +cpp_quote("HRESULT WINAPI TF_CreateLangBarMgr(ITfLangBarMgr **pppbm);") cpp_quote("EXTERN_C const GUID GUID_PROP_TEXTOWNER;") cpp_quote("DEFINE_GUID(GUID_PROP_ATTRIBUTE,0x34b45670,0x7526,0x11d2,0xa1,0x47,0x00,0x10,0x5a,0x27,0x99,0xb5);") @@ -41,6 +42,7 @@ cpp_quote("EXTERN_C const GUID GUID_PROP_COMPOSING;") cpp_quote("EXTERN_C const CLSID CLSID_TF_ThreadMgr;") cpp_quote("EXTERN_C const CLSID CLSID_TF_InputProcessorProfiles;") +cpp_quote("EXTERN_C const CLSID CLSID_TF_LangBarMgr;") cpp_quote("EXTERN_C const CLSID CLSID_TF_CategoryMgr;") cpp_quote("DEFINE_GUID(CLSID_TF_DisplayAttributeMgr,0x3ce74de4,0x53d3,0x4d74,0x8b,0x83,0x43,0x1b,0x38,0x28,0xba,0x53);")

1 0

Justin Chevrier : uuid: Add LangBarMgr CLSID.
by Alexandre Julliard Feb. 17, 2010

Feb. 17, 2010

Module: wine Branch: master Commit: fd196329e549f30aee6bd4a04255a4234def4fb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd196329e549f30aee6bd4a04… Author: Justin Chevrier <jchevrier(a)gmail.com> Date: Tue Feb 16 21:31:03 2010 -0500 uuid: Add LangBarMgr CLSID. --- dlls/uuid/uuid.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/uuid/uuid.c b/dlls/uuid/uuid.c index 34ba4dd..e27dcac 100644 --- a/dlls/uuid/uuid.c +++ b/dlls/uuid/uuid.c @@ -120,6 +120,7 @@ DEFINE_GUID(CLSID_InProcFreeMarshaler, 0x0000033a,0x0000,0x0000,0xc0,0x00,0x0 DEFINE_GUID(CLSID_TF_ThreadMgr, 0x529a9e6b,0x6587,0x4f23,0xab,0x9e,0x9c,0x7d,0x68,0x3e,0x3c,0x50); DEFINE_GUID(CLSID_TF_InputProcessorProfiles, 0x33c53a50,0xf456,0x4884,0xb0,0x49,0x85,0xfd,0x64,0x3e,0xcf,0xed); DEFINE_GUID(CLSID_TF_CategoryMgr, 0xA4B544A1,0x438D,0x4B41,0x93,0x25,0x86,0x95,0x23,0xE2,0xD6,0xC7); +DEFINE_GUID(CLSID_TF_LangBarMgr, 0xebb08c45,0x6c4a,0x4fdc,0xae,0x53,0x4e,0xb8,0xc4,0xc7,0xdb,0x8e); DEFINE_GUID(CLSID_TaskbarList, 0x56fdf344,0xfd6d,0x11d0,0x95,0x8a,0x00,0x60,0x97,0xc9,0xa0,0x90); DEFINE_GUID(GUID_TFCAT_TIP_KEYBOARD, 0x34745c63,0xb2f0,0x4784,0x8b,0x67,0x5e,0x12,0xc8,0x70,0x1a,0x31); DEFINE_GUID(GUID_TFCAT_TIP_SPEECH, 0xB5A73CD1,0x8355,0x426B,0xA1,0x61,0x25,0x98,0x08,0xF2,0x6B,0x14);

1 0