Changeset 2401 for branches/eraser6/6.0

Timestamp:

12/24/2011 3:09:00 AM (5 months ago)

Author:

lowjoel

Message:

Updated to the LZMA SDK 9.22-beta API.

Location:

branches/eraser6/6.0/Installer/Bootstrapper

Files:

• Bootstrapper.cpp (modified) (3 diffs)
• Bootstrapper.vcproj (modified) (2 diffs)
• stdafx.h (modified) (1 diff)

branches/eraser6/6.0/Installer/Bootstrapper/Bootstrapper.cpp

@@ -116 +116 @@
     size_t CurrentOffset;
 
-    static SRes LZMemStreamLook(void* object, void** buf, size_t* size)
+    static SRes LZMemStreamLook(void* object, const void** buf, size_t* size)
     {
         if (*size == 0)
@@ -238 +238 @@
         size_t convertedChars = 0;
         wchar_t fileName[MAX_PATH];
-        mbstowcs_s(&convertedChars, fileName, file->Name, sizeof(fileName) / sizeof(fileName[0]));
+        SzArEx_GetFileNameUtf16(&db, i, reinterpret_cast<UInt16*>(fileName));
         
         //Split the path to get the file name only.
@@ -259 +259 @@
         while (result == SZ_OK && destFileSize)
         {
-            result = SzAr_Extract(&db, &stream.InStream, i, &blockIndex,
+            result = SzArEx_Extract(&db, &stream.InStream, i, &blockIndex,
                 &outBuffer, &outBufferSize, &offset, &processedSize, &allocImp,
                 &allocTempImp);

branches/eraser6/6.0/Installer/Bootstrapper/Bootstrapper.vcproj

@@ -62 +62 @@
             <Tool
                 Name="VCLinkerTool"
-                AdditionalDependencies="comctl32.lib LzmaLib.lib"
+                AdditionalDependencies="comctl32.lib 7zLib.lib"
                 OutputFile="$(OutDir)\Bootstrapper.exe"
                 LinkIncremental="2"
@@ -137 +137 @@
             <Tool
                 Name="VCLinkerTool"
-                AdditionalDependencies="comctl32.lib LzmaLib.lib"
+                AdditionalDependencies="comctl32.lib 7zLib.lib"
                 OutputFile="$(OutDir)\Bootstrapper.exe"
                 LinkIncremental="1"

branches/eraser6/6.0/Installer/Bootstrapper/stdafx.h

@@ -39 +39 @@
 //7-zip SDK
 extern "C" {
+    #include <C/7z.h>
+    #include <C/7zAlloc.h>
     #include <C/7zCrc.h>
-    #include <C/Archive/7z/7zIn.h>
-    #include <C/Archive/7z/7zAlloc.h>
-    #include <C/Archive/7z/7zDecode.h>
-    #include <C/Archive/7z/7zExtract.h>
 }