From 89475918a182d8dbd7fb98bf8bb7cf78ea937607 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Wed, 16 Mar 2011 17:41:08 +0100
Subject: [PATCH] msvcrt: Export the __p_* functions on all platforms.

---
 dlls/msvcr100/msvcr100.spec | 42 ++++++++++++------------
 dlls/msvcr70/msvcr70.spec   | 52 +++++++++++++++---------------
 dlls/msvcr71/msvcr71.spec   | 58 ++++++++++++++++-----------------
 dlls/msvcr80/msvcr80.spec   | 52 +++++++++++++++---------------
 dlls/msvcr90/msvcr90.spec   | 44 ++++++++++++-------------
 dlls/msvcrt/msvcrt.spec     | 58 ++++++++++++++++-----------------
 dlls/msvcrt20/msvcrt20.spec | 52 +++++++++++++++---------------
 dlls/msvcrt40/msvcrt40.spec | 54 +++++++++++++++----------------
 dlls/msvcrtd/msvcrtd.spec   | 64 ++++++++++++++++++-------------------
 9 files changed, 238 insertions(+), 238 deletions(-)

diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 7f6ac97e5c9..473f6638def 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -435,29 +435,29 @@
 @ cdecl -arch=i386 __libm_sse2_tan() msvcrt.__libm_sse2_tan
 @ cdecl -arch=i386 __libm_sse2_tanf() msvcrt.__libm_sse2_tanf
 @ extern __mb_cur_max msvcrt.__mb_cur_max
-@ cdecl -arch=i386 __p___argc() msvcrt.__p___argc
-@ cdecl -arch=i386 __p___argv() msvcrt.__p___argv
-@ cdecl -arch=i386 __p___initenv() msvcrt.__p___initenv
-@ cdecl -arch=i386 __p___mb_cur_max() msvcrt.__p___mb_cur_max
-@ cdecl -arch=i386 __p___wargv() msvcrt.__p___wargv
-@ cdecl -arch=i386 __p___winitenv() msvcrt.__p___winitenv
-@ cdecl -arch=i386 __p__acmdln() msvcrt.__p__acmdln
-@ cdecl -arch=i386 __p__commode() msvcrt.__p__commode
-@ cdecl -arch=i386 __p__daylight() msvcrt.__p__daylight
-@ cdecl -arch=i386 __p__dstbias() msvcrt.__p__dstbias
-@ cdecl -arch=i386 __p__environ() msvcrt.__p__environ
-@ cdecl -arch=i386 __p__fmode() msvcrt.__p__fmode
-@ cdecl -arch=i386 __p__iob() msvcrt.__p__iob
+@ 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__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 __p__iob() msvcrt.__p__iob
 @ stub __p__mbcasemap
-@ cdecl -arch=i386 __p__mbctype() msvcrt.__p__mbctype
-@ cdecl -arch=i386 __p__pctype() msvcrt.__p__pctype
-@ cdecl -arch=i386 __p__pgmptr() msvcrt.__p__pgmptr
+@ cdecl __p__mbctype() msvcrt.__p__mbctype
+@ cdecl __p__pctype() msvcrt.__p__pctype
+@ cdecl __p__pgmptr() msvcrt.__p__pgmptr
 @ stub __p__pwctype
-@ cdecl -arch=i386 __p__timezone() msvcrt.__p__timezone
-@ cdecl -arch=i386 __p__tzname() msvcrt.__p__tzname
-@ cdecl -arch=i386 __p__wcmdln() msvcrt.__p__wcmdln
-@ cdecl -arch=i386 __p__wenviron() msvcrt.__p__wenviron
-@ cdecl -arch=i386 __p__wpgmptr() msvcrt.__p__wpgmptr
+@ 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__wpgmptr() msvcrt.__p__wpgmptr
 @ cdecl __pctype_func() msvcrt.__pctype_func
 @ extern __pioinfo msvcrt.__pioinfo
 @ stub __pwctype_func
diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec
index dc970849605..b1f0da64cfc 100644
--- a/dlls/msvcr70/msvcr70.spec
+++ b/dlls/msvcr70/msvcr70.spec
@@ -161,35 +161,35 @@
 @ extern __lc_handle msvcrt.__lc_handle
 @ cdecl __lconv_init() msvcrt.__lconv_init
 @ extern __mb_cur_max msvcrt.__mb_cur_max
