May 2009 - Wine-commits - list.winehq.org

Alexandre Julliard : oleaut32/tests: Use the correct allocator in the ClearCustData test.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: 4d30e7af47415d11363e71f9375a9e5f1cafd004 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d30e7af47415d11363e71f93… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 8 14:12:40 2009 +0200 oleaut32/tests: Use the correct allocator in the ClearCustData test. --- dlls/oleaut32/tests/vartype.c | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 0b4f301..7600946 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -5788,21 +5788,13 @@ static void test_UintChangeTypeEx(void) static void test_ClearCustData(void) { - WCHAR buff[sizeof(CUSTDATAITEM) * NUM_CUST_ITEMS / sizeof(WCHAR)]; CUSTDATA ci; unsigned i; CHECKPTR(ClearCustData); - memset(buff, 0, sizeof(buff)); - ci.cCustData = NUM_CUST_ITEMS; - /* This is a bit tricky. We use SysAllocStringByteLen to allocate the - * array, since native uses an internal IMalloc interface for allocating - * its memory, while Wine uses HeapAlloc(). Doing this ensures we allocate - * using the correct function whether with native or builtin. - */ - ci.prgCustData = (LPCUSTDATAITEM)Get(SysAllocStringByteLen((LPCSTR)buff, sizeof(buff))); + ci.prgCustData = CoTaskMemAlloc( sizeof(CUSTDATAITEM) * NUM_CUST_ITEMS ); for (i = 0; i < NUM_CUST_ITEMS; i++) VariantInit(&ci.prgCustData[i].varValue); pClearCustData(&ci);

1 0

Alexandre Julliard : oleaut32/tests: Don' t crash if ITypeInfo_GetTypeAttr fails.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: 8b7269e7e6dd50e0f53031eee1472826a34de734 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b7269e7e6dd50e0f53031eee… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 8 14:27:11 2009 +0200 oleaut32/tests: Don't crash if ITypeInfo_GetTypeAttr fails. --- dlls/oleaut32/tests/typelib.c | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 93920c5..277e97d 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -772,15 +772,17 @@ if(use_midl_tlb) { hr = ITypeInfo_GetTypeAttr(pTI, &pTA); ok(hr == S_OK, "hr %08x\n", hr); - ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); - ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); -if(use_midl_tlb) { - ok(pTA->wTypeFlags == TYPEFLAG_FDUAL, "typeflags %x\n", pTA->wTypeFlags); - } - ok(pTA->cFuncs == 8, "cfuncs %d\n", pTA->cFuncs); - ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); - ITypeInfo_ReleaseTypeAttr(pTI, pTA); - + if (hr == S_OK) + { + ok(pTA->typekind == TKIND_DISPATCH, "kind %04x\n", pTA->typekind); + ok(pTA->cbSizeVft == 7 * sizeof(void *), "sizevft %d\n", pTA->cbSizeVft); + if(use_midl_tlb) { + ok(pTA->wTypeFlags == TYPEFLAG_FDUAL, "typeflags %x\n", pTA->wTypeFlags); + } + ok(pTA->cFuncs == 8, "cfuncs %d\n", pTA->cFuncs); + ok(pTA->cImplTypes == 1, "cimpltypes %d\n", pTA->cImplTypes); + ITypeInfo_ReleaseTypeAttr(pTI, pTA); + } hr = ITypeInfo_GetRefTypeOfImplType(pTI, 0, &href); ok(hr == S_OK, "hr %08x\n", hr); hr = ITypeInfo_GetRefTypeInfo(pTI, href, &pTI_p);

1 0

Austin English : winedump: Sign compare fixes.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: 285572fd57c146e457bd3aa25d232fc16c71cd65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=285572fd57c146e457bd3aa25… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 8 06:10:52 2009 -0500 winedump: Sign compare fixes. --- tools/winedump/emf.c | 4 ++-- tools/winedump/lnk.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index a2ea1c7..79103c5 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -36,11 +36,11 @@ #include "winbase.h" #include "wingdi.h" -static const char *debugstr_wn(const WCHAR *wstr, int n) +static const char *debugstr_wn(const WCHAR *wstr, unsigned int n) { static char buf[80]; char *p; - int i; + unsigned int i; if (!wstr) return "(null)"; diff --git a/tools/winedump/lnk.c b/tools/winedump/lnk.c index de1e95a..98892c9 100644 --- a/tools/winedump/lnk.c +++ b/tools/winedump/lnk.c @@ -375,7 +375,7 @@ static int dump_raw_block(const DATABLOCK_HEADER* bhdr) data_size=bhdr->cbSize-sizeof(*bhdr); if (data_size > 0) { - unsigned int i; + int i; const unsigned char *data; printf("data = ");

