msvcrt: Use __iob_func instead of __p__iob in __acrt_iob_func implementation.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2019-08-08 18:27:19 +02:00 committed by Alexandre Julliard
parent bb62fe7f51
commit a0c424b111
11 changed files with 24 additions and 22 deletions

View File

@ -594,7 +594,7 @@
@ stub __get_tlsindex
@ cdecl __getmainargs(ptr ptr ptr long ptr)
@ extern __initenv MSVCRT___initenv
@ cdecl __iob_func() __p__iob
@ cdecl __iob_func()
@ cdecl __isascii(long) MSVCRT___isascii
@ cdecl __iscsym(long) MSVCRT___iscsym
@ cdecl __iscsymf(long) MSVCRT___iscsymf
@ -636,7 +636,7 @@
@ cdecl __p__dstbias() MSVCRT___p__dstbias
@ cdecl __p__environ() MSVCRT___p__environ
@ cdecl __p__fmode() MSVCRT___p__fmode
@ cdecl __p__iob()
@ cdecl __p__iob() __iob_func
@ stub __p__mbcasemap()
@ cdecl __p__mbctype()
@ cdecl __p__pctype() MSVCRT___p__pctype

View File

@ -942,7 +942,7 @@
@ stub __get_tlsindex
@ cdecl __getmainargs(ptr ptr ptr long ptr)
@ extern __initenv MSVCRT___initenv
@ cdecl __iob_func() __p__iob
@ cdecl __iob_func()
@ cdecl __isascii(long) MSVCRT___isascii
@ cdecl __iscsym(long) MSVCRT___iscsym
@ cdecl __iscsymf(long) MSVCRT___iscsymf
@ -985,7 +985,7 @@
@ cdecl __p__dstbias() MSVCRT___p__dstbias
@ cdecl __p__environ() MSVCRT___p__environ
@ cdecl __p__fmode() MSVCRT___p__fmode
@ cdecl __p__iob()
@ cdecl __p__iob() __iob_func
@ stub __p__mbcasemap()
@ cdecl __p__mbctype()
@ cdecl __p__pctype() MSVCRT___p__pctype

View File

@ -932,7 +932,7 @@
@ stub __get_tlsindex
@ cdecl __getmainargs(ptr ptr ptr long ptr)
@ extern __initenv MSVCRT___initenv
@ cdecl __iob_func() __p__iob
@ cdecl __iob_func()
@ cdecl __isascii(long) MSVCRT___isascii
@ cdecl __iscsym(long) MSVCRT___iscsym
@ cdecl __iscsymf(long) MSVCRT___iscsymf
@ -975,7 +975,7 @@
@ cdecl __p__dstbias() MSVCRT___p__dstbias
@ cdecl __p__environ() MSVCRT___p__environ
@ cdecl __p__fmode() MSVCRT___p__fmode
@ cdecl __p__iob()
@ cdecl __p__iob() __iob_func
@ stub __p__mbcasemap()
@ cdecl __p__mbctype()
@ cdecl __p__pctype() MSVCRT___p__pctype

View File

@ -151,7 +151,7 @@
@ cdecl __fpecode()
@ cdecl __getmainargs(ptr ptr ptr long ptr)
@ extern __initenv MSVCRT___initenv
@ cdecl __iob_func() __p__iob
@ cdecl __iob_func()
@ cdecl __isascii(long) MSVCRT___isascii
@ cdecl __iscsym(long) MSVCRT___iscsym
@ cdecl __iscsymf(long) MSVCRT___iscsymf
@ -175,7 +175,7 @@
@ cdecl __p__environ() MSVCRT___p__environ
@ stub __p__fileinfo()
@ cdecl __p__fmode() MSVCRT___p__fmode
@ cdecl __p__iob()
@ cdecl __p__iob() __iob_func
@ stub __p__mbcasemap()
@ cdecl __p__mbctype()
@ cdecl __p__osver()

View File

@ -146,7 +146,7 @@
@ cdecl __fpecode()
@ cdecl __getmainargs(ptr ptr ptr long ptr)
@ extern __initenv MSVCRT___initenv
@ cdecl __iob_func() __p__iob
@ cdecl __iob_func()
@ cdecl __isascii(long) MSVCRT___isascii
@ cdecl __iscsym(long) MSVCRT___iscsym
@ cdecl __iscsymf(long) MSVCRT___iscsymf
@ -170,7 +170,7 @@
@ cdecl __p__environ() MSVCRT___p__environ
@ stub __p__fileinfo()
@ cdecl __p__fmode() MSVCRT___p__fmode
@ cdecl __p__iob()
@ cdecl __p__iob() __iob_func
@ stub __p__mbcasemap()
@ cdecl __p__mbctype()
@ cdecl __p__osver()

