wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Hans Leidekker : msi: Implement the UnpublishComponents standard action.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: 0f0e81d14a3cc8a9bb127edffca6bbb36b9fb651 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f0e81d14a3cc8a9bb127edff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 17 09:55:31 2010 +0100 msi: Implement the UnpublishComponents standard action. --- dlls/msi/action.c | 80 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 74 insertions(+), 6 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index e12e014..20929c6 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4583,6 +4583,80 @@ static UINT ACTION_PublishComponents(MSIPACKAGE *package) return rc; } +static UINT ITERATE_UnpublishComponent( MSIRECORD *rec, LPVOID param ) +{ + static const WCHAR szInstallerComponents[] = { + 'S','o','f','t','w','a','r','e','\\', + 'M','i','c','r','o','s','o','f','t','\\', + 'I','n','s','t','a','l','l','e','r','\\', + 'C','o','m','p','o','n','e','n','t','s','\\',0}; + + MSIPACKAGE *package = param; + LPCWSTR compgroupid, component, feature, qualifier; + MSICOMPONENT *comp; + MSIFEATURE *feat; + MSIRECORD *uirow; + WCHAR squashed[GUID_SIZE], keypath[MAX_PATH]; + LONG res; + + feature = MSI_RecordGetString( rec, 5 ); + feat = get_loaded_feature( package, feature ); + if (!feat) + return ERROR_SUCCESS; + + if (feat->ActionRequest != INSTALLSTATE_ABSENT) + { + TRACE("Feature %s not scheduled for removal\n", debugstr_w(feature)); + feat->Action = feat->Installed; + return ERROR_SUCCESS; + } + + component = MSI_RecordGetString( rec, 3 ); + comp = get_loaded_component( package, component ); + if (!comp) + return ERROR_SUCCESS; + + compgroupid = MSI_RecordGetString( rec, 1 ); + qualifier = MSI_RecordGetString( rec, 2 ); + + squash_guid( compgroupid, squashed ); + strcpyW( keypath, szInstallerComponents ); + strcatW( keypath, squashed ); + + res = RegDeleteKeyW( HKEY_CURRENT_USER, keypath ); + if (res != ERROR_SUCCESS) + { + WARN("Unable to delete component key %d\n", res); + } + + uirow = MSI_CreateRecord( 2 ); + MSI_RecordSetStringW( uirow, 1, compgroupid ); + MSI_RecordSetStringW( uirow, 2, qualifier ); + ui_actiondata( package, szUnpublishComponents, uirow ); + msiobj_release( &uirow->hdr ); + + return ERROR_SUCCESS; +} + +static UINT ACTION_UnpublishComponents( MSIPACKAGE *package ) +{ + UINT rc; + MSIQUERY *view; + static const WCHAR query[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','P','u','b','l','i','s','h', + 'C','o','m','p','o','n','e','n','t','`',0}; + + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); + if (rc != ERROR_SUCCESS) + return ERROR_SUCCESS; + + rc = MSI_IterateRecords( view, NULL, ITERATE_UnpublishComponent, package ); + msiobj_release( &view->hdr ); + + return rc; +} + static UINT ITERATE_InstallService(MSIRECORD *rec, LPVOID param) { MSIPACKAGE *package = param; @@ -6550,12 +6624,6 @@ static UINT ACTION_SetODBCFolders( MSIPACKAGE *package ) return msi_unimplemented_action_stub( package, "SetODBCFolders", table ); } -static UINT ACTION_UnpublishComponents( MSIPACKAGE *package ) -{ - static const WCHAR table[] = { 'P','u','b','l','i','s','h','C','o','m','p','o','n','e','n','t',0 }; - return msi_unimplemented_action_stub( package, "UnpublishComponents", table ); -} - static UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package ) { static const WCHAR table[] = { 'A','p','p','I','d',0 };

1 0

Hans Leidekker : msi: PublishComponents must look at the requested install state of the feature, not the component.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: d95e3eb4d2a89ef52e764069d0a5a167daa496d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d95e3eb4d2a89ef52e764069d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 17 09:55:03 2010 +0100 msi: PublishComponents must look at the requested install state of the feature, not the component. --- dlls/msi/action.c | 37 ++++++++++++++++++------------------- 1 files changed, 18 insertions(+), 19 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 2c036b8..e12e014 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -4490,33 +4490,34 @@ static UINT ACTION_ExecuteAction(MSIPACKAGE *package) static UINT ITERATE_PublishComponent(MSIRECORD *rec, LPVOID param) { MSIPACKAGE *package = param; - LPCWSTR compgroupid=NULL; - LPCWSTR feature=NULL; - LPCWSTR text = NULL; - LPCWSTR qualifier = NULL; - LPCWSTR component = NULL; - LPWSTR advertise = NULL; - LPWSTR output = NULL; + LPCWSTR compgroupid, component, feature, qualifier, text; + LPWSTR advertise = NULL, output = NULL; HKEY hkey; - UINT rc = ERROR_SUCCESS; + UINT rc; MSICOMPONENT *comp; - DWORD sz = 0; + MSIFEATURE *feat; + DWORD sz; MSIRECORD *uirow; - component = MSI_RecordGetString(rec,3); - comp = get_loaded_component(package,component); - if (!comp) + feature = MSI_RecordGetString(rec, 5); + feat = get_loaded_feature(package, feature); + if (!feat) return ERROR_SUCCESS; - if (comp->ActionRequest != INSTALLSTATE_LOCAL && - comp->ActionRequest != INSTALLSTATE_SOURCE && - comp->ActionRequest != INSTALLSTATE_ADVERTISED) + if (feat->ActionRequest != INSTALLSTATE_LOCAL && + feat->ActionRequest != INSTALLSTATE_SOURCE && + feat->ActionRequest != INSTALLSTATE_ADVERTISED) { - TRACE("Component not scheduled for installation %s\n", debugstr_w(component)); - comp->Action = comp->Installed; + TRACE("Feature %s not scheduled for installation\n", debugstr_w(feature)); + feat->Action = feat->Installed; return ERROR_SUCCESS; } + component = MSI_RecordGetString(rec, 3); + comp = get_loaded_component(package, component); + if (!comp) + return ERROR_SUCCESS; + compgroupid = MSI_RecordGetString(rec,1); qualifier = MSI_RecordGetString(rec,2); @@ -4525,8 +4526,6 @@ static UINT ITERATE_PublishComponent(MSIRECORD *rec, LPVOID param) goto end; text = MSI_RecordGetString(rec,4); - feature = MSI_RecordGetString(rec,5); - advertise = create_component_advertise_string(package, comp, feature); sz = strlenW(advertise);

1 0

Justin Chevrier : msctf: Implement stubbed out TF_CreateLangBarMgr.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: 4e1c8767f914ba30a91c44ca00b2e4a67f8c89f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e1c8767f914ba30a91c44ca0… Author: Justin Chevrier <jchevrier(a)gmail.com> Date: Tue Feb 16 21:31:05 2010 -0500 msctf: Implement stubbed out TF_CreateLangBarMgr. --- dlls/msctf/Makefile.in | 1 + dlls/msctf/langbarmgr.c | 193 +++++++++++++++++++++++++++++++++++++++++++ dlls/msctf/msctf.c | 10 ++ dlls/msctf/msctf.spec | 2 +- dlls/msctf/msctf_internal.h | 1 + 5 files changed, 206 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/Makefile.in b/dlls/msctf/Makefile.in index 2c319f1..22b1730 100644 --- a/dlls/msctf/Makefile.in +++ b/dlls/msctf/Makefile.in @@ -11,6 +11,7 @@ C_SRCS = \ context.c \ documentmgr.c \ inputprocessor.c \ + langbarmgr.c \ msctf.c \ range.c \ regsvr.c \ diff --git a/dlls/msctf/langbarmgr.c b/dlls/msctf/langbarmgr.c new file mode 100644 index 0000000..272a816 --- /dev/null +++ b/dlls/msctf/langbarmgr.c @@ -0,0 +1,193 @@ +/* + * ITfLangBarMgr implementation + * + * 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 + */ + +#define COBJMACROS + +#include "wine/debug.h" +#include "winbase.h" +#include "winreg.h" +#include "shlwapi.h" + +#include "msctf.h" +#include "msctf_internal.h" + +WINE_DEFAULT_DEBUG_CHANNEL(msctf); + +typedef struct tagLangBarMgr { + const ITfLangBarMgrVtbl *LangBarMgrVtbl; + + LONG refCount; + +} LangBarMgr; + +static void LangBarMgr_Destructor(LangBarMgr *This) +{ + TRACE("destroying %p\n", This); + + HeapFree(GetProcessHeap(),0,This); +} + +static HRESULT WINAPI LangBarMgr_QueryInterface(ITfLangBarMgr *iface, REFIID iid, LPVOID *ppvOut) +{ + LangBarMgr *This = (LangBarMgr *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_ITfLangBarMgr)) + { + *ppvOut = This; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("unsupported interface: %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI LangBarMgr_AddRef(ITfLangBarMgr *iface) +{ + LangBarMgr *This = (LangBarMgr *)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI LangBarMgr_Release(ITfLangBarMgr *iface) +{ + LangBarMgr *This = (LangBarMgr *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + LangBarMgr_Destructor(This); + return ret; +} + +/***************************************************** + * ITfLangBarMgr functions + *****************************************************/ + +static HRESULT WINAPI LangBarMgr_AdviseEventSink( ITfLangBarMgr* iface, ITfLangBarEventSink *pSink, HWND hwnd, DWORD dwflags, DWORD *pdwCookie) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_UnAdviseEventSink( ITfLangBarMgr* iface, DWORD dwCookie) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_GetThreadMarshalInterface( ITfLangBarMgr* iface, DWORD dwThreadId, DWORD dwType, REFIID riid, IUnknown **ppunk) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_GetThreadLangBarItemMgr( ITfLangBarMgr* iface, DWORD dwThreadId, ITfLangBarItemMgr **pplbi, DWORD *pdwThreadid) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_GetInputProcessorProfiles( ITfLangBarMgr* iface, DWORD dwThreadId, ITfInputProcessorProfiles **ppaip, DWORD *pdwThreadid) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_RestoreLastFocus( ITfLangBarMgr* iface, DWORD *dwThreadId, BOOL fPrev) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_SetModalInput( ITfLangBarMgr* iface, ITfLangBarEventSink *pSink, DWORD dwThreadId, DWORD dwFlags) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_ShowFloating( ITfLangBarMgr* iface, DWORD dwFlags) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI LangBarMgr_GetShowFloatingStatus( ITfLangBarMgr* iface, DWORD *pdwFlags) +{ + LangBarMgr *This = (LangBarMgr *)iface; + + FIXME("STUB:(%p)\n",This); + return E_NOTIMPL; +} + +static const ITfLangBarMgrVtbl LangBarMgr_LangBarMgrVtbl = +{ + LangBarMgr_QueryInterface, + LangBarMgr_AddRef, + LangBarMgr_Release, + + LangBarMgr_AdviseEventSink, + LangBarMgr_UnAdviseEventSink, + LangBarMgr_GetThreadMarshalInterface, + LangBarMgr_GetThreadLangBarItemMgr, + LangBarMgr_GetInputProcessorProfiles, + LangBarMgr_RestoreLastFocus, + LangBarMgr_SetModalInput, + LangBarMgr_ShowFloating, + LangBarMgr_GetShowFloatingStatus +}; + +HRESULT LangBarMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) +{ + LangBarMgr *This; + if (pUnkOuter) + return CLASS_E_NOAGGREGATION; + + This = HeapAlloc(GetProcessHeap(),0,sizeof(LangBarMgr)); + if (This == NULL) + return E_OUTOFMEMORY; + + This->LangBarMgrVtbl= &LangBarMgr_LangBarMgrVtbl; + This->refCount = 1; + + TRACE("returning %p\n", This); + *ppOut = (IUnknown *)This; + return S_OK; +} diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 24b3b64..62d1ff2 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -87,6 +87,7 @@ static const struct { {&CLSID_TF_ThreadMgr, ThreadMgr_Constructor}, {&CLSID_TF_InputProcessorProfiles, InputProcessorProfiles_Constructor}, {&CLSID_TF_CategoryMgr, CategoryMgr_Constructor}, + {&CLSID_TF_LangBarMgr, LangBarMgr_Constructor}, {NULL, NULL} }; @@ -617,3 +618,12 @@ HRESULT WINAPI TF_InvalidAssemblyListCacheIfExist(void) FIXME("Stub\n"); return S_OK; } + +/*********************************************************************** + * TF_CreateLangBarMgr (MSCTF.@) + */ +HRESULT WINAPI TF_CreateLangBarMgr(ITfLangBarMgr **pppbm) +{ + TRACE("\n"); + return LangBarMgr_Constructor(NULL,(IUnknown**)pppbm); +} diff --git a/dlls/msctf/msctf.spec b/dlls/msctf/msctf.spec index c0cb829..387af57 100644 --- a/dlls/msctf/msctf.spec +++ b/dlls/msctf/msctf.spec @@ -13,7 +13,7 @@ @ stub TF_CreateDisplayAttributeMgr @ stdcall TF_CreateInputProcessorProfiles(ptr) @ stub TF_CreateLangBarItemMgr -@ stub TF_CreateLangBarMgr +@ stdcall TF_CreateLangBarMgr(ptr) @ stdcall TF_CreateThreadMgr(ptr) @ stub TF_DllDetachInOther @ stub TF_GetGlobalCompartment diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 3bb0baa..57423e9 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -40,6 +40,7 @@ extern HRESULT CategoryMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT Range_Constructor(ITfContext *context, ITextStoreACP *textstore, DWORD lockType, DWORD anchorStart, DWORD anchorEnd, ITfRange **ppOut); extern HRESULT CompartmentMgr_Constructor(IUnknown *pUnkOuter, REFIID riid, IUnknown **ppOut); extern HRESULT CompartmentMgr_Destructor(ITfCompartmentMgr *This); +extern HRESULT LangBarMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut); extern HRESULT Context_Initialize(ITfContext *cxt, ITfDocumentMgr *manager); extern HRESULT Context_Uninitialize(ITfContext *cxt);

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

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 : 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

Dan Kegel : cmd: Rename reference file from .out to . exp to avoid clash with gnu make builtin rule.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: e4fd5196c2ebcf29849ba11cb1c838654bfb9ee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4fd5196c2ebcf29849ba11cb… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Feb 16 12:51:03 2010 -0800 cmd: Rename reference file from .out to .exp to avoid clash with gnu make builtin rule. --- programs/cmd/tests/batch.c | 4 ++-- programs/cmd/tests/rsrc.rc | 4 ++-- ...test_builtins.cmd.out => test_builtins.cmd.exp} | 0 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 1d822a1..0b4efda 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -190,7 +190,7 @@ static void run_from_file(char *file_name) return; } - sprintf(out_name, "%s.out", file_name); + sprintf(out_name, "%s.exp", file_name); out_size = map_file(out_name, &out_data); if(!out_size) { ok(0, "Could not map file %s: %u\n", out_name, GetLastError()); @@ -236,7 +236,7 @@ static BOOL WINAPI test_enum_proc(HMODULE module, LPCTSTR type, LPSTR name, LONG if(!cmd_size) return TRUE; - sprintf(res_name, "%s.out", name); + sprintf(res_name, "%s.exp", name); out_size = load_resource(res_name, "TESTOUT", &out_data); if(!out_size) return TRUE; diff --git a/programs/cmd/tests/rsrc.rc b/programs/cmd/tests/rsrc.rc index da62c11..bcb738d 100644 --- a/programs/cmd/tests/rsrc.rc +++ b/programs/cmd/tests/rsrc.rc @@ -19,5 +19,5 @@ /* @makedep: test_builtins.cmd */ test_builtins.cmd TESTCMD "test_builtins.cmd" -/* @makedep: test_builtins.cmd.out */ -test_builtins.cmd.out TESTOUT "test_builtins.cmd.out" +/* @makedep: test_builtins.cmd.exp */ +test_builtins.cmd.exp TESTOUT "test_builtins.cmd.exp" diff --git a/programs/cmd/tests/test_builtins.cmd.out b/programs/cmd/tests/test_builtins.cmd.exp similarity index 100% rename from programs/cmd/tests/test_builtins.cmd.out rename to programs/cmd/tests/test_builtins.cmd.exp

1 0

Dan Kegel : cmd: Add test to show ~dp0 should be directory containing batch file.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: 8bc6ff9d906dd99703a4c79a06299b1cba5104cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bc6ff9d906dd99703a4c79a0… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Feb 16 12:44:16 2010 -0800 cmd: Add test to show ~dp0 should be directory containing batch file. --- programs/cmd/tests/test_builtins.cmd | 9 +++++++++ programs/cmd/tests/test_builtins.cmd.out | 4 ++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 04a75ba..2c30f6c 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -14,3 +14,12 @@ echo ------------ Testing 'set' -------------- echo set "FOO=bar" should not include the quotes in the variable value set "FOO=bar" echo %FOO% + +echo ------------ Testing variable expansion -------------- +echo ~dp0 should be directory containing batch file +echo %~dp0 +mkdir dummydir +cd dummydir +echo %~dp0 +cd .. +rmdir dummydir diff --git a/programs/cmd/tests/test_builtins.cmd.out b/programs/cmd/tests/test_builtins.cmd.out index 8b5202e..a72e35d 100644 --- a/programs/cmd/tests/test_builtins.cmd.out +++ b/programs/cmd/tests/test_builtins.cmd.out @@ -12,3 +12,7 @@ at-echoed-word ------------ Testing 'set' -------------- set "FOO=bar" should not include the quotes in the variable value bar +------------ Testing variable expansion -------------- +~dp0 should be directory containing batch file +@pwd@\ +@pwd@\

1 0

Dan Kegel : cmd: Add test to show set "FOO=bar" should not include the quotes in the variable value.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: 9d63b91405122c98a314bde38210c0b2d69263a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d63b91405122c98a314bde38… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Feb 16 12:25:41 2010 -0800 cmd: Add test to show set "FOO=bar" should not include the quotes in the variable value. --- programs/cmd/tests/test_builtins.cmd | 5 +++++ programs/cmd/tests/test_builtins.cmd.out | 3 +++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index db15217..04a75ba 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -9,3 +9,8 @@ echo "doublequotedword" echo "/?" echo. echo . + +echo ------------ Testing 'set' -------------- +echo set "FOO=bar" should not include the quotes in the variable value +set "FOO=bar" +echo %FOO% diff --git a/programs/cmd/tests/test_builtins.cmd.out b/programs/cmd/tests/test_builtins.cmd.out index 3e7413b..8b5202e 100644 --- a/programs/cmd/tests/test_builtins.cmd.out +++ b/programs/cmd/tests/test_builtins.cmd.out @@ -9,3 +9,6 @@ at-echoed-word "/?" . +------------ Testing 'set' -------------- +set "FOO=bar" should not include the quotes in the variable value +bar

1 0

Dan Kegel : cmd: Turn off echo, add visual separator between testcases.
by Alexandre Julliard 17 Feb '10

17 Feb '10

Module: wine Branch: master Commit: 786429b3d7f9b9459e8676fa1c1ee05520bfdec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=786429b3d7f9b9459e8676fa1… Author: Dan Kegel <dank(a)kegel.com> Date: Tue Feb 16 11:42:18 2010 -0800 cmd: Turn off echo, add visual separator between testcases. --- programs/cmd/tests/test_builtins.cmd | 4 +++- programs/cmd/tests/test_builtins.cmd.out | 16 +++------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index 611853e..db15217 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -1,5 +1,7 @@ -rem Tests for echo +echo Tests for cmd's builtin commands +@echo off +echo ------------ Testing 'echo' -------------- echo word echo 'singlequotedword' echo "doublequotedword" diff --git a/programs/cmd/tests/test_builtins.cmd.out b/programs/cmd/tests/test_builtins.cmd.out index cebfc33..3e7413b 100644 --- a/programs/cmd/tests/test_builtins.cmd.out +++ b/programs/cmd/tests/test_builtins.cmd.out @@ -1,21 +1,11 @@ -@pwd@>rem Tests for echo@todo_space@ - -@pwd@>echo word@todo_space@ +@pwd@>echo Tests for cmd's builtin commands@todo_space@ +Tests for cmd's builtin commands +------------ Testing 'echo' -------------- word - -@pwd@>echo 'singlequotedword'@todo_space@ 'singlequotedword' - -@pwd@>echo "doublequotedword"@todo_space@ "doublequotedword" at-echoed-word - -@pwd@>echo "/?"@todo_space@ "/?" -@pwd@>echo. - - -@pwd@>echo .@todo_space@ .

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2010