Alexandre Julliard : msvcrt: Don't export the __p__* functions on 64-bit.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 52bff1fdfe3e041313654765a3b08891de6e9f84
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=52bff1fdfe3e041313654765a3b08891de6e9f84

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Apr 25 14:49:01 2019 +0200

msvcrt: Don't export the __p__* functions on 64-bit.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msvcrt/msvcrt.spec     | 56 ++++++++++++++++++++++-----------------------
 dlls/msvcrt20/msvcrt20.spec | 48 +++++++++++++++++++-------------------
 dlls/msvcrt40/msvcrt40.spec | 50 ++++++++++++++++++++--------------------
 3 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 5be4b4c..7958a7a 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -245,35 +245,35 @@
 @ cdecl -arch=i386 -norelay __libm_sse2_tan() MSVCRT___libm_sse2_tan
 @ cdecl -arch=i386 -norelay __libm_sse2_tanf() MSVCRT___libm_sse2_tanf
 @ extern __mb_cur_max MSVCRT___mb_cur_max
-@ cdecl __p___argc() MSVCRT___p___argc
-@ cdecl __p___argv() MSVCRT___p___argv
-@ cdecl __p___initenv()
-@ cdecl __p___mb_cur_max()
-@ cdecl __p___wargv() MSVCRT___p___wargv
-@ cdecl __p___winitenv()
-@ cdecl __p__acmdln() MSVCRT___p__acmdln
-@ cdecl __p__amblksiz()
-@ cdecl __p__commode()
-@ cdecl __p__daylight() MSVCRT___p__daylight
-@ cdecl __p__dstbias() MSVCRT___p__dstbias
-@ cdecl __p__environ() MSVCRT___p__environ
-@ stub __p__fileinfo()
-@ cdecl __p__fmode() MSVCRT___p__fmode
+@ cdecl -arch=win32 __p___argc() MSVCRT___p___argc
+@ cdecl -arch=win32 __p___argv() MSVCRT___p___argv
+@ cdecl -arch=win32 __p___initenv()
+@ cdecl -arch=win32 __p___mb_cur_max()
+@ cdecl -arch=win32 __p___wargv() MSVCRT___p___wargv
+@ cdecl -arch=win32 __p___winitenv()
+@ cdecl -arch=win32 __p__acmdln() MSVCRT___p__acmdln
+@ cdecl -arch=win32 __p__amblksiz()
+@ cdecl -arch=win32 __p__commode()
+@ cdecl -arch=win32 __p__daylight() MSVCRT___p__daylight
+@ cdecl -arch=win32 __p__dstbias() MSVCRT___p__dstbias
+@ cdecl -arch=win32 __p__environ() MSVCRT___p__environ
+@ stub -arch=win32 __p__fileinfo()
+@ cdecl -arch=win32 __p__fmode() MSVCRT___p__fmode
 @ cdecl __p__iob()
-@ stub __p__mbcasemap()
-@ cdecl __p__mbctype()
-@ cdecl __p__osver()
-@ cdecl __p__pctype() MSVCRT___p__pctype
-@ cdecl __p__pgmptr() MSVCRT___p__pgmptr
-@ stub __p__pwctype()
-@ cdecl __p__timezone() MSVCRT___p__timezone
-@ cdecl __p__tzname()
-@ cdecl __p__wcmdln() MSVCRT___p__wcmdln
-@ cdecl __p__wenviron() MSVCRT___p__wenviron
-@ cdecl __p__winmajor()
-@ cdecl __p__winminor()
-@ cdecl __p__winver()
-@ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr
+@ stub -arch=win32 __p__mbcasemap()
+@ cdecl -arch=win32 __p__mbctype()
+@ cdecl -arch=win32 __p__osver()
+@ cdecl -arch=win32 __p__pctype() MSVCRT___p__pctype
+@ cdecl -arch=win32 __p__pgmptr() MSVCRT___p__pgmptr
+@ stub -arch=win32 __p__pwctype()
+@ cdecl -arch=win32 __p__timezone() MSVCRT___p__timezone
+@ cdecl -arch=win32 __p__tzname()
+@ cdecl -arch=win32 __p__wcmdln() MSVCRT___p__wcmdln
+@ cdecl -arch=win32 __p__wenviron() MSVCRT___p__wenviron
+@ cdecl -arch=win32 __p__winmajor()
+@ cdecl -arch=win32 __p__winminor()
+@ cdecl -arch=win32 __p__winver()
+@ cdecl -arch=win32 __p__wpgmptr() MSVCRT___p__wpgmptr
 @ cdecl __pctype_func() MSVCRT___pctype_func
 @ extern __pioinfo MSVCRT___pioinfo
 # stub __pwctype_func()
diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec
index 84a1014..f9d36a9 100644
--- a/dlls/msvcrt20/msvcrt20.spec
+++ b/dlls/msvcrt20/msvcrt20.spec
@@ -808,32 +808,32 @@
 @ cdecl __iscsymf(long) msvcrt.__iscsymf
 @ cdecl __lconv_init() msvcrt.__lconv_init
 @ extern __mb_cur_max msvcrt.__mb_cur_max
-@ cdecl __p___argc() msvcrt.__p___argc
-@ cdecl __p___argv() msvcrt.__p___argv
-@ cdecl __p___initenv() msvcrt.__p___initenv
-@ cdecl __p___mb_cur_max() msvcrt.__p___mb_cur_max
-@ cdecl __p___wargv() msvcrt.__p___wargv
-@ cdecl __p___winitenv() msvcrt.__p___winitenv
-@ cdecl __p__acmdln() msvcrt.__p__acmdln
-@ cdecl __p__amblksiz() msvcrt.__p__amblksiz
-@ cdecl __p__commode() msvcrt.__p__commode
-@ cdecl __p__daylight() msvcrt.__p__daylight
-@ cdecl __p__environ() msvcrt.__p__environ
-@ cdecl __p__fmode() msvcrt.__p__fmode
+@ cdecl -arch=win32 __p___argc() msvcrt.__p___argc
+@ cdecl -arch=win32 __p___argv() msvcrt.__p___argv
+@ cdecl -arch=win32 __p___initenv() msvcrt.__p___initenv
+@ cdecl -arch=win32 __p___mb_cur_max() msvcrt.__p___mb_cur_max
+@ cdecl -arch=win32 __p___wargv() msvcrt.__p___wargv
+@ cdecl -arch=win32 __p___winitenv() msvcrt.__p___winitenv
+@ cdecl -arch=win32 __p__acmdln() msvcrt.__p__acmdln
+@ cdecl -arch=win32 __p__amblksiz() msvcrt.__p__amblksiz
+@ cdecl -arch=win32 __p__commode() msvcrt.__p__commode
+@ cdecl -arch=win32 __p__daylight() msvcrt.__p__daylight
+@ cdecl -arch=win32 __p__environ() msvcrt.__p__environ
+@ cdecl -arch=win32 __p__fmode() msvcrt.__p__fmode
 @ cdecl __p__iob() msvcrt.__p__iob
-@ cdecl __p__mbctype() msvcrt.__p__mbctype
-@ cdecl __p__osver() msvcrt.__p__osver
-@ cdecl __p__pctype() msvcrt.__p__pctype
-@ cdecl __p__pgmptr() msvcrt.__p__pgmptr
+@ cdecl -arch=win32 __p__mbctype() msvcrt.__p__mbctype
+@ cdecl -arch=win32 __p__osver() msvcrt.__p__osver
+@ cdecl -arch=win32 __p__pctype() msvcrt.__p__pctype
+@ cdecl -arch=win32 __p__pgmptr() msvcrt.__p__pgmptr
 @ cdecl __p__pwctype() msvcrt.__p__pwctype
-@ cdecl __p__timezone() msvcrt.__p__timezone
-@ cdecl __p__tzname() msvcrt.__p__tzname
-@ cdecl __p__wcmdln() msvcrt.__p__wcmdln
-@ cdecl __p__wenviron() msvcrt.__p__wenviron
-@ cdecl __p__winmajor() msvcrt.__p__winmajor
-@ cdecl __p__winminor() msvcrt.__p__winminor
-@ cdecl __p__winver() msvcrt.__p__winver
-@ cdecl __p__wpgmptr() msvcrt.__p__wpgmptr
+@ cdecl -arch=win32 __p__timezone() msvcrt.__p__timezone
+@ cdecl -arch=win32 __p__tzname() msvcrt.__p__tzname
+@ cdecl -arch=win32 __p__wcmdln() msvcrt.__p__wcmdln
+@ cdecl -arch=win32 __p__wenviron() msvcrt.__p__wenviron
+@ cdecl -arch=win32 __p__winmajor() msvcrt.__p__winmajor
+@ cdecl -arch=win32 __p__winminor() msvcrt.__p__winminor
+@ cdecl -arch=win32 __p__winver() msvcrt.__p__winver
+@ cdecl -arch=win32 __p__wpgmptr() msvcrt.__p__wpgmptr
 @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs
 @ cdecl __threadhandle() msvcrt.__threadhandle
 @ cdecl __threadid() msvcrt.__threadid
diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec
index e4ef8d7..f0269e7 100644
--- a/dlls/msvcrt40/msvcrt40.spec
+++ b/dlls/msvcrt40/msvcrt40.spec
@@ -886,33 +886,33 @@
 @ cdecl __iscsymf(long) msvcrt.__iscsymf
 @ cdecl __lconv_init() msvcrt.__lconv_init
 @ extern __mb_cur_max msvcrt.__mb_cur_max
-@ cdecl __p___argc() msvcrt.__p___argc
-@ cdecl __p___argv() msvcrt.__p___argv
-@ cdecl __p___initenv() msvcrt.__p___initenv
-@ cdecl __p___mb_cur_max() msvcrt.__p___mb_cur_max
-@ cdecl __p___wargv() msvcrt.__p___wargv
-@ cdecl __p___winitenv() msvcrt.__p___winitenv
-@ cdecl __p__acmdln() msvcrt.__p__acmdln
-@ cdecl __p__amblksiz() msvcrt.__p__amblksiz
-@ cdecl __p__commode() msvcrt.__p__commode
-@ cdecl __p__daylight() msvcrt.__p__daylight
-@ cdecl __p__dstbias() msvcrt.__p__dstbias
-@ cdecl __p__environ() msvcrt.__p__environ
-@ cdecl __p__fmode() msvcrt.__p__fmode
+@ cdecl -arch=win32 __p___argc() msvcrt.__p___argc
+@ cdecl -arch=win32 __p___argv() msvcrt.__p___argv
+@ cdecl -arch=win32 __p___initenv() msvcrt.__p___initenv
+@ cdecl -arch=win32 __p___mb_cur_max() msvcrt.__p___mb_cur_max
+@ cdecl -arch=win32 __p___wargv() msvcrt.__p___wargv
+@ cdecl -arch=win32 __p___winitenv() msvcrt.__p___winitenv
+@ cdecl -arch=win32 __p__acmdln() msvcrt.__p__acmdln
+@ cdecl -arch=win32 __p__amblksiz() msvcrt.__p__amblksiz
+@ cdecl -arch=win32 __p__commode() msvcrt.__p__commode
+@ cdecl -arch=win32 __p__daylight() msvcrt.__p__daylight
+@ cdecl -arch=win32 __p__dstbias() msvcrt.__p__dstbias
+@ cdecl -arch=win32 __p__environ() msvcrt.__p__environ
+@ cdecl -arch=win32 __p__fmode() msvcrt.__p__fmode
 @ cdecl __p__iob() msvcrt.__p__iob
-@ cdecl __p__mbctype() msvcrt.__p__mbctype
-@ cdecl __p__osver() msvcrt.__p__osver
-@ cdecl __p__pctype() msvcrt.__p__pctype
-@ cdecl __p__pgmptr() msvcrt.__p__pgmptr
+@ cdecl -arch=win32 __p__mbctype() msvcrt.__p__mbctype
+@ cdecl -arch=win32 __p__osver() msvcrt.__p__osver
+@ cdecl -arch=win32 __p__pctype() msvcrt.__p__pctype
+@ cdecl -arch=win32 __p__pgmptr() msvcrt.__p__pgmptr
 @ cdecl __p__pwctype() msvcrt.__p__pwctype
-@ cdecl __p__timezone() msvcrt.__p__timezone
-@ cdecl __p__tzname() msvcrt.__p__tzname
-@ cdecl __p__wcmdln() msvcrt.__p__wcmdln
-@ cdecl __p__wenviron() msvcrt.__p__wenviron
-@ cdecl __p__winmajor() msvcrt.__p__winmajor
-@ cdecl __p__winminor() msvcrt.__p__winminor
-@ cdecl __p__winver() msvcrt.__p__winver
-@ cdecl __p__wpgmptr() msvcrt.__p__wpgmptr
+@ cdecl -arch=win32 __p__timezone() msvcrt.__p__timezone
+@ cdecl -arch=win32 __p__tzname() msvcrt.__p__tzname
+@ cdecl -arch=win32 __p__wcmdln() msvcrt.__p__wcmdln
+@ cdecl -arch=win32 __p__wenviron() msvcrt.__p__wenviron
+@ cdecl -arch=win32 __p__winmajor() msvcrt.__p__winmajor
+@ cdecl -arch=win32 __p__winminor() msvcrt.__p__winminor
+@ cdecl -arch=win32 __p__winver() msvcrt.__p__winver
+@ cdecl -arch=win32 __p__wpgmptr() msvcrt.__p__wpgmptr
 @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs
 @ cdecl __set_app_type(long) msvcrt.__set_app_type
 @ cdecl __setusermatherr(ptr) msvcrt.__setusermatherr