Commit 6671442a7c

@@ -137,8 +137,11 @@ ADD_UNDERSCORE(spawnve)
 ADD_UNDERSCORE(spawnvp)
 ADD_UNDERSCORE(spawnvpe)
 #endif
-#ifndef CRTDLL
-; stat is provided by mingw to workaround trailing slash issue in _stat
+#ifdef UCRTBASE
+F32(stat == _stat32)
+F64(stat == _stat64i32)
+#else
+; stat for non-UCRT is provided by mingw to workaround trailing slash issue in _stat
 #endif
 #ifdef NO_STRCMPI_ALIAS
 ; Symbol _strcmpi is natively present and defined in the library def file
@@ -208,7 +211,11 @@ ADD_UNDERSCORE(write)
 ; This is list of symbol aliases added in the Visual C++ 2.0 oldnames.lib library
 ; All these symbols with leading underscore are present also in pre-2.0 CRT versions: crtdll.dll and msvcrt10.dll
 ; ADD_UNDERSCORE(control87)
+#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
+ADD_UNDERSCORE(fpreset)
+#else
 ; ADD_UNDERSCORE(fpreset) ; Alias fpreset is set in CRT_fp10.c and CRT_fp8.c
+#endif
 ADD_UNDERSCORE(wcsdup)
 ADD_UNDERSCORE(wcsicmp)
 ADD_UNDERSCORE(wcsicoll)
@@ -222,7 +229,11 @@ ADD_UNDERSCORE(wcsupr)
 ; This is list of symbol aliases added in the Visual C++ 4.0 oldnames.lib library
 ; All these symbols with leading underscore are present also in pre-4.0 CRT versions: crtdll.dll, msvcrt10.dll and msvcrt20.dll
 ; ADD_UNDERSCORE(cabs)
+#ifdef UCRTBASE
+; hypot is natively exported from UCRT
+#else
 ADD_UNDERSCORE(hypot)
+#endif
 ADD_UNDERSCORE(j0)
 ADD_UNDERSCORE(j1)
 ADD_UNDERSCORE(jn)
@@ -247,27 +258,26 @@ wcstok == wcstok_s
 ADD_UNDERSCORE(nextafter)
 #endif
 
-#if defined(DEF_ARM32) || defined(DEF_ARM64)
 ; This is list of symbol aliases for C99 ARM long double functions
 ; They are defined as aliases to regular double symbols as on ARM, long double is equal to regular double
-acosl == acos
-asinl == asin
-atan2l == atan2
-atanl == atan
-ceill == ceil
-cosl == cos
-expl == exp
-floorl == floor
-fmodl == fmod
-log10l == log10
-logl == log
+F_LD64(acosl == acos)
+F_LD64(asinl == asin)
+F_LD64(atan2l == atan2)
+F_LD64(atanl == atan)
+F_LD64(ceill == ceil)
+F_LD64(cosl == cos)
+F_LD64(expl == exp)
+F_LD64(floorl == floor)
+F_LD64(fmodl == fmod)
+F_LD64(log10l == log10)
+F_LD64(logl == log)
 ; FIXME: Why is powl alias defined only for UCRT?
 #ifdef UCRTBASE
-powl == pow
-#endif
-sinl == sin
-tanl == tan
+F_LD64(powl == pow)
 #endif
+F_LD64(sinl == sin)
+F_LD64(tanl == tan)
+F_LD64(_chgsignl == _chgsign)
 
 ; This is list of symbol aliases for C11 functions
 #ifdef UCRTBASE
@@ -290,6 +300,22 @@ ADD_UNDERSCORE(popen)
 fgetpos64 == fgetpos
 fsetpos64 == fsetpos
 #endif
+#ifdef UCRTBASE
+stat32 == _stat32
+stat32i64 == _stat32i64
+stat64 == _stat64
+stat64i32 == _stat64i32
+#else
+; stat for non-UCRT is provided by mingw to workaround trailing slash issue in _stat
+#endif
+#ifdef FIXED_SIZE_SYMBOLS
+// NO_FIXED_SIZE_64_ALIAS means that DLL provides the native _fstat64 symbol
+#if defined(NO_FIXED_SIZE_64_ALIAS) && !defined(NO_FSTAT64_ALIAS)
+fstat64 == _fstat64
+#endif
+#else
+fstat64 == _fstat64
+#endif
 
 ; This is list of symbol aliases for GNU functions which are not part of POSIX or ISO C
 strcasecmp == _stricmp
@@ -545,19 +571,23 @@ __ms_vsprintf == vsprintf
 __ms_vwprintf == vwprintf
 __ms_wprintf == wprintf
 __ms_wscanf == wscanf
-#ifdef WITH_MS_VSCANF_ALIASES
-__ms_vfscanf == vfscanf
-__ms_vfwscanf == vfwscanf
-__ms_vscanf == vscanf
-__ms_vsscanf == vsscanf
-__ms_vswscanf == vswscanf
-__ms_vwscanf == vwscanf
-#endif
 #endif
 
 ; This is list of additional symbol aliases not available in any library as neither native symbols nor aliases
 ; FIXME: check if these really are needed
 
+; This is wstat and wstat64 symbol available only in mingw but for a long time
+#ifdef UCRTBASE
+F32(wstat == _wstat32)
+F64(wstat == _wstat64i32)
+wstat32 == _wstat32
+wstat32i64 == _wstat32i64
+wstat64 == _wstat64
+wstat64i32 == _wstat64i32
+#else
+; wstat for non-UCRT is provided by mingw to workaround trailing slash issue in _wstat
+#endif
+
 ; Origin of the symbol wcscmpi is unknown. This symbol is not present in
 ; crtdll.dll and neither in any msvcr* version. The only source of wcscmpi is
 ; wcstr.h header file from the Microsoft Visual C++ 1.0 (32-bit for NT) and

@@ -12,26 +12,26 @@
 // F_NON_I386  - function available on everything but i386
 // F_NON_X64   - function available on everything but x86_64
 // F_NON_ARM64 - function available on everything but arm64
-#if defined(DEF_X64)
+#if defined(__x86_64__)
 #define F64(x) x
 #define F_X64(x) x
 #define F_X86_ANY(x) x
 #define F_NON_I386(x) x
 #define F_NON_ARM64(x) x
-#elif defined(DEF_I386)
+#elif defined(__i386__)
 #define F32(x) x
 #define F_I386(x) x
 #define F_X86_ANY(x) x
 #define F_NON_X64(x) x
 #define F_NON_ARM64(x) x
-#elif defined(DEF_ARM32)
+#elif defined(__arm__)
 #define F32(x) x
 #define F_ARM32(x) x
 #define F_ARM_ANY(x) x
 #define F_NON_I386(x) x
 #define F_NON_X64(x) x
 #define F_NON_ARM64(x) x
-#elif defined(DEF_ARM64)
+#elif defined(__aarch64__)
 #define F64(x) x
 #define F_ARM64(x) x
 #define F_ARM_ANY(x) x
@@ -75,9 +75,17 @@
 #define F_NON_ARM64(x)
 #endif
 
-#if defined(DEF_I386)
+#if defined(__i386__)
 #define STDCALL_DECORATED_EXPORT(symbol) symbol == _ ## symbol
 #define FASTCALL_DECORATED_EXPORT(symbol) symbol == symbol
 #endif
 
+#if __SIZEOF_LONG_DOUBLE__ == __SIZEOF_DOUBLE__
+#define F_LD64(x) x
+#define F_LD80(x)
+#else
+#define F_LD64(x)
+#define F_LD80(x) x
+#endif
+
 #endif // FUNC_DEF_IN

@@ -47,7 +47,7 @@ _strtoi64
 _strtoi64_l
 _strtoimax_l
 _strtol_l
-F_ARM_ANY(_strtold_l) ; Can't use long double functions from the CRT on x86
+F_LD64(_strtold_l) ; Can't use long double functions from the CRT on x86
 _strtoll_l
 _strtoui64
 _strtoui64_l
@@ -68,7 +68,7 @@ _wcstoi64
 _wcstoi64_l
 _wcstoimax_l
 _wcstol_l
-F_ARM_ANY(_wcstold_l) ; Can't use long double functions from the CRT on x86
+F_LD64(_wcstold_l) ; Can't use long double functions from the CRT on x86
 _wcstoll_l
 _wcstombs_l
 _wcstombs_s_l
@@ -108,7 +108,7 @@ strtod
 strtof
 strtoimax
 strtol
-F_ARM_ANY(strtold) ; Can't use long double functions from the CRT on x86
+F_LD64(strtold) ; Can't use long double functions from the CRT on x86
 strtoll
 strtoul
 strtoull
@@ -121,7 +121,7 @@ wcstod
 wcstof
 wcstoimax
 wcstol
-F_ARM_ANY(wcstold) ; Can't use long double functions from the CRT on x86
+F_LD64(wcstold) ; Can't use long double functions from the CRT on x86
 wcstoll
 wcstombs
 wcstombs_s

@@ -39,6 +39,7 @@ F64(_fstati64 == _fstat64)
 _fstat32
 _fstat32i64
 _fstat64
+fstat64 == _fstat64
 _fstat64i32
 _fullpath
 _getdiskfree
@@ -53,14 +54,20 @@ _rmdir
 rmdir == _rmdir
 _splitpath
 _splitpath_s
+F32(stat == _stat32)
+F64(stat == _stat64i32)
 F32(_stat == _stat32)
 F64(_stat == _stat64i32)
 F32(_stati64 == _stat32i64)
 F64(_stati64 == _stat64)
 _stat32
+stat32 == _stat32
 _stat32i64
+stat32i64 == _stat32i64
 _stat64
+stat64 == _stat64
 _stat64i32
+stat64i32 == _stat64i32
 _umask
 umask == _umask
 _umask_s
@@ -96,14 +103,20 @@ _wrename
 _wrmdir
 _wsplitpath
 _wsplitpath_s
+F32(wstat == _wstat32)
+F64(wstat == _wstat64i32)
 F32(_wstat == _wstat32)
 F64(_wstat == _wstat64i32)
 F32(_wstati64 == _wstat32i64)
 F64(_wstati64 == _wstat64)
 _wstat32
+wstat32 == _wstat32
 _wstat32i64
+wstat32i64 == _wstat32i64
 _wstat64
+wstat64 == _wstat64
 _wstat64i32
+wstat64i32 == _wstat64i32
 _wunlink
 remove
 rename

@@ -4,7 +4,7 @@ EXPORTS
 
 #include "func.def.in"
 
-#ifdef DEF_I386
+#ifdef __i386__
 _CIacos
 _CIasin
 _CIatan
@@ -31,7 +31,7 @@ _FCmulcr
 _LCbuild
 _LCmulcc
 _LCmulcr
-#ifdef DEF_I386
+#ifdef __i386__
 __libm_sse2_acos
 __libm_sse2_acosf
 __libm_sse2_asin
@@ -59,6 +59,7 @@ __setusermatherr
 _cabs DATA
 _chgsign
 chgsign == _chgsign
+F_LD64(_chgsignl == _chgsign)
 _chgsignf
 _copysign
 _copysignf
@@ -94,9 +95,9 @@ finite == _finite
 F_NON_I386(_finitef)
 _fpclass
 fpclass == _fpclass
-_fpclassf
+F_X64(_fpclassf)
 F_I386(_ftol)
-_get_FMA3_enable
+F_X64(_get_FMA3_enable)
 _hypot
 _hypotf
 _isnan
@@ -118,7 +119,7 @@ _ldsign
 _ldsin
 _ldtest
 _ldunscale
-#ifdef DEF_I386
+#ifdef __i386__
 _libm_sse2_acos_precise
 _libm_sse2_asin_precise
 _libm_sse2_atan_precise
@@ -137,7 +138,7 @@ _nextafter
 F_X64(_nextafterf)
 _scalb
 F_X64(_scalbf)
-F64(_set_FMA3_enable)
+F_X64(_set_FMA3_enable)
 F_I386(_set_SSE2_enable)
 _y0
 y0 == _y0
@@ -147,224 +148,224 @@ _yn
 yn == _yn
 acos
 F_NON_I386(acosf)
