Changeset 2414


Ignore:
Timestamp:
3/8/2012 1:21:36 PM (6 years ago)
Author:
lowjoel
Message:

Forward-port from Eraser 6.0: Changes made to the Bootstrapper to use the latest LZMA SDK API.

Location:
trunk/eraser
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/eraser

  • trunk/eraser/Installer/Bootstrapper/Bootstrapper.cpp

    r1675 r2414  
    116116    size_t CurrentOffset; 
    117117 
    118     static SRes LZMemStreamLook(void* object, void** buf, size_t* size) 
     118    static SRes LZMemStreamLook(void* object, const void** buf, size_t* size) 
    119119    { 
    120120        if (*size == 0) 
     
    238238        size_t convertedChars = 0; 
    239239        wchar_t fileName[MAX_PATH]; 
    240         mbstowcs_s(&convertedChars, fileName, file->Name, sizeof(fileName) / sizeof(fileName[0])); 
     240        SzArEx_GetFileNameUtf16(&db, i, reinterpret_cast<UInt16*>(fileName)); 
    241241         
    242242        //Split the path to get the file name only. 
     
    259259        while (result == SZ_OK && destFileSize) 
    260260        { 
    261             result = SzAr_Extract(&db, &stream.InStream, i, &blockIndex, 
     261            result = SzArEx_Extract(&db, &stream.InStream, i, &blockIndex, 
    262262                &outBuffer, &outBufferSize, &offset, &processedSize, &allocImp, 
    263263                &allocTempImp); 
  • trunk/eraser/Installer/Bootstrapper/Bootstrapper.vcxproj

    r2320 r2414  
    6969    </ClCompile> 
    7070    <Link> 
    71       <AdditionalDependencies>comctl32.lib;7zd.lib;%(AdditionalDependencies)</AdditionalDependencies> 
     71      <AdditionalDependencies>comctl32.lib;7zLib.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    7272      <OutputFile>$(OutDir)Bootstrapper.exe</OutputFile> 
    7373      <GenerateDebugInformation>true</GenerateDebugInformation> 
     
    9191    </ClCompile> 
    9292    <Link> 
    93       <AdditionalDependencies>comctl32.lib;7z.lib;%(AdditionalDependencies)</AdditionalDependencies> 
     93      <AdditionalDependencies>comctl32.lib;7zLib.lib;%(AdditionalDependencies)</AdditionalDependencies> 
    9494      <OutputFile>$(OutDir)Bootstrapper.exe</OutputFile> 
    9595      <GenerateDebugInformation>true</GenerateDebugInformation> 
  • trunk/eraser/Installer/Bootstrapper/stdafx.h

    r1675 r2414  
    3939//7-zip SDK 
    4040extern "C" { 
     41    #include <C/7z.h> 
     42    #include <C/7zAlloc.h> 
    4143    #include <C/7zCrc.h> 
    42     #include <C/Archive/7z/7zIn.h> 
    43     #include <C/Archive/7z/7zAlloc.h> 
    44     #include <C/Archive/7z/7zDecode.h> 
    45     #include <C/Archive/7z/7zExtract.h> 
    4644} 
    4745 
Note: See TracChangeset for help on using the changeset viewer.