*fix bugs (removing of TFileInfo structure).

ermig1979 · Feb 22, 2023 · a75791b · a75791b
1 parent 5847425
commit a75791b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/src/AntiDupl/AntiDupl.NET.Core/CoreImageInfo.cs b/src/AntiDupl/AntiDupl.NET.Core/CoreImageInfo.cs
@@ -33,7 +33,8 @@ public class CoreImageInfo
         public ulong id;
         public string path;
         public ulong size;
-        public ulong time;
+        public ulong time;
+        public uint hash;
         public CoreDll.ImageType type;
         public uint width;
         public uint height;
@@ -46,7 +47,8 @@ public CoreImageInfo(ref CoreDll.adImageInfoW imageInfo)
             id = (ulong)imageInfo.id;
             path = imageInfo.path;
             size = imageInfo.size;
-            time = imageInfo.time;
+            time = imageInfo.time;
+            hash = imageInfo.hash;
             type = imageInfo.type;
             width = imageInfo.width;
             height = imageInfo.height;

diff --git a/src/AntiDupl/AntiDupl.NET.Core/Original/CoreDll.cs b/src/AntiDupl/AntiDupl.NET.Core/Original/CoreDll.cs
@@ -395,7 +395,8 @@ public struct adImageInfoW
             [MarshalAs(UnmanagedType.ByValTStr, SizeConst = MAX_PATH_EX)]
             public string path;
             public ulong size;
-            public ulong time;
+            public ulong time;
+            public uint hash;
             public ImageType type;
             public uint width;
             public uint height;

diff --git a/src/AntiDupl/AntiDupl/AntiDupl.h b/src/AntiDupl/AntiDupl/AntiDupl.h
@@ -519,6 +519,7 @@ extern "C"
         adPathA path;
         adUInt64 size;
         adUInt64 time;
+        adUInt32 hash;
         adImageType type;
         adUInt32 width;
         adUInt32 height;
@@ -535,6 +536,7 @@ extern "C"
         adPathW path;
         adUInt64 size;
         adUInt64 time;
+        adUInt32 hash;
         adImageType type;
         adUInt32 width;
         adUInt32 height;

diff --git a/src/AntiDupl/AntiDupl/adImageInfo.cpp b/src/AntiDupl/AntiDupl/adImageInfo.cpp
@@ -60,6 +60,7 @@ namespace ad
         if (GetFileAttributesEx(path_.c_str(), GetFileExInfoStandard,
             &fileAttributeData))
         {
+            path = path_;
             size = TUInt64(fileAttributeData.nFileSizeLow) +
                 TUInt64(fileAttributeData.nFileSizeHigh) * 0x100000000;
             time = *(TUInt64*)&fileAttributeData.ftLastWriteTime;
@@ -146,6 +147,7 @@ namespace ad
         path.Original().CopyTo(pImageInfo->path, MAX_PATH);
         pImageInfo->size = size;
         pImageInfo->time = time;
+        pImageInfo->hash = hash;
         pImageInfo->type = type;
         pImageInfo->width = width;
         pImageInfo->height = height;
@@ -165,6 +167,7 @@ namespace ad
         path.Original().CopyTo(pImageInfo->path, MAX_PATH_EX);
         pImageInfo->size = size;
         pImageInfo->time = time;
+        pImageInfo->hash = hash;
         pImageInfo->type = type;
         pImageInfo->width = width;
         pImageInfo->height = height;