-F_ARM_ANY(acosl == acos)
+F_LD64(acosl == acos)
 acosh
 acoshf
-F_ARM_ANY(acoshl) ; Can't use long double functions from the CRT on x86
+F_LD64(acoshl) ; Can't use long double functions from the CRT on x86
 asin
 F_NON_I386(asinf)
-F_ARM_ANY(asinl == asin)
+F_LD64(asinl == asin)
 asinh
 asinhf
-F_ARM_ANY(asinhl) ; Can't use long double functions from the CRT on x86
+F_LD64(asinhl) ; Can't use long double functions from the CRT on x86
 atan
 atan2
 F_NON_I386(atan2f)
-F_ARM_ANY(atan2l == atan2)
+F_LD64(atan2l == atan2)
 F_NON_I386(atanf)
-F_ARM_ANY(atanl == atan)
+F_LD64(atanl == atan)
 atanh
 atanhf
-F_ARM_ANY(atanhl) ; Can't use long double functions from the CRT on x86
+F_LD64(atanhl) ; Can't use long double functions from the CRT on x86
 cabs
 cabsf
-F_ARM_ANY(cabsl) ; Can't use long double functions from the CRT on x86
+F_LD64(cabsl) ; Can't use long double functions from the CRT on x86
 cacos
 cacosf
 cacosh
 cacoshf
-F_ARM_ANY(cacoshl) ; Can't use long double functions from the CRT on x86
-F_ARM_ANY(cacosl) ; Can't use long double functions from the CRT on x86
+F_LD64(cacoshl) ; Can't use long double functions from the CRT on x86
+F_LD64(cacosl) ; Can't use long double functions from the CRT on x86
 carg
 cargf
-F_ARM_ANY(cargl) ; Can't use long double functions from the CRT on x86
+F_LD64(cargl) ; Can't use long double functions from the CRT on x86
 casin
 casinf
 casinh
 casinhf
-F_ARM_ANY(casinhl) ; Can't use long double functions from the CRT on x86
-F_ARM_ANY(casinl) ; Can't use long double functions from the CRT on x86
+F_LD64(casinhl) ; Can't use long double functions from the CRT on x86
+F_LD64(casinl) ; Can't use long double functions from the CRT on x86
 catan
 catanf
 catanh
 catanhf
-F_ARM_ANY(catanhl) ; Can't use long double functions from the CRT on x86
-F_ARM_ANY(catanl) ; Can't use long double functions from the CRT on x86
+F_LD64(catanhl) ; Can't use long double functions from the CRT on x86
+F_LD64(catanl) ; Can't use long double functions from the CRT on x86
 cbrt
 cbrtf
-F_ARM_ANY(cbrtl) ; Can't use long double functions from the CRT on x86
+F_LD64(cbrtl) ; Can't use long double functions from the CRT on x86
 ccos
 ccosf
 ccosh
 ccoshf
-F_ARM_ANY(ccoshl) ; Can't use long double functions from the CRT on x86
-F_ARM_ANY(ccosl) ; Can't use long double functions from the CRT on x86
+F_LD64(ccoshl) ; Can't use long double functions from the CRT on x86
+F_LD64(ccosl) ; Can't use long double functions from the CRT on x86
 ceil
 F_NON_I386(ceilf)
-F_ARM_ANY(ceill == ceil)
+F_LD64(ceill == ceil)
 cexp
 cexpf
-F_ARM_ANY(cexpl) ; Can't use long double functions from the CRT on x86
+F_LD64(cexpl) ; Can't use long double functions from the CRT on x86
 cimag
 cimagf
-F_ARM_ANY(cimagl) ; Can't use long double functions from the CRT on x86
+F_LD64(cimagl) ; Can't use long double functions from the CRT on x86
 clog
 clog10
 clog10f
-F_ARM_ANY(clog10l) ; Can't use long double functions from the CRT on x86
+F_LD64(clog10l) ; Can't use long double functions from the CRT on x86
 clogf
-F_ARM_ANY(clogl) ; Can't use long double functions from the CRT on x86
+F_LD64(clogl) ; Can't use long double functions from the CRT on x86
 conj
 conjf
-F_ARM_ANY(conjl) ; Can't use long double functions from the CRT on x86
+F_LD64(conjl) ; Can't use long double functions from the CRT on x86
 copysign
 copysignf
-F_ARM_ANY(copysignl) ; Can't use long double functions from the CRT on x86
+F_LD64(copysignl) ; Can't use long double functions from the CRT on x86
 cos
 F_NON_I386(cosf)
-F_ARM_ANY(cosl == cos)
+F_LD64(cosl == cos)
 cosh
 F_NON_I386(coshf)
 cpow
 cpowf
-F_ARM_ANY(cpowl) ; Can't use long double functions from the CRT on x86
+F_LD64(cpowl) ; Can't use long double functions from the CRT on x86
 cproj
 cprojf
-F_ARM_ANY(cprojl) ; Can't use long double functions from the CRT on x86
+F_LD64(cprojl) ; Can't use long double functions from the CRT on x86
 creal
 crealf
-F_ARM_ANY(creall) ; Can't use long double functions from the CRT on x86
+F_LD64(creall) ; Can't use long double functions from the CRT on x86
 csin
 csinf
 csinh
 csinhf
-F_ARM_ANY(csinhl) ; Can't use long double functions from the CRT on x86
-F_ARM_ANY(csinl) ; Can't use long double functions from the CRT on x86
+F_LD64(csinhl) ; Can't use long double functions from the CRT on x86
+F_LD64(csinl) ; Can't use long double functions from the CRT on x86
 csqrt
 csqrtf
-F_ARM_ANY(csqrtl) ; Can't use long double functions from the CRT on x86
+F_LD64(csqrtl) ; Can't use long double functions from the CRT on x86
 ctan
 ctanf
 ctanh
 ctanhf
-F_ARM_ANY(ctanhl) ; Can't use long double functions from the CRT on x86
-F_ARM_ANY(ctanl) ; Can't use long double functions from the CRT on x86
+F_LD64(ctanhl) ; Can't use long double functions from the CRT on x86
+F_LD64(ctanl) ; Can't use long double functions from the CRT on x86
 erf
 erfc
 erfcf
-F_ARM_ANY(erfcl) ; Can't use long double functions from the CRT on x86
+F_LD64(erfcl) ; Can't use long double functions from the CRT on x86
 erff
-F_ARM_ANY(erfl) ; Can't use long double functions from the CRT on x86
+F_LD64(erfl) ; Can't use long double functions from the CRT on x86
 exp
 exp2
 exp2f
-F_ARM_ANY(exp2l) ; Can't use long double functions from the CRT on x86
+F_LD64(exp2l) ; Can't use long double functions from the CRT on x86
 F_NON_I386(expf)
-F_ARM_ANY(expl == exp)
+F_LD64(expl == exp)
 expm1
 expm1f
-F_ARM_ANY(expm1l) ; Can't use long double functions from the CRT on x86
+F_LD64(expm1l) ; Can't use long double functions from the CRT on x86
 fabs
 F_ARM_ANY(fabsf)
 fdim
 fdimf
-F_ARM_ANY(fdiml) ; Can't use long double functions from the CRT on x86
+F_LD64(fdiml) ; Can't use long double functions from the CRT on x86
 floor
 F_NON_I386(floorf)
-F_ARM_ANY(floorl == floor)
+F_LD64(floorl == floor)
 fma
 fmaf
-F_ARM_ANY(fmal) ; Can't use long double functions from the CRT on x86
+F_LD64(fmal) ; Can't use long double functions from the CRT on x86
 fmax
 fmaxf
-F_ARM_ANY(fmaxl) ; Can't use long double functions from the CRT on x86
+F_LD64(fmaxl) ; Can't use long double functions from the CRT on x86
 fmin
 fminf
-F_ARM_ANY(fminl) ; Can't use long double functions from the CRT on x86
+F_LD64(fminl) ; Can't use long double functions from the CRT on x86
 fmod
 F_NON_I386(fmodf)
-F_ARM_ANY(fmodl == fmod)
+F_LD64(fmodl == fmod)
 frexp
 hypot
 ilogb
 ilogbf
-F_ARM_ANY(ilogbl) ; Can't use long double functions from the CRT on x86
+F_LD64(ilogbl) ; Can't use long double functions from the CRT on x86
 ldexp
 ; The UCRT lgamma functions don't set/provide the signgam variable like
 ; the mingw ones do. Therefore prefer the libmingwex version instead.
 lgamma DATA
 lgammaf DATA
-F_ARM_ANY(lgammal DATA) ; Can't use long double functions from the CRT on x86
+F_LD64(lgammal DATA) ; Can't use long double functions from the CRT on x86
 llrint
 llrintf
-F_ARM_ANY(llrintl) ; Can't use long double functions from the CRT on x86
+F_LD64(llrintl) ; Can't use long double functions from the CRT on x86
 llround
 llroundf
-F_ARM_ANY(llroundl) ; Can't use long double functions from the CRT on x86
+F_LD64(llroundl) ; Can't use long double functions from the CRT on x86
 log
 log10
 F_NON_I386(log10f)
-F_ARM_ANY(log10l == log10)
+F_LD64(log10l == log10)
 log1p
 log1pf
-F_ARM_ANY(log1pl) ; Can't use long double functions from the CRT on x86
+F_LD64(log1pl) ; Can't use long double functions from the CRT on x86
 log2
 log2f
-F_ARM_ANY(log2l) ; Can't use long double functions from the CRT on x86
+F_LD64(log2l) ; Can't use long double functions from the CRT on x86
 logb
 logbf
-F_ARM_ANY(logbl) ; Can't use long double functions from the CRT on x86
+F_LD64(logbl) ; Can't use long double functions from the CRT on x86
 F_NON_I386(logf)
-F_ARM_ANY(logl == log)
+F_LD64(logl == log)
 lrint
 lrintf
-F_ARM_ANY(lrintl) ; Can't use long double functions from the CRT on x86
+F_LD64(lrintl) ; Can't use long double functions from the CRT on x86
 lround
 lroundf
-F_ARM_ANY(lroundl) ; Can't use long double functions from the CRT on x86
+F_LD64(lroundl) ; Can't use long double functions from the CRT on x86
 modf
 F_NON_I386(modff)
 nan
 nanf
-F_ARM_ANY(nanl) ; Can't use long double functions from the CRT on x86
+F_LD64(nanl) ; Can't use long double functions from the CRT on x86
 nearbyint
 nearbyintf
-F_ARM_ANY(nearbyintl) ; Can't use long double functions from the CRT on x86
+F_LD64(nearbyintl) ; Can't use long double functions from the CRT on x86
 nextafter
 nextafterf
-F_ARM_ANY(nextafterl) ; Can't use long double functions from the CRT on x86
+F_LD64(nextafterl) ; Can't use long double functions from the CRT on x86
 ; All of the nexttoward functions take the second parameter as long double,
 ; making them unusable for x86.
-F_ARM_ANY(nexttoward) ; Can't use long double functions from the CRT on x86
-F_ARM_ANY(nexttowardf) ; Can't use long double functions from the CRT on x86
-F_ARM_ANY(nexttowardl) ; Can't use long double functions from the CRT on x86
+F_LD64(nexttoward) ; Can't use long double functions from the CRT on x86
+F_LD64(nexttowardf) ; Can't use long double functions from the CRT on x86
+F_LD64(nexttowardl) ; Can't use long double functions from the CRT on x86
 norm
 normf
 norml
 pow
 F_NON_I386(powf) ; Missing in Wine's ucrtbase.dll for i386 in Wine 9.15 and older
-F_ARM_ANY(powl == pow)
+F_LD64(powl == pow)
 remainder
 remainderf
-F_ARM_ANY(remainderl) ; Can't use long double functions from the CRT on x86
+F_LD64(remainderl) ; Can't use long double functions from the CRT on x86
 remquo
 remquof
-F_ARM_ANY(remquol) ; Can't use long double functions from the CRT on x86
+F_LD64(remquol) ; Can't use long double functions from the CRT on x86
 rint
 rintf
-F_ARM_ANY(rintl) ; Can't use long double functions from the CRT on x86
+F_LD64(rintl) ; Can't use long double functions from the CRT on x86
 round
 roundf
