This commit is contained in:
Igor Pavlov
2008-12-02 00:00:00 +00:00
committed by Kornel Lesiński
parent b717a4dbfe
commit c1f1243a70
12 changed files with 30 additions and 28 deletions

View File

@@ -1,7 +1,7 @@
#define MY_VER_MAJOR 4 #define MY_VER_MAJOR 4
#define MY_VER_MINOR 61 #define MY_VER_MINOR 62
#define MY_VER_BUILD 0 #define MY_VER_BUILD 0
#define MY_VERSION "4.61 beta" #define MY_VERSION "4.62"
#define MY_DATE "2008-10-28" #define MY_DATE "2008-12-02"
#define MY_COPYRIGHT ": Igor Pavlov : Public domain" #define MY_COPYRIGHT ": Igor Pavlov : Public domain"
#define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " : " MY_DATE #define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " : " MY_DATE

View File

@@ -40,7 +40,7 @@ class CLzmaEncoder:
public: public:
STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream, STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream,
const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress); 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 MY_UNKNOWN_IMP
}; };

View File

@@ -1,4 +1,4 @@
lzma// ZipUpdate.cpp // ZipUpdate.cpp
#include "StdAfx.h" #include "StdAfx.h"

View File

@@ -6,7 +6,7 @@
#include "BZip2Decoder.h" #include "BZip2Decoder.h"
static void *CreateCodec() { return (void *)(ICompressCoder *)(new NCompress::NBZip2::CDecoder); } 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" #include "BZip2Encoder.h"
static void *CreateCodecOut() { return (void *)(ICompressCoder *)(new NCompress::NBZip2::CEncoder); } static void *CreateCodecOut() { return (void *)(ICompressCoder *)(new NCompress::NBZip2::CEncoder); }
#else #else

View File

@@ -1,8 +1,8 @@
#define MY_VER_MAJOR 4 #define MY_VER_MAJOR 4
#define MY_VER_MINOR 61 #define MY_VER_MINOR 62
#define MY_VER_BUILD 0 #define MY_VER_BUILD 0
#define MY_VERSION "4.61 beta" #define MY_VERSION "4.62"
#define MY_7ZIP_VERSION "7-Zip 4.61 beta" #define MY_7ZIP_VERSION "7-Zip 4.62"
#define MY_DATE "2008-11-23" #define MY_DATE "2008-12-02"
#define MY_COPYRIGHT "Copyright (c) 1999-2008 Igor Pavlov" #define MY_COPYRIGHT "Copyright (c) 1999-2008 Igor Pavlov"
#define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " " MY_DATE #define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " " MY_DATE

View File