-@ cdecl -arch=i386 __p___argc() msvcrt.__p___argc
-@ cdecl -arch=i386 __p___argv() msvcrt.__p___argv
-@ cdecl -arch=i386 __p___initenv() msvcrt.__p___initenv
-@ cdecl -arch=i386 __p___mb_cur_max() msvcrt.__p___mb_cur_max
-@ cdecl -arch=i386 __p___wargv() msvcrt.__p___wargv
-@ cdecl -arch=i386 __p___winitenv() msvcrt.__p___winitenv
-@ cdecl -arch=i386 __p__acmdln() msvcrt.__p__acmdln
-@ cdecl -arch=i386 __p__amblksiz() msvcrt.__p__amblksiz
-@ cdecl -arch=i386 __p__commode() msvcrt.__p__commode
-@ cdecl -arch=i386 __p__daylight() msvcrt.__p__daylight
-@ cdecl -arch=i386 __p__dstbias() msvcrt.__p__dstbias
-@ cdecl -arch=i386 __p__environ() msvcrt.__p__environ
+@ 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
 @ stub __p__fileinfo
-@ cdecl -arch=i386 __p__fmode() msvcrt.__p__fmode
-@ cdecl -arch=i386 __p__iob() msvcrt.__p__iob
+@ cdecl __p__fmode() msvcrt.__p__fmode
+@ cdecl __p__iob() msvcrt.__p__iob
 @ stub __p__mbcasemap
-@ cdecl -arch=i386 __p__mbctype() msvcrt.__p__mbctype
-@ cdecl -arch=i386 __p__osver() msvcrt.__p__osver
-@ cdecl -arch=i386 __p__pctype() msvcrt.__p__pctype
-@ cdecl -arch=i386 __p__pgmptr() msvcrt.__p__pgmptr
+@ cdecl __p__mbctype() msvcrt.__p__mbctype
+@ cdecl __p__osver() msvcrt.__p__osver
+@ cdecl __p__pctype() msvcrt.__p__pctype
+@ cdecl __p__pgmptr() msvcrt.__p__pgmptr
 @ stub __p__pwctype
-@ cdecl -arch=i386 __p__timezone() msvcrt.__p__timezone
-@ cdecl -arch=i386 __p__tzname() msvcrt.__p__tzname
-@ cdecl -arch=i386 __p__wcmdln() msvcrt.__p__wcmdln
-@ cdecl -arch=i386 __p__wenviron() msvcrt.__p__wenviron
-@ cdecl -arch=i386 __p__winmajor() msvcrt.__p__winmajor
-@ cdecl -arch=i386 __p__winminor() msvcrt.__p__winminor
-@ cdecl -arch=i386 __p__winver() msvcrt.__p__winver
-@ cdecl -arch=i386 __p__wpgmptr() msvcrt.__p__wpgmptr
+@ 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 __pctype_func() msvcrt.__pctype_func
 @ extern __pioinfo msvcrt.__pioinfo
 @ stub __pwctype_func
diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec
index 7959334a7cf..9a6018cfe95 100644
--- a/dlls/msvcr71/msvcr71.spec
+++ b/dlls/msvcr71/msvcr71.spec
@@ -156,35 +156,35 @@
 @ extern __lc_handle msvcrt.__lc_handle
 @ cdecl __lconv_init() msvcrt.__lconv_init
 @ extern __mb_cur_max msvcrt.__mb_cur_max
