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

Alexandre Julliard : oleaut32/tests: Fix the usrmarshal tests on 64-bit.
by Alexandre Julliard July 13, 2009

July 13, 2009

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 July 13, 2009

July 13, 2009

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 July 12, 2009

July 12, 2009

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 July 12, 2009

July 12, 2009

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 July 12, 2009

July 12, 2009

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 July 10, 2009

July 10, 2009

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/tests: Test EnumDocumentMgrs.
by Alexandre Julliard July 10, 2009

July 10, 2009

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

Aric Stewart : msctf: Implement ITfThreadMgr::EnumDocumentMgrs.
by Alexandre Julliard July 10, 2009

July 10, 2009

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: Add code to track created ITfDocumentMgrs.
by Alexandre Julliard July 10, 2009

July 10, 2009

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

Frédéric Delanoy : cryptui: Fix French translation & UI display.
by Alexandre Julliard July 10, 2009

July 10, 2009

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

Stefan Dösinger : wined3d: Only use 4 component specular colors if GL allows it.
by Alexandre Julliard July 10, 2009

July 10, 2009

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

Stefan Dösinger : wined3d: Drop the color0 mov optimization if the src is overwritten.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 17769497ebebb91bf925f51e685adbb47d27ae3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=17769497ebebb91bf925f51e6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 9 22:24:27 2009 +0200 wined3d: Drop the color0 mov optimization if the src is overwritten. --- dlls/wined3d/baseshader.c | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 411665e..0c2ede1 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -632,9 +632,12 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 reg_maps->texcoord_mask[dst_param.reg.idx] |= dst_param.write_mask; } - if (shader_version.type == WINED3D_SHADER_TYPE_PIXEL - && dst_param.reg.type == WINED3DSPR_COLOROUT && dst_param.reg.idx == 0) + if (shader_version.type == WINED3D_SHADER_TYPE_PIXEL) { + IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *)This; + + if(dst_param.reg.type == WINED3DSPR_COLOROUT && dst_param.reg.idx == 0) + { /* Many 2.0 and 3.0 pixel shaders end with a MOV from a temp register to * COLOROUT 0. If we know this in advance, the ARB shader backend can skip * the mov and perform the sRGB write correction from the source register. @@ -642,13 +645,20 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 * However, if the mov is only partial, we can't do this, and if the write * comes from an instruction other than MOV it is hard to do as well. If * COLOROUT 0 is overwritten partially later, the marker is dropped again. */ - IWineD3DPixelShaderImpl *ps = (IWineD3DPixelShaderImpl *)This; - ps->color0_mov = FALSE; - if (ins.handler_idx == WINED3DSIH_MOV) + ps->color0_mov = FALSE; + if (ins.handler_idx == WINED3DSIH_MOV) + { + /* Used later when the source register is read. */ + color0_mov = TRUE; + } + } + /* Also drop the MOV marker if the source register is overwritten prior to the shader + * end + */ + else if(dst_param.reg.type == WINED3DSPR_TEMP && dst_param.reg.idx == ps->color0_reg) { - /* Used later when the source register is read. */ - color0_mov = TRUE; + ps->color0_mov = FALSE; } }

1 0

Aurimas Fišeras : kernel32/nls: Add Lithuanian winerr translation.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 73d9ffbdb49736ea73d7ce988288a6df5472f554 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73d9ffbdb49736ea73d7ce988… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jul 5 12:37:05 2009 +0300 kernel32/nls: Add Lithuanian winerr translation. --- .gitignore | 1 + dlls/kernel32/Makefile.in | 1 + dlls/kernel32/nls/winerr_lth.mc | 3736 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 3738 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=73d9ffbdb49736ea73d7c…

1 0

Frédéric Delanoy : cryptui: Fix UI display.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 04f5c9153ad4654b56f71acbed7558f2ccd7ee71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04f5c9153ad4654b56f71acbe… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 10 13:15:05 2009 +0200 cryptui: Fix UI display. --- dlls/cryptui/cryptui_En.rc | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/cryptui/cryptui_En.rc b/dlls/cryptui/cryptui_En.rc index 957fe98..5aee197 100644 --- a/dlls/cryptui/cryptui_En.rc +++ b/dlls/cryptui/cryptui_En.rc @@ -285,16 +285,16 @@ CAPTION "Certificate Import Wizard" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Welcome to the Certificate Import Wizard", IDC_IMPORT_TITLE, - 115,1,195,40 + 115,7,195,12 LTEXT "This wizard helps you import certificates, certificate revocation lists, and certificate trust lists from a file to a certificate store.", - -1, 115,33,195,16 + -1, 115,26,195,25 LTEXT "A certificate can be used to identify you or the computer with which you are communicating. It can also be used for authentication, and to sign messages. Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.", -1, 115,56,195,40 LTEXT "To continue, click Next.", -1, 115,103,195,8 END -IDD_IMPORT_FILE DIALOG DISCARDABLE 0,0,317,143 +IDD_IMPORT_FILE DIALOG DISCARDABLE 0,0,317,178 CAPTION "Certificate Import Wizard" FONT 8, "MS Shell Dlg" BEGIN @@ -325,7 +325,7 @@ BEGIN PUSHBUTTON "B&rowse...", IDC_IMPORT_BROWSE_STORE, 236,49,60,14 END -IDD_IMPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 +IDD_IMPORT_FINISH DIALOG DISCARDABLE 0,0,317,178 CAPTION "Certificate Import Wizard" FONT 8, "MS Shell Dlg" BEGIN @@ -381,9 +381,9 @@ CAPTION "Certificate Export Wizard" FONT 8, "MS Shell Dlg" BEGIN LTEXT "Welcome to the Certificate Export Wizard", IDC_EXPORT_TITLE, - 115,1,195,40 + 115,7,195,12 LTEXT "This wizard helps you export certificates, certificate revocation lists, and certificate trust lists from a certificate store to a file.", - -1, 115,33,195,16 + -1, 115,26,195,25 LTEXT "A certificate can be used to identify you or the computer with which you are communicating. It can also be used for authentication, and to sign messages. Certificate stores are collections of certificates, certificate revocation lists, and certificate trust lists.", -1, 115,56,195,40 LTEXT "To continue, click Next.", @@ -394,8 +394,8 @@ IDD_EXPORT_PRIVATE_KEY DIALOG DISCARDABLE 0,0,317,143 CAPTION "Certificate Export Wizard" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "If you choose to export the private key, you will be prompted for a password to protect the private key on a later page.", -1, 21,1,195,23 - LTEXT "Do you wish to export the private key?", -1, 21,24,195,15 + LTEXT "If you choose to export the private key, you will be prompted for a password to protect the private key on a later page.", -1, 21,1,195,25 + LTEXT "Do you wish to export the private key?", -1, 21,27,195,10 AUTORADIOBUTTON "&Yes, export the private key", IDC_EXPORT_PRIVATE_KEY_YES, 31,36,200,12, BS_AUTORADIOBUTTON|WS_TABSTOP AUTORADIOBUTTON "N&o, do not export the private key", @@ -447,7 +447,7 @@ BEGIN PUSHBUTTON "B&rowse...", IDC_EXPORT_BROWSE_FILE, 236,11,60,14 END -IDD_EXPORT_FINISH DIALOG DISCARDABLE 0,0,317,143 +IDD_EXPORT_FINISH DIALOG DISCARDABLE 0,0,317,178 CAPTION "Certificate Export Wizard" FONT 8, "MS Shell Dlg" BEGIN

1 0

Alexandre Julliard : wmc: Add support for utf-8 codepage.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 52f81c12dbcdef3ccc8f0f1365d1ea21994168a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52f81c12dbcdef3ccc8f0f136… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 10 13:03:09 2009 +0200 wmc: Add support for utf-8 codepage. --- tools/wmc/mcl.c | 8 +++++--- tools/wmc/mcy.y | 6 +++--- tools/wmc/write.c | 20 ++++++++++++++------ 3 files changed, 22 insertions(+), 12 deletions(-) diff --git a/tools/wmc/mcl.c b/tools/wmc/mcl.c index be01691..7be41d5 100644 --- a/tools/wmc/mcl.c +++ b/tools/wmc/mcl.c @@ -155,7 +155,7 @@ void set_codepage(int cp) { codepage = cp; codepage_def = find_codepage(codepage); - if(!codepage_def) + if(!codepage_def && codepage != CP_UTF8) xyyerror("Codepage %d not found; cannot process\n", codepage); } @@ -200,8 +200,10 @@ try_again: xyyerror(err_fatalread); else if(!cptr) return 0; - assert(codepage_def != NULL); - n = wine_cp_mbstowcs(codepage_def, 0, xlatebuffer, strlen(xlatebuffer)+1, inputbuffer, INPUTBUFFER_SIZE); + if (codepage_def) + n = wine_cp_mbstowcs(codepage_def, 0, xlatebuffer, strlen(xlatebuffer)+1, inputbuffer, INPUTBUFFER_SIZE); + else + n = wine_utf8_mbstowcs(0, xlatebuffer, strlen(xlatebuffer)+1, inputbuffer, INPUTBUFFER_SIZE); if(n < 0) internal_error(__FILE__, __LINE__, "Could not translate to unicode (%d)\n", n); if(n <= 1) diff --git a/tools/wmc/mcy.y b/tools/wmc/mcy.y index 2887df5..5de67c9 100644 --- a/tools/wmc/mcy.y +++ b/tools/wmc/mcy.y @@ -251,12 +251,12 @@ cmaps : cmap ; cmap : clan '=' tNUMBER ':' tNUMBER { - static const char err_nocp[] = "Codepage %d not builtin; cannot convert"; + static const char err_nocp[] = "Codepage %d not builtin; cannot convert\n"; if(find_cpxlat($1)) xyyerror("Codepage translation already defined for language 0x%x\n", $1); - if($3 && !find_codepage($3)) + if($3 && $3 != CP_UTF8 && !find_codepage($3)) xyyerror(err_nocp, $3); - if($5 && !find_codepage($5)) + if($5 && $5 != CP_UTF8 && !find_codepage($5)) xyyerror(err_nocp, $5); add_cpxlat($1, $3, $5); } diff --git a/tools/wmc/write.c b/tools/wmc/write.c index 7df2424..22858b8 100644 --- a/tools/wmc/write.c +++ b/tools/wmc/write.c @@ -100,11 +100,17 @@ static char *dup_u2c(int cp, const WCHAR *uc) int len; char *cptr; const union cptable *cpdef = find_codepage(cp); - if(!cpdef) - internal_error(__FILE__, __LINE__, "Codepage %d not found (vanished?)\n", cp); - len = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, NULL, 0, NULL, NULL); + + if(cpdef) + len = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, NULL, 0, NULL, NULL); + else + len = wine_utf8_wcstombs(0, uc, unistrlen(uc)+1, NULL, 0); cptr = xmalloc(len); - if((len = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, cptr, len, NULL, NULL)) < 0) + if (cpdef) + len = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, cptr, len, NULL, NULL); + else + len = wine_utf8_wcstombs(0, uc, unistrlen(uc)+1, cptr, len); + if (len < 0) internal_error(__FILE__, __LINE__, "Buffer overflow? code %d\n", len); return cptr; } @@ -385,8 +391,10 @@ static char *make_string(WCHAR *uc, int len, int codepage) int mlen; const union cptable *cpdef = find_codepage(codepage); - assert(cpdef != NULL); - mlen = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, NULL, 0, NULL, NULL); + if (cpdef) + mlen = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, NULL, 0, NULL, NULL); + else + mlen = wine_utf8_wcstombs(0, uc, unistrlen(uc)+1, NULL, 0); cc = tmp = xmalloc(mlen); if((i = wine_cp_wcstombs(cpdef, 0, uc, unistrlen(uc)+1, tmp, mlen, NULL, NULL)) < 0) internal_error(__FILE__, __LINE__, "Buffer overflow? code %d\n", i);

1 0

