diff options
-rwxr-xr-x | C/7zVersion.h | 6 | ||||
-rwxr-xr-x | CPP/7zip/Archive/Zip/ZipAddCommon.cpp | 2 | ||||
-rwxr-xr-x | CPP/7zip/Archive/Zip/ZipUpdate.cpp | 2 | ||||
-rwxr-xr-x | CPP/7zip/Compress/BZip2/BZip2Register.cpp | 2 | ||||
-rwxr-xr-x | CPP/7zip/MyVersion.h | 8 | ||||
-rwxr-xr-x | CPP/7zip/UI/FileManager/PanelItemOpen.cpp | 13 | ||||
-rwxr-xr-x | DOC/7zC.txt | 8 | ||||
-rwxr-xr-x | DOC/7zip.nsi | 4 | ||||
-rwxr-xr-x | DOC/7zip.wxs | 2 | ||||
-rwxr-xr-x | DOC/License.txt | 2 | ||||
-rwxr-xr-x | DOC/lzma.txt | 4 | ||||
-rwxr-xr-x | DOC/readme.txt | 5 |
12 files changed, 30 insertions, 28 deletions
diff --git a/C/7zVersion.h b/C/7zVersion.h index 18de3e85..6d840902 100755 --- a/C/7zVersion.h +++ b/C/7zVersion.h @@ -1,7 +1,7 @@ #define MY_VER_MAJOR 4 -#define MY_VER_MINOR 61 +#define MY_VER_MINOR 62 #define MY_VER_BUILD 0 -#define MY_VERSION "4.61 beta" -#define MY_DATE "2008-10-28" +#define MY_VERSION "4.62" +#define MY_DATE "2008-12-02" #define MY_COPYRIGHT ": Igor Pavlov : Public domain" #define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " : " MY_DATE diff --git a/CPP/7zip/Archive/Zip/ZipAddCommon.cpp b/CPP/7zip/Archive/Zip/ZipAddCommon.cpp index d0b13af4..9010a5e4 100755 --- a/CPP/7zip/Archive/Zip/ZipAddCommon.cpp +++ b/CPP/7zip/Archive/Zip/ZipAddCommon.cpp @@ -40,7 +40,7 @@ class CLzmaEncoder: public: STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream, const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress); - HRESULT CLzmaEncoder::SetCoderProperties(const PROPID *propIDs, const PROPVARIANT *props, UInt32 numProps); + HRESULT SetCoderProperties(const PROPID *propIDs, const PROPVARIANT *props, UInt32 numProps); MY_UNKNOWN_IMP }; diff --git a/CPP/7zip/Archive/Zip/ZipUpdate.cpp b/CPP/7zip/Archive/Zip/ZipUpdate.cpp index 403b5efe..b10f801e 100755 --- a/CPP/7zip/Archive/Zip/ZipUpdate.cpp +++ b/CPP/7zip/Archive/Zip/ZipUpdate.cpp @@ -1,4 +1,4 @@ -lzma// ZipUpdate.cpp +// ZipUpdate.cpp #include "StdAfx.h" diff --git a/CPP/7zip/Compress/BZip2/BZip2Register.cpp b/CPP/7zip/Compress/BZip2/BZip2Register.cpp index 9da3fde8..1f9cf18d 100755 --- a/CPP/7zip/Compress/BZip2/BZip2Register.cpp +++ b/CPP/7zip/Compress/BZip2/BZip2Register.cpp @@ -6,7 +6,7 @@ #include "BZip2Decoder.h" static void *CreateCodec() { return (void *)(ICompressCoder *)(new NCompress::NBZip2::CDecoder); } -#if !defined(EXTRACT_ONLY) && !defined(DEFLATE_EXTRACT_ONLY) +#if !defined(EXTRACT_ONLY) && !defined(BZIP2_EXTRACT_ONLY) #include "BZip2Encoder.h" static void *CreateCodecOut() { return (void *)(ICompressCoder *)(new NCompress::NBZip2::CEncoder); } #else diff --git a/CPP/7zip/MyVersion.h b/CPP/7zip/MyVersion.h index 70657739..298f1ba7 100755 --- a/CPP/7zip/MyVersion.h +++ b/CPP/7zip/MyVersion.h @@ -1,8 +1,8 @@ #define MY_VER_MAJOR 4 -#define MY_VER_MINOR 61 +#define MY_VER_MINOR 62 #define MY_VER_BUILD 0 -#define MY_VERSION "4.61 beta" -#define MY_7ZIP_VERSION "7-Zip 4.61 beta" -#define MY_DATE "2008-11-23" +#define MY_VERSION "4.62" +#define MY_7ZIP_VERSION "7-Zip 4.62" +#define MY_DATE "2008-12-02" #define MY_COPYRIGHT "Copyright (c) 1999-2008 Igor Pavlov" #define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " " MY_DATE diff --git a/CPP/7zip/UI/FileManager/PanelItemOpen.cpp b/CPP/7zip/UI/FileManager/PanelItemOpen.cpp index ed8813c7..4d087a07 100755 --- a/CPP/7zip/UI/FileManager/PanelItemOpen.cpp +++ b/CPP/7zip/UI/FileManager/PanelItemOpen.cpp @@ -247,7 +247,7 @@ static HANDLE StartEditApplication(const UString &path, HWND window) typedef BOOL (WINAPI * ShellExecuteExWP)(LPSHELLEXECUTEINFOW lpExecInfo); #endif -static HANDLE StartApplication(const UString &path, HWND window) +static HANDLE StartApplication(const UString &dir, const UString &path, HWND window) { UINT32 result; HANDLE hProcess; @@ -261,7 +261,7 @@ static HANDLE StartApplication(const UString &path, HWND window) execInfo.lpVerb = NULL; execInfo.lpFile = path; execInfo.lpParameters = NULL; - execInfo.lpDirectory = NULL; + execInfo.lpDirectory = dir.IsEmpty() ? NULL : (LPCWSTR)dir; execInfo.nShow = SW_SHOWNORMAL; execInfo.hProcess = 0; ShellExecuteExWP shellExecuteExW = (ShellExecuteExWP) @@ -281,9 +281,10 @@ static HANDLE StartApplication(const UString &path, HWND window) execInfo.hwnd = NULL; execInfo.lpVerb = NULL; const CSysString sysPath = GetSystemString(path); + const CSysString sysDir = GetSystemString(dir); execInfo.lpFile = sysPath; execInfo.lpParameters = NULL; - execInfo.lpDirectory = NULL; + execInfo.lpDirectory = sysDir.IsEmpty() ? NULL : (LPCTSTR)sysDir; execInfo.nShow = SW_SHOWNORMAL; execInfo.hProcess = 0; ::ShellExecuteEx(&execInfo); @@ -318,7 +319,7 @@ void CPanel::EditItem(int index) void CPanel::OpenFolderExternal(int index) { - HANDLE hProcess = StartApplication(GetFsPath() + GetItemRelPath(index), (HWND)*this); + HANDLE hProcess = StartApplication(GetFsPath(), GetFsPath() + GetItemRelPath(index), (HWND)*this); if (hProcess != 0) ::CloseHandle(hProcess); } @@ -354,7 +355,7 @@ void CPanel::OpenItem(int index, bool tryInternal, bool tryExternal) { // SetCurrentDirectory opens HANDLE to folder!!! // NDirectory::MySetCurrentDirectory(_currentFolderPrefix); - HANDLE hProcess = StartApplication(fullPath, (HWND)*this); + HANDLE hProcess = StartApplication(_currentFolderPrefix, fullPath, (HWND)*this); if (hProcess != 0) ::CloseHandle(hProcess); } @@ -548,7 +549,7 @@ void CPanel::OpenItemInArchive(int index, bool tryInternal, bool tryExternal, bo if (editMode) hProcess = StartEditApplication(tempFilePath, (HWND)*this); else - hProcess = StartApplication(tempFilePath, (HWND)*this); + hProcess = StartApplication(tempDirNorm, tempFilePath, (HWND)*this); if (hProcess == 0) return; diff --git a/DOC/7zC.txt b/DOC/7zC.txt index 5966e0c0..5d5d06d7 100755 --- a/DOC/7zC.txt +++ b/DOC/7zC.txt @@ -1,4 +1,4 @@ -7z ANSI-C Decoder 4.61 +7z ANSI-C Decoder 4.62 ---------------------- 7z ANSI-C provides 7z/LZMA decoding. @@ -12,8 +12,8 @@ compression ratio and very fast decompression. LICENSE ------- -Read lzma.txt for information about license. - +7z ANSI-C Decoder is part of the LZMA SDK. +LZMA SDK is written and placed in the public domain by Igor Pavlov. Files --------------------- @@ -190,3 +190,5 @@ _SZ_ALLOC_DEBUG - define it if you want to debug alloc/free operations to stde --- http://www.7-zip.org +http://www.7-zip.org/sdk.html +http://www.7-zip.org/support.html diff --git a/DOC/7zip.nsi b/DOC/7zip.nsi index dcb9cc8a..edfa90f8 100755 --- a/DOC/7zip.nsi +++ b/DOC/7zip.nsi @@ -2,8 +2,8 @@ ;Defines !define VERSION_MAJOR 4 -!define VERSION_MINOR 61 -!define VERSION_POSTFIX_FULL " beta" +!define VERSION_MINOR 62 +!define VERSION_POSTFIX_FULL "" !ifdef WIN64 !ifdef IA64 !define VERSION_SYS_POSTFIX_FULL " for Windows IA-64" diff --git a/DOC/7zip.wxs b/DOC/7zip.wxs index eeeb439e..6c9c59ee 100755 --- a/DOC/7zip.wxs +++ b/DOC/7zip.wxs @@ -1,7 +1,7 @@ <?xml version="1.0"?> <?define VerMajor = "4" ?> -<?define VerMinor = "61" ?> +<?define VerMinor = "62" ?> <?define VerBuild = "00" ?> <?define MmVer = "$(var.VerMajor).$(var.VerMinor)" ?> <?define MmHex = "0$(var.VerMajor)$(var.VerMinor)" ?> diff --git a/DOC/License.txt b/DOC/License.txt index 2e3fa89e..0d8bc7a2 100755 --- a/DOC/License.txt +++ b/DOC/License.txt @@ -3,7 +3,7 @@ License for use and distribution ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 7-Zip Copyright (C) 1999-2007 Igor Pavlov. + 7-Zip Copyright (C) 1999-2008 Igor Pavlov. Licenses for files are: diff --git a/DOC/lzma.txt b/DOC/lzma.txt index 292849b1..ef6bd413 100755 --- a/DOC/lzma.txt +++ b/DOC/lzma.txt @@ -1,5 +1,5 @@ -LZMA SDK 4.61 beta ------------------- +LZMA SDK 4.62 +------------- LZMA SDK provides the documentation, samples, header files, libraries, and tools you need to develop applications that use LZMA compression. diff --git a/DOC/readme.txt b/DOC/readme.txt index 82061804..c2b72de8 100755 --- a/DOC/readme.txt +++ b/DOC/readme.txt @@ -1,9 +1,9 @@ -7-Zip 4.58 Sources +7-Zip 4.62 Sources ------------------ 7-Zip is a file archiver for Windows 95/98/ME/NT/2000/2003/XP/Vista. -7-Zip Copyright (C) 1999-2007 Igor Pavlov. +7-Zip Copyright (C) 1999-2008 Igor Pavlov. License Info @@ -179,4 +179,3 @@ Windows Win32 wrappers --- Igor Pavlov http://www.7-zip.org - |