wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Christian Costa : d3dxof: Turn some TRACEs into WARNs in case of parsing error.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: cafb20bb5c1440ec373353fd718ec4fdb127d48b URL: http://source.winehq.org/git/wine.git/?a=commit;h=cafb20bb5c1440ec373353fd7… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Wed Mar 3 08:52:43 2010 +0100 d3dxof: Turn some TRACEs into WARNs in case of parsing error. --- dlls/d3dxof/d3dxof.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index 88a9e52..b8c85e0 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -303,7 +303,7 @@ static HRESULT WINAPI IDirectXFileImpl_CreateEnumObject(IDirectXFile* iface, LPV { if (!parse_template(&object->buf)) { - TRACE("Template is not correct\n"); + WARN("Template is not correct\n"); hr = DXFILEERR_BADVALUE; goto error; } @@ -418,7 +418,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP { if (!parse_template(&buf)) { - TRACE("Template is not correct\n"); + WARN("Template is not correct\n"); return DXFILEERR_BADVALUE; } else @@ -1051,7 +1051,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE { if (!parse_template(&This->buf)) { - TRACE("Template is not correct\n"); + WARN("Template is not correct\n"); hr = DXFILEERR_BADVALUE; goto error; } @@ -1099,7 +1099,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetNextDataObject(IDirectXFileE if (!parse_object(&This->buf)) { - TRACE("Object is not correct\n"); + WARN("Object is not correct\n"); hr = DXFILEERR_PARSEERROR; goto error; }

1 0

Dylan Smith : comctl32/tests: Added scrolled listview test for LVM_GETSUBITEMRECT.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 7617cc4bcce24cabbad0ad5ae1d76829f492f893 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7617cc4bcce24cabbad0ad5ae… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Mar 3 02:39:14 2010 -0500 comctl32/tests: Added scrolled listview test for LVM_GETSUBITEMRECT. --- dlls/comctl32/tests/listview.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 8bcd7a4..5441cfc 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2135,6 +2135,18 @@ todo_wine expect(100, rect.left); expect(250, rect.right); + ListView_Scroll(hwnd, 10, 0); + + rect.left = LVIR_BOUNDS; + rect.top = 1; + rect.right = rect.bottom = 0; + r = SendMessage(hwnd, LVM_GETSUBITEMRECT, 0, (LPARAM)&rect); + ok(r != 0, "Expected not-null LRESULT\n"); + expect(90, rect.left); + expect(240, rect.right); + + ListView_Scroll(hwnd, -10, 0); + DestroyWindow(hwnd); /* try it for non LVS_REPORT style */

1 0

Dylan Smith : comctl32/listview: Scrolling affects subitem rect.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: a7053ecc4c226dc6afc93ff129237ce9b78380b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7053ecc4c226dc6afc93ff12… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Mar 3 02:38:39 2010 -0500 comctl32/listview: Scrolling affects subitem rect. --- dlls/comctl32/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 2d39675..9afbf10 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6873,7 +6873,7 @@ static BOOL LISTVIEW_GetSubItemRect(const LISTVIEW_INFO *infoPtr, INT nItem, LPR return FALSE; } - OffsetRect(lprc, 0, Position.y); + OffsetRect(lprc, Position.x - REPORT_MARGINX, Position.y); return TRUE; }

1 0