1 0

Austin English : d3d9/tests: Sign compare fix.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: 68ccd08952a0288e73d762c94c3d5678a8c49278 URL: http://source.winehq.org/git/wine.git/?a=commit;h=68ccd08952a0288e73d762c94… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 8 06:11:12 2009 -0500 d3d9/tests: Sign compare fix. --- dlls/d3d9/tests/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 2f5bbc8..e4ab592 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -745,7 +745,7 @@ static void test_reset(void) modes = HeapAlloc(GetProcessHeap(), 0, sizeof(*modes) * adapter_mode_count); for(i = 0; i < adapter_mode_count; ++i) { - int j; + UINT j; ZeroMemory( &d3ddm2, sizeof(d3ddm2) ); hr = IDirect3D9_EnumAdapterModes(pD3d, D3DADAPTER_DEFAULT, d3ddm.Format, i, &d3ddm2); ok(hr == D3D_OK, "IDirect3D9_EnumAdapterModes returned %#x\n", hr);

1 0

Łukasz Wojniłowicz : winmm: Added Polish translation.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: 6c81f8b05644c3655997cf0b960d1cb44bae481d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c81f8b05644c3655997cf0b9… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue May 5 17:00:58 2009 +0200 winmm: Added Polish translation. --- dlls/winmm/winmm_Pl.rc | 126 +++++++++++++++++++++++++++++++++++++++++++++++ dlls/winmm/winmm_res.rc | 1 + 2 files changed, 127 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6c81f8b05644c3655997c…

1 0

