include: Add corecrt_wio.h header.

include/Makefile.in

@@ -425,6 +425,7 @@ SOURCES = \
 	msvcrt/conio.h \
 	msvcrt/corecrt.h \
 	msvcrt/corecrt_stdio_config.h \
+	msvcrt/corecrt_wio.h \
 	msvcrt/corecrt_wstdio.h \
 	msvcrt/crtdbg.h \
 	msvcrt/crtdefs.h \

include/msvcrt/corecrt_wio.h

+/**
+ * This file has no copyright assigned and is placed in the Public Domain.
+ * This file is part of the Wine project.
+ */
+
+#ifndef _WIO_DEFINED
+#define _WIO_DEFINED
+
+#include <corecrt.h>
+
+#include <pshpack8.h>
+
+typedef __msvcrt_ulong _fsize_t;
+
+struct _wfinddata_t {
+  unsigned attrib;
+  time_t   time_create;
+  time_t   time_access;
+  time_t   time_write;
+  _fsize_t size;
+  wchar_t  name[260];
+};
+
+struct _wfinddatai64_t {
+  unsigned attrib;
+  time_t  time_create;
+  time_t  time_access;
+  time_t  time_write;
+  __int64 DECLSPEC_ALIGN(8) size;
+  wchar_t name[260];
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int      __cdecl _waccess(const wchar_t*,int);
+int      __cdecl _wchmod(const wchar_t*,int);
+int      __cdecl _wcreat(const wchar_t*,int);
+intptr_t __cdecl _wfindfirst(const wchar_t*,struct _wfinddata_t*);
+intptr_t __cdecl _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*);
+int      __cdecl _wfindnext(intptr_t,struct _wfinddata_t*);
+int      __cdecl _wfindnexti64(intptr_t, struct _wfinddatai64_t*);
+wchar_t* __cdecl _wmktemp(wchar_t*);
+int      WINAPIV _wopen(const wchar_t*,int,...);
+int      __cdecl _wrename(const wchar_t*,const wchar_t*);
+int      WINAPIV _wsopen(const wchar_t*,int,int,...);
+int      __cdecl _wunlink(const wchar_t*);
+
+#ifdef __cplusplus
+}
+#endif
+
+#include <poppack.h>
+
+#endif /* _WIO_DEFINED */

include/msvcrt/io.h

@@ -9,6 +9,7 @@
 #define __WINE_IO_H
 
 #include <corecrt.h>
+#include <corecrt_wio.h>
 
 #include <pshpack8.h>
 
@@ -21,11 +22,6 @@
 #define _A_SUBDIR 0x00000010
 #define _A_ARCH   0x00000020
 
-#ifndef _FSIZE_T_DEFINED
-typedef __msvcrt_ulong _fsize_t;
-#define _FSIZE_T_DEFINED
-#endif
-
 #ifndef _FINDDATA_T_DEFINED
 #define _FINDDATA_T_DEFINED
 struct _finddata_t
@@ -59,27 +55,6 @@ struct _finddata64_t
 };
 #endif /* _FINDDATA_T_DEFINED */
 
-#ifndef _WFINDDATA_T_DEFINED
-#define _WFINDDATA_T_DEFINED
-struct _wfinddata_t {
-  unsigned attrib;
-  time_t   time_create;
-  time_t   time_access;
-  time_t   time_write;
-  _fsize_t size;
-  wchar_t  name[260];
-};
-
-struct _wfinddatai64_t {
-  unsigned attrib;
-  time_t  time_create;
-  time_t  time_access;
-  time_t  time_write;
-  __int64 DECLSPEC_ALIGN(8) size;
-  wchar_t name[260];
-};
-#endif /* _WFINDDATA_T_DEFINED */
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -125,22 +100,6 @@ int         __cdecl _write(int,const void*,unsigned int);
 int         __cdecl remove(const char*);
 int         __cdecl rename(const char*,const char*);
 
