latest changes from main rep

CHANGELOG

@@ -83,7 +83,9 @@ Release 1.3-20070504 (2007-05-04)
   The Unicode class can be used to obtain the Unicode properties of a character.
   The UTF8 class provides case insensitive comparison and case conversion
   for UTF-8 encoded strings.
-
+- added UnWindows.h header file, replaced all #include <windows.h> with #include "Poco/UnWindows.h".
+  See the Poco/UnWindows.h header file for a rationale and explanations.
+  
 
 Release 1.2.9 (2007-02-26)
 ==========================
@@ -729,4 +731,4 @@ building the libraries.
 
 
 --
-$Id: //poco/Main/dist/CHANGELOG#56 $
+$Id: //poco/Main/dist/CHANGELOG#57 $

CONTRIBUTORS

@@ -2,11 +2,12 @@ Guenter Obiltschnig <guenter.obiltschnig@appinf.com>
 Alex Fabijanic <aleskx@gmail.com>
 Peter Schojer <peter.schojer@appinf.com>
 Claus Dabringer <claus.dabringer@appinf.com>
-Andrew Marlow (public@marlowa.plus.com)
+Andrew Marlow <public@marlowa.plus.com>
-Caleb Epstein (caleb.epstein@gmail.com)
+Caleb Epstein <caleb.epstein@gmail.com>
-Andrew J. P. Maclean (a.maclean@optusnet.com.au)
+Andrew J. P. Maclean <a.maclean@optusnet.com.au>
-Paschal Mushubi (mushubi@sympatico.ca)
+Paschal Mushubi <mushubi@sympatico.ca>
-Sergey N. Yatskevich (snc@begun.ru)
+Sergey N. Yatskevich <snc@begun.ru>
+Krzysztof Burghardt <burghardt@users.sourceforge.net>
 
 --
-$Id: //poco/Main/dist/CONTRIBUTORS#6 $
+$Id: //poco/Main/dist/CONTRIBUTORS#7 $

Foundation/include/Poco/DirectoryIterator_WIN32.h

@@ -1,7 +1,7 @@
 //
 // DirectoryIterator_WIN32.h
 //
-// $Id: //poco/Main/Foundation/include/Poco/DirectoryIterator_WIN32.h#2 $
+// $Id: //poco/Main/Foundation/include/Poco/DirectoryIterator_WIN32.h#3 $
 //
 // Library: Foundation
 // Package: Filesystem
@@ -41,7 +41,7 @@
 
 
 #include "Poco/Foundation.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/include/Poco/DirectoryIterator_WIN32U.h

@@ -1,7 +1,7 @@
 //
 // DirectoryIterator_WIN32U.h
 //
-// $Id: //poco/Main/Foundation/include/Poco/DirectoryIterator_WIN32U.h#2 $
+// $Id: //poco/Main/Foundation/include/Poco/DirectoryIterator_WIN32U.h#3 $
 //
 // Library: Foundation
 // Package: Filesystem
@@ -41,7 +41,7 @@
 
 
 #include "Poco/Foundation.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/include/Poco/EventLogChannel.h

@@ -1,7 +1,7 @@
 //
 // EventLogChannel.h
 //
-// $Id: //poco/Main/Foundation/include/Poco/EventLogChannel.h#4 $
+// $Id: //poco/Main/Foundation/include/Poco/EventLogChannel.h#5 $
 //
 // Library: Foundation
 // Package: Logging
@@ -42,7 +42,7 @@
 
 #include "Poco/Foundation.h"
 #include "Poco/Channel.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/include/Poco/Event_WIN32.h

@@ -1,7 +1,7 @@
 //
 // Event_WIN32.h
 //
-// $Id: //poco/Main/Foundation/include/Poco/Event_WIN32.h#2 $
+// $Id: //poco/Main/Foundation/include/Poco/Event_WIN32.h#3 $
 //
 // Library: Foundation
 // Package: Threading
@@ -42,7 +42,7 @@
 
 #include "Poco/Foundation.h"
 #include "Poco/Exception.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/include/Poco/ExpireStrategy.h

