Module: wine Branch: master Commit: fc8121d05fc18ca827d01767ae94072b68c9a28c URL: https://gitlab.winehq.org/wine/wine/-/commit/fc8121d05fc18ca827d01767ae94072...
Author: Piotr Caban piotr@codeweavers.com Date: Tue Jun 11 19:25:37 2024 +0200
ucrtbase: Fix _iobuf struct layout.
---
dlls/msvcrt/msvcrt.h | 17 +++++++++++++++++ include/msvcrt/corecrt_wstdio.h | 4 ++++ 2 files changed, 21 insertions(+)
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index dd7fb5895a0..d35412ee6b8 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -20,6 +20,23 @@ #ifndef __WINE_MSVCRT_H #define __WINE_MSVCRT_H
+#if _MSVCR_VER >= 140 +#ifndef _FILE_DEFINED +#define _FILE_DEFINED +typedef struct _iobuf +{ + char* _ptr; + char* _base; + int _cnt; + int _flag; + int _file; + int _charbuf; + int _bufsiz; + char* _tmpfname; +} FILE; +#endif +#endif + #include <errno.h> #include <stdarg.h> #include <stdint.h> diff --git a/include/msvcrt/corecrt_wstdio.h b/include/msvcrt/corecrt_wstdio.h index 404f7345c8e..c5c9f180fd9 100644 --- a/include/msvcrt/corecrt_wstdio.h +++ b/include/msvcrt/corecrt_wstdio.h @@ -25,6 +25,9 @@ extern "C" { #include <pshpack8.h> typedef struct _iobuf { +#ifdef _UCRT + void *_Placeholder; +#else char* _ptr; int _cnt; char* _base; @@ -33,6 +36,7 @@ typedef struct _iobuf int _charbuf; int _bufsiz; char* _tmpfname; +#endif } FILE; #include <poppack.h> #endif /* _FILE_DEFINED */