Dylan Smith : comctl32/tests: Add NULL terminator to unicode string constant.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 3952da836af47e809d1404cc5a32238b46a97b7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3952da836af47e809d1404cc5… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Wed Mar 3 02:31:29 2010 -0500 comctl32/tests: Add NULL terminator to unicode string constant. --- dlls/comctl32/tests/listview.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index b224192..8bcd7a4 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -424,7 +424,7 @@ static BOOL register_parent_wnd_class(BOOL Unicode) static HWND create_parent_window(BOOL Unicode) { - static const WCHAR nameW[] = {'t','e','s','t','p','a','r','e','n','t','n','a','m','e','W'}; + static const WCHAR nameW[] = {'t','e','s','t','p','a','r','e','n','t','n','a','m','e','W',0}; HWND hwnd; if (!register_parent_wnd_class(Unicode))

1 0

Reece Dunn : crypt32: Fix CryptFreeTls when calling with a freed index.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: a15dbfac22b4d75af2d54941a549b358ac14780c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a15dbfac22b4d75af2d54941a… Author: Reece Dunn <msclrhd(a)gmail.com> Date: Tue Mar 2 21:31:46 2010 +0000 crypt32: Fix CryptFreeTls when calling with a freed index. --- dlls/crypt32/main.c | 7 ++++++- dlls/crypt32/tests/main.c | 6 ++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index 1a5972f..5844b18 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -161,8 +161,13 @@ BOOL WINAPI I_CryptSetTls(DWORD dwTlsIndex, LPVOID lpTlsValue) BOOL WINAPI I_CryptFreeTls(DWORD dwTlsIndex, DWORD unknown) { + BOOL ret; + TRACE("(%d, %d)\n", dwTlsIndex, unknown); - return TlsFree(dwTlsIndex); + + ret = TlsFree(dwTlsIndex); + if (!ret) SetLastError( E_INVALIDARG ); + return ret; } BOOL WINAPI I_CryptGetOssGlobal(DWORD x) diff --git a/dlls/crypt32/tests/main.c b/dlls/crypt32/tests/main.c index 9b622bb..7c11e8e 100644 --- a/dlls/crypt32/tests/main.c +++ b/dlls/crypt32/tests/main.c @@ -254,10 +254,8 @@ static void test_cryptTls(void) ret = pI_CryptFreeTls(index, 0); ok(ret, "I_CryptFreeTls failed: %08x\n", GetLastError()); ret = pI_CryptFreeTls(index, 0); - /* Not sure if this fails because TlsFree should fail, so leave as - * todo for now. - */ - todo_wine ok(!ret && GetLastError() == E_INVALIDARG, + ok(!ret, "I_CryptFreeTls succeeded\n"); + ok(GetLastError() == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", GetLastError()); } /* Similar pass, check I_CryptDetachTls */

1 0

Reece Dunn : kernel32/tests: Add a test case for calling TlsFree on a freed index.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 1b46c0660d4baad9f4afe0086fb4e44240b18131 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b46c0660d4baad9f4afe0086… Author: Reece Dunn <msclrhd(a)gmail.com> Date: Tue Mar 2 21:29:48 2010 +0000 kernel32/tests: Add a test case for calling TlsFree on a freed index. --- dlls/kernel32/process.c | 2 +- dlls/kernel32/tests/thread.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1ef3e46..d9d4520 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -2496,7 +2496,7 @@ BOOL WINAPI TlsFree( DWORD index ) if (ret) NtSetInformationThread( GetCurrentThread(), ThreadZeroTlsCell, &index, sizeof(index) ); else SetLastError( ERROR_INVALID_PARAMETER ); RtlReleasePebLock(); - return TRUE; + return ret; } diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 83d13c5..afa6759 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -421,7 +421,17 @@ static VOID test_CreateThread_basic(void) "Thread did not execute successfully\n"); ok(CloseHandle(thread[i])!=0,"CloseHandle failed\n"); } - ok(TlsFree(tlsIndex)!=0,"TlsFree failed\n"); + + SetLastError(0xCAFEF00D); + ok(TlsFree(tlsIndex)!=0,"TlsFree failed: %08x\n", GetLastError()); + ok(GetLastError()==0xCAFEF00D, + "GetLastError: expected 0xCAFEF00D, got %08x\n", GetLastError()); + + /* Test freeing an already freed TLS index */ + SetLastError(0xCAFEF00D); + ok(TlsFree(tlsIndex)==0,"TlsFree succeeded\n"); + ok(GetLastError()==ERROR_INVALID_PARAMETER, + "GetLastError: expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); /* Test how passing NULL as a pointer to threadid works */ SetLastError(0xFACEaBAD);

1 0

Vincent Povirk : ole32: Add a test showing IStorage_CopyTo ignores open objects in the source.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 11abad24ddea054b95fb751c5673cb8842e52cac URL: http://source.winehq.org/git/wine.git/?a=commit;h=11abad24ddea054b95fb751c5… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Mar 2 16:07:07 2010 -0600 ole32: Add a test showing IStorage_CopyTo ignores open objects in the source. --- dlls/ole32/tests/storage32.c | 52 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 52 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index e598fe0..7cbfd49 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -2720,6 +2720,57 @@ static void test_substorage_enum(void) ok( r == TRUE, "deleted file\n"); } +static void test_copyto_locking(void) +{ + IStorage *stg, *stg2, *stg3, *stg4; + IStream *stm; + HRESULT r; + static const WCHAR stgname[] = { 'S','T','G','1',0 }; + static const WCHAR stgname2[] = { 'S','T','G','2',0 }; + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + + DeleteFileA(filenameA); + + /* create the file */ + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + /* create a substorage */ + r = IStorage_CreateStorage(stg, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + /* create another substorage */ + r = IStorage_CreateStorage(stg, stgname2, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg3); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + /* add a stream, and leave it open */ + r = IStorage_CreateStream(stg2, stmname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stm); + ok(r==S_OK, "IStorage->CreateStream failed, hr=%08x\n", r); + + /* Try to copy the storage while the stream is open */ + r = IStorage_CopyTo(stg2, 0, NULL, NULL, stg3); + todo_wine ok(r==S_OK, "IStorage->CopyTo failed, hr=%08x\n", r); + + IStream_Release(stm); + + /* create a substorage */ + r = IStorage_CreateStorage(stg2, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg4); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + /* Try to copy the storage while the substorage is open */ + r = IStorage_CopyTo(stg2, 0, NULL, NULL, stg3); + todo_wine ok(r==S_OK, "IStorage->CopyTo failed, hr=%08x\n", r); + + IStorage_Release(stg4); + IStorage_Release(stg3); + IStorage_Release(stg2); + IStorage_Release(stg); + + r = DeleteFileA(filenameA); + ok( r == TRUE, "deleted file\n"); +} + START_TEST(storage32) { CHAR temp[MAX_PATH]; @@ -2759,4 +2810,5 @@ START_TEST(storage32) test_rename(); test_toplevel_stat(); test_substorage_enum(); + test_copyto_locking(); }

1 0

Paul Chitescu : quartz: Silence the FIXME that AsyncReader does not implement IBasicAudio.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: af2bed44f89bcbf31748e95fe1eb696ae1cab916 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af2bed44f89bcbf31748e95fe… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Tue Mar 2 11:46:43 2010 -0800 quartz: Silence the FIXME that AsyncReader does not implement IBasicAudio. --- dlls/quartz/filesource.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 8bb9cfd..110415d 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -395,7 +395,8 @@ static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID rii return S_OK; } - if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IMediaSeeking) && !IsEqualIID(riid, &IID_IVideoWindow)) + if (!IsEqualIID(riid, &IID_IPin) && !IsEqualIID(riid, &IID_IMediaSeeking) && + !IsEqualIID(riid, &IID_IVideoWindow) && !IsEqualIID(riid, &IID_IBasicAudio)) FIXME("No interface for %s!\n", qzdebugstr_guid(riid)); return E_NOINTERFACE;

