Large file offset fix

diff --git a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
index fbb6d1d..7788bfe 100644 (file)
--- a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
+++ b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
@@ -56,7 +56,7 @@ using System.Windows;
 [assembly: AssemblyCopyright("Copyright © GRNet 2011-2012")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyInformationalVersion("2012-03-14")]
+[assembly: AssemblyInformationalVersion("2012-03-20")]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
@@ -93,5 +93,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.7.20312.0")]
-[assembly: AssemblyFileVersionAttribute("0.7.20312.0")]
+[assembly: AssemblyVersion("0.7.20313.0")]
+[assembly: AssemblyFileVersionAttribute("0.7.20313.0")]

diff --git a/trunk/Pithos.Core/Agents/BlockExtensions.cs b/trunk/Pithos.Core/Agents/BlockExtensions.cs
index a58a3ea..9418b2a 100644 (file)
--- a/trunk/Pithos.Core/Agents/BlockExtensions.cs
+++ b/trunk/Pithos.Core/Agents/BlockExtensions.cs
@@ -56,8 +56,11 @@ namespace Pithos.Core.Agents
     {
         
 
-        public static int Read(this FileInfo fileInfo,byte[] buffer,int offset,int count)
-        {            
+        public static int Read(this FileInfo fileInfo,byte[] buffer,long offset,int count)
+        {
+            if (offset <= 0)
+                throw new ArgumentOutOfRangeException("offset", offset, "The file offset can't be negative");
+            Contract.EndContractBlock();
             //Open the stream only long enough to read a block
             using (var stream = fileInfo.OpenRead())
             {

diff --git a/trunk/Pithos.Core/Agents/BlockUpdater.cs b/trunk/Pithos.Core/Agents/BlockUpdater.cs
index 3aac381..3eff1c6 100644 (file)
--- a/trunk/Pithos.Core/Agents/BlockUpdater.cs
+++ b/trunk/Pithos.Core/Agents/BlockUpdater.cs
@@ -188,7 +188,7 @@ namespace Pithos.Core.Agents
                     var blockIndex = block.Key;
                     using (var blockStream = File.OpenRead(blockPath))
                     {                        
-                        var offset = blockIndex*ServerHash.BlockSize;
+                        long offset = blockIndex*ServerHash.BlockSize;
                         stream.Seek(offset, SeekOrigin.Begin);
                         blockStream.CopyTo(stream);
                     }

diff --git a/trunk/Pithos.Core/Agents/NetworkAgent.cs b/trunk/Pithos.Core/Agents/NetworkAgent.cs
index e6be6f9..bf48ad8 100644 (file)
--- a/trunk/Pithos.Core/Agents/NetworkAgent.cs
+++ b/trunk/Pithos.Core/Agents/NetworkAgent.cs
@@ -959,7 +959,7 @@ namespace Pithos.Core.Agents
                 {
                     //Find the proper block
                     var blockIndex = treeHash.HashDictionary[missingHash];
-                    var offset = blockIndex*accountInfo.BlockSize;
+                    long offset = blockIndex*accountInfo.BlockSize;
 
                     var read = fileInfo.Read(buffer, offset, accountInfo.BlockSize);
 

diff --git a/trunk/Pithos.Installer/versioninfo.xml b/trunk/Pithos.Installer/versioninfo.xml
index 11b7cfa..ea7c585 100644 (file)
--- a/trunk/Pithos.Installer/versioninfo.xml
+++ b/trunk/Pithos.Installer/versioninfo.xml
@@ -5,7 +5,18 @@
                <title>Pithos MS Client</title>      \r
                <link>https://code.grnet.gr/projects/pithos-ms-client/repository/revisions/master/changes/trunk/Pithos.Installer/versioninfo.xml</link>     \r
                <description></description>      \r
-               <language>en</language>      \r
+               <language>en</language>                 \r
+               <item>            \r
+                       <title>Version 0.7.20313</title>\r
+                       <sparkle:releaseNotesLink>https://code.grnet.gr/projects/pithos-ms-client/repository/revisions/master/raw/trunk/Pithos.Installer/rnotes.0.7.20313.html</sparkle:releaseNotesLink>\r
+                       <pubDate>Tue, 20 Mar 2012 09:00:00 +0200</pubDate>\r
+                       <enclosure \r
+                               url="https://code.grnet.gr/attachments/download/1023/PithosPlus_Setupv0.7.20313.0.exe"\r
+                               length="4334895" \r
+                               type="application/octet-stream"\r
+                               sparkle:version="0.7.20313" \r
+                       />\r
+               </item>\r
                <item>            \r
                        <title>Version 0.7.20312</title>\r
                        <sparkle:releaseNotesLink>https://code.grnet.gr/projects/pithos-ms-client/repository/revisions/master/raw/trunk/Pithos.Installer/rnotes.0.7.20312.html</sparkle:releaseNotesLink>\r