Łukasz Wojniłowicz : oleacc: Added Polish translation.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: 42be8171f354a7ae3de4d393a54b095edacb4975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42be8171f354a7ae3de4d393a… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue May 5 21:06:49 2009 +0200 oleacc: Added Polish translation. --- dlls/oleacc/oleacc.rc | 1 + dlls/oleacc/oleacc_Pl.rc | 90 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 91 insertions(+), 0 deletions(-) diff --git a/dlls/oleacc/oleacc.rc b/dlls/oleacc/oleacc.rc index 8d4709f..fcffbc1 100644 --- a/dlls/oleacc/oleacc.rc +++ b/dlls/oleacc/oleacc.rc @@ -25,3 +25,4 @@ #include "oleacc_Fr.rc" #include "oleacc_Ko.rc" #include "oleacc_Nl.rc" +#include "oleacc_Pl.rc" diff --git a/dlls/oleacc/oleacc_Pl.rc b/dlls/oleacc/oleacc_Pl.rc new file mode 100644 index 0000000..fc93cb0 --- /dev/null +++ b/dlls/oleacc/oleacc_Pl.rc @@ -0,0 +1,90 @@ +/* + * Polish resources for oleacc + * + * Copyright 2009 �ukasz Wojni�owicz + * + * 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 + */ + +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +{ + 0 "unknown object" /* undocumented */ + ROLE_SYSTEM_TITLEBAR "pasek tytu�u" + ROLE_SYSTEM_MENUBAR "pasek menu" + ROLE_SYSTEM_SCROLLBAR "pasek przewijania" + ROLE_SYSTEM_GRIP "grip" + ROLE_SYSTEM_SOUND "d�wi�k" + ROLE_SYSTEM_CURSOR "kursor" + ROLE_SYSTEM_CARET "daszek" + ROLE_SYSTEM_ALERT "ostrze�enie" + ROLE_SYSTEM_WINDOW "okno" + ROLE_SYSTEM_CLIENT "klient" + ROLE_SYSTEM_MENUPOPUP "menu rozwijane" + ROLE_SYSTEM_MENUITEM "element menu" + ROLE_SYSTEM_TOOLTIP "podpowied�" + ROLE_SYSTEM_APPLICATION "aplikacja" + ROLE_SYSTEM_DOCUMENT "dokument" + ROLE_SYSTEM_PANE "pane" + ROLE_SYSTEM_CHART "wykres" + ROLE_SYSTEM_DIALOG "dialog" + ROLE_SYSTEM_BORDER "obramowanie" + ROLE_SYSTEM_GROUPING "grupowanie" + ROLE_SYSTEM_SEPARATOR "separator" + ROLE_SYSTEM_TOOLBAR "pasek narz�dzi" + ROLE_SYSTEM_STATUSBAR "pasek stanu" + ROLE_SYSTEM_TABLE "tabela" + ROLE_SYSTEM_COLUMNHEADER "nag��wek kolumny" + ROLE_SYSTEM_ROWHEADER "nag��wek wiersza" + ROLE_SYSTEM_COLUMN "kolumna" + ROLE_SYSTEM_ROW "wiersz" + ROLE_SYSTEM_CELL "kom�rka" + ROLE_SYSTEM_LINK "link" + ROLE_SYSTEM_HELPBALLOON "dymek pomocy" + ROLE_SYSTEM_CHARACTER "znak" + ROLE_SYSTEM_LIST "lista" + ROLE_SYSTEM_LISTITEM "element listy" + ROLE_SYSTEM_OUTLINE "zarys" + ROLE_SYSTEM_OUTLINEITEM "element zarysu" + ROLE_SYSTEM_PAGETAB "page tab" + ROLE_SYSTEM_PROPERTYPAGE "strona w�a�ciwo�ci" + ROLE_SYSTEM_INDICATOR "wska�nik" + ROLE_SYSTEM_GRAPHIC "grafika" + ROLE_SYSTEM_STATICTEXT "tekst statyczny" + ROLE_SYSTEM_TEXT "tekst" + ROLE_SYSTEM_PUSHBUTTON "przycisk" + ROLE_SYSTEM_CHECKBUTTON "przycisk zaznaczany" + ROLE_SYSTEM_RADIOBUTTON "przycisk opcji" + ROLE_SYSTEM_COMBOBOX "pole kombi" + ROLE_SYSTEM_DROPLIST "lista rozwijana" + ROLE_SYSTEM_PROGRESSBAR "pasek post�pu" + ROLE_SYSTEM_DIAL "dial" + ROLE_SYSTEM_HOTKEYFIELD "hot key field" + ROLE_SYSTEM_SLIDER "suwak" + ROLE_SYSTEM_SPINBUTTON "spin box" + ROLE_SYSTEM_DIAGRAM "diagram" + ROLE_SYSTEM_ANIMATION "animacja" + ROLE_SYSTEM_EQUATION "r�wnanie" + ROLE_SYSTEM_BUTTONDROPDOWN "przycisk rozwijany" + ROLE_SYSTEM_BUTTONMENU "przycisk menu" + ROLE_SYSTEM_BUTTONDROPDOWNGRID "siatka przycisk�w rozwijanych" + ROLE_SYSTEM_WHITESPACE "bia�a spacja" + ROLE_SYSTEM_PAGETABLIST "page tab list" + ROLE_SYSTEM_CLOCK "zegar" + ROLE_SYSTEM_SPLITBUTTON "przycisk rozdzielania" + ROLE_SYSTEM_IPADDRESS "adres IP" + ROLE_SYSTEM_OUTLINEBUTTON "przycisk zarysu" +}

1 0

Łukasz Wojniłowicz : wineps: Added Polish translations.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: 7be9c71eacaab0946603c3b252b5e14a78236819 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7be9c71eacaab0946603c3b25… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Tue May 5 21:10:07 2009 +0200 wineps: Added Polish translations. --- dlls/wineps.drv/rsrc.rc | 1 + dlls/wineps.drv/wps_Pl.rc | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/rsrc.rc b/dlls/wineps.drv/rsrc.rc index 7513cb3..2529bf0 100644 --- a/dlls/wineps.drv/rsrc.rc +++ b/dlls/wineps.drv/rsrc.rc @@ -47,6 +47,7 @@ #include "wps_Nl.rc" #include "wps_No.rc" #include "wps_Pt.rc" +#include "wps_Pl.rc" #include "wps_Ro.rc" #include "wps_Ru.rc" #include "wps_Si.rc" diff --git a/dlls/wineps.drv/wps_Pl.rc b/dlls/wineps.drv/wps_Pl.rc new file mode 100644 index 0000000..a64e25c --- /dev/null +++ b/dlls/wineps.drv/wps_Pl.rc @@ -0,0 +1,37 @@ +/* + * Copyright 2009 �ukasz Wojni�owicz + * + * 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 + */ + +LANGUAGE LANG_POLISH, SUBLANG_NEUTRAL + +PAPER DIALOG LOADONCALL MOVEABLE DISCARDABLE 5, 43, 227, 215 +STYLE WS_POPUP | WS_CAPTION | WS_CLIPSIBLINGS | WS_VISIBLE +CAPTION "Papier" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Format papier&u:", -1, 10, 6, 100, 8 + LISTBOX IDD_PAPERS, 10, 15, 200, 45, LBS_STANDARD | LBS_HASSTRINGS | + WS_TABSTOP + GROUPBOX "Orientacja", -1, 10, 80, 200, 50 + CONTROL "P&ionowo", IDD_ORIENT_PORTRAIT, "Button", BS_AUTORADIOBUTTON | + WS_TABSTOP, 20, 90, 60, 10 + CONTROL "Po&ziomo", IDD_ORIENT_LANDSCAPE, "Button", BS_AUTORADIOBUTTON, + 20, 110, 60, 10 + LTEXT "Duplex:", IDD_DUPLEX_NAME, 10, 140, 100, 8 + COMBOBOX IDD_DUPLEX, 10, 151, 200, 20, CBS_DROPDOWNLIST | CBS_HASSTRINGS | + WS_TABSTOP +}