-@ cdecl -arch=i386 __p___argc() msvcrt.__p___argc
-@ cdecl -arch=i386 __p___argv() msvcrt.__p___argv
-@ cdecl -arch=i386 __p___initenv() msvcrt.__p___initenv
-@ cdecl -arch=i386 __p___mb_cur_max() msvcrt.__p___mb_cur_max
-@ cdecl -arch=i386 __p___wargv() msvcrt.__p___wargv
-@ cdecl -arch=i386 __p___winitenv() msvcrt.__p___winitenv
-@ cdecl -arch=i386 __p__acmdln() msvcrt.__p__acmdln
-@ cdecl -arch=i386 __p__amblksiz() msvcrt.__p__amblksiz
-@ cdecl -arch=i386 __p__commode() msvcrt.__p__commode
-@ cdecl -arch=i386 __p__daylight() msvcrt.__p__daylight
-@ cdecl -arch=i386 __p__dstbias() msvcrt.__p__dstbias
-@ cdecl -arch=i386 __p__environ() msvcrt.__p__environ
-@ cdecl -arch=i386 __p__fileinfo() msvcrt.__p__fileinfo
-@ cdecl -arch=i386 __p__fmode() msvcrt.__p__fmode
-@ cdecl -arch=i386 __p__iob() msvcrt.__p__iob
-@ cdecl -arch=i386 __p__mbcasemap() msvcrt.__p__mbcasemap
-@ cdecl -arch=i386 __p__mbctype() msvcrt.__p__mbctype
-@ cdecl -arch=i386 __p__osver() msvcrt.__p__osver
-@ cdecl -arch=i386 __p__pctype() msvcrt.__p__pctype
-@ cdecl -arch=i386 __p__pgmptr() msvcrt.__p__pgmptr
-@ cdecl -arch=i386 __p__pwctype() msvcrt.__p__pwctype
-@ cdecl -arch=i386 __p__timezone() msvcrt.__p__timezone
-@ cdecl -arch=i386 __p__tzname() msvcrt.__p__tzname
-@ cdecl -arch=i386 __p__wcmdln() msvcrt.__p__wcmdln
-@ cdecl -arch=i386 __p__wenviron() msvcrt.__p__wenviron
-@ cdecl -arch=i386 __p__winmajor() msvcrt.__p__winmajor
-@ cdecl -arch=i386 __p__winminor() msvcrt.__p__winminor
-@ cdecl -arch=i386 __p__winver() msvcrt.__p__winver
-@ cdecl -arch=i386 __p__wpgmptr() msvcrt.__p__wpgmptr
+@ 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__fileinfo() msvcrt.__p__fileinfo
+@ cdecl __p__fmode() msvcrt.__p__fmode
+@ cdecl __p__iob() msvcrt.__p__iob
+@ cdecl __p__mbcasemap() msvcrt.__p__mbcasemap
+@ 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 __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 __pctype_func() msvcrt.__pctype_func
 @ extern __pioinfo msvcrt.__pioinfo
 @ stub __pwctype_func
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index e4cf5cd184d..9da91db6894 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -253,35 +253,35 @@
 @ cdecl -arch=i386 __libm_sse2_tan() msvcrt.__libm_sse2_tan
 @ cdecl -arch=i386 __libm_sse2_tanf() msvcrt.__libm_sse2_tanf
 @ extern __mb_cur_max msvcrt.__mb_cur_max
-@ cdecl -arch=i386 __p___argc() msvcrt.__p___argc
-@ cdecl -arch=i386 __p___argv() msvcrt.__p___argv
-@ cdecl -arch=i386 __p___initenv() msvcrt.__p___initenv
-@ cdecl -arch=i386 __p___mb_cur_max() msvcrt.__p___mb_cur_max
-@ cdecl -arch=i386 __p___wargv() msvcrt.__p___wargv
-@ cdecl -arch=i386 __p___winitenv() msvcrt.__p___winitenv
-@ cdecl -arch=i386 __p__acmdln() msvcrt.__p__acmdln
-@ cdecl -arch=i386 __p__amblksiz() msvcrt.__p__amblksiz
-@ cdecl -arch=i386 __p__commode() msvcrt.__p__commode
-@ cdecl -arch=i386 __p__daylight() msvcrt.__p__daylight
-@ cdecl -arch=i386 __p__dstbias() msvcrt.__p__dstbias
-@ cdecl -arch=i386 __p__environ() msvcrt.__p__environ
-@ cdecl -arch=i386 __p__fmode() msvcrt.__p__fmode
-@ cdecl -arch=i386 __p__iob() msvcrt.__p__iob
+@ 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 __p__iob() msvcrt.__p__iob
 @ stub __p__mbcasemap
-@ cdecl -arch=i386 __p__mbctype() msvcrt.__p__mbctype
+@ cdecl __p__mbctype() msvcrt.__p__mbctype
 @ stub __p__osplatform
-@ cdecl -arch=i386 __p__osver() msvcrt.__p__osver
-@ cdecl -arch=i386 __p__pctype() msvcrt.__p__pctype
-@ cdecl -arch=i386 __p__pgmptr() msvcrt.__p__pgmptr
+@ cdecl __p__osver() msvcrt.__p__osver
+@ cdecl __p__pctype() msvcrt.__p__pctype
+@ cdecl __p__pgmptr() msvcrt.__p__pgmptr
 @ stub __p__pwctype
