wine-commits November 2009

wine-commits@winehq.org

3 participants
910 discussions

Owen Rudge : shell32: Don't increase refcount twice in SHGetImageList.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: ed5a2992f372dcbebf00abe52351bbc375a7b474 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed5a2992f372dcbebf00abe52… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Wed Nov 18 14:44:10 2009 -0600 shell32: Don't increase refcount twice in SHGetImageList. --- dlls/shell32/shellord.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 7aa3a0c..be601a1 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -2203,9 +2203,7 @@ HRESULT WINAPI SHGetImageList(int iImageList, REFIID riid, void **ppv) if (hNew) { ret = HIMAGELIST_QueryInterface(hNew, riid, ppv); - - if (!SUCCEEDED(ret)) - ImageList_Destroy(hNew); + ImageList_Destroy(hNew); } return ret;

1 0

Roderick Colenbrander : opengl32: Get rid of invalid opengl 0.0 test.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 19316ff8cbef0e8f059e912d417db4460c227313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19316ff8cbef0e8f059e912d4… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Nov 18 21:36:49 2009 +0100 opengl32: Get rid of invalid opengl 0.0 test. The test passes on windows using AMD and Nvidia but not on AMD on linux. A close look at the spec shows that behavior of a version lower than 3.0 is up to the driver. --- dlls/opengl32/tests/opengl.c | 12 ------------ 1 files changed, 0 insertions(+), 12 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index 4137eea..c216ed2 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -553,18 +553,6 @@ static void test_dc(HWND hwnd, HDC hdc) static void test_opengl3(HDC hdc) { - /* Try to create a context using an invalid OpenGL version namely 0.x */ - { - HGLRC gl3Ctx; - int attribs[] = {WGL_CONTEXT_MAJOR_VERSION_ARB, 0, 0}; - - gl3Ctx = pwglCreateContextAttribsARB(hdc, 0, attribs); - ok(gl3Ctx == 0, "wglCreateContextAttribs with major version=0 should fail!\n"); - - if(gl3Ctx) - wglDeleteContext(gl3Ctx); - } - /* Try to create a context compatible with OpenGL 1.x; 1.0-2.1 is allowed */ { HGLRC gl3Ctx;

1 0

Roderick Colenbrander : opengl32: No display driver supports windowless opengl3 rendering and likely no driver will ever will .
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 1874f314e2c6e3c54e25db8380606cc859adcfc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1874f314e2c6e3c54e25db838… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Wed Nov 18 21:25:47 2009 +0100 opengl32: No display driver supports windowless opengl3 rendering and likely no driver will ever will. --- dlls/opengl32/tests/opengl.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/opengl32/tests/opengl.c b/dlls/opengl32/tests/opengl.c index c83f1a0..4137eea 100644 --- a/dlls/opengl32/tests/opengl.c +++ b/dlls/opengl32/tests/opengl.c @@ -641,10 +641,13 @@ static void test_opengl3(HDC hdc) gl3Ctx = pwglCreateContextAttribsARB(hdc, 0, attribs); ok(gl3Ctx != 0, "pwglCreateContextAttribsARB for a 3.0 context failed!\n"); - /* OpenGL 3.0 allows offscreen rendering WITHOUT a drawable */ - /* NOTE: Nvidia's 177.89 beta drivers don't allow this yet */ + /* OpenGL 3.0 allows offscreen rendering WITHOUT a drawable + * Neither AMD or Nvidia support it at this point. The WGL_ARB_create_context specs also say that + * it is hard because drivers use the HDC to enter the display driver and it sounds like they don't + * expect drivers to ever offer it. + */ res = wglMakeCurrent(0, gl3Ctx); - todo_wine ok(res == TRUE, "OpenGL 3.0 should allow windowless rendering, but the test failed!\n"); + ok(res == FALSE, "Wow, OpenGL 3.0 windowless rendering passed while it was expected not to!\n"); if(res) wglMakeCurrent(0, 0);

1 0

Vincent Povirk : ole32: Do not allow renaming streams that are open.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 52100e962065d4ca4d120cd89af101ffffa417b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52100e962065d4ca4d120cd89… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 18 11:19:18 2009 -0600 ole32: Do not allow renaming streams that are open. --- dlls/ole32/storage32.c | 6 ++++++ dlls/ole32/tests/storage32.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 23b47ad..8613aa8 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -731,6 +731,12 @@ static HRESULT WINAPI StorageBaseImpl_RenameElement( if (currentEntryRef != DIRENTRY_NULL) { + if (StorageBaseImpl_IsStreamOpen(This, currentEntryRef)) + { + WARN("Stream is already open; cannot rename.\n"); + return STG_E_ACCESSDENIED; + } + /* Remove the element from its current position in the tree */ removeFromTree(This->ancestorStorage, This->storageDirEntry, currentEntryRef); diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 10767e1..75c0dae 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1113,7 +1113,7 @@ static void test_substorage_share(void) /* cannot rename the stream while it's open */ r = IStorage_RenameElement(stg, stmname, othername); - todo_wine ok(r==STG_E_ACCESSDENIED, "IStorage->RenameElement should fail %08x\n", r); + ok(r==STG_E_ACCESSDENIED, "IStorage->RenameElement should fail %08x\n", r); if (SUCCEEDED(r)) IStorage_RenameElement(stg, othername, stmname); /* destroying an object while it's open invalidates it */

1 0

Vincent Povirk : ole32: Do not allow the same stream to be opened twice.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 371f6a4818ee3739282f29a3259f86357e4e47a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=371f6a4818ee3739282f29a32… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 18 10:38:10 2009 -0600 ole32: Do not allow the same stream to be opened twice. --- dlls/ole32/storage32.c | 24 ++++++++++++++++++++++++ dlls/ole32/tests/storage32.c | 4 ++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 4cfc76f..23b47ad 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -110,6 +110,8 @@ static BOOL StorageImpl_WriteDWordToBigBlock( StorageImpl* This, static BOOL StorageImpl_ReadDWordFromBigBlock( StorageImpl* This, ULONG blockIndex, ULONG offset, DWORD* value); +static BOOL StorageBaseImpl_IsStreamOpen(StorageBaseImpl * stg, DirRef streamEntry); + /* OLESTREAM memory structure to use for Get and Put Routines */ /* Used for OleConvertIStorageToOLESTREAM and OleConvertOLESTREAMToIStorage */ typedef struct @@ -453,6 +455,13 @@ static HRESULT WINAPI StorageBaseImpl_OpenStream( if ( (streamEntryRef!=DIRENTRY_NULL) && (currentEntry.stgType==STGTY_STREAM) ) { + if (StorageBaseImpl_IsStreamOpen(This, streamEntryRef)) + { + /* A single stream cannot be opened a second time. */ + res = STG_E_ACCESSDENIED; + goto end; + } + newStream = StgStreamImpl_Construct(This, grfMode, streamEntryRef); if (newStream!=0) @@ -1807,6 +1816,21 @@ void StorageBaseImpl_RemoveStream(StorageBaseImpl * stg, StgStreamImpl * strm) list_remove(&(strm->StrmListEntry)); } +static BOOL StorageBaseImpl_IsStreamOpen(StorageBaseImpl * stg, DirRef streamEntry) +{ + StgStreamImpl *strm; + + LIST_FOR_EACH_ENTRY(strm, &stg->strmHead, StgStreamImpl, StrmListEntry) + { + if (strm->dirEntry == streamEntry) + { + return TRUE; + } + } + + return FALSE; +} + static void StorageBaseImpl_DeleteAll(StorageBaseImpl * stg) { struct list *cur, *cur2; diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 8fa300f..10767e1 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1100,13 +1100,13 @@ static void test_substorage_share(void) if (r == S_OK) { r = IStorage_OpenStream(stg, stmname, NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, &stm2); - todo_wine ok(r==STG_E_ACCESSDENIED, "IStorage->OpenStream should fail %08x\n", r); + ok(r==STG_E_ACCESSDENIED, "IStorage->OpenStream should fail %08x\n", r); if (r == S_OK) IStorage_Release(stm2); r = IStorage_OpenStream(stg, stmname, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, &stm2); - todo_wine ok(r==STG_E_ACCESSDENIED, "IStorage->OpenStream should fail %08x\n", r); + ok(r==STG_E_ACCESSDENIED, "IStorage->OpenStream should fail %08x\n", r); if (r == S_OK) IStorage_Release(stm2);

1 0

Vincent Povirk : ole32: Use safe list iteration when searching for streams to invalidate.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 53128d522b44759d60cdb38586be52ba22b4f0e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53128d522b44759d60cdb3858… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 18 10:27:16 2009 -0600 ole32: Use safe list iteration when searching for streams to invalidate. --- dlls/ole32/storage32.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 96e3e00..4cfc76f 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1903,10 +1903,10 @@ static HRESULT deleteStreamContents( IStream *pis; HRESULT hr; ULARGE_INTEGER size; - StgStreamImpl *strm; + StgStreamImpl *strm, *strm2; /* Invalidate any open stream objects. */ - LIST_FOR_EACH_ENTRY(strm, &parentStorage->strmHead, StgStreamImpl, StrmListEntry) + LIST_FOR_EACH_ENTRY_SAFE(strm, strm2, &parentStorage->strmHead, StgStreamImpl, StrmListEntry) { if (strm->dirEntry == indexToDelete) {

1 0

Vincent Povirk : ole32: Always invalidate stream objects when deleting the stream.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 9d0c4c971d56a74aac9599e5771bbbdd57906f6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d0c4c971d56a74aac9599e57… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 18 10:22:50 2009 -0600 ole32: Always invalidate stream objects when deleting the stream. --- dlls/ole32/storage32.c | 23 ++++++++++++----------- dlls/ole32/tests/storage32.c | 2 +- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index df0305d..96e3e00 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -823,17 +823,6 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( */ if (STGM_CREATE_MODE(grfMode) == STGM_CREATE) { - StgStreamImpl *strm; - - LIST_FOR_EACH_ENTRY(strm, &This->strmHead, StgStreamImpl, StrmListEntry) - { - if (strm->dirEntry == currentEntryRef) - { - TRACE("Stream deleted %p\n", strm); - strm->parentStorage = NULL; - list_remove(&strm->StrmListEntry); - } - } IStorage_DestroyElement(iface, pwcsName); } else @@ -1914,6 +1903,18 @@ static HRESULT deleteStreamContents( IStream *pis; HRESULT hr; ULARGE_INTEGER size; + StgStreamImpl *strm; + + /* Invalidate any open stream objects. */ + LIST_FOR_EACH_ENTRY(strm, &parentStorage->strmHead, StgStreamImpl, StrmListEntry) + { + if (strm->dirEntry == indexToDelete) + { + TRACE("Stream deleted %p\n", strm); + strm->parentStorage = NULL; + list_remove(&strm->StrmListEntry); + } + } size.u.HighPart = 0; size.u.LowPart = 0; diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index b908ea5..8fa300f 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1121,7 +1121,7 @@ static void test_substorage_share(void) ok(r==S_OK, "IStorage->DestroyElement failed, hr=%08x\n", r); r = IStream_Write(stm, "this shouldn't work\n", 20, NULL); - todo_wine ok(r==STG_E_REVERTED, "IStream_Write should fail %08x\n", r); + ok(r==STG_E_REVERTED, "IStream_Write should fail %08x\n", r); IStorage_Release(stm); }

1 0

Vincent Povirk : ole32: Add a test for freeing the parent of an open stream .
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: a2c405fa15d8a38d970cc24c9a790437efc5cc15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2c405fa15d8a38d970cc24c9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Nov 17 11:20:34 2009 -0600 ole32: Add a test for freeing the parent of an open stream. --- dlls/ole32/tests/storage32.c | 45 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index e4783e8..b908ea5 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1288,6 +1288,50 @@ static void test_revert(void) ok( r == TRUE, "deleted file\n"); } +static void test_parent_free(void) +{ + IStorage *stg = NULL, *stg2 = NULL; + HRESULT r; + IStream *stm = NULL; + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; + ULONG ref; + + DeleteFileA(filenameA); + + /* create the file */ + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE |STGM_TRANSACTED, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + /* commit a new storage */ + r = IStorage_CreateStorage(stg, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + if (r == S_OK) + { + /* now create a stream inside the new storage */ + r = IStorage_CreateStream(stg2, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + + ref = IStorage_Release(stg2); + ok(ref == 0, "IStorage still has %u references\n", ref); + + if (r == S_OK) + { + r = IStream_Write(stm, "this should fail\n", 17, NULL); + ok(r==STG_E_REVERTED, "IStream->Write sould fail, hr=%x\n", r); + + IStream_Release(stm); + } + } + + IStorage_Release(stg); + + r = DeleteFileA(filenameA); + ok( r == TRUE, "deleted file\n"); +} + static void test_nonroot_transacted(void) { IStorage *stg = NULL, *stg2 = NULL; @@ -2422,6 +2466,7 @@ START_TEST(storage32) test_transact(); test_substorage_share(); test_revert(); + test_parent_free(); test_nonroot_transacted(); test_ReadClassStm(); test_access();

1 0

Vincent Povirk : ole32: Invalidate child streams when a non-top-level storage is freed.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: 55604eb36c4d569464a9f154ff30b4fdd4987c33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55604eb36c4d569464a9f154f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Nov 18 10:16:13 2009 -0600 ole32: Invalidate child streams when a non-top-level storage is freed. --- dlls/ole32/storage32.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index b6de7ae..df0305d 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3485,6 +3485,8 @@ static void StorageInternalImpl_Destroy( StorageBaseImpl *iface) { StorageInternalImpl* This = (StorageInternalImpl*) iface; + StorageBaseImpl_DeleteAll(&This->base); + HeapFree(GetProcessHeap(), 0, This); }

1 0

Austin English : winex11.drv: Downgrade an ERR to a WARN.
by Alexandre Julliard 19 Nov '09

19 Nov '09

Module: wine Branch: master Commit: a3cf7a4e0657a82ad53f34b1a61213d867ce4e19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3cf7a4e0657a82ad53f34b1a… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 18 14:09:20 2009 -0600 winex11.drv: Downgrade an ERR to a WARN. --- dlls/winex11.drv/bitmap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/bitmap.c b/dlls/winex11.drv/bitmap.c index 47d2562..5992b31 100644 --- a/dlls/winex11.drv/bitmap.c +++ b/dlls/winex11.drv/bitmap.c @@ -144,7 +144,7 @@ BOOL CDECL X11DRV_CreateBitmap( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, LPVOID /* check if bpp is compatible with screen depth */ if (!((bitmap.bmBitsPixel == 1) || (bitmap.bmBitsPixel == screen_bpp))) { - ERR("Trying to make bitmap with planes=%d, bpp=%d\n", + WARN("Trying to make bitmap with planes=%d, bpp=%d\n", bitmap.bmPlanes, bitmap.bmBitsPixel); return FALSE; }

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
91
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 November 2009