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

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

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

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

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

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

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

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

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

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

Stefan Dösinger : wined3d: Only use 4 component specular colors if GL allows it.
by Alexandre Julliard 10 Jul '09

10 Jul '09

Module: wine Branch: master Commit: 8a6553da149694f9a188d2b28b46318d37add3ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a6553da149694f9a188d2b28… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 10 11:28:49 2009 +0200 wined3d: Only use 4 component specular colors if GL allows it. --- dlls/wined3d/directx.c | 47 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/state.c | 36 ++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 81 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1f5a750..1ba7ca5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -612,6 +612,33 @@ static BOOL match_dx10_capable(const WineD3D_GL_Info *gl_info, const char *gl_re return gl_info->max_glsl_varyings > 44; } +/* A GL context is provided by the caller */ +static BOOL match_allows_spec_alpha(const WineD3D_GL_Info *gl_info, const char *gl_renderer) +{ + GLenum error; + DWORD data[16]; + + if(!GL_SUPPORT(EXT_SECONDARY_COLOR)) return FALSE; + + ENTER_GL(); + while(glGetError()); + GL_EXTCALL(glSecondaryColorPointerEXT)(4, GL_UNSIGNED_BYTE, 4, data); + error = glGetError(); + LEAVE_GL(); + + if(error == GL_NO_ERROR) + { + TRACE("GL Implementation accepts 4 component specular color pointers\n"); + return TRUE; + } + else + { + TRACE("GL implementation does not accept 4 component specular colors, error %s\n", + debug_glerror(error)); + return FALSE; + } +} + static void quirk_arb_constants(WineD3D_GL_Info *gl_info) { TRACE_(d3d_caps)("Using ARB vs constant limit(=%u) for GLSL.\n", gl_info->vs_arb_constantsF); @@ -721,6 +748,11 @@ static void quirk_clip_varying(WineD3D_GL_Info *gl_info) gl_info->quirks |= WINED3D_QUIRK_GLSL_CLIP_VARYING; } +static void quirk_allows_specular_alpha(WineD3D_GL_Info *gl_info) +{ + gl_info->quirks |= WINED3D_QUIRK_ALLOWS_SPECULAR_ALPHA; +} + struct driver_quirk { BOOL (*match)(const WineD3D_GL_Info *gl_info, const char *gl_renderer); @@ -770,6 +802,21 @@ struct driver_quirk quirk_table[] = match_dx10_capable, quirk_clip_varying, "Reserved varying for gl_ClipPos" + }, + { + /* GL_EXT_secondary_color does not allow 4 component secondary colors, but most + * GL implementations accept it. The Mac GL is the only implementation known to + * reject it. + * + * If we can pass 4 component specular colors, do it, because (a) we don't have + * to screw around with the data, and (b) the D3D fixed function vertex pipeline + * passes specular alpha to the pixel shader if any is used. Otherwise the + * specular alpha is used to pass the fog coordinate, which we pass to opengl + * via GL_EXT_fog_coord. + */ + match_allows_spec_alpha, + quirk_allows_specular_alpha, + "Allow specular alpha quirk" } }; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2158d0b..9f77b5b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4199,15 +4199,45 @@ static void loadVertexData(IWineD3DStateBlockImpl *stateblock, const struct wine VTRACE(("glSecondaryColorPointer(4, GL_UNSIGNED_BYTE, %d, %p)\n", e->stride, e->data)); if (GL_SUPPORT(EXT_SECONDARY_COLOR)) { + GLenum type = e->format_desc->gl_vtx_type; + GLint format = e->format_desc->gl_vtx_format; + if (curVBO != e->buffer_object) { GL_EXTCALL(glBindBufferARB(GL_ARRAY_BUFFER_ARB, e->buffer_object)); checkGLcall("glBindBufferARB"); curVBO = e->buffer_object; } - GL_EXTCALL(glSecondaryColorPointerEXT)(e->format_desc->gl_vtx_format, e->format_desc->gl_vtx_type, - e->stride, e->data + stateblock->loadBaseVertexIndex * e->stride + offset[e->stream_idx]); - checkGLcall("glSecondaryColorPointerEXT(4, GL_UNSIGNED_BYTE, ...)"); + + if(format != 4 || (GLINFO_LOCATION.quirks & WINED3D_QUIRK_ALLOWS_SPECULAR_ALPHA)) + { + /* Usually specular colors only allow 3 components, since they have no alpha. In D3D, the specular alpha + * contains the fog coordinate, which is passed to GL with GL_EXT_fog_coord. However, the fixed function + * vertex pipeline can pass the specular alpha through, and pixel shaders can read it. So it GL accepts + * 4 component secondary colors use it + */ + GL_EXTCALL(glSecondaryColorPointerEXT)(format, type, + e->stride, e->data + stateblock->loadBaseVertexIndex * e->stride + offset[e->stream_idx]); + checkGLcall("glSecondaryColorPointerEXT(format, type, ...)"); + } + else + { + switch(type) + { + case GL_UNSIGNED_BYTE: + GL_EXTCALL(glSecondaryColorPointerEXT)(3, GL_UNSIGNED_BYTE, + e->stride, e->data + stateblock->loadBaseVertexIndex * e->stride + offset[e->stream_idx]); + checkGLcall("glSecondaryColorPointerEXT(3, GL_UNSIGNED_BYTE, ...)"); + break; + + default: + FIXME("Add 4 component specular color pointers for type %x\n", type); + /* Make sure that the right color component is dropped */ + GL_EXTCALL(glSecondaryColorPointerEXT)(3, type, + e->stride, e->data + stateblock->loadBaseVertexIndex * e->stride + offset[e->stream_idx]); + checkGLcall("glSecondaryColorPointerEXT(3, type, ...)"); + } + } glEnableClientState(GL_SECONDARY_COLOR_ARRAY_EXT); checkGLcall("glEnableClientState(GL_SECONDARY_COLOR_ARRAY_EXT)"); } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b80c35c..60c363c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -47,6 +47,7 @@ #define WINED3D_QUIRK_ARB_VS_OFFSET_LIMIT 0x00000001 #define WINED3D_QUIRK_SET_TEXCOORD_W 0x00000002 #define WINED3D_QUIRK_GLSL_CLIP_VARYING 0x00000004 +#define WINED3D_QUIRK_ALLOWS_SPECULAR_ALPHA 0x00000008 /* Texture format fixups */

1 0