Merge branch 'master' into jgrpp

# Conflicts:
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32.cpp
#	src/os/windows/win32.h
#	src/video/win32_v.cpp
#	src/video/win32_v.h

regression/regression/main.nut

@@ -2024,5 +2024,12 @@ function Regression::Start()
 	print("  IsEventWaiting:        false");
 
 	this.Math();
+
+	/* Check Valuate() is actually limited, MUST BE THE LAST TEST. */
+	print("--Valuate() with excessive CPU usage--")
+	local list = AIList();
+	list.AddItem(0, 0);
+	local Infinite = function(id) { while(true); }
+	list.Valuate(Infinite);
 }
 

regression/regression/result.txt

@@ -9585,4 +9585,23 @@ ERROR: IsEnd() is invalid as Begin() is never called
   -1          >  2147483647:   false
   -2147483648 >  2147483647:   false
    13725      > -2147483648:   true
+--Valuate() with excessive CPU usage--
+Your script made an error: excessive CPU usage in valuator function
+
+*FUNCTION [unknown()] regression/main.nut line [2032]
+*FUNCTION [Valuate()] NATIVE line [-1]
+*FUNCTION [Start()] regression/main.nut line [2033]
+
+[id] 0
+[this] TABLE
+[Infinite] CLOSURE
+[list] INSTANCE
+[this] INSTANCE
+Your script made an error: excessive CPU usage in valuator function
+
+*FUNCTION [Start()] regression/main.nut line [2033]
+
+[Infinite] CLOSURE
+[list] INSTANCE
+[this] INSTANCE
 ERROR: The script died unexpectedly.