View File

@ -233,7 +233,7 @@
@ stub __get_tlsindex
@ cdecl __getmainargs(ptr ptr ptr long ptr)
@ extern __initenv MSVCRT___initenv
@ cdecl __iob_func() __p__iob
@ cdecl __iob_func()
@ cdecl __isascii(long) MSVCRT___isascii
@ cdecl __iscsym(long) MSVCRT___iscsym
@ cdecl __iscsymf(long) MSVCRT___iscsymf
@ -280,7 +280,7 @@
@ cdecl __p__dstbias() MSVCRT___p__dstbias
@ cdecl __p__environ() MSVCRT___p__environ
@ cdecl __p__fmode() MSVCRT___p__fmode
@ cdecl __p__iob()
@ cdecl __p__iob() __iob_func
@ stub __p__mbcasemap()
@ cdecl __p__mbctype()
@ stub __p__osplatform

View File

@ -222,7 +222,7 @@
@ stub __get_tlsindex
@ cdecl __getmainargs(ptr ptr ptr long ptr)
@ extern __initenv MSVCRT___initenv
@ cdecl __iob_func() __p__iob
@ cdecl __iob_func()
@ cdecl __isascii(long) MSVCRT___isascii
@ cdecl __iscsym(long) MSVCRT___iscsym
@ cdecl __iscsymf(long) MSVCRT___iscsymf
@ -269,7 +269,7 @@
@ cdecl __p__dstbias() MSVCRT___p__dstbias
@ cdecl __p__environ() MSVCRT___p__environ
@ cdecl __p__fmode() MSVCRT___p__fmode
@ cdecl __p__iob()
@ cdecl __p__iob() __iob_func
@ stub __p__mbcasemap()
@ cdecl __p__mbctype()
@ cdecl __p__pctype() MSVCRT___p__pctype

View File

@ -780,9 +780,10 @@ static int msvcrt_int_to_base32_w(int num, MSVCRT_wchar_t *str)
}
/*********************************************************************
* __p__iob (MSVCRT.@)
* __iob_func (MSVCRT.@)
*/
MSVCRT_FILE * CDECL __p__iob(void)
#undef __iob_func
MSVCRT_FILE * CDECL __iob_func(void)
{
return &MSVCRT__iob[0];
}

View File

@ -18,21 +18,22 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
/* this function is part of the import lib for compatibility with the Mingw runtime */
/* this function is part of the import lib for compatibility with ucrt runtime */
#if 0
#pragma makedep implib
#endif
#include "msvcrt.h"
extern MSVCRT_FILE * CDECL __p__iob(void);
#undef __iob_func
extern MSVCRT_FILE * CDECL __iob_func(void);
/*********************************************************************
* __acrt_iob_func(UCRTBASE.@)
*/
MSVCRT_FILE * CDECL __acrt_iob_func(unsigned idx)
{
return __p__iob() + idx;
return __iob_func() + idx;
}
#ifdef __i386__

View File

@ -214,7 +214,7 @@
@ stub __get_app_type
@ cdecl __getmainargs(ptr ptr ptr long ptr)
@ extern __initenv MSVCRT___initenv
@ cdecl __iob_func() __p__iob
@ cdecl __iob_func()
@ cdecl __isascii(long) MSVCRT___isascii
@ cdecl __iscsym(long) MSVCRT___iscsym
@ cdecl __iscsymf(long) MSVCRT___iscsymf
@ -259,7 +259,7 @@
@ cdecl -arch=win32 __p__environ() MSVCRT___p__environ
@ stub -arch=win32 __p__fileinfo()
@ cdecl -arch=win32 __p__fmode() MSVCRT___p__fmode
@ cdecl __p__iob()
@ cdecl __p__iob() __iob_func
@ stub -arch=win32 __p__mbcasemap()
@ cdecl -arch=win32 __p__mbctype()
@ cdecl -arch=win32 __p__osver()

View File

@ -167,7 +167,7 @@
@ cdecl __p__environ() MSVCRT___p__environ
@ stub __p__fileinfo()
@ cdecl __p__fmode() MSVCRT___p__fmode
@ cdecl __p__iob()
@ cdecl __p__iob() __iob_func
@ stub __p__mbcasemap()
@ cdecl __p__mbctype()
@ cdecl __p__osver()