1 0

Juan Lang : wintrust: Correct GenericChainCertificateTrust' s handling of WINTRUST_CreateChainForSigner's return value.
by Alexandre Julliard 03 Mar '10

03 Mar '10

Module: wine Branch: master Commit: 2f836649816764cd8f4af5779baec6561d430e00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f836649816764cd8f4af5779… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Mar 1 08:51:47 2010 -0800 wintrust: Correct GenericChainCertificateTrust's handling of WINTRUST_CreateChainForSigner's return value. --- dlls/wintrust/softpub.c | 25 ++++++++++--------------- 1 files changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index f753c93..9fa0d05 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -845,7 +845,7 @@ HRESULT WINAPI WintrustCertificateTrust(CRYPT_PROVIDER_DATA *data) HRESULT WINAPI GenericChainCertificateTrust(CRYPT_PROVIDER_DATA *data) { - BOOL ret; + DWORD err; WTD_GENERIC_CHAIN_POLICY_DATA *policyData = data->pWintrustData->pPolicyCallbackData; @@ -854,15 +854,11 @@ HRESULT WINAPI GenericChainCertificateTrust(CRYPT_PROVIDER_DATA *data) if (policyData && policyData->u.cbSize != sizeof(WTD_GENERIC_CHAIN_POLICY_CREATE_INFO)) { - SetLastError(ERROR_INVALID_PARAMETER); - ret = FALSE; + err = ERROR_INVALID_PARAMETER; goto end; } if (!data->csSigners) - { - ret = FALSE; - SetLastError(TRUST_E_NOSIGNATURE); - } + err = TRUST_E_NOSIGNATURE; else { DWORD i; @@ -880,19 +876,18 @@ HRESULT WINAPI GenericChainCertificateTrust(CRYPT_PROVIDER_DATA *data) pChainPara = &chainPara; pCreateInfo = &createInfo; } - ret = TRUE; - for (i = 0; i < data->csSigners; i++) - ret = WINTRUST_CreateChainForSigner(data, i, pCreateInfo, + err = ERROR_SUCCESS; + for (i = 0; !err && i < data->csSigners; i++) + err = WINTRUST_CreateChainForSigner(data, i, pCreateInfo, pChainPara); } end: - if (!ret) - data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV] = - GetLastError(); - TRACE("returning %d (%08x)\n", ret ? S_OK : S_FALSE, + if (err) + data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV] = err; + TRACE("returning %d (%08x)\n", !err ? S_OK : S_FALSE, data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV]); - return ret ? S_OK : S_FALSE; + return !err ? S_OK : S_FALSE; } HRESULT WINAPI SoftpubAuthenticode(CRYPT_PROVIDER_DATA *data)

1 0

Vincent Povirk : ole32: Clear the sibling links when reinserting a renamed element.
by Alexandre Julliard 02 Mar '10

02 Mar '10

Module: wine Branch: master Commit: 24ff70483519c22b201027a9c758d318d92a1ece URL: http://source.winehq.org/git/wine.git/?a=commit;h=24ff70483519c22b201027a9c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Feb 26 10:02:17 2010 -0600 ole32: Clear the sibling links when reinserting a renamed element. --- dlls/ole32/storage32.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 88e0524..837365b 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -797,6 +797,10 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( /* Change the name of the element */ strcpyW(currentEntry.name, pwcsNewName); + /* Delete any sibling links */ + currentEntry.leftChild = DIRENTRY_NULL; + currentEntry.rightChild = DIRENTRY_NULL; + StorageBaseImpl_WriteDirEntry(This, currentEntryRef, &currentEntry);

1 0

← Newer
1
...
81
82
83
84
85
86
87
...
92
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2010