From c574fc0f4bba94e693b0e22f730d355b75d4f4ce Mon Sep 17 00:00:00 2001
From: Igor Pavlov <ipavlov@users.sourceforge.net>
Date: Fri, 25 May 2007 00:00:00 +0000
Subject: 4.46 beta

---
 CPP/7zip/UI/Far/ExtractEngine.cpp   | 4 ++--
 CPP/7zip/UI/Far/Far.dsp             | 9 +++++++++
 CPP/7zip/UI/Far/Main.cpp            | 2 --
 CPP/7zip/UI/Far/OverwriteDialog.cpp | 2 --
 CPP/7zip/UI/Far/PluginWrite.cpp     | 5 +++--
 CPP/7zip/UI/Far/makefile            | 1 +
 6 files changed, 15 insertions(+), 8 deletions(-)

(limited to 'CPP/7zip/UI/Far')

diff --git a/CPP/7zip/UI/Far/ExtractEngine.cpp b/CPP/7zip/UI/Far/ExtractEngine.cpp
index 15548949..a71d22b8 100755
--- a/CPP/7zip/UI/Far/ExtractEngine.cpp
+++ b/CPP/7zip/UI/Far/ExtractEngine.cpp
@@ -147,8 +147,8 @@ STDMETHODIMP CExtractCallBackImp::SetOperationResult(INT32 operationResult, bool
           return E_FAIL;
       }
       char buffer[512];
-      sprintf(buffer, g_StartupInfo.GetMsgString(idMessage), 
-          GetSystemString(m_CurrentFilePath, m_CodePage));
+      const AString s = GetSystemString(m_CurrentFilePath, m_CodePage);
+      sprintf(buffer, g_StartupInfo.GetMsgString(idMessage), (const char *)s);
       if (g_StartupInfo.ShowMessage(buffer) == -1)
         return E_ABORT;
     }
diff --git a/CPP/7zip/UI/Far/Far.dsp b/CPP/7zip/UI/Far/Far.dsp
index fa540ed2..327574dd 100755
--- a/CPP/7zip/UI/Far/Far.dsp
+++ b/CPP/7zip/UI/Far/Far.dsp
@@ -570,6 +570,15 @@ SOURCE=..\..\..\..\C\Sort.c
 
 SOURCE=..\..\..\..\C\Sort.h
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Threads.c
+# SUBTRACT CPP /YX /Yc /Yu
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Threads.h
+# End Source File
 # End Group
 # End Target
 # End Project
diff --git a/CPP/7zip/UI/Far/Main.cpp b/CPP/7zip/UI/Far/Main.cpp
index 70d9117c..0409855d 100755
--- a/CPP/7zip/UI/Far/Main.cpp
+++ b/CPP/7zip/UI/Far/Main.cpp
@@ -33,8 +33,6 @@ using namespace NFar;
 
 static const char *kCommandPrefix = "7-zip";
 
-static const int kDescriptionMaxSize = 256;
-
 static const char *kRegisrtryMainKeyName = "";
 
 static const char *kRegisrtryValueNameEnabled = "UsedByDefault3";
diff --git a/CPP/7zip/UI/Far/OverwriteDialog.cpp b/CPP/7zip/UI/Far/OverwriteDialog.cpp
index 028fff4e..1594a350 100755
--- a/CPP/7zip/UI/Far/OverwriteDialog.cpp
+++ b/CPP/7zip/UI/Far/OverwriteDialog.cpp
@@ -21,8 +21,6 @@ using namespace NFar;
 
 namespace NOverwriteDialog {
 
-static const char *kHelpTopic = "OverwriteDialog";
-
 struct CFileInfoStrings
 {
   CSysString Size;
diff --git a/CPP/7zip/UI/Far/PluginWrite.cpp b/CPP/7zip/UI/Far/PluginWrite.cpp
index a159a476..79fdbf8f 100755
--- a/CPP/7zip/UI/Far/PluginWrite.cpp
+++ b/CPP/7zip/UI/Far/PluginWrite.cpp
@@ -421,8 +421,10 @@ HRESULT CompressFiles(const CObjectVector<PluginPanelItem> &pluginPanelItems)
     const CArcInfoEx &arcInfo = codecs->Formats[archiverIndex];
 
     char updateAddToArchiveString[512];
+    const AString s = GetSystemString(arcInfo.Name, CP_OEMCP);
+
     sprintf(updateAddToArchiveString, 
-        g_StartupInfo.GetMsgString(NMessageID::kUpdateAddToArchive), GetSystemString(arcInfo.Name), CP_OEMCP);
+        g_StartupInfo.GetMsgString(NMessageID::kUpdateAddToArchive), (const char *)s);
 
     int methodIndex = 0;
     int i;
@@ -534,7 +536,6 @@ HRESULT CompressFiles(const CObjectVector<PluginPanelItem> &pluginPanelItems)
           if (archiveName.Right(prevExtensionLen).CompareNoCase(prevExtension) == 0)
           {
             int pos = archiveName.Length() - prevExtensionLen;
-            UString temp = archiveName.Left(pos);
             if (pos > 1)
             {
               int dotPos = archiveName.ReverseFind('.');
diff --git a/CPP/7zip/UI/Far/makefile b/CPP/7zip/UI/Far/makefile
index 42c5a0a7..142226a4 100755
--- a/CPP/7zip/UI/Far/makefile
+++ b/CPP/7zip/UI/Far/makefile
@@ -71,6 +71,7 @@ AGENT_OBJS = \
 C_OBJS = \
   $O\Alloc.obj \
   $O\Sort.obj \
+  $O\Threads.obj \
 
 OBJS = \
   $O\StdAfx.obj \
-- 
cgit v1.2.3