5 files changed, 51 insertions, 13 deletions

diff --git a/xdelta3/xdelta3-blkcache.h b/xdelta3/xdelta3-blkcache.h
index dcd4c06..36f8216 100644
--- a/xdelta3/xdelta3-blkcache.h
+++ b/xdelta3/xdelta3-blkcache.h
@@ -21,6 +21,8 @@
 /* TODO: This code is heavily revised from 3.0z but still needs major
  * refactoring. */
 
+#include "xdelta3-internal.h"
+
 typedef struct _main_blklru      main_blklru;
 typedef struct _main_blklru_list main_blklru_list;
 
@@ -38,8 +40,7 @@ struct _main_blklru
   main_blklru_list  link;
 };
 
-/* TODO: The value for MAX_LRU_SIZE has what significance? */
-#define MAX_LRU_SIZE 32U  /* must be a power of 2 */
+#define MAX_LRU_SIZE 32U
 #define XD3_MINSRCWINSZ (XD3_ALLOCSIZE * MAX_LRU_SIZE)
 
 XD3_MAKELIST(main_blklru_list,main_blklru,link);
@@ -67,7 +68,7 @@ static void main_lru_cleanup (void)
 {
   if (lru != NULL)
     {
-      main_free (lru[0].blk);
+      main_buffree (lru[0].blk);
     }
 
   main_free (lru);
@@ -145,7 +146,7 @@ main_set_source (xd3_stream *stream, xd3_cmd cmd,
   memset (lru, 0, sizeof(lru[0]) * MAX_LRU_SIZE);
 
   /* Allocate the entire buffer. */
-  if ((lru[0].blk = (uint8_t*) main_malloc (option_srcwinsz)) == NULL)
+  if ((lru[0].blk = (uint8_t*) main_bufalloc (option_srcwinsz)) == NULL)
     {
       ret = ENOMEM;
       return ret;
@@ -189,11 +190,11 @@ main_set_source (xd3_stream *stream, xd3_cmd cmd,
   if (!sfile->size_known || source_size > option_srcwinsz)
     {
       /* Modify block 0, change blocksize. */
-      lru_size = MAX_LRU_SIZE;
-      blksize = option_srcwinsz / MAX_LRU_SIZE;  /* Power of 2 */
+      blksize = option_srcwinsz / MAX_LRU_SIZE;
       source->blksize = blksize;
       source->onblk = blksize;  /* xd3 sets onblk */
       lru[0].size = blksize;
+      lru_size = MAX_LRU_SIZE;
 
       /* Setup rest of blocks. */
       for (i = 1; i < lru_size; i += 1)
diff --git a/xdelta3/xdelta3-internal.h b/xdelta3/xdelta3-internal.h
index 10ecb38..955a277 100644
--- a/xdelta3/xdelta3-internal.h
+++ b/xdelta3/xdelta3-internal.h
@@ -23,6 +23,8 @@
 typedef struct _main_file        main_file;
 typedef struct _main_extcomp     main_extcomp;
 
+void main_buffree (void *ptr);
+void* main_bufalloc (usize_t size);
 void main_file_init (main_file *xfile);
 int main_file_close (main_file *xfile);
 void main_file_cleanup (main_file *xfile);
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h
index dfac8b7..5b1efa9 100644
--- a/xdelta3/xdelta3-main.h
+++ b/xdelta3/xdelta3-main.h
@@ -391,6 +391,7 @@ main_config (void)
   XPR(NTR "XD3_HARDMAXWINSIZE=%d\n", XD3_HARDMAXWINSIZE);
   XPR(NTR "sizeof(void*)=%d\n", (int)sizeof(void*));
   XPR(NTR "sizeof(int)=%d\n", (int)sizeof(int));
+  XPR(NTR "sizeof(size_t)=%d\n", (int)sizeof(size_t));
   XPR(NTR "sizeof(uint32_t)=%d\n", (int)sizeof(uint32_t));
   XPR(NTR "sizeof(uint64_t)=%d\n", (int)sizeof(uint64_t));
   XPR(NTR "sizeof(usize_t)=%d\n", (int)sizeof(usize_t));
@@ -450,6 +451,14 @@ main_malloc1 (usize_t size)
   return r;
 }
 
+void* main_bufalloc (usize_t size) {
+#if XD3_WIN32
+  return VirtualAlloc(NULL, size, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
+#else
+  return main_malloc1(size);
+#endif
+}
+
 static void*
 main_malloc (usize_t size)
 {
@@ -484,6 +493,14 @@ main_free (void *ptr)
     }
 }
 
+void main_buffree (void *ptr) {
+#if XD3_WIN32
+  VirtualFree(ptr, 0, MEM_RELEASE);
+#else
+  main_free(ptr);
+#endif
+}
+
 /* This ensures that (ret = errno) always indicates failure, in case errno was
  * accidentally not set.  If this prints there's a bug somewhere. */
 static int
@@ -1752,7 +1769,7 @@ main_merge_arguments (main_merge_list* merges)
 
       if (main_bdata != NULL)
         {
-          main_free (main_bdata);
+          main_buffree (main_bdata);
           main_bdata = NULL;
           main_bsize = 0;
         }
@@ -1887,11 +1904,11 @@ main_merge_output (xd3_stream *stream, main_file *ofile)
 
       if (main_bsize < window_size)
         {
-          main_free (main_bdata);
+          main_buffree (main_bdata);
           main_bdata = NULL;
           main_bsize = 0;
           if ((main_bdata = (uint8_t*)
-               main_malloc (window_size)) == NULL)
+               main_bufalloc (window_size)) == NULL)
             {
               return ENOMEM;
             }
@@ -3079,7 +3096,7 @@ main_input (xd3_cmd     cmd,
 
   main_bsize = winsize = main_get_winsize (ifile);
 
-  if ((main_bdata = (uint8_t*) main_malloc (winsize)) == NULL)
+  if ((main_bdata = (uint8_t*) main_bufalloc (winsize)) == NULL)
     {
       return EXIT_FAILURE;
     }
@@ -3441,7 +3458,7 @@ main_cleanup (void)
       appheader_used = NULL;
     }
 
-  main_free (main_bdata);
+  main_buffree (main_bdata);
   main_bdata = NULL;
   main_bsize = 0;
 
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h
index 8a94729..6256961 100644
--- a/xdelta3/xdelta3.h
+++ b/xdelta3/xdelta3.h
@@ -29,7 +29,9 @@
 #define _ISOC99_SOURCE
 #define _C99_SOURCE
 
+#if HAVE_CONFIG_H
 #include "config.h"
+#endif
 
 #include <errno.h>
 #include <stdarg.h>
diff --git a/xdelta3/xdelta3.vcxproj b/xdelta3/xdelta3.vcxproj
index 6b82af7..8d4464b 100755
--- a/xdelta3/xdelta3.vcxproj
+++ b/xdelta3/xdelta3.vcxproj
@@ -16,6 +16,22 @@
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/DXD3_DEBUG=0 /DXD3_USE_LARGEFILE64=1 /DREGRESSION_TEST=1 /DSECONDARY_DJW=1 /DSECONDARY_FGK=1 /DXD3_MAIN=1 /DXD3_WIN32=1 /DEXTERNAL_COMPRESSION=0 /DXD3_STDIO=0 /DXD3_POSIX=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>

     </ClCompile>

   </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="xdelta3-blkcache.h" />

+    <ClInclude Include="xdelta3-cfgs.h" />

+    <ClInclude Include="xdelta3-decode.h" />

+    <ClInclude Include="xdelta3-djw.h" />

+    <ClInclude Include="xdelta3-fgk.h" />

+    <ClInclude Include="xdelta3-hash.h" />

+    <ClInclude Include="xdelta3-internal.h" />

+    <ClInclude Include="xdelta3-list.h" />

+    <ClInclude Include="xdelta3-lzma.h" />

+    <ClInclude Include="xdelta3-main.h" />

+    <ClInclude Include="xdelta3-merge.h" />

+    <ClInclude Include="xdelta3-second.h" />

+    <ClInclude Include="xdelta3-test.h" />

+    <ClInclude Include="xdelta3.h" />

+  </ItemGroup>

   <PropertyGroup Label="Globals">

     <ProjectGuid>{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}</ProjectGuid>

     <Keyword>Win32Proj</Keyword>

@@ -25,13 +41,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">

     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

-    <CharacterSet>Unicode</CharacterSet>

+    <CharacterSet>MultiByte</CharacterSet>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">

     <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>false</UseDebugLibraries>

     <WholeProgramOptimization>true</WholeProgramOptimization>

-    <CharacterSet>Unicode</CharacterSet>

+    <CharacterSet>MultiByte</CharacterSet>

   </PropertyGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

   <ImportGroup Label="ExtensionSettings">