1 files changed, 44 insertions, 42 deletions

diff --git a/src/libs/7zip/win/CPP/Common/StdOutStream.cpp b/src/libs/7zip/win/CPP/Common/StdOutStream.cpp
index 061a76063..6aed31a31 100644
--- a/src/libs/7zip/win/CPP/Common/StdOutStream.cpp
+++ b/src/libs/7zip/win/CPP/Common/StdOutStream.cpp
@@ -9,21 +9,16 @@
 #include "StringConvert.h"
 #include "UTFConvert.h"
 
-#ifdef _MSC_VER
-// "was declared deprecated" disabling
-#pragma warning(disable : 4996 )
-#endif
-
 static const char kNewLineChar =  '\n';
 
 static const char *kFileOpenMode = "wt";
 
 extern int g_CodePage;
 
-CStdOutStream  g_StdOut(stdout);
-CStdOutStream  g_StdErr(stderr);
+CStdOutStream g_StdOut(stdout);
+CStdOutStream g_StdErr(stderr);
 
-bool CStdOutStream::Open(const char *fileName)
+bool CStdOutStream::Open(const char *fileName) throw()
 {
   Close();
   _stream = fopen(fileName, kFileOpenMode);
@@ -31,7 +26,7 @@ bool CStdOutStream::Open(const char *fileName)
   return _streamIsOpen;
 }
 
-bool CStdOutStream::Close()
+bool CStdOutStream::Close() throw()
 {
   if (!_streamIsOpen)
     return true;
@@ -42,33 +37,16 @@ bool CStdOutStream::Close()
   return true;
 }
 
-bool CStdOutStream::Flush()
+bool CStdOutStream::Flush() throw()
 {
   return (fflush(_stream) == 0);
 }
 
-CStdOutStream::~CStdOutStream ()
-{
-  Close();
-}
-
-CStdOutStream & CStdOutStream::operator<<(CStdOutStream & (*aFunction)(CStdOutStream  &))
-{
-  (*aFunction)(*this);
-  return *this;
-}
-
-CStdOutStream & endl(CStdOutStream & outStream)
+CStdOutStream & endl(CStdOutStream & outStream) throw()
 {
   return outStream << kNewLineChar;
 }
 
-CStdOutStream & CStdOutStream::operator<<(const char *s)
-{
-  fputs(s, _stream);
-  return *this;
-}
-
 CStdOutStream & CStdOutStream::operator<<(const wchar_t *s)
 {
   int codePage = g_CodePage;
@@ -78,27 +56,51 @@ CStdOutStream & CStdOutStream::operator<<(const wchar_t *s)
   if (codePage == CP_UTF8)
     ConvertUnicodeToUTF8(s, dest);
   else
-    dest = UnicodeStringToMultiByte(s, (UINT)codePage);
-  *this << (const char *)dest;
-  return *this;
+    UnicodeStringToMultiByte2(dest, s, (UINT)codePage);
+  return operator<<((const char *)dest);
+}
+
+void StdOut_Convert_UString_to_AString(const UString &s, AString &temp)
+{
+  int codePage = g_CodePage;
+  if (codePage == -1)
+    codePage = CP_OEMCP;
+  if (codePage == CP_UTF8)
+    ConvertUnicodeToUTF8(s, temp);
+  else
+    UnicodeStringToMultiByte2(temp, s, (UINT)codePage);
+}
+
+void CStdOutStream::PrintUString(const UString &s, AString &temp)
+{
+  StdOut_Convert_UString_to_AString(s, temp);
+  *this << (const char *)temp;
+}
+
+CStdOutStream & CStdOutStream::operator<<(Int32 number) throw()
+{
+  char s[32];
+  ConvertInt64ToString(number, s);
+  return operator<<(s);
 }
 
-CStdOutStream & CStdOutStream::operator<<(char c)
+CStdOutStream & CStdOutStream::operator<<(Int64 number) throw()
 {
-  fputc(c, _stream);
-  return *this;
+  char s[32];
+  ConvertInt64ToString(number, s);
+  return operator<<(s);
 }
 
-CStdOutStream & CStdOutStream::operator<<(int number)
+CStdOutStream & CStdOutStream::operator<<(UInt32 number) throw()
 {
-  char textString[32];
-  ConvertInt64ToString(number, textString);
-  return operator<<(textString);
+  char s[16];
+  ConvertUInt32ToString(number, s);
+  return operator<<(s);
 }
 
-CStdOutStream & CStdOutStream::operator<<(UInt64 number)
+CStdOutStream & CStdOutStream::operator<<(UInt64 number) throw()
 {
-  char textString[32];
-  ConvertUInt64ToString(number, textString);
-  return operator<<(textString);
+  char s[32];
+  ConvertUInt64ToString(number, s);
+  return operator<<(s);
 }