Merge branch 'master' into entrypoint

Author: TheNNX

COREDLL/COREDLL.vcxproj

@@ -240,6 +240,7 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="stdafx.h" />
+    <ClInclude Include="stdio_wcecl.h" />
     <ClInclude Include="targetver.h" />
     <ClInclude Include="winuser_wcecl.h" />
   </ItemGroup>

COREDLL/COREDLL.vcxproj.filters

@@ -24,6 +24,9 @@
     <ClInclude Include="winuser_wcecl.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="stdio_wcecl.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="dllmain.cpp">

COREDLL/other.cpp

@@ -196,7 +196,13 @@ void CeLogSetZones(DWORD dwZoneUser,        // User-defined zones
 
 void* _fileno_WCECL(FILE* file)
 {
-	/* https://stackoverflow.com/a/3989842 */
+	void* result = WceclTryGetOrAllocStdHandle(file);
+	if (result != NULL)
+	{
+		return result;
+	}
+
+  /* https://stackoverflow.com/a/3989842 */
 	return (void*)_get_osfhandle(_fileno(file));
 }
 

COREDLL/stdafx.h

@@ -85,3 +85,5 @@ BOOL ProgramErrorDialog(LPCWSTR Text, BOOL YesNo);
 VOID DisplayAssert32ErrorDialog(LPCWSTR ExpressionText, LPCWSTR Comment, BOOL ShowLastError);
 DWORD GetBaseAddress(HANDLE pHandle);
 HMODULE GetModule(HANDLE pHandle);
+
+#include "stdio_wcecl.h"