Check-in [36ad977839]

Not logged in
Overview
SHA1 Hash:36ad9778393504d121a4d9c7c317d7d74b44d455
Date: 2017-05-30 13:07:57
User: kinaba
Comment:1.22: Enlarged the header search range (for SFX skip) for new UNLHA.
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | manifest
Tags And Properties
Changes
hide diffs unified diffs patch

Modified Caldix.dsp from [349c593e8a5c109a] to [beb5d6648c42fa77].

66 # PROP Use_MFC 0 66 # PROP Use_MFC 0 67 # PROP Use_Debug_Libraries 1 67 # PROP Use_Debug_Libraries 1 68 # PROP Output_Dir "Debug" 68 # PROP Output_Dir "Debug" 69 # PROP Intermediate_Dir "Debug" 69 # PROP Intermediate_Dir "Debug" 70 # PROP Ignore_Export_Lib 0 70 # PROP Ignore_Export_Lib 0 71 # PROP Target_Dir "" 71 # PROP Target_Dir "" 72 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" 72 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" 73 # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_ | 73 # ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_ 74 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 74 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 75 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 75 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 76 # ADD BASE RSC /l 0x411 /d "_DEBUG" 76 # ADD BASE RSC /l 0x411 /d "_DEBUG" 77 # ADD RSC /l 0x411 /d "_DEBUG" 77 # ADD RSC /l 0x411 /d "_DEBUG" 78 BSC32=bscmake.exe 78 BSC32=bscmake.exe 79 # ADD BASE BSC32 /nologo 79 # ADD BASE BSC32 /nologo 80 # ADD BSC32 /nologo 80 # ADD BSC32 /nologo

Modified Caldix.rc from [04eaa031711e6a57] to [9f904c36c4464c7f].

24 #ifndef _MAC 24 #ifndef _MAC 25 ///////////////////////////////////////////////////////////////////////////// 25 ///////////////////////////////////////////////////////////////////////////// 26 // 26 // 27 // Version 27 // Version 28 // 28 // 29 29 30 VS_VERSION_INFO VERSIONINFO 30 VS_VERSION_INFO VERSIONINFO 31 FILEVERSION 1,2,1,0 | 31 FILEVERSION 1,2,2,0 32 PRODUCTVERSION 1,2,1,0 | 32 PRODUCTVERSION 1,2,2,0 33 FILEFLAGSMASK 0x3fL 33 FILEFLAGSMASK 0x3fL 34 #ifdef _DEBUG 34 #ifdef _DEBUG 35 FILEFLAGS 0x1L 35 FILEFLAGS 0x1L 36 #else 36 #else 37 FILEFLAGS 0x0L 37 FILEFLAGS 0x0L 38 #endif 38 #endif 39 FILEOS 0x4L 39 FILEOS 0x4L ................................................................................................................................................................................ 43 BLOCK "StringFileInfo" 43 BLOCK "StringFileInfo" 44 BEGIN 44 BEGIN 45 BLOCK "041104b0" 45 BLOCK "041104b0" 46 BEGIN 46 BEGIN 47 VALUE "Comments", "http://www.kmonos.net/\0" 47 VALUE "Comments", "http://www.kmonos.net/\0" 48 VALUE "CompanyName", "\0" 48 VALUE "CompanyName", "\0" 49 VALUE "FileDescription", "Common Archivers Library DLL Installer X\0 49 VALUE "FileDescription", "Common Archivers Library DLL Installer X\0 50 VALUE "FileVersion", "1.21\0" | 50 VALUE "FileVersion", "1.22\0" 51 VALUE "InternalName", "caldix\0" 51 VALUE "InternalName", "caldix\0" 52 VALUE "LegalCopyright", "proposed by k.inaba\0" 52 VALUE "LegalCopyright", "proposed by k.inaba\0" 53 VALUE "LegalTrademarks", "\0" 53 VALUE "LegalTrademarks", "\0" 54 VALUE "OriginalFilename", "caldix.exe\0" 54 VALUE "OriginalFilename", "caldix.exe\0" 55 VALUE "PrivateBuild", "\0" 55 VALUE "PrivateBuild", "\0" 56 VALUE "ProductName", "K.I.Lib caldix\0" 56 VALUE "ProductName", "K.I.Lib caldix\0" 57 VALUE "ProductVersion", "1.21\0" | 57 VALUE "ProductVersion", "1.22\0" 58 VALUE "SpecialBuild", "\0" 58 VALUE "SpecialBuild", "\0" 59 END 59 END 60 END 60 END 61 BLOCK "VarFileInfo" 61 BLOCK "VarFileInfo" 62 BEGIN 62 BEGIN 63 VALUE "Translation", 0x411, 1200 63 VALUE "Translation", 0x411, 1200 64 END 64 END

Modified LzhTool.cpp from [4a1f472039c28674] to [867fcb36cfe598b8].

