wine-commits October 2009

wine-commits@winehq.org

3 participants
1207 discussions

Paul Vriens : comctl32/tests: Fix some test failures ( MCM_SETRANGE and MCM_GETRANGE).
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 0d726970c6b4a6c4b564db2b3a661d71c5866a73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d726970c6b4a6c4b564db2b3… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Oct 3 14:51:09 2009 +0200 comctl32/tests: Fix some test failures (MCM_SETRANGE and MCM_GETRANGE). --- dlls/comctl32/tests/monthcal.c | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index fc61fee..eaabc47 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -322,6 +322,7 @@ static void test_monthcal(void) HWND hwnd; SYSTEMTIME st[2], st1[2], today; int res, month_range; + DWORD limits; hwnd = CreateWindowA(MONTHCAL_CLASSA, "MonthCal", WS_POPUP | WS_VISIBLE, CW_USEDEFAULT, 0, 300, 300, 0, 0, NULL, NULL); @@ -329,7 +330,16 @@ static void test_monthcal(void) /* test range just after creation */ memset(&st, 0xcc, sizeof(st)); - ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st) == 0, "No limits should be set\n"); + limits = SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st); + ok(limits == 0 || + broken(limits == GDTR_MIN), /* comctl32 <= 4.70 */ + "No limits should be set (%d)\n", limits); + if (limits == GDTR_MIN) + { + win_skip("comctl32 <= 4.70 is broken\n"); + DestroyWindow(hwnd); + return; + } ok(0 == st[0].wYear || broken(1752 == st[0].wYear), /* comctl32 <= 4.72 */

1 0

Paul Vriens : comctl32/tests: Fix some test failures on older comctl32 versions.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: 1dbab053649823c36b52f81ae92e29dc2e18944b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dbab053649823c36b52f81ae… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Sat Oct 3 14:44:34 2009 +0200 comctl32/tests: Fix some test failures on older comctl32 versions. --- 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 28b3646..fc61fee 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -331,9 +331,15 @@ static void test_monthcal(void) memset(&st, 0xcc, sizeof(st)); ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st) == 0, "No limits should be set\n"); - expect(0, st[0].wYear); - expect(0, st[0].wMonth); - expect(0, st[0].wDay); + ok(0 == st[0].wYear || + broken(1752 == st[0].wYear), /* comctl32 <= 4.72 */ + "Expected 0, got %d\n", st[0].wYear); + ok(0 == st[0].wMonth || + broken(9 == st[0].wMonth), /* comctl32 <= 4.72 */ + "Expected 0, got %d\n", st[0].wMonth); + ok(0 == st[0].wDay || + broken(14 == st[0].wDay), /* comctl32 <= 4.72 */ + "Expected 0, got %d\n", st[0].wDay); expect(0, st[0].wDayOfWeek); expect(0, st[0].wHour); expect(0, st[0].wMinute);

1 0

Austin English : atl: Add missing prototypes.
by Alexandre Julliard 05 Oct '09

05 Oct '09

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

Austin English : jscript: Add missing prototype.
by Alexandre Julliard 05 Oct '09

05 Oct '09

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 05 Oct '09

05 Oct '09

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: Remove useless comments.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: b41822b1dcdb640206be54ef01e75faaa5a7cae5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b41822b1dcdb640206be54ef0… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 2 17:21:33 2009 -0500 ole32: Remove useless comments. --- dlls/ole32/storage32.c | 172 +----------------------------------------------- 1 files changed, 2 insertions(+), 170 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b41822b1dcdb640206be5…

1 0

Vincent Povirk : ole32/tests: Add test for non-root transacted storage objects.
by Alexandre Julliard 05 Oct '09

05 Oct '09

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

Vincent Povirk : ole32/tests: Add test for IStorage::Revert.
by Alexandre Julliard 05 Oct '09

05 Oct '09

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

Vincent Povirk : ole32/tests: Test substorages of transacted storage objects.
by Alexandre Julliard 05 Oct '09

05 Oct '09

Module: wine Branch: master Commit: d6e020fdb856e2cad682311d7fe6a210b33d1ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6e020fdb856e2cad682311d7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Oct 2 14:23:19 2009 -0500 ole32/tests: Test substorages of transacted storage objects. --- dlls/ole32/tests/storage32.c | 78 +++++++++++++++++++++++++++++++++++------ 1 files changed, 66 insertions(+), 12 deletions(-) diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 620e6cb..b1f4b14 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -894,11 +894,13 @@ static void test_streamenum(void) static void test_transact(void) { - IStorage *stg = NULL, *stg2 = NULL; + IStorage *stg = NULL, *stg2 = NULL, *stg3 = NULL; HRESULT r; IStream *stm = 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 }; DeleteFileA(filenameA); @@ -907,19 +909,40 @@ static void test_transact(void) STGM_READWRITE |STGM_TRANSACTED, 0, &stg); ok(r==S_OK, "StgCreateDocfile failed\n"); - /* now create a stream, but don't commit it */ + /* 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 = IStream_Release(stm); + IStream_Release(stm); + + 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_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); - /* now create a stream, but don't commit it */ + if (r == S_OK) + IStorage_Release(stg3); + + IStorage_Release(stg2); + } + + /* now create a stream and storage, but don't commit them */ stm = NULL; r = IStorage_CreateStream(stg, stmname, STGM_SHARE_EXCLUSIVE | STGM_READWRITE, 0, 0, &stm ); ok(r==S_OK, "IStorage->CreateStream failed\n"); @@ -927,10 +950,17 @@ static void test_transact(void) r = IStream_Write(stm, "this is stream 2\n", 16, NULL); ok(r==S_OK, "IStream->Write failed\n"); + /* IStream::Commit does nothing for OLE storage streams */ r = IStream_Commit(stm, STGC_ONLYIFCURRENT | STGC_DANGEROUSLYCOMMITMERELYTODISKCACHE); ok(r==S_OK, "IStream->Commit failed\n"); - r = IStream_Release(stm); + r = IStorage_CreateStorage(stg, stgname2, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg2); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + + if (r == S_OK) + IStorage_Release(stg2); + + IStream_Release(stm); IStorage_Release(stg); @@ -958,16 +988,40 @@ static void test_transact(void) 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 (stm) - r = IStream_Release(stm); + 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 fail %08x\n", r); - if (stm) - r = IStream_Release(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);

1 0

Vincent Povirk : ole32: We do need to implement Commit/ Revert for non-root storage.
by Alexandre Julliard 05 Oct '09

05 Oct '09

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

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 October 2009