Alexandre Julliard : msvcrt: Fix some spec file discrepancies.
Alexandre Julliard
julliard at winehq.org
Fri Jan 15 15:39:45 CST 2021
Module: wine
Branch: master
Commit: dda104587bf734f2bbaf6c4b075d32ab6a0bb8c5
URL: https://source.winehq.org/git/wine.git/?a=commit;h=dda104587bf734f2bbaf6c4b075d32ab6a0bb8c5
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Jan 15 17:05:55 2021 +0100
msvcrt: Fix some spec file discrepancies.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msvcr100/msvcr100.spec | 6 +++---
dlls/msvcr110/msvcr110.spec | 10 +++++-----
dlls/msvcr120/msvcr120.spec | 6 +++---
dlls/msvcr120_app/msvcr120_app.spec | 2 +-
dlls/msvcr70/msvcr70.spec | 4 ++--
dlls/msvcr71/msvcr71.spec | 6 +++---
dlls/msvcr80/msvcr80.spec | 6 +++---
dlls/msvcr90/msvcr90.spec | 6 +++---
dlls/msvcrt/msvcrt.spec | 4 ++--
dlls/msvcrtd/msvcrtd.spec | 2 +-
dlls/ucrtbase/ucrtbase.spec | 8 ++++----
11 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 4e981ca8718..b15a6219c52 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -657,7 +657,7 @@
@ extern __setlc_active MSVCRT___setlc_active
@ cdecl __setusermatherr(ptr)
@ cdecl __strncnt(str long)
-@ varargs __swprintf_l(ptr wstr ptr)
+@ varargs __swprintf_l(ptr wstr ptr)
@ cdecl __sys_errlist()
@ cdecl __sys_nerr()
@ cdecl __threadhandle() kernel32.GetCurrentThread
@@ -870,7 +870,7 @@
@ varargs _fwscanf_l(ptr wstr ptr)
@ varargs _fwscanf_s_l(ptr wstr ptr)
@ cdecl _gcvt(double long str)
-@ cdecl _gcvt_s(ptr long double long)
+@ cdecl _gcvt_s(ptr long double long)
@ cdecl _get_current_locale()
@ cdecl _get_daylight(ptr)
@ cdecl _get_doserrno(ptr)
@@ -903,7 +903,7 @@
@ cdecl _getdrives() kernel32.GetLogicalDrives
@ cdecl _getmaxstdio()
@ cdecl _getmbcp()
-@ cdecl _getpid() _getpid
+@ cdecl _getpid()
@ cdecl _getptd()
@ stub _getsystime(ptr)
@ cdecl _getw(ptr)
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index 5aef5e3739f..c4782b5977b 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -1005,7 +1005,7 @@
@ extern __setlc_active MSVCRT___setlc_active
@ cdecl __setusermatherr(ptr)
@ cdecl __strncnt(str long)
-@ varargs __swprintf_l(ptr wstr ptr)
+@ varargs __swprintf_l(ptr wstr ptr)
@ cdecl __sys_errlist()
@ cdecl __sys_nerr()
@ cdecl __threadhandle() kernel32.GetCurrentThread
@@ -1217,7 +1217,7 @@
@ varargs _fwscanf_l(ptr wstr ptr)
@ varargs _fwscanf_s_l(ptr wstr ptr)
@ cdecl _gcvt(double long str)
-@ cdecl _gcvt_s(ptr long double long)
+@ cdecl _gcvt_s(ptr long double long)
@ cdecl _get_current_locale()
@ cdecl _get_daylight(ptr)
@ cdecl _get_doserrno(ptr)
@@ -1249,7 +1249,7 @@
@ cdecl _getdrives() kernel32.GetLogicalDrives
@ cdecl _getmaxstdio()
@ cdecl _getmbcp()
-@ cdecl _getpid() _getpid
+@ cdecl _getpid()
@ cdecl _getptd()
@ stub _getsystime(ptr)
@ cdecl _getw(ptr)
@@ -1340,9 +1340,9 @@
@ cdecl _ismbcl2_l(long ptr)
@ cdecl _ismbclegal(long)
@ cdecl _ismbclegal_l(long ptr)
-@ stub _ismbclower(long)
+@ cdecl _ismbclower(long)
@ cdecl _ismbclower_l(long ptr)
-@ stub _ismbcprint(long)
+@ cdecl _ismbcprint(long)
@ cdecl _ismbcprint_l(long ptr)
@ cdecl _ismbcpunct(long)
@ cdecl _ismbcpunct_l(long ptr)
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index 50cb4377fb5..b8ba61a2e8c 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -1217,7 +1217,7 @@
@ varargs _fwscanf_l(ptr wstr ptr)
@ varargs _fwscanf_s_l(ptr wstr ptr)
@ cdecl _gcvt(double long str)
-@ cdecl _gcvt_s(ptr long double long)
+@ cdecl _gcvt_s(ptr long double long)
@ cdecl _get_current_locale()
@ cdecl _get_daylight(ptr)
@ cdecl _get_doserrno(ptr)
@@ -1249,7 +1249,7 @@
@ cdecl _getdrives() kernel32.GetLogicalDrives
@ cdecl _getmaxstdio()
@ cdecl _getmbcp()
-@ cdecl _getpid() _getpid
+@ cdecl _getpid()
@ cdecl _getptd()
@ stub _getsystime(ptr)
@ cdecl _getw(ptr)
@@ -1345,7 +1345,7 @@
@ cdecl _ismbcl2_l(long ptr)
@ cdecl _ismbclegal(long)
@ cdecl _ismbclegal_l(long ptr)
-@ stub _ismbclower(long)
+@ cdecl _ismbclower(long)
@ cdecl _ismbclower_l(long ptr)
@ cdecl _ismbcprint(long)
@ cdecl _ismbcprint_l(long ptr)
diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec
index 144eb39ac29..b99bb2ee614 100644
--- a/dlls/msvcr120_app/msvcr120_app.spec
+++ b/dlls/msvcr120_app/msvcr120_app.spec
@@ -1145,7 +1145,7 @@
@ varargs _fwscanf_l(ptr wstr ptr) msvcr120._fwscanf_l
@ varargs _fwscanf_s_l(ptr wstr ptr) msvcr120._fwscanf_s_l
@ cdecl _gcvt(double long str) msvcr120._gcvt
-@ cdecl _gcvt_s(ptr long double long) msvcr120._gcvt_s
+@ cdecl _gcvt_s(ptr long double long) msvcr120._gcvt_s
@ cdecl _get_current_locale() msvcr120._get_current_locale
@ cdecl _get_daylight(ptr) msvcr120._get_daylight
@ cdecl _get_doserrno(ptr) msvcr120._get_doserrno
diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec
index 07b1bb7298d..bdf94e26226 100644
--- a/dlls/msvcr70/msvcr70.spec
+++ b/dlls/msvcr70/msvcr70.spec
@@ -342,7 +342,7 @@
@ cdecl _getdrives() kernel32.GetLogicalDrives
@ cdecl _getmaxstdio()
@ cdecl _getmbcp()
-@ cdecl _getpid() _getpid
+@ cdecl _getpid()
@ stub _getsystime(ptr)
@ cdecl _getw(ptr)
@ cdecl _getwch()
@@ -421,7 +421,7 @@
@ cdecl _mbbtombc(long)
@ cdecl _mbbtype(long long)
# extern _mbcasemap
-@ cdecl _mbccpy(ptr str)
+@ cdecl _mbccpy(ptr ptr)
@ cdecl _mbcjistojms(long)
@ cdecl _mbcjmstojis(long)
@ cdecl _mbclen(ptr)
diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec
index b3231c0be45..98d35a337df 100644
--- a/dlls/msvcr71/msvcr71.spec
+++ b/dlls/msvcr71/msvcr71.spec
@@ -230,7 +230,7 @@
@ cdecl _amsg_exit(long)
@ cdecl _assert(str str long)
@ cdecl _atodbl(ptr str)
-@ cdecl -ret64 _atoi64(str) ntdll._atoi64
+@ cdecl -ret64 _atoi64(str)
@ cdecl _atoldbl(ptr str)
@ cdecl _beep(long long)
@ cdecl _beginthread(ptr long ptr)
@@ -337,7 +337,7 @@
@ cdecl _getdrives() kernel32.GetLogicalDrives
@ cdecl _getmaxstdio()
@ cdecl _getmbcp()
-@ cdecl _getpid() _getpid
+@ cdecl _getpid()
@ stub _getsystime(ptr)
@ cdecl _getw(ptr)
@ cdecl _getwch()
@@ -416,7 +416,7 @@
@ cdecl _mbbtombc(long)
@ cdecl _mbbtype(long long)
# extern _mbcasemap
-@ cdecl _mbccpy(ptr str)
+@ cdecl _mbccpy(ptr ptr)
@ cdecl _mbcjistojms(long)
@ cdecl _mbcjmstojis(long)
@ cdecl _mbclen(ptr)
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index 187aeabca6d..ddca7ed9ff7 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -306,7 +306,7 @@
@ extern __setlc_active MSVCRT___setlc_active
@ cdecl __setusermatherr(ptr)
@ cdecl __strncnt(str long)
-@ varargs __swprintf_l(ptr wstr ptr)
+@ varargs __swprintf_l(ptr wstr ptr)
@ cdecl __sys_errlist()
@ cdecl __sys_nerr()
@ cdecl __threadhandle() kernel32.GetCurrentThread
@@ -536,7 +536,7 @@
@ varargs _fwscanf_l(ptr wstr ptr)
@ varargs _fwscanf_s_l(ptr wstr ptr)
@ cdecl _gcvt(double long str)
-@ cdecl _gcvt_s(ptr long double long)
+@ cdecl _gcvt_s(ptr long double long)
@ stub _get_amblksiz
@ cdecl _get_current_locale()
@ cdecl _get_daylight(ptr)
@@ -576,7 +576,7 @@
@ cdecl _getdrives() kernel32.GetLogicalDrives
@ cdecl _getmaxstdio()
@ cdecl _getmbcp()
-@ cdecl _getpid() _getpid
+@ cdecl _getpid()
@ cdecl _getptd()
@ stub _getsystime(ptr)
@ cdecl _getw(ptr)
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 9f8a3ba8877..5e35ded3570 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -290,7 +290,7 @@
@ extern __setlc_active MSVCRT___setlc_active
@ cdecl __setusermatherr(ptr)
@ cdecl __strncnt(str long)
-@ varargs __swprintf_l(ptr wstr ptr)
+@ varargs __swprintf_l(ptr wstr ptr)
@ cdecl __sys_errlist()
@ cdecl __sys_nerr()
@ cdecl __threadhandle() kernel32.GetCurrentThread
@@ -519,7 +519,7 @@
@ varargs _fwscanf_l(ptr wstr ptr)
@ varargs _fwscanf_s_l(ptr wstr ptr)
@ cdecl _gcvt(double long str)
-@ cdecl _gcvt_s(ptr long double long)
+@ cdecl _gcvt_s(ptr long double long)
@ stub _get_amblksiz
@ cdecl _get_current_locale()
@ cdecl _get_daylight(ptr)
@@ -554,7 +554,7 @@
@ cdecl _getdrives() kernel32.GetLogicalDrives
@ cdecl _getmaxstdio()
@ cdecl _getmbcp()
-@ cdecl _getpid() _getpid
+@ cdecl _getpid()
@ cdecl _getptd()
@ stub _getsystime(ptr)
@ cdecl _getw(ptr)
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index c40510a4889..f80c0af6700 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -500,7 +500,7 @@
@ varargs _fwscanf_l(ptr wstr ptr)
@ varargs _fwscanf_s_l(ptr wstr ptr)
@ cdecl _gcvt(double long str)
-@ cdecl _gcvt_s(ptr long double long)
+@ cdecl _gcvt_s(ptr long double long)
@ cdecl _get_current_locale()
@ cdecl _get_doserrno(ptr)
@ cdecl _get_environ(ptr)
@@ -532,7 +532,7 @@
@ cdecl _getdrives() kernel32.GetLogicalDrives
@ cdecl _getmaxstdio()
@ cdecl _getmbcp()
-@ cdecl _getpid() _getpid
+@ cdecl _getpid()
@ stub _getsystime(ptr)
@ cdecl _getw(ptr)
@ cdecl _getwch()
diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec
index 9c78b3ba389..7162e5168a4 100644
--- a/dlls/msvcrtd/msvcrtd.spec
+++ b/dlls/msvcrtd/msvcrtd.spec
@@ -552,7 +552,7 @@
@ cdecl _unlock(long)
@ cdecl -arch=win32 _utime(str ptr) _utime32
@ cdecl -arch=win64 _utime(str ptr) _utime64
-@ cdecl _vsnprintf(ptr long str ptr)
+@ cdecl -norelay _vsnprintf(ptr long str ptr)
@ cdecl _vsnwprintf(ptr long wstr ptr)
@ cdecl _waccess(wstr long)
@ cdecl _wasctime(ptr)
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index 2a4a77865a8..b1d6cf992b4 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -394,7 +394,7 @@
@ cdecl _getdrives() kernel32.GetLogicalDrives
@ cdecl _getmaxstdio()
@ cdecl _getmbcp()
-@ cdecl _getpid() _getpid
+@ cdecl _getpid()
@ stub _getsystime(ptr)
@ cdecl _getw(ptr)
@ cdecl _getwc_nolock(ptr) _fgetwc_nolock
@@ -484,7 +484,7 @@
@ cdecl _ismbcl2_l(long ptr)
@ cdecl _ismbclegal(long)
@ cdecl _ismbclegal_l(long ptr)
-@ stub _ismbclower(long)
+@ cdecl _ismbclower(long)
@ cdecl _ismbclower_l(long ptr)
@ cdecl _ismbcprint(long)
@ cdecl _ismbcprint_l(long ptr)
@@ -623,7 +623,7 @@
@ cdecl _mbscspn_l(str str ptr)
@ cdecl _mbsdec(ptr ptr)
@ stub _mbsdec_l
-@ stub _mbsdup(str)
+@ cdecl _mbsdup(str) _strdup
@ cdecl _mbsicmp(str str)
@ stub _mbsicmp_l
@ cdecl _mbsicoll(str str)
@@ -2425,7 +2425,7 @@
@ cdecl memcpy(ptr ptr long)
@ cdecl memcpy_s(ptr long ptr long)
@ cdecl memmove(ptr ptr long)
-@ cdecl memmove_s(ptr long ptr long) memmove_s
+@ cdecl memmove_s(ptr long ptr long)
@ cdecl memset(ptr long long)
@ cdecl modf(double ptr)
@ cdecl -arch=!i386 modff(float ptr)
More information about the wine-cvs
mailing list