-F_ARM_ANY(roundl) ; Can't use long double functions from the CRT on x86
+F_LD64(roundl) ; Can't use long double functions from the CRT on x86
 scalbln
 scalblnf
-F_ARM_ANY(scalblnl) ; Can't use long double functions from the CRT on x86
+F_LD64(scalblnl) ; Can't use long double functions from the CRT on x86
 scalbn
 scalbnf
-F_ARM_ANY(scalbnl) ; Can't use long double functions from the CRT on x86
+F_LD64(scalbnl) ; Can't use long double functions from the CRT on x86
 sin
 F_NON_I386(sinf)
-F_ARM_ANY(sinl == sin)
+F_LD64(sinl == sin)
 ; if we implement sinh, we can set it DATA only.
 sinh
 F_NON_I386(sinhf)
@@ -372,13 +373,13 @@ sqrt
 F_NON_I386(sqrtf)
 tan
 F_NON_I386(tanf)
-F_ARM_ANY(tanl == tan)
+F_LD64(tanl == tan)
 ; if we implement tanh, we can set it to DATA only.
 tanh
 F_NON_I386(tanhf)
 tgamma
 tgammaf
-F_ARM_ANY(tgammal) ; Can't use long double functions from the CRT on x86
+F_LD64(tgammal) ; Can't use long double functions from the CRT on x86
 trunc
 truncf
-F_ARM_ANY(truncl) ; Can't use long double functions from the CRT on x86
+F_LD64(truncl) ; Can't use long double functions from the CRT on x86

@@ -9,14 +9,14 @@ F_I386(_CxxThrowException@8)
 F_NON_I386(_CxxThrowException)
 F_I386(_EH_prolog)
 _FindAndUnlinkFrame
-_GetImageBase
-_GetThrowImageBase
+F_X64(_GetImageBase)
+F_X64(_GetThrowImageBase)
 _IsExceptionObjectToBeDestroyed
-_NLG_Dispatch2
-_NLG_Return
-_NLG_Return2
-_SetImageBase
-_SetThrowImageBase
+F_I386(_NLG_Dispatch2@4)
+F_I386(_NLG_Return@12)
+F_I386(_NLG_Return2)
+F_X64(_SetImageBase)
+F_X64(_SetThrowImageBase)
 _SetWinRTOutOfMemoryExceptionCallback
 __AdjustPointer
 __BuildCatchObject
@@ -34,8 +34,8 @@ __CxxUnregisterExceptionObject
 __DestructExceptionObject
 __FrameUnwindFilter
 __GetPlatformExceptionInfo
-__NLG_Dispatch2
-__NLG_Return2
+F_NON_I386(__NLG_Dispatch2)
+F_NON_I386(__NLG_Return2)
 __RTCastToVoid
 __RTDynamicCast
 __RTtypeid
@@ -44,8 +44,8 @@ __current_exception
 __current_exception_context
 __dcrt_get_wide_environment_from_os
 __dcrt_initial_narrow_environment DATA
-__intrinsic_abnormal_termination
-__intrinsic_setjmp
+F_I386(__intrinsic_abnormal_termination)
+F_NON_ARM64(__intrinsic_setjmp)
 F64(__intrinsic_setjmpex)
 __processing_throw
 __report_gsfailure
@@ -66,26 +66,26 @@ _get_purecall_handler
 _get_unexpected
 F_I386(_global_unwind2)
 _is_exception_typeof
-F_X64(_local_unwind)
+F64(_local_unwind)
 F_I386(_local_unwind2)
 F_I386(_local_unwind4)
 F_I386(_longjmpex)
-_o__CIacos
-_o__CIasin
-_o__CIatan
-_o__CIatan2
-_o__CIcos
-_o__CIcosh
-_o__CIexp
-_o__CIfmod
-_o__CIlog
-_o__CIlog10
-_o__CIpow
-_o__CIsin
-_o__CIsinh
-_o__CIsqrt
-_o__CItan
-_o__CItanh
+F_I386(_o__CIacos)
+F_I386(_o__CIasin)
+F_I386(_o__CIatan)
+F_I386(_o__CIatan2)
+F_I386(_o__CIcos)
+F_I386(_o__CIcosh)
+F_I386(_o__CIexp)
+F_I386(_o__CIfmod)
+F_I386(_o__CIlog)
+F_I386(_o__CIlog10)
+F_I386(_o__CIpow)
+F_I386(_o__CIsin)
+F_I386(_o__CIsinh)
+F_I386(_o__CIsqrt)
+F_I386(_o__CItan)
+F_I386(_o__CItanh)
 _o__Getdays
 _o__Getmonths
 _o__Gettnames
@@ -106,27 +106,27 @@ _o___conio_common_vcwscanf
 _o___daylight
 _o___dstbias
 _o___fpe_flt_rounds
-_o___libm_sse2_acos
-_o___libm_sse2_acosf
-_o___libm_sse2_asin
-_o___libm_sse2_asinf
-_o___libm_sse2_atan
-_o___libm_sse2_atan2
-_o___libm_sse2_atanf
-_o___libm_sse2_cos
-_o___libm_sse2_cosf
-_o___libm_sse2_exp
-_o___libm_sse2_expf
-_o___libm_sse2_log
-_o___libm_sse2_log10
-_o___libm_sse2_log10f
-_o___libm_sse2_logf
-_o___libm_sse2_pow
-_o___libm_sse2_powf
-_o___libm_sse2_sin
-_o___libm_sse2_sinf
-_o___libm_sse2_tan
-_o___libm_sse2_tanf
+F_I386(_o___libm_sse2_acos)
+F_I386(_o___libm_sse2_acosf)
+F_I386(_o___libm_sse2_asin)
+F_I386(_o___libm_sse2_asinf)
+F_I386(_o___libm_sse2_atan)
+F_I386(_o___libm_sse2_atan2)
+F_I386(_o___libm_sse2_atanf)
+F_I386(_o___libm_sse2_cos)
+F_I386(_o___libm_sse2_cosf)
+F_I386(_o___libm_sse2_exp)
+F_I386(_o___libm_sse2_expf)
+F_I386(_o___libm_sse2_log)
+F_I386(_o___libm_sse2_log10)
+F_I386(_o___libm_sse2_log10f)
+F_I386(_o___libm_sse2_logf)
+F_I386(_o___libm_sse2_pow)
+F_I386(_o___libm_sse2_powf)
+F_I386(_o___libm_sse2_sin)
+F_I386(_o___libm_sse2_sinf)
+F_I386(_o___libm_sse2_tan)
+F_I386(_o___libm_sse2_tanf)
 _o___p___argc
 _o___p___argv
 _o___p___wargv
@@ -272,7 +272,7 @@ _o__findnext64
 _o__findnext64i32
 _o__flushall
 _o__fpclass
-_o__fpclassf
+F_X64(_o__fpclassf)
 _o__fputc_nolock
 _o__fputchar
 _o__fputwc_nolock
@@ -443,17 +443,17 @@ _o__ldtest
 _o__ldunscale
 _o__lfind
 _o__lfind_s
-_o__libm_sse2_acos_precise
-_o__libm_sse2_asin_precise
-_o__libm_sse2_atan_precise
-_o__libm_sse2_cos_precise
-_o__libm_sse2_exp_precise
-_o__libm_sse2_log10_precise
-_o__libm_sse2_log_precise
-_o__libm_sse2_pow_precise
-_o__libm_sse2_sin_precise
-_o__libm_sse2_sqrt_precise
-_o__libm_sse2_tan_precise
+F_I386(_o__libm_sse2_acos_precise)
+F_I386(_o__libm_sse2_asin_precise)
+F_I386(_o__libm_sse2_atan_precise)
+F_I386(_o__libm_sse2_cos_precise)
+F_I386(_o__libm_sse2_exp_precise)
+F_I386(_o__libm_sse2_log10_precise)
+F_I386(_o__libm_sse2_log_precise)
+F_I386(_o__libm_sse2_pow_precise)
+F_I386(_o__libm_sse2_sin_precise)
+F_I386(_o__libm_sse2_sqrt_precise)
+F_I386(_o__libm_sse2_tan_precise)
 _o__loaddll
 _o__localtime32
 _o__localtime32_s
@@ -462,7 +462,7 @@ _o__localtime64_s
 _o__lock_file
 _o__locking
 _o__logb
-_o__logbf
+F_NON_I386(_o__logbf)
 _o__lsearch
 _o__lsearch_s
 _o__lseek
@@ -619,7 +619,7 @@ _o__mktime32
 _o__mktime64
 _o__msize
 _o__nextafter
-_o__nextafterf
+F_X64(_o__nextafterf)
 _o__open_osfhandle
 _o__pclose
 _o__pipe
@@ -642,7 +642,7 @@ _o__resetstkoflw
 _o__rmdir
 _o__rmtmp
 _o__scalb
-_o__scalbf
+F_X64(_o__scalbf)
 _o__searchenv
 _o__searchenv_s
 _o__set_abort_behavior
@@ -700,7 +700,7 @@ _o__strtof_l
 _o__strtoi64
 _o__strtoi64_l
 _o__strtol_l
-_o__strtold_l
+F_LD64(_o__strtold_l) ; Can't use long double functions from the CRT on x86
 _o__strtoll_l
 _o__strtoui64
 _o__strtoui64_l
@@ -780,7 +780,7 @@ _o__wcstof_l
 _o__wcstoi64
 _o__wcstoi64_l
 _o__wcstol_l
-_o__wcstold_l
+F_LD64(_o__wcstold_l) ; Can't use long double functions from the CRT on x86
 _o__wcstoll_l
 _o__wcstombs_l
 _o__wcstombs_s_l
@@ -875,24 +875,24 @@ _o__y1
 _o__yn
 _o_abort
 _o_acos
-_o_acosf
+F_NON_I386(_o_acosf)
 _o_acosh
 _o_acoshf
-_o_acoshl
+F_LD64(_o_acoshl) ; Can't use long double functions from the CRT on x86
 _o_asctime
 _o_asctime_s
 _o_asin
-_o_asinf
+F_NON_I386(_o_asinf)
 _o_asinh
 _o_asinhf
-_o_asinhl
+F_LD64(_o_asinhl) ; Can't use long double functions from the CRT on x86
 _o_atan
 _o_atan2
-_o_atan2f
-_o_atanf
+F_NON_I386(_o_atan2f)
+F_NON_I386(_o_atanf)
 _o_atanh
 _o_atanhf
-_o_atanhl
+F_LD64(_o_atanhl) ; Can't use long double functions from the CRT on x86
 _o_atof
 _o_atoi
 _o_atol
@@ -904,24 +904,24 @@ _o_calloc
 _o_cbrt
 _o_cbrtf
 _o_ceil
-_o_ceilf
+F_NON_I386(_o_ceilf)
 _o_clearerr
 _o_clearerr_s
 _o_cos
-_o_cosf
+F_NON_I386(_o_cosf)
 _o_cosh
-_o_coshf
+F_NON_I386(_o_coshf)
 _o_erf
 _o_erfc
 _o_erfcf
-_o_erfcl
+F_LD64(_o_erfcl) ; Can't use long double functions from the CRT on x86
 _o_erff
-_o_erfl
+F_LD64(_o_erfl) ; Can't use long double functions from the CRT on x86
 _o_exp
 _o_exp2
 _o_exp2f
-_o_exp2l
-_o_expf
+F_LD64(_o_exp2l) ; Can't use long double functions from the CRT on x86
+F_NON_I386(_o_expf)
 _o_fabs
 _o_fclose
 _o_feof
@@ -933,12 +933,12 @@ _o_fgets
 _o_fgetwc
 _o_fgetws
 _o_floor
-_o_floorf
+F_NON_I386(_o_floorf)
 _o_fma
 _o_fmaf
-_o_fmal
+F_LD64(_o_fmal) ; Can't use long double functions from the CRT on x86
 _o_fmod
-_o_fmodf
+F_NON_I386(_o_fmodf)
 _o_fopen
 _o_fopen_s
 _o_fputc
@@ -995,33 +995,33 @@ _o_isxdigit
 _o_ldexp
 _o_lgamma
 _o_lgammaf
