Use global::cout to output string to stdout.

In MinGW32 build, global::cout is WinConsoleFile. When outputing to
console, it uses WriteConsoleW, so Unicode characters are written.
Fixed memory leak in WChar<->MultiByte conversion functions.  The
portion of code which uses std::cout is rewritten to use global::cout.

1 files changed, 58 insertions, 0 deletions

diff --git a/src/WinConsoleFile.h b/src/WinConsoleFile.h
new file mode 100644
index 00000000..56d750eb
--- /dev/null
+++ b/src/WinConsoleFile.h
@@ -0,0 +1,58 @@
+/* <!-- copyright */
+/*
+ * aria2 - The high speed download utility
+ *
+ * Copyright (C) 2011 Tatsuhiro Tsujikawa
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+/* copyright --> */
+#ifndef D_WIN_CONSOLE_FILE_H
+#define D_WIN_CONSOLE_FILE_H
+
+#include "OutputFile.h"
+
+namespace aria2 {
+
+// This is a wrapper class for WriteConsoleW
+class WinConsoleFile:public OutputFile {
+public:
+  WinConsoleFile();
+  virtual ~WinConsoleFile();
+  virtual size_t write(const char* str);
+  virtual int printf(const char* format, ...);
+  virtual int flush();
+private:
+  // Don't allow copying
+  WinConsoleFile(const WinConsoleFile&);
+  WinConsoleFile& operator=(const WinConsoleFile&);
+};
+
+} // namespace aria2
+
+#endif // D_WIN_CONSOLE_FILE_H