Stefan Dösinger : wined3d: Check the correct constant limit.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 2bfdff198c54218147cbf9532c68c9140b543909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2bfdff198c54218147cbf9532… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jul 10 09:30:14 2009 +0200 wined3d: Check the correct constant limit. --- dlls/wined3d/arb_program_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e48d5e3..6f7a1f0 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4492,7 +4492,7 @@ static void shader_arb_get_caps(WINED3DDEVTYPE devtype, const WineD3D_GL_Info *g pCaps->PixelShaderVersion = WINED3DPS_VERSION(3,0); TRACE_(d3d_caps)("Hardware pixel shader version 3.0 enabled (NV_FRAGMENT_PROGRAM2)\n"); } - else if(GL_LIMITS(vshader_constantsF) >= 32) + else if(GL_LIMITS(pshader_constantsF) >= 32) { /* Shader Model 2.0 requires at least 32 pixel shader constants */ pCaps->PixelShaderVersion = WINED3DPS_VERSION(2,0);

1 0

Alexandre Julliard : dbghelp: Grow all arrays by doubling the size.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 75792a3e6994e124a777b8825ef9b2916e7fe333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75792a3e6994e124a777b8825… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 10 14:46:55 2009 +0200 dbghelp: Grow all arrays by doubling the size. --- dlls/dbghelp/coff.c | 20 ++++++++++++------ dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/minidump.c | 28 ++++++++++++++++++++----- dlls/dbghelp/module.c | 2 + dlls/dbghelp/msc.c | 11 +++++++-- dlls/dbghelp/source.c | 9 ++++++- dlls/dbghelp/stabs.c | 43 ++++++++++++++++++++++++--------------- dlls/dbghelp/symbol.c | 13 ++++++++++- 8 files changed, 90 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75792a3e6994e124a777b…

1 0

Juan Lang : wininet: Support IPv6 in GetAddress.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: cd0c18be6c54a4e599b1f1a0c43472189154d29f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd0c18be6c54a4e599b1f1a0c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 9 11:51:21 2009 -0700 wininet: Support IPv6 in GetAddress. --- dlls/wininet/utility.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index e2eee46..0812af5 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -178,14 +178,23 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, #ifdef HAVE_GETADDRINFO memset( &hints, 0, sizeof(struct addrinfo) ); + /* Prefer IPv4 to IPv6 addresses, since some servers do not listen on + * their IPv6 addresses even though they have IPv6 addresses in the DNS. + */ hints.ai_family = AF_INET; ret = getaddrinfo( name, NULL, &hints, &res ); HeapFree( GetProcessHeap(), 0, name ); if (ret != 0) { - TRACE("failed to get address of %s (%s)\n", debugstr_w(lpszServerName), gai_strerror(ret)); - return FALSE; + TRACE("failed to get IPv4 address of %s (%s), retrying with IPv6\n", debugstr_w(lpszServerName), gai_strerror(ret)); + hints.ai_family = AF_INET6; + ret = getaddrinfo( name, NULL, &hints, &res ); + if (ret != 0) + { + TRACE("failed to get address of %s (%s)\n", debugstr_w(lpszServerName), gai_strerror(ret)); + return FALSE; + } } if (*sa_len < res->ai_addrlen) { @@ -201,6 +210,9 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, case AF_INET: ((struct sockaddr_in *)psa)->sin_port = htons(nServerPort); break; + case AF_INET6: + ((struct sockaddr_in6 *)psa)->sin6_port = htons(nServerPort); + break; } freeaddrinfo( res );

1 0

Juan Lang : wininet: Fail in FTP if the resolved name is not an IPv4 address.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 78b813236a72f1190b52ef324f6582791e595898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78b813236a72f1190b52ef324… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 9 11:45:48 2009 -0700 wininet: Fail in FTP if the resolved name is not an IPv4 address. --- dlls/wininet/ftp.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 6d41ac5..dce18bb 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2450,6 +2450,12 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, SendAsyncCallback(&hIC->hdr, dwContext, INTERNET_STATUS_NAME_RESOLVED, (LPWSTR) lpszServerName, strlenW(lpszServerName)); + if (socketAddr.sin_family != AF_INET) + { + WARN("unsupported address family %d\n", socketAddr.sin_family); + INTERNET_SetLastError(ERROR_INTERNET_CANNOT_CONNECT); + goto lerror; + } nsocket = socket(AF_INET,SOCK_STREAM,0); if (nsocket == -1) {

1 0

Roderick Colenbrander : winex11: Get rid of depth conversion fixme.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: cce1c44afa6e0d2efe1d145e7c39206ffef66c63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cce1c44afa6e0d2efe1d145e7… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Thu Jul 9 22:01:47 2009 +0200 winex11: Get rid of depth conversion fixme. --- dlls/winex11.drv/xrandr.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 4884e1f..c313bab 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -178,16 +178,11 @@ static LONG X11DRV_XRandR_SetCurrentMode(int mode) short rate; unsigned int i; int j; - DWORD dwBpp = screen_bpp; wine_tsx11_lock(); root = RootWindow (gdi_display, DefaultScreen(gdi_display)); sc = pXRRGetScreenInfo (gdi_display, root); size = pXRRConfigCurrentConfiguration (sc, &rot); - if (dwBpp != dd_modes[mode].dwBPP) - { - FIXME("Cannot change screen BPP from %d to %d\n", dwBpp, dd_modes[mode].dwBPP); - } mode = mode%real_xrandr_modes_count; TRACE("Changing Resolution to %dx%d @%d Hz\n",

1 0

Piotr Caban : jscript: Added String_fontcolor implementation.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 1133bc7ce846478ec04c97aa54ae585684bc3c6c URL: http://source.winehq.org/git/wine.git/?a=commit;h=1133bc7ce846478ec04c97aa5… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 9 22:41:27 2009 +0200 jscript: Added String_fontcolor implementation. --- dlls/jscript/string.c | 54 +++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/tests/api.js | 13 ++++++++++ 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 9f2ab9b..927d95a 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -150,6 +150,54 @@ static HRESULT do_attributeless_tag_format(DispatchEx *dispex, LCID lcid, WORD f return S_OK; } +static HRESULT do_attribute_tag_format(DispatchEx *dispex, LCID lcid, WORD flags, + DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp, + const WCHAR *tagname, const WCHAR *attr) +{ + static const WCHAR tagfmtW[] + = {'<','%','s',' ','%','s','=','\"','%','s','\"','>','%','s','<','/','%','s','>',0}; + static const WCHAR undefinedW[] = {'u','n','d','e','f','i','n','e','d',0}; + + StringInstance *string; + BSTR ret, attr_value; + HRESULT hres; + + if(!is_class(dispex, JSCLASS_STRING)) { + WARN("this is not a string object\n"); + return E_NOTIMPL; + } + + string = (StringInstance*) dispex; + + if(arg_cnt(dp)) { + hres = to_string(dispex->ctx, get_arg(dp, 0), ei, &attr_value); + if(FAILED(hres)) + return hres; + } + else { + attr_value = SysAllocString(undefinedW); + if(!attr_value) + return E_OUTOFMEMORY; + } + + if(retv) { + ret = SysAllocStringLen(NULL, string->length + 2*strlenW(tagname) + + strlenW(attr) + SysStringLen(attr_value) + 9); + if(!ret) { + SysFreeString(attr_value); + return E_OUTOFMEMORY; + } + + sprintfW(ret, tagfmtW, tagname, attr, attr_value, string->str, tagname); + + V_VT(retv) = VT_BSTR; + V_BSTR(retv) = ret; + } + + SysFreeString(attr_value); + return S_OK; +} + static HRESULT String_anchor(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { @@ -336,8 +384,10 @@ static HRESULT String_fixed(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAM static HRESULT String_fontcolor(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR fontW[] = {'F','O','N','T',0}; + static const WCHAR colorW[] = {'C','O','L','O','R',0}; + + return do_attribute_tag_format(dispex, lcid, flags, dp, retv, ei, sp, fontW, colorW); } static HRESULT String_fontsize(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 79b255b..2368a4b 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -305,6 +305,19 @@ ok(tmp === "<TT>test</TT>", "'test'.fixed() = " + tmp); tmp = "test".fixed(3); ok(tmp === "<TT>test</TT>", "'test'.fixed(3) = " + tmp); +tmp = "".fontcolor(); +ok(tmp === "", "''.fontcolor() = " + tmp); +tmp = "".fontcolor(3); +ok(tmp === "", "''.fontcolor(3) = " + tmp); +tmp = "".fontcolor("red"); +ok(tmp === "", "''.fontcolor('red') = " + tmp); +tmp = "test".fontcolor(); +ok(tmp === "test", "'test'.fontcolor() = " + tmp); +tmp = "test".fontcolor(3); +ok(tmp === "test", "'test'.fontcolor(3) = " + tmp); +tmp = "test".fontcolor("green"); +ok(tmp === "test", "'test'.fontcolor('green') = " + tmp); + tmp = "".italics(); ok(tmp === "", "''.italics() = " + tmp); tmp = "".italics(3);

1 0

Piotr Caban : jscript: Added String_fontsize implementation.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 0a0731ed450e889d924c7266b7829bbb4e4aca45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a0731ed450e889d924c7266b… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 9 20:09:10 2009 +0200 jscript: Added String_fontsize implementation. --- dlls/jscript/string.c | 6 ++++-- dlls/jscript/tests/api.js | 16 ++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 927d95a..efdff17 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -393,8 +393,10 @@ static HRESULT String_fontcolor(DispatchEx *dispex, LCID lcid, WORD flags, DISPP static HRESULT String_fontsize(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR fontW[] = {'F','O','N','T',0}; + static const WCHAR colorW[] = {'S','I','Z','E',0}; + + return do_attribute_tag_format(dispex, lcid, flags, dp, retv, ei, sp, fontW, colorW); } static HRESULT String_indexOf(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 2368a4b..fe20939 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -318,6 +318,22 @@ ok(tmp === "test", "'test'.fontcolor(3) = " + tmp); tmp = "test".fontcolor("green"); ok(tmp === "test", "'test'.fontcolor('green') = " + tmp); +tmp = "".fontsize(); +ok(tmp === "", "''.fontsize() = " + tmp); +tmp = "".fontsize(3); +ok(tmp === "", "''.fontsize(3) = " + tmp); +tmp = "".fontsize("red"); +ok(tmp === "", "''.fontsize('red') = " + tmp); +tmp = "test".fontsize(); +ok(tmp === "test", "'test'.fontsize() = " + tmp); +tmp = "test".fontsize(3); +ok(tmp === "test", "'test'.fontsize(3) = " + tmp); +tmp = "test".fontsize("green"); +ok(tmp === "test", "'test'.fontsize('green') = " + tmp); + +tmp = ("".fontcolor()).fontsize(); +ok(tmp === "", "(''.fontcolor()).fontsize() = " + tmp); + tmp = "".italics(); ok(tmp === "", "''.italics() = " + tmp); tmp = "".italics(3);

1 0

Piotr Caban : jscript: Added String_link implementation.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 3412e22eeea077782b9ea2c31a5834725b67d569 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3412e22eeea077782b9ea2c31… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 9 20:09:32 2009 +0200 jscript: Added String_link implementation. --- dlls/jscript/string.c | 6 ++++-- dlls/jscript/tests/api.js | 13 +++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 4777f18..70ec50b 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -486,8 +486,10 @@ static HRESULT String_lastIndexOf(DispatchEx *dispex, LCID lcid, WORD flags, DIS static HRESULT String_link(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR fontW[] = {'A',0}; + static const WCHAR colorW[] = {'H','R','E','F',0}; + + return do_attribute_tag_format(dispex, lcid, flags, dp, retv, ei, sp, fontW, colorW); } /* ECMA-262 3rd Edition 15.5.4.10 */ diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 66d1280..22b5317 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -356,6 +356,19 @@ ok(tmp === "test", "'test'.italics() = " + tmp); tmp = "test".italics(3); ok(tmp === "test", "'test'.italics(3) = " + tmp); +tmp = "".link(); +ok(tmp === "<A HREF=\"undefined\"></A>", "''.link() = " + tmp); +tmp = "".link(3); +ok(tmp === "<A HREF=\"3\"></A>", "''.link(3) = " + tmp); +tmp = "".link("red"); +ok(tmp === "<A HREF=\"red\"></A>", "''.link('red') = " + tmp); +tmp = "test".link(); +ok(tmp === "<A HREF=\"undefined\">test</A>", "'test'.link() = " + tmp); +tmp = "test".link(3); +ok(tmp === "<A HREF=\"3\">test</A>", "'test'.link(3) = " + tmp); +tmp = "test".link("green"); +ok(tmp === "<A HREF=\"green\">test</A>", "'test'.link('green') = " + tmp); + tmp = "".small(); ok(tmp === "", "''.small() = " + tmp); tmp = "".small(3);

1 0

Piotr Caban : jscript: Added String_anchor implementation.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: ecfa129d669c2e77f33719f2905ae885151de6d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecfa129d669c2e77f33719f29… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 9 20:09:20 2009 +0200 jscript: Added String_anchor implementation. --- dlls/jscript/string.c | 6 ++++-- dlls/jscript/tests/api.js | 13 +++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index efdff17..4777f18 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -201,8 +201,10 @@ static HRESULT do_attribute_tag_format(DispatchEx *dispex, LCID lcid, WORD flags static HRESULT String_anchor(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { - FIXME("\n"); - return E_NOTIMPL; + static const WCHAR fontW[] = {'A',0}; + static const WCHAR colorW[] = {'N','A','M','E',0}; + + return do_attribute_tag_format(dispex, lcid, flags, dp, retv, ei, sp, fontW, colorW); } static HRESULT String_big(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index fe20939..66d1280 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -269,6 +269,19 @@ ok(tmp === "TEST", "''.toUpperCase() = " + tmp); tmp = "tEsT".toUpperCase(3); ok(tmp === "TEST", "''.toUpperCase(3) = " + tmp); +tmp = "".anchor(); +ok(tmp === "<A NAME=\"undefined\"></A>", "''.anchor() = " + tmp); +tmp = "".anchor(3); +ok(tmp === "<A NAME=\"3\"></A>", "''.anchor(3) = " + tmp); +tmp = "".anchor("red"); +ok(tmp === "<A NAME=\"red\"></A>", "''.anchor('red') = " + tmp); +tmp = "test".anchor(); +ok(tmp === "<A NAME=\"undefined\">test</A>", "'test'.anchor() = " + tmp); +tmp = "test".anchor(3); +ok(tmp === "<A NAME=\"3\">test</A>", "'test'.anchor(3) = " + tmp); +tmp = "test".anchor("green"); +ok(tmp === "<A NAME=\"green\">test</A>", "'test'.anchor('green') = " + tmp); + tmp = "".big(); ok(tmp === "<BIG></BIG>", "''.big() = " + tmp); tmp = "".big(3);

1 0

Juan Lang : wininet: Support IPv6 addresses in HTTP_ResolveName and HTTP_OpenConnection.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 481c9b895d4d9ce92e5db4da25317d885dd5b0a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=481c9b895d4d9ce92e5db4da2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 9 11:42:25 2009 -0700 wininet: Support IPv6 addresses in HTTP_ResolveName and HTTP_OpenConnection. --- dlls/wininet/http.c | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 9573f6f..5832a5c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1448,9 +1448,13 @@ static BOOL HTTP_DealWithProxy( LPWININETAPPINFOW hIC, return TRUE; } +#ifndef INET6_ADDRSTRLEN +#define INET6_ADDRSTRLEN 46 +#endif + static BOOL HTTP_ResolveName(LPWININETHTTPREQW lpwhr) { - char szaddr[32]; + char szaddr[INET6_ADDRSTRLEN]; LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; const void *addr; @@ -1472,6 +1476,9 @@ static BOOL HTTP_ResolveName(LPWININETHTTPREQW lpwhr) case AF_INET: addr = &((struct sockaddr_in *)&lpwhs->socketAddress)->sin_addr; break; + case AF_INET6: + addr = &((struct sockaddr_in6 *)&lpwhs->socketAddress)->sin6_addr; + break; default: WARN("unsupported family %d\n", lpwhs->socketAddress.ss_family); INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED); @@ -4117,7 +4124,7 @@ static BOOL HTTP_OpenConnection(LPWININETHTTPREQW lpwhr) BOOL bSuccess = FALSE; LPWININETHTTPSESSIONW lpwhs; LPWININETAPPINFOW hIC = NULL; - char szaddr[32]; + char szaddr[INET6_ADDRSTRLEN]; const void *addr; TRACE("-->\n"); @@ -4144,6 +4151,9 @@ static BOOL HTTP_OpenConnection(LPWININETHTTPREQW lpwhr) case AF_INET: addr = &((struct sockaddr_in *)&lpwhs->socketAddress)->sin_addr; break; + case AF_INET6: + addr = &((struct sockaddr_in6 *)&lpwhs->socketAddress)->sin6_addr; + break; default: WARN("unsupported family %d\n", lpwhs->socketAddress.ss_family); INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED);

1 0

Juan Lang : wininet: Use struct sockaddr_storage in InternetCheckConnectionW.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 33d09e736418ba505911fa6e2e52f5108ff4830d URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d09e736418ba505911fa6e2… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 9 10:58:15 2009 -0700 wininet: Use struct sockaddr_storage in InternetCheckConnectionW. --- dlls/wininet/internet.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index b1def60..ed6a70f 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2749,16 +2749,16 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe if (dwFlags & FLAG_ICC_FORCE_CONNECTION) { - struct sockaddr_in sin; - socklen_t sa_len = sizeof(sin); + struct sockaddr_storage saddr; + socklen_t sa_len = sizeof(saddr); int fd; - if (!GetAddress(hostW, port, (struct sockaddr *)&sin, &sa_len)) + if (!GetAddress(hostW, port, (struct sockaddr *)&saddr, &sa_len)) goto End; - fd = socket(sin.sin_family, SOCK_STREAM, 0); + fd = socket(saddr.ss_family, SOCK_STREAM, 0); if (fd != -1) { - if (connect(fd, (struct sockaddr *)&sin, sa_len) == 0) + if (connect(fd, (struct sockaddr *)&saddr, sa_len) == 0) rc = TRUE; close(fd); }

1 0

Juan Lang : wininet: Use length reported by GetAddress in FTP_Connect.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: deabdca653b6f1c27da1addea0ef2184a682a6c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=deabdca653b6f1c27da1addea… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 9 11:01:44 2009 -0700 wininet: Use length reported by GetAddress in FTP_Connect. --- dlls/wininet/ftp.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 791459e..75bf69c 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2458,9 +2458,9 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, } SendAsyncCallback(&hIC->hdr, dwContext, INTERNET_STATUS_CONNECTING_TO_SERVER, - &socketAddr, sizeof(struct sockaddr_in)); + &socketAddr, sock_namelen); - if (connect(nsocket, (struct sockaddr *)&socketAddr, sizeof(socketAddr)) < 0) + if (connect(nsocket, (struct sockaddr *)&socketAddr, sock_namelen) < 0) { ERR("Unable to connect (%s)\n", strerror(errno)); INTERNET_SetLastError(ERROR_INTERNET_CANNOT_CONNECT); @@ -2471,7 +2471,7 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, TRACE("Connected to server\n"); lpwfs->sndSocket = nsocket; SendAsyncCallback(&hIC->hdr, dwContext, INTERNET_STATUS_CONNECTED_TO_SERVER, - &socketAddr, sizeof(struct sockaddr_in)); + &socketAddr, sock_namelen); sock_namelen = sizeof(lpwfs->socketAddress); getsockname(nsocket, (struct sockaddr *) &lpwfs->socketAddress, &sock_namelen);

1 0

Juan Lang : wininet: Use address length returned by GetAddress in NETCON_connect.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: c572e1c99a49ed501e8f1618e945effb319d3ea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c572e1c99a49ed501e8f1618e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 9 11:30:59 2009 -0700 wininet: Use address length returned by GetAddress in NETCON_connect. --- dlls/wininet/http.c | 7 +++---- dlls/wininet/internet.h | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 4ff4be7..f7df3a9 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1452,16 +1452,15 @@ static BOOL HTTP_ResolveName(LPWININETHTTPREQW lpwhr) { char szaddr[32]; LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; - socklen_t sa_len; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RESOLVING_NAME, lpwhs->lpszServerName, strlenW(lpwhs->lpszServerName)+1); - sa_len = sizeof(lpwhs->socketAddress); + lpwhs->sa_len = sizeof(lpwhs->socketAddress); if (!GetAddress(lpwhs->lpszServerName, lpwhs->nServerPort, - (struct sockaddr *)&lpwhs->socketAddress, &sa_len)) + (struct sockaddr *)&lpwhs->socketAddress, &lpwhs->sa_len)) { INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED); return FALSE; @@ -4144,7 +4143,7 @@ static BOOL HTTP_OpenConnection(LPWININETHTTPREQW lpwhr) } if (!NETCON_connect(&lpwhr->netConnection, (struct sockaddr *)&lpwhs->socketAddress, - sizeof(lpwhs->socketAddress))) + lpwhs->sa_len)) goto lend; if (lpwhr->hdr.dwFlags & INTERNET_FLAG_SECURE) diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index 53e9715..eae3423 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -166,6 +166,7 @@ typedef struct INTERNET_PORT nHostPort; /* the final destination port of the request */ INTERNET_PORT nServerPort; /* the port of the server we directly connect to */ struct sockaddr_in socketAddress; + socklen_t sa_len; } WININETHTTPSESSIONW, *LPWININETHTTPSESSIONW; #define HDR_ISREQUEST 0x0001

1 0

Juan Lang : wininet: Convert WININETSESSIONW' s socketAddress to a struct sockaddr_storage.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 058e918da5a520d6fd08674cea57302550e0cf05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=058e918da5a520d6fd08674ce… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 9 11:36:00 2009 -0700 wininet: Convert WININETSESSIONW's socketAddress to a struct sockaddr_storage. --- dlls/wininet/http.c | 30 +++++++++++++++++++++++++----- dlls/wininet/internet.h | 2 +- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index f7df3a9..9573f6f 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1452,6 +1452,7 @@ static BOOL HTTP_ResolveName(LPWININETHTTPREQW lpwhr) { char szaddr[32]; LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; + const void *addr; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RESOLVING_NAME, @@ -1466,8 +1467,17 @@ static BOOL HTTP_ResolveName(LPWININETHTTPREQW lpwhr) return FALSE; } - inet_ntop(lpwhs->socketAddress.sin_family, &lpwhs->socketAddress.sin_addr, - szaddr, sizeof(szaddr)); + switch (lpwhs->socketAddress.ss_family) + { + case AF_INET: + addr = &((struct sockaddr_in *)&lpwhs->socketAddress)->sin_addr; + break; + default: + WARN("unsupported family %d\n", lpwhs->socketAddress.ss_family); + INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED); + return FALSE; + } + inet_ntop(lpwhs->socketAddress.ss_family, addr, szaddr, sizeof(szaddr)); INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_NAME_RESOLVED, szaddr, strlen(szaddr)+1); @@ -4108,6 +4118,7 @@ static BOOL HTTP_OpenConnection(LPWININETHTTPREQW lpwhr) LPWININETHTTPSESSIONW lpwhs; LPWININETAPPINFOW hIC = NULL; char szaddr[32]; + const void *addr; TRACE("-->\n"); @@ -4128,14 +4139,23 @@ static BOOL HTTP_OpenConnection(LPWININETHTTPREQW lpwhr) lpwhs = lpwhr->lpHttpSession; hIC = lpwhs->lpAppInfo; - inet_ntop(lpwhs->socketAddress.sin_family, &lpwhs->socketAddress.sin_addr, - szaddr, sizeof(szaddr)); + switch (lpwhs->socketAddress.ss_family) + { + case AF_INET: + addr = &((struct sockaddr_in *)&lpwhs->socketAddress)->sin_addr; + break; + default: + WARN("unsupported family %d\n", lpwhs->socketAddress.ss_family); + INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED); + return FALSE; + } + inet_ntop(lpwhs->socketAddress.ss_family, addr, szaddr, sizeof(szaddr)); INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_CONNECTING_TO_SERVER, szaddr, strlen(szaddr)+1); - if (!NETCON_create(&lpwhr->netConnection, lpwhs->socketAddress.sin_family, + if (!NETCON_create(&lpwhr->netConnection, lpwhs->socketAddress.ss_family, SOCK_STREAM, 0)) { WARN("Socket creation failed: %u\n", INTERNET_GetLastError()); diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index eae3423..4cd22d6 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -165,7 +165,7 @@ typedef struct LPWSTR lpszPassword; INTERNET_PORT nHostPort; /* the final destination port of the request */ INTERNET_PORT nServerPort; /* the port of the server we directly connect to */ - struct sockaddr_in socketAddress; + struct sockaddr_storage socketAddress; socklen_t sa_len; } WININETHTTPSESSIONW, *LPWININETHTTPSESSIONW;

1 0

Juan Lang : wininet: Use sizeof(member) rather than sizeof(type) for address lengths.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 9f82d9c779b2da0e20f3bce9280a7ca1cdcfbef8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f82d9c779b2da0e20f3bce92… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 9 11:04:33 2009 -0700 wininet: Use sizeof(member) rather than sizeof(type) for address lengths. --- dlls/wininet/ftp.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index 75bf69c..6d41ac5 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2807,7 +2807,7 @@ lend: static BOOL FTP_InitListenSocket(LPWININETFTPSESSIONW lpwfs) { BOOL bSuccess = FALSE; - socklen_t namelen = sizeof(struct sockaddr_in); + socklen_t namelen = sizeof(lpwfs->lstnSocketAddress); TRACE("\n"); @@ -2824,7 +2824,7 @@ static BOOL FTP_InitListenSocket(LPWININETFTPSESSIONW lpwfs) /* and get the system to assign us a port */ lpwfs->lstnSocketAddress.sin_port = htons(0); - if (bind(lpwfs->lstnSocket,(struct sockaddr *) &lpwfs->lstnSocketAddress, sizeof(struct sockaddr_in)) == -1) + if (bind(lpwfs->lstnSocket,(struct sockaddr *) &lpwfs->lstnSocketAddress, sizeof(lpwfs->lstnSocketAddress)) == -1) { TRACE("Unable to bind socket\n"); goto lend;

1 0

Henri Verbeet : wined3d: Remove GetGlDesc() from the public IWineD3DSurface interface.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 038d939941d164f77b4a68aad926048bfca7e29d URL: http://source.winehq.org/git/wine.git/?a=commit;h=038d939941d164f77b4a68aad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 10 10:20:12 2009 +0200 wined3d: Remove GetGlDesc() from the public IWineD3DSurface interface. --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/surface.c | 8 -------- dlls/wined3d/surface_gdi.c | 7 ------- include/wine/wined3d.idl | 3 --- 4 files changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 2962d6d..27de1b3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5746,7 +5746,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, WINED3DPOOL srcPool, destPool; int offset = 0; int rowoffset = 0; /* how many bytes to add onto the end of a row to wraparound to the beginning of the next */ - glDescriptor *glDescription = NULL; + glDescriptor *glDescription; const struct GlPixelFormatDesc *src_format_desc, *dst_format_desc; GLenum dummy; int sampler; @@ -5807,7 +5807,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, surface_internal_preload(pDestinationSurface, SRGB_RGB); IWineD3DSurface_BindTexture(pDestinationSurface, FALSE); - IWineD3DSurface_GetGlDesc(pDestinationSurface, &glDescription); + glDescription = &((IWineD3DSurfaceImpl *)pDestinationSurface)->glDescription; src_format_desc = ((IWineD3DSurfaceImpl *)pSrcSurface)->resource.format_desc; dst_format_desc = ((IWineD3DSurfaceImpl *)pDestinationSurface)->resource.format_desc; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 6909627..9328e82 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -914,13 +914,6 @@ static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { IWineD3DSurface IWineD3DSurface parts follow ****************************************************** */ -static void WINAPI IWineD3DSurfaceImpl_GetGlDesc(IWineD3DSurface *iface, glDescriptor **glDescription) -{ - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - TRACE("(%p) : returning %p\n", This, &This->glDescription); - *glDescription = &This->glDescription; -} - /* Read the framebuffer back into the surface */ static void read_from_framebuffer(IWineD3DSurfaceImpl *This, CONST RECT *rect, void *dest, UINT pitch) { IWineD3DSwapChainImpl *swapchain; @@ -5082,7 +5075,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DSurfaceImpl_BindTexture, IWineD3DSurfaceImpl_SaveSnapshot, IWineD3DSurfaceImpl_SetContainer, - IWineD3DSurfaceImpl_GetGlDesc, IWineD3DBaseSurfaceImpl_GetData, IWineD3DSurfaceImpl_SetFormat, IWineD3DSurfaceImpl_PrivateSetup, diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 9e1a5de..39f00cc 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -547,12 +547,6 @@ IWineGDISurfaceImpl_PrivateSetup(IWineD3DSurface *iface) return WINED3D_OK; } -static void WINAPI IWineGDISurfaceImpl_GetGlDesc(IWineD3DSurface *iface, glDescriptor **glDescription) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - FIXME("(%p) : Should not be called on a GDI surface\n", This); - *glDescription = NULL; -} - static HRESULT WINAPI IWineGDISurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; @@ -682,7 +676,6 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineD3DBaseSurfaceImpl_BindTexture, IWineGDISurfaceImpl_SaveSnapshot, IWineD3DBaseSurfaceImpl_SetContainer, - IWineGDISurfaceImpl_GetGlDesc, IWineD3DBaseSurfaceImpl_GetData, IWineD3DBaseSurfaceImpl_SetFormat, IWineGDISurfaceImpl_PrivateSetup, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 0f51b8e..3cc9d2c 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2532,9 +2532,6 @@ interface IWineD3DSurface : IWineD3DResource HRESULT SetContainer( [in] IWineD3DBase *container ); - void GetGlDesc( - [out] glDescriptor **desc - ); const void *GetData( ); HRESULT SetFormat(

1 0

Juan Lang : wininet: Fix tests when running behind a proxy server.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 9fd8462add1e40abfc727cea9f6efb7a2a8ec768 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fd8462add1e40abfc727cea9… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 9 10:19:00 2009 -0700 wininet: Fix tests when running behind a proxy server. --- dlls/wininet/tests/http.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index bf6ca02..b11cb2c 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1788,7 +1788,12 @@ static void test_proxy_indirect(int port) sz = sizeof buffer; r = HttpQueryInfo(hr, HTTP_QUERY_PROXY_AUTHENTICATE, buffer, &sz, NULL); - ok(r, "HttpQueryInfo failed\n"); + ok(r || GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "HttpQueryInfo failed: %d\n", GetLastError()); + if (!r) + { + skip("missing proxy header, not testing remaining proxy headers\n"); + goto out; + } ok(!strcmp(buffer, "Basic realm=\"placebo\""), "proxy auth info wrong\n"); sz = sizeof buffer; @@ -1821,6 +1826,7 @@ static void test_proxy_indirect(int port) ok(GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, "HttpQueryInfo should fail\n"); ok(r == FALSE, "HttpQueryInfo failed\n"); +out: InternetCloseHandle(hr); InternetCloseHandle(hc); InternetCloseHandle(hi);

1 0

Michael Stefaniuc : wrc: Reset the language before processing multiple rc files.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: d67a9d92eabb116a23a1c1b4dae72eee84bffbd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d67a9d92eabb116a23a1c1b4d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 10 11:48:34 2009 +0200 wrc: Reset the language before processing multiple rc files. --- tools/wrc/wrc.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/wrc/wrc.c b/tools/wrc/wrc.c index 61a3734..6a856eb 100644 --- a/tools/wrc/wrc.c +++ b/tools/wrc/wrc.c @@ -132,6 +132,7 @@ int extensions = 1; /* * Language setting for resources (-l option) */ +static language_t *defaultlanguage; language_t *currentlanguage = NULL; /* @@ -289,6 +290,9 @@ static int load_file( const char *input_name, const char *output_name ) input_name = temp_name; } + /* Reset the language */ + currentlanguage = dup_language( defaultlanguage ); + /* Go from .rc to .res */ chat("Starting parse\n"); @@ -302,6 +306,7 @@ static int load_file( const char *input_name, const char *output_name ) unlink( temp_name ); temp_name = NULL; } + free( currentlanguage ); return ret; } @@ -429,7 +434,7 @@ int main(int argc,char *argv[]) lan = strtol(optarg, NULL, 0); if (get_language_codepage(PRIMARYLANGID(lan), SUBLANGID(lan)) == -1) error("Language %04x is not supported\n", lan); - currentlanguage = new_language(PRIMARYLANGID(lan), SUBLANGID(lan)); + defaultlanguage = new_language(PRIMARYLANGID(lan), SUBLANGID(lan)); } break; case 'f': @@ -492,8 +497,8 @@ int main(int argc,char *argv[]) (debuglevel & DEBUGLEVEL_PPMSG) != 0 ); /* Check if the user set a language, else set default */ - if(!currentlanguage) - currentlanguage = new_language(0, 0); + if(!defaultlanguage) + defaultlanguage = new_language(0, 0); atexit(cleanup_files);

