winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
July
June
May
April
March
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
July 2009
----- 2025 -----
July 2025
June 2025
May 2025
April 2025
March 2025
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
4 participants
1067 discussions
Start a n
N
ew thread
Alexandre Julliard : oleaut32/tests: Fix the usrmarshal tests on 64-bit.
by Alexandre Julliard
13 Jul '09
13 Jul '09
Module: wine Branch: master Commit: a0b8ec0e1b1b8a803833394d5f9489571f3d7b14 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a0b8ec0e1b1b8a803833394d5…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 10 19:13:16 2009 +0200 oleaut32/tests: Fix the usrmarshal tests on 64-bit. --- dlls/oleaut32/tests/usrmarshal.c | 76 ++++++++++++++++++++++++------------- 1 files changed, 49 insertions(+), 27 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=a0b8ec0e1b1b8a8038333…
1
0
0
0
Paul Vriens : transl: Actually highlight equal strings when comparing to English (US).
by Alexandre Julliard
13 Jul '09
13 Jul '09
Module: tools Branch: master Commit: fcd67cbd9a61eabcf49bebdfa36cebd83876fc2e URL:
http://source.winehq.org/git/tools.git/?a=commit;h=fcd67cbd9a61eabcf49bebdf…
Author: Paul Vriens <paul(a)acer.famvriens.nl> Date: Fri Jul 10 16:36:10 2009 +0200 transl: Actually highlight equal strings when comparing to English (US). --- transl/php/lib_res.php | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/transl/php/lib_res.php b/transl/php/lib_res.php index 5a980f8..534e16d 100644 --- a/transl/php/lib_res.php +++ b/transl/php/lib_res.php @@ -429,7 +429,9 @@ class StringTable extends Resource { $uni_str = $this->strings[$lparam]; $other_uni_str = $other->strings[$lparam]; - return ((!$other_uni_str && $uni_str) || ($other_uni_str && !$uni_str)); + return ((!$other_uni_str && $uni_str) || + ($other_uni_str && !$uni_str) || + (($uni_str && $other_uni_str) && ($uni_str == $other_uni_str))); } function dump($master_res = NULL) @@ -503,7 +505,9 @@ class MessageTable extends Resource { $uni_str = $this->strings[$lparam]; $other_uni_str = $other->strings[$lparam]; - return ((!$other_uni_str && $uni_str) || ($other_uni_str && !$uni_str)); + return ((!$other_uni_str && $uni_str) || + ($other_uni_str && !$uni_str) || + (($uni_str && $other_uni_str) && ($uni_str == $other_uni_str))); } function dump($master_res = NULL)
1
0
0
0
Alexander Nicolaysen Sørnes : cron: Don' t examine deleted versions in orphan cleanup
by Alexander Nicolaysen Sørnes
12 Jul '09
12 Jul '09
Module: appdb Branch: master Commit: 658056bd91693bfa87fdd0735b8034d3ab095c2f URL:
http://source.winehq.org/git/appdb.git/?a=commit;h=658056bd91693bfa87fdd073…
Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jul 12 23:35:13 2009 +0200 cron: Don't examine deleted versions in orphan cleanup --- cron/cleanup.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cron/cleanup.php b/cron/cleanup.php index 43a3e89..299c0b0 100644 --- a/cron/cleanup.php +++ b/cron/cleanup.php @@ -167,7 +167,7 @@ function orphanVersionCheck() { global $sEmailSubject; - $sQuery = "select versionId, versionName from appVersion where appId = 0"; + $sQuery = "select versionId, versionName from appVersion where appId = 0 and state != 'deleted'"; $hResult = query_appdb($sQuery); $found_orphans = false;
1
0
0
0
Alexander Nicolaysen Sørnes : Top 25: Don't show queued or deleted versions
by Alexander Nicolaysen Sørnes
12 Jul '09
12 Jul '09
Module: appdb Branch: master Commit: 0a42c3e36ce3f0234e31fd0d5783e9d0fa0706cc URL:
http://source.winehq.org/git/appdb.git/?a=commit;h=0a42c3e36ce3f0234e31fd0d…
Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jul 12 23:20:42 2009 +0200 Top 25: Don't show queued or deleted versions --- votestats.php | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/votestats.php b/votestats.php index c1db7e6..58cb715 100644 --- a/votestats.php +++ b/votestats.php @@ -131,7 +131,8 @@ if(empty($aClean['iCategoryId'])) count(userId) as count FROM appVotes, appFamily, appVersion WHERE appVotes.versionId = appVersion.versionId AND - appFamily.appId = appVersion.appId + appFamily.appId = appVersion.appId AND + appVersion.state = 'accepted' GROUP BY appVotes.versionId ORDER BY count DESC LIMIT ?", $aClean['iTopNumber']); } else @@ -149,6 +150,7 @@ if(empty($aClean['iCategoryId'])) FROM appFamily AS f, appCategory AS c, appVotes AS v, appVersion WHERE appVersion.appId = f.appId AND appVersion.versionId = v.versionId + AND appVersion.state = 'accepted' AND f.catId = c.catId AND ( c.catId = '?'
1
0
0
0
Alexander Nicolaysen Sørnes : testData: Make the last argument to CreateTestTableRow() optional
by Alexander Nicolaysen Sørnes
12 Jul '09
12 Jul '09
Module: appdb Branch: master Commit: 5790692faae6201109115101e9515e8694781817 URL:
http://source.winehq.org/git/appdb.git/?a=commit;h=5790692faae6201109115101…
Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Sun Jul 12 23:10:17 2009 +0200 testData: Make the last argument to CreateTestTableRow() optional --- include/testData.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/testData.php b/include/testData.php index ec24d1e..18169da 100644 --- a/include/testData.php +++ b/include/testData.php @@ -562,7 +562,7 @@ class testData{ } /* Creates and returns a table row for a test result table */ - function CreateTestTableRow($iCurrentId, $sLink, $bShowAll) + function CreateTestTableRow($iCurrentId, $sLink, $bShowAll = false) { $oVersion = new Version($this->iVersionId); $oApp = new Application($oVersion->iAppId);
1
0
0
0
Aric Stewart : msctf/tests: Test EnumDocumentMgrs.
by Alexandre Julliard
10 Jul '09
10 Jul '09
Module: wine Branch: master Commit: 3d6bb38952eb0de7f895b06eae5e47a12a58eb92 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=3d6bb38952eb0de7f895b06ea…
Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jul 10 07:38:45 2009 -0500 msctf/tests: Test EnumDocumentMgrs. --- dlls/msctf/tests/inputprocessor.c | 45 +++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 9b266ba..d35d391 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1142,6 +1142,39 @@ static void test_EnumContexts(ITfDocumentMgr *dm, ITfContext *search) ok(!found,"Found an ITfContext we should should not have\n"); } +static void test_EnumDocumentMgr(ITfThreadMgr *tm, ITfDocumentMgr *search, ITfDocumentMgr *absent) +{ + HRESULT hr; + IEnumTfDocumentMgrs* pEnum; + BOOL found = FALSE; + BOOL notfound = TRUE; + + hr = ITfThreadMgr_EnumDocumentMgrs(tm,&pEnum); + ok(SUCCEEDED(hr),"EnumDocumentMgrs failed\n"); + if (SUCCEEDED(hr)) + { + ULONG fetched; + ITfDocumentMgr *dm; + while (IEnumTfDocumentMgrs_Next(pEnum, 1, &dm, &fetched) == S_OK) + { + if (!search) + found = TRUE; + else if (search == dm) + found = TRUE; + if (absent && dm == absent) + notfound = FALSE; + ITfDocumentMgr_Release(dm); + } + IEnumTfDocumentMgrs_Release(pEnum); + } + if (search) + ok(found,"Did not find proper ITfDocumentMgr\n"); + else + ok(!found,"Found an ITfDocumentMgr we should should not have\n"); + if (absent) + ok(notfound,"Found an ITfDocumentMgr we believe should be absent\n"); +} + static inline int check_context_refcount(ITfContext *iface) { IUnknown_AddRef(iface); @@ -1174,9 +1207,21 @@ static void test_startSession(void) hr = ITfThreadMgr_Deactivate(g_tm); ok(SUCCEEDED(hr),"Failed to Deactivate\n"); + test_EnumDocumentMgr(g_tm,NULL,NULL); + hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&g_dm); ok(SUCCEEDED(hr),"CreateDocumentMgr failed\n"); + test_EnumDocumentMgr(g_tm,g_dm,NULL); + + hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&dmtest); + ok(SUCCEEDED(hr),"CreateDocumentMgr failed\n"); + + test_EnumDocumentMgr(g_tm,dmtest,NULL); + + ITfDocumentMgr_Release(dmtest); + test_EnumDocumentMgr(g_tm,g_dm,dmtest); + hr = ITfThreadMgr_GetFocus(g_tm,&dmtest); ok(SUCCEEDED(hr),"GetFocus Failed\n"); ok(dmtest == NULL,"Initial focus not null\n");
1
0
0
0
Aric Stewart : msctf: Implement ITfThreadMgr::EnumDocumentMgrs.
by Alexandre Julliard
10 Jul '09
10 Jul '09
Module: wine Branch: master Commit: 844fd9220081703a0d6983332e87b16bcb0dbf9c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=844fd9220081703a0d6983332…
Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jul 10 07:38:20 2009 -0500 msctf: Implement ITfThreadMgr::EnumDocumentMgrs. --- dlls/msctf/threadmgr.c | 162 +++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 160 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index da2c74a..9fb1b5d 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -107,6 +107,16 @@ typedef struct tagACLMulti { struct list ThreadMgrEventSink; } ThreadMgr; +typedef struct tagEnumTfDocumentMgr { + const IEnumTfDocumentMgrsVtbl *Vtbl; + LONG refCount; + + struct list *index; + struct list *head; +} EnumTfDocumentMgr; + +static HRESULT EnumTfDocumentMgr_Constructor(struct list* head, IEnumTfDocumentMgrs **ppOut); + static inline ThreadMgr *impl_from_ITfSourceVtbl(ITfSource *iface) { return (ThreadMgr *)((char *)iface - FIELD_OFFSET(ThreadMgr,SourceVtbl)); @@ -343,8 +353,12 @@ static HRESULT WINAPI ThreadMgr_EnumDocumentMgrs( ITfThreadMgr* iface, IEnumTfDo **ppEnum) { ThreadMgr *This = (ThreadMgr *)iface; - FIXME("STUB:(%p)\n",This); - return E_NOTIMPL; + TRACE("(%p) %p\n",This,ppEnum); + + if (!ppEnum) + return E_INVALIDARG; + + return EnumTfDocumentMgr_Constructor(&This->CreatedDocumentMgrs, ppEnum); } static HRESULT WINAPI ThreadMgr_GetFocus( ITfThreadMgr* iface, ITfDocumentMgr @@ -1129,6 +1143,150 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) return S_OK; } +/************************************************** + * IEnumTfDocumentMgrs implementaion + **************************************************/ +static void EnumTfDocumentMgr_Destructor(EnumTfDocumentMgr *This) +{ + TRACE("destroying %p\n", This); + HeapFree(GetProcessHeap(),0,This); +} + +static HRESULT WINAPI EnumTfDocumentMgr_QueryInterface(IEnumTfDocumentMgrs *iface, REFIID iid, LPVOID *ppvOut) +{ + EnumTfDocumentMgr *This = (EnumTfDocumentMgr *)iface; + *ppvOut = NULL; + + if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IEnumTfDocumentMgrs)) + { + *ppvOut = This; + } + + if (*ppvOut) + { + IUnknown_AddRef(iface); + return S_OK; + } + + WARN("unsupported interface: %s\n", debugstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI EnumTfDocumentMgr_AddRef(IEnumTfDocumentMgrs *iface) +{ + EnumTfDocumentMgr *This = (EnumTfDocumentMgr*)iface; + return InterlockedIncrement(&This->refCount); +} + +static ULONG WINAPI EnumTfDocumentMgr_Release(IEnumTfDocumentMgrs *iface) +{ + EnumTfDocumentMgr *This = (EnumTfDocumentMgr *)iface; + ULONG ret; + + ret = InterlockedDecrement(&This->refCount); + if (ret == 0) + EnumTfDocumentMgr_Destructor(This); + return ret; +} + +static HRESULT WINAPI EnumTfDocumentMgr_Next(IEnumTfDocumentMgrs *iface, + ULONG ulCount, ITfDocumentMgr **rgDocumentMgr, ULONG *pcFetched) +{ + EnumTfDocumentMgr *This = (EnumTfDocumentMgr *)iface; + ULONG fetched = 0; + + TRACE("(%p)\n",This); + + if (rgDocumentMgr == NULL) return E_POINTER; + + while (fetched < ulCount) + { + DocumentMgrEntry *mgrentry; + if (This->index == NULL) + break; + + mgrentry = LIST_ENTRY(This->index,DocumentMgrEntry,entry); + if (mgrentry == NULL) + break; + + *rgDocumentMgr = mgrentry->docmgr; + ITfDocumentMgr_AddRef(*rgDocumentMgr); + + This->index = list_next(This->head, This->index); + ++fetched; + ++rgDocumentMgr; + } + + if (pcFetched) *pcFetched = fetched; + return fetched == ulCount ? S_OK : S_FALSE; +} + +static HRESULT WINAPI EnumTfDocumentMgr_Skip( IEnumTfDocumentMgrs* iface, ULONG celt) +{ + INT i; + EnumTfDocumentMgr *This = (EnumTfDocumentMgr *)iface; + TRACE("(%p)\n",This); + for(i = 0; i < celt && This->index != NULL; i++) + This->index = list_next(This->head, This->index); + return S_OK; +} + +static HRESULT WINAPI EnumTfDocumentMgr_Reset( IEnumTfDocumentMgrs* iface) +{ + EnumTfDocumentMgr *This = (EnumTfDocumentMgr *)iface; + TRACE("(%p)\n",This); + This->index = list_head(This->head); + return S_OK; +} + +static HRESULT WINAPI EnumTfDocumentMgr_Clone( IEnumTfDocumentMgrs *iface, + IEnumTfDocumentMgrs **ppenum) +{ + EnumTfDocumentMgr *This = (EnumTfDocumentMgr *)iface; + HRESULT res; + + TRACE("(%p)\n",This); + + if (ppenum == NULL) return E_POINTER; + + res = EnumTfDocumentMgr_Constructor(This->head, ppenum); + if (SUCCEEDED(res)) + { + EnumTfDocumentMgr *new_This = (EnumTfDocumentMgr *)*ppenum; + new_This->index = This->index; + } + return res; +} + +static const IEnumTfDocumentMgrsVtbl IEnumTfDocumentMgrs_Vtbl ={ + EnumTfDocumentMgr_QueryInterface, + EnumTfDocumentMgr_AddRef, + EnumTfDocumentMgr_Release, + + EnumTfDocumentMgr_Clone, + EnumTfDocumentMgr_Next, + EnumTfDocumentMgr_Reset, + EnumTfDocumentMgr_Skip +}; + +static HRESULT EnumTfDocumentMgr_Constructor(struct list* head, IEnumTfDocumentMgrs **ppOut) +{ + EnumTfDocumentMgr *This; + + This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(EnumTfDocumentMgr)); + if (This == NULL) + return E_OUTOFMEMORY; + + This->Vtbl= &IEnumTfDocumentMgrs_Vtbl; + This->refCount = 1; + This->head = head; + This->index = list_head(This->head); + + TRACE("returning %p\n", This); + *ppOut = (IEnumTfDocumentMgrs*)This; + return S_OK; +} + void ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *tm, ITfDocumentMgr *mgr) { ThreadMgr *This = (ThreadMgr *)tm;
1
0
0
0
Aric Stewart : msctf: Add code to track created ITfDocumentMgrs.
by Alexandre Julliard
10 Jul '09
10 Jul '09
Module: wine Branch: master Commit: 171a1ad0a2ef2e4c784af0e4c96d5945a232dfb4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=171a1ad0a2ef2e4c784af0e4c…
Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jul 10 07:36:56 2009 -0500 msctf: Add code to track created ITfDocumentMgrs. --- dlls/msctf/documentmgr.c | 5 ++++ dlls/msctf/msctf_internal.h | 1 + dlls/msctf/threadmgr.c | 52 ++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 57 insertions(+), 1 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index 66f0f50..0a25b3d 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -69,7 +69,12 @@ static inline DocumentMgr *impl_from_ITfSourceVtbl(ITfSource *iface) static void DocumentMgr_Destructor(DocumentMgr *This) { + ITfThreadMgr *tm; TRACE("destroying %p\n", This); + + TF_GetThreadMgr(&tm); + ThreadMgr_OnDocumentMgrDestruction(tm, (ITfDocumentMgr*)This); + if (This->contextStack[0]) ITfContext_Release(This->contextStack[0]); if (This->contextStack[1]) diff --git a/dlls/msctf/msctf_internal.h b/dlls/msctf/msctf_internal.h index 928b046..3bb0baa 100644 --- a/dlls/msctf/msctf_internal.h +++ b/dlls/msctf/msctf_internal.h @@ -43,6 +43,7 @@ extern HRESULT CompartmentMgr_Destructor(ITfCompartmentMgr *This); extern HRESULT Context_Initialize(ITfContext *cxt, ITfDocumentMgr *manager); extern HRESULT Context_Uninitialize(ITfContext *cxt); +extern void ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *tm, ITfDocumentMgr *mgr); extern HRESULT TF_SELECTION_to_TS_SELECTION_ACP(const TF_SELECTION *tf, TS_SELECTION_ACP *tsAcp); /* cookie function */ diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index b109107..da2c74a 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -65,6 +65,12 @@ typedef struct tagPreservedKey TfClientId tid; } PreservedKey; +typedef struct tagDocumentMgrs +{ + struct list entry; + ITfDocumentMgr *docmgr; +} DocumentMgrEntry; + typedef struct tagACLMulti { const ITfThreadMgrVtbl *ThreadMgrVtbl; const ITfSourceVtbl *SourceVtbl; @@ -90,6 +96,7 @@ typedef struct tagACLMulti { CLSID forgroundTextService; struct list CurrentPreservedKeys; + struct list CreatedDocumentMgrs; /* kept as separate lists to reduce unnecessary iterations */ struct list ActiveLanguageProfileNotifySink; @@ -186,6 +193,14 @@ static void ThreadMgr_Destructor(ThreadMgr *This) HeapFree(GetProcessHeap(),0,key); } + LIST_FOR_EACH_SAFE(cursor, cursor2, &This->CreatedDocumentMgrs) + { + DocumentMgrEntry *mgr = LIST_ENTRY(cursor,DocumentMgrEntry,entry); + list_remove(cursor); + FIXME("Left Over ITfDocumentMgr. Should we do something with it?\n"); + HeapFree(GetProcessHeap(),0,mgr); + } + CompartmentMgr_Destructor(This->CompartmentMgr); HeapFree(GetProcessHeap(),0,This); @@ -303,8 +318,25 @@ static HRESULT WINAPI ThreadMgr_CreateDocumentMgr( ITfThreadMgr* iface, ITfDocum **ppdim) { ThreadMgr *This = (ThreadMgr *)iface; + DocumentMgrEntry *mgrentry; + HRESULT hr; + TRACE("(%p)\n",iface); - return DocumentMgr_Constructor((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, ppdim); + mgrentry = HeapAlloc(GetProcessHeap(),0,sizeof(DocumentMgrEntry)); + if (mgrentry == NULL) + return E_OUTOFMEMORY; + + hr = DocumentMgr_Constructor((ITfThreadMgrEventSink*)&This->ThreadMgrEventSinkVtbl, ppdim); + + if (SUCCEEDED(hr)) + { + mgrentry->docmgr = *ppdim; + list_add_head(&This->CreatedDocumentMgrs,&mgrentry->entry); + } + else + HeapFree(GetProcessHeap(),0,mgrentry); + + return hr; } static HRESULT WINAPI ThreadMgr_EnumDocumentMgrs( ITfThreadMgr* iface, IEnumTfDocumentMgrs @@ -1083,6 +1115,7 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) CompartmentMgr_Constructor((IUnknown*)This, &IID_IUnknown, (IUnknown**)&This->CompartmentMgr); list_init(&This->CurrentPreservedKeys); + list_init(&This->CreatedDocumentMgrs); list_init(&This->ActiveLanguageProfileNotifySink); list_init(&This->DisplayAttributeNotifySink); @@ -1095,3 +1128,20 @@ HRESULT ThreadMgr_Constructor(IUnknown *pUnkOuter, IUnknown **ppOut) *ppOut = (IUnknown *)This; return S_OK; } + +void ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *tm, ITfDocumentMgr *mgr) +{ + ThreadMgr *This = (ThreadMgr *)tm; + struct list *cursor; + LIST_FOR_EACH(cursor, &This->CreatedDocumentMgrs) + { + DocumentMgrEntry *mgrentry = LIST_ENTRY(cursor,DocumentMgrEntry,entry); + if (mgrentry->docmgr == mgr) + { + list_remove(cursor); + HeapFree(GetProcessHeap(),0,mgrentry); + return; + } + } + FIXME("ITfDocumenMgr %p not found in this thread\n",mgr); +}
1
0
0
0
Aric Stewart : msctf: Add definition for IEnumTfDocumentMgrs.
by Alexandre Julliard
10 Jul '09
10 Jul '09
Module: wine Branch: master Commit: 025df7d605929a342d4c83b05ddb5ac59bf1ee93 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=025df7d605929a342d4c83b05…
Author: Aric Stewart <aric(a)codeweavers.com> Date: Fri Jul 10 07:36:41 2009 -0500 msctf: Add definition for IEnumTfDocumentMgrs. --- include/msctf.idl | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/include/msctf.idl b/include/msctf.idl index 6b341d2..b9890f2 100644 --- a/include/msctf.idl +++ b/include/msctf.idl @@ -974,3 +974,24 @@ interface IEnumTfContexts : IUnknown HRESULT Skip( [in] ULONG ulCount); }; + +[ + object, + uuid(aa80e808-2021-11d2-93e0-0060b067b86e), + pointer_default(unique) +] +interface IEnumTfDocumentMgrs : IUnknown +{ + HRESULT Clone( + [out] IEnumTfDocumentMgrs **ppEnum); + + HRESULT Next( + [in] ULONG ulCount, + [out, size_is(ulCount), length_is(*pcFetched)] ITfDocumentMgr **rgDocumentMgr, + [out] ULONG *pcFetched); + + HRESULT Reset(); + + HRESULT Skip( + [in] ULONG ulCount); +};
1
0
0
0
Frédéric Delanoy : cryptui: Fix French translation & UI display.
by Alexandre Julliard
10 Jul '09
10 Jul '09
Module: wine Branch: master Commit: e3bf3d8b6236e381d865ea0b13647b3c8c33c552 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e3bf3d8b6236e381d865ea0b1…
Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 10 14:15:25 2009 +0200 cryptui: Fix French translation & UI display. --- dlls/cryptui/cryptui_Fr.rc | 104 ++++++++++++++++++++++---------------------- 1 files changed, 52 insertions(+), 52 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=e3bf3d8b6236e381d865e…
1
0
0
0
← Newer
1
...
53
54
55
56
57
58
59
...
107
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
Results per page:
10
25
50
100
200