diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec
index 0ad683b6d3d..992eaa7c694 100644
--- a/dlls/mapi32/mapi32.spec
+++ b/dlls/mapi32/mapi32.spec
@@ -1,191 +1,191 @@
-@ stub BMAPIAddress
-@ stub BMAPIDetails
-@ stub BMAPIFindNext
-@ stub BMAPIGetAddress
-@ stub BMAPIGetReadMail
-@ stub BMAPIReadMail
-@ stub BMAPIResolveName
-@ stub BMAPISaveMail
-@ stub BMAPISendMail
-@ stub BuildDisplayTable@40
-@ stub CbOfEncoded@4
-@ stub CchOfEncoding@4
-@ stub ChangeIdleRoutine@28
-@ stub CloseIMsgSession@4
-@ stub CreateIProp@24
-@ stub CreateTable@36
-@ stdcall DeinitMapiUtil()
-@ stub DeregisterIdleRoutine@4
-@ stub DllCanUnloadNow
-@ stub DllGetClassObject
-@ stub EnableIdleRoutine@8
-@ stub EncodeID@12
-@ stub FBadColumnSet@4
-@ stub FBadEntryList@4
-@ stub FBadProp@4
-@ stub FBadPropTag@4
-@ stub FBadRestriction@4
-@ stub FBadRglpNameID@8
-@ stub FBadRglpszA@8
-@ stub FBadRglpszW@8
-@ stub FBadRow@4
-@ stub FBadRowSet@4
-@ stub FBadSortOrderSet@4
-@ stub FBinFromHex@8
-@ stub FDecodeID@12
-@ stub FEqualNames@8
-
+  8 stub @
+ 10 stdcall MAPILogonEx(long ptr ptr long ptr)
+ 11 stdcall MAPILogonEx@20(long ptr ptr long ptr) MAPILogonEx
+ 12 stdcall MAPIAllocateBuffer(long ptr)
+ 13 stdcall MAPIAllocateBuffer@8(long ptr) MAPIAllocateBuffer
+ 14 stub MAPIAllocateMore
+ 15 stub MAPIAllocateMore@12
+ 16 stub MAPIFreeBuffer
+ 17 stub MAPIFreeBuffer@4
+ 18 stub MAPIAdminProfiles
+ 19 stub MAPIAdminProfiles@8
+ 20 stdcall MAPIInitialize(ptr)
+ 21 stdcall MAPIInitialize@4(ptr) MAPIInitialize
+ 22 stdcall MAPIUninitialize()
+ 23 stdcall MAPIUninitialize@0() MAPIUninitialize
+ 24 stub PRProviderInit
+ 25 stub LAUNCHWIZARD
+ 26 stub LaunchWizard@20
+ 27 stub DllGetClassObject
+ 28 stub DllCanUnloadNow
+ 29 stub MAPIOpenFormMgr
+ 30 stub MAPIOpenFormMgr@8
+ 31 stub MAPIOpenLocalFormContainer
+ 32 stub MAPIOpenLocalFormContainer@4
+ 33 stub ScInitMapiUtil@4
+ 34 stdcall DeinitMapiUtil@0() DeinitMapiUtil
+ 35 stub ScGenerateMuid@4
+ 36 stub HrAllocAdviseSink@12
+ 41 stub WrapProgress@20
+ 42 stub HrThisThreadAdviseSink@8
+ 43 stub ScBinFromHexBounded@12
+ 44 stub FBinFromHex@8
+ 45 stub HexFromBin@12
+ 46 stub BuildDisplayTable@40
+ 47 stub SwapPlong@8
+ 48 stub SwapPword@8
+ 49 stub MAPIInitIdle@4
+ 50 stub MAPIDeinitIdle@0
+ 51 stub InstallFilterHook@4
+ 52 stub FtgRegisterIdleRoutine@20
+ 53 stub EnableIdleRoutine@8
+ 54 stub DeregisterIdleRoutine@4
+ 55 stub ChangeIdleRoutine@28
+ 59 stub MAPIGetDefaultMalloc@0
+ 60 stub CreateIProp@24
+ 61 stub CreateTable@36
+ 62 stub MNLS_lstrlenW@4
+ 63 stub MNLS_lstrcmpW@8
+ 64 stub MNLS_lstrcpyW@8
+ 65 stub MNLS_CompareStringW@24
+ 66 stub MNLS_MultiByteToWideChar@24
+ 67 stub MNLS_WideCharToMultiByte@32
+ 68 stub MNLS_IsBadStringPtrW@8
+ 72 stub FEqualNames@8
+ 73 stub WrapStoreEntryID@24
+ 74 stub IsBadBoundedStringPtr@8
+ 75 stub HrQueryAllRows@24
+ 76 stub PropCopyMore@16
+ 77 stub UlPropSize@4
+ 78 stub FPropContainsProp@12
+ 79 stub FPropCompareProp@12
+ 80 stub LPropCompareProp@8
+ 81 stub HrAddColumns@16
+ 82 stub HrAddColumnsEx@20
+121 stub FtAddFt@16
+122 stub FtAdcFt@20
+123 stub FtSubFt@16
+124 stub FtMulDw@12
+125 stub FtMulDwDw@8
+126 stub FtNegFt@8
+127 stub FtDivFtBogus@20
+128 stub UlAddRef@4
+129 stub UlRelease@4
+130 stub SzFindCh@8
+131 stub SzFindLastCh@8
+132 stub SzFindSz@8
+133 stub UFromSz@4
+135 stub HrGetOneProp@12
+136 stub HrSetOneProp@8
+137 stub FPropExists@8
+138 stub PpropFindProp@12
+139 stub FreePadrlist@4
+140 stub FreeProws@4
+141 stub HrSzFromEntryID@12
+142 stub HrEntryIDFromSz@12
+143 stub HrComposeEID@28
+144 stub HrDecomposeEID@28
+145 stub HrComposeMsgID@24
+146 stub HrDecomposeMsgID@24
+147 stub OpenStreamOnFile@24
+148 stub OpenStreamOnFile
+149 stub OpenTnefStream@28
+150 stub OpenTnefStream
+151 stub OpenTnefStreamEx@32
+152 stub OpenTnefStreamEx
+153 stub GetTnefStreamCodepage@12
+154 stub GetTnefStreamCodepage
+155 stub UlFromSzHex@4
+156 stub UNKOBJ_ScAllocate@12
+157 stub UNKOBJ_ScAllocateMore@16
+158 stub UNKOBJ_Free@8
+159 stub UNKOBJ_FreeRows@8
+160 stub UNKOBJ_ScCOAllocate@12
+161 stub UNKOBJ_ScCOReallocate@12
+162 stub UNKOBJ_COFree@8
+163 stub UNKOBJ_ScSzFromIdsAlloc@20
+164 stub ScCountNotifications@12
+165 stub ScCopyNotifications@16
+166 stub ScRelocNotifications@20
+170 stub ScCountProps@12
+171 stub ScCopyProps@16
+172 stub ScRelocProps@20
+173 stub LpValFindProp@12
+174 stub ScDupPropset@16
+175 stub FBadRglpszA@8
+176 stub FBadRglpszW@8
+177 stub FBadRowSet@4
+178 stub FBadRglpNameID@8
+179 stub FBadPropTag@4
+180 stub FBadRow@4
+181 stub FBadProp@4
+182 stub FBadColumnSet@4
+183 stub RTFSync@12
+184 stub RTFSync
+185 stub WrapCompressedRTFStream@12
+186 stub WrapCompressedRTFStream
+187 stub __ValidateParameters@8
+188 stub __CPPValidateParameters@8
+189 stub FBadSortOrderSet@4
+190 stub FBadEntryList@4
+191 stub FBadRestriction@4
+192 stub ScUNCFromLocalPath@12
+193 stub ScLocalPathFromUNC@12
+194 stub HrIStorageFromStream@16
+195 stub HrValidateIPMSubtree@20
+196 stub OpenIMsgSession@12
+197 stub CloseIMsgSession@4
+198 stub OpenIMsgOnIStg@44
+199 stub SetAttribIMsgOnIStg@16
+200 stub GetAttribIMsgOnIStg@12
+201 stub MapStorageSCode@4
+202 stub ScMAPIXFromCMC
+203 stub ScMAPIXFromSMAPI
+204 stub EncodeID@12
+205 stub FDecodeID@12
+206 stub CchOfEncoding@4
+207 stub CbOfEncoded@4
+208 stub MAPISendDocuments
+209 stdcall MAPILogon(long ptr ptr long long ptr)
+210 stub MAPILogoff
+211 stub MAPISendMail
+212 stub MAPISaveMail
+213 stub MAPIReadMail
+214 stub MAPIFindNext
+215 stub MAPIDeleteMail
+217 stub MAPIAddress
+218 stub MAPIDetails
+219 stub MAPIResolveName
+220 stub BMAPISendMail
+221 stub BMAPISaveMail
+222 stub BMAPIReadMail
+223 stub BMAPIGetReadMail
+224 stub BMAPIFindNext
+225 stub BMAPIAddress
+226 stub BMAPIGetAddress
+227 stub BMAPIDetails
+228 stub BMAPIResolveName
+229 stub cmc_act_on
+230 stub cmc_free
+231 stub cmc_list
+232 stub cmc_logoff
+233 stub cmc_logon
+234 stub cmc_look_up
+235 stub cmc_query_configuration
+236 stub cmc_read
+237 stub cmc_send
+238 stub cmc_send_documents
+239 stub HrDispatchNotifications@4
+241 stub HrValidateParameters@8
+244 stub ScCreateConversationIndex@16
+246 stub HrGetOmiProvidersFlags
+247 stub HrGetOmiProvidersFlags@8
+248 stub HrSetOmiProvidersFlagsInvalid
+249 stub HrSetOmiProvidersFlagsInvalid@4
+250 stub GetOutlookVersion
+251 stub GetOutlookVersion@0
+252 stub FixMAPI
+253 stub FixMAPI@0
 # This entry point is sometimes used to detect if the mapi dll came from Outlook
