ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Francois Gouget 2014-06-18 17:53:48 +02:00 committed by Alexandre Julliard
parent f4c7e6d607
commit bea2c6f2d5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/ole32/storage32.c
View File

@ -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;
}