February 2010 - Wine-commits

Paul Chitescu : qedit: Always print a TRACE when a SampleGrabber pin gets connected.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: 381bd1c0ca250b22a5b77f55c9d4614d606575ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=381bd1c0ca250b22a5b77f55c… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Wed Feb 17 12:52:28 2010 +0200 qedit: Always print a TRACE when a SampleGrabber pin gets connected. --- dlls/qedit/samplegrabber.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 4538004..b4912eb 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -1022,8 +1022,8 @@ SampleGrabber_Out_IPin_Connect(IPin *iface, IPin *receiver, const AM_MEDIA_TYPE IMemInputPin_Release(This->sg->memOutput); This->sg->memOutput = NULL; } - if (SUCCEEDED(IPin_QueryInterface(receiver,&IID_IMemInputPin,(void **)&(This->sg->memOutput)))) - TRACE("pair IMemInputPin %p\n", This->sg->memOutput); + IPin_QueryInterface(receiver,&IID_IMemInputPin,(void **)&(This->sg->memOutput)); + TRACE("(%p) Accepted IPin %p, IMemInputPin %p\n", This, receiver, This->sg->memOutput); return S_OK; } @@ -1066,6 +1066,7 @@ SampleGrabber_In_IPin_ReceiveConnection(IPin *iface, IPin *connector, const AM_M This->sg->mtype.pbFormat = NULL; } This->pair = connector; + TRACE("(%p) Accepted IPin %p\n", This, connector); return S_OK; }

1 0

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

17 Feb '10

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

Piotr Caban : oleaut32: Fix crash in LoadTypeLib if typelib name is not specified.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: 2c911147b923e93c19b8c02aff4f15d19d362930 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c911147b923e93c19b8c02af… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Feb 17 13:01:33 2010 +0100 oleaut32: Fix crash in LoadTypeLib if typelib name is not specified. --- dlls/oleaut32/tests/typelib.c | 28 ++++++++++++++++++++++++++++ dlls/oleaut32/typelib.c | 6 +++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 936c497..843af08 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -968,6 +968,33 @@ if(use_midl_tlb) { return; } +static void test_CreateTypeLib(void) { + char filename[MAX_PATH]; + WCHAR filenameW[MAX_PATH]; + ICreateTypeLib2 *createtl; + ITypeLib *tl; + HRESULT hres; + + trace("CreateTypeLib tests\n"); + + GetTempFileNameA(".", "tlb", 0, filename); + MultiByteToWideChar(CP_ACP, 0, filename, -1, filenameW, MAX_PATH); + + hres = CreateTypeLib2(SYS_WIN32, filenameW, &createtl); + ok(hres == S_OK, "got %08x\n", hres); + + hres = ICreateTypeLib2_SaveAllChanges(createtl); + ok(hres == S_OK, "got %08x\n", hres); + ICreateTypeLib2_Release(createtl); + + hres = LoadTypeLib(filenameW, &tl); + ok(hres == S_OK, "got %08x\n", hres); + + ITypeLib_Release(tl); + + DeleteFileA(filename); +} + #if 0 /* use this to generate more tests */ #define OLE_CHECK(x) { HRESULT hr = x; if (FAILED(hr)) { printf(#x "failed - %x\n", hr); return; } } @@ -1480,6 +1507,7 @@ START_TEST(typelib) test_TypeInfo(); test_QueryPathOfRegTypeLib(); test_inheritance(); + test_CreateTypeLib(); if ((filename = create_test_typelib())) { diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 2ad5412..445eac5 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -552,7 +552,9 @@ HRESULT WINAPI RegisterTypeLib( LPOLESTR doc; /* Set the human-readable name of the typelib */ - if (SUCCEEDED(ITypeLib_GetDocumentation(ptlib, -1, NULL, &doc, NULL, NULL))) + if (FAILED(ITypeLib_GetDocumentation(ptlib, -1, NULL, &doc, NULL, NULL))) + res = E_FAIL; + else if (doc) { if (RegSetValueExW(key, NULL, 0, REG_SZ, (BYTE *)doc, (lstrlenW(doc)+1) * sizeof(OLECHAR)) != ERROR_SUCCESS) @@ -560,8 +562,6 @@ HRESULT WINAPI RegisterTypeLib( SysFreeString(doc); } - else - res = E_FAIL; /* Make up the name of the typelib path subkey */ if (!get_lcid_subkey( attr->lcid, attr->syskind, tmp )) res = E_FAIL;

1 0

Piotr Caban : oleaut32: Return TYPE_E_NAMECONFLICT in ICreateTypeLib2:: CreateTypeInfo.
by Alexandre Julliard 17 Feb '10

17 Feb '10

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

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

17 Feb '10

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

