October 2009 - Wine-Commits

Paul Vriens : comctl32/tests: Fix some test failures ( MCM_SETCURSEL and MCM_GETCURSEL).
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: efaa25fe66bddc48a72d54cd1a6f46dbd1a84e02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efaa25fe66bddc48a72d54cd1… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Oct 3 15:00:56 2009 +0200 comctl32/tests: Fix some test failures (MCM_SETCURSEL and MCM_GETCURSEL). --- dlls/comctl32/tests/monthcal.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index eaabc47..cb229e4 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -773,9 +773,15 @@ static void test_monthcal_currdate(void) expect(st_original.wYear, st_new.wYear); expect(st_original.wMonth, st_new.wMonth); expect(st_original.wDay, st_new.wDay); - expect(st_original.wHour, st_new.wHour); - expect(st_original.wMinute, st_new.wMinute); - expect(st_original.wSecond, st_new.wSecond); + ok(st_original.wHour == st_new.wHour || + broken(0 == st_new.wHour), /* comctl32 <= 4.70 */ + "Expected %d, got %d\n", st_original.wHour, st_new.wHour); + ok(st_original.wMinute == st_new.wMinute || + broken(0 == st_new.wMinute), /* comctl32 <= 4.70 */ + "Expected %d, got %d\n", st_original.wMinute, st_new.wMinute); + ok(st_original.wSecond == st_new.wSecond || + broken(0 == st_new.wSecond), /* comctl32 <= 4.70 */ + "Expected %d, got %d\n", st_original.wSecond, st_new.wSecond); /* lparam cannot be NULL */ res = SendMessage(hwnd, MCM_GETCURSEL, 0, 0);

1 0

Paul Vriens : comctl32/tests: Fix some test failures (MCM_GETSELRANGE).
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: a7633d783dfeb375941d9b4e072ced1d48c9524b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7633d783dfeb375941d9b4e0… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Oct 3 15:21:59 2009 +0200 comctl32/tests: Fix some test failures (MCM_GETSELRANGE). --- dlls/comctl32/tests/monthcal.c | 34 +++++++++++++++++++++++----------- 1 files changed, 23 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 64a11b0..1ac2bb8 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1484,7 +1484,7 @@ static void test_monthcal_getselrange(void) { HWND hwnd; SYSTEMTIME st, range[2]; - BOOL ret; + BOOL ret, old_comctl32 = FALSE; hwnd = create_monthcal_control(MCS_MULTISELECT); @@ -1492,25 +1492,37 @@ static void test_monthcal_getselrange(void) ret = SendMessage(hwnd, MCM_GETTODAY, 0, (LPARAM)&st); expect(TRUE, ret); + memset(range, 0xcc, sizeof(range)); ret = SendMessage(hwnd, MCM_GETSELRANGE, 0, (LPARAM)range); expect(TRUE, ret); expect(st.wYear, range[0].wYear); expect(st.wMonth, range[0].wMonth); expect(st.wDay, range[0].wDay); - expect(st.wDayOfWeek, range[0].wDayOfWeek); - expect(st.wHour, range[0].wHour); - expect(st.wMinute, range[0].wMinute); - expect(st.wSecond, range[0].wSecond); - expect(st.wMilliseconds, range[0].wMilliseconds); + if (range[0].wDayOfWeek == 0) + { + win_skip("comctl32 <= 4.70 doesn't set some values\n"); + old_comctl32 = TRUE; + } + else + { + expect(st.wDayOfWeek, range[0].wDayOfWeek); + expect(st.wHour, range[0].wHour); + expect(st.wMinute, range[0].wMinute); + expect(st.wSecond, range[0].wSecond); + expect(st.wMilliseconds, range[0].wMilliseconds); + } expect(st.wYear, range[1].wYear); expect(st.wMonth, range[1].wMonth); expect(st.wDay, range[1].wDay); - expect(st.wDayOfWeek, range[1].wDayOfWeek); - expect(st.wHour, range[1].wHour); - expect(st.wMinute, range[1].wMinute); - expect(st.wSecond, range[1].wSecond); - expect(st.wMilliseconds, range[1].wMilliseconds); + if (!old_comctl32) + { + expect(st.wDayOfWeek, range[1].wDayOfWeek); + expect(st.wHour, range[1].wHour); + expect(st.wMinute, range[1].wMinute); + expect(st.wSecond, range[1].wSecond); + expect(st.wMilliseconds, range[1].wMilliseconds); + } DestroyWindow(hwnd); }

1 0