@@ -1,7 +1,7 @@
 //
 // ExpireStrategy.h
 //
-// $Id: //poco/Main/Foundation/include/Poco/ExpireStrategy.h#6 $
+// $Id: //poco/Main/Foundation/include/Poco/ExpireStrategy.h#7 $
 //
 // Library: Foundation
 // Package: Cache
@@ -82,8 +82,8 @@ public:
 	void onAdd(const void*, const KeyValueArgs <TKey, TValue>& args)
 	{
 		Timestamp now;
-		IndexIterator it = _keyIndex.insert(TimeIndex::value_type(now, args.key()));
+		IndexIterator it = _keyIndex.insert(typename TimeIndex::value_type(now, args.key()));
-		std::pair<Iterator, bool> stat = _keys.insert(std::make_pair(args.key(), it));
+		std::pair<Iterator, bool> stat = _keys.insert(typename Keys::value_type(args.key(), it));
 		if (!stat.second)
 		{
 			_keyIndex.erase(stat.first->second);

Foundation/include/Poco/FileStream_WIN32.h

@@ -1,7 +1,7 @@
 //
 // FileStream_WIN32.h
 //
-// $Id: //poco/Main/Foundation/include/Poco/FileStream_WIN32.h#4 $
+// $Id: //poco/Main/Foundation/include/Poco/FileStream_WIN32.h#5 $
 //
 // Library: Foundation
 // Package: Streams
@@ -42,7 +42,7 @@
 
 #include "Poco/Foundation.h"
 #include "Poco/BufferedBidirectionalStreamBuf.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/include/Poco/LogFile_WIN32.h

@@ -1,7 +1,7 @@
 //
 // LogFile_WIN32.h
 //
-// $Id: //poco/Main/Foundation/include/Poco/LogFile_WIN32.h#2 $
+// $Id: //poco/Main/Foundation/include/Poco/LogFile_WIN32.h#3 $
 //
 // Library: Foundation
 // Package: Logging
@@ -42,7 +42,7 @@
 
 #include "Poco/Foundation.h"
 #include "Poco/Timestamp.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/include/Poco/LogFile_WIN32U.h

@@ -1,7 +1,7 @@
 //
 // LogFile_WIN32U.h
 //
-// $Id: //poco/Main/Foundation/include/Poco/LogFile_WIN32U.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/LogFile_WIN32U.h#2 $
 //
 // Library: Foundation
 // Package: Logging
@@ -42,7 +42,7 @@
 
 #include "Poco/Foundation.h"
 #include "Poco/Timestamp.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/include/Poco/Mutex_WIN32.h

@@ -1,7 +1,7 @@
 //
 // Mutex_WIN32.h
 //
-// $Id: //poco/Main/Foundation/include/Poco/Mutex_WIN32.h#2 $
+// $Id: //poco/Main/Foundation/include/Poco/Mutex_WIN32.h#3 $
 //
 // Library: Foundation
 // Package: Threading
@@ -42,7 +42,7 @@
 
 #include "Poco/Foundation.h"
 #include "Poco/Exception.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/include/Poco/NamedEvent_WIN32.h

@@ -1,7 +1,7 @@
 //
 // NamedEvent_WIN32.h
 //
-// $Id: //poco/Main/Foundation/include/Poco/NamedEvent_WIN32.h#2 $
+// $Id: //poco/Main/Foundation/include/Poco/NamedEvent_WIN32.h#3 $
 //
 // Library: Foundation
 // Package: Processes
@@ -41,7 +41,7 @@
 
 
 #include "Poco/Foundation.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/include/Poco/NamedEvent_WIN32U.h

@@ -1,7 +1,7 @@
 //
 // NamedEvent_WIN32U.h
 //
-// $Id: //poco/Main/Foundation/include/Poco/NamedEvent_WIN32U.h#2 $
+// $Id: //poco/Main/Foundation/include/Poco/NamedEvent_WIN32U.h#3 $
 //
 // Library: Foundation
 // Package: Processes
@@ -41,7 +41,7 @@
 
 
 #include "Poco/Foundation.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/include/Poco/NamedMutex_WIN32.h

@@ -1,7 +1,7 @@
 //
 // NamedMutex_WIN32.h
 //
-// $Id: //poco/Main/Foundation/include/Poco/NamedMutex_WIN32.h#2 $
+// $Id: //poco/Main/Foundation/include/Poco/NamedMutex_WIN32.h#3 $
 //
 // Library: Foundation
 // Package: Processes
@@ -41,7 +41,7 @@
 
 
 #include "Poco/Foundation.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/include/Poco/NamedMutex_WIN32U.h

@@ -1,7 +1,7 @@
 //
 // NamedMutex_WIN32U.h
 //
-// $Id: //poco/Main/Foundation/include/Poco/NamedMutex_WIN32U.h#2 $
+// $Id: //poco/Main/Foundation/include/Poco/NamedMutex_WIN32U.h#3 $
 //
 // Library: Foundation
 // Package: Processes
@@ -41,7 +41,7 @@
 
 
 #include "Poco/Foundation.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/include/Poco/PipeImpl_WIN32.h

@@ -1,7 +1,7 @@
 //
 // PipeImpl_WIN32.h
 //
-// $Id: //poco/Main/Foundation/include/Poco/PipeImpl_WIN32.h#3 $
+// $Id: //poco/Main/Foundation/include/Poco/PipeImpl_WIN32.h#4 $
 //
 // Library: Foundation
 // Package: Processes
@@ -42,7 +42,7 @@
 
 #include "Poco/Foundation.h"
 #include "Poco/RefCountedObject.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/include/Poco/Platform_WIN32.h

@@ -1,7 +1,7 @@
 //
 // Platform_WIN32.h
 //
-// $Id: //poco/Main/Foundation/include/Poco/Platform_WIN32.h#6 $
+// $Id: //poco/Main/Foundation/include/Poco/Platform_WIN32.h#7 $
 //
 // Library: Foundation
 // Package: Core
@@ -54,7 +54,7 @@
 #endif
 
 
-// Reduce bloat imported by <windows.h>
+// Reduce bloat imported by "Poco/UnWindows.h"
 #if defined(_WIN32)
 	#if !defined(_WIN32_WINNT)
 		#define _WIN32_WINNT 0x0500

Foundation/include/Poco/Process_WIN32.h

@@ -1,7 +1,7 @@
 //
 // Process_WIN32.h
 //
-// $Id: //poco/Main/Foundation/include/Poco/Process_WIN32.h#2 $
+// $Id: //poco/Main/Foundation/include/Poco/Process_WIN32.h#3 $
 //
 // Library: Foundation
 // Package: Processes
@@ -43,7 +43,7 @@
 #include "Poco/Foundation.h"
 #include "Poco/RefCountedObject.h"
 #include <vector>
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/include/Poco/Process_WIN32U.h

@@ -1,7 +1,7 @@
 //
 // Process_WIN32U.h
 //
-// $Id: //poco/Main/Foundation/include/Poco/Process_WIN32U.h#2 $
+// $Id: //poco/Main/Foundation/include/Poco/Process_WIN32U.h#3 $
 //
 // Library: Foundation
 // Package: Processes
@@ -43,7 +43,7 @@
 #include "Poco/Foundation.h"
 #include "Poco/RefCountedObject.h"
 #include <vector>
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/include/Poco/RWLock_WIN32.h

@@ -1,7 +1,7 @@
 //
 // RWLock_WIN32.h
 //
-// $Id: //poco/Main/Foundation/include/Poco/RWLock_WIN32.h#2 $
+// $Id: //poco/Main/Foundation/include/Poco/RWLock_WIN32.h#3 $
 //
 // Library: Foundation
 // Package: Threading
@@ -42,7 +42,7 @@
 
 #include "Poco/Foundation.h"
 #include "Poco/Exception.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/include/Poco/Semaphore_WIN32.h

@@ -1,7 +1,7 @@
 //
 // Semaphore_WIN32.h
 //
-// $Id: //poco/Main/Foundation/include/Poco/Semaphore_WIN32.h#2 $
+// $Id: //poco/Main/Foundation/include/Poco/Semaphore_WIN32.h#3 $
 //
 // Library: Foundation
 // Package: Threading
@@ -42,7 +42,7 @@
 
 #include "Poco/Foundation.h"
 #include "Poco/Exception.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/include/Poco/Thread_WIN32.h

@@ -1,7 +1,7 @@
 //
 // Thread_WIN32.h
 //
-// $Id: //poco/Main/Foundation/include/Poco/Thread_WIN32.h#3 $
+// $Id: //poco/Main/Foundation/include/Poco/Thread_WIN32.h#4 $
 //
 // Library: Foundation
 // Package: Threading
@@ -42,7 +42,7 @@
 
 #include "Poco/Foundation.h"
 #include "Poco/Runnable.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/include/Poco/UnWindows.h

@@ -0,0 +1,110 @@
+//
+// UnWindows.h
+//
+// $Id: //poco/Main/Foundation/include/Poco/UnWindows.h#1 $
+//
+// Library: Foundation
+// Package: Core
+// Module:  UnWindows
+//
+// A wrapper around the "Poco/UnWindows.h" header file that #undef's some
+// of the macros for function names defined by "Poco/UnWindows.h" that
+// are a frequent source of conflicts (e.g., GetUserName).
+//
+// Remember, that most of the WIN32 API functions come in two variants,
+// an Unicode variant (e.g., GetUserNameA) and an ASCII variant (GetUserNameW).
+// There is also a macro (GetUserName) that's either defined to be the Unicode
+// name or the ASCII name, depending on whether the UNICODE macro is #define'd
+// or not. POCO always calls the Unicode or ASCII functions directly (depending
+// on whether POCO_WIN32_UTF8 is #define'd or not), so the macros are not ignored.
+//
+// These macro definitions are a frequent case of problems and naming conflicts,
+// especially for C++ programmers. Say, you define a class with a member function named
+// GetUserName. Depending on whether "Poco/UnWindows.h" has been included by a particular
+// translation unit or not, this might be changed to GetUserNameA/GetUserNameW, or not.
+// While, due to naming conventions used, this is less of a problem in POCO, some
+// of the users of POCO might use a different naming convention where this can become
+// a problem.
+//
+// To disable the #undef's, compile POCO with the POCO_NO_UNWINDOWS macro #define'd.
+//
+// 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 <windows.h>
+
+
+#if !defined(POCO_NO_UNWINDOWS)
+// A list of annoying macros to #undef.
+// Feel free to extend as required.
+#undef GetBinaryType
+#undef GetShortPathName
+#undef GetLongPathName
+#undef GetEnvironmentStrings
+#undef SetEnvironmentStrings
+#undef FreeEnvironmentStrings
+#undef FormatMessage
+#undef EncryptFile
+#undef DecryptFile
+#undef CreateMutex
+#undef OpenMutex
+#undef CreateEvent
+#undef OpenEvent
+#undef CreateSemaphore
+#undef OpenSemaphore
+#undef LoadLibrary
+#undef GetModuleFileName
+#undef CreateProcess
+#undef GetCommandLine
+#undef GetEnvironmentVariable
+#undef SetEnvironmentVariable
+#undef ExpandEnvironmentStrings
+#undef OutputDebugString
+#undef FindResource
+#undef UpdateResource
+#undef FindAtom
+#undef AddAtom
+#undef GetSystemDirector
+#undef GetTempPath
+#undef GetTempFileName
+#undef SetCurrentDirectory
+#undef GetCurrentDirectory
+#undef CreateDirectory
+#undef RemoveDirectory
+#undef CreateFile
+#undef DeleteFile
+#undef SearchPath
+#undef CopyFile
+#undef MoveFile
+#undef ReplaceFile
+#undef GetComputerName
+#undef SetComputerName
+#undef GetUserName
+#undef LogonUser
+#undef GetVersion
+#undef GetObject
+#endif // POCO_NO_UNWINDOWS

Foundation/include/Poco/WindowsConsoleChannel.h

@@ -1,7 +1,7 @@
 //
 // WindowsConsoleChannel.h
 //
-// $Id: //poco/Main/Foundation/include/Poco/WindowsConsoleChannel.h#1 $
+// $Id: //poco/Main/Foundation/include/Poco/WindowsConsoleChannel.h#2 $
 //
 // Library: Foundation
 // Package: Logging
@@ -43,7 +43,7 @@
 #include "Poco/Foundation.h"
 #include "Poco/Channel.h"
 #include "Poco/Mutex.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/src/Debugger.cpp

@@ -1,7 +1,7 @@
 //
 // Debugger.cpp
 //
-// $Id: //poco/Main/Foundation/src/Debugger.cpp#13 $
+// $Id: //poco/Main/Foundation/src/Debugger.cpp#14 $
 //
 // Library: Foundation
 // Package: Core
@@ -39,7 +39,7 @@
 #include <cstdlib>
 #include <cstdio>
 #if defined(POCO_OS_FAMILY_WINDOWS)
-	#include <windows.h>
+	#include "Poco/UnWindows.h"
 #elif defined(POCO_OS_FAMILY_UNIX)
 	#include <unistd.h>
 	#include <signal.h>

Foundation/src/Environment_WIN32.cpp

@@ -1,7 +1,7 @@
 //
 // Environment_WIN32.cpp
 //
-// $Id: //poco/Main/Foundation/src/Environment_WIN32.cpp#11 $
+// $Id: //poco/Main/Foundation/src/Environment_WIN32.cpp#12 $
 //
 // Library: Foundation
 // Package: Core
@@ -37,7 +37,7 @@
 #include "Poco/Environment_WIN32.h"
 #include "Poco/Exception.h"
 #include <sstream>
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/src/Environment_WIN32U.cpp

@@ -1,7 +1,7 @@
 //
 // Environment_WIN32U.cpp
 //
-// $Id: //poco/Main/Foundation/src/Environment_WIN32U.cpp#8 $
+// $Id: //poco/Main/Foundation/src/Environment_WIN32U.cpp#9 $
 //
 // Library: Foundation
 // Package: Core
@@ -40,7 +40,7 @@
 #include "Poco/Buffer.h"
 #include <sstream>
 #include <cstring>
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/src/Event_WIN32.cpp

@@ -1,7 +1,7 @@
 //
 // Event_WIN32.cpp
 //
-// $Id: //poco/Main/Foundation/src/Event_WIN32.cpp#12 $
+// $Id: //poco/Main/Foundation/src/Event_WIN32.cpp#13 $
 //
 // Library: Foundation
 // Package: Threading
@@ -42,7 +42,7 @@ namespace Poco {
 
 EventImpl::EventImpl(bool autoReset)
 {
-	_event = CreateEvent(NULL, autoReset ? FALSE : TRUE, FALSE, NULL);
+	_event = CreateEventW(NULL, autoReset ? FALSE : TRUE, FALSE, NULL);
 	if (!_event)
 		throw SystemException("cannot create event");
 }

Foundation/src/File_WIN32.cpp

@@ -1,7 +1,7 @@
 //
 // File_WIN32.cpp
 //
-// $Id: //poco/Main/Foundation/src/File_WIN32.cpp#17 $
+// $Id: //poco/Main/Foundation/src/File_WIN32.cpp#18 $
 //
 // Library: Foundation
 // Package: Filesystem
@@ -37,7 +37,7 @@
 #include "Poco/File_WIN32.h"
 #include "Poco/Exception.h"
 #include "Poco/String.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/src/File_WIN32U.cpp

@@ -1,7 +1,7 @@
 //
 // File_WIN32U.cpp
 //
-// $Id: //poco/Main/Foundation/src/File_WIN32U.cpp#11 $
+// $Id: //poco/Main/Foundation/src/File_WIN32U.cpp#12 $
 //
 // Library: Foundation
 // Package: Filesystem
@@ -38,7 +38,7 @@
 #include "Poco/Exception.h"
 #include "Poco/String.h"
 #include "Poco/UnicodeConverter.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/src/Path_WIN32.cpp

@@ -1,7 +1,7 @@
 //
 // Path_WIN32.cpp
 //
-// $Id: //poco/Main/Foundation/src/Path_WIN32.cpp#11 $
+// $Id: //poco/Main/Foundation/src/Path_WIN32.cpp#12 $
 //
 // Library: Foundation
 // Package: Filesystem
@@ -36,7 +36,7 @@
 
 #include "Poco/Path_WIN32.h"
 #include "Poco/Environment_WIN32.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/src/Path_WIN32U.cpp

@@ -1,7 +1,7 @@
 //
 // Path_WIN32U.cpp
 //
-// $Id: //poco/Main/Foundation/src/Path_WIN32U.cpp#7 $
+// $Id: //poco/Main/Foundation/src/Path_WIN32U.cpp#8 $
 //
 // Library: Foundation
 // Package: Filesystem
@@ -39,7 +39,7 @@
 #include "Poco/UnicodeConverter.h"
 #include "Poco/Buffer.h"
 #include "Poco/Exception.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/src/RWLock_WIN32.cpp

@@ -1,7 +1,7 @@
 //
 // RWLock_WIN32.cpp
 //
-// $Id: //poco/Main/Foundation/src/RWLock_WIN32.cpp#11 $
+// $Id: //poco/Main/Foundation/src/RWLock_WIN32.cpp#12 $
 //
 // Library: Foundation
 // Package: Threading
@@ -42,15 +42,15 @@ namespace Poco {
 
 RWLockImpl::RWLockImpl(): _readers(0), _writers(0)
 {
-	_mutex = CreateMutex(NULL, FALSE, NULL);
+	_mutex = CreateMutexW(NULL, FALSE, NULL);
 	if (_mutex == NULL)
 		throw SystemException("cannot create reader/writer lock");
 
-	_readEvent = CreateEvent(NULL, TRUE, TRUE, NULL);
+	_readEvent = CreateEventW(NULL, TRUE, TRUE, NULL);
 	if (_readEvent == NULL)
 		throw SystemException("cannot create reader/writer lock");
 
-	_writeEvent = CreateEvent(NULL, TRUE, TRUE, NULL);
+	_writeEvent = CreateEventW(NULL, TRUE, TRUE, NULL);
 	if (_writeEvent == NULL)
 		throw SystemException("cannot create reader/writer lock");
 }

Foundation/src/RandomStream.cpp

@@ -1,7 +1,7 @@
 //
 // RandomStream.cpp
 //
-// $Id: //poco/Main/Foundation/src/RandomStream.cpp#13 $
+// $Id: //poco/Main/Foundation/src/RandomStream.cpp#14 $
 //
 // Library: Foundation
 // Package: Crypt
@@ -38,7 +38,7 @@
 #include "Poco/Random.h"
 #include "Poco/SHA1Engine.h"
 #if defined(POCO_OS_FAMILY_WINDOWS)
-#include <windows.h>
+#include "Poco/UnWindows.h"
 #include <wincrypt.h>
 #elif defined(POCO_OS_FAMILY_UNIX)
 #include <fcntl.h>

Foundation/src/Semaphore_WIN32.cpp

@@ -1,7 +1,7 @@
 //
 // Semaphore_WIN32.cpp
 //
-// $Id: //poco/Main/Foundation/src/Semaphore_WIN32.cpp#11 $
+// $Id: //poco/Main/Foundation/src/Semaphore_WIN32.cpp#12 $
 //
 // Library: Foundation
 // Package: Threading
@@ -44,7 +44,7 @@ SemaphoreImpl::SemaphoreImpl(int n, int max)
 {
 	poco_assert (n >= 0 && max > 0 && n <= max);
 
-	_sema = CreateSemaphore(NULL, n, max, NULL);
+	_sema = CreateSemaphoreW(NULL, n, max, NULL);
 	if (!_sema)
 	{
 		throw SystemException("cannot create semaphore");

Foundation/src/SharedLibrary_WIN32.cpp

@@ -1,7 +1,7 @@
 //
 // SharedLibrary_WIN32.cpp
 //
-// $Id: //poco/Main/Foundation/src/SharedLibrary_WIN32.cpp#11 $
+// $Id: //poco/Main/Foundation/src/SharedLibrary_WIN32.cpp#12 $
 //
 // Library: Foundation
 // Package: SharedLibrary
@@ -35,7 +35,7 @@
 
 
 #include "Poco/SharedLibrary_WIN32.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/src/SharedLibrary_WIN32U.cpp

@@ -1,7 +1,7 @@
 //
 // SharedLibrary_WIN32U.cpp
 //
-// $Id: //poco/Main/Foundation/src/SharedLibrary_WIN32U.cpp#1 $
+// $Id: //poco/Main/Foundation/src/SharedLibrary_WIN32U.cpp#2 $
 //
 // Library: Foundation
 // Package: SharedLibrary
@@ -36,7 +36,7 @@
 
 #include "Poco/SharedLibrary_WIN32U.h"
 #include "Poco/UnicodeConverter.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/src/SharedMemory_WIN32.cpp

@@ -1,7 +1,7 @@
 //
 // SharedMemoryImpl.cpp
 //
-// $Id: //poco/Main/Foundation/src/SharedMemory_WIN32.cpp#5 $
+// $Id: //poco/Main/Foundation/src/SharedMemory_WIN32.cpp#6 $
 //
 // Library: Foundation
 // Package: Processes
@@ -40,7 +40,7 @@
 #if defined (POCO_WIN32_UTF8)
 #include "Poco/UnicodeConverter.h"
 #endif
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 namespace Poco {

Foundation/src/Timestamp.cpp

@@ -1,7 +1,7 @@
 //
 // Timestamp.cpp
 //
-// $Id: //poco/Main/Foundation/src/Timestamp.cpp#13 $
+// $Id: //poco/Main/Foundation/src/Timestamp.cpp#14 $
 //
 // Library: Foundation
 // Package: DateTime
@@ -43,7 +43,7 @@
 #include <sys/time.h>
 #include <sys/times.h>
 #elif defined(POCO_OS_FAMILY_WINDOWS)
-#include <windows.h>
+#include "Poco/UnWindows.h"
 #endif
 
 

Foundation/src/Timezone_WIN32.cpp

@@ -1,7 +1,7 @@
 //
 // Timezone_WIN32.cpp
 //
-// $Id: //poco/Main/Foundation/src/Timezone_WIN32.cpp#12 $
+// $Id: //poco/Main/Foundation/src/Timezone_WIN32.cpp#13 $
 //
 // Library: Foundation
 // Package: DateTime
@@ -36,7 +36,7 @@
 
 #include "Poco/Timezone.h"
 #include "Poco/UnicodeConverter.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 #include <ctime>
 
 

Foundation/src/UUIDGenerator.cpp

@@ -1,7 +1,7 @@
 //
 // UUIDGenerator.cpp
 //
-// $Id: //poco/Main/Foundation/src/UUIDGenerator.cpp#17 $
+// $Id: //poco/Main/Foundation/src/UUIDGenerator.cpp#18 $
 //
 // Library: Foundation
 // Package: UUID
@@ -164,7 +164,7 @@ UUIDGenerator& UUIDGenerator::defaultGenerator()
 //
 // Windows
 //
-#include <windows.h>
+#include "Poco/UnWindows.h"
 #include <iphlpapi.h>
 
 

Foundation/src/pcre_config.h

@@ -121,7 +121,7 @@ them both to 0; an emulation function will be used. */
 #define HAVE_UNSIGNED_LONG_LONG 0
 #endif
 
-/* Define to 1 if you have the <windows.h> header file. */
+/* Define to 1 if you have the "Poco/UnWindows.h" header file. */
 /* #undef HAVE_WINDOWS_H */
 
 /* The value of LINK_SIZE determines the number of bytes used to store links

Foundation/src/pocomsg.h

@@ -1,7 +1,7 @@
 //
 // pocomsg.mc[.h]
 //
-// $Id: //poco/Main/Foundation/src/pocomsg.mc#7 $
+// $Id: //poco/Main/Foundation/src/pocomsg.h#24 $
 //
 // The Poco message source/header file.
 //

Foundation/src/zconf.h

@@ -3,7 +3,7 @@
  * For conditions of distribution and use, see copyright notice in zlib.h
  */
 
-/* @(#) $Id: //poco/Main/Foundation/src/zconf.h#8 $ */
+/* @(#) $Id: //poco/Main/Foundation/src/zconf.h#9 $ */
 
 #ifndef ZCONF_H
 #define ZCONF_H
@@ -219,7 +219,7 @@
 #    ifdef FAR
 #      undef FAR
 #    endif
-#    include <windows.h>
+#    include "Poco/UnWindows.h"
      /* No need for _export, use ZLIB.DEF instead. */
      /* For complete Windows compatibility, use WINAPI, not __stdcall. */
 #    define ZEXPORT WINAPI

Net/include/Poco/Net/SocketDefs.h

@@ -1,7 +1,7 @@
 //
 // SocketDefs.h
 //
-// $Id: //poco/Main/Net/include/Poco/Net/SocketDefs.h#2 $
+// $Id: //poco/Main/Net/include/Poco/Net/SocketDefs.h#3 $
 //
 // Library: Net
 // Package: NetCore
@@ -41,6 +41,7 @@
 
 
 #if defined(POCO_OS_FAMILY_WINDOWS)
+#include "Poco/UnWindows.h"
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #define POCO_INVALID_SOCKET  INVALID_SOCKET

Util/include/Poco/Util/WinRegistryKey.h

@@ -1,7 +1,7 @@
 //
 // WinRegistryKey.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/WinRegistryKey.h#2 $
+// $Id: //poco/Main/Util/include/Poco/Util/WinRegistryKey.h#3 $
 //
 // Library: Util
 // Package: Windows
@@ -41,7 +41,7 @@
 
 
 #include "Poco/Util/Util.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 #include <vector>
 
 

Util/include/Poco/Util/WinService.h

@@ -1,7 +1,7 @@
 //
 // WinService.h
 //
-// $Id: //poco/Main/Util/include/Poco/Util/WinService.h#3 $
+// $Id: //poco/Main/Util/include/Poco/Util/WinService.h#4 $
 //
 // Library: Util
 // Package: Windows
@@ -41,7 +41,7 @@
 
 
 #include "Poco/Util/Util.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 
 
 #if defined(POCO_WIN32_UTF8)

Util/src/Application.cpp

@@ -1,7 +1,7 @@
 //
 // Application.cpp
 //
-// $Id: //poco/Main/Util/src/Application.cpp#26 $
+// $Id: //poco/Main/Util/src/Application.cpp#27 $
 //
 // Library: Util
 // Package: Application
@@ -53,7 +53,7 @@
 #include "Poco/ConsoleChannel.h"
 #include "Poco/AutoPtr.h"
 #if defined(POCO_OS_FAMILY_WINDOWS)
-#include <windows.h>
+#include "Poco/UnWindows.h"
 #endif
 #if defined(POCO_OS_FAMILY_UNIX)
 #include "Poco/SignalHandler.h"

Util/src/ServerApplication.cpp

@@ -1,7 +1,7 @@
 //
 // ServerApplication.cpp
 //
-// $Id: //poco/Main/Util/src/ServerApplication.cpp#21 $
+// $Id: //poco/Main/Util/src/ServerApplication.cpp#22 $
 //
 // Library: Util
 // Package: Application
@@ -50,7 +50,7 @@
 #include <sys/stat.h>
 #elif defined(POCO_OS_FAMILY_WINDOWS)
 #include "Poco/Util/WinService.h"
-#include <windows.h>
+#include "Poco/UnWindows.h"
 #include <cstring>
 #endif
 #if defined(POCO_WIN32_UTF8)