-_o_lgammal
+F_LD64(_o_lgammal) ; Can't use long double functions from the CRT on x86
 _o_llrint
 _o_llrintf
-_o_llrintl
+F_LD64(_o_llrintl) ; Can't use long double functions from the CRT on x86
 _o_llround
 _o_llroundf
-_o_llroundl
+F_LD64(_o_llroundl) ; Can't use long double functions from the CRT on x86
 _o_localeconv
 _o_log
 _o_log10
-_o_log10f
+F_NON_I386(_o_log10f)
 _o_log1p
 _o_log1pf
-_o_log1pl
+F_LD64(_o_log1pl) ; Can't use long double functions from the CRT on x86
 _o_log2
 _o_log2f
-_o_log2l
+F_LD64(_o_log2l) ; Can't use long double functions from the CRT on x86
 _o_logb
 _o_logbf
-_o_logbl
-_o_logf
+F_LD64(_o_logbl) ; Can't use long double functions from the CRT on x86
+F_NON_I386(_o_logf)
 _o_lrint
 _o_lrintf
-_o_lrintl
+F_LD64(_o_lrintl) ; Can't use long double functions from the CRT on x86
 _o_lround
 _o_lroundf
-_o_lroundl
+F_LD64(_o_lroundl) ; Can't use long double functions from the CRT on x86
 _o_malloc
 _o_mblen
 _o_mbrlen
@@ -1035,19 +1035,19 @@ _o_mbstowcs_s
 _o_mbtowc
 _o_memset
 _o_modf
-_o_modff
+F_NON_I386(_o_modff)
 _o_nan
 _o_nanf
-_o_nanl
+F_LD64(_o_nanl) ; Can't use long double functions from the CRT on x86
 _o_nearbyint
 _o_nearbyintf
-_o_nearbyintl
+F_LD64(_o_nearbyintl) ; Can't use long double functions from the CRT on x86
 _o_nextafter
 _o_nextafterf
-_o_nextafterl
-_o_nexttoward
-_o_nexttowardf
-_o_nexttowardl
+F_LD64(_o_nextafterl) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_nexttoward) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_nexttowardf) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_nexttowardl) ; Can't use long double functions from the CRT on x86
 _o_pow
 _o_powf
 _o_putc
@@ -1063,33 +1063,33 @@ _o_rand_s
 _o_realloc
 _o_remainder
 _o_remainderf
-_o_remainderl
+F_LD64(_o_remainderl) ; Can't use long double functions from the CRT on x86
 _o_remove
 _o_remquo
 _o_remquof
-_o_remquol
+F_LD64(_o_remquol) ; Can't use long double functions from the CRT on x86
 _o_rewind
 _o_rint
 _o_rintf
-_o_rintl
+F_LD64(_o_rintl) ; Can't use long double functions from the CRT on x86
 _o_round
 _o_roundf
-_o_roundl
+F_LD64(_o_roundl) ; Can't use long double functions from the CRT on x86
 _o_scalbln
 _o_scalblnf
-_o_scalblnl
+F_LD64(_o_scalblnl) ; Can't use long double functions from the CRT on x86
 _o_scalbn
 _o_scalbnf
-_o_scalbnl
+F_LD64(_o_scalbnl) ; Can't use long double functions from the CRT on x86
 _o_set_terminate
 _o_setbuf
 _o_setvbuf
 _o_sin
-_o_sinf
+F_NON_I386(_o_sinf)
 _o_sinh
-_o_sinhf
+F_NON_I386(_o_sinhf)
 _o_sqrt
-_o_sqrtf
+F_NON_I386(_o_sqrtf)
 _o_srand
 _o_strcat_s
 _o_strcoll
@@ -1104,19 +1104,19 @@ _o_strtof
 _o_strtok
 _o_strtok_s
 _o_strtol
-_o_strtold
+F_LD64(_o_strtold) ; Can't use long double functions from the CRT on x86
 _o_strtoll
 _o_strtoul
 _o_strtoull
 _o_system
 _o_tan
-_o_tanf
+F_NON_I386(_o_tanf)
 _o_tanh
-_o_tanhf
+F_NON_I386(_o_tanhf)
 _o_terminate
 _o_tgamma
 _o_tgammaf
-_o_tgammal
+F_LD64(_o_tgammal) ; Can't use long double functions from the CRT on x86
 _o_tmpfile_s
 _o_tmpnam_s
 _o_tolower
@@ -1141,7 +1141,7 @@ _o_wcstof
 _o_wcstok
 _o_wcstok_s
 _o_wcstol
-_o_wcstold
+F_LD64(_o_wcstold) ; Can't use long double functions from the CRT on x86
 _o_wcstoll
 _o_wcstombs
 _o_wcstombs_s
@@ -1172,3 +1172,33 @@ unexpected
 wcschr
 wcsrchr
 wcsstr
+
+; These symbols were added in api-ms-win-crt-private-l1-1-0.dll version 10.0.10563.0
+; It is part of the Microsoft Visual C++ 2015 Redistributable version 14.0.23506.0
+_o____lc_codepage_func
+_o____lc_collate_cp_func
+_o____lc_locale_name_func
+_o____mb_cur_max_func
+_o___std_exception_copy
+_o___std_exception_destroy
+_o___std_type_info_destroy_list
+_o___std_type_info_name
+_o__cexit
+_o__configthreadlocale
+_o__configure_narrow_argv
+_o__controlfp_s
+_o__crt_atexit
+_o__exit
+_o__get_initial_narrow_environment
+_o__get_initial_wide_environment
+_o__initialize_narrow_environment
+_o__initialize_wide_environment
+_o__purecall
+_o__seh_filter_dll
+_o__seh_filter_exe
+_o__set_app_type
+_o__set_fmode
+_o_exit
+_o_memcpy_s
+_o_rename
+_o_setlocale

@@ -37,15 +37,14 @@ _controlfp
 _controlfp_s
 _crt_at_quick_exit
 _crt_atexit
-_crt_debugger_hook
+F_I386(_crt_debugger_hook)
 _endthread
 _endthreadex
 _errno
 _execute_onexit_table
 _exit
-F_NON_I386(_fpieee_flt)
-; DATA added manually
-_fpreset DATA
+_fpieee_flt
+_fpreset F_LD80(DATA) ; DATA added manually
 _get_doserrno
 _get_errno
 _get_initial_narrow_environment

@@ -5,9 +5,13 @@ EXPORTS
 #include "func.def.in"
 
 __daylight
+__p__daylight == __daylight
 __dstbias
+__p__dstbias == __dstbias
 __timezone
+__p__timezone == __timezone
 __tzname
+__p__tzname == __tzname
 _ctime32
 _ctime32_s
 _ctime64
@@ -18,6 +22,8 @@ _difftime32
 _difftime64
 F32(_ftime == _ftime32)
 F64(_ftime == _ftime64)
+F32(ftime == _ftime32)
+F64(ftime == _ftime64)
 _ftime32
 _ftime32_s
 _ftime64

@@ -2,7 +2,7 @@
 
 LIBRARY "ntdll.dll"
 EXPORTS
-#ifdef DEF_X64
+#ifdef __x86_64__
 PropertyLengthAsVariant
 RtlConvertPropertyToVariant
 RtlConvertVariantToProperty
@@ -38,7 +38,7 @@ CsrClientConnectToServer
 CsrFreeCaptureBuffer
 CsrGetProcessId
 CsrIdentifyAlertableThread
-#if defined(DEF_I386) || defined(DEF_X64)
+#if defined(__i386__) || defined(__x86_64__)
 CsrNewThread
 CsrProbeForRead
 CsrProbeForWrite
@@ -65,12 +65,12 @@ DbgUiStopDebugging
 DbgUiWaitStateChange
 DbgUserBreakPoint
 EtwCheckCoverage
-#ifdef DEF_X64
+#ifdef __x86_64__
 EtwControlTraceA
 EtwControlTraceW
 #endif
 EtwCreateTraceInstanceId
-#ifdef DEF_X64
+#ifdef __x86_64__
 EtwEnableTrace
 EtwEnumerateTraceGuids
 EtwFlushTraceA
@@ -95,7 +95,7 @@ EtwEventWriteTransfer
 EtwGetTraceEnableFlags
 EtwGetTraceEnableLevel
 EtwGetTraceLoggerHandle
-#ifdef DEF_X64
+#ifdef __x86_64__
 EtwNotificationRegistrationA
 EtwNotificationRegistrationW
 EtwQueryAllTracesA
@@ -112,7 +112,7 @@ EtwProcessPrivateLoggerRequest
 EtwRegisterSecurityProvider
 EtwRegisterTraceGuidsA
 EtwRegisterTraceGuidsW
-#ifdef DEF_X64
+#ifdef __x86_64__
 EtwStartTraceA
 EtwStartTraceW
 EtwStopTraceA
@@ -126,7 +126,7 @@ EtwTraceEventInstance
 EtwTraceMessage
 EtwTraceMessageVa
 EtwUnregisterTraceGuids
-#ifdef DEF_X64
+#ifdef __x86_64__
 EtwUpdateTraceA
 EtwUpdateTraceW
 EtwpGetTraceBuffer
@@ -138,7 +138,7 @@ EtwpGetCpuSpeed
 F_X64(EtwpNotificationThread)
 EvtIntReportAuthzEventAndSourceAsync
 EvtIntReportEventAndSourceAsync
-#ifndef DEF_ARM32
+#ifndef __arm__
 ExpInterlockedPopEntrySListEnd
 F_X64(ExpInterlockedPopEntrySListEnd16)
 ExpInterlockedPopEntrySListFault
@@ -729,7 +729,7 @@ NtWaitForWorkViaWorkerFactory
 NtWaitHighEventPair
 NtWaitLowEventPair
 NtWorkerFactoryWorkerReady
-#ifdef DEF_ARM32
+#ifdef __arm__
 NtWow64AllocateVirtualMemory64
 NtWow64CallFunction64
 NtWow64CsrAllocateCaptureBuffer
@@ -946,7 +946,7 @@ RtlCreateSystemVolumeInformationFolder
 RtlCreateTagHeap
 RtlCreateTimer
 RtlCreateTimerQueue
-#ifdef DEF_X64
+#ifdef __x86_64__
 RtlCreateUmsCompletionList
 RtlCreateUmsThread
 RtlCreateUmsThreadContext
@@ -995,7 +995,7 @@ RtlDeleteSecurityObject
 RtlDeleteTimer
 RtlDeleteTimerQueue
 RtlDeleteTimerQueueEx
-#ifdef DEF_X64
+#ifdef __x86_64__
 RtlDeleteUmsCompletionList
 RtlDeleteUmsThreadContext
 RtlDequeueUmsCompletionListItems
@@ -1732,7 +1732,7 @@ F64(RtlWow64GetThreadContext)
 F64(RtlWow64GetThreadSelectorEntry)
 RtlWow64IsWowGuestMachineSupported
 RtlWow64LogMessageInEventLogger
-#if defined(DEF_X64) || defined(DEF_ARM64)
+#if defined(__x86_64__) || defined(__aarch64__)
 RtlWow64PopAllCrossProcessWorkFromWorkList
 RtlWow64PopCrossProcessWorkFromFreeList
 RtlWow64PushCrossProcessWorkOntoFreeList
@@ -1794,7 +1794,7 @@ F_X64(RtlpUmsThreadYield)
 RtlpUnWaitCriticalSection
 RtlpVerifyAndCommitUILanguageSettings
 RtlpWaitForCriticalSection
-#ifdef DEF_X64
+#ifdef __x86_64__
 RtlpWow64CtxFromAmd64
 RtlpWow64GetContextOnAmd64
 RtlpWow64SetContextOnAmd64
@@ -2388,7 +2388,7 @@ ZwWaitForWorkViaWorkerFactory
 ZwWaitHighEventPair
 ZwWaitLowEventPair
 ZwWorkerFactoryWorkerReady
-#ifdef DEF_ARM32
+#ifdef __arm__
 ZwWow64AllocateVirtualMemory64
 ZwWow64CallFunction64
 ZwWow64CsrAllocateCaptureBuffer

@@ -2,7 +2,7 @@
 
 LIBRARY "ntdll.dll"
 EXPORTS
