From 023693693a451571c87d51b67b9c30a0176ffc89 Mon Sep 17 00:00:00 2001
From: Ted Smith <tedsmith28@yahoo.co.uk>
Date: Fri, 1 Jul 2016 17:27:58 +0100
Subject: [PATCH] v2.6.9 Final

---
 DiskModule/diskmoduleunit1.lfm |   2 +-
 README.txt                     |  14 +++
 project1.lpi                   | 179 ++++++++++++++++-----------------
 unit2.lfm                      |   4 +-
 4 files changed, 103 insertions(+), 96 deletions(-)

diff --git a/DiskModule/diskmoduleunit1.lfm b/DiskModule/diskmoduleunit1.lfm
index 1855542..b8e6b95 100755
--- a/DiskModule/diskmoduleunit1.lfm
+++ b/DiskModule/diskmoduleunit1.lfm
@@ -3,7 +3,7 @@ object frmDiskHashingModule: TfrmDiskHashingModule
   Height = 600
   Top = 155
   Width = 691
-  Caption = 'QuickHash 2.6.8 (2011 - 2015) (c) Ted Smith - Disk Hashing Module'
+  Caption = 'QuickHash 2.6.9 (2011 - 2015) (c) Ted Smith - Disk Hashing Module'
   ClientHeight = 600
   ClientWidth = 691
   Position = poScreenCenter
diff --git a/README.txt b/README.txt
index 03e1361..65567e0 100755
--- a/README.txt
+++ b/README.txt
@@ -1,3 +1,17 @@
+
+V2.6.9 – July 2016
+
+The UNC and long path name fixes still had not entirely worked as hoped when tested on big data sets. Further fixes implemented to ensure the filename and path to an existing file in a very long path is detected, and likewise re-created when copied. 
+
+Improvements made to the way QH reports errors. Errors are generally quite rare except when dealing with very large volumes of network data in a dynamic environment. Prior to v2.6.9, a message window would appear which was not very useful if there were over a few dozen errors because the list was too big for the screen and the automatic saving of that data seemed to go wrong and generate save errors. That was fixed to a simple warning that errors were found and the user is now prompted to save a text file in a place of their choosing.  
+
+If QuickHash fails to initiate a handle to a file at the time of hashing, not only will the user be told that there was an error initiating a handle (as it did before) but it will now tell you which file is causing the problem. 
+
+If the user pastes the path of a mounted drive as a UNC path (e.g. M:\MyServer\MyDataShare\MyFolder) as either source or destination, the user will now be told to fix it to a true UNC path rather than simply crashing out!  
+
+Status bar in the bottom of the Copy tab (the part that shows the user what file is currently being hashed) was being truncated if the path length was particularly long, and was still truncated even if maximised to the full screen size on a 40” monitor! That has been improved. 
+
+
 V2.6.8 – June 2016
 
 In the 'Copy' tab, users can now select multiple source folders so that multiple folder content can be hashed, copied to a single destination folder, and then hashed again. Note that an experimental limit exists – if the list of files in memory exceeds 2Gb, Quickhash will likely crash. Please report such instances. If they are too many, I will implement another technique. 
diff --git a/project1.lpi b/project1.lpi
index f729988..27a434c 100755
--- a/project1.lpi
+++ b/project1.lpi
@@ -19,7 +19,7 @@
       <MajorVersionNr Value="2"/>
       <MinorVersionNr Value="6"/>
       <RevisionNr Value="2"/>
-      <BuildNr Value="13"/>
+      <BuildNr Value="14"/>
       <Language Value="0809"/>
       <StringTable Comments="Free, cross platform, open-source file and disk hashing software" CompanyName="Ted Smith (Ted Technology on Sourceforge)" FileDescription="File hashing GUI for Linux &amp; Windows" LegalCopyright="2011 - 2015 (c) Ted Smith" ProductName="QuickHash" ProductVersion="2.6.2.b"/>
     </VersionInfo>
@@ -50,7 +50,7 @@
       <Unit0>
         <Filename Value="project1.lpr"/>
         <IsPartOfProject Value="True"/>
