November 2009 - Wine-Commits

Jeremy White : mshtml: Declare prototype of wine_dos_get_file_name correctly; fixes Gecko install on win64.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 9145a1cdb27404a4694fcd58a70a414995963fbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=9145a1cdb27404a4694fcd58a… Author: Jeremy White <jwhite(a)winehq.org> Date: Wed Nov 18 14:46:00 2009 -0600 mshtml: Declare prototype of wine_dos_get_file_name correctly; fixes Gecko install on win64. --- dlls/mshtml/install.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/install.c b/dlls/mshtml/install.c index 5eca3a6..cfe3cd0 100644 --- a/dlls/mshtml/install.c +++ b/dlls/mshtml/install.c @@ -182,7 +182,7 @@ static BOOL install_from_unix_file(const char *file_name) int fd; BOOL ret; - static WCHAR *(*wine_get_dos_file_name)(const char*); + static WCHAR * (CDECL *wine_get_dos_file_name)(const char*); static const WCHAR kernel32W[] = {'k','e','r','n','e','l','3','2','.','d','l','l',0}; fd = open(file_name, O_RDONLY);

1 0

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

Nov. 19, 2009

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 Nov. 19, 2009

Nov. 19, 2009

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

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

Nov. 19, 2009

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 Nov. 19, 2009

Nov. 19, 2009

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: Use safe list iteration when searching for streams to invalidate.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

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

Piotr Caban : oleaut32: Ignore milliseconds in VarDateFromUdate implementation.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 1f7a07ebe397fbef6fbb0aac1ade7c21db11f8aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f7a07ebe397fbef6fbb0aac1… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Nov 18 19:02:21 2009 +0100 oleaut32: Ignore milliseconds in VarDateFromUdate implementation. --- dlls/msi/tests/automation.c | 3 +-- dlls/oleaut32/tests/vartest.c | 3 +++ dlls/oleaut32/variant.c | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/tests/automation.c b/dlls/msi/tests/automation.c index 4af37aa..29a7cd2 100644 --- a/dlls/msi/tests/automation.c +++ b/dlls/msi/tests/automation.c @@ -1506,8 +1506,7 @@ static void test_SummaryInfo(IDispatch *pSummaryInfo, const msi_summary_info *in hr = SummaryInfo_PropertyGet(pSummaryInfo, PID_LASTSAVE_DTM, &varresult, V_VT(&var)); ok(hr == S_OK, "SummaryInfo_PropertyGet failed, hresult 0x%08x\n", hr); - /* FIXME: Off by one second */ - todo_wine ok(V_DATE(&var) == V_DATE(&varresult), "SummaryInfo_PropertyGet expected %lf, but returned %lf\n", V_DATE(&var), V_DATE(&varresult)); + ok(V_DATE(&var) == V_DATE(&varresult), "SummaryInfo_PropertyGet expected %lf, but returned %lf\n", V_DATE(&var), V_DATE(&varresult)); VariantClear(&varresult); VariantClear(&var); diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 68a4edf..05f4be3 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1646,6 +1646,9 @@ static void test_VarDateFromUdate(void) UD2T(31,12,9999,0,0,0,0,0,0,0,S_OK,2958465.0); /* 31 Dec 9999 - Max */ UD2T(1,1,10000,0,0,0,0,0,0,0,E_INVALIDARG,0.0); /* > 31 Dec 9999 => err */ + UD2T(30,12,1899,0,0,0,0,0,0,0,S_OK,0.0); /* 30 Dec 1899 0:00:00 */ + UD2T(30,12,1899,0,0,0,999,0,0,0,S_OK,0.0); /* Ignore milliseconds */ + UD2T(1,1,1980,18,1,16,0,2,1,0,S_OK,29221.75087962963); /* 6:18:02 PM */ todo_wine UD2T(0,1,1980,42,1,16,0,2,1,0,S_OK,29221.75087962963); /* Test rolled hours */ todo_wine UD2T(1,1,1980,17,61,16,0,2,1,0,S_OK,29221.75087962963); /* Test rolled minutes */ diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index cd99814..10bc8ed 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1388,7 +1388,6 @@ HRESULT WINAPI VarDateFromUdateEx(UDATE *pUdateIn, LCID lcid, ULONG dwFlags, DAT dateVal += ud.st.wHour / 24.0; dateVal += ud.st.wMinute / 1440.0; dateVal += ud.st.wSecond / 86400.0; - dateVal += ud.st.wMilliseconds / 86400000.0; TRACE("Returning %g\n", dateVal); *pDateOut = dateVal;

1 0

Piotr Caban : msxml3: Remove test that fails on some systems.
by Alexandre Julliard Nov. 19, 2009

Nov. 19, 2009

Module: wine Branch: master Commit: 6633001d6edf348e922521daea069ec36ac9b3a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6633001d6edf348e922521dae… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Wed Nov 18 19:02:30 2009 +0100 msxml3: Remove test that fails on some systems. --- dlls/msxml3/tests/domdoc.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index f84d748..20c6a9f 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -4066,18 +4066,9 @@ static void test_NodeTypeValue(void) ok(hr == S_OK, "ret %08x\n", hr ); if(hr == S_OK) { - VARIANT hlp_in, hlp_out; - V_VT(&hlp_in) = VT_BSTR; - V_BSTR(&hlp_in) = _bstr_("7322.9371"); - V_VT(&hlp_out) = VT_CY; - ok(VariantChangeType(&hlp_out, &hlp_in, 0, VT_CY) == S_OK, "VariantChangeType failed\n"); - VariantClear(&hlp_in); - hr = IXMLDOMNode_get_nodeTypedValue(pNode, &v); ok(hr == S_OK, "ret %08x\n", hr ); ok(V_VT(&v) == VT_CY, "incorrect type\n"); - ok(VarCyCmp(V_CY(&v), V_CY(&hlp_out)) == VARCMP_EQ, "incorrect value\n"); - VariantClear(&hlp_out); VariantClear(&v); IXMLDOMNode_Release(pNode);

1 0

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

Nov. 19, 2009

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

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

Nov. 19, 2009

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