-#ifdef DEF_I386
+#ifdef __i386__
 _CIcos
 _CIlog
 _CIpow
@@ -17,7 +17,7 @@ __iscsymf
 F_X64(__misaligned_access)
 F_ARM32(__jump_unwind)
 __toascii
-#ifdef DEF_I386
+#ifdef __i386__
 _alldiv
 _alldvrm@16
 _allmul@16
@@ -29,7 +29,7 @@ _allshl
 _allshr
 #endif
 _atoi64
-#ifdef DEF_I386
+#ifdef __i386__
 _aulldiv@16
 _aulldvrm@16
 _aullrem@16
@@ -39,7 +39,7 @@ _aullshr
 _errno
 F_I386(_except_handler4_common)
 _fltused DATA
-#ifdef DEF_I386
+#ifdef __i386__
 _ftol
 _ftol2
 _ftol2_sse

@@ -390,7 +390,9 @@ OleBuildVersion
 OleConvertIStorageToOLESTREAM
 OleConvertIStorageToOLESTREAMEx
 OleConvertOLESTREAMToIStorage
+OleConvertOLESTREAMToIStorage2
 OleConvertOLESTREAMToIStorageEx
+OleConvertOLESTREAMToIStorageEx2
 OleCreate
 OleCreateDefaultHandler
 OleCreateEmbeddingHelper
@@ -417,6 +419,7 @@ OleDuplicateData
 OleFlushClipboard
 OleGetAutoConvert
 OleGetClipboard
+OleGetClipboardWithEnterpriseInfo
 OleGetIconOfClass
 OleGetIconOfFile
 OleIconToCursorExt

@@ -218,7 +218,7 @@ __threadid
 __timezone
 __toascii
 __tzname
-#if !defined(DEF_DEBUG) || !defined(DEF_ARM64)
+#if !defined(DEF_DEBUG) || !defined(__aarch64__)
 ; symbols __unDName and __unDNameEx are available in all versions except ARM64 ucrtbased.dll
 __unDName
 __unDNameEx
@@ -388,7 +388,7 @@ _flushall
 _fpclass
 F_X64(_fpclassf)
 _fpieee_flt
-_fpreset DATA ; DATA added manually
+_fpreset F_LD80(DATA) ; DATA added manually
 _fputc_nolock
 _fputchar
 _fputwc_nolock
@@ -493,7 +493,7 @@ F_DEBUG(_invalid_parameter)
 _invalid_parameter_noinfo
 _invalid_parameter_noinfo_noreturn
 _invoke_watson
-#if !defined(DEF_DEBUG) || !defined(DEF_ARM64)
+#if !defined(DEF_DEBUG) || !defined(__aarch64__)
 ; symbol _is_exception_typeof is available in all versions except ARM64 ucrtbased.dll
 _is_exception_typeof
 #endif
@@ -1433,7 +1433,7 @@ _o__strtof_l
 _o__strtoi64
 _o__strtoi64_l
 _o__strtol_l
-F_ARM_ANY(_o__strtold_l) ; Can't use long double functions from the CRT on x86
+F_LD64(_o__strtold_l) ; Can't use long double functions from the CRT on x86
 _o__strtoll_l
 _o__strtoui64
 _o__strtoui64_l
@@ -1513,7 +1513,7 @@ _o__wcstof_l
 _o__wcstoi64
 _o__wcstoi64_l
 _o__wcstol_l
-F_ARM_ANY(_o__wcstold_l) ; Can't use long double functions from the CRT on x86
+F_LD64(_o__wcstold_l) ; Can't use long double functions from the CRT on x86
 _o__wcstoll_l
 _o__wcstombs_l
 _o__wcstombs_s_l
@@ -1611,21 +1611,21 @@ _o_acos
 F_NON_I386(_o_acosf)
 _o_acosh
 _o_acoshf
-F_ARM_ANY(_o_acoshl) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_acoshl) ; Can't use long double functions from the CRT on x86
 _o_asctime
 _o_asctime_s
 _o_asin
 F_NON_I386(_o_asinf)
 _o_asinh
 _o_asinhf
-F_ARM_ANY(_o_asinhl) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_asinhl) ; Can't use long double functions from the CRT on x86
 _o_atan
 _o_atan2
 F_NON_I386(_o_atan2f)
 F_NON_I386(_o_atanf)
 _o_atanh
 _o_atanhf
-F_ARM_ANY(_o_atanhl) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_atanhl) ; Can't use long double functions from the CRT on x86
 _o_atof
 _o_atoi
 _o_atol
@@ -1647,13 +1647,13 @@ F_NON_I386(_o_coshf)
 _o_erf
 _o_erfc
 _o_erfcf
-F_ARM_ANY(_o_erfcl) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_erfcl) ; Can't use long double functions from the CRT on x86
 _o_erff
-F_ARM_ANY(_o_erfl) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_erfl) ; Can't use long double functions from the CRT on x86
 _o_exp
 _o_exp2
 _o_exp2f
-F_ARM_ANY(_o_exp2l) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_exp2l) ; Can't use long double functions from the CRT on x86
 F_NON_I386(_o_expf)
 _o_fabs
 F_ARM_ANY(_o_fabsf)
@@ -1670,7 +1670,7 @@ _o_floor
 F_NON_I386(_o_floorf)
 _o_fma
 _o_fmaf
-F_ARM_ANY(_o_fmal) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_fmal) ; Can't use long double functions from the CRT on x86
 _o_fmod
 F_NON_I386(_o_fmodf)
 _o_fopen
@@ -1729,33 +1729,33 @@ _o_isxdigit
 _o_ldexp
 _o_lgamma
 _o_lgammaf
-F_ARM_ANY(_o_lgammal) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_lgammal) ; Can't use long double functions from the CRT on x86
 _o_llrint
 _o_llrintf
-F_ARM_ANY(_o_llrintl) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_llrintl) ; Can't use long double functions from the CRT on x86
 _o_llround
 _o_llroundf
-F_ARM_ANY(_o_llroundl) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_llroundl) ; Can't use long double functions from the CRT on x86
 _o_localeconv
 _o_log
 _o_log10
 F_NON_I386(_o_log10f)
 _o_log1p
 _o_log1pf
-F_ARM_ANY(_o_log1pl) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_log1pl) ; Can't use long double functions from the CRT on x86
 _o_log2
 _o_log2f
-F_ARM_ANY(_o_log2l) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_log2l) ; Can't use long double functions from the CRT on x86
 _o_logb
 _o_logbf
-F_ARM_ANY(_o_logbl) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_logbl) ; Can't use long double functions from the CRT on x86
 F_NON_I386(_o_logf)
 _o_lrint
 _o_lrintf
-F_ARM_ANY(_o_lrintl) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_lrintl) ; Can't use long double functions from the CRT on x86
 _o_lround
 _o_lroundf
-F_ARM_ANY(_o_lroundl) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_lroundl) ; Can't use long double functions from the CRT on x86
 _o_malloc
 _o_mblen
 _o_mbrlen
@@ -1772,16 +1772,16 @@ _o_modf
 F_NON_I386(_o_modff)
 _o_nan
 _o_nanf
-F_ARM_ANY(_o_nanl) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_nanl) ; Can't use long double functions from the CRT on x86
 _o_nearbyint
 _o_nearbyintf
-F_ARM_ANY(_o_nearbyintl) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_nearbyintl) ; Can't use long double functions from the CRT on x86
 _o_nextafter
 _o_nextafterf
-F_ARM_ANY(_o_nextafterl) ; Can't use long double functions from the CRT on x86
-F_ARM_ANY(_o_nexttoward) ; Can't use long double functions from the CRT on x86
-F_ARM_ANY(_o_nexttowardf) ; Can't use long double functions from the CRT on x86
-F_ARM_ANY(_o_nexttowardl) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_nextafterl) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_nexttoward) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_nexttowardf) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_nexttowardl) ; Can't use long double functions from the CRT on x86
 _o_pow
 _o_powf
 _o_putc
@@ -1797,24 +1797,24 @@ _o_rand_s
 _o_realloc
 _o_remainder
 _o_remainderf
-F_ARM_ANY(_o_remainderl) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_remainderl) ; Can't use long double functions from the CRT on x86
 _o_remove
 _o_remquo
 _o_remquof
-F_ARM_ANY(_o_remquol) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_remquol) ; Can't use long double functions from the CRT on x86
 _o_rewind
 _o_rint
 _o_rintf
-F_ARM_ANY(_o_rintl) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_rintl) ; Can't use long double functions from the CRT on x86
 _o_round
 _o_roundf
-F_ARM_ANY(_o_roundl) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_roundl) ; Can't use long double functions from the CRT on x86
 _o_scalbln
 _o_scalblnf
-F_ARM_ANY(_o_scalblnl) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_scalblnl) ; Can't use long double functions from the CRT on x86
 _o_scalbn
 _o_scalbnf
-F_ARM_ANY(_o_scalbnl) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_scalbnl) ; Can't use long double functions from the CRT on x86
 _o_set_terminate
 _o_setbuf
 _o_setvbuf
@@ -1838,7 +1838,7 @@ _o_strtof
 _o_strtok
 _o_strtok_s
 _o_strtol
-F_ARM_ANY(_o_strtold) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_strtold) ; Can't use long double functions from the CRT on x86
 _o_strtoll
 _o_strtoul
 _o_strtoull
@@ -1850,7 +1850,7 @@ F_NON_I386(_o_tanhf)
 _o_terminate
 _o_tgamma
 _o_tgammaf
-F_ARM_ANY(_o_tgammal) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_tgammal) ; Can't use long double functions from the CRT on x86
 _o_tmpfile_s
 _o_tmpnam_s
 _o_tolower
@@ -1875,7 +1875,7 @@ _o_wcstof
 _o_wcstok
 _o_wcstok_s
 _o_wcstol
-F_ARM_ANY(_o_wcstold) ; Can't use long double functions from the CRT on x86
+F_LD64(_o_wcstold) ; Can't use long double functions from the CRT on x86
 _o_wcstoll
 _o_wcstombs
 _o_wcstombs_s
@@ -2004,7 +2004,7 @@ _strtoi64
 _strtoi64_l
 _strtoimax_l
 _strtol_l
-F_ARM_ANY(_strtold_l) ; Can't use long double functions from the CRT on x86
+F_LD64(_strtold_l) ; Can't use long double functions from the CRT on x86
 _strtoll_l
 _strtoui64
 _strtoui64_l
@@ -2094,7 +2094,7 @@ _wcstoi64
 _wcstoi64_l
 _wcstoimax_l
 _wcstol_l
-F_ARM_ANY(_wcstold_l) ; Can't use long double functions from the CRT on x86
+F_LD64(_wcstold_l) ; Can't use long double functions from the CRT on x86
 _wcstoll_l
 _wcstombs_l
 _wcstombs_s_l
@@ -2212,21 +2212,21 @@ acos
 F_NON_I386(acosf)
 acosh
 acoshf
-F_ARM_ANY(acoshl) ; Can't use long double functions from the CRT on x86
+F_LD64(acoshl) ; Can't use long double functions from the CRT on x86
 asctime
 asctime_s
 asin
 F_NON_I386(asinf)
 asinh
 asinhf
-F_ARM_ANY(asinhl) ; Can't use long double functions from the CRT on x86
+F_LD64(asinhl) ; Can't use long double functions from the CRT on x86
 atan
 atan2
 F_NON_I386(atan2f)
 F_NON_I386(atanf)
 atanh
 atanhf
-F_ARM_ANY(atanhl) ; Can't use long double functions from the CRT on x86
+F_LD64(atanhl) ; Can't use long double functions from the CRT on x86
 atof
 atoi
 atol
@@ -2238,111 +2238,111 @@ c16rtomb
 c32rtomb
 cabs
 cabsf
-F_ARM_ANY(cabsl) ; Can't use long double functions from the CRT on x86
+F_LD64(cabsl) ; Can't use long double functions from the CRT on x86
 cacos
 cacosf
 cacosh
 cacoshf
-F_ARM_ANY(cacoshl) ; Can't use long double functions from the CRT on x86
-F_ARM_ANY(cacosl) ; Can't use long double functions from the CRT on x86
+F_LD64(cacoshl) ; Can't use long double functions from the CRT on x86
+F_LD64(cacosl) ; Can't use long double functions from the CRT on x86
 calloc
 carg
 cargf
