diff options
-rw-r--r-- | xdelta3/xdelta3-main.h | 4 | ||||
-rwxr-xr-x | xdelta3/xdelta3.vcxproj | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h index 00f8aa7..0081cc2 100644 --- a/xdelta3/xdelta3-main.h +++ b/xdelta3/xdelta3-main.h | |||
@@ -2808,11 +2808,11 @@ main_get_appheader (xd3_stream *stream, main_file *ifile, | |||
2808 | 2808 | ||
2809 | if (appheadsz > 0) | 2809 | if (appheadsz > 0) |
2810 | { | 2810 | { |
2811 | const int kMaxArgs = 4; | ||
2812 | char *start = (char*)apphead; | 2811 | char *start = (char*)apphead; |
2813 | char *slash; | 2812 | char *slash; |
2814 | int place = 0; | 2813 | int place = 0; |
2815 | char *parsed[kMaxArgs]; | 2814 | const int kMaxArgs = 4; |
2815 | char *parsed[4]; | ||
2816 | 2816 | ||
2817 | memset (parsed, 0, sizeof (parsed)); | 2817 | memset (parsed, 0, sizeof (parsed)); |
2818 | 2818 | ||
diff --git a/xdelta3/xdelta3.vcxproj b/xdelta3/xdelta3.vcxproj index 8cee9b9..1bff06b 100755 --- a/xdelta3/xdelta3.vcxproj +++ b/xdelta3/xdelta3.vcxproj | |||
@@ -197,7 +197,7 @@ | |||
197 | <Link> | 197 | <Link> |
198 | <SubSystem>Console</SubSystem> | 198 | <SubSystem>Console</SubSystem> |
199 | <GenerateDebugInformation>true</GenerateDebugInformation> | 199 | <GenerateDebugInformation>true</GenerateDebugInformation> |
200 | <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;..\xz\bin_i486\liblzma_static.lib;%(AdditionalDependencies)</AdditionalDependencies> | 200 | <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;..\..\..\..\src\xz\bin_i486\liblzma_static.lib;%(AdditionalDependencies)</AdditionalDependencies> |
201 | </Link> | 201 | </Link> |
202 | </ItemDefinitionGroup> | 202 | </ItemDefinitionGroup> |
203 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> | 203 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> |
@@ -224,7 +224,7 @@ | |||
224 | <Link> | 224 | <Link> |
225 | <SubSystem>Console</SubSystem> | 225 | <SubSystem>Console</SubSystem> |
226 | <GenerateDebugInformation>true</GenerateDebugInformation> | 226 | <GenerateDebugInformation>true</GenerateDebugInformation> |
227 | <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;..\xz\bin_x86-64\liblzma_static.lib;%(AdditionalDependencies)</AdditionalDependencies> | 227 | <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;..\..\..\..\src\xz\bin_x86-64\liblzma_static.lib;%(AdditionalDependencies)</AdditionalDependencies> |
228 | </Link> | 228 | </Link> |
229 | </ItemDefinitionGroup> | 229 | </ItemDefinitionGroup> |
230 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | 230 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
@@ -236,14 +236,14 @@ | |||
236 | <IntrinsicFunctions>true</IntrinsicFunctions> | 236 | <IntrinsicFunctions>true</IntrinsicFunctions> |
237 | <PreprocessorDefinitions>WIN32;XD3_MAIN=1;XD3_DEBUG=0;XD3_USE_LARGEFILE64=1;REGRESSION_TEST=1;SECONDARY_DJW=1;SECONDARY_FGK=1;SECONDARY_LZMA=1;XD3_WIN32=1;EXTERNAL_COMPRESSION=0;SHELL_TESTS=0;_DEBUG;_CONSOLE;LZMA_API_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 237 | <PreprocessorDefinitions>WIN32;XD3_MAIN=1;XD3_DEBUG=0;XD3_USE_LARGEFILE64=1;REGRESSION_TEST=1;SECONDARY_DJW=1;SECONDARY_FGK=1;SECONDARY_LZMA=1;XD3_WIN32=1;EXTERNAL_COMPRESSION=0;SHELL_TESTS=0;_DEBUG;_CONSOLE;LZMA_API_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
238 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | 238 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
239 | <AdditionalIncludeDirectories>..\xz\include</AdditionalIncludeDirectories> | 239 | <AdditionalIncludeDirectories>..\..\..\..\src\xz\include</AdditionalIncludeDirectories> |
240 | </ClCompile> | 240 | </ClCompile> |
241 | <Link> | 241 | <Link> |
242 | <SubSystem>Console</SubSystem> | 242 | <SubSystem>Console</SubSystem> |
243 | <GenerateDebugInformation>true</GenerateDebugInformation> | 243 | <GenerateDebugInformation>true</GenerateDebugInformation> |
244 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | 244 | <EnableCOMDATFolding>true</EnableCOMDATFolding> |
245 | <OptimizeReferences>true</OptimizeReferences> | 245 | <OptimizeReferences>true</OptimizeReferences> |
246 | <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;..\xz\bin_i486\liblzma_static.lib;%(AdditionalDependencies)</AdditionalDependencies> | 246 | <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;..\..\..\..\src\xz\bin_i486\liblzma_static.lib;%(AdditionalDependencies)</AdditionalDependencies> |
247 | </Link> | 247 | </Link> |
248 | </ItemDefinitionGroup> | 248 | </ItemDefinitionGroup> |
249 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> | 249 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> |
@@ -272,13 +272,14 @@ | |||
272 | <IntrinsicFunctions>true</IntrinsicFunctions> | 272 | <IntrinsicFunctions>true</IntrinsicFunctions> |
273 | <PreprocessorDefinitions>WIN32;XD3_MAIN=1;XD3_DEBUG=0;XD3_USE_LARGEFILE64=1;REGRESSION_TEST=1;SECONDARY_DJW=1;SECONDARY_FGK=1;SECONDARY_LZMA=1;XD3_WIN32=1;EXTERNAL_COMPRESSION=0;SHELL_TESTS=0;_DEBUG;_CONSOLE;LZMA_API_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> | 273 | <PreprocessorDefinitions>WIN32;XD3_MAIN=1;XD3_DEBUG=0;XD3_USE_LARGEFILE64=1;REGRESSION_TEST=1;SECONDARY_DJW=1;SECONDARY_FGK=1;SECONDARY_LZMA=1;XD3_WIN32=1;EXTERNAL_COMPRESSION=0;SHELL_TESTS=0;_DEBUG;_CONSOLE;LZMA_API_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
274 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | 274 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> |
275 | <AdditionalIncludeDirectories>..\..\..\..\src\xz\include</AdditionalIncludeDirectories> | ||
275 | </ClCompile> | 276 | </ClCompile> |
276 | <Link> | 277 | <Link> |
277 | <SubSystem>Console</SubSystem> | 278 | <SubSystem>Console</SubSystem> |
278 | <GenerateDebugInformation>true</GenerateDebugInformation> | 279 | <GenerateDebugInformation>true</GenerateDebugInformation> |
279 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | 280 | <EnableCOMDATFolding>true</EnableCOMDATFolding> |
280 | <OptimizeReferences>true</OptimizeReferences> | 281 | <OptimizeReferences>true</OptimizeReferences> |
281 | <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);..\xz\bin_x86-64\liblzma_static.lib</AdditionalDependencies> | 282 | <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies);..\..\..\..\src\xz\bin_x86-64\liblzma_static.lib</AdditionalDependencies> |
282 | </Link> | 283 | </Link> |
283 | </ItemDefinitionGroup> | 284 | </ItemDefinitionGroup> |
284 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='xdelta3-64|Win32'"> | 285 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='xdelta3-64|Win32'"> |