1 0

Aric Stewart : msctf: Add internal functions for managing active text services.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: aaa15671f4f3025a01fc9c5ee35ef40314f97b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa15671f4f3025a01fc9c5ee… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 7 14:27:29 2009 -0500 msctf: Add internal functions for managing active text services. --- dlls/msctf/msctf.c | 179 +++++++++++++++++++++++++++++++++++++++++++ dlls/msctf/msctf_internal.h | 6 ++ 2 files changed, 185 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 711ae51..57cd477 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -26,6 +26,7 @@ #define COBJMACROS #include "wine/debug.h" +#include "wine/list.h" #include "windef.h" #include "winbase.h" #include "winreg.h" @@ -50,10 +51,25 @@ typedef struct LPVOID data; } CookieInternal; +typedef struct { + TF_LANGUAGEPROFILE LanguageProfile; + ITfTextInputProcessor *pITfTextInputProcessor; + ITfThreadMgr *pITfThreadMgr; + TfClientId tid; +} ActivatedTextService; + +typedef struct +{ + struct list entry; + ActivatedTextService *ats; +} AtsEntry; + static CookieInternal *cookies; static UINT id_last; static UINT array_size; +static struct list AtsList = LIST_INIT(AtsList); + DWORD tlsIndex = 0; const WCHAR szwSystemTIPKey[] = {'S','O','F','T','W','A','R','E','\\','M','i','c','r','o','s','o','f','t','\\','C','T','F','\\','T','I','P',0}; @@ -264,6 +280,169 @@ DWORD enumerate_Cookie(DWORD magic, DWORD *index) return 0x0; } +/***************************************************************************** + * Active Text Service Management + *****************************************************************************/ +static HRESULT activate_given_ts(ActivatedTextService *actsvr, ITfThreadMgr* tm) +{ + HRESULT hr; + + /* Already Active? */ + if (actsvr->pITfTextInputProcessor) + return S_OK; + + hr = CoCreateInstance (&actsvr->LanguageProfile.clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_ITfTextInputProcessor, (void**)&actsvr->pITfTextInputProcessor); + if (FAILED(hr)) return hr; + + hr = ITfTextInputProcessor_Activate(actsvr->pITfTextInputProcessor, tm, actsvr->tid); + if (FAILED(hr)) + { + ITfTextInputProcessor_Release(actsvr->pITfTextInputProcessor); + actsvr->pITfTextInputProcessor = NULL; + return hr; + } + + actsvr->pITfThreadMgr = tm; + ITfThreadMgr_AddRef(tm); + return hr; +} + +static HRESULT deactivate_given_ts(ActivatedTextService *actsvr) +{ + HRESULT hr = S_OK; + + if (actsvr->pITfTextInputProcessor) + { + hr = ITfTextInputProcessor_Deactivate(actsvr->pITfTextInputProcessor); + ITfTextInputProcessor_Release(actsvr->pITfTextInputProcessor); + ITfThreadMgr_Release(actsvr->pITfThreadMgr); + actsvr->pITfTextInputProcessor = NULL; + actsvr->pITfThreadMgr = NULL; + } + + return hr; +} + +static void deactivate_remove_conflicting_ts(REFCLSID catid) +{ + AtsEntry *ats, *cursor2; + + LIST_FOR_EACH_ENTRY_SAFE(ats, cursor2, &AtsList, AtsEntry, entry) + { + if (IsEqualCLSID(catid,&ats->ats->LanguageProfile.catid)) + { + deactivate_given_ts(ats->ats); + list_remove(&ats->entry); + HeapFree(GetProcessHeap(),0,ats->ats); + HeapFree(GetProcessHeap(),0,ats); + /* we are guarenteeing there is only 1 */ + break; + } + } +} + +HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp) +{ + ActivatedTextService *actsvr; + ITfCategoryMgr *catmgr; + AtsEntry *entry; + ITfThreadMgr *tm = (ITfThreadMgr*)TlsGetValue(tlsIndex); + ITfClientId *clientid; + + if (!tm) return E_UNEXPECTED; + + actsvr = HeapAlloc(GetProcessHeap(),0,sizeof(ActivatedTextService)); + if (!actsvr) return E_OUTOFMEMORY; + + entry = HeapAlloc(GetProcessHeap(),0,sizeof(AtsEntry)); + + if (!entry) + { + HeapFree(GetProcessHeap(),0,actsvr); + return E_OUTOFMEMORY; + } + + ITfThreadMgr_QueryInterface(tm,&IID_ITfClientId,(LPVOID)&clientid); + ITfClientId_GetClientId(clientid, &lp->clsid, &actsvr->tid); + ITfClientId_Release(clientid); + + if (!actsvr->tid) + { + HeapFree(GetProcessHeap(),0,actsvr); + return E_OUTOFMEMORY; + } + + actsvr->pITfTextInputProcessor = NULL; + actsvr->LanguageProfile = *lp; + actsvr->LanguageProfile.fActive = TRUE; + + /* get TIP category */ + if (SUCCEEDED(CategoryMgr_Constructor(NULL,(IUnknown**)&catmgr))) + { + static const GUID *list[3] = {&GUID_TFCAT_TIP_SPEECH, &GUID_TFCAT_TIP_KEYBOARD, &GUID_TFCAT_TIP_HANDWRITING}; + + ITfCategoryMgr_FindClosestCategory(catmgr, + &actsvr->LanguageProfile.clsid, &actsvr->LanguageProfile.catid, + list, 3); + + ITfCategoryMgr_Release(catmgr); + } + else + { + ERR("CategoryMgr construction failed\n"); + actsvr->LanguageProfile.catid = GUID_NULL; + } + + if (!IsEqualGUID(&actsvr->LanguageProfile.catid,&GUID_NULL)) + deactivate_remove_conflicting_ts(&actsvr->LanguageProfile.catid); + + entry->ats = actsvr; + list_add_head(&AtsList, &entry->entry); + + return S_OK; +} + +BOOL get_active_textservice(REFCLSID rclsid, TF_LANGUAGEPROFILE *profile) +{ + AtsEntry *ats; + + LIST_FOR_EACH_ENTRY(ats, &AtsList, AtsEntry, entry) + { + if (IsEqualCLSID(rclsid,&ats->ats->LanguageProfile.clsid)) + { + if (profile) + *profile = ats->ats->LanguageProfile; + return TRUE; + } + } + return FALSE; +} + +HRESULT activate_textservices(ITfThreadMgr *tm) +{ + HRESULT hr = S_OK; + AtsEntry *ats; + + LIST_FOR_EACH_ENTRY(ats, &AtsList, AtsEntry, entry) + { + hr = activate_given_ts(ats->ats, tm); + if (FAILED(hr)) + FIXME("Failed to activate text service\n"); + } + return hr; +} + +HRESULT deactivate_textservices(void) +{ + AtsEntry *ats; + + LIST_FOR_EACH_ENTRY(ats, &AtsList, AtsEntry, entry) + deactivate_given_ts(ats->ats); + + return S_OK; +} + /************************************************************************* * MSCTF DllMain */ diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 826c09d..7bfc221 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -40,5 +40,11 @@ extern LPVOID get_Cookie_data(DWORD id); extern LPVOID remove_Cookie(DWORD id); extern DWORD enumerate_Cookie(DWORD magic, DWORD *index); +/* activated text services functions */ +extern HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp); +extern BOOL get_active_textservice(REFCLSID rclsid, TF_LANGUAGEPROFILE *lp); +extern HRESULT activate_textservices(ITfThreadMgr *tm); +extern HRESULT deactivate_textservices(void); + extern const WCHAR szwSystemTIPKey[]; #endif /* __WINE_MSCTF_I_H */