-@ cdecl -arch=i386 __p__timezone() msvcrt.__p__timezone
-@ cdecl -arch=i386 __p__tzname() msvcrt.__p__tzname
-@ cdecl -arch=i386 __p__wcmdln() msvcrt.__p__wcmdln
-@ cdecl -arch=i386 __p__wenviron() msvcrt.__p__wenviron
-@ cdecl -arch=i386 __p__winmajor() msvcrt.__p__winmajor
-@ cdecl -arch=i386 __p__winminor() msvcrt.__p__winminor
-@ cdecl -arch=i386 __p__winver() msvcrt.__p__winver
-@ cdecl -arch=i386 __p__wpgmptr() msvcrt.__p__wpgmptr
+@ 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 __pctype_func() msvcrt.__pctype_func
 @ extern __pioinfo msvcrt.__pioinfo
 @ stub __pwctype_func
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 515a6bd3af1..96d4589c268 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -250,30 +250,30 @@
 @ cdecl -arch=i386 __libm_sse2_tan() msvcrt.__libm_sse2_tan
 @ cdecl -arch=i386 __libm_sse2_tanf() msvcrt.__libm_sse2_tanf
 @ extern __mb_cur_max msvcrt.__mb_cur_max
-@ cdecl -arch=i386 __p___argc() msvcrt.__p___argc
-@ cdecl -arch=i386 __p___argv() msvcrt.__p___argv
-@ cdecl -arch=i386 __p___initenv() msvcrt.__p___initenv
-@ cdecl -arch=i386 __p___mb_cur_max() msvcrt.__p___mb_cur_max
-@ cdecl -arch=i386 __p___wargv() msvcrt.__p___wargv
-@ cdecl -arch=i386 __p___winitenv() msvcrt.__p___winitenv
-@ cdecl -arch=i386 __p__acmdln() msvcrt.__p__acmdln
-@ cdecl -arch=i386 __p__amblksiz() msvcrt.__p__amblksiz
-@ cdecl -arch=i386 __p__commode() msvcrt.__p__commode
-@ cdecl -arch=i386 __p__daylight() msvcrt.__p__daylight
-@ cdecl -arch=i386 __p__dstbias() msvcrt.__p__dstbias
-@ cdecl -arch=i386 __p__environ() msvcrt.__p__environ
-@ cdecl -arch=i386 __p__fmode() msvcrt.__p__fmode
-@ cdecl -arch=i386 __p__iob() msvcrt.__p__iob
+@ 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 __p__iob() msvcrt.__p__iob
 @ stub __p__mbcasemap
-@ cdecl -arch=i386 __p__mbctype() msvcrt.__p__mbctype
-@ cdecl -arch=i386 __p__pctype() msvcrt.__p__pctype
-@ cdecl -arch=i386 __p__pgmptr() msvcrt.__p__pgmptr
+@ cdecl __p__mbctype() msvcrt.__p__mbctype
+@ cdecl __p__pctype() msvcrt.__p__pctype
+@ cdecl __p__pgmptr() msvcrt.__p__pgmptr
 @ stub __p__pwctype
-@ cdecl -arch=i386 __p__timezone() msvcrt.__p__timezone
-@ cdecl -arch=i386 __p__tzname() msvcrt.__p__tzname
-@ cdecl -arch=i386 __p__wcmdln() msvcrt.__p__wcmdln
-@ cdecl -arch=i386 __p__wenviron() msvcrt.__p__wenviron
-@ cdecl -arch=i386 __p__wpgmptr() msvcrt.__p__wpgmptr
+@ 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__wpgmptr() msvcrt.__p__wpgmptr
 @ cdecl __pctype_func() msvcrt.__pctype_func
 @ extern __pioinfo msvcrt.__pioinfo
 @ stub __pwctype_func
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 1438dfa0b0a..c324dea37a9 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -218,35 +218,35 @@
 @ cdecl -arch=i386 __libm_sse2_tan()
 @ cdecl -arch=i386 __libm_sse2_tanf()
 @ extern __mb_cur_max MSVCRT___mb_cur_max
