4.624.62

5 files changed, 14 insertions, 13 deletions

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;