From 38006ba5538ce33c2b160b3665271bb69ec6ad92 Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Tue, 22 Nov 2016 18:30:08 -0800
Subject: [PATCH] tst: HookMoveFileExW: fix problem with requesting oplock on
 same file

---
 tst/winfsp-tests/hooks.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tst/winfsp-tests/hooks.c b/tst/winfsp-tests/hooks.c
index fc999e25..b24b41d4 100644
--- a/tst/winfsp-tests/hooks.c
+++ b/tst/winfsp-tests/hooks.c
@@ -206,7 +206,7 @@ HANDLE WINAPI HookCreateFileW(
 
     PrepareFileName(lpFileName, FileNameBuf);
 
-    MaybeRequestOplock(lpFileName);
+    MaybeRequestOplock(FileNameBuf);
 
     MaybeAdjustTraversePrivilege(FALSE);
     Handle = (OptResilient ? ResilientCreateFileW : CreateFileW)(
@@ -300,8 +300,10 @@ BOOL WINAPI HookMoveFileExW(
     PrepareFileName(lpExistingFileName, OldFileNameBuf);
     PrepareFileName(lpNewFileName, NewFileNameBuf);
 
-    MaybeRequestOplock(lpExistingFileName);
-    MaybeRequestOplock(lpNewFileName);
+    MaybeRequestOplock(OldFileNameBuf);
+    if (OptCaseInsensitive ?
+        _wcsicmp(OldFileNameBuf, NewFileNameBuf) : wcscmp(OldFileNameBuf, NewFileNameBuf))
+        MaybeRequestOplock(NewFileNameBuf);
 
     MaybeAdjustTraversePrivilege(FALSE);
     Success = MoveFileExW(OldFileNameBuf, NewFileNameBuf, dwFlags);