Module: wine Branch: master Commit: ffc4a49bcb9c98ee76a7b210232db35423e06de1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffc4a49bcb9c98ee76a7b21023...
Author: Vincent Povirk vincent@codeweavers.com Date: Fri Dec 4 18:14:51 2009 -0600
ole32: Always allow changes to read-only transacted storages.
The only time the write permissions of transacted storages matter is when committing.
---
dlls/ole32/storage32.c | 30 +++++++++++++++--------------- dlls/ole32/tests/storage32.c | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 629709a..229fe76 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -864,15 +864,16 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( (grfMode & STGM_TRANSACTED)) return STG_E_INVALIDFUNCTION;
- /* Can't create a stream on read-only storage */ - if ( STGM_ACCESS_MODE( This->openFlags ) == STGM_READ ) - return STG_E_ACCESSDENIED; - /* - * Check that we're compatible with the parent's storage mode - * if not in transacted mode + * Don't worry about permissions in transacted mode, as we can always write + * changes; we just can't always commit them. */ if(!(This->openFlags & STGM_TRANSACTED)) { + /* Can't create a stream on read-only storage */ + if ( STGM_ACCESS_MODE( This->openFlags ) == STGM_READ ) + return STG_E_ACCESSDENIED; + + /* Can't create a stream with greater access than the parent. */ if ( STGM_ACCESS_MODE( grfMode ) > STGM_ACCESS_MODE( This->openFlags ) ) return STG_E_ACCESSDENIED; } @@ -899,11 +900,6 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( else return STG_E_FILEALREADYEXISTS; } - else if (STGM_ACCESS_MODE(This->openFlags) == STGM_READ) - { - WARN("read-only storage\n"); - return STG_E_ACCESSDENIED; - }
/* * memset the empty entry @@ -1058,7 +1054,8 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( /* * Check that we're compatible with the parent's storage mode */ - if ( STGM_ACCESS_MODE( grfMode ) > STGM_ACCESS_MODE( This->openFlags ) ) + if ( !(This->openFlags & STGM_TRANSACTED) && + STGM_ACCESS_MODE( grfMode ) > STGM_ACCESS_MODE( This->openFlags ) ) { WARN("access denied\n"); return STG_E_ACCESSDENIED; @@ -1075,7 +1072,8 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( * An element with this name already exists */ if (STGM_CREATE_MODE(grfMode) == STGM_CREATE && - STGM_ACCESS_MODE(This->openFlags) != STGM_READ) + ((This->openFlags & STGM_TRANSACTED) || + STGM_ACCESS_MODE(This->openFlags) != STGM_READ)) { hr = IStorage_DestroyElement(iface, pwcsName); if (FAILED(hr)) @@ -1087,7 +1085,8 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( return STG_E_FILEALREADYEXISTS; } } - else if (STGM_ACCESS_MODE(This->openFlags) == STGM_READ) + else if (!(This->openFlags & STGM_TRANSACTED) && + STGM_ACCESS_MODE(This->openFlags) == STGM_READ) { WARN("read-only storage\n"); return STG_E_ACCESSDENIED; @@ -1831,7 +1830,8 @@ static HRESULT WINAPI StorageBaseImpl_DestroyElement( if (This->reverted) return STG_E_REVERTED;
- if ( STGM_ACCESS_MODE( This->openFlags ) == STGM_READ ) + if ( !(This->openFlags & STGM_TRANSACTED) && + STGM_ACCESS_MODE( This->openFlags ) == STGM_READ ) return STG_E_ACCESSDENIED;
entryToDeleteRef = findElement( diff --git a/dlls/ole32/tests/storage32.c b/dlls/ole32/tests/storage32.c index 2011375..e8a7ec9 100644 --- a/dlls/ole32/tests/storage32.c +++ b/dlls/ole32/tests/storage32.c @@ -1505,7 +1505,7 @@ static void test_nonroot_transacted(void) { /* The storage can be modified. */ r = IStorage_CreateStorage(stg2, stgname, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, 0, 0, &stg3); - todo_wine ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); + ok(r==S_OK, "IStorage->CreateStorage failed, hr=%08x\n", r); if (r == S_OK) IStream_Release(stg3);