Francois Gouget : ole32: Return the correct error in FileLockBytesImpl_*LockRegion*().

[Alexandre Julliard]

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

Author: Francois Gouget 
Date:   Wed Jun 18 17:55:13 2014 +0200

ole32: Return the correct error in FileLockBytesImpl_*LockRegion*().

---

dlls/ole32/filelockbytes.c |   22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/dlls/ole32/filelockbytes.c b/dlls/ole32/filelockbytes.c
index 1c8c938..605b5df 100644
--- a/dlls/ole32/filelockbytes.c
+++ b/dlls/ole32/filelockbytes.c
@@ -313,6 +313,19 @@ static HRESULT WINAPI FileLockBytesImpl_SetSize(ILockBytes* iface, ULARGE_INTEGE
     return hr;
 }

+static HRESULT get_lock_error(void)
+{
+    switch (GetLastError())
+    {
+    case ERROR_LOCK_VIOLATION: return STG_E_LOCKVIOLATION; break;
+    case ERROR_ACCESS_DENIED:  return STG_E_ACCESSDENIED; break;
+    case ERROR_NOT_SUPPORTED:  return STG_E_INVALIDFUNCTION; break;
+    default:
+        FIXME("no mapping for error %d\n", GetLastError());
+        return STG_E_INVALIDFUNCTION;
+    }
+}
+
 static HRESULT WINAPI FileLockBytesImpl_LockRegion(ILockBytes* iface,
     ULARGE_INTEGER libOffset, ULARGE_INTEGER cb, DWORD dwLockType)
 {
@@ -334,8 +347,7 @@ static HRESULT WINAPI FileLockBytesImpl_LockRegion(ILockBytes* iface,

if (LockFileEx(This->hfile, lock_flags, 0, cb.u.LowPart, cb.u.HighPart, &ol))
         return S_OK;
-    else
-        return STG_E_ACCESSDENIED;
+    return get_lock_error();
 }

HRESULT FileLockBytesImpl_LockRegionSync(ILockBytes* iface,
@@ -353,8 +365,7 @@ HRESULT FileLockBytesImpl_LockRegionSync(ILockBytes* iface,

if (LockFileEx(This->hfile, LOCKFILE_EXCLUSIVE_LOCK, 0, cb.u.LowPart, cb.u.HighPart, &ol))
         return S_OK;
-    else
-        return STG_E_ACCESSDENIED;
+    return get_lock_error();
 }

static HRESULT WINAPI FileLockBytesImpl_UnlockRegion(ILockBytes* iface,
@@ -374,8 +385,7 @@ static HRESULT WINAPI FileLockBytesImpl_UnlockRegion(ILockBytes* iface,

if (UnlockFileEx(This->hfile, 0, cb.u.LowPart, cb.u.HighPart, &ol))
         return S_OK;
-    else
-        return STG_E_ACCESSDENIED;
+    return get_lock_error();
 }

static HRESULT WINAPI FileLockBytesImpl_Stat(ILockBytes* iface,