-# @ stub FGetComponentPath
-
-@ stub FPropCompareProp@12
-@ stub FPropContainsProp@12
-@ stub FPropExists@8
-@ stub FixMAPI
-# @ stub FixMAPI@0
-@ stub FreePadrlist@4
-@ stub FreeProws@4
-@ stub FtAdcFt@20
-@ stub FtAddFt@16
-@ stub FtDivFtBogus@20
-@ stub FtMulDw@12
-@ stub FtMulDwDw@8
-@ stub FtNegFt@8
-@ stub FtSubFt@16
-@ stub FtgRegisterIdleRoutine@20
-@ stub GetAttribIMsgOnIStg@12
-@ stub GetOutlookVersion
-# @ stub GetOutlookVersion@0
-@ stub GetTnefStreamCodepage
-# @ stub GetTnefStreamCodepage@12
-@ stub HexFromBin@12
-@ stub HrAddColumns@16
-@ stub HrAddColumnsEx@20
-@ stub HrAllocAdviseSink@12
-@ stub HrComposeEID@28
-@ stub HrComposeMsgID@24
-@ stub HrDecomposeEID@28
-@ stub HrDecomposeMsgID@24
-@ stub HrDispatchNotifications@4
-@ stub HrEntryIDFromSz@12
-@ stub HrGetOmiProvidersFlags
-# @ stub HrGetOmiProvidersFlags@8
-@ stub HrGetOneProp@12
-@ stub HrIStorageFromStream@16
-@ stub HrQueryAllRows@24
-@ stub HrSetOmiProvidersFlagsInvalid
-# @ stub HrSetOmiProvidersFlagsInvalid@4
-@ stub HrSetOneProp@8
-@ stub HrSzFromEntryID@12
-@ stub HrThisThreadAdviseSink@8
-@ stub HrValidateIPMSubtree@20
-@ stub HrValidateParameters@8
-@ stub InstallFilterHook@4
-@ stub IsBadBoundedStringPtr@8
-@ stub LAUNCHWIZARD
-@ stub LPropCompareProp@8
-@ stub LaunchWizard@20
-@ stub LpValFindProp@12
-@ stub MAPIAddress
-@ stub MAPIAdminProfiles
-# @ stub MAPIAdminProfiles@8
-@ stdcall MAPIAllocateBuffer(long ptr)
-# @ stub MAPIAllocateBuffer@8
-@ stub MAPIAllocateMore
-# @ stub MAPIAllocateMore@12
-@ stub MAPIDeinitIdle@0
-@ stub MAPIDeleteMail
-@ stub MAPIDetails
-@ stub MAPIFindNext
-@ stub MAPIFreeBuffer
-# @ stub MAPIFreeBuffer@4
-@ stub MAPIGetDefaultMalloc@0
-@ stub MAPIInitIdle@4
-@ stdcall MAPIInitialize(ptr)
-# @ stub MAPIInitialize@4
-@ stub MAPILogoff
-@ stdcall MAPILogon(long ptr ptr long long ptr)
-@ stdcall MAPILogonEx(long ptr ptr long ptr)
-# @ stub MAPILogonEx@20
-@ stub MAPIOpenFormMgr
-# @ stub MAPIOpenFormMgr@8
-@ stub MAPIOpenLocalFormContainer
-# @ stub MAPIOpenLocalFormContainer@4
-@ stub MAPIReadMail
-@ stub MAPIResolveName
-@ stub MAPISaveMail
-@ stub MAPISendDocuments
-@ stub MAPISendMail
-@ stdcall MAPIUninitialize()
-# @ stub MAPIUninitialize@0
-@ stub MNLS_CompareStringW@24
-@ stub MNLS_IsBadStringPtrW@8
-@ stub MNLS_MultiByteToWideChar@24
-@ stub MNLS_WideCharToMultiByte@32
-@ stub MNLS_lstrcmpW@8
-@ stub MNLS_lstrcpyW@8
-@ stub MNLS_lstrlenW@4
-@ stub MapStorageSCode@4
-@ stub OpenIMsgOnIStg@44
-@ stub OpenIMsgSession@12
-@ stub OpenStreamOnFile
-# @ stub OpenStreamOnFile@24
-@ stub OpenTnefStream
-# @ stub OpenTnefStream@28
-@ stub OpenTnefStreamEx
-# @ stub OpenTnefStreamEx@32
-@ stub PRProviderInit
-@ stub PpropFindProp@12
-@ stub PropCopyMore@16
-@ stub RTFSync
-# @ stub RTFSync@12
-@ stub ScBinFromHexBounded@12
-@ stub ScCopyNotifications@16
-@ stub ScCopyProps@16
-@ stub ScCountNotifications@12
-@ stub ScCountProps@12
-@ stub ScCreateConversationIndex@16
-@ stub ScDupPropset@16
-@ stub ScGenerateMuid@4
-@ stub ScInitMapiUtil@4
-@ stub ScLocalPathFromUNC@12
-@ stub ScMAPIXFromCMC
-@ stub ScMAPIXFromSMAPI
-@ stub ScRelocNotifications@20
-@ stub ScRelocProps@20
-@ stub ScUNCFromLocalPath@12
-@ stub SetAttribIMsgOnIStg@16
-@ stub SwapPlong@8
-@ stub SwapPword@8
-@ stub SzFindCh@8
-@ stub SzFindLastCh@8
-@ stub SzFindSz@8
-@ stub UFromSz@4
-@ stub UNKOBJ_COFree@8
-@ stub UNKOBJ_Free@8
-@ stub UNKOBJ_FreeRows@8
-@ stub UNKOBJ_ScAllocate@12
-@ stub UNKOBJ_ScAllocateMore@16
-@ stub UNKOBJ_ScCOAllocate@12
-@ stub UNKOBJ_ScCOReallocate@12
-@ stub UNKOBJ_ScSzFromIdsAlloc@20
-@ stub UlAddRef@4
-@ stub UlFromSzHex@4
-@ stub UlPropSize@4
-@ stub UlRelease@4
-@ stub WrapCompressedRTFStream
-# @ stub WrapCompressedRTFStream@12
-@ stub WrapProgress@20
-@ stub WrapStoreEntryID@24
-@ stub __CPPValidateParameters@8
-@ stub __ValidateParameters@8
-@ stub cmc_act_on
-@ stub cmc_free
-@ stub cmc_list
-@ stub cmc_logoff
-@ stub cmc_logon
-@ stub cmc_look_up
-@ stub cmc_query_configuration
-@ stub cmc_read
-@ stub cmc_send
-@ stub cmc_send_documents
+#254 stub FGetComponentPath
+#255 stub FGetComponentPath@20
diff --git a/dlls/shell32/shell32.spec b/dlls/shell32/shell32.spec
index 230a314d91a..f4ec451396e 100644
--- a/dlls/shell32/shell32.spec
+++ b/dlls/shell32/shell32.spec
@@ -6,10 +6,10 @@
    2 stdcall SHChangeNotifyRegister(long long long long long ptr)
    4 stdcall SHChangeNotifyDeregister (long)
    5 stdcall SHChangeNotifyUpdateEntryList (long long long long)
