Module: wine Branch: master Commit: 62fd803e5269d5935ed5bfabff58e9cc02c9ca08 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62fd803e5269d5935ed5bfabf...
Author: Alexandre Julliard julliard@winehq.org Date: Fri Mar 29 09:38:36 2019 +0100
msvcrt: Only add __acrt_iob_func() to the import library of msvcrt itself.
This partially reverts ca50117418d6b8a6146dcecd5e78819b28da2e40.
Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/msvcr100/Makefile.in | 1 - dlls/msvcr110/Makefile.in | 1 - dlls/msvcr120/Makefile.in | 1 - dlls/msvcr70/Makefile.in | 1 - dlls/msvcr71/Makefile.in | 1 - dlls/msvcr80/Makefile.in | 1 - dlls/msvcr90/Makefile.in | 1 - dlls/msvcrt/file.c | 10 ++++++++++ dlls/ucrtbase/Makefile.in | 1 - dlls/ucrtbase/ucrtbase.spec | 4 ++-- 10 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/dlls/msvcr100/Makefile.in b/dlls/msvcr100/Makefile.in index e95c929..5018226 100644 --- 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 \ diff --git a/dlls/msvcr110/Makefile.in b/dlls/msvcr110/Makefile.in index 00928ca..d00d24e 100644 --- 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 \ diff --git a/dlls/msvcr120/Makefile.in b/dlls/msvcr120/Makefile.in index fa09d30..7f32a17 100644 --- 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 \ diff --git a/dlls/msvcr70/Makefile.in b/dlls/msvcr70/Makefile.in index c7d3edf..f44f437 100644 --- 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 \ diff --git a/dlls/msvcr71/Makefile.in b/dlls/msvcr71/Makefile.in index d7606cc..e2a8679 100644 --- 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 \ diff --git a/dlls/msvcr80/Makefile.in b/dlls/msvcr80/Makefile.in index 90c43f7..e935509 100644 --- 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 \ diff --git a/dlls/msvcr90/Makefile.in b/dlls/msvcr90/Makefile.in index 5d644a3..550878f 100644 --- 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 \ diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 0983d6e..851a89c 100644 --- 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.@) */ diff --git a/dlls/ucrtbase/Makefile.in b/dlls/ucrtbase/Makefile.in index e023305..c7cc63d 100644 --- 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 \ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 2fde50e..6dab5e7 100644 --- 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