Austin English : atl: Add missing prototypes.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: 982608214343bef7389cdc7ccc7aac923f2147d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=982608214343bef7389cdc7cc… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Oct 3 03:01:03 2009 -0500 atl: Add missing prototypes. --- dlls/atl/atlbase.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/atl/atlbase.h b/dlls/atl/atlbase.h index ad7acfa..49c13e4 100644 --- a/dlls/atl/atlbase.h +++ b/dlls/atl/atlbase.h @@ -28,9 +28,9 @@ typedef HRESULT (WINAPI _ATL_CREATORFUNC)(void* pv, REFIID riid, LPVOID* ppv); typedef HRESULT (WINAPI _ATL_CREATORARGFUNC)(void* pv, REFIID riid, LPVOID* ppv, DWORD dw); typedef HRESULT (WINAPI _ATL_MODULEFUNC)(DWORD dw); -typedef LPCSTR (WINAPI _ATL_DESCRIPTIONFUNCA)(); -typedef LPCWSTR (WINAPI _ATL_DESCRIPTIONFUNCW)(); -typedef const struct _ATL_CATMAP_ENTRY* (_ATL_CATMAPFUNC)(); +typedef LPCSTR (WINAPI _ATL_DESCRIPTIONFUNCA)(void); +typedef LPCWSTR (WINAPI _ATL_DESCRIPTIONFUNCW)(void); +typedef const struct _ATL_CATMAP_ENTRY* (_ATL_CATMAPFUNC)(void); typedef void (WINAPI _ATL_TERMFUNC)(DWORD dw); typedef struct _ATL_OBJMAP_ENTRYA_TAG

1 0

