From dfdea6c4a59af94cfbf17367c703812a33c74b13 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sun, 29 Aug 2010 12:07:37 +0200 Subject: [PATCH] msvcrt: Add -ret64 flag on some functions that return a 64-bit value. --- dlls/msvcr100/msvcr100.spec | 18 +++++++++--------- dlls/msvcr70/msvcr70.spec | 10 +++++----- dlls/msvcr71/msvcr71.spec | 10 +++++----- dlls/msvcr80/msvcr80.spec | 18 +++++++++--------- dlls/msvcr90/msvcr90.spec | 18 +++++++++--------- dlls/msvcrt/msvcrt.spec | 20 ++++++++++---------- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ntdll/ntdll.spec | 2 +- 8 files changed, 49 insertions(+), 49 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 5c688052cdd..66c0f7be5af 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1158,11 +1158,11 @@ @ cdecl _strtime(ptr) msvcrt._strtime @ cdecl _strtime_s(ptr long) msvcrt._strtime_s @ cdecl _strtod_l(str ptr ptr) msvcrt._strtod_l -@ cdecl _strtoi64(str ptr long) msvcrt._strtoi64 -@ cdecl _strtoi64_l(str ptr long ptr) msvcrt._strtoi64_l +@ cdecl -ret64 _strtoi64(str ptr long) msvcrt._strtoi64 +@ cdecl -ret64 _strtoi64_l(str ptr long ptr) msvcrt._strtoi64_l @ stub _strtol_l -@ cdecl _strtoui64(str ptr long) msvcrt._strtoui64 -@ cdecl _strtoui64_l(str ptr long ptr) msvcrt._strtoui64_l +@ cdecl -ret64 _strtoui64(str ptr long) msvcrt._strtoui64 +@ cdecl -ret64 _strtoui64_l(str ptr long ptr) msvcrt._strtoui64_l @ stub _strtoul_l @ cdecl _strupr(str) msvcrt._strupr @ stub _strupr_l @@ -1307,13 +1307,13 @@ @ cdecl _wcsset(wstr long) msvcrt._wcsset @ stub _wcsset_s @ cdecl _wcstod_l(wstr ptr) msvcrt._wcstod_l -@ cdecl _wcstoi64(wstr ptr long) msvcrt._wcstoi64 -@ cdecl _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l +@ cdecl -ret64 _wcstoi64(wstr ptr long) msvcrt._wcstoi64 +@ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l @ stub _wcstol_l @ cdecl _wcstombs_l(ptr ptr long ptr) msvcrt._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l -@ cdecl _wcstoui64(wstr ptr long) msvcrt._wcstoui64 -@ cdecl _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l +@ cdecl -ret64 _wcstoui64(wstr ptr long) msvcrt._wcstoui64 +@ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l @ stub _wcstoul_l @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l @@ -1408,7 +1408,7 @@ @ cdecl _wtof(wstr) msvcrt._wtof @ cdecl _wtof_l(wstr ptr) msvcrt._wtof_l @ cdecl _wtoi(wstr) msvcrt._wtoi -@ cdecl _wtoi64(wstr) msvcrt._wtoi64 +@ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 @ stub _wtoi64_l @ stub _wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 2949b54e0bc..bfcac58a1bd 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -557,8 +557,8 @@ @ cdecl _strrev(str) msvcrt._strrev @ cdecl _strset(str long) msvcrt._strset @ cdecl _strtime(ptr) msvcrt._strtime -@ cdecl _strtoi64(str ptr long) msvcrt._strtoi64 -@ cdecl _strtoui64(str ptr long) msvcrt._strtoui64 +@ cdecl -ret64 _strtoi64(str ptr long) msvcrt._strtoi64 +@ cdecl -ret64 _strtoui64(str ptr long) msvcrt._strtoui64 @ cdecl _strupr(str) msvcrt._strupr @ cdecl _swab(str str long) msvcrt._swab @ extern _sys_errlist msvcrt._sys_errlist @@ -605,8 +605,8 @@ @ cdecl _wcsnset(wstr long long) msvcrt._wcsnset @ cdecl _wcsrev(wstr) msvcrt._wcsrev @ cdecl _wcsset(wstr long) msvcrt._wcsset -@ cdecl _wcstoi64(wstr ptr long) msvcrt._wcstoi64 -@ cdecl _wcstoui64(wstr ptr long) msvcrt._wcstoui64 +@ cdecl -ret64 _wcstoi64(wstr ptr long) msvcrt._wcstoi64 +@ cdecl -ret64 _wcstoui64(wstr ptr long) msvcrt._wcstoui64 @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ cdecl _wctime(ptr) msvcrt._wctime @ cdecl _wctime64(ptr) msvcrt._wctime64 @@ -671,7 +671,7 @@ @ stub _wtmpnam @ cdecl _wtof(wstr) msvcrt._wtof @ cdecl _wtoi(wstr) msvcrt._wtoi -@ cdecl _wtoi64(wstr) msvcrt._wtoi64 +@ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 @ cdecl _wtol(wstr) msvcrt._wtol @ cdecl _wunlink(wstr) msvcrt._wunlink @ cdecl _wutime(wstr ptr) msvcrt._wutime diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 8d488cf2067..c4c21e6a8cc 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -553,8 +553,8 @@ @ cdecl _strrev(str) msvcrt._strrev @ cdecl _strset(str long) msvcrt._strset @ cdecl _strtime(ptr) msvcrt._strtime -@ cdecl _strtoi64(str ptr long) msvcrt._strtoi64 -@ cdecl _strtoui64(str ptr long) msvcrt._strtoui64 +@ cdecl -ret64 _strtoi64(str ptr long) msvcrt._strtoi64 +@ cdecl -ret64 _strtoui64(str ptr long) msvcrt._strtoui64 @ cdecl _strupr(str) msvcrt._strupr @ cdecl _swab(str str long) msvcrt._swab @ extern _sys_errlist msvcrt._sys_errlist @@ -601,8 +601,8 @@ @ cdecl _wcsnset(wstr long long) msvcrt._wcsnset @ cdecl _wcsrev(wstr) msvcrt._wcsrev @ cdecl _wcsset(wstr long) msvcrt._wcsset -@ cdecl _wcstoi64(wstr ptr long) msvcrt._wcstoi64 -@ cdecl _wcstoui64(wstr ptr long) msvcrt._wcstoui64 +@ cdecl -ret64 _wcstoi64(wstr ptr long) msvcrt._wcstoi64 +@ cdecl -ret64 _wcstoui64(wstr ptr long) msvcrt._wcstoui64 @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ cdecl _wctime(ptr) msvcrt._wctime @ cdecl _wctime64(ptr) msvcrt._wctime64 @@ -667,7 +667,7 @@ @ cdecl _wtmpnam(ptr) msvcrt._wtmpnam @ cdecl _wtof(wstr) msvcrt._wtof @ cdecl _wtoi(wstr) msvcrt._wtoi -@ cdecl _wtoi64(wstr) msvcrt._wtoi64 +@ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 @ cdecl _wtol(wstr) msvcrt._wtol @ cdecl _wunlink(wstr) msvcrt._wunlink @ cdecl _wutime(wstr ptr) msvcrt._wutime diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 701e28a5655..efc450d125a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1012,11 +1012,11 @@ @ cdecl _strtime(ptr) msvcrt._strtime @ cdecl _strtime_s(ptr long) msvcrt._strtime_s @ cdecl _strtod_l(str ptr ptr) msvcrt._strtod_l -@ cdecl _strtoi64(str ptr long) msvcrt._strtoi64 -@ cdecl _strtoi64_l(str ptr long ptr) msvcrt._strtoi64_l +@ cdecl -ret64 _strtoi64(str ptr long) msvcrt._strtoi64 +@ cdecl -ret64 _strtoi64_l(str ptr long ptr) msvcrt._strtoi64_l @ stub _strtol_l -@ cdecl _strtoui64(str ptr long) msvcrt._strtoui64 -@ cdecl _strtoui64_l(str ptr long ptr) msvcrt._strtoui64_l +@ cdecl -ret64 _strtoui64(str ptr long) msvcrt._strtoui64 +@ cdecl -ret64 _strtoui64_l(str ptr long ptr) msvcrt._strtoui64_l @ stub _strtoul_l @ cdecl _strupr(str) msvcrt._strupr @ stub _strupr_l @@ -1160,13 +1160,13 @@ @ cdecl _wcsset(wstr long) msvcrt._wcsset @ stub _wcsset_s @ cdecl _wcstod_l(wstr ptr) msvcrt._wcstod_l -@ cdecl _wcstoi64(wstr ptr long) msvcrt._wcstoi64 -@ cdecl _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l +@ cdecl -ret64 _wcstoi64(wstr ptr long) msvcrt._wcstoi64 +@ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l @ stub _wcstol_l @ cdecl _wcstombs_l(ptr ptr long ptr) msvcrt._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l -@ cdecl _wcstoui64(wstr ptr long) msvcrt._wcstoui64 -@ cdecl _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l +@ cdecl -ret64 _wcstoui64(wstr ptr long) msvcrt._wcstoui64 +@ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l @ stub _wcstoul_l @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l @@ -1264,7 +1264,7 @@ @ cdecl _wtof(wstr) msvcrt._wtof @ cdecl _wtof_l(wstr ptr) msvcrt._wtof_l @ cdecl _wtoi(wstr) msvcrt._wtoi -@ cdecl _wtoi64(wstr) msvcrt._wtoi64 +@ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 @ stub _wtoi64_l @ stub _wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 965b9c35e1f..e0d00681a09 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -998,11 +998,11 @@ @ cdecl _strtime(ptr) msvcrt._strtime @ cdecl _strtime_s(ptr long) msvcrt._strtime_s @ cdecl _strtod_l(str ptr ptr) msvcrt._strtod_l -@ cdecl _strtoi64(str ptr long) msvcrt._strtoi64 -@ cdecl _strtoi64_l(str ptr long ptr) msvcrt._strtoi64_l +@ cdecl -ret64 _strtoi64(str ptr long) msvcrt._strtoi64 +@ cdecl -ret64 _strtoi64_l(str ptr long ptr) msvcrt._strtoi64_l @ stub _strtol_l -@ cdecl _strtoui64(str ptr long) msvcrt._strtoui64 -@ cdecl _strtoui64_l(str ptr long ptr) msvcrt._strtoui64_l +@ cdecl -ret64 _strtoui64(str ptr long) msvcrt._strtoui64 +@ cdecl -ret64 _strtoui64_l(str ptr long ptr) msvcrt._strtoui64_l @ stub _strtoul_l @ cdecl _strupr(str) msvcrt._strupr @ stub _strupr_l @@ -1147,13 +1147,13 @@ @ cdecl _wcsset(wstr long) msvcrt._wcsset @ stub _wcsset_s @ cdecl _wcstod_l(wstr ptr) msvcrt._wcstod_l -@ cdecl _wcstoi64(wstr ptr long) msvcrt._wcstoi64 -@ cdecl _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l +@ cdecl -ret64 _wcstoi64(wstr ptr long) msvcrt._wcstoi64 +@ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) msvcrt._wcstoi64_l @ stub _wcstol_l @ cdecl _wcstombs_l(ptr ptr long ptr) msvcrt._wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) msvcrt._wcstombs_s_l -@ cdecl _wcstoui64(wstr ptr long) msvcrt._wcstoui64 -@ cdecl _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l +@ cdecl -ret64 _wcstoui64(wstr ptr long) msvcrt._wcstoui64 +@ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) msvcrt._wcstoui64_l @ stub _wcstoul_l @ cdecl _wcsupr(wstr) msvcrt._wcsupr @ stub _wcsupr_l @@ -1248,7 +1248,7 @@ @ cdecl _wtof(wstr) msvcrt._wtof @ cdecl _wtof_l(wstr ptr) msvcrt._wtof_l @ cdecl _wtoi(wstr) msvcrt._wtoi -@ cdecl _wtoi64(wstr) msvcrt._wtoi64 +@ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 @ stub _wtoi64_l @ stub _wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a7371a8ac06..022b0bd7206 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -933,11 +933,11 @@ @ cdecl _strtime(ptr) @ cdecl _strtime_s(ptr long) @ cdecl _strtod_l(str ptr ptr) MSVCRT_strtod_l -@ cdecl _strtoi64(str ptr long) MSVCRT_strtoi64 -@ cdecl _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l +@ cdecl -ret64 _strtoi64(str ptr long) MSVCRT_strtoi64 +@ cdecl -ret64 _strtoi64_l(str ptr long ptr) MSVCRT_strtoi64_l # stub _strtol_l -@ cdecl _strtoui64(str ptr long) MSVCRT_strtoui64 -@ cdecl _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l +@ cdecl -ret64 _strtoui64(str ptr long) MSVCRT_strtoui64 +@ cdecl -ret64 _strtoui64_l(str ptr long ptr) MSVCRT_strtoui64_l # stub _strtoul_l @ cdecl _strupr(str) ntdll._strupr # stub _strupr_l @@ -1075,13 +1075,13 @@ @ cdecl _wcsrev(wstr) @ cdecl _wcsset(wstr long) # stub _wcsset_s -@ cdecl _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 -@ cdecl _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l +@ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 +@ cdecl -ret64 _wcstoi64_l(wstr ptr long ptr) MSVCRT__wcstoi64_l # stub _wcstol_l @ cdecl _wcstombs_l(ptr ptr long ptr) MSVCRT__wcstombs_l @ cdecl _wcstombs_s_l(ptr ptr long wstr long ptr) MSVCRT__wcstombs_s_l -@ cdecl _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 -@ cdecl _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l +@ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 +@ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l # stub _wcstoul_l @ cdecl _wcsupr(wstr) ntdll._wcsupr # stub _wcsupr_l @@ -1179,7 +1179,7 @@ @ cdecl _wtof(wstr) MSVCRT__wtof @ cdecl _wtof_l(wstr ptr) MSVCRT__wtof_l @ cdecl _wtoi(wstr) ntdll._wtoi -@ cdecl _wtoi64(wstr) ntdll._wtoi64 +@ cdecl -ret64 _wtoi64(wstr) ntdll._wtoi64 # stub _wtoi64_l # stub _wtoi_l @ cdecl _wtol(wstr) ntdll._wtol @@ -1222,7 +1222,7 @@ @ cdecl -arch=x86_64 coshf(double) MSVCRT_coshf @ cdecl ctime(ptr) MSVCRT_ctime @ cdecl difftime(long long) MSVCRT_difftime -@ cdecl div(long long) MSVCRT_div +@ cdecl -ret64 div(long long) MSVCRT_div @ cdecl exit(long) MSVCRT_exit @ cdecl exp(double) MSVCRT_exp @ cdecl -arch=x86_64 expf(double) MSVCRT_expf diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 29b029ec48a..3af5e921171 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -622,7 +622,7 @@ @ cdecl _wtempnam(wstr wstr) msvcrt._wtempnam @ cdecl _wtmpnam(ptr) msvcrt._wtmpnam @ cdecl _wtoi(wstr) ntdll._wtoi -@ cdecl _wtoi64(wstr) ntdll._wtoi64 +@ cdecl -ret64 _wtoi64(wstr) ntdll._wtoi64 @ cdecl _wtol(wstr) ntdll._wtol @ cdecl _wunlink(wstr) msvcrt._wunlink @ cdecl _wutime(wstr ptr) msvcrt._wutime diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 574b4c3a710..3f67f8c3e3e 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1291,7 +1291,7 @@ @ cdecl -private _wcsnicmp(wstr wstr long) NTDLL__wcsnicmp @ cdecl -private _wcsupr(wstr) NTDLL__wcsupr @ cdecl -private _wtoi(wstr) -@ cdecl -private _wtoi64(wstr) +@ cdecl -private -ret64 _wtoi64(wstr) @ cdecl -private _wtol(wstr) @ cdecl -private abs(long) NTDLL_abs @ cdecl -private atan(double) NTDLL_atan