4 files changed, 6 insertions, 5 deletions

diff --git a/xdelta3/releases/xdelta3-3.0.6-win32.exe b/xdelta3/releases/xdelta3-3.0.6-win32.exe
new file mode 100644
index 0000000..7d03fa2
--- /dev/null
+++ b/xdelta3/releases/xdelta3-3.0.6-win32.exe
diff --git a/xdelta3/releases/xdelta3-3.0.6-x64.exe b/xdelta3/releases/xdelta3-3.0.6-x64.exe
new file mode 100644
index 0000000..2ee4c4c
--- /dev/null
+++ b/xdelta3/releases/xdelta3-3.0.6-x64.exe
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index af2336d..fcef08d 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -1015,10 +1015,11 @@ xd3_win32_io (HANDLE file, uint8_t *buf, size_t size,
 
   while (nproc < size)
     {
-      DWORD nproc2;
+      DWORD nproc2 = 0;  /* hmm */
+          DWORD nremain = size - nproc;
       if ((is_read ?
-           ReadFile (file, buf + nproc, size - nproc, &nproc2, NULL) :
-           WriteFile (file, buf + nproc, size - nproc, &nproc2, NULL)) == 0)
+           ReadFile (file, buf + nproc, nremain, &nproc2, NULL) :
+           WriteFile (file, buf + nproc, nremain, &nproc2, NULL)) == 0)
         {
           ret = get_errno();
           if (ret != ERROR_HANDLE_EOF && ret != ERROR_BROKEN_PIPE)
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index 686e05c..9c42318 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -110,7 +110,6 @@
  */
 #ifndef _WIN32
 #include <stdint.h>
-typedef uint32_t usize_t;
 #else
 #define WIN32_LEAN_AND_MEAN
 #if XD3_USE_LARGEFILE64
@@ -125,7 +124,6 @@ typedef uint32_t usize_t;
 #define _WIN32_WINNT    0x0400
 #endif
 #include <windows.h>
-typedef uint32_t usize_t;
 #ifdef _MSC_VER
 #define inline
 typedef signed int     ssize_t;
@@ -144,6 +142,8 @@ typedef ULONGLONG      uint64_t;
 #endif
 #endif
 
+typedef uint32_t usize_t;
+
 #if XD3_USE_LARGEFILE64
 #define __USE_FILE_OFFSET64 1 /* GLIBC: for 64bit fileops, ... ? */
 #ifndef _LARGEFILE_SOURCE