-   9 stub PifMgr_OpenProperties@16
-  10 stub PifMgr_GetProperties@20
-  11 stub PifMgr_SetProperties@20
-  13 stub PifMgr_CloseProperties@8
+   9 stub PifMgr_OpenProperties
+  10 stub PifMgr_GetProperties
+  11 stub PifMgr_SetProperties
+  13 stub PifMgr_CloseProperties
   15 stdcall ILGetDisplayName(ptr ptr)
   16 stdcall ILFindLastID(ptr)
   17 stdcall ILRemoveLastID(ptr)
@@ -52,7 +52,7 @@
   56 stdcall PathUnquoteSpaces(str) PathUnquoteSpacesAW
   57 stdcall PathGetDriveNumber (str) PathGetDriveNumberAW
   58 stdcall ParseField(str long ptr long) ParseFieldAW
-  59 stub RestartDialog@12
+  59 stub RestartDialog
   60 stdcall ExitWindowsDialog(long)
   61 stdcall RunFileDlg(long long long str str long)
   62 stdcall PickIconDlg(long long long long)
@@ -202,7 +202,7 @@
  212 stub Printers_AddPrinterPropPages
  213 stub Printers_RegisterWindowW
  214 stub Printers_UnregisterWindow
- 215 stub SHStartNetConnectionDialog@12
+ 215 stub SHStartNetConnectionDialog
  243 stdcall @(long long) shell32_243
  244 stdcall SHInitRestricted(ptr ptr)
  247 stdcall SHGetDataFromIDListA (ptr ptr long ptr long)
