mirror of
https://github.com/pocoproject/poco.git
synced 2025-10-26 18:42:41 +01:00
latest changes from main repository; added eclipse cdt project files
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
//
|
||||
// Format.cpp
|
||||
//
|
||||
// $Id: //poco/Main/Foundation/src/Format.cpp#7 $
|
||||
// $Id: //poco/Main/Foundation/src/Format.cpp#8 $
|
||||
//
|
||||
// Library: Foundation
|
||||
// Package: Core
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
//
|
||||
// LoggingFactory.cpp
|
||||
//
|
||||
// $Id: //poco/Main/Foundation/src/LoggingFactory.cpp#7 $
|
||||
// $Id: //poco/Main/Foundation/src/LoggingFactory.cpp#8 $
|
||||
//
|
||||
// Library: Foundation
|
||||
// Package: Logging
|
||||
@@ -50,6 +50,7 @@
|
||||
#endif
|
||||
#if defined(POCO_OS_FAMILY_WINDOWS)
|
||||
#include "Poco/EventLogChannel.h"
|
||||
#include "Poco/WindowsConsoleChannel.h"
|
||||
#endif
|
||||
#include "Poco/PatternFormatter.h"
|
||||
|
||||
@@ -102,7 +103,11 @@ LoggingFactory& LoggingFactory::defaultFactory()
|
||||
void LoggingFactory::registerBuiltins()
|
||||
{
|
||||
_channelFactory.registerClass("AsyncChannel", new Instantiator<AsyncChannel, Channel>);
|
||||
#if defined(POCO_OS_FAMILY_WINDOWS)
|
||||
_channelFactory.registerClass("ConsoleChannel", new Instantiator<WindowsConsoleChannel, Channel>);
|
||||
#else
|
||||
_channelFactory.registerClass("ConsoleChannel", new Instantiator<ConsoleChannel, Channel>);
|
||||
#endif
|
||||
_channelFactory.registerClass("FileChannel", new Instantiator<FileChannel, Channel>);
|
||||
_channelFactory.registerClass("FormattingChannel", new Instantiator<FormattingChannel, Channel>);
|
||||
_channelFactory.registerClass("SplitterChannel", new Instantiator<SplitterChannel, Channel>);
|
||||
|
||||
88
Foundation/src/WindowsConsoleChannel.cpp
Normal file
88
Foundation/src/WindowsConsoleChannel.cpp
Normal file
@@ -0,0 +1,88 @@
|
||||
//
|
||||
// WindowsConsoleChannel.cpp
|
||||
//
|
||||
// $Id: //poco/Main/Foundation/src/WindowsConsoleChannel.cpp#1 $
|
||||
//
|
||||
// Library: Foundation
|
||||
// Package: Logging
|
||||
// Module: WindowsConsoleChannel
|
||||
//
|
||||
// Copyright (c) 2007, Applied Informatics Software Engineering GmbH.
|
||||
// and Contributors.
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person or organization
|
||||
// obtaining a copy of the software and accompanying documentation covered by
|
||||
// this license (the "Software") to use, reproduce, display, distribute,
|
||||
// execute, and transmit the Software, and to prepare derivative works of the
|
||||
// Software, and to permit third-parties to whom the Software is furnished to
|
||||
// do so, all subject to the following:
|
||||
//
|
||||
// The copyright notices in the Software and this entire statement, including
|
||||
// the above license grant, this restriction and the following disclaimer,
|
||||
// must be included in all copies of the Software, in whole or in part, and
|
||||
// all derivative works of the Software, unless such copies or derivative
|
||||
// works are solely in the form of machine-executable object code generated by
|
||||
// a source language processor.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
|
||||
// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
|
||||
// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
|
||||
// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
// DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
|
||||
|
||||
#include "Poco/WindowsConsoleChannel.h"
|
||||
#include "Poco/Message.h"
|
||||
#if defined(POCO_WIN32_UTF8)
|
||||
#include "Poco/UnicodeConverter.h"
|
||||
#endif
|
||||
|
||||
|
||||
namespace Poco {
|
||||
|
||||
|
||||
WindowsConsoleChannel::WindowsConsoleChannel():
|
||||
_isFile(false),
|
||||
_hConsole(INVALID_HANDLE_VALUE)
|
||||
{
|
||||
_hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
|
||||
// check whether the console has been redirected
|
||||
DWORD mode;
|
||||
_isFile = (GetConsoleMode(_hConsole, &mode) == 0);
|
||||
}
|
||||
|
||||
|
||||
WindowsConsoleChannel::~WindowsConsoleChannel()
|
||||
{
|
||||
}
|
||||
|
||||
|
||||
void WindowsConsoleChannel::log(const Message& msg)
|
||||
{
|
||||
std::string text = msg.getText();
|
||||
text += "\r\n";
|
||||
|
||||
#if defined(POCO_WIN32_UTF8)
|
||||
if (_isFile)
|
||||
{
|
||||
DWORD written;
|
||||
WriteFile(_hConsole, text.data(), text.size(), &written, NULL);
|
||||
}
|
||||
else
|
||||
{
|
||||
std::wstring utext;
|
||||
UnicodeConverter::toUTF16(text, utext);
|
||||
DWORD written;
|
||||
WriteConsoleW(_hConsole, utext.data(), utext.size(), &written, NULL);
|
||||
}
|
||||
#else
|
||||
DWORD written;
|
||||
WriteFile(_hConsole, text.data(), text.size(), &written, NULL);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
} // namespace Poco
|
||||
Reference in New Issue
Block a user