-        <EditorIndex Value="7"/>
+        <EditorIndex Value="5"/>
         <CursorPos X="46" Y="24"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
@@ -90,8 +90,8 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="Unit2"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="1716"/>
-        <CursorPos X="34" Y="1753"/>
+        <TopLine Value="1486"/>
+        <CursorPos X="52" Y="1503"/>
         <UsageCount Value="201"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
@@ -100,67 +100,67 @@
         <Filename Value="../dcpcrypt-2.0.4.1/dcpcrypt2.pas"/>
         <TopLine Value="299"/>
         <CursorPos X="46" Y="306"/>
-        <UsageCount Value="0"/>
+        <UsageCount Value="10"/>
       </Unit6>
       <Unit7>
         <Filename Value="../dcpcrypt-2.0.4.1/Hashes/dcphaval.pas"/>
         <TopLine Value="275"/>
         <CursorPos X="54" Y="299"/>
-        <UsageCount Value="0"/>
+        <UsageCount Value="10"/>
       </Unit7>
       <Unit8>
         <Filename Value="../dcpcrypt-2.0.4.1/Hashes/dcpmd4.pas"/>
         <TopLine Value="168"/>
         <CursorPos X="52" Y="192"/>
-        <UsageCount Value="0"/>
+        <UsageCount Value="10"/>
       </Unit8>
       <Unit9>
         <Filename Value="../dcpcrypt-2.0.4.1/Hashes/dcpmd5.pas"/>
         <TopLine Value="185"/>
         <CursorPos X="52" Y="209"/>
-        <UsageCount Value="0"/>
+        <UsageCount Value="10"/>
       </Unit9>
       <Unit10>
         <Filename Value="../dcpcrypt-2.0.4.1/Hashes/dcpripemd128.pas"/>
         <TopLine Value="251"/>
         <CursorPos X="58" Y="275"/>
-        <UsageCount Value="0"/>
+        <UsageCount Value="10"/>
       </Unit10>
       <Unit11>
         <Filename Value="../dcpcrypt-2.0.4.1/Hashes/dcpripemd160.pas"/>
         <TopLine Value="612"/>
         <CursorPos X="58" Y="636"/>
-        <UsageCount Value="0"/>
+        <UsageCount Value="10"/>
       </Unit11>
       <Unit12>
         <Filename Value="../dcpcrypt-2.0.4.1/Hashes/dcpsha1.pas"/>
         <TopLine Value="204"/>
         <CursorPos X="53" Y="228"/>
-        <UsageCount Value="0"/>
+        <UsageCount Value="10"/>
       </Unit12>
       <Unit13>
         <Filename Value="../dcpcrypt-2.0.4.1/Hashes/dcpsha256.pas"/>
         <TopLine Value="10"/>
         <CursorPos Y="10"/>
-        <UsageCount Value="0"/>
+        <UsageCount Value="10"/>
       </Unit13>
       <Unit14>
         <Filename Value="../dcpcrypt-2.0.4.1/Hashes/dcpsha512.pas"/>
         <TopLine Value="185"/>
         <CursorPos X="59" Y="209"/>
-        <UsageCount Value="0"/>
+        <UsageCount Value="10"/>
       </Unit14>
       <Unit15>
         <Filename Value="../dcpcrypt-2.0.4.1/Hashes/dcptiger.pas"/>
         <TopLine Value="231"/>
         <CursorPos X="26" Y="265"/>
-        <UsageCount Value="0"/>
+        <UsageCount Value="10"/>
       </Unit15>
       <Unit16>
         <Filename Value="sha1customised.pas"/>
         <IsPartOfProject Value="True"/>
         <UnitName Value="sha1Customised"/>
-        <EditorIndex Value="6"/>
+        <EditorIndex Value="4"/>
         <TopLine Value="297"/>
         <CursorPos X="27" Y="310"/>
         <UsageCount Value="200"/>
@@ -169,7 +169,7 @@
       <Unit17>
         <Filename Value="md5customised.pas"/>
         <IsPartOfProject Value="True"/>