-@ cdecl -arch=i386 __p___argc()
-@ cdecl -arch=i386 __p___argv()
-@ cdecl -arch=i386 __p___initenv()
-@ cdecl -arch=i386 __p___mb_cur_max() MSVCRT____mb_cur_max_func
-@ cdecl -arch=i386 __p___wargv()
-@ cdecl -arch=i386 __p___winitenv()
-@ cdecl -arch=i386 __p__acmdln()
-@ cdecl -arch=i386 __p__amblksiz()
-@ cdecl -arch=i386 __p__commode()
-@ cdecl -arch=i386 __p__daylight() MSVCRT___p__daylight
-@ cdecl -arch=i386 __p__dstbias()
-@ cdecl -arch=i386 __p__environ()
-@ stub -arch=i386 __p__fileinfo #()
-@ cdecl -arch=i386 __p__fmode()
-@ cdecl -arch=i386 __p__iob() MSVCRT___iob_func
-@ stub -arch=i386 __p__mbcasemap #()
-@ cdecl -arch=i386 __p__mbctype()
-@ cdecl -arch=i386 __p__osver()
-@ cdecl -arch=i386 __p__pctype() MSVCRT___pctype_func
-@ cdecl -arch=i386 __p__pgmptr()
-@ stub -arch=i386 __p__pwctype #()
-@ cdecl -arch=i386 __p__timezone() MSVCRT___p__timezone
-@ cdecl -arch=i386 __p__tzname()
-@ cdecl -arch=i386 __p__wcmdln()
-@ cdecl -arch=i386 __p__wenviron()
-@ cdecl -arch=i386 __p__winmajor()
-@ cdecl -arch=i386 __p__winminor()
-@ cdecl -arch=i386 __p__winver()
-@ cdecl -arch=i386 __p__wpgmptr()
+@ cdecl __p___argc()
+@ cdecl __p___argv()
+@ cdecl __p___initenv()
+@ cdecl __p___mb_cur_max() MSVCRT____mb_cur_max_func
+@ cdecl __p___wargv()
+@ cdecl __p___winitenv()
+@ cdecl __p__acmdln()
+@ cdecl __p__amblksiz()
+@ cdecl __p__commode()
+@ cdecl __p__daylight() MSVCRT___p__daylight
+@ cdecl __p__dstbias()
+@ cdecl __p__environ()
+@ stub __p__fileinfo #()
+@ cdecl __p__fmode()
+@ cdecl __p__iob() MSVCRT___iob_func
+@ stub __p__mbcasemap #()
+@ cdecl __p__mbctype()
+@ cdecl __p__osver()
+@ cdecl __p__pctype() MSVCRT___pctype_func
+@ cdecl __p__pgmptr()
+@ stub __p__pwctype #()
+@ cdecl __p__timezone() MSVCRT___p__timezone
+@ cdecl __p__tzname()
+@ cdecl __p__wcmdln()
+@ cdecl __p__wenviron()
+@ cdecl __p__winmajor()
+@ cdecl __p__winminor()
+@ cdecl __p__winver()
+@ cdecl __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 62c208d321b..5aebddce65d 100644
--- a/dlls/msvcrt20/msvcrt20.spec
+++ b/dlls/msvcrt20/msvcrt20.spec
@@ -476,32 +476,32 @@
 @ cdecl __iscsymf(long) msvcrt.__iscsymf
 @ cdecl __lconv_init() msvcrt.__lconv_init
 @ extern __mb_cur_max msvcrt.__mb_cur_max
