Vincent Povirk : ole32: Don' t use ancestorStorage to decide if a storage is transacted.

Alexandre Julliard julliard at winehq.org
Thu Dec 10 10:00:56 CST 2009


Module: wine
Branch: master
Commit: 55b3a6e59f81013bb9f39bd57d2b6b5f103dabbc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=55b3a6e59f81013bb9f39bd57d2b6b5f103dabbc

Author: Vincent Povirk <vincent at codeweavers.com>
Date:   Mon Nov 30 17:10:49 2009 -0600

ole32: Don't use ancestorStorage to decide if a storage is transacted.

---

 dlls/ole32/storage32.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index 266d677..d0b0461 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -435,7 +435,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStream(
    * Check that we're compatible with the parent's storage mode, but
    * only if we are not in transacted mode
    */
-  if(!(This->ancestorStorage->base.openFlags & STGM_TRANSACTED)) {
+  if(!(This->openFlags & STGM_TRANSACTED)) {
     if ( STGM_ACCESS_MODE( grfMode ) > STGM_ACCESS_MODE( This->openFlags ) )
     {
       res = STG_E_ACCESSDENIED;
@@ -560,7 +560,7 @@ static HRESULT WINAPI StorageBaseImpl_OpenStorage(
    * Check that we're compatible with the parent's storage mode,
    * but only if we are not transacted
    */
-  if(!(This->ancestorStorage->base.openFlags & STGM_TRANSACTED)) {
+  if(!(This->openFlags & STGM_TRANSACTED)) {
     if ( STGM_ACCESS_MODE( grfMode ) > STGM_ACCESS_MODE( This->openFlags ) )
     {
       res = STG_E_ACCESSDENIED;
@@ -848,7 +848,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream(
    * Check that we're compatible with the parent's storage mode
    * if not in transacted mode
    */
-  if(!(This->ancestorStorage->base.openFlags & STGM_TRANSACTED)) {
+  if(!(This->openFlags & STGM_TRANSACTED)) {
     if ( STGM_ACCESS_MODE( grfMode ) > STGM_ACCESS_MODE( This->openFlags ) )
       return STG_E_ACCESSDENIED;
   }




More information about the wine-cvs mailing list