Jacek Caban : mshtml: Added IHTMLElement2::clientTop implementation.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: 6d6f341c64b037e59cccebe028a057374e2e2b96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d6f341c64b037e59cccebe02… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Oct 4 21:58:38 2009 +0200 mshtml: Added IHTMLElement2::clientTop implementation. --- dlls/mshtml/htmlelem2.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem2.c b/dlls/mshtml/htmlelem2.c index 342030c..5b58fd4 100644 --- a/dlls/mshtml/htmlelem2.c +++ b/dlls/mshtml/htmlelem2.c @@ -590,8 +590,25 @@ static HRESULT WINAPI HTMLElement2_get_clientWidth(IHTMLElement2 *iface, LONG *p static HRESULT WINAPI HTMLElement2_get_clientTop(IHTMLElement2 *iface, LONG *p) { HTMLElement *This = HTMLELEM2_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + nsIDOMNSElement *nselem; + PRInt32 client_top = 0; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMElement_QueryInterface(This->nselem, &IID_nsIDOMNSElement, (void**)&nselem); + if(NS_SUCCEEDED(nsres)) { + nsres = nsIDOMNSElement_GetClientTop(nselem, &client_top); + nsIDOMNSElement_Release(nselem); + if(NS_FAILED(nsres)) + ERR("GetScrollHeight failed: %08x\n", nsres); + }else { + ERR("Could not get nsIDOMNSElement interface: %08x\n", nsres); + } + + *p = client_top; + TRACE("*p = %d\n", *p); + return S_OK; } static HRESULT WINAPI HTMLElement2_get_clientLeft(IHTMLElement2 *iface, LONG *p)

1 0

Austin English : jscript: Add missing prototype.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: 8bbaeb89fa357f84ce39ce0d159600742718231b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8bbaeb89fa357f84ce39ce0d1… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Oct 3 03:02:43 2009 -0500 jscript: Add missing prototype. --- dlls/jscript/jscript.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 533be57..4451669 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -369,7 +369,7 @@ static inline void num_set_nan(VARIANT *v) #endif } -static inline DOUBLE ret_nan() +static inline DOUBLE ret_nan(void) { VARIANT v; num_set_nan(&v);

1 0

Austin English : comctl32: Add missing prototype.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: a19754ab66cfb5f47cbe395e68a1faeaa82da909 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a19754ab66cfb5f47cbe395e6… Author: Austin English <austinenglish(a)gmail.com> Date: Sat Oct 3 03:00:45 2009 -0500 comctl32: Add missing prototype. --- dlls/comctl32/toolbar.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index d95dc7d..d05a40d 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -6434,7 +6434,7 @@ TOOLBAR_StyleChanged (TOOLBAR_INFO *infoPtr, INT nType, const STYLESTRUCT *lpSty static LRESULT -TOOLBAR_SysColorChange () +TOOLBAR_SysColorChange (void) { COMCTL32_RefreshSysColors();

1 0

Vincent Povirk : ole32: We do need to implement Commit/ Revert for non-root storage.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: 40433554d508b9c2c1231e4dc486516e077879e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40433554d508b9c2c1231e4dc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 2 15:27:24 2009 -0500 ole32: We do need to implement Commit/Revert for non-root storage. --- dlls/ole32/storage32.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 9082334..61752e4 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -3720,13 +3720,12 @@ static void StorageInternalImpl_Destroy( StorageBaseImpl *iface) ** ** Storage32InternalImpl_Commit ** -** The non-root storages cannot be opened in transacted mode thus this function -** does nothing. */ static HRESULT WINAPI StorageInternalImpl_Commit( IStorage* iface, DWORD grfCommitFlags) /* [in] */ { + FIXME("(%p,%x): stub\n", iface, grfCommitFlags); return S_OK; } @@ -3734,12 +3733,11 @@ static HRESULT WINAPI StorageInternalImpl_Commit( ** ** Storage32InternalImpl_Revert ** -** The non-root storages cannot be opened in transacted mode thus this function -** does nothing. */ static HRESULT WINAPI StorageInternalImpl_Revert( IStorage* iface) { + FIXME("(%p): stub\n", iface); return S_OK; }

1 0

Vincent Povirk : ole32/tests: Add test for non-root transacted storage objects.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: 536aa9be99b7c724a887dea85333bff52f627afb URL: http://source.winehq.org/git/wine.git/?a=commit;h=536aa9be99b7c724a887dea85… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 2 15:22:51 2009 -0500 ole32/tests: Add test for non-root transacted storage objects. --- dlls/ole32/tests/storage32.c | 102 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 102 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index cbb23c8..22c044d 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1185,6 +1185,107 @@ static void test_revert(void) ok( r == TRUE, "deleted file\n"); } +static void test_nonroot_transacted(void) +{ + IStorage *stg = NULL, *stg2 = NULL; + HRESULT r; + IStream *stm = NULL; + static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + static const WCHAR stmname2[] = { 'F','O','O',0 }; + + DeleteFileA(filenameA); + + /* create a transacted file */ + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE |STGM_TRANSACTED, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + /* create a transacted substorage */ + r = IStorage_CreateStorage(stg, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_TRANSACTED, 0, 0, &stg2); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + if (r == S_OK) + { + /* create and commit stmname */ + r = IStorage_CreateStream(stg2, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + if (r == S_OK) + IStream_Release(stm); + + IStorage_Commit(stg2, 0); + + /* create and revert stmname2 */ + r = IStorage_CreateStream(stg2, stmname2, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + if (r == S_OK) + IStream_Release(stm); + + IStorage_Revert(stg2); + + /* check that Commit and Revert really worked */ + r = IStorage_OpenStream(stg2, stmname, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + ok(r==S_OK, "IStorage->OpenStream should succeed %08x\n", r); + if (r == S_OK) + IStream_Release(stm); + + r = IStorage_OpenStream(stg2, stmname2, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + todo_wine ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); + if (r == S_OK) + IStream_Release(stm); + + IStorage_Release(stg2); + } + + IStream_Release(stg); + + /* create a non-transacted file */ + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + /* create a transacted substorage */ + r = IStorage_CreateStorage(stg, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_TRANSACTED, 0, 0, &stg2); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + if (r == S_OK) + { + /* create and commit stmname */ + r = IStorage_CreateStream(stg2, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + if (r == S_OK) + IStream_Release(stm); + + IStorage_Commit(stg2, 0); + + /* create and revert stmname2 */ + r = IStorage_CreateStream(stg2, stmname2, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + if (r == S_OK) + IStream_Release(stm); + + IStorage_Revert(stg2); + + /* check that Commit and Revert really worked */ + r = IStorage_OpenStream(stg2, stmname, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + ok(r==S_OK, "IStorage->OpenStream should succeed %08x\n", r); + if (r == S_OK) + IStream_Release(stm); + + r = IStorage_OpenStream(stg2, stmname2, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + todo_wine ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); + if (r == S_OK) + IStream_Release(stm); + + IStorage_Release(stg2); + } + + IStream_Release(stg); + + r = DeleteFileA(filenameA); + ok( r == TRUE, "deleted file\n"); +} + static void test_ReadClassStm(void) { CLSID clsid; @@ -1741,6 +1842,7 @@ START_TEST(storage32) test_streamenum(); test_transact(); test_revert(); + test_nonroot_transacted(); test_ReadClassStm(); test_access(); test_writeclassstg();

1 0

Jacek Caban : mshtml.idl: Moved IElementSelector dispinterface declaration to macro and added it to all element types with data .
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: b399acd8384c81d1ac6997907a4c3dbe8ef9376a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b399acd8384c81d1ac6997907… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Oct 2 20:15:51 2009 +0200 mshtml.idl: Moved IElementSelector dispinterface declaration to macro and added it to all element types with data. --- include/mshtml.idl | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/mshtml.idl b/include/mshtml.idl index e2c36a4..cfe6516 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -5378,6 +5378,13 @@ interface IHTMLElement4 : IDispatch [propget, id(DISPID_IHTMLELEMENT4_ONFOCUSOUT), displaybind, bindable] \ VARIANT onfocusout() +#define WINE_IELEMENTSELECTOR_DISPINTERFACE_DECL \ + [id(DISPID_IELEMENTSELECTOR_QUERYSELECTOR)] \ + IHTMLElement *querySelector([in] BSTR v); \ + \ + [id(DISPID_IELEMENTSELECTOR_QUERYSELECTORALL)] \ + IHTMLDOMChildrenCollection *querySelectorAll([in] BSTR v) + /***************************************************************************** * IHTMLUniqueName interface */ @@ -5662,7 +5669,8 @@ interface IHTMLDatabinding : IDispatch WINE_IHTMLUNIQUENAME_DISPINTERFACE_DECL; \ WINE_HTMLDOMNODE_DISPINTERFACE_DECL; \ WINE_IHTMLDATABINDING_DISPINTERFACE_DECL; \ - WINE_IHTMLELEMENT5_DISPINTERFACE_DECL + WINE_IHTMLELEMENT5_DISPINTERFACE_DECL; \ + WINE_IELEMENTSELECTOR_DISPINTERFACE_DECL /***************************************************************************** * IHTMLGenericElement interface @@ -7252,12 +7260,6 @@ properties: methods: WINE_HTMLDATAELEMENT_DISPINTERFACE_DECL; - [id(DISPID_IELEMENTSELECTOR_QUERYSELECTOR)] - IHTMLElement *querySelector([in] BSTR v); - - [id(DISPID_IELEMENTSELECTOR_QUERYSELECTORALL)] - IHTMLDOMChildrenCollection *querySelectorAll([in] BSTR v); - [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] IDispatch *constructor();

1 0

Vincent Povirk : ole32/tests: Add test for IStorage::Revert.
by Alexandre Julliard Oct. 5, 2009

Oct. 5, 2009

Module: wine Branch: master Commit: 3c9067de9fcd92fbc1f7ff266259e90298dcd8ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c9067de9fcd92fbc1f7ff266… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 2 15:05:10 2009 -0500 ole32/tests: Add test for IStorage::Revert. --- dlls/ole32/tests/storage32.c | 157 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 157 insertions(+), 0 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index b1f4b14..cbb23c8 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1029,6 +1029,162 @@ static void test_transact(void) ok( r == TRUE, "deleted file\n"); } +static void test_revert(void) +{ + IStorage *stg = NULL, *stg2 = NULL, *stg3 = NULL; + HRESULT r; + IStream *stm = NULL, *stm2 = NULL; + static const WCHAR stmname[] = { 'C','O','N','T','E','N','T','S',0 }; + static const WCHAR stmname2[] = { 'F','O','O',0 }; + static const WCHAR stgname[] = { 'P','E','R','M','S','T','G',0 }; + static const WCHAR stgname2[] = { 'T','E','M','P','S','T','G',0 }; + STATSTG statstg; + + 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 stream and storage */ + r = IStorage_CreateStream(stg, stmname2, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + + r = IStream_Write(stm, "this is stream 1\n", 16, NULL); + ok(r==S_OK, "IStream->Write failed\n"); + + 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) + { + /* Create two substorages but only commit one */ + r = IStorage_CreateStorage(stg2, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg3); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + if (r == S_OK) + IStorage_Release(stg3); + + r = IStorage_Commit(stg, 0); + ok(r==S_OK, "IStorage->Commit failed\n"); + + r = IStorage_CreateStorage(stg2, stgname2, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg3); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + if (r == S_OK) + IStorage_Release(stg3); + } + + /* now create a stream and storage, then revert */ + r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm2 ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + + r = IStream_Write(stm2, "this is stream 2\n", 16, NULL); + ok(r==S_OK, "IStream->Write failed\n"); + + r = IStorage_CreateStorage(stg, stgname2, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg3); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + r = IStorage_Revert(stg); + + /* all open objects become invalid */ + todo_wine { + r = IStream_Write(stm, "this shouldn't work\n", 20, NULL); + ok(r==STG_E_REVERTED, "IStream_Write should fail %08x\n", r); + + r = IStream_Write(stm2, "this shouldn't work\n", 20, NULL); + ok(r==STG_E_REVERTED, "IStream_Write should fail %08x\n", r); + + r = IStorage_Stat(stg2, &statstg, STATFLAG_NONAME); + ok(r==STG_E_REVERTED, "IStorage_Stat should fail %08x\n", r); + + r = IStorage_Stat(stg3, &statstg, STATFLAG_NONAME); + ok(r==STG_E_REVERTED, "IStorage_Stat should fail %08x\n", r); + } + + IStream_Release(stm); + IStream_Release(stm2); + IStorage_Release(stg2); + IStorage_Release(stg3); + + r = IStorage_OpenStream(stg, stmname, NULL, STGM_SHARE_DENY_NONE|STGM_READ, 0, &stm ); + ok(r==STG_E_INVALIDFLAG, "IStorage->OpenStream failed %08x\n", r); + + r = IStorage_OpenStream(stg, stmname, NULL, STGM_DELETEONRELEASE|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + ok(r==STG_E_INVALIDFUNCTION, "IStorage->OpenStream failed %08x\n", r); + + r = IStorage_OpenStream(stg, stmname, NULL, STGM_TRANSACTED|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + ok(r==STG_E_INVALIDFUNCTION, "IStorage->OpenStream failed %08x\n", r); + + r = IStorage_OpenStorage(stg, stmname, NULL, STGM_TRANSACTED|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg2 ); + ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream failed %08x\n", r); + + todo_wine { + r = IStorage_OpenStream(stg, stmname, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream should fail %08x\n", r); + } + if (r == S_OK) + IStream_Release(stm); + + todo_wine { + r = IStorage_OpenStorage(stg, stgname2, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg2 ); + ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStorage should fail %08x\n", r); + } + if (r == S_OK) + IStorage_Release(stg2); + + r = IStorage_OpenStorage(stg, stmname2, NULL, STGM_TRANSACTED|STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg2 ); + ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStream failed %08x\n", r); + + r = IStorage_OpenStream(stg, stmname2, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, 0, &stm ); + ok(r==S_OK, "IStorage->OpenStream should succeed %08x\n", r); + if (r == S_OK) + IStream_Release(stm); + + r = IStorage_OpenStorage(stg, stgname, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg2 ); + ok(r==S_OK, "IStorage->OpenStorage should succeed %08x\n", r); + if (r == S_OK) + { + r = IStorage_OpenStorage(stg2, stgname, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg3 ); + ok(r==S_OK, "IStorage->OpenStorage should succeed %08x\n", r); + if (r == S_OK) + IStorage_Release(stg3); + + r = IStorage_OpenStorage(stg2, stgname2, NULL, STGM_SHARE_EXCLUSIVE|STGM_READWRITE, NULL, 0, &stg3 ); + todo_wine ok(r==STG_E_FILENOTFOUND, "IStorage->OpenStorage should fail %08x\n", r); + if (r == S_OK) + IStorage_Release(stg3); + + IStorage_Release(stg2); + } + + IStorage_Release(stg); + + r = DeleteFileA(filenameA); + ok( r == TRUE, "deleted file\n"); + + /* Revert only invalidates objects in transacted mode */ + r = StgCreateDocfile( filename, STGM_CREATE | STGM_SHARE_EXCLUSIVE | + STGM_READWRITE, 0, &stg); + ok(r==S_OK, "StgCreateDocfile failed\n"); + + r = IStorage_CreateStream(stg, stmname2, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); + ok(r==S_OK, "IStorage->CreateStream failed\n"); + + r = IStorage_Revert(stg); + todo_wine ok(r==S_OK, "IStorage->Revert failed %08x\n", r); + + r = IStream_Write(stm, "this works\n", 11, NULL); + ok(r==S_OK, "IStream_Write should succeed %08x\n", r); + + IStream_Release(stm); + IStream_Release(stg); + + r = DeleteFileA(filenameA); + ok( r == TRUE, "deleted file\n"); +} + static void test_ReadClassStm(void) { CLSID clsid; @@ -1584,6 +1740,7 @@ START_TEST(storage32) test_storage_refcount(); test_streamenum(); test_transact(); + test_revert(); test_ReadClassStm(); test_access(); test_writeclassstg();

1 0