-        <EditorIndex Value="5"/>
+        <EditorIndex Value="3"/>
         <TopLine Value="611"/>
         <CursorPos X="87" Y="632"/>
         <UsageCount Value="200"/>
@@ -249,7 +249,7 @@
       </Unit29>
       <Unit30>
         <Filename Value="DiskModule/diskmoduleunit1.lfm"/>
-        <EditorIndex Value="9"/>
+        <EditorIndex Value="7"/>
         <UsageCount Value="55"/>
         <Loaded Value="True"/>
         <DefaultSyntaxHighlighter Value="LFM"/>
@@ -261,7 +261,7 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="DiskModuleUnit1"/>
-        <EditorIndex Value="8"/>
+        <EditorIndex Value="6"/>
         <TopLine Value="122"/>
         <CursorPos X="70" Y="148"/>
         <UsageCount Value="205"/>
@@ -312,7 +312,7 @@
       <Unit39>
         <Filename Value="/lazarus/fpc/2.6.4/source/rtl/objpas/types.pp"/>
         <TopLine Value="105"/>
-        <UsageCount Value="0"/>
+        <UsageCount Value="10"/>
       </Unit39>
       <Unit40>
         <Filename Value="MD5TransformEnhancedAssemblyCode.pas"/>
@@ -323,13 +323,13 @@
         <Filename Value="findallfilesenhancedunit.pas"/>
         <IsPartOfProject Value="True"/>
         <CursorPos X="43" Y="15"/>
-        <UsageCount Value="173"/>
+        <UsageCount Value="174"/>
       </Unit41>
       <Unit42>
         <Filename Value="FindAllFilesEnhanced.pas"/>
-        <EditorIndex Value="4"/>
-        <TopLine Value="26"/>
-        <CursorPos Y="48"/>
+        <EditorIndex Value="2"/>
+        <TopLine Value="15"/>
+        <CursorPos X="3" Y="49"/>
         <UsageCount Value="79"/>
         <Loaded Value="True"/>
       </Unit42>
@@ -411,10 +411,10 @@
         <HasResources Value="True"/>
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="uDisplayGrid"/>
-        <EditorIndex Value="3"/>
+        <EditorIndex Value="1"/>
         <TopLine Value="13"/>
         <CursorPos X="3" Y="30"/>
-        <UsageCount Value="107"/>
+        <UsageCount Value="108"/>
         <Loaded Value="True"/>
         <LoadedDesigner Value="True"/>
       </Unit55>
@@ -539,142 +539,136 @@
         <UsageCount Value="9"/>
       </Unit72>
       <Unit73>
-        <Filename Value="C:/lazarus/fpc/2.6.4/source/rtl/objpas/sysutils/finah.inc"/>
-        <EditorIndex Value="1"/>
+        <Filename Value="../../../../lazarus/fpc/2.6.4/source/rtl/objpas/sysutils/finah.inc"/>
+        <EditorIndex Value="-1"/>
         <CursorPos X="10" Y="22"/>
         <UsageCount Value="11"/>
-        <Loaded Value="True"/>
       </Unit73>
       <Unit74>
-        <Filename Value="C:/lazarus/fpc/2.6.4/source/rtl/objpas/sysutils/fina.inc"/>
-        <EditorIndex Value="2"/>
+        <Filename Value="../../../../lazarus/fpc/2.6.4/source/rtl/objpas/sysutils/fina.inc"/>
+        <EditorIndex Value="-1"/>
         <TopLine Value="55"/>
         <CursorPos X="3" Y="65"/>
         <UsageCount Value="11"/>
-        <Loaded Value="True"/>
       </Unit74>
     </Units>
-    <JumpHistory Count="30" HistoryIndex="29">
+    <JumpHistory Count="29" HistoryIndex="28">
       <Position1>
         <Filename Value="sha1customised.pas"/>
-        <Caret Line="82" TopLine="55"/>
+        <Caret Line="356" TopLine="334"/>
       </Position1>
       <Position2>
         <Filename Value="sha1customised.pas"/>