1 0

Juan Lang : wininet: Simplify GetAddress when using getaddrinfo.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: f0dde6b673905f2229ca09c9e153ac879b614c6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0dde6b673905f2229ca09c9e… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 9 10:55:18 2009 -0700 wininet: Simplify GetAddress when using getaddrinfo. --- dlls/wininet/utility.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 2c443bf..e2eee46 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -187,17 +187,21 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, TRACE("failed to get address of %s (%s)\n", debugstr_w(lpszServerName), gai_strerror(ret)); return FALSE; } - if (*sa_len < sizeof(struct sockaddr_in)) + if (*sa_len < res->ai_addrlen) { WARN("address too small\n"); freeaddrinfo( res ); return FALSE; } - *sa_len = sizeof(struct sockaddr_in); - memset( psa, 0, sizeof(struct sockaddr_in) ); - memcpy( &((struct sockaddr_in *)psa)->sin_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, sizeof(struct in_addr) ); - ((struct sockaddr_in *)psa)->sin_family = res->ai_family; - ((struct sockaddr_in *)psa)->sin_port = htons(nServerPort); + *sa_len = res->ai_addrlen; + memcpy( psa, res->ai_addr, res->ai_addrlen ); + /* Copy port */ + switch (res->ai_family) + { + case AF_INET: + ((struct sockaddr_in *)psa)->sin_port = htons(nServerPort); + break; + } freeaddrinfo( res ); #else