-@ cdecl -arch=i386 __p___argc() msvcrt.__p___argc
-@ cdecl -arch=i386 __p___argv() msvcrt.__p___argv
-@ cdecl -arch=i386 __p___initenv() msvcrt.__p___initenv
-@ cdecl -arch=i386 __p___mb_cur_max() msvcrt.__p___mb_cur_max
-@ cdecl -arch=i386 __p___wargv() msvcrt.__p___wargv
-@ cdecl -arch=i386 __p___winitenv() msvcrt.__p___winitenv
-@ cdecl -arch=i386 __p__acmdln() msvcrt.__p__acmdln
-@ cdecl -arch=i386 __p__amblksiz() msvcrt.__p__amblksiz
-@ cdecl -arch=i386 __p__commode() msvcrt.__p__commode
-@ cdecl -arch=i386 __p__daylight() msvcrt.__p__daylight
-@ cdecl -arch=i386 __p__environ() msvcrt.__p__environ
-@ cdecl -arch=i386 __p__fmode() msvcrt.__p__fmode
-@ cdecl -arch=i386 __p__iob() msvcrt.__p__iob
-@ cdecl -arch=i386 __p__mbctype() msvcrt.__p__mbctype
-@ cdecl -arch=i386 __p__osver() msvcrt.__p__osver
-@ cdecl -arch=i386 __p__pctype() msvcrt.__p__pctype
-@ cdecl -arch=i386 __p__pgmptr() msvcrt.__p__pgmptr
-@ cdecl -arch=i386 __p__pwctype() msvcrt.__p__pwctype
-@ cdecl -arch=i386 __p__timezone() msvcrt.__p__timezone
-@ cdecl -arch=i386 __p__tzname() msvcrt.__p__tzname
-@ cdecl -arch=i386 __p__wcmdln() msvcrt.__p__wcmdln
-@ cdecl -arch=i386 __p__wenviron() msvcrt.__p__wenviron
-@ cdecl -arch=i386 __p__winmajor() msvcrt.__p__winmajor
-@ cdecl -arch=i386 __p__winminor() msvcrt.__p__winminor
-@ cdecl -arch=i386 __p__winver() msvcrt.__p__winver
-@ cdecl -arch=i386 __p__wpgmptr() msvcrt.__p__wpgmptr
+@ 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 __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 __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 __pxcptinfoptrs() msvcrt.__pxcptinfoptrs
 @ cdecl __threadhandle() msvcrt.__threadhandle
 @ cdecl __threadid() msvcrt.__threadid
diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec
index c7a8f942565..016dad95b33 100644
--- a/dlls/msvcrt40/msvcrt40.spec
+++ b/dlls/msvcrt40/msvcrt40.spec
@@ -548,33 +548,33 @@
 @ cdecl __iscsymf(long) msvcrt.__iscsymf
 @ cdecl __lconv_init() msvcrt.__lconv_init
 @ extern __mb_cur_max msvcrt.__mb_cur_max
-@ cdecl -arch=i386 __p___argc() msvcrt.__p___argc
-@ cdecl -arch=i386 __p___argv() msvcrt.__p___argv
-@ cdecl -arch=i386 __p___initenv() msvcrt.__p___initenv
-@ cdecl -arch=i386 __p___mb_cur_max() msvcrt.__p___mb_cur_max
-@ cdecl -arch=i386 __p___wargv() msvcrt.__p___wargv
-@ cdecl -arch=i386 __p___winitenv() msvcrt.__p___winitenv
-@ cdecl -arch=i386 __p__acmdln() msvcrt.__p__acmdln
-@ cdecl -arch=i386 __p__amblksiz() msvcrt.__p__amblksiz
-@ cdecl -arch=i386 __p__commode() msvcrt.__p__commode
-@ cdecl -arch=i386 __p__daylight() msvcrt.__p__daylight
-@ cdecl -arch=i386 __p__dstbias() msvcrt.__p__dstbias
-@ cdecl -arch=i386 __p__environ() msvcrt.__p__environ
-@ cdecl -arch=i386 __p__fmode() msvcrt.__p__fmode
-@ cdecl -arch=i386 __p__iob() msvcrt.__p__iob
-@ cdecl -arch=i386 __p__mbctype() msvcrt.__p__mbctype
-@ cdecl -arch=i386 __p__osver() msvcrt.__p__osver
-@ cdecl -arch=i386 __p__pctype() msvcrt.__p__pctype
-@ cdecl -arch=i386 __p__pgmptr() msvcrt.__p__pgmptr
-@ cdecl -arch=i386 __p__pwctype() msvcrt.__p__pwctype
-@ cdecl -arch=i386 __p__timezone() msvcrt.__p__timezone
-@ cdecl -arch=i386 __p__tzname() msvcrt.__p__tzname
-@ cdecl -arch=i386 __p__wcmdln() msvcrt.__p__wcmdln
-@ cdecl -arch=i386 __p__wenviron() msvcrt.__p__wenviron
-@ cdecl -arch=i386 __p__winmajor() msvcrt.__p__winmajor
-@ cdecl -arch=i386 __p__winminor() msvcrt.__p__winminor
-@ cdecl -arch=i386 __p__winver() msvcrt.__p__winver
-@ cdecl -arch=i386 __p__wpgmptr() msvcrt.__p__wpgmptr
+@ 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 __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 __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 __pxcptinfoptrs() msvcrt.__pxcptinfoptrs
 @ cdecl __set_app_type(long) msvcrt.__set_app_type
 @ cdecl __setusermatherr(ptr) msvcrt.__setusermatherr
diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec
index da93b9ce282..4b027a48f1f 100644
--- a/dlls/msvcrtd/msvcrtd.spec
+++ b/dlls/msvcrtd/msvcrtd.spec
@@ -150,38 +150,38 @@
 @ extern __lc_handle msvcrt.__lc_handle
 @ cdecl __lconv_init() msvcrt.__lconv_init
 @ extern __mb_cur_max msvcrt.__mb_cur_max
-@ cdecl -arch=i386 __p___argc() msvcrt.__p___argc
-@ cdecl -arch=i386 __p___argv() msvcrt.__p___argv
-@ cdecl -arch=i386 __p___initenv() msvcrt.__p___initenv
-@ cdecl -arch=i386 __p___mb_cur_max() msvcrt.__p___mb_cur_max
-@ cdecl -arch=i386 __p___wargv() msvcrt.__p___wargv
-@ cdecl -arch=i386 __p___winitenv() msvcrt.__p___winitenv
-@ cdecl -arch=i386 __p__acmdln() msvcrt.__p__acmdln
-@ cdecl -arch=i386 __p__amblksiz() msvcrt.__p__amblksiz
-@ cdecl -arch=i386 __p__commode() msvcrt.__p__commode
-@ cdecl -arch=i386 __p__crtAssertBusy()
-@ cdecl -arch=i386 __p__crtBreakAlloc()
-@ cdecl -arch=i386 __p__crtDbgFlag()
-@ cdecl -arch=i386 __p__daylight() msvcrt.__p__daylight
-@ cdecl -arch=i386 __p__dstbias() msvcrt.__p__dstbias
-@ cdecl -arch=i386 __p__environ() msvcrt.__p__environ
-@ cdecl -arch=i386 __p__fileinfo() msvcrt.__p__fileinfo
-@ cdecl -arch=i386 __p__fmode() msvcrt.__p__fmode
-@ cdecl -arch=i386 __p__iob() msvcrt.__p__iob
-@ cdecl -arch=i386 __p__mbcasemap() msvcrt.__p__mbcasemap
-@ cdecl -arch=i386 __p__mbctype() msvcrt.__p__mbctype
-@ cdecl -arch=i386 __p__osver() msvcrt.__p__osver
-@ cdecl -arch=i386 __p__pctype() msvcrt.__p__pctype
-@ cdecl -arch=i386 __p__pgmptr() msvcrt.__p__pgmptr
-@ cdecl -arch=i386 __p__pwctype() msvcrt.__p__pwctype
-@ cdecl -arch=i386 __p__timezone() msvcrt.__p__timezone
-@ cdecl -arch=i386 __p__tzname() msvcrt.__p__tzname
-@ cdecl -arch=i386 __p__wcmdln() msvcrt.__p__wcmdln
-@ cdecl -arch=i386 __p__wenviron() msvcrt.__p__wenviron
-@ cdecl -arch=i386 __p__winmajor() msvcrt.__p__winmajor
-@ cdecl -arch=i386 __p__winminor() msvcrt.__p__winminor
-@ cdecl -arch=i386 __p__winver() msvcrt.__p__winver
-@ cdecl -arch=i386 __p__wpgmptr() msvcrt.__p__wpgmptr
+@ 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__crtAssertBusy()
+@ cdecl __p__crtBreakAlloc()
+@ cdecl __p__crtDbgFlag()
+@ cdecl __p__daylight() msvcrt.__p__daylight
+@ cdecl __p__dstbias() msvcrt.__p__dstbias
+@ cdecl __p__environ() msvcrt.__p__environ
+@ cdecl __p__fileinfo() msvcrt.__p__fileinfo
+@ cdecl __p__fmode() msvcrt.__p__fmode
+@ cdecl __p__iob() msvcrt.__p__iob
+@ cdecl __p__mbcasemap() msvcrt.__p__mbcasemap
+@ 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 __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 __pctype_func() msvcrt.__pctype_func
 @ extern __pioinfo msvcrt.__pioinfo
 @ cdecl __pxcptinfoptrs() msvcrt.__pxcptinfoptrs