This commit is contained in:
Igor Pavlov
2006-05-14 00:00:00 +00:00
committed by Kornel Lesiński
parent 631462beb2
commit 0ec42ff829
5 changed files with 15 additions and 11 deletions
+6 -2
View File
@@ -434,10 +434,14 @@ void CPanel::OpenItemInArchive(int index, bool tryInternal, bool tryExternal,
CRecordVector<UInt32> indices; CRecordVector<UInt32> indices;
indices.Add(index); indices.Add(index);
HRESULT result = CopyTo(indices, tempDirNorm, false, true, 0); UStringVector messages;
HRESULT result = CopyTo(indices, tempDirNorm, false, true, &messages);
if ((result != S_OK && result != E_ABORT)) if (!messages.IsEmpty())
return;
if (result != S_OK)
{ {
if (result != E_ABORT)
MessageBoxError(result); MessageBoxError(result);
return; return;
} }
+4 -4
View File
@@ -1,8 +1,8 @@
#define MY_VER_MAJOR 4 #define MY_VER_MAJOR 4
#define MY_VER_MINOR 41 #define MY_VER_MINOR 42
#define MY_VER_BUILD 0 #define MY_VER_BUILD 0
#define MY_VERSION "4.41 beta" #define MY_VERSION "4.42"
#define MY_7ZIP_VERSION "7-Zip 4.41 beta" #define MY_7ZIP_VERSION "7-Zip 4.42"
#define MY_DATE "2006-05-09" #define MY_DATE "2006-05-14"
#define MY_COPYRIGHT "Copyright (c) 1999-2006 Igor Pavlov" #define MY_COPYRIGHT "Copyright (c) 1999-2006 Igor Pavlov"
#define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " " MY_DATE #define MY_VERSION_COPYRIGHT_DATE MY_VERSION " " MY_COPYRIGHT " " MY_DATE
+2 -2
View File
@@ -2,8 +2,8 @@
;Defines ;Defines
!define VERSION_MAJOR 4 !define VERSION_MAJOR 4
!define VERSION_MINOR 41 !define VERSION_MINOR 42
!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"
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<?define VerMajor = "4" ?> <?define VerMajor = "4" ?>
<?define VerMinor = "41" ?> <?define VerMinor = "42" ?>
<?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)" ?>
+1 -1
View File
@@ -1,4 +1,4 @@
7-Zip 4.41 Sources 7-Zip 4.42 Sources
------------------ ------------------
7-Zip is a file archiver for Windows 95/98/ME/NT/2000/2003/XP. 7-Zip is a file archiver for Windows 95/98/ME/NT/2000/2003/XP.