MinGW build fix.

zzc-1024 · zzc-1024 · commit 7fb6958c7a7d · 2023-02-25T00:04:12.000+08:00
Fixes kovacsv#14
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -211,6 +211,14 @@ if (WIN32)
 		${WindowsAppSupportSourcesFolder}
 	)
 	target_link_libraries (WindowsReferenceApp NodeEngine NodeUIEngine BuiltInNodes WindowsAppSupport)
+	target_link_libraries(
+		WindowsReferenceApp
+		gdiplus
+		comctl32
+		windowscodecs
+		d2d1
+		dwrite
+	)
 	SetCompilerOptions (WindowsReferenceApp)
 	
 	# WindowsEmbeddingDemo
diff --git a/Sources/NodeEngine/NE_NodeEngineUtilities.hpp b/Sources/NodeEngine/NE_NodeEngineUtilities.hpp
@@ -3,6 +3,7 @@
 
 #include <functional>
 #include <vector>
+#include <cstddef>
 
 namespace NE
 {
diff --git a/Sources/NodeEngine/NE_ValueCombination.cpp b/Sources/NodeEngine/NE_ValueCombination.cpp
@@ -4,6 +4,7 @@
 #include "NE_Debug.hpp"
 
 #include <algorithm>
+#include <limits>
 
 namespace NE
 {
diff --git a/Sources/NodeUIEngine/NUIE_NodeAlignment.cpp b/Sources/NodeUIEngine/NUIE_NodeAlignment.cpp
@@ -1,6 +1,7 @@
 #include "NUIE_NodeAlignment.hpp"
 
 #include <algorithm>
+#include <limits>
 
 namespace NUIE
 {
diff --git a/Sources/WindowsAppSupport/WAS_CustomControl.cpp b/Sources/WindowsAppSupport/WAS_CustomControl.cpp
@@ -2,6 +2,7 @@
 #include "NE_Debug.hpp"
 
 #include <vector>
+#include <algorithm>
 
 namespace WAS
 {
diff --git a/Sources/WindowsAppSupport/WAS_Direct2DContextBase.cpp b/Sources/WindowsAppSupport/WAS_Direct2DContextBase.cpp
@@ -1,5 +1,6 @@
 #include "WAS_Direct2DContextBase.hpp"
 #include "NE_Debug.hpp"
+#include <float.h>
 
 namespace WAS
 {
@@ -130,9 +131,9 @@ Direct2DContextBase::Direct2DContextBase () :
 
 Direct2DContextBase::Direct2DContextBase (const Direct2DImageLoaderPtr& imageLoader) :
 	NUIE::NativeDrawingContext (),
-	direct2DHandler (),
 	width (0),
 	height (0),
+	direct2DHandler (),
 	imageLoader (imageLoader),
 	renderTarget (nullptr)
 {
@@ -165,7 +166,7 @@ void Direct2DContextBase::BeginDraw ()
 void Direct2DContextBase::EndDraw ()
 {
 	HRESULT result = renderTarget->EndDraw ();
-	if (result == D2DERR_RECREATE_TARGET) {
+	if ((unsigned int)result == D2DERR_RECREATE_TARGET) {
 		InitRenderTarget ();
 	}
 }
diff --git a/Sources/WindowsAppSupport/WAS_GdiOffscreenContext.hpp b/Sources/WindowsAppSupport/WAS_GdiOffscreenContext.hpp
@@ -12,8 +12,14 @@
 namespace WAS
 {
 
+#ifdef _MSC_VER
 template <typename KeyType>
 HANDLE CreateHandle (const KeyType& key);
+#else
+HANDLE CreateHandle (const NUIE::PenCacheKey& key);
+HANDLE CreateHandle (const NUIE::ColorCacheKey& key);
+HANDLE CreateHandle (const NUIE::FontCacheKey& key);
+#endif
 
 template <typename KeyType>
 class HandleCache
diff --git a/Sources/WindowsAppSupport/WAS_InMemoryDialog.cpp b/Sources/WindowsAppSupport/WAS_InMemoryDialog.cpp
@@ -289,7 +289,8 @@ INT_PTR InMemoryDialog::Show (HWND parentHwnd, DLGPROC dialogProc, LPARAM initPa
 		return -1;
 	}
 
-	NONCLIENTMETRICS metrics = { sizeof (NONCLIENTMETRICS) };
+	NONCLIENTMETRICS metrics;
+	metrics.cbSize = sizeof (NONCLIENTMETRICS);
 	if (DBGERROR (!SystemParametersInfo (SPI_GETNONCLIENTMETRICS, 0, &metrics, 0))) {
 		return -1;
 	}
diff --git a/Sources/WindowsAppSupport/WAS_IncludeWindowsHeaders.hpp b/Sources/WindowsAppSupport/WAS_IncludeWindowsHeaders.hpp
@@ -5,11 +5,17 @@
 #include <windowsx.h>
 #include <CommCtrl.h>
 
+#ifdef _MSC_VER
 #pragma warning (push)
 #pragma warning (disable : 4244)
 #pragma warning (disable : 4458)
+#endif
+
 #include <minmax.h> // for gdiplus
 #include <gdiplus.h>
+
+#ifdef _MSC_VER
 #pragma warning (pop)
+#endif
 
 #endif
diff --git a/Sources/WindowsAppSupport/WAS_NodeEditorHwndControl.cpp b/Sources/WindowsAppSupport/WAS_NodeEditorHwndControl.cpp
@@ -11,7 +11,7 @@ static LRESULT CALLBACK NodeEditorStaticWindowProc (HWND hwnd, UINT msg, WPARAM
 		LPCREATESTRUCT createStruct = LPCREATESTRUCT (lParam);
 		SetWindowLongPtr (hwnd, GWLP_USERDATA, (LONG_PTR) createStruct->lpCreateParams);
 	} else if (msg == WM_DESTROY) {
-		SetWindowLongPtr (hwnd, GWLP_USERDATA, NULL);
+		SetWindowLongPtr (hwnd, GWLP_USERDATA, 0);
 	}
 
 	NodeEditorHwndControl* control = (NodeEditorHwndControl*) GetWindowLongPtr (hwnd, GWLP_USERDATA);
diff --git a/Sources/WindowsAppSupport/WAS_NodeEditorNodeTreeHwndControl.cpp b/Sources/WindowsAppSupport/WAS_NodeEditorNodeTreeHwndControl.cpp
@@ -14,7 +14,7 @@ static LRESULT CALLBACK NodeEditorNodeListStaticWindowProc (HWND hwnd, UINT msg,
 		LPCREATESTRUCT createStruct = LPCREATESTRUCT (lParam);
 		SetWindowLongPtr (hwnd, GWLP_USERDATA, (LONG_PTR) createStruct->lpCreateParams);
 	} else if (msg == WM_DESTROY) {
-		SetWindowLongPtr (hwnd, GWLP_USERDATA, NULL);
+		SetWindowLongPtr (hwnd, GWLP_USERDATA, 0);
 	}
 
 	NodeEditorNodeTreeHwndControl* control = (NodeEditorNodeTreeHwndControl*) GetWindowLongPtr (hwnd, GWLP_USERDATA);
diff --git a/Sources/WindowsEmbeddingDemo/main.cpp b/Sources/WindowsEmbeddingDemo/main.cpp
@@ -382,7 +382,11 @@ LRESULT CALLBACK ApplicationWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPAR
 	return DefWindowProc (hwnd, msg, wParam, lParam);
 }
 
+#ifdef _MSC_VER
 int wWinMain (HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/, LPWSTR /*lpCmdLine*/, int /*nCmdShow*/)
+#else
+int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE, LPSTR, int)
+#endif
 {
 	WNDCLASSEX windowClass;
 	ZeroMemory (&windowClass, sizeof (WNDCLASSEX));
diff --git a/Sources/WindowsReferenceApp/Application.cpp b/Sources/WindowsReferenceApp/Application.cpp
@@ -117,7 +117,7 @@ void Application::InitFileMenu (HWND hwnd)
 {
 	HMENU file = fileMenu.AddPopupMenu (L"File");
 	fileMenu.AddPopupMenuItem (file, FILE_NEW, L"New");
-	fileMenu.AddPopupMenuItem (file, FILE_OPEN, L"Open");
+	fileMenu.AddPopupMenuItem (file, OPEN_FILE, L"Open");
 	fileMenu.AddPopupMenuItem (file, FILE_SAVE, L"Save");
 	fileMenu.AddPopupMenuSeparator (file);
 	fileMenu.AddPopupMenuItem (file, FILE_QUIT, L"Quit");
@@ -142,7 +142,7 @@ void Application::InitToolbar (HWND hwnd)
 	toolbar.Init (hwnd);
 
 	AddToolbarItem (TOOLBAR_ENABLED_NEW_ICON, FILE_NEW);
-	AddToolbarItem (TOOLBAR_ENABLED_OPEN_ICON, FILE_OPEN);
+	AddToolbarItem (TOOLBAR_ENABLED_OPEN_ICON, OPEN_FILE);
 	AddToolbarItem (TOOLBAR_ENABLED_SAVE_ICON, FILE_SAVE);
 	toolbar.AddSeparator ();
 
diff --git a/Sources/WindowsReferenceApp/CommandIds.hpp b/Sources/WindowsReferenceApp/CommandIds.hpp
@@ -2,7 +2,7 @@
 #define COMMANDIDS_HPP
 
 #define FILE_NEW		1101
-#define FILE_OPEN		1102
+#define OPEN_FILE		1102
 #define FILE_SAVE		1103
 #define FILE_QUIT		1104
 #define EDIT_UNDO		1201
diff --git a/Sources/WindowsReferenceApp/main.cpp b/Sources/WindowsReferenceApp/main.cpp
@@ -4,20 +4,22 @@
 #include "ResourceIds.hpp"
 #include "CommandIds.hpp"
 
+#ifdef _MSC_VER
 #pragma comment (lib, "gdiplus.lib")
 #pragma comment (lib, "comctl32.lib")
 #pragma comment (lib, "windowscodecs.lib")
 #pragma comment (lib, "d2d1.lib")
 #pragma comment (lib, "dwrite.lib")
 #pragma comment (linker, "\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
+#endif
 
 LRESULT CALLBACK ApplicationWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 {
 	if (msg == WM_CREATE) {
 		LPCREATESTRUCT createStruct = LPCREATESTRUCT (lParam);
 		SetWindowLongPtr (hwnd, GWLP_USERDATA, (LONG_PTR) createStruct->lpCreateParams);
 	} else if (msg == WM_DESTROY) {
-		SetWindowLongPtr (hwnd, GWLP_USERDATA, NULL);
+		SetWindowLongPtr (hwnd, GWLP_USERDATA, 0);
 		PostQuitMessage (0);
 	}
 
@@ -70,7 +72,7 @@ LRESULT CALLBACK ApplicationWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPAR
 					case FILE_NEW:
 						application->New (hwnd);
 						break;
-					case FILE_OPEN:
+					case OPEN_FILE:
 						application->Open (hwnd);
 						break;
 					case FILE_SAVE:
@@ -111,7 +113,11 @@ LRESULT CALLBACK ApplicationWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPAR
 	return DefWindowProc (hwnd, msg, wParam, lParam);
 }
 
+#ifdef _MSC_VER
 int wWinMain (HINSTANCE hInstance, HINSTANCE /*hPrevInstance*/, LPWSTR /*lpCmdLine*/, int /*nCmdShow*/)
+#else
+int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE, LPSTR, int)
+#endif
 {
 	EnableLeakDetection ();
 	InitCommonControls ();

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`
`4`	`4`	`#include <functional>`
`5`	`5`	`#include <vector>`
	`6`	`+#include <cstddef>`
`6`	`7`
`7`	`8`	`namespace NE`
`8`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`#include "NE_Debug.hpp"`
`5`	`5`
`6`	`6`	`#include <algorithm>`
	`7`	`+#include <limits>`
`7`	`8`
`8`	`9`	`namespace NE`
`9`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`#include "NUIE_NodeAlignment.hpp"`
`2`	`2`
`3`	`3`	`#include <algorithm>`
	`4`	`+#include <limits>`
`4`	`5`
`5`	`6`	`namespace NUIE`
`6`	`7`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`#include "NE_Debug.hpp"`
`3`	`3`
`4`	`4`	`#include <vector>`
	`5`	`+#include <algorithm>`
`5`	`6`
`6`	`7`	`namespace WAS`
`7`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`#include "WAS_Direct2DContextBase.hpp"`
`2`	`2`	`#include "NE_Debug.hpp"`
	`3`	`+#include <float.h>`
`3`	`4`
`4`	`5`	`namespace WAS`
`5`	`6`	`{`
`@@ -130,9 +131,9 @@ Direct2DContextBase::Direct2DContextBase () :`
`130`	`131`
`131`	`132`	`Direct2DContextBase::Direct2DContextBase (const Direct2DImageLoaderPtr& imageLoader) :`
`132`	`133`	`NUIE::NativeDrawingContext (),`
`133`		`- direct2DHandler (),`
`134`	`134`	`width (0),`
`135`	`135`	`height (0),`
	`136`	`+ direct2DHandler (),`
`136`	`137`	`imageLoader (imageLoader),`
`137`	`138`	`renderTarget (nullptr)`
`138`	`139`	`{`
`@@ -165,7 +166,7 @@ void Direct2DContextBase::BeginDraw ()`
`165`	`166`	`void Direct2DContextBase::EndDraw ()`
`166`	`167`	`{`
`167`	`168`	`HRESULT result = renderTarget->EndDraw ();`
`168`		`- if (result == D2DERR_RECREATE_TARGET) {`
	`169`	`+ if ((unsigned int)result == D2DERR_RECREATE_TARGET) {`
`169`	`170`	`InitRenderTarget ();`
`170`	`171`	`}`
`171`	`172`	`}`
Original file line number	Diff line number	Diff line change
`@@ -289,7 +289,8 @@ INT_PTR InMemoryDialog::Show (HWND parentHwnd, DLGPROC dialogProc, LPARAM initPa`
`289`	`289`	`return -1;`
`290`	`290`	`}`
`291`	`291`
`292`		`- NONCLIENTMETRICS metrics = { sizeof (NONCLIENTMETRICS) };`
	`292`	`+ NONCLIENTMETRICS metrics;`
	`293`	`+ metrics.cbSize = sizeof (NONCLIENTMETRICS);`
`293`	`294`	`if (DBGERROR (!SystemParametersInfo (SPI_GETNONCLIENTMETRICS, 0, &metrics, 0))) {`
`294`	`295`	`return -1;`
`295`	`296`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ static LRESULT CALLBACK NodeEditorStaticWindowProc (HWND hwnd, UINT msg, WPARAM`
`11`	`11`	`LPCREATESTRUCT createStruct = LPCREATESTRUCT (lParam);`
`12`	`12`	`SetWindowLongPtr (hwnd, GWLP_USERDATA, (LONG_PTR) createStruct->lpCreateParams);`
`13`	`13`	`} else if (msg == WM_DESTROY) {`
`14`		`- SetWindowLongPtr (hwnd, GWLP_USERDATA, NULL);`
	`14`	`+ SetWindowLongPtr (hwnd, GWLP_USERDATA, 0);`
`15`	`15`	`}`
`16`	`16`
`17`	`17`	`NodeEditorHwndControl* control = (NodeEditorHwndControl*) GetWindowLongPtr (hwnd, GWLP_USERDATA);`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ static LRESULT CALLBACK NodeEditorNodeListStaticWindowProc (HWND hwnd, UINT msg,`
`14`	`14`	`LPCREATESTRUCT createStruct = LPCREATESTRUCT (lParam);`
`15`	`15`	`SetWindowLongPtr (hwnd, GWLP_USERDATA, (LONG_PTR) createStruct->lpCreateParams);`
`16`	`16`	`} else if (msg == WM_DESTROY) {`
`17`		`- SetWindowLongPtr (hwnd, GWLP_USERDATA, NULL);`
	`17`	`+ SetWindowLongPtr (hwnd, GWLP_USERDATA, 0);`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`NodeEditorNodeTreeHwndControl* control = (NodeEditorNodeTreeHwndControl*) GetWindowLongPtr (hwnd, GWLP_USERDATA);`
Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,11 @@ LRESULT CALLBACK ApplicationWindowProc (HWND hwnd, UINT msg, WPARAM wParam, LPAR`
`382`	`382`	`return DefWindowProc (hwnd, msg, wParam, lParam);`
`383`	`383`	`}`
`384`	`384`
	`385`	`+#ifdef _MSC_VER`
`385`	`386`	`int wWinMain (HINSTANCE hInstance, HINSTANCE /hPrevInstance/, LPWSTR /lpCmdLine/, int /nCmdShow/)`
	`387`	`+#else`
	`388`	`+int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE, LPSTR, int)`
	`389`	`+#endif`
`386`	`390`	`{`
`387`	`391`	`WNDCLASSEX windowClass;`
`388`	`392`	`ZeroMemory (&windowClass, sizeof (WNDCLASSEX));`