-#ifndef _WIO_DEFINED
-#define _WIO_DEFINED
-int         __cdecl _waccess(const wchar_t*,int);
-int         __cdecl _wchmod(const wchar_t*,int);
-int         __cdecl _wcreat(const wchar_t*,int);
-intptr_t    __cdecl _wfindfirst(const wchar_t*,struct _wfinddata_t*);
-intptr_t    __cdecl _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*);
-int         __cdecl _wfindnext(intptr_t,struct _wfinddata_t*);
-int         __cdecl _wfindnexti64(intptr_t, struct _wfinddatai64_t*);
-wchar_t *   __cdecl _wmktemp(wchar_t*);
-int         WINAPIV _wopen(const wchar_t*,int,...);
-int         __cdecl _wrename(const wchar_t*,const wchar_t*);
-int         WINAPIV _wsopen(const wchar_t*,int,int,...);
-int         __cdecl _wunlink(const wchar_t*);
-#endif /* _WIO_DEFINED */
-
 #ifdef __cplusplus
 }
 #endif

include/msvcrt/wchar.h

@@ -9,6 +9,7 @@
 #define __WINE_WCHAR_H
 
 #include <corecrt_wstdio.h>
+#include <corecrt_wio.h>
 #include <string.h>
 
 #include <pshpack8.h>
@@ -34,11 +35,6 @@ extern "C" {
 
 typedef int mbstate_t;
 
-#ifndef _FSIZE_T_DEFINED
-typedef __msvcrt_ulong _fsize_t;
-#define _FSIZE_T_DEFINED
-#endif
-
 #ifndef _DEV_T_DEFINED
 typedef unsigned int   _dev_t;
 #define _DEV_T_DEFINED
@@ -69,29 +65,6 @@ struct tm {
 };
 #endif /* _TM_DEFINED */
 
-#ifndef _WFINDDATA_T_DEFINED
-#define _WFINDDATA_T_DEFINED
-
-struct _wfinddata_t {
-  unsigned attrib;
-  time_t time_create;
-  time_t time_access;
-  time_t time_write;
-  _fsize_t size;
-  wchar_t name[260];
-};
-
-struct _wfinddatai64_t {
-  unsigned attrib;
-  time_t time_create;
-  time_t time_access;
-  time_t time_write;
-  __int64 DECLSPEC_ALIGN(8) size;
-  wchar_t name[260];
-};
-
-#endif /* _WFINDDATA_T_DEFINED */
-
 #ifndef _STAT_DEFINED
 #define _STAT_DEFINED
 
@@ -236,22 +209,6 @@ int      __cdecl _wmkdir(const wchar_t*);
 int      __cdecl _wrmdir(const wchar_t*);
 #endif /* _WDIRECT_DEFINED */
 
-#ifndef _WIO_DEFINED
-#define _WIO_DEFINED
-int      __cdecl _waccess(const wchar_t*,int);
-int      __cdecl _wchmod(const wchar_t*,int);
-int      __cdecl _wcreat(const wchar_t*,int);
-intptr_t __cdecl _wfindfirst(const wchar_t*,struct _wfinddata_t*);
-intptr_t __cdecl _wfindfirsti64(const wchar_t*, struct _wfinddatai64_t*);
-int      __cdecl _wfindnext(intptr_t,struct _wfinddata_t*);
-int      __cdecl _wfindnexti64(intptr_t, struct _wfinddatai64_t*);
-wchar_t* __cdecl _wmktemp(wchar_t*);
-int      WINAPIV _wopen(const wchar_t*,int,...);
-int      __cdecl _wrename(const wchar_t*,const wchar_t*);
-int      WINAPIV _wsopen(const wchar_t*,int,int,...);
-int      __cdecl _wunlink(const wchar_t*);
-#endif /* _WIO_DEFINED */
-
 #ifndef _WLOCALE_DEFINED
 #define _WLOCALE_DEFINED
 wchar_t* __cdecl _wsetlocale(int,const wchar_t*);