1 0

Aric Stewart : msctf: Implement ITfInputProcessorProfiles:: ActivateLanguageProfile.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: c0233cbc887e4e83d185df68e491463cad74957b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0233cbc887e4e83d185df68e… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 7 14:27:41 2009 -0500 msctf: Implement ITfInputProcessorProfiles::ActivateLanguageProfile. --- dlls/msctf/inputprocessor.c | 34 ++++++++++++++++++++++++++++++---- dlls/msctf/tests/inputprocessor.c | 2 +- 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 7df5575..c32fcb3 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -288,9 +288,36 @@ static HRESULT WINAPI InputProcessorProfiles_ActivateLanguageProfile( ITfInputProcessorProfiles *iface, REFCLSID rclsid, LANGID langid, REFGUID guidProfiles) { + HRESULT hr; + BOOL enabled; + TF_LANGUAGEPROFILE LanguageProfile; InputProcessorProfiles *This = (InputProcessorProfiles*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + + TRACE("(%p) %s %x %s\n",This,debugstr_guid(rclsid),langid,debugstr_guid(guidProfiles)); + + if (langid != This->currentLanguage) return E_INVALIDARG; + + if (get_active_textservice(rclsid,NULL)) + { + TRACE("Already Active\n"); + return E_FAIL; + } + + hr = ITfInputProcessorProfiles_IsEnabledLanguageProfile(iface, rclsid, + langid, guidProfiles, &enabled); + if (FAILED(hr) || !enabled) + { + TRACE("Not Enabled\n"); + return E_FAIL; + } + + LanguageProfile.clsid = *rclsid; + LanguageProfile.langid = langid; + LanguageProfile.guidProfile = *guidProfiles; + + hr = add_active_textservice(&LanguageProfile); + + return hr; } static HRESULT WINAPI InputProcessorProfiles_GetActiveLanguageProfile( @@ -756,8 +783,7 @@ static INT next_LanguageProfile(EnumTfLanguageProfiles *This, CLSID clsid, TF_LA tflp->clsid = clsid; tflp->langid = This->langid; - /* FIXME */ - tflp->fActive = FALSE; + tflp->fActive = get_active_textservice(&clsid, NULL); tflp->guidProfile = profile; if (ITfCategoryMgr_FindClosestCategory(This->catmgr, &clsid, &tflp->catid, tipcats, 3) != S_OK) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 2477ad8..39f58e6 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -444,7 +444,7 @@ static void test_Activate(void) HRESULT hr; hr = ITfInputProcessorProfiles_ActivateLanguageProfile(g_ipp,&CLSID_FakeService,gLangid,&CLSID_FakeService); - todo_wine ok(SUCCEEDED(hr),"Failed to Activate text service\n"); + ok(SUCCEEDED(hr),"Failed to Activate text service\n"); } static inline int check_context_refcount(ITfContext *iface)

1 0

Aric Stewart : msctf: Implement ITfInputProcessorProfiles:: GetActiveLanguageProfile.
by Alexandre Julliard 08 May '09

08 May '09

Module: wine Branch: master Commit: b88f32f1161ebdb7815a543d53bc880e3a750bdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b88f32f1161ebdb7815a543d5… Author: Aric Stewart <aric(a)codeweavers.com> Date: Thu May 7 14:27:52 2009 -0500 msctf: Implement ITfInputProcessorProfiles::GetActiveLanguageProfile. --- dlls/msctf/inputprocessor.c | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index c32fcb3..38e9368 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -324,9 +324,25 @@ static HRESULT WINAPI InputProcessorProfiles_GetActiveLanguageProfile( ITfInputProcessorProfiles *iface, REFCLSID rclsid, LANGID *plangid, GUID *pguidProfile) { + TF_LANGUAGEPROFILE profile; InputProcessorProfiles *This = (InputProcessorProfiles*)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + + TRACE("(%p) %s %p %p\n",This,debugstr_guid(rclsid),plangid,pguidProfile); + + if (!rclsid || !plangid || !pguidProfile) + return E_INVALIDARG; + + if (get_active_textservice(rclsid, &profile)) + { + *plangid = profile.langid; + *pguidProfile = profile.guidProfile; + return S_OK; + } + else + { + *pguidProfile = GUID_NULL; + return S_FALSE; + } } static HRESULT WINAPI InputProcessorProfiles_GetLanguageProfileDescription(

1 0