Jacek Caban : msvcrt: Use __iob_func instead of __p__iob in __acrt_iob_func implementation.
Alexandre Julliard
julliard at winehq.org
Thu Aug 8 19:27:21 CDT 2019
Module: wine
Branch: master
Commit: a0c424b111ff4365df77134d2fb96cbf45f22f50
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0c424b111ff4365df77134d2fb96cbf45f22f50
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Aug 8 18:27:19 2019 +0200
msvcrt: Use __iob_func instead of __p__iob in __acrt_iob_func implementation.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msvcr100/msvcr100.spec | 4 ++--
dlls/msvcr110/msvcr110.spec | 4 ++--
dlls/msvcr120/msvcr120.spec | 4 ++--
dlls/msvcr70/msvcr70.spec | 4 ++--
dlls/msvcr71/msvcr71.spec | 4 ++--
dlls/msvcr80/msvcr80.spec | 4 ++--
dlls/msvcr90/msvcr90.spec | 4 ++--
dlls/msvcrt/file.c | 5 +++--
dlls/msvcrt/iob.c | 7 ++++---
dlls/msvcrt/msvcrt.spec | 4 ++--
dlls/msvcrtd/msvcrtd.spec | 2 +-
11 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index c578176..cf4d6d4 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -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
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index 144ff1d..410aae4 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -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
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index 469bc01..171cfd27 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -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
diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec
index 06ced5e..1fefdaa 100644
--- a/dlls/msvcr70/msvcr70.spec
+++ b/dlls/msvcr70/msvcr70.spec
@@ -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()
diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec
index b5980b5..7f4f35a 100644
--- a/dlls/msvcr71/msvcr71.spec
+++ b/dlls/msvcr71/msvcr71.spec
@@ -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()
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index 717d02a..eb40249 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -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
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 7a2ce05..4050f42 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -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
diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c
index 8f91ca9..b5b51fc 100644
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -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];
}
diff --git a/dlls/msvcrt/iob.c b/dlls/msvcrt/iob.c
index c02913b..5d289f6 100644
--- a/dlls/msvcrt/iob.c
+++ b/dlls/msvcrt/iob.c
@@ -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__
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index ed1e72c..4ec0af1 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -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()
diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec
index debd4d0..4a0238e 100644
--- a/dlls/msvcrtd/msvcrtd.spec
+++ b/dlls/msvcrtd/msvcrtd.spec
@@ -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()
More information about the wine-cvs
mailing list