msvcrt: Only add __acrt_iob_func() to the import library of msvcrt itself.

This partially reverts ca501174. Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Only add __acrt_iob_func() to the import library of msvcrt itself.
62fd803e · Alexandre Julliard · cad72d3c · 62fd803e · 62fd803e · 62fd803e
Commit 62fd803e authored Mar 29, 2019 by Alexandre Julliard
10 changed files
--- a/dlls/msvcr100/Makefile.in
+++ b/dlls/msvcr100/Makefile.in
@@ -20,7 +20,6 @@ C_SRCS = \
 	exit.c \
 	file.c \
 	heap.c \
-	iob.c \
 	locale.c \
 	lock.c \
 	main.c \

--- a/dlls/msvcr110/Makefile.in
+++ b/dlls/msvcr110/Makefile.in
@@ -20,7 +20,6 @@ C_SRCS = \
 	exit.c \
 	file.c \
 	heap.c \
-	iob.c \
 	locale.c \
 	lock.c \
 	main.c \

--- a/dlls/msvcr120/Makefile.in
+++ b/dlls/msvcr120/Makefile.in
@@ -20,7 +20,6 @@ C_SRCS = \
 	exit.c \
 	file.c \
 	heap.c \
-	iob.c \
 	locale.c \
 	lock.c \
 	main.c \

--- a/dlls/msvcr70/Makefile.in
+++ b/dlls/msvcr70/Makefile.in
@@ -20,7 +20,6 @@ C_SRCS = \
 	exit.c \
 	file.c \
 	heap.c \
-	iob.c \
 	locale.c \
 	lock.c \
 	main.c \

--- a/dlls/msvcr71/Makefile.in
+++ b/dlls/msvcr71/Makefile.in
@@ -20,7 +20,6 @@ C_SRCS = \
 	exit.c \
 	file.c \
 	heap.c \
-	iob.c \
 	locale.c \
 	lock.c \
 	main.c \

--- a/dlls/msvcr80/Makefile.in
+++ b/dlls/msvcr80/Makefile.in
@@ -20,7 +20,6 @@ C_SRCS = \
 	exit.c \
 	file.c \
 	heap.c \
-	iob.c \
 	locale.c \
 	lock.c \
 	main.c \

--- a/dlls/msvcr90/Makefile.in
+++ b/dlls/msvcr90/Makefile.in
@@ -20,7 +20,6 @@ C_SRCS = \
 	exit.c \
 	file.c \
 	heap.c \
-	iob.c \
 	locale.c \
 	lock.c \
 	main.c \

--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -786,6 +786,16 @@ MSVCRT_FILE * CDECL __p__iob(void)
 return &MSVCRT__iob[0];
 }

+#if _MSVCR_VER >= 140
+/*********************************************************************
+ *		__acrt_iob_func(UCRTBASE.@)
+ */
+MSVCRT_FILE * CDECL MSVCRT___acrt_iob_func(unsigned idx)
+{
+ return &MSVCRT__iob[idx];
+}
+#endif
+
 /*********************************************************************
 *		_access (MSVCRT.@)
 */

--- a/dlls/ucrtbase/Makefile.in
+++ b/dlls/ucrtbase/Makefile.in
@@ -20,7 +20,6 @@ C_SRCS = \
 	exit.c \
 	file.c \
 	heap.c \
-	iob.c \
 	locale.c \
 	lock.c \
 	main.c \

--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -72,7 +72,7 @@
 @ cdecl ___lc_locale_name_func()
 @ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func
 @ cdecl ___mb_cur_max_l_func(ptr)
-@ cdecl __acrt_iob_func(long)
+@ cdecl __acrt_iob_func(long) MSVCRT___acrt_iob_func
 @ cdecl __conio_common_vcprintf(int64 str ptr ptr) MSVCRT__conio_common_vcprintf
 @ stub __conio_common_vcprintf_p
 @ stub __conio_common_vcprintf_s
@@ -758,7 +758,7 @@
 @ stub _o____lc_collate_cp_func
 @ stub _o____lc_locale_name_func
 @ stub _o____mb_cur_max_func
-@ cdecl _o___acrt_iob_func(long) __acrt_iob_func
+@ cdecl _o___acrt_iob_func(long) MSVCRT___acrt_iob_func
 @ stub _o___conio_common_vcprintf
 @ stub _o___conio_common_vcprintf_p
 @ stub _o___conio_common_vcprintf_s