Index: Caldix.dsp ================================================================== --- Caldix.dsp +++ Caldix.dsp @@ -68,11 +68,11 @@ # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /FR /Yu"stdafx.h" /FD /GZ /c # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x411 /d "_DEBUG" # ADD RSC /l 0x411 /d "_DEBUG" BSC32=bscmake.exe Index: Caldix.rc ================================================================== --- Caldix.rc +++ Caldix.rc @@ -26,12 +26,12 @@ // // Version // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,1,0 - PRODUCTVERSION 1,2,1,0 + FILEVERSION 1,2,2,0 + PRODUCTVERSION 1,2,2,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L #else FILEFLAGS 0x0L @@ -45,18 +45,18 @@ BLOCK "041104b0" BEGIN VALUE "Comments", "http://www.kmonos.net/\0" VALUE "CompanyName", "\0" VALUE "FileDescription", "Common Archivers Library DLL Installer X\0" - VALUE "FileVersion", "1.21\0" + VALUE "FileVersion", "1.22\0" VALUE "InternalName", "caldix\0" VALUE "LegalCopyright", "proposed by k.inaba\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "caldix.exe\0" VALUE "PrivateBuild", "\0" VALUE "ProductName", "K.I.Lib caldix\0" - VALUE "ProductVersion", "1.21\0" + VALUE "ProductVersion", "1.22\0" VALUE "SpecialBuild", "\0" END END BLOCK "VarFileInfo" BEGIN Index: LzhTool.cpp ================================================================== --- LzhTool.cpp +++ LzhTool.cpp @@ -12,12 +12,13 @@ { // 先頭の方を読み込み FILE* fp = fopen( aname,"rb" ); if( !fp ) return false; - unsigned char* buff = new unsigned char[65536]; - DWORD siz = fread( buff, 1, 65536, fp ); + const int maxHeaderOffset = 1<<20; // 1MB + unsigned char* buff = new unsigned char[maxHeaderOffset]; + DWORD siz = fread( buff, 1, maxHeaderOffset, fp ); fclose( fp ); // ヘッダを探す int ps = FindHeader( aname,buff,siz ); // 書庫を開く if( ps==-1 || !(lzh = fopen( aname,"rb" )) ) Index: StdAfx.h ================================================================== --- StdAfx.h +++ StdAfx.h @@ -1,6 +1,6 @@ -#ifndef FX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_ +#ifndef AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_ #define AFX_STDAFX_H__A9DB83DB_A9FD_11D0_BFD1_444553540000__INCLUDED_ #undef WINVER #define WINVER 0x0400 #include Index: kilib/kl_reg.cpp ================================================================== --- kilib/kl_reg.cpp +++ kilib/kl_reg.cpp @@ -117,11 +117,11 @@ { if( !exepath ) m_FileName = ""; else { - m_FileName.beSpecialPath( kiPath.Exe ); + m_FileName.beSpecialPath( kiPath::Exe ); m_FileName.beBackSlash( true ); } m_FileName += ini; } Index: kilib/kl_wcmn.cpp ================================================================== --- kilib/kl_wcmn.cpp +++ kilib/kl_wcmn.cpp @@ -76,11 +76,11 @@ psl->SetWorkingDirectory( kiPath(kiPath::Exe,false) ); IPersistFile* ppf; if( SUCCEEDED(psl->QueryInterface(IID_IPersistFile,(void**)&ppf)) ) { - WORD wsz[MAX_PATH]; + WCHAR wsz[MAX_PATH]; kiPath lnkfile( at ); lnkfile += name, lnkfile += ".lnk"; ::MultiByteToWideChar(CP_ACP,0,lnkfile,-1,wsz,MAX_PATH); ppf->Save(wsz,TRUE); ppf->Release(); Index: kiutil.cpp ================================================================== --- kiutil.cpp +++ kiutil.cpp @@ -20,11 +20,11 @@ CloseHandle( han ); } void kiutil::timeSet( const char* fname, DWORD sec ) { - struct tm* time=gmtime((long*)&sec); + struct tm* time=gmtime((time_t*)&sec); if( time!=NULL ) { FILETIME ft; SYSTEMTIME sys;