-        <Caret Line="83" TopLine="55"/>
+        <Caret Line="340" TopLine="319"/>
       </Position2>
       <Position3>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="84" TopLine="55"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="2780" TopLine="2759"/>
       </Position3>
       <Position4>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="85" TopLine="55"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="1738" Column="22" TopLine="1716"/>
       </Position4>
       <Position5>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="316" TopLine="293"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="2775" Column="24" TopLine="2763"/>
       </Position5>
       <Position6>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="318" TopLine="293"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="2266" Column="59" TopLine="2229"/>
       </Position6>
       <Position7>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="319" TopLine="293"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="2900" TopLine="2860"/>
       </Position7>
       <Position8>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="320" TopLine="293"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="1446" Column="15" TopLine="1415"/>
       </Position8>
       <Position9>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="325" TopLine="293"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="188" Column="15" TopLine="166"/>
       </Position9>
       <Position10>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="327" TopLine="293"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="1426" Column="49" TopLine="1402"/>
       </Position10>
       <Position11>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="328" TopLine="293"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="1417" TopLine="1402"/>
       </Position11>
       <Position12>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="329" TopLine="293"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="1418" TopLine="1402"/>
       </Position12>
       <Position13>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="330" TopLine="293"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="1420" TopLine="1402"/>
       </Position13>
       <Position14>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="331" TopLine="293"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="1422" TopLine="1402"/>
       </Position14>
       <Position15>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="332" TopLine="294"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="1278" TopLine="1255"/>
       </Position15>
       <Position16>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="355" TopLine="321"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="1279" TopLine="1255"/>
       </Position16>
       <Position17>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="263" TopLine="240"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="1280" TopLine="1255"/>
       </Position17>
       <Position18>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="266" TopLine="240"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="1285" TopLine="1255"/>
       </Position18>
       <Position19>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="269" TopLine="240"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="1288" TopLine="1255"/>
       </Position19>
       <Position20>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="270" TopLine="240"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="1290" TopLine="1255"/>
       </Position20>
       <Position21>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="205" TopLine="182"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="1432" TopLine="1410"/>
       </Position21>
       <Position22>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="206" TopLine="182"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="1433" TopLine="1410"/>
       </Position22>
       <Position23>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="209" TopLine="182"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="1434" TopLine="1410"/>
       </Position23>
       <Position24>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="210" TopLine="182"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="1411" TopLine="1403"/>
       </Position24>
       <Position25>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="213" TopLine="182"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="1413" TopLine="1403"/>
       </Position25>
       <Position26>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="233" TopLine="211"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="1414" TopLine="1403"/>
       </Position26>
       <Position27>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="273" TopLine="250"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="1415" TopLine="1403"/>
       </Position27>
       <Position28>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="356" TopLine="334"/>
+        <Filename Value="unit2.pas"/>
+        <Caret Line="1416" TopLine="1403"/>
       </Position28>
       <Position29>
-        <Filename Value="sha1customised.pas"/>
-        <Caret Line="340" TopLine="319"/>
-      </Position29>
-      <Position30>
         <Filename Value="unit2.pas"/>
-        <Caret Line="2780" TopLine="2759"/>
-      </Position30>
+        <Caret Line="2072" TopLine="2049"/>
+      </Position29>
     </JumpHistory>
   </ProjectOptions>
   <CompilerOptions>
@@ -692,7 +686,6 @@
       </SyntaxOptions>
     </Parsing>
     <CodeGeneration>
-      <TargetOS Value="win32"/>
       <Optimizations>
         <OptimizationLevel Value="3"/>
       </Optimizations>
diff --git a/unit2.lfm b/unit2.lfm
index 5bdd878..6fdd0be 100755
--- a/unit2.lfm
+++ b/unit2.lfm
@@ -1,7 +1,7 @@
 object MainForm: TMainForm
-  Left = 421
+  Left = 306
   Height = 689
-  Top = 110
+  Top = 98
   Width = 1018
   AllowDropFiles = True
   Caption = 'Quick Hash v2.6.9 (c) 2011-2016 - The easy and convenient way to hash data in both Linux, Apple Mac and Windows'