@@ -219,8 +219,8 @@
  276 stub SheFullPathA
  277 stub SheFullPathW
  278 stub SheGetCurDrive
- 279 stub SheGetDirA@8
- 280 stub SheGetDirExW@12
+ 279 stub SheGetDirA
+ 280 stub SheGetDirExW
  281 stdcall SheGetDirW (long long)
  282 stub SheGetPathOffsetW
  283 stub SheRemoveQuotesA
@@ -272,7 +272,7 @@
  505 stdcall SHRegCloseKey (long)
  506 stdcall SHRegOpenKeyA (long str long)
  507 stdcall SHRegOpenKeyW (long wstr long)
- 508 stub SHRegQueryValueA@16
+ 508 stub SHRegQueryValueA
  509 stdcall SHRegQueryValueExA(long str ptr ptr ptr ptr)
  510 stdcall SHRegQueryValueW (long long long long)
  511 stdcall SHRegQueryValueExW (long wstr ptr ptr ptr ptr)
@@ -282,18 +282,18 @@
  521 stdcall SHLockShared (long long)
  522 stdcall SHUnlockShared (long)
  523 stdcall SHFreeShared (long long)
- 524 stub RealDriveType@8
- 525 stub RealDriveTypeFlags@8
+ 524 stub RealDriveType
+ 525 stub RealDriveTypeFlags
 
  640 stdcall NTSHChangeNotifyRegister (long long long long long long)
  641 stdcall NTSHChangeNotifyDeregister (long)
 
