Credit for "wmain()" wrapper (#2372)

* Add credit for "wmain()" wrapper. * Now message compiler required just for MSVC. * Some code rearrange.
pocoproject · Aug 1, 2018 · 36e5121 · 36e5121
1 parent ceb1637
commit 36e5121
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 13 deletions.
diff --git a/CppUnit/CMakeLists.txt b/CppUnit/CMakeLists.txt
@@ -28,10 +28,10 @@ if(NOT BUILD_SHARED_LIBS)
         PUBLIC
             POCO_STATIC
     )
-endif()
-
-if(BUILD_SHARED_LIBS AND MINGW)
-	target_compile_definitions(CppUnit PUBLIC _DLL)
+elseif(MINGW)
+	target_compile_definitions(CppUnit
+		PUBLIC
+			_DLL)
 endif()
 
 POCO_INSTALL(CppUnit)

diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt
@@ -180,7 +180,7 @@ if (CMAKE_SYSTEM MATCHES "SunOS")
   target_link_libraries(Foundation PUBLIC pthread socket xnet nsl resolv rt ${CMAKE_DL_LIBS})
 endif()
 
-if (CMAKE_COMPILER_IS_MINGW)
+if (MINGW)
   target_compile_definitions(Foundation
 	  PUBLIC
 		WC_NO_BEST_FIT_CHARS=0x400
@@ -189,6 +189,7 @@ if (CMAKE_COMPILER_IS_MINGW)
 		WINVER=0x500
 		ODBCVER=0x0300
 		POCO_THREAD_STACK_SIZE
+		$<$<BOOL:BUILD_SHARED_LIBS>:_DLL>
 	)
 endif()
 
@@ -237,10 +238,6 @@ if (NOT POCO_ENABLE_FPENVIRONMENT)
 	target_compile_definitions(Foundation PUBLIC POCO_NO_FPENVIRONMENT)
 endif()
 
-if(BUILD_SHARED_LIBS AND MINGW)
-	target_compile_definitions(Foundation PUBLIC _DLL)
-endif()
-
 POCO_INSTALL(Foundation)
 POCO_GENERATE_PACKAGE(Foundation)
 

diff --git a/Foundation/src/Thread_STD_WIN32.cpp b/Foundation/src/Thread_STD_WIN32.cpp
@@ -24,13 +24,14 @@ namespace Poco {
 
 void ThreadImpl::setPriorityImpl(int prio)
 {
+	HANDLE handle = reinterpret_cast<HANDLE>(_pData->thread->native_handle());
 	if (prio != _pData->prio)
 	{
 		_pData->prio = prio;
 		_pData->policy = 0;
 		if (_pData->started && !_pData->joined && _pData->thread)
 		{
-			if (SetThreadPriority(reinterpret_cast<HANDLE>(_pData->thread->native_handle()), _pData->prio) == 0)
+			if (SetThreadPriority(handle, _pData->prio) == 0)
 				throw SystemException("cannot set thread priority");
 		}
 	}
@@ -64,11 +65,12 @@ void ThreadImpl::setStackSizeImpl(int size)
 
 void ThreadImpl::setAffinityImpl(int cpu)
 {
+	HANDLE handle = reinterpret_cast<HANDLE>(_pData->thread->native_handle());
 	DWORD mask = 1;
 	mask <<= cpu;
 	if (_pData->started && !_pData->joined && _pData->thread)
 	{
-		if (SetThreadAffinityMask(reinterpret_cast<HANDLE>(_pData->thread->native_handle()), mask) == 0)
+		if (SetThreadAffinityMask(handle, mask) == 0)
 		{
 			throw SystemException("Failed to set affinity");
 		}

diff --git a/cmake/PocoMacros.cmake b/cmake/PocoMacros.cmake
@@ -41,9 +41,9 @@ if (WIN32)
   endif ()
   find_program(CMAKE_MC_COMPILER mc.exe HINTS "${sdk_bindir}" "${kit_bindir}" "${kit81_bindir}" ${kit10_bindir}
     DOC "path to message compiler")
-  if (NOT CMAKE_MC_COMPILER AND NOT MINGW)
+  if(NOT CMAKE_MC_COMPILER AND MSVC)
     message(FATAL_ERROR "message compiler not found: required to build")
-  endif (NOT CMAKE_MC_COMPILER AND NOT MINGW)
+  endif(NOT CMAKE_MC_COMPILER AND MSVC)
   if(CMAKE_MC_COMPILER)
     message(STATUS "Found message compiler: ${CMAKE_MC_COMPILER}")
     mark_as_advanced(CMAKE_MC_COMPILER)

diff --git a/doc/90100-Acknowledgements.page b/doc/90100-Acknowledgements.page
@@ -322,3 +322,14 @@ following copyrighted material, the use of which is hereby acknowledged.
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
+----
+
+
+!!! Wrapper for function "wmain" for MinGW
+
+    http://www.coderforlife.com/projects/utilities/#MinGWUnicodeSupport
+
+    Copyright (c) 2012 Jeff Bush <jeff@coderforlife.com>
+
+    This document is released into the public domain. Absolutely no warranty is provided.
+    See http://www.coderforlife.com/projects/utilities.