-F_ARM_ANY(cargl) ; Can't use long double functions from the CRT on x86
+F_LD64(cargl) ; Can't use long double functions from the CRT on x86
 casin
 casinf
 casinh
 casinhf
-F_ARM_ANY(casinhl) ; Can't use long double functions from the CRT on x86
-F_ARM_ANY(casinl) ; Can't use long double functions from the CRT on x86
+F_LD64(casinhl) ; Can't use long double functions from the CRT on x86
+F_LD64(casinl) ; Can't use long double functions from the CRT on x86
 catan
 catanf
 catanh
 catanhf
-F_ARM_ANY(catanhl) ; Can't use long double functions from the CRT on x86
-F_ARM_ANY(catanl) ; Can't use long double functions from the CRT on x86
+F_LD64(catanhl) ; Can't use long double functions from the CRT on x86
+F_LD64(catanl) ; Can't use long double functions from the CRT on x86
 cbrt
 cbrtf
-F_ARM_ANY(cbrtl) ; Can't use long double functions from the CRT on x86
+F_LD64(cbrtl) ; Can't use long double functions from the CRT on x86
 ccos
 ccosf
 ccosh
 ccoshf
-F_ARM_ANY(ccoshl) ; Can't use long double functions from the CRT on x86
-F_ARM_ANY(ccosl) ; Can't use long double functions from the CRT on x86
+F_LD64(ccoshl) ; Can't use long double functions from the CRT on x86
+F_LD64(ccosl) ; Can't use long double functions from the CRT on x86
 ceil
 F_NON_I386(ceilf)
 cexp
 cexpf
-F_ARM_ANY(cexpl) ; Can't use long double functions from the CRT on x86
+F_LD64(cexpl) ; Can't use long double functions from the CRT on x86
 cimag
 cimagf
-F_ARM_ANY(cimagl) ; Can't use long double functions from the CRT on x86
+F_LD64(cimagl) ; Can't use long double functions from the CRT on x86
 clearerr
 clearerr_s
 clock
 clog
 clog10
 clog10f
-F_ARM_ANY(clog10l) ; Can't use long double functions from the CRT on x86
+F_LD64(clog10l) ; Can't use long double functions from the CRT on x86
 clogf
-F_ARM_ANY(clogl) ; Can't use long double functions from the CRT on x86
+F_LD64(clogl) ; Can't use long double functions from the CRT on x86
 conj
 conjf
-F_ARM_ANY(conjl) ; Can't use long double functions from the CRT on x86
+F_LD64(conjl) ; Can't use long double functions from the CRT on x86
 copysign
 copysignf
-F_ARM_ANY(copysignl) ; Can't use long double functions from the CRT on x86
+F_LD64(copysignl) ; Can't use long double functions from the CRT on x86
 cos
 F_NON_I386(cosf)
 cosh
 F_NON_I386(coshf)
 cpow
 cpowf
-F_ARM_ANY(cpowl) ; Can't use long double functions from the CRT on x86
+F_LD64(cpowl) ; Can't use long double functions from the CRT on x86
 cproj
 cprojf
-F_ARM_ANY(cprojl) ; Can't use long double functions from the CRT on x86
+F_LD64(cprojl) ; Can't use long double functions from the CRT on x86
 creal
 crealf
-F_ARM_ANY(creall) ; Can't use long double functions from the CRT on x86
+F_LD64(creall) ; Can't use long double functions from the CRT on x86
 csin
 csinf
 csinh
 csinhf
-F_ARM_ANY(csinhl) ; Can't use long double functions from the CRT on x86
-F_ARM_ANY(csinl) ; Can't use long double functions from the CRT on x86
+F_LD64(csinhl) ; Can't use long double functions from the CRT on x86
+F_LD64(csinl) ; Can't use long double functions from the CRT on x86
 csqrt
 csqrtf
-F_ARM_ANY(csqrtl) ; Can't use long double functions from the CRT on x86
+F_LD64(csqrtl) ; Can't use long double functions from the CRT on x86
 ctan
 ctanf
 ctanh
 ctanhf
-F_ARM_ANY(ctanhl) ; Can't use long double functions from the CRT on x86
-F_ARM_ANY(ctanl) ; Can't use long double functions from the CRT on x86
+F_LD64(ctanhl) ; Can't use long double functions from the CRT on x86
+F_LD64(ctanl) ; Can't use long double functions from the CRT on x86
 div
 erf
 erfc
 erfcf
-F_ARM_ANY(erfcl) ; Can't use long double functions from the CRT on x86
+F_LD64(erfcl) ; Can't use long double functions from the CRT on x86
 erff
-F_ARM_ANY(erfl) ; Can't use long double functions from the CRT on x86
+F_LD64(erfl) ; Can't use long double functions from the CRT on x86
 exit
 exp
 exp2
 exp2f
-F_ARM_ANY(exp2l) ; Can't use long double functions from the CRT on x86
+F_LD64(exp2l) ; Can't use long double functions from the CRT on x86
 F_NON_I386(expf)
 expm1
 expm1f
-F_ARM_ANY(expm1l) ; Can't use long double functions from the CRT on x86
+F_LD64(expm1l) ; Can't use long double functions from the CRT on x86
 fabs
 F_ARM_ANY(fabsf)
 fclose
 fdim
 fdimf
-F_ARM_ANY(fdiml) ; Can't use long double functions from the CRT on x86
+F_LD64(fdiml) ; Can't use long double functions from the CRT on x86
 ; Don't use the float env functions from UCRT; fesetround doesn't seem to have
 ; any effect on the FPU control word as required by other libmingwex math
 ; routines.
@@ -2367,13 +2367,13 @@ floor
 F_NON_I386(floorf)
 fma
 fmaf
-F_ARM_ANY(fmal) ; Can't use long double functions from the CRT on x86
+F_LD64(fmal) ; Can't use long double functions from the CRT on x86
 fmax
 fmaxf
-F_ARM_ANY(fmaxl) ; Can't use long double functions from the CRT on x86
+F_LD64(fmaxl) ; Can't use long double functions from the CRT on x86
 fmin
 fminf
-F_ARM_ANY(fminl) ; Can't use long double functions from the CRT on x86
+F_LD64(fminl) ; Can't use long double functions from the CRT on x86
 fmod
 F_NON_I386(fmodf)
 fopen
@@ -2403,7 +2403,7 @@ getwchar
 hypot
 ilogb
 ilogbf
-F_ARM_ANY(ilogbl) ; Can't use long double functions from the CRT on x86
+F_LD64(ilogbl) ; Can't use long double functions from the CRT on x86
 imaxabs
 imaxdiv
 is_wctype
@@ -2441,36 +2441,36 @@ ldiv
 ; the mingw ones do. Therefore prefer the libmingwex version instead.
 lgamma DATA
 lgammaf DATA
-F_ARM_ANY(lgammal DATA) ; Can't use long double functions from the CRT on x86
+F_LD64(lgammal DATA) ; Can't use long double functions from the CRT on x86
 llabs
 lldiv
 llrint
 llrintf
-F_ARM_ANY(llrintl) ; Can't use long double functions from the CRT on x86
+F_LD64(llrintl) ; Can't use long double functions from the CRT on x86
 llround
 llroundf
-F_ARM_ANY(llroundl) ; Can't use long double functions from the CRT on x86
+F_LD64(llroundl) ; Can't use long double functions from the CRT on x86
 localeconv
 log
 log10
 F_NON_I386(log10f)
 log1p
 log1pf
-F_ARM_ANY(log1pl) ; Can't use long double functions from the CRT on x86
+F_LD64(log1pl) ; Can't use long double functions from the CRT on x86
 log2
 log2f
-F_ARM_ANY(log2l) ; Can't use long double functions from the CRT on x86
+F_LD64(log2l) ; Can't use long double functions from the CRT on x86
 logb
 logbf
-F_ARM_ANY(logbl) ; Can't use long double functions from the CRT on x86
+F_LD64(logbl) ; Can't use long double functions from the CRT on x86
 F_NON_I386(logf)
 longjmp
 lrint
 lrintf
-F_ARM_ANY(lrintl) ; Can't use long double functions from the CRT on x86
+F_LD64(lrintl) ; Can't use long double functions from the CRT on x86
 lround
 lroundf
-F_ARM_ANY(lroundl) ; Can't use long double functions from the CRT on x86
+F_LD64(lroundl) ; Can't use long double functions from the CRT on x86
 malloc
 mblen
 mbrlen
@@ -2493,18 +2493,18 @@ modf
 F_NON_I386(modff)
 nan
 nanf
-F_ARM_ANY(nanl) ; Can't use long double functions from the CRT on x86
+F_LD64(nanl) ; Can't use long double functions from the CRT on x86
 nearbyint
 nearbyintf
-F_ARM_ANY(nearbyintl) ; Can't use long double functions from the CRT on x86
+F_LD64(nearbyintl) ; Can't use long double functions from the CRT on x86
 nextafter
 nextafterf
-F_ARM_ANY(nextafterl) ; Can't use long double functions from the CRT on x86
+F_LD64(nextafterl) ; Can't use long double functions from the CRT on x86
 ; All of the nexttoward functions take the second parameter as long double,
 ; making them unusable for x86.
-F_ARM_ANY(nexttoward) ; Can't use long double functions from the CRT on x86
-F_ARM_ANY(nexttowardf) ; Can't use long double functions from the CRT on x86
-F_ARM_ANY(nexttowardl) ; Can't use long double functions from the CRT on x86
+F_LD64(nexttoward) ; Can't use long double functions from the CRT on x86
+F_LD64(nexttowardf) ; Can't use long double functions from the CRT on x86
+F_LD64(nexttowardl) ; Can't use long double functions from the CRT on x86
 norm
 normf
 norml
@@ -2525,25 +2525,25 @@ rand_s
 realloc
 remainder
 remainderf
-F_ARM_ANY(remainderl) ; Can't use long double functions from the CRT on x86
+F_LD64(remainderl) ; Can't use long double functions from the CRT on x86
 remove
 remquo
 remquof
-F_ARM_ANY(remquol) ; Can't use long double functions from the CRT on x86
+F_LD64(remquol) ; Can't use long double functions from the CRT on x86
 rename
 rewind
 rint
 rintf
-F_ARM_ANY(rintl) ; Can't use long double functions from the CRT on x86
+F_LD64(rintl) ; Can't use long double functions from the CRT on x86
 round
 roundf
-F_ARM_ANY(roundl) ; Can't use long double functions from the CRT on x86
+F_LD64(roundl) ; Can't use long double functions from the CRT on x86
 scalbln
 scalblnf
-F_ARM_ANY(scalblnl) ; Can't use long double functions from the CRT on x86
+F_LD64(scalblnl) ; Can't use long double functions from the CRT on x86
 scalbn
 scalbnf
-F_ARM_ANY(scalbnl) ; Can't use long double functions from the CRT on x86
+F_LD64(scalbnl) ; Can't use long double functions from the CRT on x86
 set_terminate
 set_unexpected
 setbuf
@@ -2587,7 +2587,7 @@ strtoimax
 strtok
 strtok_s
 strtol
-F_ARM_ANY(strtold) ; Can't use long double functions from the CRT on x86
+F_LD64(strtold) ; Can't use long double functions from the CRT on x86
 strtoll
 strtoul
 strtoull
@@ -2602,7 +2602,7 @@ F_NON_I386(tanhf)
 terminate
 tgamma
 tgammaf
-F_ARM_ANY(tgammal) ; Can't use long double functions from the CRT on x86
+F_LD64(tgammal) ; Can't use long double functions from the CRT on x86
 tmpfile
 tmpfile_s
 tmpnam
@@ -2614,7 +2614,7 @@ towlower
 towupper
 trunc
 truncf
-F_ARM_ANY(truncl) ; Can't use long double functions from the CRT on x86
+F_LD64(truncl) ; Can't use long double functions from the CRT on x86
 unexpected
 ungetc
 ungetwc
@@ -2648,7 +2648,7 @@ wcstoimax
 wcstok
 wcstok_s
 wcstol
