Skip to content

W
wine-cw
Commit 92617993 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

msvcrt: Use FILE from public header.

Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent d784dbb8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 49 deletions
dlls/msvcrt/msvcrt.h
View file @ 92617993
......@@ -283,9 +283,7 @@ extern unsigned int __cdecl _control87(unsigned int, unsigned int);
#define _RT_CRNL 252
#define _RT_BANNER 255
typedef struct _iobuf MSVCRT_FILE;
extern MSVCRT_FILE MSVCRT__iob[];
extern FILE MSVCRT__iob[];
typedef struct _complex _Dcomplex;
......@@ -767,36 +765,36 @@ int __cdecl MSVCRT__isleadbyte_l(int, _locale_t);
int __cdecl MSVCRT__isspace_l(int, _locale_t);
int __cdecl MSVCRT__iswspace_l(wchar_t, _locale_t);
void __cdecl MSVCRT__lock_file(MSVCRT_FILE*);
void __cdecl MSVCRT__unlock_file(MSVCRT_FILE*);
int __cdecl MSVCRT_fgetc(MSVCRT_FILE*);
int __cdecl MSVCRT__fgetc_nolock(MSVCRT_FILE*);
int __cdecl MSVCRT__fputc_nolock(int,MSVCRT_FILE*);
int __cdecl MSVCRT_ungetc(int,MSVCRT_FILE*);
int __cdecl MSVCRT__ungetc_nolock(int,MSVCRT_FILE*);
wint_t __cdecl MSVCRT_fgetwc(MSVCRT_FILE*);
wint_t __cdecl MSVCRT__fgetwc_nolock(MSVCRT_FILE*);
wint_t __cdecl MSVCRT__fputwc_nolock(wint_t,MSVCRT_FILE*);
wint_t __cdecl MSVCRT_ungetwc(wint_t,MSVCRT_FILE*);
wint_t __cdecl MSVCRT__ungetwc_nolock(wint_t, MSVCRT_FILE*);
int __cdecl MSVCRT__fseeki64_nolock(MSVCRT_FILE*,__int64,int);
__int64 __cdecl MSVCRT__ftelli64(MSVCRT_FILE* file);
__int64 __cdecl MSVCRT__ftelli64_nolock(MSVCRT_FILE*);
void __cdecl MSVCRT__lock_file(FILE*);
void __cdecl MSVCRT__unlock_file(FILE*);
int __cdecl MSVCRT_fgetc(FILE*);
int __cdecl MSVCRT__fgetc_nolock(FILE*);
int __cdecl MSVCRT__fputc_nolock(int,FILE*);
int __cdecl MSVCRT_ungetc(int,FILE*);
int __cdecl MSVCRT__ungetc_nolock(int,FILE*);
wint_t __cdecl MSVCRT_fgetwc(FILE*);
wint_t __cdecl MSVCRT__fgetwc_nolock(FILE*);
wint_t __cdecl MSVCRT__fputwc_nolock(wint_t,FILE*);
wint_t __cdecl MSVCRT_ungetwc(wint_t,FILE*);
wint_t __cdecl MSVCRT__ungetwc_nolock(wint_t, FILE*);
int __cdecl MSVCRT__fseeki64_nolock(FILE*,__int64,int);
__int64 __cdecl MSVCRT__ftelli64(FILE* file);
__int64 __cdecl MSVCRT__ftelli64_nolock(FILE*);
void __cdecl MSVCRT__exit(int);
void __cdecl MSVCRT_abort(void);
char* __cdecl MSVCRT_getenv(const char*);
size_t __cdecl MSVCRT__fread_nolock(void*,size_t,size_t,MSVCRT_FILE*);
size_t __cdecl MSVCRT__fread_nolock_s(void*,size_t,size_t,size_t,MSVCRT_FILE*);
size_t __cdecl MSVCRT__fwrite_nolock(const void*,size_t,size_t,MSVCRT_FILE*);
int __cdecl MSVCRT_fclose(MSVCRT_FILE*);
int __cdecl MSVCRT__fclose_nolock(MSVCRT_FILE*);
int __cdecl MSVCRT__fflush_nolock(MSVCRT_FILE*);
MSVCRT_FILE* __cdecl MSVCRT__iob_func(void);
size_t __cdecl MSVCRT__fread_nolock(void*,size_t,size_t,FILE*);
size_t __cdecl MSVCRT__fread_nolock_s(void*,size_t,size_t,size_t,FILE*);
size_t __cdecl MSVCRT__fwrite_nolock(const void*,size_t,size_t,FILE*);
int __cdecl MSVCRT_fclose(FILE*);
int __cdecl MSVCRT__fclose_nolock(FILE*);
int __cdecl MSVCRT__fflush_nolock(FILE*);
FILE* __cdecl MSVCRT__iob_func(void);
__time32_t __cdecl MSVCRT__time32(__time32_t*);
__time64_t __cdecl MSVCRT__time64(__time64_t*);
MSVCRT_FILE* __cdecl MSVCRT__fdopen(int, const char *);
MSVCRT_FILE* __cdecl MSVCRT__wfdopen(int, const wchar_t *);
int WINAPIV MSVCRT_fwprintf(MSVCRT_FILE *file, const wchar_t *format, ...);
FILE* __cdecl MSVCRT__fdopen(int, const char *);
FILE* __cdecl MSVCRT__wfdopen(int, const wchar_t *);
int WINAPIV MSVCRT_fwprintf(FILE *file, const wchar_t *format, ...);
int __cdecl MSVCRT_vsnwprintf(wchar_t *str, size_t len,
const wchar_t *format, __ms_va_list valist );
int WINAPIV MSVCRT__snwprintf(wchar_t*, size_t, const wchar_t*, ...);
......
dlls/msvcrt/process.c
View file @ 92617993
......@@ -1020,7 +1020,7 @@ intptr_t CDECL MSVCRT__wspawnvp(int flags, const wchar_t* name, const wchar_t* c
}
static struct popen_handle {
MSVCRT_FILE *f;
FILE *f;
HANDLE proc;
} *popen_handles;
static DWORD popen_handles_size;
......@@ -1035,9 +1035,9 @@ void msvcrt_free_popen_data(void)
*
* Unicode version of _popen
*/
MSVCRT_FILE* CDECL MSVCRT__wpopen(const wchar_t* command, const wchar_t* mode)
FILE* CDECL MSVCRT__wpopen(const wchar_t* command, const wchar_t* mode)
{
MSVCRT_FILE *ret;
FILE *ret;
BOOL readPipe = TRUE;
int textmode, fds[2], fdToDup, fdToOpen, fdStdHandle = -1;
const wchar_t *p;
......@@ -1148,9 +1148,9 @@ error:
/*********************************************************************
* _popen (MSVCRT.@)
*/
MSVCRT_FILE* CDECL MSVCRT__popen(const char* command, const char* mode)
FILE* CDECL MSVCRT__popen(const char* command, const char* mode)
{
MSVCRT_FILE *ret;
FILE *ret;
wchar_t *cmdW, *modeW;
TRACE("(command=%s, mode=%s)\n", debugstr_a(command), debugstr_a(mode));
......@@ -1175,7 +1175,7 @@ MSVCRT_FILE* CDECL MSVCRT__popen(const char* command, const char* mode)
/*********************************************************************
* _pclose (MSVCRT.@)
*/
int CDECL MSVCRT__pclose(MSVCRT_FILE* file)
int CDECL MSVCRT__pclose(FILE* file)
{
HANDLE h;
DWORD i;
......
dlls/msvcrt/scanf.c
View file @ 92617993
......@@ -146,7 +146,7 @@ static int wchar2digit(wchar_t c, int base) {
/*********************************************************************
* fscanf (MSVCRT.@)
*/
int WINAPIV MSVCRT_fscanf(MSVCRT_FILE *file, const char *format, ...)
int WINAPIV MSVCRT_fscanf(FILE *file, const char *format, ...)
{
__ms_va_list valist;
int res;
......@@ -160,7 +160,7 @@ int WINAPIV MSVCRT_fscanf(MSVCRT_FILE *file, const char *format, ...)
/*********************************************************************
* _fscanf_l (MSVCRT.@)
*/
int WINAPIV MSVCRT__fscanf_l(MSVCRT_FILE *file, const char *format,
int WINAPIV MSVCRT__fscanf_l(FILE *file, const char *format,
_locale_t locale, ...)
{
__ms_va_list valist;
......@@ -175,7 +175,7 @@ int WINAPIV MSVCRT__fscanf_l(MSVCRT_FILE *file, const char *format,
/*********************************************************************
* fscanf_s (MSVCRT.@)
*/
int WINAPIV MSVCRT_fscanf_s(MSVCRT_FILE *file, const char *format, ...)
int WINAPIV MSVCRT_fscanf_s(FILE *file, const char *format, ...)
{
__ms_va_list valist;
int res;
......@@ -189,7 +189,7 @@ int WINAPIV MSVCRT_fscanf_s(MSVCRT_FILE *file, const char *format, ...)
/*********************************************************************
* _fscanf_s_l (MSVCRT.@)
*/
int WINAPIV MSVCRT__fscanf_s_l(MSVCRT_FILE *file, const char *format,
int WINAPIV MSVCRT__fscanf_s_l(FILE *file, const char *format,
_locale_t locale, ...)
{
__ms_va_list valist;
......@@ -260,7 +260,7 @@ int WINAPIV MSVCRT__scanf_s_l(const char *format, _locale_t locale, ...)
/*********************************************************************
* fwscanf (MSVCRT.@)
*/
int WINAPIV MSVCRT_fwscanf(MSVCRT_FILE *file, const wchar_t *format, ...)
int WINAPIV MSVCRT_fwscanf(FILE *file, const wchar_t *format, ...)
{
__ms_va_list valist;
int res;
......@@ -274,7 +274,7 @@ int WINAPIV MSVCRT_fwscanf(MSVCRT_FILE *file, const wchar_t *format, ...)
/*********************************************************************
* _fwscanf_l (MSVCRT.@)
*/
int WINAPIV MSVCRT__fwscanf_l(MSVCRT_FILE *file, const wchar_t *format,
int WINAPIV MSVCRT__fwscanf_l(FILE *file, const wchar_t *format,
_locale_t locale, ...)
{
__ms_va_list valist;
......@@ -289,7 +289,7 @@ int WINAPIV MSVCRT__fwscanf_l(MSVCRT_FILE *file, const wchar_t *format,
/*********************************************************************
* fwscanf_s (MSVCRT.@)
*/
int WINAPIV MSVCRT_fwscanf_s(MSVCRT_FILE *file, const wchar_t *format, ...)
int WINAPIV MSVCRT_fwscanf_s(FILE *file, const wchar_t *format, ...)
{
__ms_va_list valist;
int res;
......@@ -303,7 +303,7 @@ int WINAPIV MSVCRT_fwscanf_s(MSVCRT_FILE *file, const wchar_t *format, ...)
/*********************************************************************
* _fwscanf_s_l (MSVCRT.@)
*/
int WINAPIV MSVCRT__fwscanf_s_l(MSVCRT_FILE *file, const wchar_t *format,
int WINAPIV MSVCRT__fwscanf_s_l(FILE *file, const wchar_t *format,
_locale_t locale, ...)
{
__ms_va_list valist;
......@@ -704,7 +704,7 @@ int CDECL MSVCRT__stdio_common_vswscanf(unsigned __int64 options,
* __stdio_common_vfscanf (UCRTBASE.@)
*/
int CDECL MSVCRT__stdio_common_vfscanf(unsigned __int64 options,
MSVCRT_FILE *file,
FILE *file,
const char *format,
_locale_t locale,
__ms_va_list valist)
......@@ -721,7 +721,7 @@ int CDECL MSVCRT__stdio_common_vfscanf(unsigned __int64 options,
* __stdio_common_vfwscanf (UCRTBASE.@)
*/
int CDECL MSVCRT__stdio_common_vfwscanf(unsigned __int64 options,
MSVCRT_FILE *file,
FILE *file,
const wchar_t *format,
_locale_t locale,
__ms_va_list valist)
......
dlls/msvcrt/scanf.h
View file @ 92617993
......@@ -127,9 +127,9 @@
#define _LOCK_FILE_(file) MSVCRT__lock_file(file)
#define _UNLOCK_FILE_(file) MSVCRT__unlock_file(file)
#ifdef SECURE
#define _FUNCTION_ static int MSVCRT_vfwscanf_s_l(MSVCRT_FILE* file, const wchar_t *format, _locale_t locale, __ms_va_list ap)
#define _FUNCTION_ static int MSVCRT_vfwscanf_s_l(FILE* file, const wchar_t *format, _locale_t locale, __ms_va_list ap)
#else /* SECURE */
#define _FUNCTION_ static int MSVCRT_vfwscanf_l(MSVCRT_FILE* file, const wchar_t *format, _locale_t locale, __ms_va_list ap)
#define _FUNCTION_ static int MSVCRT_vfwscanf_l(FILE* file, const wchar_t *format, _locale_t locale, __ms_va_list ap)
#endif /* SECURE */
#else /* WIDE_SCANF */
#define _GETC_FUNC_(file) MSVCRT_fgetc(file)
......@@ -139,9 +139,9 @@
#define _LOCK_FILE_(file) MSVCRT__lock_file(file)
#define _UNLOCK_FILE_(file) MSVCRT__unlock_file(file)
#ifdef SECURE
#define _FUNCTION_ static int MSVCRT_vfscanf_s_l(MSVCRT_FILE* file, const char *format, _locale_t locale, __ms_va_list ap)
#define _FUNCTION_ static int MSVCRT_vfscanf_s_l(FILE* file, const char *format, _locale_t locale, __ms_va_list ap)
#else /* SECURE */
#define _FUNCTION_ static int MSVCRT_vfscanf_l(MSVCRT_FILE* file, const char *format, _locale_t locale, __ms_va_list ap)
#define _FUNCTION_ static int MSVCRT_vfscanf_l(FILE* file, const char *format, _locale_t locale, __ms_va_list ap)
#endif /* SECURE */
#endif /* WIDE_SCANF */
#endif /* STRING */
......@@ -153,7 +153,7 @@ struct _STRTOD_NAME_(strtod_scanf_ctx) {
#ifdef STRING
const _CHAR_ *file;
#else
MSVCRT_FILE *file;
FILE *file;
#endif
int length;
int read;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment