Alexandre Julliard : ntdll: Use the exported name directly for a few more functions.
Alexandre Julliard
julliard at winehq.org
Tue Jun 30 14:55:06 CDT 2020
Module: wine
Branch: master
Commit: 3df16c0b70f734f5260bfde0f68239976d6a5842
URL: https://source.winehq.org/git/wine.git/?a=commit;h=3df16c0b70f734f5260bfde0f68239976d6a5842
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Jun 30 12:08:00 2020 +0200
ntdll: Use the exported name directly for a few more functions.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ntdll/misc.c | 50 +++++++++++++++++++++++++-------------------------
dlls/ntdll/ntdll.spec | 42 +++++++++++++++++++++---------------------
2 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
index 0efb8f6afe..6960b52dcb 100644
--- a/dlls/ntdll/misc.c
+++ b/dlls/ntdll/misc.c
@@ -49,7 +49,7 @@ LPCSTR debugstr_us( const UNICODE_STRING *us )
/*********************************************************************
* wine_get_version (NTDLL.@)
*/
-const char * CDECL NTDLL_wine_get_version(void)
+const char * CDECL wine_get_version(void)
{
return unix_funcs->get_version();
}
@@ -57,7 +57,7 @@ const char * CDECL NTDLL_wine_get_version(void)
/*********************************************************************
* wine_get_build_id (NTDLL.@)
*/
-const char * CDECL NTDLL_wine_get_build_id(void)
+const char * CDECL wine_get_build_id(void)
{
return unix_funcs->get_build_id();
}
@@ -65,7 +65,7 @@ const char * CDECL NTDLL_wine_get_build_id(void)
/*********************************************************************
* wine_get_host_version (NTDLL.@)
*/
-void CDECL NTDLL_wine_get_host_version( const char **sysname, const char **release )
+void CDECL wine_get_host_version( const char **sysname, const char **release )
{
return unix_funcs->get_host_version( sysname, release );
}
@@ -73,7 +73,7 @@ void CDECL NTDLL_wine_get_host_version( const char **sysname, const char **relea
/*********************************************************************
* abs (NTDLL.@)
*/
-int CDECL NTDLL_abs( int i )
+int CDECL abs( int i )
{
return i >= 0 ? i : -i;
}
@@ -81,7 +81,7 @@ int CDECL NTDLL_abs( int i )
/*********************************************************************
* atan (NTDLL.@)
*/
-double CDECL NTDLL_atan( double d )
+double CDECL atan( double d )
{
return unix_funcs->atan( d );
}
@@ -89,7 +89,7 @@ double CDECL NTDLL_atan( double d )
/*********************************************************************
* ceil (NTDLL.@)
*/
-double CDECL NTDLL_ceil( double d )
+double CDECL ceil( double d )
{
return unix_funcs->ceil( d );
}
@@ -97,7 +97,7 @@ double CDECL NTDLL_ceil( double d )
/*********************************************************************
* cos (NTDLL.@)
*/
-double CDECL NTDLL_cos( double d )
+double CDECL cos( double d )
{
return unix_funcs->cos( d );
}
@@ -105,7 +105,7 @@ double CDECL NTDLL_cos( double d )
/*********************************************************************
* fabs (NTDLL.@)
*/
-double CDECL NTDLL_fabs( double d )
+double CDECL fabs( double d )
{
return unix_funcs->fabs( d );
}
@@ -113,7 +113,7 @@ double CDECL NTDLL_fabs( double d )
/*********************************************************************
* floor (NTDLL.@)
*/
-double CDECL NTDLL_floor( double d )
+double CDECL floor( double d )
{
return unix_funcs->floor( d );
}
@@ -121,7 +121,7 @@ double CDECL NTDLL_floor( double d )
/*********************************************************************
* log (NTDLL.@)
*/
-double CDECL NTDLL_log( double d )
+double CDECL log( double d )
{
return unix_funcs->log( d );
}
@@ -129,7 +129,7 @@ double CDECL NTDLL_log( double d )
/*********************************************************************
* pow (NTDLL.@)
*/
-double CDECL NTDLL_pow( double x, double y )
+double CDECL pow( double x, double y )
{
return unix_funcs->pow( x, y );
}
@@ -137,7 +137,7 @@ double CDECL NTDLL_pow( double x, double y )
/*********************************************************************
* sin (NTDLL.@)
*/
-double CDECL NTDLL_sin( double d )
+double CDECL sin( double d )
{
return unix_funcs->sin( d );
}
@@ -145,7 +145,7 @@ double CDECL NTDLL_sin( double d )
/*********************************************************************
* sqrt (NTDLL.@)
*/
-double CDECL NTDLL_sqrt( double d )
+double CDECL sqrt( double d )
{
return unix_funcs->sqrt( d );
}
@@ -153,7 +153,7 @@ double CDECL NTDLL_sqrt( double d )
/*********************************************************************
* tan (NTDLL.@)
*/
-double CDECL NTDLL_tan( double d )
+double CDECL tan( double d )
{
return unix_funcs->tan( d );
}
@@ -169,52 +169,52 @@ double CDECL NTDLL_tan( double d )
/*********************************************************************
* _CIcos (NTDLL.@)
*/
-double CDECL NTDLL__CIcos(void)
+double CDECL _CIcos(void)
{
FPU_DOUBLE(x);
- return NTDLL_cos(x);
+ return cos(x);
}
/*********************************************************************
* _CIlog (NTDLL.@)
*/
-double CDECL NTDLL__CIlog(void)
+double CDECL _CIlog(void)
{
FPU_DOUBLE(x);
- return NTDLL_log(x);
+ return log(x);
}
/*********************************************************************
* _CIpow (NTDLL.@)
*/
-double CDECL NTDLL__CIpow(void)
+double CDECL _CIpow(void)
{
FPU_DOUBLES(x,y);
- return NTDLL_pow(x,y);
+ return pow(x,y);
}
/*********************************************************************
* _CIsin (NTDLL.@)
*/
-double CDECL NTDLL__CIsin(void)
+double CDECL _CIsin(void)
{
FPU_DOUBLE(x);
- return NTDLL_sin(x);
+ return sin(x);
}
/*********************************************************************
* _CIsqrt (NTDLL.@)
*/
-double CDECL NTDLL__CIsqrt(void)
+double CDECL _CIsqrt(void)
{
FPU_DOUBLE(x);
- return NTDLL_sqrt(x);
+ return sqrt(x);
}
/*********************************************************************
* _ftol (NTDLL.@)
*/
-LONGLONG CDECL NTDLL__ftol(void)
+LONGLONG CDECL _ftol(void)
{
FPU_DOUBLE(x);
return (LONGLONG)x;
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 9009f02c45..0b1e91ddc9 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -1417,11 +1417,11 @@
@ stub ZwWriteRequestData
@ stdcall -private ZwWriteVirtualMemory(long ptr ptr long ptr) NtWriteVirtualMemory
@ stdcall -private ZwYieldExecution() NtYieldExecution
-@ cdecl -private -arch=i386 _CIcos() NTDLL__CIcos
-@ cdecl -private -arch=i386 _CIlog() NTDLL__CIlog
-@ cdecl -private -arch=i386 _CIpow() NTDLL__CIpow
-@ cdecl -private -arch=i386 _CIsin() NTDLL__CIsin
-@ cdecl -private -arch=i386 _CIsqrt() NTDLL__CIsqrt
+@ cdecl -private -arch=i386 _CIcos()
+@ cdecl -private -arch=i386 _CIlog()
+@ cdecl -private -arch=i386 _CIpow()
+@ cdecl -private -arch=i386 _CIsin()
+@ cdecl -private -arch=i386 _CIsqrt()
@ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr)
@ cdecl -arch=arm,x86_64 -norelay __chkstk()
@ cdecl __isascii(long)
@@ -1442,7 +1442,7 @@
@ stdcall -arch=i386 -ret64 _aullshr(int64 long)
@ cdecl -arch=i386 -norelay _chkstk()
@ stub _fltused
-@ cdecl -arch=i386 -ret64 _ftol() NTDLL__ftol
+@ cdecl -arch=i386 -ret64 _ftol()
@ cdecl _i64toa(int64 ptr long)
@ cdecl _i64tow(int64 ptr long)
@ cdecl _itoa(long ptr long)
@@ -1482,15 +1482,15 @@
@ cdecl _wtoi(wstr)
@ cdecl -ret64 _wtoi64(wstr)
@ cdecl _wtol(wstr)
-@ cdecl abs(long) NTDLL_abs
-@ cdecl atan(double) NTDLL_atan
+@ cdecl abs(long)
+@ cdecl atan(double)
@ cdecl atoi(str)
@ cdecl atol(str)
@ cdecl bsearch(ptr ptr long long ptr)
-@ cdecl ceil(double) NTDLL_ceil
-@ cdecl cos(double) NTDLL_cos
-@ cdecl fabs(double) NTDLL_fabs
-@ cdecl floor(double) NTDLL_floor
+@ cdecl ceil(double)
+@ cdecl cos(double)
+@ cdecl fabs(double)
+@ cdecl floor(double)
@ cdecl isalnum(long)
@ cdecl isalpha(long)
@ cdecl iscntrl(long)
@@ -1508,20 +1508,20 @@
@ cdecl iswspace(long)
@ cdecl iswxdigit(long)
@ cdecl isxdigit(long)
-@ cdecl labs(long) NTDLL_abs
-@ cdecl log(double) NTDLL_log
+@ cdecl labs(long) abs
+@ cdecl log(double)
@ cdecl mbstowcs(ptr str long)
@ cdecl memchr(ptr long long)
@ cdecl memcmp(ptr ptr long)
@ cdecl memcpy(ptr ptr long)
@ cdecl memmove(ptr ptr long)
@ cdecl memset(ptr long long)
-@ cdecl pow(double double) NTDLL_pow
+@ cdecl pow(double double)
@ cdecl qsort(ptr long long ptr)
-@ cdecl sin(double) NTDLL_sin
+@ cdecl sin(double)
@ varargs sprintf(ptr str) NTDLL_sprintf
@ varargs sprintf_s(ptr long str)
-@ cdecl sqrt(double) NTDLL_sqrt
+@ cdecl sqrt(double)
@ varargs sscanf(str str)
@ cdecl strcat(str str)
@ cdecl strchr(str long)
@@ -1541,7 +1541,7 @@
@ cdecl strtoul(str ptr long)
@ varargs swprintf(ptr wstr) NTDLL_swprintf
@ varargs swprintf_s(ptr long wstr)
-@ cdecl tan(double) NTDLL_tan
+@ cdecl tan(double)
@ cdecl tolower(long)
@ cdecl toupper(long)
@ cdecl towlower(long)
@@ -1595,9 +1595,9 @@
@ cdecl __wine_locked_recvmsg(long ptr long)
# Version
-@ cdecl wine_get_version() NTDLL_wine_get_version
-@ cdecl wine_get_build_id() NTDLL_wine_get_build_id
-@ cdecl wine_get_host_version(ptr ptr) NTDLL_wine_get_host_version
+@ cdecl wine_get_version()
+@ cdecl wine_get_build_id()
+@ cdecl wine_get_host_version(ptr ptr)
# Codepages
@ cdecl __wine_get_unix_codepage()
More information about the wine-cvs
mailing list