-F_ARM_ANY(wcstold) ; Can't use long double functions from the CRT on x86
+F_LD64(wcstold) ; Can't use long double functions from the CRT on x86
 wcstoll
 wcstombs
 wcstombs_s

@@ -2,200 +2,200 @@
 
 LIBRARY "WS2_32.dll"
 EXPORTS
-accept
-bind
-closesocket
-connect
-getpeername
-getsockname
-getsockopt
-htonl
-htons
-ioctlsocket
-inet_addr
-inet_ntoa
-listen
-ntohl
-ntohs
-recv
-recvfrom
-select
-send
-sendto
-setsockopt
-shutdown
-socket
-WSApSetPostRoutine
-FreeAddrInfoEx
-FreeAddrInfoExW
-FreeAddrInfoW
-GetAddrInfoExA
-GetAddrInfoExCancel
-GetAddrInfoExOverlappedResult
-GetAddrInfoExW
-GetAddrInfoW
-GetHostNameW
-GetNameInfoW
-InetNtopW
-InetPtonW
-ProcessSocketNotifications
-SetAddrInfoExA
-SetAddrInfoExW
-WPUCompleteOverlappedRequest
-WPUGetProviderPathEx
-WSAAccept
-WSAAddressToStringA
-WSAAddressToStringW
-WSAAdvertiseProvider
-WSACloseEvent
-WSAConnect
-WSAConnectByList
-WSAConnectByNameA
-WSAConnectByNameW
-WSACreateEvent
-gethostbyaddr
-gethostbyname
-getprotobyname
-getprotobynumber
-getservbyname
-getservbyport
-gethostname
-WSADuplicateSocketA
-WSADuplicateSocketW
-WSAEnumNameSpaceProvidersA
-WSAEnumNameSpaceProvidersExA
-WSAEnumNameSpaceProvidersExW
-WSAEnumNameSpaceProvidersW
-WSAEnumNetworkEvents
-WSAEnumProtocolsA
-WSAEnumProtocolsW
-WSAEventSelect
-WSAGetOverlappedResult
-WSAGetQOSByName
-WSAGetServiceClassInfoA
-WSAGetServiceClassInfoW
-WSAGetServiceClassNameByClassIdA
-WSAGetServiceClassNameByClassIdW
-WSAHtonl
-WSAHtons
-WSAInstallServiceClassA
-WSAInstallServiceClassW
-WSAIoctl
-WSAJoinLeaf
-WSALookupServiceBeginA
-WSALookupServiceBeginW
-WSALookupServiceEnd
-WSALookupServiceNextA
-WSALookupServiceNextW
-WSANSPIoctl
-WSANtohl
-WSANtohs
-WSAPoll
-WSAProviderCompleteAsyncCall
-WSAProviderConfigChange
-WSARecv
-WSARecvDisconnect
-WSARecvFrom
-WSARemoveServiceClass
-WSAResetEvent
-WSASend
-WSASendDisconnect
-WSASendMsg
-WSASendTo
-WSASetEvent
-WSAAsyncSelect
-WSAAsyncGetHostByAddr
-WSAAsyncGetHostByName
-WSAAsyncGetProtoByNumber
-WSAAsyncGetProtoByName
-WSAAsyncGetServByPort
-WSAAsyncGetServByName
-WSACancelAsyncRequest
-WSASetBlockingHook
-WSAUnhookBlockingHook
-WSAGetLastError
-WSASetLastError
-WSACancelBlockingCall
-WSAIsBlocking
-WSAStartup
-WSACleanup
-WSASetServiceA
-WSASetServiceW
-WSASocketA
-WSASocketW
-WSAStringToAddressA
-WSAStringToAddressW
-WSAUnadvertiseProvider
-WSAWaitForMultipleEvents
-WSCDeinstallProvider
+__WSAFDIsSet@8
+FreeAddrInfoEx@4
+FreeAddrInfoExW@4
+FreeAddrInfoW@4
+GetAddrInfoExA@40
+GetAddrInfoExCancel@4
+GetAddrInfoExOverlappedResult@4
+GetAddrInfoExW@40
+GetAddrInfoW@16
+GetHostNameW@8
+GetNameInfoW@28
+InetNtopW@16
+InetPtonW@12
+ProcessSocketNotifications@28
+SetAddrInfoExA@48
+SetAddrInfoExW@48
+WEP@0
+WPUCompleteOverlappedRequest@20
+WPUGetProviderPathEx@20
+WSAAccept@20
+WSAAddressToStringA@20
+WSAAddressToStringW@20
+WSAAdvertiseProvider@8
+WSAAsyncGetHostByAddr@28
+WSAAsyncGetHostByName@20
+WSAAsyncGetProtoByName@20
+WSAAsyncGetProtoByNumber@20
+WSAAsyncGetServByName@24
+WSAAsyncGetServByPort@24
+WSAAsyncSelect@16
+WSACancelAsyncRequest@4
+WSACancelBlockingCall@0
+WSACleanup@0
+WSACloseEvent@4
+WSAConnect@28
+WSAConnectByList@32
+WSAConnectByNameA@36
+WSAConnectByNameW@36
+WSACreateEvent@0
+WSADuplicateSocketA@12
+WSADuplicateSocketW@12
+WSAEnumNameSpaceProvidersA@8
+WSAEnumNameSpaceProvidersExA@8
+WSAEnumNameSpaceProvidersExW@8
+WSAEnumNameSpaceProvidersW@8
+WSAEnumNetworkEvents@12
+WSAEnumProtocolsA@12
+WSAEnumProtocolsW@12
+WSAEventSelect@12
+WSAGetLastError@0
+WSAGetOverlappedResult@20
+WSAGetQOSByName@12
+WSAGetServiceClassInfoA@16
+WSAGetServiceClassInfoW@16
+WSAGetServiceClassNameByClassIdA@12
+WSAGetServiceClassNameByClassIdW@12
+WSAHtonl@12
+WSAHtons@12
+WSAInstallServiceClassA@4
+WSAInstallServiceClassW@4
+WSAIoctl@36
+WSAIsBlocking@0
+WSAJoinLeaf@32
+WSALookupServiceBeginA@12
+WSALookupServiceBeginW@12
+WSALookupServiceEnd@4
+WSALookupServiceNextA@16
+WSALookupServiceNextW@16
+WSANSPIoctl@32
+WSANtohl@12
+WSANtohs@12
+WSAPoll@12
+WSAProviderCompleteAsyncCall@8
+WSAProviderConfigChange@12
+WSARecv@28
+WSARecvDisconnect@8
+WSARecvFrom@36
+WSARemoveServiceClass@4
+WSAResetEvent@4
+WSASend@28
+WSASendDisconnect@8
+WSASendMsg@24
+WSASendTo@36
+WSASetBlockingHook@4
+WSASetEvent@4
+WSASetLastError@4
+WSASetServiceA@12
+WSASetServiceW@12
+WSASocketA@24
+WSASocketW@24
+WSAStartup@8
+WSAStringToAddressA@20
+WSAStringToAddressW@20
+WSAUnadvertiseProvider@4
+WSAUnhookBlockingHook@0
+WSAWaitForMultipleEvents@20
+WSApSetPostRoutine@4
+WSCDeinstallProvider@8
 F64(WSCDeinstallProvider32)
-WSCDeinstallProviderEx
-WSCEnableNSProvider
+WSCDeinstallProviderEx@12
+WSCEnableNSProvider@8
 F64(WSCEnableNSProvider32)
 F64(WSCEnumNameSpaceProviders32)
 F64(WSCEnumNameSpaceProvidersEx32)
-WSCEnumProtocols
-WSCEnumProtocolsEx
+WSCEnumProtocols@16
 F64(WSCEnumProtocols32)
-WSCGetApplicationCategory
-WSCGetApplicationCategoryEx
-WSCGetProviderInfo
+WSCEnumProtocolsEx@20
+WSCGetApplicationCategory@24
+WSCGetApplicationCategoryEx@28
+WSCGetProviderInfo@24
 F64(WSCGetProviderInfo32)
-WSCGetProviderPath
+WSCGetProviderPath@16
 F64(WSCGetProviderPath32)
-WSCInstallNameSpace
+WSCInstallNameSpace@20
 F64(WSCInstallNameSpace32)
-WSCInstallNameSpaceEx
-WSCInstallNameSpaceEx2
+WSCInstallNameSpaceEx@24
+WSCInstallNameSpaceEx2@28
 F64(WSCInstallNameSpaceEx32)
-WSCInstallProvider
+WSCInstallProvider@20
 F64(WSCInstallProvider64_32)
-WSCInstallProviderAndChains
+WSCInstallProviderAndChains@32
 F64(WSCInstallProviderAndChains64_32)
-WSCInstallProviderEx
-WSCSetApplicationCategory
-WSCSetApplicationCategoryEx
-WSCSetProviderInfo
+WSCInstallProviderEx@28
+WSCSetApplicationCategory@28
+WSCSetApplicationCategoryEx@32
+WSCSetProviderInfo@24
 F64(WSCSetProviderInfo32)
-WSCUnInstallNameSpace
+WSCUnInstallNameSpace@4
 F64(WSCUnInstallNameSpace32)
-WSCUnInstallNameSpaceEx2
-WSCUpdateProvider
+WSCUnInstallNameSpaceEx2@8
+WSCUpdateProvider@20
 F64(WSCUpdateProvider32)
-WSCUpdateProviderEx
-WSCWriteNameSpaceOrder
+WSCUpdateProviderEx@24
+WSCWriteNameSpaceOrder@8
 F64(WSCWriteNameSpaceOrder32)
-WSCWriteProviderOrder
+WSCWriteProviderOrder@8
 F64(WSCWriteProviderOrder32)
-WSCWriteProviderOrderEx
-WahCloseApcHelper
-__WSAFDIsSet
-WahCloseHandleHelper
-WahCloseNotificationHandleHelper
-WahCloseSocketHandle
-WahCloseThread
-WahCompleteRequest
-WahCreateHandleContextTable
-WahCreateNotificationHandle
-WahCreateSocketHandle
-WahDestroyHandleContextTable
-WahDisableNonIFSHandleSupport
-WahEnableNonIFSHandleSupport
-WahEnumerateHandleContexts
-WahInsertHandleContext
-WahNotifyAllProcesses
-WahOpenApcHelper
-WahOpenCurrentThread
-WahOpenHandleHelper
-WahOpenNotificationHandleHelper
-WahQueueUserApc
-WahReferenceContextByHandle
-WahRemoveHandleContext
-WahWaitForNotification
-WahWriteLSPEvent
-freeaddrinfo
-getaddrinfo
-getnameinfo
-inet_ntop
-inet_pton
-WEP
+WSCWriteProviderOrderEx@12
+WahCloseApcHelper@4
+WahCloseHandleHelper@4
+WahCloseNotificationHandleHelper@4
+WahCloseSocketHandle@8
+WahCloseThread@8
+WahCompleteRequest@20
+WahCreateHandleContextTable@4
+WahCreateNotificationHandle@8
+WahCreateSocketHandle@8
+WahDestroyHandleContextTable@4
+WahDisableNonIFSHandleSupport@0
+WahEnableNonIFSHandleSupport@0
+WahEnumerateHandleContexts@12
+WahInsertHandleContext@8
+WahNotifyAllProcesses@4
+WahOpenApcHelper@4
+WahOpenCurrentThread@8
+WahOpenHandleHelper@4
+WahOpenNotificationHandleHelper@4
+WahQueueUserApc@16
+WahReferenceContextByHandle@8
+WahRemoveHandleContext@8
+WahWaitForNotification@16
+WahWriteLSPEvent@8
+accept@12
+bind@12
+closesocket@4
+connect@12
+freeaddrinfo@4
+getaddrinfo@16
+gethostbyaddr@12
+gethostbyname@4
+gethostname@8
+getnameinfo@28
+getpeername@12
+getprotobyname@4
+getprotobynumber@4
+getservbyname@8
+getservbyport@8
+getsockname@12
+getsockopt@20
+htonl@4
+htons@4
+inet_addr@4
+inet_ntoa@4
+inet_ntop@16
+inet_pton@12
+ioctlsocket@12
+listen@8
+ntohl@4
+ntohs@4
+recv@16
+recvfrom@24
+select@20
+send@16
+sendto@24
+setsockopt@20
+shutdown@8
+socket@12