1 0

Henri Verbeet : d3d9/tests: Use color_match() in a few more places.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 3115f3357fd9533b1ccc0dd02ac3b2e996636c4a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3115f3357fd9533b1ccc0dd02… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 10 10:20:15 2009 +0200 d3d9/tests: Use color_match() in a few more places. --- dlls/d3d9/tests/visual.c | 33 ++++++++++++++++----------------- 1 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index cd362f0..2a86be8 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3004,7 +3004,7 @@ static void g16r16_texture_test(IDirect3DDevice9 *device) IDirect3DTexture9 *texture = NULL; D3DLOCKED_RECT lr; DWORD *data; - DWORD color, red, green, blue; + DWORD color; float quad[] = { -1.0, -1.0, 0.1, 0.0, 0.0, -1.0, 1.0, 0.1, 0.0, 1.0, @@ -3058,11 +3058,8 @@ static void g16r16_texture_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); color = getPixelColor(device, 240, 320); - red = (color & 0x00ff0000) >> 16; - green = (color & 0x0000ff00) >> 8; - blue = (color & 0x000000ff) >> 0; - ok(blue == 0xff && red >= 0xef && red <= 0xf1 && green >= 0x0e && green <= 0x10, - "D3DFMT_G16R16 with value 0x00ffff00 has color %08x, expected 0x00F00FFF\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xf0, 0x0f, 0xff), 1), + "D3DFMT_G16R16 with value 0x00ffff00 has color %08x, expected 0x00f00fff\n", color); out: if(texture) IDirect3DTexture9_Release(texture); @@ -4163,7 +4160,7 @@ static void x8l8v8u8_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); color = getPixelColor(device, 578, 430); - ok(color == 0x008262ca || color == 0x008363ca || color == 0x008362ca, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x82, 0x62, 0xca), 1), "D3DFMT_X8L8V8U8 = 0x112131ca returns color %08x, expected 0x008262ca\n", color); hr = IDirect3DDevice9_SetPixelShader(device, shader2); @@ -4435,19 +4432,19 @@ static void test_constant_clamp_vs(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexDeclaration returned %08x\n", hr); color = getPixelColor(device, 160, 360); - ok(color == 0x00bfbf80 || color == 0x00bfbf7f || color == 0x00bfbf81, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xbf, 0xbf, 0x80), 1), "quad 1 has color %08x, expected 0x00bfbf80\n", color); color = getPixelColor(device, 480, 360); - ok(color == 0x00bfbf80 || color == 0x00bfbf7f || color == 0x00bfbf81, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xbf, 0xbf, 0x80), 1), "quad 2 has color %08x, expected 0x00bfbf80\n", color); if(shader_20) { color = getPixelColor(device, 160, 120); - ok(color == 0x00bfbf80 || color == 0x00bfbf7f || color == 0x00bfbf81, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xbf, 0xbf, 0x80), 1), "quad 3 has color %08x, expected 0x00bfbf80\n", color); } if(shader_20_2) { color = getPixelColor(device, 480, 120); - ok(color == 0x00bfbf80 || color == 0x00bfbf7f || color == 0x00bfbf81, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xbf, 0xbf, 0x80), 1), "quad 4 has color %08x, expected 0x00bfbf80\n", color); } @@ -4578,17 +4575,17 @@ static void constant_clamp_ps_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader returned %08x\n", hr); color = getPixelColor(device, 160, 360); - ok(color == 0x00808000 || color == 0x007f7f00 || color == 0x00818100, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x80, 0x80, 0x00), 1), "quad 1 has color %08x, expected 0x00808000\n", color); color = getPixelColor(device, 480, 360); - ok(color == 0x00808000 || color == 0x007f7f00 || color == 0x00818100, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x80, 0x80, 0x00), 1), "quad 2 has color %08x, expected 0x00808000\n", color); color = getPixelColor(device, 480, 120); - ok(color == 0x00808000 || color == 0x007f7f00 || color == 0x00818100, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x80, 0x80, 0x00), 1), "quad 3 has color %08x, expected 0x00808000\n", color); if(shader_20) { color = getPixelColor(device, 160, 120); - ok(color == 0x00bfbf80 || color == 0x00bfbf7f || color == 0x00bfbf81, + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0xbf, 0xbf, 0x80), 1), "quad 4 has color %08x, expected 0x00bfbf80\n", color); } @@ -4680,7 +4677,8 @@ static void dp2add_ps_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); color = getPixelColor(device, 360, 240); - ok(color == 0x007f7f7f || color == 0x00808080, "dp2add pixel has color %08x, expected ~0x007f7f7f\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x7f, 0x7f, 0x7f), 1), + "dp2add pixel has color %08x, expected ~0x007f7f7f\n", color); IDirect3DPixelShader9_Release(shader_dp2add); } else { @@ -4706,7 +4704,8 @@ static void dp2add_ps_test(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); color = getPixelColor(device, 360, 240); - ok(color == 0x007f7f7f || color == 0x00808080, "dp2add pixel has color %08x, expected ~0x007f7f7f\n", color); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x7f, 0x7f, 0x7f), 1), + "dp2add pixel has color %08x, expected ~0x007f7f7f\n", color); IDirect3DPixelShader9_Release(shader_dp2add_sat); } else {

1 0

Henri Verbeet : wined3d: Take geometry shaders into account in shader_glsl_load_constantsB().
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 38cb9d02b10a8e69e0696b399f13aa2dd91d11a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38cb9d02b10a8e69e0696b399… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 10 10:20:14 2009 +0200 wined3d: Take geometry shaders into account in shader_glsl_load_constantsB(). --- dlls/wined3d/glsl_shader.c | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7402a79..83511aa 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -502,10 +502,30 @@ static void shader_glsl_load_constantsB(IWineD3DBaseShaderImpl *This, const Wine GLint tmp_loc; unsigned int i; char tmp_name[8]; - char is_pshader = shader_is_pshader_version(This->baseShader.reg_maps.shader_version.type); - const char* prefix = is_pshader? "PB":"VB"; + const char *prefix; struct list* ptr; + switch (This->baseShader.reg_maps.shader_version.type) + { + case WINED3D_SHADER_TYPE_VERTEX: + prefix = "VB"; + break; + + case WINED3D_SHADER_TYPE_GEOMETRY: + prefix = "GB"; + break; + + case WINED3D_SHADER_TYPE_PIXEL: + prefix = "PB"; + break; + + default: + FIXME("Unknown shader type %#x.\n", + This->baseShader.reg_maps.shader_version.type); + prefix = "UB"; + break; + } + /* TODO: Benchmark and see if it would be beneficial to store the * locations of the constants to avoid looking up each time */ for (i = 0; constants_set; constants_set >>= 1, ++i)

1 0

Henri Verbeet : wined3d: Get rid of struct glDescriptor.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 69b76122655d58a99f726a1558621cc4dede2032 URL: http://source.winehq.org/git/wine.git/?a=commit;h=69b76122655d58a99f726a155… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 10 10:20:13 2009 +0200 wined3d: Get rid of struct glDescriptor. In general it might not be a bad idea to group GL specific data into a separate struct, but IWineD3DSurfaceImpl is currently the only thing that bothers. It doesn't get it quite right either, since e.g. the PBO isn't in glDescriptor either. --- dlls/wined3d/context.c | 19 ++-- dlls/wined3d/device.c | 24 ++--- dlls/wined3d/surface.c | 228 +++++++++++++++++++--------------------- dlls/wined3d/surface_gdi.c | 3 +- dlls/wined3d/swapchain.c | 6 +- dlls/wined3d/utils.c | 3 +- dlls/wined3d/wined3d_private.h | 6 +- include/wine/wined3d.idl | 7 -- 8 files changed, 142 insertions(+), 154 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=69b76122655d58a99f726…

1 0

Juan Lang : wininet: Change type of GetAddress from struct sockaddr_in * to struct sockaddr *.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 44bf025767f94e4335cd642747dabf293172977a URL: http://source.winehq.org/git/wine.git/?a=commit;h=44bf025767f94e4335cd64274… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Jul 9 10:53:08 2009 -0700 wininet: Change type of GetAddress from struct sockaddr_in * to struct sockaddr *. --- dlls/wininet/ftp.c | 4 +++- dlls/wininet/http.c | 4 +++- dlls/wininet/internet.c | 5 +++-- dlls/wininet/internet.h | 2 +- dlls/wininet/utility.c | 31 +++++++++++++++++++++++-------- 5 files changed, 33 insertions(+), 13 deletions(-) diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index ebb6d39..791459e 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -2439,7 +2439,9 @@ HINTERNET FTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, SendAsyncCallback(&hIC->hdr, dwContext, INTERNET_STATUS_RESOLVING_NAME, (LPWSTR) lpszServerName, strlenW(lpszServerName)); - if (!GetAddress(lpszServerName, nServerPort, &socketAddr)) + sock_namelen = sizeof(socketAddr); + if (!GetAddress(lpszServerName, nServerPort, + (struct sockaddr *)&socketAddr, &sock_namelen)) { INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED); goto lerror; diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 1b8d585..4ff4be7 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -1452,14 +1452,16 @@ static BOOL HTTP_ResolveName(LPWININETHTTPREQW lpwhr) { char szaddr[32]; LPWININETHTTPSESSIONW lpwhs = lpwhr->lpHttpSession; + socklen_t sa_len; INTERNET_SendCallback(&lpwhr->hdr, lpwhr->hdr.dwContext, INTERNET_STATUS_RESOLVING_NAME, lpwhs->lpszServerName, strlenW(lpwhs->lpszServerName)+1); + sa_len = sizeof(lpwhs->socketAddress); if (!GetAddress(lpwhs->lpszServerName, lpwhs->nServerPort, - &lpwhs->socketAddress)) + (struct sockaddr *)&lpwhs->socketAddress, &sa_len)) { INTERNET_SetLastError(ERROR_INTERNET_NAME_NOT_RESOLVED); return FALSE; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 3d87a73..b1def60 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2750,14 +2750,15 @@ BOOL WINAPI InternetCheckConnectionW( LPCWSTR lpszUrl, DWORD dwFlags, DWORD dwRe if (dwFlags & FLAG_ICC_FORCE_CONNECTION) { struct sockaddr_in sin; + socklen_t sa_len = sizeof(sin); int fd; - if (!GetAddress(hostW, port, &sin)) + if (!GetAddress(hostW, port, (struct sockaddr *)&sin, &sa_len)) goto End; fd = socket(sin.sin_family, SOCK_STREAM, 0); if (fd != -1) { - if (connect(fd, (struct sockaddr *)&sin, sizeof(sin)) == 0) + if (connect(fd, (struct sockaddr *)&sin, sa_len) == 0) rc = TRUE; close(fd); } diff --git a/dlls/wininet/internet.h b/dlls/wininet/internet.h index e01e8de..53e9715 100644 --- a/dlls/wininet/internet.h +++ b/dlls/wininet/internet.h @@ -381,7 +381,7 @@ HINTERNET HTTP_Connect(LPWININETAPPINFOW hIC, LPCWSTR lpszServerName, DWORD dwInternalFlags); BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, - struct sockaddr_in *psa); + struct sockaddr *psa, socklen_t *sa_len); void INTERNET_SetLastError(DWORD dwError); DWORD INTERNET_GetLastError(void); diff --git a/dlls/wininet/utility.c b/dlls/wininet/utility.c index 5afdeb2..2c443bf 100644 --- a/dlls/wininet/utility.c +++ b/dlls/wininet/utility.c @@ -145,7 +145,7 @@ time_t ConvertTimeString(LPCWSTR asctime) BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, - struct sockaddr_in *psa) + struct sockaddr *psa, socklen_t *sa_len) { WCHAR *found; char *name; @@ -155,6 +155,7 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, int ret; #else struct hostent *phe; + struct sockaddr_in *sin = (struct sockaddr_in *)psa; #endif TRACE("%s\n", debugstr_w(lpszServerName)); @@ -186,10 +187,17 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, TRACE("failed to get address of %s (%s)\n", debugstr_w(lpszServerName), gai_strerror(ret)); return FALSE; } + if (*sa_len < sizeof(struct sockaddr_in)) + { + WARN("address too small\n"); + freeaddrinfo( res ); + return FALSE; + } + *sa_len = sizeof(struct sockaddr_in); memset( psa, 0, sizeof(struct sockaddr_in) ); - memcpy( &psa->sin_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, sizeof(struct in_addr) ); - psa->sin_family = res->ai_family; - psa->sin_port = htons(nServerPort); + memcpy( &((struct sockaddr_in *)psa)->sin_addr, &((struct sockaddr_in *)res->ai_addr)->sin_addr, sizeof(struct in_addr) ); + ((struct sockaddr_in *)psa)->sin_family = res->ai_family; + ((struct sockaddr_in *)psa)->sin_port = htons(nServerPort); freeaddrinfo( res ); #else @@ -203,10 +211,17 @@ BOOL GetAddress(LPCWSTR lpszServerName, INTERNET_PORT nServerPort, LeaveCriticalSection( &cs_gethostbyname ); return FALSE; } - memset(psa,0,sizeof(struct sockaddr_in)); - memcpy((char *)&psa->sin_addr, phe->h_addr, phe->h_length); - psa->sin_family = phe->h_addrtype; - psa->sin_port = htons(nServerPort); + if (*sa_len < sizeof(struct sockaddr_in)) + { + WARN("address too small\n"); + LeaveCriticalSection( &cs_gethostbyname ); + return FALSE; + } + *sa_len = sizeof(struct sockaddr_in); + memset(sin,0,sizeof(struct sockaddr_in)); + memcpy((char *)&sin->sin_addr, phe->h_addr, phe->h_length); + sin->sin_family = phe->h_addrtype; + sin->sin_port = htons(nServerPort); LeaveCriticalSection( &cs_gethostbyname ); #endif

1 0

Henri Verbeet : wined3d: Simplify the GLSL sRGB write code.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 60e0997c79cf9bd97a052377bf28870def7f943b URL: http://source.winehq.org/git/wine.git/?a=commit;h=60e0997c79cf9bd97a052377b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jul 10 10:20:11 2009 +0200 wined3d: Simplify the GLSL sRGB write code. --- dlls/wined3d/glsl_shader.c | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 82a5fb8..7402a79 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -891,11 +891,12 @@ static void shader_generate_glsl_declarations(IWineD3DBaseShader *iface, const s extra_constants_needed++; } - if(ps_args->srgb_correction) { - shader_addline(buffer, "const vec4 srgb_mul_low = vec4(%f, %f, %f, %f);\n", - srgb_mul_low, srgb_mul_low, srgb_mul_low, srgb_mul_low); - shader_addline(buffer, "const vec4 srgb_comparison = vec4(%f, %f, %f, %f);\n", - srgb_cmp, srgb_cmp, srgb_cmp, srgb_cmp); + if (ps_args->srgb_correction) + { + shader_addline(buffer, "const vec4 srgb_const0 = vec4(%.8e, %.8e, %.8e, %.8e);\n", + srgb_pow, srgb_mul_high, srgb_sub_high, srgb_mul_low); + shader_addline(buffer, "const vec4 srgb_const1 = vec4(%.8e, 0.0, 0.0, 0.0);\n", + srgb_cmp); } if(reg_maps->vpos || reg_maps->usesdsy) { if(This->baseShader.limits.constant_float + extra_constants_needed + 1 < GL_LIMITS(pshader_constantsF)) { @@ -3717,14 +3718,13 @@ static GLuint shader_glsl_generate_pshader(IWineD3DPixelShaderImpl *This, struct shader_addline(buffer, "gl_FragData[0] = R0;\n"); } - if(args->srgb_correction) { - shader_addline(buffer, "tmp0.xyz = pow(gl_FragData[0].xyz, vec3(%f, %f, %f)) * vec3(%f, %f, %f) - vec3(%f, %f, %f);\n", - srgb_pow, srgb_pow, srgb_pow, srgb_mul_high, srgb_mul_high, srgb_mul_high, - srgb_sub_high, srgb_sub_high, srgb_sub_high); - shader_addline(buffer, "tmp1.xyz = gl_FragData[0].xyz * srgb_mul_low.xyz;\n"); - shader_addline(buffer, "gl_FragData[0].x = gl_FragData[0].x < srgb_comparison.x ? tmp1.x : tmp0.x;\n"); - shader_addline(buffer, "gl_FragData[0].y = gl_FragData[0].y < srgb_comparison.y ? tmp1.y : tmp0.y;\n"); - shader_addline(buffer, "gl_FragData[0].z = gl_FragData[0].z < srgb_comparison.z ? tmp1.z : tmp0.z;\n"); + if (args->srgb_correction) + { + shader_addline(buffer, "tmp0.xyz = pow(gl_FragData[0].xyz, vec3(srgb_const0.x));\n"); + shader_addline(buffer, "tmp0.xyz = tmp0.xyz * vec3(srgb_const0.y) - vec3(srgb_const0.z);\n"); + shader_addline(buffer, "tmp1.xyz = gl_FragData[0].xyz * vec3(srgb_const0.w);\n"); + shader_addline(buffer, "bvec3 srgb_compare = lessThan(gl_FragData[0].xyz, vec3(srgb_const1.x));\n"); + shader_addline(buffer, "gl_FragData[0].xyz = mix(tmp0.xyz, tmp1.xyz, vec3(srgb_compare));\n"); shader_addline(buffer, "gl_FragData[0] = clamp(gl_FragData[0], 0.0, 1.0);\n"); } /* Pixel shader < 3.0 do not replace the fog stage.

1 0

Frédéric Delanoy : cryptdlg: Update French translation.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 5f0ca73208ac7241701bbebfef23ed05ef4681bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f0ca73208ac7241701bbebfe… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 10 08:36:25 2009 +0200 cryptdlg: Update French translation. --- dlls/cryptdlg/cryptdlg_Fr.rc | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/cryptdlg/cryptdlg_Fr.rc b/dlls/cryptdlg/cryptdlg_Fr.rc index f71be3a..25d8a64 100644 --- a/dlls/cryptdlg/cryptdlg_Fr.rc +++ b/dlls/cryptdlg/cryptdlg_Fr.rc @@ -1,7 +1,8 @@ /* * cryptdlg dll French resources * - * Copyright 2008 Jonathan Ernst + * Copyright 2008 Jonathan Ernst + * Copyright 2009 Frédéric Delanoy * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -20,19 +21,22 @@ #include "cryptres.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE DISCARDABLE { IDS_CERT_POLICY "Politique de certificat" IDS_POLICY_ID "Identifiant de politique : " - IDS_POLICY_QUALIFIER_INFO "Policy Qualifier Info" - IDS_POLICY_QUALIFIER_ID "Policy Qualifier Id=" - IDS_CPS "CPS" - IDS_USER_NOTICE "User Notice" - IDS_QUALIFIER "Qualifier" - IDS_NOTICE_REF "Notice Reference" - IDS_ORGANIZATION "Organisation=" - IDS_NOTICE_NUM "Notice Number=" - IDS_NOTICE_TEXT "Notice Text=" + IDS_POLICY_QUALIFIER_INFO "Informations sur le qualificateur de politique" + IDS_POLICY_QUALIFIER_ID "Id de qualificateur de politique =" + IDS_CPS "Énoncé des pratiques de certification (CPS)" + IDS_USER_NOTICE "Avis utilisateur" + IDS_QUALIFIER "Qualificateur" + IDS_NOTICE_REF "Référence à l'avis" + IDS_ORGANIZATION "Organisation =" + IDS_NOTICE_NUM "Numéro de l'avis =" + IDS_NOTICE_TEXT "Texte de l'avis =" }

1 0

Damjan Jovanovic : ws2_32: Test AcceptEx early disconnects and invalid parameters.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 26b0fad163dfbb643006e03777a20f6bcca28bfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=26b0fad163dfbb643006e0377… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jul 9 20:00:10 2009 +0200 ws2_32: Test AcceptEx early disconnects and invalid parameters. --- dlls/ws2_32/tests/sock.c | 53 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 52 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c90111d..acb2638 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2625,6 +2625,22 @@ static void test_AcceptEx(void) broken(WSAGetLastError() == WSAEFAULT)), /* NT4 */ "AcceptEx on NULL buffer returned %d + errno %d\n", bret, WSAGetLastError()); + bret = pAcceptEx(listener, acceptor, buffer, 0, 0, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small local address size " + "returned %d + errno %d\n", bret, WSAGetLastError()); + + bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, 0, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == WSAEINVAL, "AcceptEx on too small remote address size " + "returned %d + errno %d\n", bret, WSAGetLastError()); + + bret = pAcceptEx(listener, acceptor, buffer, 0, + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, NULL); + ok(bret == FALSE && WSAGetLastError() == ERROR_INVALID_PARAMETER, "AcceptEx on a NULL overlapped " + "returned %d + errno %d\n", bret, WSAGetLastError()); + bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); @@ -2689,13 +2705,48 @@ static void test_AcceptEx(void) iret = send(connector, buffer, 1, 0); ok(iret == 1, "could not send 1 byte: send %d errno %d\n", iret, WSAGetLastError()); - dwret = WaitForSingleObject(overlapped.hEvent, 0); + dwret = WaitForSingleObject(overlapped.hEvent, 1000); ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError()); ok(bytesReturned == 1, "bytesReturned isn't supposed to be %d\n", bytesReturned); + closesocket(connector); + connector = INVALID_SOCKET; + closesocket(acceptor); + acceptor = INVALID_SOCKET; + + /* Disconnect during receive? */ + + acceptor = socket(AF_INET, SOCK_STREAM, 0); + if (acceptor == INVALID_SOCKET) { + skip("could not create acceptor socket, error %d\n", WSAGetLastError()); + goto end; + } + connector = socket(AF_INET, SOCK_STREAM, 0); + if (connector == INVALID_SOCKET) { + skip("could not create connector socket, error %d\n", WSAGetLastError()); + goto end; + } + bret = pAcceptEx(listener, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), + sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, + &bytesReturned, &overlapped); + ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); + + iret = connect(connector, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); + ok(iret == 0, "connecting to accepting socket failed, error %d\n", WSAGetLastError()); + + closesocket(connector); + connector = INVALID_SOCKET; + + dwret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(dwret == WAIT_OBJECT_0, "Waiting for accept event failed with %d + errno %d\n", dwret, GetLastError()); + + bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); + ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError()); + ok(bytesReturned == 0, "bytesReturned isn't supposed to be %d\n", bytesReturned); + end: if (overlapped.hEvent) WSACloseEvent(overlapped.hEvent);

1 0

Detlef Riekenberg : urlmon/tests: Windows headers need _WIN32_IE for IInternetZoneManagerEx2.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: b32e6f0fd2e7d33f4a1edfad112c6a48c4eb1a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b32e6f0fd2e7d33f4a1edfad1… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Thu Jul 9 22:37:15 2009 +0200 urlmon/tests: Windows headers need _WIN32_IE for IInternetZoneManagerEx2. --- dlls/urlmon/tests/sec_mgr.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index a6fb6bb..c7774ec 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -21,6 +21,9 @@ #define CONST_VTABLE #define NONAMELESSUNION +/* needed for IInternetZoneManagerEx2 */ +#define _WIN32_IE 0x0700 + #include <wine/test.h> #include <stdarg.h> #include <stddef.h>

1 0

Nikolay Sivov : comctl32/header: Test item rectangles updating after reordering.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 67d2292b00c6fa743accfd7e80eb720ea082c8e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d2292b00c6fa743accfd7e8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 9 23:10:25 2009 +0400 comctl32/header: Test item rectangles updating after reordering. --- dlls/comctl32/tests/header.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 6bf0212..3268ccc 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -121,7 +121,6 @@ static const struct message deleteItem_getItemCount_seq[] = { }; static const struct message orderArray_seq[] = { - { HDM_GETITEMCOUNT, sent }, { HDM_SETORDERARRAY, sent|wparam, 2 }, { HDM_GETORDERARRAY, sent|wparam, 2 }, { 0 } @@ -1108,6 +1107,7 @@ static void test_hdm_index_messages(HWND hParent) static char thirdHeaderItem[] = "Type"; static char fourthHeaderItem[] = "Date Modified"; static char *items[] = {firstHeaderItem, secondHeaderItem, thirdHeaderItem, fourthHeaderItem}; + RECT rect; HDITEM hdItem; hdItem.mask = HDI_TEXT | HDI_WIDTH | HDI_FORMAT; hdItem.fmt = HDF_LEFT; @@ -1135,17 +1135,17 @@ static void test_hdm_index_messages(HWND hParent) retVal = SendMessage(hChild, HDM_DELETEITEM, 3, (LPARAM) &hdItem); ok(retVal == TRUE, "Deleting item 3 should return TRUE, got %d\n", retVal); - retVal = SendMessage(hChild, HDM_GETITEMCOUNT, 0, (LPARAM) &hdItem); + retVal = SendMessage(hChild, HDM_GETITEMCOUNT, 0, 0); ok(retVal == 3, "Getting item count should return 3, got %d\n", retVal); retVal = SendMessage(hChild, HDM_DELETEITEM, 3, (LPARAM) &hdItem); ok(retVal == FALSE, "Deleting already-deleted item should return FALSE, got %d\n", retVal); - retVal = SendMessage(hChild, HDM_GETITEMCOUNT, 0, (LPARAM) &hdItem); + retVal = SendMessage(hChild, HDM_GETITEMCOUNT, 0, 0); ok(retVal == 3, "Getting item count should return 3, got %d\n", retVal); retVal = SendMessage(hChild, HDM_DELETEITEM, 2, (LPARAM) &hdItem); ok(retVal == TRUE, "Deleting item 2 should return TRUE, got %d\n", retVal); - retVal = SendMessage(hChild, HDM_GETITEMCOUNT, 0, (LPARAM) &hdItem); + retVal = SendMessage(hChild, HDM_GETITEMCOUNT, 0, 0); ok(retVal == 2, "Getting item count should return 2, got %d\n", retVal); ok_sequence(sequences, HEADER_SEQ_INDEX, deleteItem_getItemCount_seq, @@ -1166,9 +1166,19 @@ static void test_hdm_index_messages(HWND hParent) expect(0, strcmpResult); expect(80, hdItem.cxy); + iSize = SendMessage(hChild, HDM_GETITEMCOUNT, 0, 0); + + /* item should be updated just after accepting new array */ + ShowWindow(hChild, SW_HIDE); + retVal = SendMessage(hChild, HDM_SETORDERARRAY, iSize, (LPARAM) lpiarray); + expect(TRUE, retVal); + rect.left = 0; + retVal = SendMessage(hChild, HDM_GETITEMRECT, 0, (LPARAM) &rect); + expect(TRUE, retVal); + todo_wine ok(rect.left != 0, "Expected updated rectangle\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); - iSize = SendMessage(hChild, HDM_GETITEMCOUNT, 0, (LPARAM) &hdItem); retVal = SendMessage(hChild, HDM_SETORDERARRAY, iSize, (LPARAM) lpiarray); ok(retVal == TRUE, "Setting header items order should return TRUE, got %d\n", retVal);

1 0

Paul Vriens : appwiz.cpl: Fix Dutch translations.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 223c07738f8b50dc13f714e75f9661d421bf7eae URL: http://source.winehq.org/git/wine.git/?a=commit;h=223c07738f8b50dc13f714e75… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jul 10 09:45:54 2009 +0200 appwiz.cpl: Fix Dutch translations. --- dlls/appwiz.cpl/Nl.rc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/appwiz.cpl/Nl.rc b/dlls/appwiz.cpl/Nl.rc index 49bf832..f29f97c 100644 --- a/dlls/appwiz.cpl/Nl.rc +++ b/dlls/appwiz.cpl/Nl.rc @@ -21,6 +21,8 @@ #include "res.h" +#pragma code_page(65001) + LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL STRINGTABLE @@ -47,9 +49,9 @@ FONT 8, "MS Shell Dlg" CONTROL "&Installeren...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 - CONTROL "De volgende software kan automatisch verwijderd worden. Om het programma te verwijderen of de geïnstalleerde onderdelen te wijzigen, selecteer het in de lijst en druk op Toevoegen/Verwijderen.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "De volgende software kan automatisch verwijderd worden. Om het programma te verwijderen of de geïnstalleerde onderdelen te wijzigen, selecteer het in de lijst en druk op Wijzigen/Verwijderen.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 - CONTROL "Toevoegen/&Verwijderen...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 198, 64, 14 + CONTROL "Wijzigen/&Verwijderen...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 198, 64, 14 CONTROL "&Support Informatie...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 176, 198, 64, 14 CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 }

1 0

Daniel Nylander : appwiz.cpl: Add Swedish translation.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: d07779252f31e487a0bb4b4e2665c4291ed8b24a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d07779252f31e487a0bb4b4e2… Author: Daniel Nylander <po(a)danielnylander.se> Date: Thu Jul 9 22:43:50 2009 +0200 appwiz.cpl: Add Swedish translation. --- dlls/appwiz.cpl/Makefile.in | 1 + dlls/appwiz.cpl/Sv.rc | 84 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/appwiz.cpl/Makefile.in b/dlls/appwiz.cpl/Makefile.in index daf75d8..b7ae32e 100644 --- a/dlls/appwiz.cpl/Makefile.in +++ b/dlls/appwiz.cpl/Makefile.in @@ -21,6 +21,7 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Si.rc \ + Sv.rc \ Zh.rc \ appwiz.rc diff --git a/dlls/appwiz.cpl/Sv.rc b/dlls/appwiz.cpl/Sv.rc new file mode 100644 index 0000000..da8bae2 --- /dev/null +++ b/dlls/appwiz.cpl/Sv.rc @@ -0,0 +1,84 @@ +/* +* Add/Remove Programs Swedish resources +* +* Copyright 2001-2002, 2008 Owen Rudge +* Copyright 2008 Daniel Nylander <po(a)danielnylander.se> +* +* 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 +* +*/ + +#include "res.h" + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_SWEDISH, SUBLANG_NEUTRAL + +STRINGTABLE +{ + IDS_CPL_TITLE, "Lägg till/Ta bort program" + IDS_CPL_DESC, "Låter dig installera ny programvara, eller ta bort befintlig programvara från din dator." + IDS_TAB1_TITLE, "Program" + + IDS_UNINSTALL_FAILED, "Kunde inte köra avinstalleraren, '%s'. Vill du ta bort avinstallationsobjektet för detta program från registret?" + IDS_NOT_SPECIFIED, "Inte angivet" + + IDS_COLUMN_NAME, "Namn" + IDS_COLUMN_PUBLISHER, "Utgivare" + IDS_COLUMN_VERSION, "Version" + IDS_INSTALL_FILTER, "Installationsprogram\0*instal*.exe;*setup*.exe;*.msi\0Program (*.exe)\0*.exe\0Alla filer (*.*)\0*.*\0\0" +} + +IDD_MAIN DIALOG 0, 0, 320, 220 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Installera/Avinstallera" +FONT 8, "MS Shell Dlg" +{ + CONTROL "Klicka på Installera för att installera ett nytt program från en diskett, cd-skiva eller din hårddisk.", 1000, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 7, 270, 20 + CONTROL "&Installera...", IDC_INSTALL, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 246, 26, 64, 14 + CONTROL "", -1, "STATIC", SS_LEFT | SS_SUNKEN | WS_CHILD | WS_VISIBLE, 7, 46, 303, 1 + CONTROL 2, 1001, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 7, 21, 20 + CONTROL "Följande programvara kan automatiskt tas bort. Markera den från listan och klicka på Lägg till/Ta bort för att ta bort eller ändra dess installerade komponenter.", 1002, "STATIC", SS_LEFT | WS_CHILD | WS_VISIBLE | WS_GROUP, 40, 57, 270, 30 + CONTROL "", IDL_PROGRAMS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SORTASCENDING | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 7, 90, 303, 100 + CONTROL "Lägg till/&Ta bort...", IDC_ADDREMOVE, "BUTTON", BS_PUSHBUTTON | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 244, 198, 68, 14 + CONTROL "&Supportinfo...", IDC_SUPPORT_INFO, "button", BS_PUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 176, 198, 64, 14 + CONTROL 3, 1003, "STATIC", SS_ICON | WS_CHILD | WS_VISIBLE, 7, 57, 21, 20 +} + +IDD_INFO DIALOG 0, 0, 256, 138 +STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Supportinformation" +FONT 8, "MS Shell Dlg" +{ + CONTROL "OK", IDOK, "BUTTON", BS_DEFPUSHBUTTON | BS_CENTER | WS_CHILD | WS_VISIBLE | WS_TABSTOP, 103, 116, 50, 14 + CONTROL "Följande information kan användas för att få teknisk support för %s:", IDC_INFO_LABEL, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 12, 9, 228, 19 + CONTROL "Utgivare:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 30, 60, 8 + CONTROL "Version:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 40, 60, 8 + CONTROL "Kontakt:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 50, 60, 8 + CONTROL "Supportinformation:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 60, 64, 8 + CONTROL "Telefonsupport:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 70, 68, 8 + CONTROL "Readme:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 80, 60, 8 + CONTROL "Produktuppdateringar:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 90, 60, 8 + CONTROL "Kommentarer:", -1, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 16, 100, 60, 8 + CONTROL "", IDC_INFO_PUBLISHER, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 30, 136, 8 + CONTROL "", IDC_INFO_VERSION, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 40, 136, 8 + CONTROL "", IDC_INFO_CONTACT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 50, 136, 8 + CONTROL "", IDC_INFO_SUPPORT, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 60, 136, 8 + CONTROL "", IDC_INFO_PHONE, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 70, 136, 8 + CONTROL "", IDC_INFO_README, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 80, 136, 8 + CONTROL "", IDC_INFO_UPDATES, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 90, 136, 8 + CONTROL "", IDC_INFO_COMMENTS, "static", SS_LEFT | WS_CHILD | WS_VISIBLE, 104, 100, 136, 8 +}

1 0

Frédéric Delanoy : shell32: Fix French translation & UI display.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 4a4c2fa12ff01366f81d4e4c5101ee843073b246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a4c2fa12ff01366f81d4e4c5… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 10 01:36:12 2009 +0200 shell32: Fix French translation & UI display. --- dlls/shell32/shell32_Fr.rc | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shell32_Fr.rc b/dlls/shell32/shell32_Fr.rc index 511a373..e63a589 100644 --- a/dlls/shell32/shell32_Fr.rc +++ b/dlls/shell32/shell32_Fr.rc @@ -87,7 +87,7 @@ BEGIN MENUITEM "E&xplorer", FCIDM_SHVIEW_EXPLORE MENUITEM "&Ouvrir", FCIDM_SHVIEW_OPEN MENUITEM SEPARATOR - MENUITEM "C&ouper", FCIDM_SHVIEW_CUT + MENUITEM "Cou&per", FCIDM_SHVIEW_CUT MENUITEM "&Copier", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR MENUITEM "Créer un &lien", FCIDM_SHVIEW_CREATELINK @@ -148,7 +148,7 @@ FONT 8, "MS Shell Dlg" WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Créer un nouveau dossier", IDD_MAKENEWFOLDER, 12, 174, 70, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "&Nouveau dossier", IDD_MAKENEWFOLDER, 12, 174, 70, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 102, 174, 50, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuler", IDCANCEL, 156, 174, 50, 14, WS_GROUP | WS_TABSTOP } @@ -216,7 +216,7 @@ STRINGTABLE IDS_DESKTOP "Bureau" IDS_MYCOMPUTER "Poste de travail" IDS_RECYCLEBIN_FOLDER_NAME "Corbeille" - IDS_CONTROLPANEL "Control Panel" + IDS_CONTROLPANEL "Panneau de configuration" /* context menus */ IDS_VIEW_LARGE "&Grandes icônes" @@ -226,19 +226,19 @@ STRINGTABLE IDS_SELECT "Sélectionner" IDS_OPEN "Ouvrir" - IDS_CREATEFOLDER_DENIED "Impossible de créer le nouveau dossier : permission refusée." - IDS_CREATEFOLDER_CAPTION "Erreur lors de la création du nouveau dossier" - IDS_DELETEITEM_CAPTION "Confirmer la suppression du fichier" - IDS_DELETEFOLDER_CAPTION "Confirmer la suppression du dossier" - IDS_DELETEITEM_TEXT "Êtes-vous sûr de vouloir supprimer '%1'?" + IDS_CREATEFOLDER_DENIED "Impossible de créer le dossier : permission refusée." + IDS_CREATEFOLDER_CAPTION "Erreur lors de la création du dossier" + IDS_DELETEITEM_CAPTION "Confirmez la suppression du fichier" + IDS_DELETEFOLDER_CAPTION "Confirmez la suppression du dossier" + IDS_DELETEITEM_TEXT "Êtes-vous sûr de vouloir supprimer « %1 » ?" IDS_DELETEMULTIPLE_TEXT "Êtes-vous sûr de vouloir supprimer ces %1 éléments ?" - IDS_DELETESELECTED_TEXT "Êtes-vous sûr de vouloir supprimer le(les) élément(s) séléectionné(s) ?" + IDS_DELETESELECTED_TEXT "Êtes-vous sûr de vouloir supprimer le(s) élément(s) sélectionné(s) ?" IDS_TRASHITEM_TEXT "Êtes-vous sûr de vouloir mettre « %1 » dans la corbeille ?" IDS_TRASHFOLDER_TEXT "Êtes-vous sûr de vouloir mettre « %1 » et tout ce qu'il contient dans la corbeille ?" IDS_TRASHMULTIPLE_TEXT "Êtes-vous sûr de vouloir mettre ces %1 éléments dans la corbeille ?" - IDS_CANTTRASH_TEXT "L'élément « %1 » ne peut pas être mis dans la corbeille. Souhaitez-vous le supprimer à la place ?" + IDS_CANTTRASH_TEXT "L'élément « %1 » ne peut être mis dans la corbeille. Souhaitez-vous plutôt le supprimer ?" IDS_OVERWRITEFILE_TEXT "Ce dossier contient déjà un fichier nommé « %1 ».\n\nVoulez-vous le remplacer ?" - IDS_OVERWRITEFILE_CAPTION "Confirmer l'écrasement du fichier" + IDS_OVERWRITEFILE_CAPTION "Confirmez l'écrasement du fichier" IDS_OVERWRITEFOLDER_TEXT "Ce dossier contient déjà un dossier nommé « %1 ».\n\n"\ "Si des fichiers dans le dossier de destination ont le même nom que ceux dans le dossier\n"\ "sélectionné, ils seront écrasés. Voulez-vous quand même déplacer ou copier\n"\ @@ -248,7 +248,7 @@ STRINGTABLE IDS_RESTART_TITLE "Redémarrer" IDS_RESTART_PROMPT "Voulez-vous simuler le redémarrage de Windows ?" IDS_SHUTDOWN_TITLE "Arrêter" - IDS_SHUTDOWN_PROMPT "Voulez-vous fermer la session Wine ?" + IDS_SHUTDOWN_PROMPT "Voulez-vous clôturer la session Wine ?" /* Run File dialog */ IDS_RUNDLG_ERROR "Impossible d'afficher la boîte de dialogue « Exécuter » (erreur interne)" @@ -267,7 +267,7 @@ STRINGTABLE IDS_MYMUSIC "Ma musique" IDS_MYVIDEO "Mes vidéos" IDS_DESKTOPDIRECTORY "Bureau" - IDS_NETHOOD "Voisinage Réseau" + IDS_NETHOOD "Voisinage réseau" IDS_TEMPLATES "Modèles" IDS_APPDATA "Application Data" IDS_PRINTHOOD "Voisinage d'impression" @@ -301,7 +301,7 @@ IDS_LICENSE, "Wine est un logiciel libre ; vous pouvez le redistribuer et/ou \ le modifier suivant les termes de la Licence Générale Publique Limitée GNU \ telle que publiée par la Free Software Foundation ; soit la version 2.1 \ -de la License, soit (à votre gré) toute version ultérieure.\n\n\ +de la Licence, soit (à votre gré) toute version ultérieure.\n\n\ Wine est distribué dans l’espoir qu'il sera utile, mais \ SANS AUCUNE GARANTIE : sans même la garantie implicite de \ COMMERCIALISABILITÉ ou d’ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez \

1 0

Frédéric Delanoy : clock: Convert French resources to UTF-8.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 3e41d66449816a18eb21b2a9d264cd222412002c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e41d66449816a18eb21b2a9d… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 10 01:03:36 2009 +0200 clock: Convert French resources to UTF-8. --- programs/clock/Fr.rc | 37 ++++++++++++++++++++----------------- 1 files changed, 20 insertions(+), 17 deletions(-) diff --git a/programs/clock/Fr.rc b/programs/clock/Fr.rc index ce6aa8d..c6c24ba 100644 --- a/programs/clock/Fr.rc +++ b/programs/clock/Fr.rc @@ -22,13 +22,16 @@ #include "clock_res.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL MAIN_MENU MENU { - POPUP "&Propri�t�s" { + POPUP "&Propriétés" { MENUITEM "Ana&logique", IDM_ANALOG - MENUITEM "&Num�rique", IDM_DIGITAL + MENUITEM "&Numérique", IDM_DIGITAL MENUITEM SEPARATOR MENUITEM "&Police...", IDM_FONT MENUITEM SEPARATOR @@ -42,7 +45,7 @@ MAIN_MENU MENU POPUP "Inf&o" { MENUITEM "&Licence...", IDM_LICENSE MENUITEM "AUCUNE &GARANTIE...", IDM_NOWARRANTY - MENUITEM "� &propos de l'horloge", IDM_ABOUT + MENUITEM "À &propos de l'horloge", IDM_ABOUT } } @@ -55,23 +58,23 @@ STRINGTABLE DISCARDABLE LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL { IDS_LICENSE_CAPTION, "LICENCE" IDS_LICENSE, -"Ce programme est un logiciel libre�; vous pouvez le redistribuer et/ou \ -le modifier suivant les termes de la Licence G�n�rale Publique Limit�e GNU \ -telle que publi�e par la Free Software Foundation�; soit la version 2.1 \ -de la License, soit (� votre gr�) toute version ult�rieure.\n\ -Ce programme est distribu� dans l'espoir qu'il sera utile, mais \ -SANS AUCUNE GARANTIE�: sans m�me la garantie implicite de \ -COMMERCIALISABILIT� ou d'AD�QUATION � UN OBJECTIF PARTICULIER. Consultez \ -la Licence G�n�rale Publique Limit�e pour plus de d�tails.\n\ -Vous devriez avoir re�u une copie de la Licence G�n�rale Publique Limit�e \ -GNU avec ce programme�; si ce n'est pas le cas, �crivez � la�: \ +"Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou \ +le modifier suivant les termes de la Licence Générale Publique Limitée GNU \ +telle que publiée par la Free Software Foundation ; soit la version 2.1 \ +de la Licence, soit (à votre gré) toute version ultérieure.\n\ +Ce programme est distribué dans l'espoir qu'il sera utile, mais \ +SANS AUCUNE GARANTIE : sans même la garantie implicite de \ +COMMERCIALISABILITÉ ou d'ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez \ +la Licence Générale Publique Limitée pour plus de détails.\n\ +Vous devriez avoir reçu une copie de la Licence Générale Publique Limitée \ +GNU avec ce programme ; si ce n'est pas le cas, écrivez à la : \ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, \ MA 02110-1301, USA." IDS_WARRANTY_CAPTION, "AUCUNE GARANTIE" IDS_WARRANTY, -"Ce programme est distribu� dans l'espoir qu'il sera utile, mais \ -SANS AUCUNE GARANTIE�: sans m�me la garantie implicite de \ -COMMERCIALISABILIT� ou d'AD�QUATION � UN OBJECTIF PARTICULIER. Consultez \ -la Licence G�n�rale Publique Limit�e pour plus de d�tails." +"Ce programme est distribué dans l'espoir qu'il sera utile, mais \ +SANS AUCUNE GARANTIE : sans même la garantie implicite de \ +COMMERCIALISABILITÉ ou d'ADÉQUATION À UN OBJECTIF PARTICULIER. Consultez \ +la Licence Générale Publique Limitée pour plus de détails." }

1 0

Rein Klazes : comdlg32: Memorize and restore the size of the file dialog between calls.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 1b41bafa07074c338e19e5e95bbcec0ece9f4129 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b41bafa07074c338e19e5e95… Author: Rein Klazes <wijn(a)online.nl> Date: Fri Jul 10 10:07:48 2009 +0200 comdlg32: Memorize and restore the size of the file dialog between calls. Includes some fine tuning to fix a couple of todo's in the tests. --- dlls/comdlg32/filedlg.c | 25 +++++++++++++++++-------- dlls/comdlg32/tests/filedlg.c | 19 ++++++++++--------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index faed51a..041d75c 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -172,6 +172,7 @@ typedef struct tagFD32_PRIVATE const char FileOpenDlgInfosStr[] = "FileOpenDlgInfos"; /* windows property description string */ static const char LookInInfosStr[] = "LookInInfos"; /* LOOKIN combo box property */ +static SIZE MemDialogSize = { 0, 0}; /* keep size of the (resizable) dialog */ /*********************************************************************** * Prototypes @@ -1197,13 +1198,14 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l if( fodInfos->DlgInfos.hwndCustomDlg) ShowWindow( fodInfos->DlgInfos.hwndCustomDlg, SW_SHOW); - if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) + if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) { SendCustomDlgNotificationMessage(hwnd,CDN_INITDONE); + SendCustomDlgNotificationMessage(hwnd,CDN_FOLDERCHANGE); + } if (fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) { GetWindowRect( hwnd, &rc); - /* FIXME: should remember sizes of last invocation */ fodInfos->sizedlg.cx = rc.right - rc.left; fodInfos->sizedlg.cy = rc.bottom - rc.top; fodInfos->initial_size.x = fodInfos->sizedlg.cx; @@ -1212,13 +1214,16 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l SetWindowPos( fodInfos->DlgInfos.hwndGrip, NULL, rc.right - gripx, rc.bottom - gripy, 0, 0, SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOZORDER); + /* resize the dialog to the previous invocation */ + if( MemDialogSize.cx && MemDialogSize.cy) + SetWindowPos( hwnd, NULL, + 0, 0, MemDialogSize.cx, MemDialogSize.cy, + SWP_NOMOVE | SWP_NOACTIVATE | SWP_NOZORDER); } if(fodInfos->ofnInfos->Flags & OFN_EXPLORER) - { - SendCustomDlgNotificationMessage(hwnd,CDN_FOLDERCHANGE); SendCustomDlgNotificationMessage(hwnd,CDN_SELCHANGE); - } + return 0; } case WM_SIZE: @@ -1242,9 +1247,13 @@ INT_PTR CALLBACK FileOpenDlgProc95(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l return FILEDLG95_OnWMGetIShellBrowser(hwnd); case WM_DESTROY: - RemovePropA(hwnd, FileOpenDlgInfosStr); - return FALSE; - + { + FileOpenDlgInfos * fodInfos = GetPropA(hwnd,FileOpenDlgInfosStr); + if (fodInfos && fodInfos->ofnInfos->Flags & OFN_ENABLESIZING) + MemDialogSize = fodInfos->sizedlg; + RemovePropA(hwnd, FileOpenDlgInfosStr); + return FALSE; + } case WM_NOTIFY: { LPNMHDR lpnmh = (LPNMHDR)lParam; diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index e81d054..63375bb 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -273,8 +273,8 @@ static void test_create_view_template(void) /* test cases for resizing of the file dialog */ struct { DWORD flags; - int resize_init; /* change in CDN_INITDONE handler */ - int resize_folderchg; /* change in CDN_FOLDERCHANGE handler */ + int resize_folderchange; /* change in CDN_FOLDERCHANGE handler */ + int resize_selchange; /* change in CDN_SELCHANGE handler */ int resize_timer1; /* change in first WM_TIMER handler */ int resize_check; /* expected change (in second WM_TIMER handler) */ BOOL todo; /* mark that test todo_wine */ @@ -285,10 +285,11 @@ struct { { OFN_ENABLESIZING , 0, 0, 0, 0,FALSE,FALSE}, { OFN_ENABLESIZING , 0, 0,-10, 0,FALSE,FALSE}, { OFN_ENABLESIZING , 0, 0, 10, 10,FALSE, TRUE}, - { OFN_ENABLESIZING , 0,-10, 0, 10, TRUE,FALSE}, /* 5 */ + { OFN_ENABLESIZING , 0,-10, 0, 0,FALSE,FALSE}, /* 5 */ { OFN_ENABLESIZING , 0, 10, 0, 10,FALSE,FALSE}, - { OFN_ENABLESIZING ,-10, 0, 0, 10, TRUE,FALSE}, + { OFN_ENABLESIZING ,-10, 0, 0, 10,FALSE,FALSE}, { OFN_ENABLESIZING , 10, 0, 0, 10,FALSE,FALSE}, + { OFN_ENABLESIZING , 0, 0, 10, 20,FALSE,FALSE}, /* mark the end */ { 0xffffffff } }; @@ -331,14 +332,14 @@ static LONG_PTR WINAPI resize_template_hook(HWND dlg, UINT msg, WPARAM wParam, L } case WM_NOTIFY: { - if(( (LPNMHDR)lParam)->code == CDN_INITDONE){ + if(( (LPNMHDR)lParam)->code == CDN_FOLDERCHANGE){ GetWindowRect( parent, &initrc); - if( (resize = resize_testcases[index].resize_init)){ + if( (resize = resize_testcases[index].resize_folderchange)){ MoveWindow( parent, initrc.left,initrc.top, initrc.right - initrc.left + resize, initrc.bottom - initrc.top + resize, TRUE); } - } else if(( (LPNMHDR)lParam)->code == CDN_FOLDERCHANGE){ - if( (resize = resize_testcases[index].resize_folderchg)){ + } else if(( (LPNMHDR)lParam)->code == CDN_SELCHANGE){ + if( (resize = resize_testcases[index].resize_selchange)){ GetWindowRect( parent, &rc); MoveWindow( parent, rc.left,rc.top, rc.right - rc.left + resize, rc.bottom - rc.top + resize, TRUE); @@ -619,7 +620,7 @@ static void test_ok(void) int i; DWORD ret; - if (!GetTempFileNameA(".", "tmp", 0, tmpfilename)) { + if (!GetTempFileNameA(".", "txt", 0, tmpfilename)) { skip("Failed to create a temporary file name\n"); return; }

1 0

Nikolay Sivov : comctl32/header: Always update rectangles after HDM_SETORDERARRAY.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: a18886e5c21254aca1cb75d8005bbb88c4c3a86c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a18886e5c21254aca1cb75d80… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jul 9 23:13:28 2009 +0400 comctl32/header: Always update rectangles after HDM_SETORDERARRAY. --- dlls/comctl32/header.c | 2 +- dlls/comctl32/tests/header.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index ddc9cb0..aa68102 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -1210,7 +1210,7 @@ HEADER_SetOrderArray(HEADER_INFO *infoPtr, INT size, const INT *order) lpItem = &infoPtr->items[*order++]; lpItem->iOrder=i; } - infoPtr->bRectsValid=0; + HEADER_SetItemBounds(infoPtr); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return TRUE; } diff --git a/dlls/comctl32/tests/header.c b/dlls/comctl32/tests/header.c index 3268ccc..e357f9d 100644 --- a/dlls/comctl32/tests/header.c +++ b/dlls/comctl32/tests/header.c @@ -1175,7 +1175,7 @@ static void test_hdm_index_messages(HWND hParent) rect.left = 0; retVal = SendMessage(hChild, HDM_GETITEMRECT, 0, (LPARAM) &rect); expect(TRUE, retVal); - todo_wine ok(rect.left != 0, "Expected updated rectangle\n"); + ok(rect.left != 0, "Expected updated rectangle\n"); flush_sequences(sequences, NUM_MSG_SEQUENCES);

1 0

Frédéric Delanoy : reg: Fix French translation.
by Alexandre Julliard July 10, 2009

July 10, 2009

Module: wine Branch: master Commit: 77ec63c55f2993e78ac91a9b6d83b24a2fea80e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=77ec63c55f2993e78ac91a9b6… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Jul 10 00:51:21 2009 +0200 reg: Fix French translation. --- programs/reg/Fr.rc | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/programs/reg/Fr.rc b/programs/reg/Fr.rc index cb5de82..1560c13 100644 --- a/programs/reg/Fr.rc +++ b/programs/reg/Fr.rc @@ -22,17 +22,20 @@ #include "reg.h" +/* UTF-8 */ +#pragma code_page(65001) + LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL STRINGTABLE { STRING_USAGE, "La syntaxe de cette commande est :\n\nREG [ ADD | DELETE | QUERY ]\nREG commande /?\n" - STRING_ADD_USAGE, "REG ADD nom_de_cl� [/v nom_de_valeur | /ve] [/t type] [/s s�parateur] [/d donn�e] [/f]\n" - STRING_DELETE_USAGE, "REG DELETE nom_de_cl� [/v nom_de_valeur | /ve | /va] [/f]\n" - STRING_QUERY_USAGE, "REG QUERY nom_de_cl� [/v nom_de_valeur | /ve] [/s]\n" - STRING_SUCCESS, "L'op�ration s'est termin�e avec succ�s\n" - STRING_INVALID_KEY, "Erreur�: Nom de cl� non valable\n" - STRING_INVALID_CMDLINE, "Erreur�: Param�tre de ligne de commande non valable\n" - STRING_NO_REMOTE, "Erreur�: Impossible d'ajouter des cl�s � une machine distante\n" - STRING_CANNOT_FIND, "Erreur�: Le syst�me n'a pas �t� en mesure de trouver la cl� ou la valeur de registre sp�cifi�e\n" + STRING_ADD_USAGE, "REG ADD nom_de_clé [/v nom_de_valeur | /ve] [/t type] [/s séparateur] [/d données] [/f]\n" + STRING_DELETE_USAGE, "REG DELETE nom_de_clé [/v nom_de_valeur | /ve | /va] [/f]\n" + STRING_QUERY_USAGE, "REG QUERY nom_de_clé [/v nom_de_valeur | /ve] [/s]\n" + STRING_SUCCESS, "L'opération s'est terminée avec succès\n" + STRING_INVALID_KEY, "Erreur : nom de clé non valable\n" + STRING_INVALID_CMDLINE, "Erreur : paramètre de ligne de commande non valable\n" + STRING_NO_REMOTE, "Erreur : impossible d'ajouter des clés à une machine distante\n" + STRING_CANNOT_FIND, "Erreur : le système n'a pas pu trouver la clé ou la valeur de registre spécifiée\n" }

1 0