try not to pollute with windows headers

Author: devshgraphicsprogramming

include/nbl/system/CColoredStdoutLoggerWin32.h

@@ -6,29 +6,13 @@
 namespace nbl::system
 {
 #ifdef _NBL_PLATFORM_WINDOWS_
-//instead of #include <Windows.h>
-#include "nbl/system/DefaultFuncPtrLoader.h"
-
-class CColoredStdoutLoggerWin32 : public IThreadsafeLogger
+class NBL_API2 CColoredStdoutLoggerWin32 : public IThreadsafeLogger
 {
-		HANDLE m_native_console;
+		void* m_native_console;
 
-	public:
-		CColoredStdoutLoggerWin32(core::bitflag<E_LOG_LEVEL> logLevelMask = ILogger::defaultLogMask()) : IThreadsafeLogger(logLevelMask)
-		{
-			m_native_console = GetStdHandle(STD_OUTPUT_HANDLE);
-		}
+		void threadsafeLog_impl(const std::string_view& fmt, E_LOG_LEVEL logLevel, va_list args) override;
 
-	private:
-		virtual void threadsafeLog_impl(const std::string_view& fmt, E_LOG_LEVEL logLevel, va_list args) override
-		{
-			SetConsoleTextAttribute(m_native_console, getConsoleColor(logLevel));
-			printf(constructLogString(fmt, logLevel, args).data());
-			fflush(stdout);
-			SetConsoleTextAttribute(m_native_console, 15); // restore to white
-		}
-
-		int getConsoleColor(E_LOG_LEVEL level)
+		inline int getConsoleColor(E_LOG_LEVEL level)
 		{
 			switch (level)
 			{
@@ -60,6 +44,9 @@ class CColoredStdoutLoggerWin32 : public IThreadsafeLogger
 			}
 			return 0;
 		}
+
+	public:
+		CColoredStdoutLoggerWin32(core::bitflag<E_LOG_LEVEL> logLevelMask = ILogger::defaultLogMask());
 };
 
 #endif

include/nbl/system/CSystemWin32.h

@@ -5,7 +5,10 @@
 #include "nbl/system/ISystem.h"
 
 
+
 #ifdef _NBL_PLATFORM_WINDOWS_
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
 #include <delayimp.h>
 
 namespace nbl::system

include/nbl/system/DefaultFuncPtrLoader.h

@@ -1,93 +1,41 @@
-// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
+// Copyright (C) 2018-2023 - DevSH Graphics Programming Sp. z O.O.
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
-
 #ifndef _NBL_SYSTEM_DEFAULT_FUNC_PTR_LOADER_H_INCLUDED_
 #define _NBL_SYSTEM_DEFAULT_FUNC_PTR_LOADER_H_INCLUDED_
 
-#include "nbl/system/FuncPtrLoader.h"
 
-#if defined(_NBL_WINDOWS_API_)
-	#define WIN32_LEAN_AND_MEAN
-	#include <windows.h> 
-	#include <stdio.h> 
-#elif defined(_NBL_POSIX_API_)
-	#include <dlfcn.h>
-#endif
+#include "nbl/system/FuncPtrLoader.h"
 
 
 namespace nbl::system
 {
 
 class DefaultFuncPtrLoader final : FuncPtrLoader
 {
-	protected:
-		#if defined(_NBL_WINDOWS_API_)
-			HMODULE lib;
-		#elif defined(_NBL_POSIX_API_)
-			void* lib;
-		#endif
-	public:
-		DefaultFuncPtrLoader() : lib(NULL) {}
-		DefaultFuncPtrLoader(const char* name) : DefaultFuncPtrLoader()
-		{
-			if (!name)
-				return;
+		void* lib;
 
-			// TODO: redo with either LoadLibraryExA or SetDllDirectoryA and linux equivalents to allow loading shared libraries
-			// with other shared library dependencies from regular directories without changing CWD (which is not thread safe)
-			#if defined(_NBL_WINDOWS_API_)
-				std::string libname(name);
-				libname += ".dll";
-				lib = LoadLibraryA(libname.c_str());
-				if (!lib)
-					lib = LoadLibraryA(name);
-			#elif defined(_NBL_POSIX_API_)
-				std::string libname("lib");
-				libname += name;
-				libname += ".so";
-				lib = dlopen(libname.c_str(),RTLD_LAZY);
-				if (!lib)
-					lib = dlopen(name,RTLD_LAZY);
-			#endif
-		}
-		DefaultFuncPtrLoader(DefaultFuncPtrLoader&& other) : DefaultFuncPtrLoader()
+	public:
+		inline DefaultFuncPtrLoader() : lib(nullptr) {}
+		NBL_API2 DefaultFuncPtrLoader(const char* name);
+		inline DefaultFuncPtrLoader(DefaultFuncPtrLoader&& other) : DefaultFuncPtrLoader()
 		{
 			operator=(std::move(other));
 		}
-		~DefaultFuncPtrLoader()
-		{
-			if (lib != NULL)
-			#if defined(_NBL_WINDOWS_API_)
-				FreeLibrary(lib);
-			#elif defined(_NBL_POSIX_API_)
-				dlclose(lib);
-			#endif
-		}
+		NBL_API2 ~DefaultFuncPtrLoader();
 
 		inline DefaultFuncPtrLoader& operator=(DefaultFuncPtrLoader&& other)
 		{
-			std::swap(lib, other.lib);
+			std::swap(lib,other.lib);
 			return *this;
 		}
 
 		inline bool isLibraryLoaded() override final
 		{
-			return lib!=NULL;
+			return lib!=nullptr;
 		}
 
-		inline void* loadFuncPtr(const char* funcname) override final
-		{
-			if (isLibraryLoaded())
-			{
-			#if defined(_NBL_WINDOWS_API_)
-				return GetProcAddress(lib,funcname);
-			#elif defined(_NBL_POSIX_API_)
-				return dlsym(lib,funcname);
-			#endif
-			}
-			return nullptr;
-		}
+		void* loadFuncPtr(const char* funcname) override final;
 };
 
 }

include/nbl/system/DynamicLibraryFunctionPointer.h

@@ -1,8 +1,8 @@
-// Copyright (C) 2018-2022 - DevSH Graphics Programming Sp. z O.O.
+// Copyright (C) 2018-2023 - DevSH Graphics Programming Sp. z O.O.
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
-#ifndef __NBL_SYSTEM_DYNAMIC_LIBRARY_FUNCTION_POINTER_H_INCLUDED__
-#define __NBL_SYSTEM_DYNAMIC_LIBRARY_FUNCTION_POINTER_H_INCLUDED__
+#ifndef _NBL_SYSTEM_DYNAMIC_LIBRARY_FUNCTION_POINTER_H_INCLUDED_
+#define _NBL_SYSTEM_DYNAMIC_LIBRARY_FUNCTION_POINTER_H_INCLUDED_
 
 
 #include "nbl/core/declarations.h"

include/nbl/system/FuncPtrLoader.h

@@ -1,9 +1,8 @@
-// Copyright (C) 2018-2020 - DevSH Graphics Programming Sp. z O.O.
+// Copyright (C) 2018-2023 - DevSH Graphics Programming Sp. z O.O.
 // This file is part of the "Nabla Engine".
 // For conditions of distribution and use, see copyright notice in nabla.h
-
-#ifndef __NBL_SYSTEM_FUNC_PTR_LOADER_H_INCLUDED__
-#define __NBL_SYSTEM_FUNC_PTR_LOADER_H_INCLUDED__
+#ifndef _NBL_SYSTEM_FUNC_PTR_LOADER_H_INCLUDED_
+#define _NBL_SYSTEM_FUNC_PTR_LOADER_H_INCLUDED_
 
 #include "nbl/system/DynamicLibraryFunctionPointer.h"
 

src/nbl/CMakeLists.txt

@@ -166,13 +166,15 @@ set(NBL_CORE_SOURCES
 	${NBL_ROOT_PATH}/src/nbl/core/IReferenceCounted.cpp
 )
 set(NBL_SYSTEM_SOURCES
+	${NBL_ROOT_PATH}/src/nbl/system/DefaultFuncPtrLoader.cpp
 	${NBL_ROOT_PATH}/src/nbl/system/IFileBase.cpp
 	${NBL_ROOT_PATH}/src/nbl/system/ILogger.cpp
 	${NBL_ROOT_PATH}/src/nbl/system/CArchiveLoaderZip.cpp
 	${NBL_ROOT_PATH}/src/nbl/system/CArchiveLoaderTar.cpp
 	${NBL_ROOT_PATH}/src/nbl/system/CAPKResourcesArchive.cpp
 	${NBL_ROOT_PATH}/src/nbl/system/ISystem.cpp
 	${NBL_ROOT_PATH}/src/nbl/system/IFileArchive.cpp
+	${NBL_ROOT_PATH}/src/nbl/system/CColoredStdoutLoggerWin32.cpp
 	${NBL_ROOT_PATH}/src/nbl/system/CStdoutLoggerAndroid.cpp
 	${NBL_ROOT_PATH}/src/nbl/system/CFileViewVirtualAllocatorWin32.cpp
 	${NBL_ROOT_PATH}/src/nbl/system/CFileViewVirtualAllocatorPOSIX.cpp

src/nbl/system/CColoredStdoutLoggerWin32.cpp

@@ -0,0 +1,22 @@
+#include "nbl/system/CColoredStdoutLoggerWin32.h"
+
+using namespace nbl;
+using namespace nbl::system;
+
+#ifdef _NBL_PLATFORM_WINDOWS_
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+CColoredStdoutLoggerWin32::CColoredStdoutLoggerWin32(core::bitflag<E_LOG_LEVEL> logLevelMask) : IThreadsafeLogger(logLevelMask)
+{
+	m_native_console = GetStdHandle(STD_OUTPUT_HANDLE);
+}
+
+void CColoredStdoutLoggerWin32::threadsafeLog_impl(const std::string_view& fmt, E_LOG_LEVEL logLevel, va_list args)
+{
+	SetConsoleTextAttribute(m_native_console, getConsoleColor(logLevel));
+	printf(constructLogString(fmt, logLevel, args).data());
+	fflush(stdout);
+	SetConsoleTextAttribute(m_native_console, 15); // restore to white
+}
+#endif

src/nbl/system/CSystemWin32.cpp

@@ -5,7 +5,6 @@ using namespace nbl;
 using namespace nbl::system;
 
 #ifdef _NBL_PLATFORM_WINDOWS_
-#include <windows.h>
 #include <powerbase.h>
 
 //LOL the struct definition wasn't added to winapi headers do they ask to declare them yourself

src/nbl/system/DefaultFuncPtrLoader.cpp

@@ -0,0 +1,68 @@
+#include "nbl/system/DefaultFuncPtrLoader.h"
+
+#if defined(_NBL_WINDOWS_API_)
+	#define WIN32_LEAN_AND_MEAN
+	#include <windows.h> 
+	#include <stdio.h> 
+#elif defined(_NBL_POSIX_API_)
+	#include <dlfcn.h>
+#endif
+
+
+using namespace nbl;
+using namespace nbl::system;
+
+
+#if defined(_NBL_WINDOWS_API_)
+#define LIB reinterpret_cast<HMODULE&>(lib)
+#elif defined(_NBL_POSIX_API_)
+#define lib
+#endif
+
+DefaultFuncPtrLoader::DefaultFuncPtrLoader(const char* name) : DefaultFuncPtrLoader()
+{
+	if (!name)
+		return;
+
+	// TODO: redo with either LoadLibraryExA or SetDllDirectoryA and linux equivalents to allow loading shared libraries
+	// with other shared library dependencies from regular directories without changing CWD (which is not thread safe)
+	#if defined(_NBL_WINDOWS_API_)
+		std::string libname(name);
+		libname += ".dll";
+		LIB = LoadLibraryA(libname.c_str());
+		if (!lib)
+			LIB = LoadLibraryA(name);
+	#elif defined(_NBL_POSIX_API_)
+		std::string libname("lib");
+		libname += name;
+		libname += ".so";
+		LIB = dlopen(libname.c_str(),RTLD_LAZY);
+		if (!lib)
+			LIB = dlopen(name,RTLD_LAZY);
+	#endif
+}
+
+DefaultFuncPtrLoader::~DefaultFuncPtrLoader()
+{
+	if (lib!=nullptr)
+	{
+	#if defined(_NBL_WINDOWS_API_)
+		FreeLibrary(LIB);
+	#elif defined(_NBL_POSIX_API_)
+		dlclose(LIB);
+	#endif
+	}
+}
+
+void* DefaultFuncPtrLoader::loadFuncPtr(const char* funcname)
+{
+	if (isLibraryLoaded())
+	{
+	#if defined(_NBL_WINDOWS_API_)
+		return GetProcAddress(LIB,funcname);
+	#elif defined(_NBL_POSIX_API_)
+		return dlsym(lib,funcname);
+	#endif
+	}
+	return nullptr;
+}