- 643 stub SHChangeNotifyReceive@16
+ 643 stub SHChangeNotifyReceive
  644 stdcall SHChangeNotification_Lock(long long ptr ptr)
  645 stdcall SHChangeNotification_Unlock(long)
- 646 stub SHChangeRegistrationReceive@8
- 647 stub ReceiveAddToRecentDocs@8
- 648 stub SHWaitOp_Operate@8
+ 646 stub SHChangeRegistrationReceive
+ 647 stub ReceiveAddToRecentDocs
+ 648 stub SHWaitOp_Operate
 
  650 stdcall PathIsSameRoot(ptr ptr)PathIsSameRootAW
 
@@ -371,33 +371,33 @@
 @ stdcall SHCreateDirectoryExA(long str ptr)
 @ stdcall SHCreateDirectoryExW(long wstr ptr)
 @ stub ShellHookProc
-@ stub SHEmptyRecycleBinA@12
-@ stub SHEmptyRecycleBinW@12
+@ stub SHEmptyRecycleBinA
+@ stub SHEmptyRecycleBinW
 @ stdcall SHFileOperation(ptr)SHFileOperationAW
 @ stdcall SHFileOperationA(ptr)
 @ stdcall SHFileOperationW(ptr)
-@ stub SHFormatDrive@16
-@ stub SHFreeNameMappings@4
+@ stub SHFormatDrive
+@ stub SHFreeNameMappings
 @ stdcall SHGetDesktopFolder(ptr)
 @ stdcall SHGetFileInfo(ptr long ptr long long)SHGetFileInfoAW
 @ stdcall SHGetFileInfoA(ptr long ptr long long)
 @ stdcall SHGetFileInfoW(ptr long ptr long long)
 @ stdcall SHGetInstanceExplorer(long)
 @ stdcall SHGetMalloc(ptr)
