Fixed FILE structure size for OLDCRT + modern VC++

gildor2 · gildor2 · commit 19986c6424da · 2019-12-01T00:44:40.000+04:00
There was a problem with structure size alignment: it wasn't aligned to pointer size, what caused wrong stderr etc with 64-bit builds.
diff --git a/Core/CoreWin32.cpp b/Core/CoreWin32.cpp
@@ -548,7 +548,7 @@ enum { CRT_FILE_SIZE = (sizeof(char*)*3 + sizeof(int)*5) };
 
 extern "C" FILE* __cdecl __acrt_iob_func(unsigned Index)
 {
-	return (FILE*)((char*)__iob_func() + Index * CRT_FILE_SIZE);
+	return (FILE*)((char*)__iob_func() + Index * Align(CRT_FILE_SIZE, sizeof(char*)));
 }
 
 #endif // OLDCRT

Original file line number	Diff line number	Diff line change
`@@ -548,7 +548,7 @@ enum { CRT_FILE_SIZE = (sizeof(char)3 + sizeof(int)*5) };`
`548`	`548`
`549`	`549`	`extern "C" FILE* __cdecl __acrt_iob_func(unsigned Index)`
`550`	`550`	`{`
`551`		`- return (FILE)((char)__iob_func() + Index * CRT_FILE_SIZE);`
	`551`	`+ return (FILE)((char)__iob_func() + Index * Align(CRT_FILE_SIZE, sizeof(char*)));`
`552`	`552`	`}`
`553`	`553`
`554`	`554`	`#endif // OLDCRT`