Roderick Colenbrander : winex11: Use PictOpOver instead of PictOpSrc in 1-bit -> color blits.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: a19abd9fd57088395cfe2af7e395787645a181ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19abd9fd57088395cfe2af7e… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Feb 17 12:43:46 2010 +0100 winex11: Use PictOpOver instead of PictOpSrc in 1-bit -> color blits. --- dlls/winex11.drv/xrender.c | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/xrender.c b/dlls/winex11.drv/xrender.c index a5cd65a..d3600b7 100644 --- a/dlls/winex11.drv/xrender.c +++ b/dlls/winex11.drv/xrender.c @@ -1852,28 +1852,30 @@ static void xrender_blit(Picture src_pict, Picture mask_pict, Picture dst_pict, int x_offset = (xscale<0) ? width : 0; int y_offset = (yscale<0) ? height : 0; + /* When we are using a mask, 'src_pict' contains a 1x1 picture for tiling, the actual source data is in mask_pict. + * The 'src_pict' data effectively acts as an alpha channel to the tile data. We need PictOpOver for correct rendering. */ + int op = mask_pict ? PictOpOver : PictOpSrc; + /* When we need to scale we perform scaling and source_x / source_y translation using a transformation matrix. * This is needed because XRender is inaccurate in combination with scaled source coordinates passed to XRenderComposite. * In all other cases we do use XRenderComposite for translation as it is faster than using a transformation matrix. */ if(xscale != 1.0 || yscale != 1.0) { - /* When we are using a mask, 'src_pict' contains a 1x1 picture for tiling, the actual source data is in mask_pict */ if(mask_pict) set_xrender_transformation(mask_pict, xscale, yscale, x_offset, y_offset); else set_xrender_transformation(src_pict, xscale, yscale, x_src + x_offset, y_src + y_offset); - pXRenderComposite(gdi_display, PictOpSrc, src_pict, mask_pict, dst_pict, 0, 0, 0, 0, 0, 0, width, height); + pXRenderComposite(gdi_display, op, src_pict, mask_pict, dst_pict, 0, 0, 0, 0, 0, 0, width, height); } else { - /* When we are using a mask, 'src_pict' contains a 1x1 picture for tiling, the actual source data is in mask_pict */ if(mask_pict) set_xrender_transformation(mask_pict, 1, 1, 0, 0); else set_xrender_transformation(src_pict, 1, 1, 0, 0); - pXRenderComposite(gdi_display, PictOpSrc, src_pict, mask_pict, dst_pict, x_src, y_src, 0, 0, 0, 0, width, height); + pXRenderComposite(gdi_display, op, src_pict, mask_pict, dst_pict, x_src, y_src, 0, 0, 0, 0, width, height); } }

1 0

Stefan Dösinger : wined3d: Control SFLAG_CONVERTED in surface_prepare_texture.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: 5c4d3fb5a21210f48dfb7d9c0af8a91b23dc7ac4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c4d3fb5a21210f48dfb7d9c0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Feb 15 12:30:37 2010 +0100 wined3d: Control SFLAG_CONVERTED in surface_prepare_texture. This makes sure that the flag is set correctly when surface_allocate_surface is called and client storage is disabled properly for converted surfaces. --- dlls/wined3d/surface.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1a37fb1..d5d2246 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1265,6 +1265,9 @@ void surface_prepare_texture(IWineD3DSurfaceImpl *surface, BOOL srgb) if (surface->Flags & alloc_flag) return; d3dfmt_get_conv(surface, TRUE, TRUE, &format, &internal, &type, &convert, &bpp, srgb); + if(convert != NO_CONVERSION) surface->Flags |= SFLAG_CONVERTED; + else surface->Flags &= ~SFLAG_CONVERTED; + if ((surface->Flags & SFLAG_NONPOW2) && !(surface->Flags & SFLAG_OVERSIZE)) { width = surface->pow2Width; @@ -5060,17 +5063,13 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D return WINED3DERR_OUTOFVIDEOMEMORY; } d3dfmt_convert_surface(This->resource.allocatedMemory, mem, pitch, width, height, outpitch, convert, This); - - This->Flags |= SFLAG_CONVERTED; } else if (This->resource.format_desc->format == WINED3DFMT_P8_UINT && (gl_info->supported[EXT_PALETTED_TEXTURE] || gl_info->supported[ARB_FRAGMENT_PROGRAM])) { d3dfmt_p8_upload_palette(iface, convert); - This->Flags &= ~SFLAG_CONVERTED; mem = This->resource.allocatedMemory; } else { - This->Flags &= ~SFLAG_CONVERTED; mem = This->resource.allocatedMemory; }

1 0

Justin Chevrier : include: Add ITfLangBarMgr Interface.
by Alexandre Julliard 17 Feb '10

17 Feb '10

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 17 Feb '10

17 Feb '10

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

Justin Chevrier : msctf: Add TF_LangBarMgr registration.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: b6da8233546e39326cfb09dca12855bc68fd09de URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6da8233546e39326cfb09dca… Author: Justin Chevrier <jchevrier(a)gmail.com> Date: Tue Feb 16 21:31:04 2010 -0500 msctf: Add TF_LangBarMgr registration. --- dlls/msctf/regsvr.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/regsvr.c b/dlls/msctf/regsvr.c index aa050ed..2af1f24 100644 --- a/dlls/msctf/regsvr.c +++ b/dlls/msctf/regsvr.c @@ -462,6 +462,13 @@ static struct regsvr_coclass const coclass_list[] = { "msctf.dll", "Apartment" }, + { + &CLSID_TF_LangBarMgr, + "TF_LangBarMgr", + NULL, + "msctf.dll", + "Apartment" + }, { NULL } /* list terminator */ };

1 0