Francois Gouget : ole32: Treat STG_E_LOCKVIOLATION the same way as STG_E_ACCESSDENIED as both indicate locking contention.

[Alexandre Julliard]

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

Author: Francois Gouget 
Date:   Wed Jun 18 17:53:48 2014 +0200

ole32: Treat STG_E_LOCKVIOLATION the same way as STG_E_ACCESSDENIED as both indicate locking contention.

---

dlls/ole32/storage32.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c
index f425d87..6ebc1e7 100644
--- a/dlls/ole32/storage32.c
+++ b/dlls/ole32/storage32.c
@@ -2885,12 +2885,12 @@ static HRESULT StorageImpl_LockRegionSync(StorageImpl *This, ULARGE_INTEGER offs
     {
         hr = ILockBytes_LockRegion(This->lockBytes, offset, cb, dwLockType);

-        if (hr == STG_E_ACCESSDENIED)
+        if (hr == STG_E_ACCESSDENIED || hr == STG_E_LOCKVIOLATION)
         {
             Sleep(delay);
             if (delay < 150) delay++;
         }
-    } while (hr == STG_E_ACCESSDENIED);
+    } while (hr == STG_E_ACCESSDENIED || hr == STG_E_LOCKVIOLATION);

return hr;
 }
@@ -2907,7 +2907,7 @@ static HRESULT StorageImpl_CheckLockRange(StorageImpl *This, ULONG start,
     hr = ILockBytes_LockRegion(This->lockBytes, offset, cb, LOCK_ONLYONCE);
     if (SUCCEEDED(hr)) ILockBytes_UnlockRegion(This->lockBytes, offset, cb, LOCK_ONLYONCE);

-    if (hr == STG_E_ACCESSDENIED)
+    if (hr == STG_E_ACCESSDENIED || hr == STG_E_LOCKVIOLATION)
         return fail_hr;
     else
         return S_OK;
@@ -2925,7 +2925,7 @@ static HRESULT StorageImpl_LockOne(StorageImpl *This, ULONG start, ULONG end)
     {
         offset.QuadPart = i;
         hr = ILockBytes_LockRegion(This->lockBytes, offset, cb, LOCK_ONLYONCE);
-        if (hr != STG_E_ACCESSDENIED)
+        if (hr != STG_E_ACCESSDENIED && hr != STG_E_LOCKVIOLATION)
             break;
     }