-@ stub SHGetNewLinkInfo@20
+@ stub SHGetNewLinkInfo
 @ stdcall SHGetPathFromIDList(ptr ptr)SHGetPathFromIDListAW
 @ stdcall SHGetPathFromIDListA(ptr ptr)
 @ stdcall SHGetPathFromIDListW(ptr ptr)
 @ stdcall SHGetSettings(ptr long)
 @ stdcall SHGetSpecialFolderLocation(long long ptr)
 @ stdcall SHHelpShortcuts_RunDLL(long long long long)
-@ stub SHHelpShortcuts_RunDLLA@16
-@ stub SHHelpShortcuts_RunDLLW@16
+@ stub SHHelpShortcuts_RunDLLA
+@ stub SHHelpShortcuts_RunDLLW
 @ stdcall SHLoadInProc(long)
-@ stub SHQueryRecycleBinA@8
-@ stub SHQueryRecycleBinW@8
-@ stub SHUpdateRecycleBinIcon@0
-@ stub WOWShellExecute@28
+@ stub SHQueryRecycleBinA
+@ stub SHQueryRecycleBinW
+@ stub SHUpdateRecycleBinIcon
+@ stub WOWShellExecute
 
 #
 # version 4.70 (IE3.0)
diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c
index cd1c3da6913..9a37f5e4463 100644
--- a/tools/winebuild/parser.c
+++ b/tools/winebuild/parser.c
@@ -460,7 +460,6 @@ static int parse_spec_ordinal( int ordinal, DLLSPEC *spec )
     if (*token == '-' && !(token = parse_spec_flags( odp ))) goto error;
 
     odp->name = xstrdup( token );
-    remove_stdcall_decoration( odp->name );
     odp->lineno = current_line;
     odp->ordinal = ordinal;