10 10 11 bool CLzhTool::Extract( const char* aname, const char* dll, kiPath& dll_rel_path 11 bool CLzhTool::Extract( const char* aname, const char* dll, kiPath& dll_rel_path 12 { 12 { 13 // 先頭の方を読み込み 13 // 先頭の方を読み込み 14 FILE* fp = fopen( aname,"rb" ); 14 FILE* fp = fopen( aname,"rb" ); 15 if( !fp ) 15 if( !fp ) 16 return false; 16 return false; > 17 const int maxHeaderOffset = 1<<20; // 1MB 17 unsigned char* buff = new unsigned char[65536]; | 18 unsigned char* buff = new unsigned char[maxHeaderOffset]; 18 DWORD siz = fread( buff, 1, 65536, fp ); | 19 DWORD siz = fread( buff, 1, maxHeaderOffset, fp ); 19 fclose( fp ); 20 fclose( fp ); 20 // ヘッダを探す 21 // ヘッダを探す 21 int ps = FindHeader( aname,buff,siz ); 22 int ps = FindHeader( aname,buff,siz ); 22 // 書庫を開く 23 // 書庫を開く 23 if( ps==-1 || !(lzh = fopen( aname,"rb" )) ) 24 if( ps==-1 || !(lzh = fopen( aname,"rb" )) ) 24 { 25 { 25 delete [] buff; 26 delete [] buff;

Modified StdAfx.h from [cef59c2068371b3f] to [ed95265c235fc57b].

1 #ifndef FX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_ | 1 #ifndef AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_ 2 #define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_ 2 #define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_ 3 3 4 #undef WINVER 4 #undef WINVER 5 #define WINVER 0x0400 5 #define WINVER 0x0400 6 #include <windows.h> 6 #include <windows.h> 7 7 8 #include <shlobj.h> 8 #include <shlobj.h>

Modified kilib/kl_reg.cpp from [6b590b6d15780424] to [7e2055bca5da9935].

115 115 116 void kiIniFile::setFileName( const char* ini, bool exepath ) 116 void kiIniFile::setFileName( const char* ini, bool exepath ) 117 { 117 { 118 if( !exepath ) 118 if( !exepath ) 119 m_FileName = ""; 119 m_FileName = ""; 120 else 120 else 121 { 121 { 122 m_FileName.beSpecialPath( kiPath.Exe ); | 122 m_FileName.beSpecialPath( kiPath::Exe ); 123 m_FileName.beBackSlash( true ); 123 m_FileName.beBackSlash( true ); 124 } 124 } 125 m_FileName += ini; 125 m_FileName += ini; 126 } 126 } 127 127 128 128 129 //--------------------------- ini:read系 ----------------------------// 129 //--------------------------- ini:read系 ----------------------------//

Modified kilib/kl_wcmn.cpp from [9574967cdc8457be] to [f3baeef4f3c35434].

74 { 74 { 75 psl->SetPath( kiPath(kiPath::Exe_name) ); 75 psl->SetPath( kiPath(kiPath::Exe_name) ); 76 psl->SetWorkingDirectory( kiPath(kiPath::Exe,false) ); 76 psl->SetWorkingDirectory( kiPath(kiPath::Exe,false) ); 77 77 78 IPersistFile* ppf; 78 IPersistFile* ppf; 79 if( SUCCEEDED(psl->QueryInterface(IID_IPersistFile,(void**)&ppf) 79 if( SUCCEEDED(psl->QueryInterface(IID_IPersistFile,(void**)&ppf) 80 { 80 { 81 WORD wsz[MAX_PATH]; | 81 WCHAR wsz[MAX_PATH]; 82 kiPath lnkfile( at ); 82 kiPath lnkfile( at ); 83 lnkfile += name, lnkfile += ".lnk"; 83 lnkfile += name, lnkfile += ".lnk"; 84 ::MultiByteToWideChar(CP_ACP,0,lnkfile,-1,wsz,MAX_PATH); 84 ::MultiByteToWideChar(CP_ACP,0,lnkfile,-1,wsz,MAX_PATH); 85 ppf->Save(wsz,TRUE); 85 ppf->Save(wsz,TRUE); 86 ppf->Release(); 86 ppf->Release(); 87 } 87 } 88 psl->Release(); 88 psl->Release();

Modified kiutil.cpp from [1eab6b89a8a30aee] to [ccf31ef10ed8e4be].

18 SetFileTime( han,pft,NULL,pft ); 18 SetFileTime( han,pft,NULL,pft ); 19 19 20 CloseHandle( han ); 20 CloseHandle( han ); 21 } 21 } 22 22 23 void kiutil::timeSet( const char* fname, DWORD sec ) 23 void kiutil::timeSet( const char* fname, DWORD sec ) 24 { 24 { 25 struct tm* time=gmtime((long*)&sec); | 25 struct tm* time=gmtime((time_t*)&sec); 26 if( time!=NULL ) 26 if( time!=NULL ) 27 { 27 { 28 FILETIME ft; 28 FILETIME ft; 29 SYSTEMTIME sys; 29 SYSTEMTIME sys; 30 30 31 sys.wYear = time->tm_year+1900; 31 sys.wYear = time->tm_year+1900; 32 sys.wMonth = time->tm_mon+1; 32 sys.wMonth = time->tm_mon+1;