Alexandre Julliard : kernelbase: Use FSCTL_GET_OBJECT_ID to compare file identities.

Alexandre Julliard julliard at winehq.org
Thu Jul 16 19:01:20 CDT 2020


Module: wine
Branch: master
Commit: d1f83537e7f064f0f77ead043617bc213c8c0053
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=d1f83537e7f064f0f77ead043617bc213c8c0053

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jul 16 09:14:56 2020 +0200

kernelbase: Use FSCTL_GET_OBJECT_ID to compare file identities.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

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

diff --git a/dlls/kernelbase/file.c b/dlls/kernelbase/file.c
index 9d082f1a64..d9b3440869 100644
--- a/dlls/kernelbase/file.c
+++ b/dlls/kernelbase/file.c
@@ -473,12 +473,12 @@ DWORD file_name_WtoA( LPCWSTR src, INT srclen, LPSTR dest, INT destlen )
  */
 static BOOL is_same_file( HANDLE h1, HANDLE h2 )
 {
-    FILE_ID_INFORMATION id1, id2;
+    FILE_OBJECTID_BUFFER id1, id2;
     IO_STATUS_BLOCK io;
 
-    return !NtQueryInformationFile( h1, &io, &id1, sizeof(id1), FileIdInformation ) &&
-           !NtQueryInformationFile( h2, &io, &id2, sizeof(id2), FileIdInformation ) &&
-           !memcmp( &id1, &id2, sizeof(FILE_ID_INFORMATION) );
+    return (!NtFsControlFile( h1, 0, NULL, NULL, &io, FSCTL_GET_OBJECT_ID, NULL, 0, &id1, sizeof(id1) ) &&
+            !NtFsControlFile( h2, 0, NULL, NULL, &io, FSCTL_GET_OBJECT_ID, NULL, 0, &id2, sizeof(id2) ) &&
+            !memcmp( &id1.ObjectId, &id2.ObjectId, sizeof(id1.ObjectId) ));
 }
 
 




More information about the wine-cvs mailing list