@@ -247,7 +247,7 @@ static HANDLE StartEditApplication(const UString &path, HWND window)
typedef BOOL (WINAPI * ShellExecuteExWP)(LPSHELLEXECUTEINFOW lpExecInfo); typedef BOOL (WINAPI * ShellExecuteExWP)(LPSHELLEXECUTEINFOW lpExecInfo);
#endif #endif
static HANDLE StartApplication(const UString &path, HWND window) static HANDLE StartApplication(const UString &dir, const UString &path, HWND window)
{ {
UINT32 result; UINT32 result;
HANDLE hProcess; HANDLE hProcess;
@@ -261,7 +261,7 @@ static HANDLE StartApplication(const UString &path, HWND window)
execInfo.lpVerb = NULL; execInfo.lpVerb = NULL;
execInfo.lpFile = path; execInfo.lpFile = path;
execInfo.lpParameters = NULL; execInfo.lpParameters = NULL;
execInfo.lpDirectory = NULL; execInfo.lpDirectory = dir.IsEmpty() ? NULL : (LPCWSTR)dir;
execInfo.nShow = SW_SHOWNORMAL; execInfo.nShow = SW_SHOWNORMAL;
execInfo.hProcess = 0; execInfo.hProcess = 0;
ShellExecuteExWP shellExecuteExW = (ShellExecuteExWP) ShellExecuteExWP shellExecuteExW = (ShellExecuteExWP)
@@ -281,9 +281,10 @@ static HANDLE StartApplication(const UString &path, HWND window)
execInfo.hwnd = NULL; execInfo.hwnd = NULL;
execInfo.lpVerb = NULL; execInfo.lpVerb = NULL;
const CSysString sysPath = GetSystemString(path); const CSysString sysPath = GetSystemString(path);
const CSysString sysDir = GetSystemString(dir);
execInfo.lpFile = sysPath; execInfo.lpFile = sysPath;
execInfo.lpParameters = NULL; execInfo.lpParameters = NULL;
execInfo.lpDirectory = NULL; execInfo.lpDirectory = sysDir.IsEmpty() ? NULL : (LPCTSTR)sysDir;
execInfo.nShow = SW_SHOWNORMAL; execInfo.nShow = SW_SHOWNORMAL;
execInfo.hProcess = 0; execInfo.hProcess = 0;
::ShellExecuteEx(&execInfo); ::ShellExecuteEx(&execInfo);
@@ -318,7 +319,7 @@ void CPanel::EditItem(int index)
void CPanel::OpenFolderExternal(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) if (hProcess != 0)
::CloseHandle(hProcess); ::CloseHandle(hProcess);
} }
@@ -354,7 +355,7 @@ void CPanel::OpenItem(int index, bool tryInternal, bool tryExternal)
{ {
// SetCurrentDirectory opens HANDLE to folder!!! // SetCurrentDirectory opens HANDLE to folder!!!
// NDirectory::MySetCurrentDirectory(_currentFolderPrefix); // NDirectory::MySetCurrentDirectory(_currentFolderPrefix);
HANDLE hProcess = StartApplication(fullPath, (HWND)*this); HANDLE hProcess = StartApplication(_currentFolderPrefix, fullPath, (HWND)*this);
if (hProcess != 0) if (hProcess != 0)
::CloseHandle(hProcess); ::CloseHandle(hProcess);
} }
@@ -548,7 +549,7 @@ void CPanel::OpenItemInArchive(int index, bool tryInternal, bool tryExternal, bo
if (editMode) if (editMode)
hProcess = StartEditApplication(tempFilePath, (HWND)*this); hProcess = StartEditApplication(tempFilePath, (HWND)*this);
else else
hProcess = StartApplication(tempFilePath, (HWND)*this); hProcess = StartApplication(tempDirNorm, tempFilePath, (HWND)*this);
if (hProcess == 0) if (hProcess == 0)
return; return;

View File

@@ -1,4 +1,4 @@
7z ANSI-C Decoder 4.61 7z ANSI-C Decoder 4.62
---------------------- ----------------------
7z ANSI-C provides 7z/LZMA decoding. 7z ANSI-C provides 7z/LZMA decoding.
@@ -12,8 +12,8 @@ compression ratio and very fast decompression.
LICENSE 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 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
http://www.7-zip.org/sdk.html
http://www.7-zip.org/support.html

View File

@@ -2,8 +2,8 @@
;Defines ;Defines
!define VERSION_MAJOR 4 !define VERSION_MAJOR 4
!define VERSION_MINOR 61 !define VERSION_MINOR 62
!define VERSION_POSTFIX_FULL " beta" !define VERSION_POSTFIX_FULL ""
!ifdef WIN64 !ifdef WIN64
!ifdef IA64 !ifdef IA64
!define VERSION_SYS_POSTFIX_FULL " for Windows IA-64" !define VERSION_SYS_POSTFIX_FULL " for Windows IA-64"

View File

@@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<?define VerMajor = "4" ?> <?define VerMajor = "4" ?>
<?define VerMinor = "61" ?> <?define VerMinor = "62" ?>
<?define VerBuild = "00" ?> <?define VerBuild = "00" ?>
<?define MmVer = "$(var.VerMajor).$(var.VerMinor)" ?> <?define MmVer = "$(var.VerMajor).$(var.VerMinor)" ?>
<?define MmHex = "0$(var.VerMajor)$(var.VerMinor)" ?> <?define MmHex = "0$(var.VerMajor)$(var.VerMinor)" ?>

View File

@@ -3,7 +3,7 @@
License for use and distribution 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: Licenses for files are:

View File

@@ -1,5 +1,5 @@
LZMA SDK 4.61 beta LZMA SDK 4.62
------------------ -------------
LZMA SDK provides the documentation, samples, header files, libraries, LZMA SDK provides the documentation, samples, header files, libraries,
and tools you need to develop applications that use LZMA compression. and tools you need to develop applications that use LZMA compression.

View File

@@ -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 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 License Info
@@ -179,4 +179,3 @@ Windows Win32 wrappers
--- ---
Igor Pavlov Igor Pavlov
http://www.7-zip.org http://www.7-zip.org