@@ -25,6 +25,7 @@ CLSIDFromProgIDEx@8
 CLSIDFromString@8
 CoAddRefServerProcess@0
 CoAllowSetForegroundWindow@8
+CoAllowUnmarshalerCLSID@4
 CoBuildVersion@0
 CoCancelCall@8
 CoCopyProxy@8
@@ -35,6 +36,8 @@ CoCreateInstanceEx@24
 CoCreateInstanceFromApp@24
 CoCreateObjectInContext@16
 CoDeactivateObject@8
+CoDecodeProxy@16
+CoDecrementMTAUsage@4
 CoDisableCallCancellation@4
 CoDisconnectContext@4
 CoDisconnectObject@8
@@ -77,7 +80,9 @@ CoGetState@4
 CoGetStdMarshalEx@12
 CoGetSystemSecurityPermissions@8
 CoGetTreatAsClass@8
+CoHandlePriorityEventsFromMessagePump@0
 CoImpersonateClient@0
+CoIncrementMTAUsage@4
 CoInitialize@4
 CoInitializeEx@8
 CoInitializeSecurity@36
@@ -98,6 +103,7 @@ CoQueryClientBlanket@28
 CoQueryProxyBlanket@32
 CoQueryReleaseObject@4
 CoReactivateObject@8
+CoRegisterActivationFilter@4
 CoRegisterChannelHook@8
 CoRegisterClassObject@20
 CoRegisterInitializeSpy@8
@@ -115,6 +121,7 @@ CoRevokeClassObject@4
 CoRevokeInitializeSpy@8
 CoRevokeMallocSpy@0
 CoSetCancelObject@4
+CoSetMessageDispatcher@4
 CoSetProxyBlanket@32
 CoSetState@4
 CoSuspendClassObjects@0
@@ -129,6 +136,7 @@ CoUnloadingWOW@4
 CoUnmarshalHresult@8
 CoUnmarshalInterface@12
 CoWaitForMultipleHandles@20
+CoWaitForMultipleObjects@20
 ComPs_NdrDllCanUnloadNow@4
 ComPs_NdrDllGetClassObject@24
 ComPs_NdrDllRegisterProxy@20
@@ -157,6 +165,7 @@ DoDragDrop@16
 EnableHookObject@8
 FmtIdToPropStgName@8
 FreePropVariantArray@8
+GetActiveObjectExt@12
 GetClassFile@8
 GetConvertStg@4
 GetDocumentBitStg@4
@@ -205,6 +214,10 @@ HMETAFILE_UserFree@8
 HMETAFILE_UserMarshal@12
 HMETAFILE_UserSize@12
 HMETAFILE_UserUnmarshal@12
+HMONITOR_UserFree@8
+HMONITOR_UserMarshal@12
+HMONITOR_UserSize@12
+HMONITOR_UserUnmarshal@12
 HPALETTE_UserFree@8
 HPALETTE_UserMarshal@12
 HPALETTE_UserSize@12
@@ -288,11 +301,14 @@ OleBuildVersion@0
 OleConvertIStorageToOLESTREAM@8
 OleConvertIStorageToOLESTREAMEx@28
 OleConvertOLESTREAMToIStorage@12
+OleConvertOLESTREAMToIStorage2@24
 OleConvertOLESTREAMToIStorageEx@28
+OleConvertOLESTREAMToIStorageEx2@40
 OleCreate@28
 OleCreateDefaultHandler@16
 OleCreateEmbeddingHelper@24
 OleCreateEx@48
+OleCreateFontIndirectExt@12
 OleCreateFromData@28
 OleCreateFromDataEx@48
 OleCreateFromFile@32
@@ -304,6 +320,8 @@ OleCreateLinkFromDataEx@48
 OleCreateLinkToFile@28
 OleCreateLinkToFileEx@48
 OleCreateMenuDescriptor@8
+OleCreatePictureIndirectExt@16
+OleCreatePropertyFrameIndirectExt@4
 OleCreateStaticFromData@28
 OleDestroyMenuDescriptor@4
 OleDoAutoConvert@8
@@ -312,14 +330,19 @@ OleDuplicateData@12
 OleFlushClipboard@0
 OleGetAutoConvert@8
 OleGetClipboard@4
+OleGetClipboardWithEnterpriseInfo@20
 OleGetIconOfClass@12
 OleGetIconOfFile@8
+OleIconToCursorExt@8
 OleInitialize@4
 OleInitializeWOW@8
 OleIsCurrentClipboard@4
 OleIsRunning@4
 OleLoad@16
 OleLoadFromStream@12
+OleLoadPictureExt@32
+OleLoadPictureFileExt@32
+OleLoadPicturePathExt@24
 OleLockRunning@12
 OleMetafilePictFromIconAndLabel@16
 OleNoteObjectVisible@8
@@ -331,12 +354,14 @@ OleRegGetMiscStatus@12
 OleRegGetUserType@12
 OleRun@4
 OleSave@12
+OleSavePictureFileExt@8
 OleSaveToStream@8
 OleSetAutoConvert@8
 OleSetClipboard@4
 OleSetContainedObject@8
 OleSetMenuDescriptor@20
 OleTranslateAccelerator@12
+OleTranslateColorExt@12
 OleUninitialize@0
 OpenOrCreateStream@12
 ProgIDFromCLSID@8
@@ -350,9 +375,12 @@ ReadClassStm@8
 ReadFmtUserTypeStg@12
 ReadOleStg@24
 ReadStringStream@8
+RegisterActiveObjectExt@16
 RegisterDragDrop@8
 ReleaseStgMedium@4
+RevokeActiveObjectExt@8
 RevokeDragDrop@4
+RoGetAgileReference@16
 SNB_UserFree@8
 SNB_UserMarshal@12
 SNB_UserSize@12

@@ -1,188 +0,0 @@
-;
-; Definition file of WS2_32.dll
-; Automatic generated by gendef
-; written by Kai Tietz 2008
-;
-LIBRARY "WS2_32.dll"
-EXPORTS
-accept@12
-bind@12
-closesocket@4
-connect@12
-getpeername@12
-getsockname@12
-getsockopt@20
-htonl@4
-htons@4
-ioctlsocket@12
-inet_addr@4
-inet_ntoa@4
-listen@8
-ntohl@4
-ntohs@4
-recv@16
-recvfrom@24
-select@20
-send@16
-sendto@24
-setsockopt@20
-shutdown@8
-socket@12
-WSApSetPostRoutine@4
-FreeAddrInfoEx@4
-FreeAddrInfoExW@4
-FreeAddrInfoW@4
-GetAddrInfoExA@40
-GetAddrInfoExCancel@4
-GetAddrInfoExOverlappedResult@4
-GetAddrInfoExW@40
-GetAddrInfoW@16
-GetHostNameW@8
-GetNameInfoW@28
-InetNtopW@16
-InetPtonW@12
-ProcessSocketNotifications@28
-SetAddrInfoExA@48
-SetAddrInfoExW@48
-WPUCompleteOverlappedRequest@20
-WPUGetProviderPathEx@20
-WSAAccept@20
-WSAAddressToStringA@20
-WSAAddressToStringW@20
-WSAAdvertiseProvider@8
-WSACloseEvent@4
-WSAConnect@28
-WSAConnectByList@32
-WSAConnectByNameA@36
-WSAConnectByNameW@36
-WSACreateEvent@0
-WSADuplicateSocketA@12
-WSADuplicateSocketW@12
-WSAEnumNameSpaceProvidersA@8
-WSAEnumNameSpaceProvidersExA@8
-gethostbyaddr@12
-gethostbyname@4
-getprotobyname@4
-getprotobynumber@4
-getservbyname@8
-getservbyport@8
-gethostname@8
-WSAEnumNameSpaceProvidersExW@8
-WSAEnumNameSpaceProvidersW@8
-WSAEnumNetworkEvents@12
-WSAEnumProtocolsA@12
-WSAEnumProtocolsW@12
-WSAEventSelect@12
-WSAGetOverlappedResult@20
-WSAGetQOSByName@12
-WSAGetServiceClassInfoA@16
-WSAGetServiceClassInfoW@16
-WSAGetServiceClassNameByClassIdA@12
-WSAGetServiceClassNameByClassIdW@12
-WSAHtonl@12
-WSAHtons@12
-WSAInstallServiceClassA@4
-WSAInstallServiceClassW@4
-WSAIoctl@36
-WSAJoinLeaf@32
-WSALookupServiceBeginA@12
-WSALookupServiceBeginW@12
-WSALookupServiceEnd@4
-WSALookupServiceNextA@16
-WSALookupServiceNextW@16
-WSANSPIoctl@32
-WSANtohl@12
-WSANtohs@12
-WSAPoll@12
-WSAProviderCompleteAsyncCall@8
-WSAProviderConfigChange@12
-WSARecv@28
-WSARecvDisconnect@8
-WSARecvFrom@36
-WSARemoveServiceClass@4
-WSAResetEvent@4
-WSASend@28
-WSASendDisconnect@8
-WSASendMsg@24
-WSASendTo@36
-WSASetEvent@4
-WSASetServiceA@12
-WSASetServiceW@12
-WSASocketA@24
-WSASocketW@24
-WSAAsyncSelect@16
-WSAAsyncGetHostByAddr@28
-WSAAsyncGetHostByName@20
-WSAAsyncGetProtoByNumber@20
-WSAAsyncGetProtoByName@20
-WSAAsyncGetServByPort@24
-WSAAsyncGetServByName@24
-WSACancelAsyncRequest@4
-WSASetBlockingHook@4
-WSAUnhookBlockingHook@0
-WSAGetLastError@0
-WSASetLastError@4
-WSACancelBlockingCall@0
-WSAIsBlocking@0
-WSAStartup@8
-WSACleanup@0
-WSAStringToAddressA@20
-WSAStringToAddressW@20
-WSAUnadvertiseProvider@4
-WSAWaitForMultipleEvents@20
-WSCDeinstallProvider@8
-WSCDeinstallProviderEx@12
-WSCEnableNSProvider@8
-WSCEnumProtocols@16
-WSCEnumProtocolsEx@20
-WSCGetApplicationCategory@24
-WSCGetApplicationCategoryEx@28
-WSCGetProviderInfo@24
-WSCGetProviderPath@16
-WSCInstallNameSpace@20
-WSCInstallNameSpaceEx2@28
-WSCInstallNameSpaceEx@24
-WSCInstallProvider@20
-WSCInstallProviderAndChains@32
-WSCInstallProviderEx@28
-WSCSetApplicationCategory@28
-WSCSetApplicationCategoryEx@32
-WSCSetProviderInfo@24
-WSCUnInstallNameSpace@4
-WSCUnInstallNameSpaceEx2@8
-WSCUpdateProvider@20
-WSCUpdateProviderEx@24
-WSCWriteNameSpaceOrder@8
-WSCWriteProviderOrder@8
-WSCWriteProviderOrderEx@12
-WahCloseApcHelper@4
-WahCloseHandleHelper@4
-WahCloseNotificationHandleHelper@4
-WahCloseSocketHandle@8
-WahCloseThread@8
-WahCompleteRequest@20
-WahCreateHandleContextTable@4
-WahCreateNotificationHandle@8
-WahCreateSocketHandle@8
-WahDestroyHandleContextTable@4
-WahDisableNonIFSHandleSupport@0
-WahEnableNonIFSHandleSupport@0
-WahEnumerateHandleContexts@12
-WahInsertHandleContext@8
-__WSAFDIsSet@8
-WahNotifyAllProcesses@4
-WahOpenApcHelper@4
-WahOpenCurrentThread@8
-WahOpenHandleHelper@4
-WahOpenNotificationHandleHelper@4
-WahQueueUserApc@16
-WahReferenceContextByHandle@8
-WahRemoveHandleContext@8
-WahWaitForNotification@16
-WahWriteLSPEvent@8
-freeaddrinfo@4
-getaddrinfo@16
-getnameinfo@28
-inet_ntop@16
-inet_pton@12
-WEP@0