Ignore:
Timestamp:
Jun 21, 1999, 7:45:38 PM (26 years ago)
Author:
sandervl
Message:

Removed calling convention from inline functions

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/os2wrap.h

    r119 r146  
    1 /* $Id: os2wrap.h,v 1.3 1999-06-19 10:53:12 sandervl Exp $ */
     1/* $Id: os2wrap.h,v 1.4 1999-06-21 17:45:38 sandervl Exp $ */
    22#ifndef __OS2WRAP_H__
    33#define __OS2WRAP_H__
    … …  
    88
    99#ifdef INCL_DOSMEMMGR
    10 inline ULONG  _DosAllocMem(PPVOID a, ULONG b, ULONG c)
     10inline ULONG _DosAllocMem(PPVOID a, ULONG b, ULONG c)
    1111{
    1212 ULONG yyrc;
    … …  
    2222#define DosAllocMem _DosAllocMem
    2323
    24 inline ULONG APIENTRY _DosAllocSharedMem(PPVOID a, PCSZ b, ULONG c, ULONG d)
     24inline ULONG _DosAllocSharedMem(PPVOID a, PCSZ b, ULONG c, ULONG d)
    2525{
    2626 ULONG yyrc;
    … …  
    3636#define DosAllocSharedMem _DosAllocSharedMem
    3737
    38 inline ULONG APIENTRY _DosFreeMem(PVOID a)
     38inline ULONG _DosFreeMem(PVOID a)
    3939{
    4040 ULONG yyrc;
    … …  
    5050#define DosFreeMem _DosFreeMem
    5151
    52 inline ULONG APIENTRY _DosGetNamedSharedMem(PPVOID a, PCSZ b, ULONG c)
     52inline ULONG _DosGetNamedSharedMem(PPVOID a, PCSZ b, ULONG c)
    5353{
    5454 ULONG yyrc;
    … …  
    6464#define DosGetNamedSharedMem _DosGetNamedSharedMem
    6565
    66 inline ULONG APIENTRY _DosGetSharedMem(PVOID a, ULONG b)
     66inline ULONG _DosGetSharedMem(PVOID a, ULONG b)
    6767{
    6868 ULONG yyrc;
    … …  
    7878#define DosGetSharedMem _DosGetSharedMem
    7979
    80 inline ULONG APIENTRY _DosGiveSharedMem(PVOID a, PID b, ULONG c)
     80inline ULONG _DosGiveSharedMem(PVOID a, PID b, ULONG c)
    8181{
    8282 ULONG yyrc;
    … …  
    9292#define DosGiveSharedMem _DosGiveSharedMem
    9393
    94 inline ULONG APIENTRY _DosQueryMem(PVOID a, PULONG b, PULONG c)
     94inline ULONG _DosQueryMem(PVOID a, PULONG b, PULONG c)
    9595{
    9696 ULONG yyrc;
    … …  
    106106#define DosQueryMem _DosQueryMem
    107107
    108 inline ULONG APIENTRY _DosSetMem(PVOID a, ULONG b, ULONG c)
     108inline ULONG _DosSetMem(PVOID a, ULONG b, ULONG c)
    109109{
    110110 ULONG yyrc;
    … …  
    120120#define DosSetMem _DosSetMem
    121121
    122 inline ULONG APIENTRY _DosSubAllocMem(PVOID a, PPVOID b, ULONG c)
     122inline ULONG _DosSubAllocMem(PVOID a, PPVOID b, ULONG c)
    123123{
    124124 ULONG yyrc;
    … …  
    134134#define DosSubAllocMem _DosSubAllocMem
    135135
    136 inline ULONG APIENTRY _DosSubFreeMem(PVOID a, PVOID b, ULONG c)
     136inline ULONG _DosSubFreeMem(PVOID a, PVOID b, ULONG c)
    137137{
    138138 ULONG yyrc;
    … …  
    148148#define DosSubFreeMem _DosSubFreeMem
    149149
    150 inline ULONG APIENTRY _DosSubSetMem(PVOID a, ULONG b, ULONG c)
     150inline ULONG _DosSubSetMem(PVOID a, ULONG b, ULONG c)
    151151{
    152152 ULONG yyrc;
    … …  
    162162#define DosSubSetMem _DosSubSetMem
    163163
    164 inline ULONG APIENTRY _DosSubUnsetMem(PVOID a)
     164inline ULONG _DosSubUnsetMem(PVOID a)
    165165{
    166166 ULONG yyrc;
    … …  
    178178#endif
    179179#ifdef INCL_DOSFILEMGR
    180 inline ULONG APIENTRY _DosCancelLockRequest(HFILE a, PFILELOCK b)
     180inline ULONG _DosCancelLockRequest(HFILE a, PFILELOCK b)
    181181{
    182182 ULONG yyrc;
    … …  
    192192#define DosCancelLockRequest _DosCancelLockRequest
    193193
    194 inline ULONG APIENTRY _DosClose(HFILE a)
     194inline ULONG _DosClose(HFILE a)
    195195{
    196196 ULONG yyrc;
    … …  
    206206#define DosClose _DosClose
    207207
    208 inline ULONG APIENTRY _DosCopy(PCSZ a, PCSZ b, ULONG c)
     208inline ULONG _DosCopy(PCSZ a, PCSZ b, ULONG c)
    209209{
    210210 ULONG yyrc;
    … …  
    220220#define DosCopy _DosCopy
    221221
    222 inline ULONG APIENTRY _DosCreateDir(PCSZ a, PEAOP2 b)
     222inline ULONG _DosCreateDir(PCSZ a, PEAOP2 b)
    223223{
    224224 ULONG yyrc;
    … …  
    234234#define DosCreateDir _DosCreateDir
    235235
    236 inline ULONG APIENTRY _DosDelete(PCSZ a)
     236inline ULONG _DosDelete(PCSZ a)
    237237{
    238238 ULONG yyrc;
    … …  
    248248#define DosDelete _DosDelete
    249249
    250 inline ULONG APIENTRY _DosDeleteDir(PCSZ a)
     250inline ULONG _DosDeleteDir(PCSZ a)
    251251{
    252252 ULONG yyrc;
    … …  
    262262#define DosDeleteDir _DosDeleteDir
    263263
    264 inline ULONG APIENTRY _DosDupHandle(HFILE a, PHFILE b)
     264inline ULONG _DosDupHandle(HFILE a, PHFILE b)
    265265{
    266266 ULONG yyrc;
    … …  
    276276#define DosDupHandle _DosDupHandle
    277277
    278 inline ULONG APIENTRY _DosEditName(ULONG a, PCSZ b, PCSZ c, PBYTE d, ULONG e)
     278inline ULONG _DosEditName(ULONG a, PCSZ b, PCSZ c, PBYTE d, ULONG e)
    279279{
    280280 ULONG yyrc;
    … …  
    290290#define DosEditName _DosEditName
    291291
    292 inline ULONG APIENTRY _DosEnumAttribute(ULONG a, PVOID b, ULONG c, PVOID d, ULONG e, PULONG f, ULONG g)
     292inline ULONG _DosEnumAttribute(ULONG a, PVOID b, ULONG c, PVOID d, ULONG e, PULONG f, ULONG g)
    293293{
    294294 ULONG yyrc;
    … …  
    304304#define DosEnumAttribute _DosEnumAttribute
    305305
    306 inline ULONG APIENTRY _DosFindClose(HDIR a)
     306inline ULONG _DosFindClose(HDIR a)
    307307{
    308308 ULONG yyrc;
    … …  
    318318#define DosFindClose _DosFindClose
    319319
    320 inline ULONG APIENTRY _DosFindFirst(PCSZ a, PHDIR b, ULONG c, PVOID d, ULONG e, PULONG f, ULONG g)
     320inline ULONG _DosFindFirst(PCSZ a, PHDIR b, ULONG c, PVOID d, ULONG e, PULONG f, ULONG g)
    321321{
    322322 ULONG yyrc;
    … …  
    332332#define DosFindFirst _DosFindFirst
    333333
    334 inline ULONG APIENTRY _DosFindNext(HDIR a, PVOID b, ULONG c, PULONG d)
     334inline ULONG _DosFindNext(HDIR a, PVOID b, ULONG c, PULONG d)
    335335{
    336336 ULONG yyrc;
    … …  
    346346#define DosFindNext _DosFindNext
    347347
    348 inline ULONG APIENTRY _DosForceDelete(PCSZ a)
     348inline ULONG _DosForceDelete(PCSZ a)
    349349{
    350350 ULONG yyrc;
    … …  
    360360#define DosForceDelete _DosForceDelete
    361361
    362 inline ULONG APIENTRY _DosFSAttach(PCSZ a, PCSZ b, PVOID c, ULONG d, ULONG e)
     362inline ULONG _DosFSAttach(PCSZ a, PCSZ b, PVOID c, ULONG d, ULONG e)
    363363{
    364364 ULONG yyrc;
    … …  
    374374#define DosFSAttach _DosFSAttach
    375375
    376 inline ULONG APIENTRY _DosFSCtl(PVOID a, ULONG b, PULONG c, PVOID d, ULONG e, PULONG f, ULONG g, PCSZ h, HFILE i, ULONG j)
     376inline ULONG _DosFSCtl(PVOID a, ULONG b, PULONG c, PVOID d, ULONG e, PULONG f, ULONG g, PCSZ h, HFILE i, ULONG j)
    377377{
    378378 ULONG yyrc;
    … …  
    388388#define DosFSCtl _DosFSCtl
    389389
    390 inline ULONG APIENTRY _DosMove(PCSZ a, PCSZ b)
     390inline ULONG _DosMove(PCSZ a, PCSZ b)
    391391{
    392392 ULONG yyrc;
    … …  
    402402#define DosMove _DosMove
    403403
    404 inline ULONG APIENTRY _DosOpen(PCSZ a, PHFILE b, PULONG c, ULONG d, ULONG e, ULONG f, ULONG g, PEAOP2 h)
     404inline ULONG _DosOpen(PCSZ a, PHFILE b, PULONG c, ULONG d, ULONG e, ULONG f, ULONG g, PEAOP2 h)
    405405{
    406406 ULONG yyrc;
    … …  
    416416#define DosOpen _DosOpen
    417417
    418 inline ULONG APIENTRY _DosProtectClose(HFILE a, FHLOCK b)
     418inline ULONG _DosProtectClose(HFILE a, FHLOCK b)
    419419{
    420420 ULONG yyrc;
    … …  
    430430#define DosProtectClose _DosProtectClose
    431431
    432 inline ULONG APIENTRY _DosProtectEnumAttribute(ULONG a, PVOID b, ULONG c, PVOID d, ULONG e, PULONG f, ULONG g, FHLOCK h)
     432inline ULONG _DosProtectEnumAttribute(ULONG a, PVOID b, ULONG c, PVOID d, ULONG e, PULONG f, ULONG g, FHLOCK h)
    433433{
    434434 ULONG yyrc;
    … …  
    444444#define DosProtectEnumAttribute _DosProtectEnumAttribute
    445445
    446 inline ULONG APIENTRY _DosProtectOpen(PCSZ a, PHFILE b, PULONG c, ULONG d, ULONG e, ULONG f, ULONG g, PEAOP2 h, PFHLOCK i)
     446inline ULONG _DosProtectOpen(PCSZ a, PHFILE b, PULONG c, ULONG d, ULONG e, ULONG f, ULONG g, PEAOP2 h, PFHLOCK i)
    447447{
    448448 ULONG yyrc;
    … …  
    458458#define DosProtectOpen _DosProtectOpen
    459459
    460 inline ULONG APIENTRY _DosProtectQueryFHState(HFILE a, PULONG b, FHLOCK c)
     460inline ULONG _DosProtectQueryFHState(HFILE a, PULONG b, FHLOCK c)
    461461{
    462462 ULONG yyrc;
    … …  
    472472#define DosProtectQueryFHState _DosProtectQueryFHState
    473473
    474 inline ULONG APIENTRY _DosProtectQueryFileInfo(HFILE a, ULONG b, PVOID c, ULONG d, FHLOCK e)
     474inline ULONG _DosProtectQueryFileInfo(HFILE a, ULONG b, PVOID c, ULONG d, FHLOCK e)
    475475{
    476476 ULONG yyrc;
    … …  
    486486#define DosProtectQueryFileInfo _DosProtectQueryFileInfo
    487487
    488 inline ULONG APIENTRY _DosProtectRead(HFILE a, PVOID b, ULONG c, PULONG d, FHLOCK e)
     488inline ULONG _DosProtectRead(HFILE a, PVOID b, ULONG c, PULONG d, FHLOCK e)
    489489{
    490490 ULONG yyrc;
    … …  
    500500#define DosProtectRead _DosProtectRead
    501501
    502 inline ULONG APIENTRY _DosProtectSetFHState(HFILE a, ULONG b, FHLOCK c)
     502inline ULONG _DosProtectSetFHState(HFILE a, ULONG b, FHLOCK c)
    503503{
    504504 ULONG yyrc;
    … …  
    514514#define DosProtectSetFHState _DosProtectSetFHState
    515515
    516 inline ULONG APIENTRY _DosProtectSetFileInfo(HFILE a, ULONG b, PVOID c, ULONG d, FHLOCK e)
     516inline ULONG _DosProtectSetFileInfo(HFILE a, ULONG b, PVOID c, ULONG d, FHLOCK e)
    517517{
    518518 ULONG yyrc;
    … …  
    528528#define DosProtectSetFileInfo _DosProtectSetFileInfo
    529529
    530 inline ULONG APIENTRY _DosProtectSetFileLocks(HFILE a, PFILELOCK b, PFILELOCK c, ULONG d, ULONG e, FHLOCK f)
     530inline ULONG _DosProtectSetFileLocks(HFILE a, PFILELOCK b, PFILELOCK c, ULONG d, ULONG e, FHLOCK f)
    531531{
    532532 ULONG yyrc;
    … …  
    542542#define DosProtectSetFileLocks _DosProtectSetFileLocks
    543543
    544 inline ULONG APIENTRY _DosProtectSetFilePtr(HFILE a, LONG b, ULONG c, PULONG d, FHLOCK e)
     544inline ULONG _DosProtectSetFilePtr(HFILE a, LONG b, ULONG c, PULONG d, FHLOCK e)
    545545{
    546546 ULONG yyrc;
    … …  
    556556#define DosProtectSetFilePtr _DosProtectSetFilePtr
    557557
    558 inline ULONG APIENTRY _DosProtectSetFileSize(HFILE a, ULONG b, FHLOCK c)
     558inline ULONG _DosProtectSetFileSize(HFILE a, ULONG b, FHLOCK c)
    559559{
    560560 ULONG yyrc;
    … …  
    570570#define DosProtectSetFileSize _DosProtectSetFileSize
    571571
    572 inline ULONG APIENTRY _DosProtectWrite(HFILE a, PVOID b, ULONG c, PULONG d, FHLOCK e)
     572inline ULONG _DosProtectWrite(HFILE a, PVOID b, ULONG c, PULONG d, FHLOCK e)
    573573{
    574574 ULONG yyrc;
    … …  
    584584#define DosProtectWrite _DosProtectWrite
    585585
    586 inline ULONG APIENTRY _DosQueryCurrentDir(ULONG a, PBYTE b, PULONG c)
     586inline ULONG _DosQueryCurrentDir(ULONG a, PBYTE b, PULONG c)
    587587{
    588588 ULONG yyrc;
    … …  
    598598#define DosQueryCurrentDir _DosQueryCurrentDir
    599599
    600 inline ULONG APIENTRY _DosQueryCurrentDisk(PULONG a, PULONG b)
     600inline ULONG _DosQueryCurrentDisk(PULONG a, PULONG b)
    601601{
    602602 ULONG yyrc;
    … …  
    612612#define DosQueryCurrentDisk _DosQueryCurrentDisk
    613613
    614 inline ULONG APIENTRY _DosQueryFHState(HFILE a, PULONG b)
     614inline ULONG _DosQueryFHState(HFILE a, PULONG b)
    615615{
    616616 ULONG yyrc;
    … …  
    626626#define DosQueryFHState _DosQueryFHState
    627627
    628 inline ULONG APIENTRY _DosQueryFileInfo(HFILE a, ULONG b, PVOID c, ULONG d)
     628inline ULONG _DosQueryFileInfo(HFILE a, ULONG b, PVOID c, ULONG d)
    629629{
    630630 ULONG yyrc;
    … …  
    640640#define DosQueryFileInfo _DosQueryFileInfo
    641641
    642 inline ULONG APIENTRY _DosQueryFSAttach(PCSZ a, ULONG b, ULONG c, PFSQBUFFER2 d, PULONG e)
     642inline ULONG _DosQueryFSAttach(PCSZ a, ULONG b, ULONG c, PFSQBUFFER2 d, PULONG e)
    643643{
    644644 ULONG yyrc;
    … …  
    654654#define DosQueryFSAttach _DosQueryFSAttach
    655655
    656 inline ULONG APIENTRY _DosQueryFSInfo(ULONG a, ULONG b, PVOID c, ULONG d)
     656inline ULONG _DosQueryFSInfo(ULONG a, ULONG b, PVOID c, ULONG d)
    657657{
    658658 ULONG yyrc;
    … …  
    668668#define DosQueryFSInfo _DosQueryFSInfo
    669669
    670 inline ULONG APIENTRY _DosQueryHType(HFILE a, PULONG b, PULONG c)
     670inline ULONG _DosQueryHType(HFILE a, PULONG b, PULONG c)
    671671{
    672672 ULONG yyrc;
    … …  
    682682#define DosQueryHType _DosQueryHType
    683683
    684 inline ULONG APIENTRY _DosQueryPathInfo(PCSZ a, ULONG b, PVOID c, ULONG d)
     684inline ULONG _DosQueryPathInfo(PCSZ a, ULONG b, PVOID c, ULONG d)
    685685{
    686686 ULONG yyrc;
    … …  
    696696#define DosQueryPathInfo _DosQueryPathInfo
    697697
    698 inline ULONG APIENTRY _DosQueryVerify(PBOOL32 a)
     698inline ULONG _DosQueryVerify(PBOOL32 a)
    699699{
    700700 ULONG yyrc;
    … …  
    710710#define DosQueryVerify _DosQueryVerify
    711711
    712 inline ULONG APIENTRY _DosRead(HFILE a, PVOID b, ULONG c, PULONG d)
     712inline ULONG _DosRead(HFILE a, PVOID b, ULONG c, PULONG d)
    713713{
    714714 ULONG yyrc;
    … …  
    724724#define DosRead _DosRead
    725725
    726 inline ULONG APIENTRY _DosResetBuffer(HFILE a)
     726inline ULONG _DosResetBuffer(HFILE a)
    727727{
    728728 ULONG yyrc;
    … …  
    738738#define DosResetBuffer _DosResetBuffer
    739739
    740 inline ULONG APIENTRY _DosSetCurrentDir(PCSZ a)
     740inline ULONG _DosSetCurrentDir(PCSZ a)
    741741{
    742742 ULONG yyrc;
    … …  
    752752#define DosSetCurrentDir _DosSetCurrentDir
    753753
    754 inline ULONG APIENTRY _DosSetDefaultDisk(ULONG a)
     754inline ULONG _DosSetDefaultDisk(ULONG a)
    755755{
    756756 ULONG yyrc;
    … …  
    766766#define DosSetDefaultDisk _DosSetDefaultDisk
    767767
    768 inline ULONG APIENTRY _DosSetFHState(HFILE a, ULONG b)
     768inline ULONG _DosSetFHState(HFILE a, ULONG b)
    769769{
    770770 ULONG yyrc;
    … …  
    780780#define DosSetFHState _DosSetFHState
    781781
    782 inline ULONG APIENTRY _DosSetFileInfo(HFILE a, ULONG b, PVOID c, ULONG d)
     782inline ULONG _DosSetFileInfo(HFILE a, ULONG b, PVOID c, ULONG d)
    783783{
    784784 ULONG yyrc;
    … …  
    794794#define DosSetFileInfo _DosSetFileInfo
    795795
    796 inline ULONG APIENTRY _DosSetFileLocks(HFILE a, PFILELOCK b, PFILELOCK c, ULONG d, ULONG e)
     796inline ULONG _DosSetFileLocks(HFILE a, PFILELOCK b, PFILELOCK c, ULONG d, ULONG e)
    797797{
    798798 ULONG yyrc;
    … …  
    808808#define DosSetFileLocks _DosSetFileLocks
    809809
    810 inline ULONG APIENTRY _DosSetFilePtr(HFILE a, LONG b, ULONG c, PULONG d)
     810inline ULONG _DosSetFilePtr(HFILE a, LONG b, ULONG c, PULONG d)
    811811{
    812812 ULONG yyrc;
    … …  
    822822#define DosSetFilePtr _DosSetFilePtr
    823823
    824 inline ULONG APIENTRY _DosSetFileSize(HFILE a, ULONG b)
     824inline ULONG _DosSetFileSize(HFILE a, ULONG b)
    825825{
    826826 ULONG yyrc;
    … …  
    836836#define DosSetFileSize _DosSetFileSize
    837837
    838 inline ULONG APIENTRY _DosSetFSInfo(ULONG a, ULONG b, PVOID c, ULONG d)
     838inline ULONG _DosSetFSInfo(ULONG a, ULONG b, PVOID c, ULONG d)
    839839{
    840840 ULONG yyrc;
    … …  
    850850#define DosSetFSInfo _DosSetFSInfo
    851851
    852 inline ULONG APIENTRY _DosSetMaxFH(ULONG a)
     852inline ULONG _DosSetMaxFH(ULONG a)
    853853{
    854854 ULONG yyrc;
    … …  
    864864#define DosSetMaxFH _DosSetMaxFH
    865865
    866 inline ULONG APIENTRY _DosSetPathInfo(PCSZ a, ULONG b, PVOID c, ULONG d, ULONG e)
     866inline ULONG _DosSetPathInfo(PCSZ a, ULONG b, PVOID c, ULONG d, ULONG e)
    867867{
    868868 ULONG yyrc;
    … …  
    878878#define DosSetPathInfo _DosSetPathInfo
    879879
    880 inline ULONG APIENTRY _DosSetRelMaxFH(PLONG a, PULONG b)
     880inline ULONG _DosSetRelMaxFH(PLONG a, PULONG b)
    881881{
    882882 ULONG yyrc;
    … …  
    892892#define DosSetRelMaxFH _DosSetRelMaxFH
    893893
    894 inline ULONG APIENTRY _DosSetVerify(BOOL32 a)
     894inline ULONG _DosSetVerify(BOOL32 a)
    895895{
    896896 ULONG yyrc;
    … …  
    906906#define DosSetVerify _DosSetVerify
    907907
    908 inline ULONG APIENTRY _DosShutdown(ULONG a)
     908inline ULONG _DosShutdown(ULONG a)
    909909{
    910910 ULONG yyrc;
    … …  
    920920#define DosShutdown _DosShutdown
    921921
    922 inline ULONG APIENTRY _DosWrite(HFILE a, PVOID b, ULONG c, PULONG d)
     922inline ULONG _DosWrite(HFILE a, PVOID b, ULONG c, PULONG d)
    923923{
    924924 ULONG yyrc;
    … …  
    936936#endif
    937937#ifdef INCL_DOSMISC
    938 inline ULONG APIENTRY _DosSearchPath(ULONG a, PCSZ b, PCSZ c, PBYTE d, ULONG e)
     938inline ULONG _DosSearchPath(ULONG a, PCSZ b, PCSZ c, PBYTE d, ULONG e)
    939939{
    940940 ULONG yyrc;
    … …  
    952952#endif
    953953#ifdef INCL_DOSDEVICES
    954 inline ULONG APIENTRY _DosDevConfig(PVOID a, ULONG b)
     954inline ULONG _DosDevConfig(PVOID a, ULONG b)
    955955{
    956956 ULONG yyrc;
    … …  
    966966#define DosDevConfig _DosDevConfig
    967967
    968 inline ULONG APIENTRY _DosDevIOCtl(HFILE a, ULONG b, ULONG c, PVOID d, ULONG e, PULONG f, PVOID g, ULONG h, PULONG i)
     968inline ULONG _DosDevIOCtl(HFILE a, ULONG b, ULONG c, PVOID d, ULONG e, PULONG f, PVOID g, ULONG h, PULONG i)
    969969{
    970970 ULONG yyrc;
    … …  
    980980#define DosDevIOCtl _DosDevIOCtl
    981981
    982 inline ULONG APIENTRY _DosPhysicalDisk(ULONG a, PVOID b, ULONG c, PVOID d, ULONG e)
     982inline ULONG _DosPhysicalDisk(ULONG a, PVOID b, ULONG c, PVOID d, ULONG e)
    983983{
    984984 ULONG yyrc;
    … …  
    996996#endif
    997997#ifdef INCL_DOSNLS
    998 inline ULONG APIENTRY _DosMapCase(ULONG a, PCOUNTRYCODE b, PCHAR c)
     998inline ULONG _DosMapCase(ULONG a, PCOUNTRYCODE b, PCHAR c)
    999999{
    10001000 ULONG yyrc;
    … …  
    10101010#define DosMapCase _DosMapCase
    10111011
    1012 inline ULONG APIENTRY _DosQueryCollate(ULONG a, PCOUNTRYCODE b, PCHAR c, PULONG d)
     1012inline ULONG _DosQueryCollate(ULONG a, PCOUNTRYCODE b, PCHAR c, PULONG d)
    10131013{
    10141014 ULONG yyrc;
    … …  
    10241024#define DosQueryCollate _DosQueryCollate
    10251025
    1026 inline ULONG APIENTRY _DosQueryCp(ULONG a, PULONG b, PULONG c)
     1026inline ULONG _DosQueryCp(ULONG a, PULONG b, PULONG c)
    10271027{
    10281028 ULONG yyrc;
    … …  
    10381038#define DosQueryCp _DosQueryCp
    10391039
    1040 inline ULONG APIENTRY _DosQueryCtryInfo(ULONG a, PCOUNTRYCODE b, PCOUNTRYINFO c, PULONG d)
     1040inline ULONG _DosQueryCtryInfo(ULONG a, PCOUNTRYCODE b, PCOUNTRYINFO c, PULONG d)
    10411041{
    10421042 ULONG yyrc;
    … …  
    10521052#define DosQueryCtryInfo _DosQueryCtryInfo
    10531053
    1054 inline ULONG APIENTRY _DosQueryDBCSEnv(ULONG a, PCOUNTRYCODE b, PCHAR c)
     1054inline ULONG _DosQueryDBCSEnv(ULONG a, PCOUNTRYCODE b, PCHAR c)
    10551055{
    10561056 ULONG yyrc;
    … …  
    10661066#define DosQueryDBCSEnv _DosQueryDBCSEnv
    10671067
    1068 inline ULONG APIENTRY _DosSetProcessCp(ULONG a)
     1068inline ULONG _DosSetProcessCp(ULONG a)
    10691069{
    10701070 ULONG yyrc;
    … …  
    10821082#endif
    10831083#ifdef INCL_DOSMODULEMGR
    1084 inline ULONG APIENTRY _DosFreeModule(HMODULE a)
     1084inline ULONG _DosFreeModule(HMODULE a)
    10851085{
    10861086 ULONG yyrc;
    … …  
    10961096#define DosFreeModule _DosFreeModule
    10971097
    1098 inline ULONG APIENTRY _DosLoadModule(PSZ a, ULONG b, PCSZ c, PHMODULE d)
     1098inline ULONG _DosLoadModule(PSZ a, ULONG b, PCSZ c, PHMODULE d)
    10991099{
    11001100 ULONG yyrc;
    … …  
    11101110#define DosLoadModule _DosLoadModule
    11111111
    1112 inline ULONG APIENTRY _DosQueryModuleHandle(PCSZ a, PHMODULE b)
     1112inline ULONG _DosQueryModuleHandle(PCSZ a, PHMODULE b)
    11131113{
    11141114 ULONG yyrc;
    … …  
    11241124#define DosQueryModuleHandle _DosQueryModuleHandle
    11251125
    1126 inline ULONG APIENTRY _DosQueryModuleName(HMODULE a, ULONG b, PCHAR c)
     1126inline ULONG _DosQueryModuleName(HMODULE a, ULONG b, PCHAR c)
    11271127{
    11281128 ULONG yyrc;
    … …  
    11381138#define DosQueryModuleName _DosQueryModuleName
    11391139
    1140 inline ULONG APIENTRY _DosQueryProcAddr(HMODULE a, ULONG b, PCSZ c, PFN *d)
     1140inline ULONG _DosQueryProcAddr(HMODULE a, ULONG b, PCSZ c, PFN *d)
    11411141{
    11421142 ULONG yyrc;
    … …  
    11521152#define DosQueryProcAddr _DosQueryProcAddr
    11531153
    1154 inline ULONG APIENTRY _DosQueryProcType(HMODULE a, ULONG b, PCSZ c, PULONG d)
     1154inline ULONG _DosQueryProcType(HMODULE a, ULONG b, PCSZ c, PULONG d)
    11551155{
    11561156 ULONG yyrc;
    … …  
    11681168#endif
    11691169#ifdef INCL_DOSRESOURCES
    1170 inline ULONG APIENTRY _DosFreeResource(PVOID a)
     1170inline ULONG _DosFreeResource(PVOID a)
    11711171{
    11721172 ULONG yyrc;
    … …  
    11821182#define DosFreeResource _DosFreeResource
    11831183
    1184 inline ULONG APIENTRY _DosGetResource(HMODULE a, ULONG b, ULONG c, PPVOID d)
     1184inline ULONG _DosGetResource(HMODULE a, ULONG b, ULONG c, PPVOID d)
    11851185{
    11861186 ULONG yyrc;
    … …  
    11961196#define DosGetResource _DosGetResource
    11971197
    1198 inline ULONG APIENTRY _DosQueryResourceSize(HMODULE a, ULONG b, ULONG c, PULONG d)
     1198inline ULONG _DosQueryResourceSize(HMODULE a, ULONG b, ULONG c, PULONG d)
    11991199{
    12001200 ULONG yyrc;
    … …  
    12121212#endif
    12131213#ifdef INCL_DOSPROCESS
    1214 inline ULONG APIENTRY _DosBeep(ULONG a, ULONG b)
     1214inline ULONG _DosBeep(ULONG a, ULONG b)
    12151215{
    12161216 ULONG yyrc;
    … …  
    12261226#define DosBeep _DosBeep
    12271227
    1228 inline VOID APIENTRY _DosExit(ULONG a, ULONG b)
     1228inline VOID _DosExit(ULONG a, ULONG b)
    12291229{
    12301230 USHORT sel = GetFS();
    … …  
    12371237#define DosExit _DosExit
    12381238
    1239 inline ULONG APIENTRY _DosAllocThreadLocalMemory(ULONG a, PULONG *b)
     1239inline ULONG _DosAllocThreadLocalMemory(ULONG a, PULONG *b)
    12401240{
    12411241 ULONG yyrc;
    … …  
    12511251#define DosAllocThreadLocalMemory _DosAllocThreadLocalMemory
    12521252
    1253 inline ULONG APIENTRY _DosCreateThread(PTID a, PFNTHREAD b, ULONG c, ULONG d, ULONG e)
     1253inline ULONG _DosCreateThread(PTID a, PFNTHREAD b, ULONG c, ULONG d, ULONG e)
    12541254{
    12551255 ULONG yyrc;
    … …  
    12651265#define DosCreateThread _DosCreateThread
    12661266
    1267 inline ULONG APIENTRY _DosEnterCritSec()
     1267inline ULONG _DosEnterCritSec()
    12681268{
    12691269 ULONG yyrc;
    … …  
    12791279#define DosEnterCritSec _DosEnterCritSec
    12801280
    1281 inline ULONG APIENTRY _DosExecPgm(PCHAR a, LONG b, ULONG c, PCSZ d, PCSZ e, PRESULTCODES f, PCSZ g)
     1281inline ULONG _DosExecPgm(PCHAR a, LONG b, ULONG c, PCSZ d, PCSZ e, PRESULTCODES f, PCSZ g)
    12821282{
    12831283 ULONG yyrc;
    … …  
    12931293#define DosExecPgm _DosExecPgm
    12941294
    1295 inline ULONG APIENTRY _DosExitCritSec()
     1295inline ULONG _DosExitCritSec()
    12961296{
    12971297 ULONG yyrc;
    … …  
    13071307#define DosExitCritSec _DosExitCritSec
    13081308
    1309 inline ULONG APIENTRY _DosExitList(ULONG a, PFNEXITLIST b)
     1309inline ULONG _DosExitList(ULONG a, PFNEXITLIST b)
    13101310{
    13111311 ULONG yyrc;
    … …  
    13211321#define DosExitList _DosExitList
    13221322
    1323 inline ULONG APIENTRY _DosFreeThreadLocalMemory(ULONG *a)
     1323inline ULONG _DosFreeThreadLocalMemory(ULONG *a)
    13241324{
    13251325 ULONG yyrc;
    … …  
    13351335#define DosFreeThreadLocalMemory _DosFreeThreadLocalMemory
    13361336
    1337 inline ULONG APIENTRY _DosGetInfoBlocks(PTIB *a, PPIB *b)
     1337inline ULONG _DosGetInfoBlocks(PTIB *a, PPIB *b)
    13381338{
    13391339 ULONG yyrc;
    … …  
    13491349#define DosGetInfoBlocks _DosGetInfoBlocks
    13501350
    1351 inline ULONG APIENTRY _DosKillProcess(ULONG a, PID b)
     1351inline ULONG _DosKillProcess(ULONG a, PID b)
    13521352{
    13531353 ULONG yyrc;
    … …  
    13631363#define DosKillProcess _DosKillProcess
    13641364
    1365 inline ULONG APIENTRY _DosKillThread(TID a)
     1365inline ULONG _DosKillThread(TID a)
    13661366{
    13671367 ULONG yyrc;
    … …  
    13771377#define DosKillThread _DosKillThread
    13781378
    1379 inline ULONG APIENTRY _DosResumeThread(TID a)
     1379inline ULONG _DosResumeThread(TID a)
    13801380{
    13811381 ULONG yyrc;
    … …  
    13911391#define DosResumeThread _DosResumeThread
    13921392
    1393 inline ULONG APIENTRY _DosSetPriority(ULONG a, ULONG b, LONG c, ULONG d)
     1393inline ULONG _DosSetPriority(ULONG a, ULONG b, LONG c, ULONG d)
    13941394{
    13951395 ULONG yyrc;
    … …  
    14051405#define DosSetPriority _DosSetPriority
    14061406
    1407 inline ULONG APIENTRY _DosSleep(ULONG a)
     1407inline ULONG _DosSleep(ULONG a)
    14081408{
    14091409 ULONG yyrc;
    … …  
    14191419#define DosSleep _DosSleep
    14201420
    1421 inline ULONG APIENTRY _DosSuspendThread(TID a)
     1421inline ULONG _DosSuspendThread(TID a)
    14221422{
    14231423 ULONG yyrc;
    … …  
    14331433#define DosSuspendThread _DosSuspendThread
    14341434
    1435 inline ULONG APIENTRY _DosWaitChild(ULONG a, ULONG b, PRESULTCODES c, PPID d, PID e)
     1435inline ULONG _DosWaitChild(ULONG a, ULONG b, PRESULTCODES c, PPID d, PID e)
    14361436{
    14371437 ULONG yyrc;
    … …  
    14471447#define DosWaitChild _DosWaitChild
    14481448
    1449 inline ULONG APIENTRY _DosWaitThread(PTID a, ULONG b)
     1449inline ULONG _DosWaitThread(PTID a, ULONG b)
    14501450{
    14511451 ULONG yyrc;
    … …  
    14631463#endif
    14641464#ifdef INCL_DOSSESMGR
    1465 inline ULONG APIENTRY _DosQueryAppType(PCSZ a, PULONG b)
     1465inline ULONG _DosQueryAppType(PCSZ a, PULONG b)
    14661466{
    14671467 ULONG yyrc;
    … …  
    14771477#define DosQueryAppType _DosQueryAppType
    14781478
    1479 inline ULONG APIENTRY _DosSelectSession(ULONG a)
     1479inline ULONG _DosSelectSession(ULONG a)
    14801480{
    14811481 ULONG yyrc;
    … …  
    14911491#define DosSelectSession _DosSelectSession
    14921492
    1493 inline ULONG APIENTRY _DosSetSession(ULONG a, PSTATUSDATA b)
     1493inline ULONG _DosSetSession(ULONG a, PSTATUSDATA b)
    14941494{
    14951495 ULONG yyrc;
    … …  
    15051505#define DosSetSession _DosSetSession
    15061506
    1507 inline ULONG APIENTRY _DosStartSession(PSTARTDATA a, PULONG b, PPID c)
     1507inline ULONG _DosStartSession(PSTARTDATA a, PULONG b, PPID c)
    15081508{
    15091509 ULONG yyrc;
    … …  
    15191519#define DosStartSession _DosStartSession
    15201520
    1521 inline ULONG APIENTRY _DosStopSession(ULONG a, ULONG b)
     1521inline ULONG _DosStopSession(ULONG a, ULONG b)
    15221522{
    15231523 ULONG yyrc;
    … …  
    15351535#endif
    15361536#ifdef INCL_DOSSEMAPHORES
    1537 inline ULONG APIENTRY _DosCloseEventSem(HEV a)
     1537inline ULONG _DosCloseEventSem(HEV a)
    15381538{
    15391539 ULONG yyrc;
    … …  
    15491549#define DosCloseEventSem _DosCloseEventSem
    15501550
    1551 inline ULONG APIENTRY _DosCreateEventSem(PCSZ a, PHEV b, ULONG c, BOOL32 d)
     1551inline ULONG _DosCreateEventSem(PCSZ a, PHEV b, ULONG c, BOOL32 d)
    15521552{
    15531553 ULONG yyrc;
    … …  
    15631563#define DosCreateEventSem _DosCreateEventSem
    15641564
    1565 inline ULONG APIENTRY _DosOpenEventSem(PCSZ a, PHEV b)
     1565inline ULONG _DosOpenEventSem(PCSZ a, PHEV b)
    15661566{
    15671567 ULONG yyrc;
    … …  
    15771577#define DosOpenEventSem _DosOpenEventSem
    15781578
    1579 inline ULONG APIENTRY _DosPostEventSem(HEV a)
     1579inline ULONG _DosPostEventSem(HEV a)
    15801580{
    15811581 ULONG yyrc;
    … …  
    15911591#define DosPostEventSem _DosPostEventSem
    15921592
    1593 inline ULONG APIENTRY _DosQueryEventSem(HEV a, PULONG b)
     1593inline ULONG _DosQueryEventSem(HEV a, PULONG b)
    15941594{
    15951595 ULONG yyrc;
    … …  
    16051605#define DosQueryEventSem _DosQueryEventSem
    16061606
    1607 inline ULONG APIENTRY _DosResetEventSem(HEV a, PULONG b)
     1607inline ULONG _DosResetEventSem(HEV a, PULONG b)
    16081608{
    16091609 ULONG yyrc;
    … …  
    16191619#define DosResetEventSem _DosResetEventSem
    16201620
    1621 inline ULONG APIENTRY _DosWaitEventSem(HEV a, ULONG b)
     1621inline ULONG _DosWaitEventSem(HEV a, ULONG b)
    16221622{
    16231623 ULONG yyrc;
    … …  
    16331633#define DosWaitEventSem _DosWaitEventSem
    16341634
    1635 inline ULONG APIENTRY _DosCloseMutexSem(HMTX a)
     1635inline ULONG _DosCloseMutexSem(HMTX a)
    16361636{
    16371637 ULONG yyrc;
    … …  
    16471647#define DosCloseMutexSem _DosCloseMutexSem
    16481648
    1649 inline ULONG APIENTRY _DosCreateMutexSem(PCSZ a, PHMTX b, ULONG c, BOOL32 d)
     1649inline ULONG _DosCreateMutexSem(PCSZ a, PHMTX b, ULONG c, BOOL32 d)
    16501650{
    16511651 ULONG yyrc;
    … …  
    16611661#define DosCreateMutexSem _DosCreateMutexSem
    16621662
    1663 inline ULONG APIENTRY _DosOpenMutexSem(PCSZ a, PHMTX b)
     1663inline ULONG _DosOpenMutexSem(PCSZ a, PHMTX b)
    16641664{
    16651665 ULONG yyrc;
    … …  
    16751675#define DosOpenMutexSem _DosOpenMutexSem
    16761676
    1677 inline ULONG APIENTRY _DosQueryMutexSem(HMTX a, PPID b, PTID c, PULONG d)
     1677inline ULONG _DosQueryMutexSem(HMTX a, PPID b, PTID c, PULONG d)
    16781678{
    16791679 ULONG yyrc;
    … …  
    16891689#define DosQueryMutexSem _DosQueryMutexSem
    16901690
    1691 inline ULONG APIENTRY _DosReleaseMutexSem(HMTX a)
     1691inline ULONG _DosReleaseMutexSem(HMTX a)
    16921692{
    16931693 ULONG yyrc;
    … …  
    17031703#define DosReleaseMutexSem _DosReleaseMutexSem
    17041704
    1705 inline ULONG APIENTRY _DosRequestMutexSem(HMTX a, ULONG b)
     1705inline ULONG _DosRequestMutexSem(HMTX a, ULONG b)
    17061706{
    17071707 ULONG yyrc;
    … …  
    17171717#define DosRequestMutexSem _DosRequestMutexSem
    17181718
    1719 inline ULONG APIENTRY _DosAddMuxWaitSem(HMUX a, PSEMRECORD b)
     1719inline ULONG _DosAddMuxWaitSem(HMUX a, PSEMRECORD b)
    17201720{
    17211721 ULONG yyrc;
    … …  
    17311731#define DosAddMuxWaitSem _DosAddMuxWaitSem
    17321732
    1733 inline ULONG APIENTRY _DosCloseMuxWaitSem(HMUX a)
     1733inline ULONG _DosCloseMuxWaitSem(HMUX a)
    17341734{
    17351735 ULONG yyrc;
    … …  
    17451745#define DosCloseMuxWaitSem _DosCloseMuxWaitSem
    17461746
    1747 inline ULONG APIENTRY _DosCreateMuxWaitSem(PCSZ a, PHMUX b, ULONG c, PSEMRECORD d, ULONG e)
     1747inline ULONG _DosCreateMuxWaitSem(PCSZ a, PHMUX b, ULONG c, PSEMRECORD d, ULONG e)
    17481748{
    17491749 ULONG yyrc;
    … …  
    17591759#define DosCreateMuxWaitSem _DosCreateMuxWaitSem
    17601760
    1761 inline ULONG APIENTRY _DosDeleteMuxWaitSem(HMUX a, HSEM b)
     1761inline ULONG _DosDeleteMuxWaitSem(HMUX a, HSEM b)
    17621762{
    17631763 ULONG yyrc;
    … …  
    17731773#define DosDeleteMuxWaitSem _DosDeleteMuxWaitSem
    17741774
    1775 inline ULONG APIENTRY _DosOpenMuxWaitSem(PCSZ a, PHMUX b)
     1775inline ULONG _DosOpenMuxWaitSem(PCSZ a, PHMUX b)
    17761776{
    17771777 ULONG yyrc;
    … …  
    17871787#define DosOpenMuxWaitSem _DosOpenMuxWaitSem
    17881788
    1789 inline ULONG APIENTRY _DosQueryMuxWaitSem(HMUX a, PULONG b, PSEMRECORD c, PULONG d)
     1789inline ULONG _DosQueryMuxWaitSem(HMUX a, PULONG b, PSEMRECORD c, PULONG d)
    17901790{
    17911791 ULONG yyrc;
    … …  
    18011801#define DosQueryMuxWaitSem _DosQueryMuxWaitSem
    18021802
    1803 inline ULONG APIENTRY _DosWaitMuxWaitSem(HMUX a, ULONG b, PULONG c)
     1803inline ULONG _DosWaitMuxWaitSem(HMUX a, ULONG b, PULONG c)
    18041804{
    18051805 ULONG yyrc;
    … …  
    18171817#endif
    18181818#ifdef INCL_DOSNMPIPES
    1819 inline ULONG APIENTRY _DosCallNPipe(PCSZ a, PVOID b, ULONG c, PVOID d, ULONG e, PULONG f, ULONG g)
     1819inline ULONG _DosCallNPipe(PCSZ a, PVOID b, ULONG c, PVOID d, ULONG e, PULONG f, ULONG g)
    18201820{
    18211821 ULONG yyrc;
    … …  
    18311831#define DosCallNPipe _DosCallNPipe
    18321832
    1833 inline ULONG APIENTRY _DosConnectNPipe(HPIPE a)
     1833inline ULONG _DosConnectNPipe(HPIPE a)
    18341834{
    18351835 ULONG yyrc;
    … …  
    18451845#define DosConnectNPipe _DosConnectNPipe
    18461846
    1847 inline ULONG APIENTRY _DosCreateNPipe(PCSZ a, PHPIPE b, ULONG c, ULONG d, ULONG e, ULONG f, ULONG g)
     1847inline ULONG _DosCreateNPipe(PCSZ a, PHPIPE b, ULONG c, ULONG d, ULONG e, ULONG f, ULONG g)
    18481848{
    18491849 ULONG yyrc;
    … …  
    18591859#define DosCreateNPipe _DosCreateNPipe
    18601860
    1861 inline ULONG APIENTRY _DosDisConnectNPipe(HPIPE a)
     1861inline ULONG _DosDisConnectNPipe(HPIPE a)
    18621862{
    18631863 ULONG yyrc;
    … …  
    18731873#define DosDisConnectNPipe _DosDisConnectNPipe
    18741874
    1875 inline ULONG APIENTRY _DosPeekNPipe(HPIPE a, PVOID b, ULONG c, PULONG d, PAVAILDATA e, PULONG f)
     1875inline ULONG _DosPeekNPipe(HPIPE a, PVOID b, ULONG c, PULONG d, PAVAILDATA e, PULONG f)
    18761876{
    18771877 ULONG yyrc;
    … …  
    18871887#define DosPeekNPipe _DosPeekNPipe
    18881888
    1889 inline ULONG APIENTRY _DosQueryNPHState(HPIPE a, PULONG b)
     1889inline ULONG _DosQueryNPHState(HPIPE a, PULONG b)
    18901890{
    18911891 ULONG yyrc;
    … …  
    19011901#define DosQueryNPHState _DosQueryNPHState
    19021902
    1903 inline ULONG APIENTRY _DosQueryNPipeInfo(HPIPE a, ULONG b, PVOID c, ULONG d)
     1903inline ULONG _DosQueryNPipeInfo(HPIPE a, ULONG b, PVOID c, ULONG d)
    19041904{
    19051905 ULONG yyrc;
    … …  
    19151915#define DosQueryNPipeInfo _DosQueryNPipeInfo
    19161916
    1917 inline ULONG APIENTRY _DosQueryNPipeSemState(HSEM a, PPIPESEMSTATE b, ULONG c)
     1917inline ULONG _DosQueryNPipeSemState(HSEM a, PPIPESEMSTATE b, ULONG c)
    19181918{
    19191919 ULONG yyrc;
    … …  
    19291929#define DosQueryNPipeSemState _DosQueryNPipeSemState
    19301930
    1931 inline ULONG APIENTRY _DosRawReadNPipe(PCSZ a, ULONG b, PULONG c, PVOID d)
     1931inline ULONG _DosRawReadNPipe(PCSZ a, ULONG b, PULONG c, PVOID d)
    19321932{
    19331933 ULONG yyrc;
    … …  
    19431943#define DosRawReadNPipe _DosRawReadNPipe
    19441944
    1945 inline ULONG APIENTRY _DosRawWriteNPipe(PCSZ a, ULONG b)
     1945inline ULONG _DosRawWriteNPipe(PCSZ a, ULONG b)
    19461946{
    19471947 ULONG yyrc;
    … …  
    19571957#define DosRawWriteNPipe _DosRawWriteNPipe
    19581958
    1959 inline ULONG APIENTRY _DosSetNPHState(HPIPE a, ULONG b)
     1959inline ULONG _DosSetNPHState(HPIPE a, ULONG b)
    19601960{
    19611961 ULONG yyrc;
    … …  
    19711971#define DosSetNPHState _DosSetNPHState
    19721972
    1973 inline ULONG APIENTRY _DosSetNPipeSem(HPIPE a, HSEM b, ULONG c)
     1973inline ULONG _DosSetNPipeSem(HPIPE a, HSEM b, ULONG c)
    19741974{
    19751975 ULONG yyrc;
    … …  
    19851985#define DosSetNPipeSem _DosSetNPipeSem
    19861986
    1987 inline ULONG APIENTRY _DosTransactNPipe(HPIPE a, PVOID b, ULONG c, PVOID d, ULONG e, PULONG f)
     1987inline ULONG _DosTransactNPipe(HPIPE a, PVOID b, ULONG c, PVOID d, ULONG e, PULONG f)
    19881988{
    19891989 ULONG yyrc;
    … …  
    19991999#define DosTransactNPipe _DosTransactNPipe
    20002000
    2001 inline ULONG APIENTRY _DosWaitNPipe(PCSZ a, ULONG b)
     2001inline ULONG _DosWaitNPipe(PCSZ a, ULONG b)
    20022002{
    20032003 ULONG yyrc;
    … …  
    20132013#define DosWaitNPipe _DosWaitNPipe
    20142014
    2015 inline ULONG APIENTRY _DosCreatePipe(PHFILE a, PHFILE b, ULONG c)
     2015inline ULONG _DosCreatePipe(PHFILE a, PHFILE b, ULONG c)
    20162016{
    20172017 ULONG yyrc;
    … …  
    20292029#endif
    20302030#ifdef INCL_DOSQUEUES
    2031 inline ULONG APIENTRY _DosCloseQueue(HQUEUE a)
     2031inline ULONG _DosCloseQueue(HQUEUE a)
    20322032{
    20332033 ULONG yyrc;
    … …  
    20432043#define DosCloseQueue _DosCloseQueue
    20442044
    2045 inline ULONG APIENTRY _DosCreateQueue(PHQUEUE a, ULONG b, PCSZ c)
     2045inline ULONG _DosCreateQueue(PHQUEUE a, ULONG b, PCSZ c)
    20462046{
    20472047 ULONG yyrc;
    … …  
    20572057#define DosCreateQueue _DosCreateQueue
    20582058
    2059 inline ULONG APIENTRY _DosOpenQueue(PPID a, PHQUEUE b, PCSZ c)
     2059inline ULONG _DosOpenQueue(PPID a, PHQUEUE b, PCSZ c)
    20602060{
    20612061 ULONG yyrc;
    … …  
    20712071#define DosOpenQueue _DosOpenQueue
    20722072
    2073 inline ULONG APIENTRY _DosPeekQueue(HQUEUE a, PREQUESTDATA b, PULONG c, PPVOID d, PULONG e, BOOL32 f, PBYTE g, HEV h)
     2073inline ULONG _DosPeekQueue(HQUEUE a, PREQUESTDATA b, PULONG c, PPVOID d, PULONG e, BOOL32 f, PBYTE g, HEV h)
    20742074{
    20752075 ULONG yyrc;
    … …  
    20852085#define DosPeekQueue _DosPeekQueue
    20862086
    2087 inline ULONG APIENTRY _DosPurgeQueue(HQUEUE a)
     2087inline ULONG _DosPurgeQueue(HQUEUE a)
    20882088{
    20892089 ULONG yyrc;
    … …  
    20992099#define DosPurgeQueue _DosPurgeQueue
    21002100
    2101 inline ULONG APIENTRY _DosQueryQueue(HQUEUE a, PULONG b)
     2101inline ULONG _DosQueryQueue(HQUEUE a, PULONG b)
    21022102{
    21032103 ULONG yyrc;
    … …  
    21132113#define DosQueryQueue _DosQueryQueue
    21142114
    2115 inline ULONG APIENTRY _DosReadQueue(HQUEUE a, PREQUESTDATA b, PULONG c, PPVOID d, ULONG e, BOOL32 f, PBYTE g, HEV h)
     2115inline ULONG _DosReadQueue(HQUEUE a, PREQUESTDATA b, PULONG c, PPVOID d, ULONG e, BOOL32 f, PBYTE g, HEV h)
    21162116{
    21172117 ULONG yyrc;
    … …  
    21272127#define DosReadQueue _DosReadQueue
    21282128
    2129 inline ULONG APIENTRY _DosWriteQueue(HQUEUE a, ULONG b, ULONG c, PVOID d, ULONG e)
     2129inline ULONG _DosWriteQueue(HQUEUE a, ULONG b, ULONG c, PVOID d, ULONG e)
    21302130{
    21312131 ULONG yyrc;
    … …  
    21432143#endif
    21442144#ifdef INCL_DOSEXCEPTIONS
    2145 inline ULONG APIENTRY _DosAcknowledgeSignalException(ULONG a)
     2145inline ULONG _DosAcknowledgeSignalException(ULONG a)
    21462146{
    21472147 ULONG yyrc;
    … …  
    21572157#define DosAcknowledgeSignalException _DosAcknowledgeSignalException
    21582158
    2159 inline ULONG APIENTRY _DosEnterMustComplete(PULONG a)
     2159inline ULONG _DosEnterMustComplete(PULONG a)
    21602160{
    21612161 ULONG yyrc;
    … …  
    21712171#define DosEnterMustComplete _DosEnterMustComplete
    21722172
    2173 inline ULONG APIENTRY _DosExitMustComplete(PULONG a)
     2173inline ULONG _DosExitMustComplete(PULONG a)
    21742174{
    21752175 ULONG yyrc;
    … …  
    21852185#define DosExitMustComplete _DosExitMustComplete
    21862186
    2187 inline ULONG APIENTRY _DosQueryThreadContext(TID a, ULONG b, PCONTEXTRECORD c)
     2187inline ULONG _DosQueryThreadContext(TID a, ULONG b, PCONTEXTRECORD c)
    21882188{
    21892189 ULONG yyrc;
    … …  
    21992199#define DosQueryThreadContext _DosQueryThreadContext
    22002200
    2201 inline ULONG APIENTRY _DosRaiseException(PEXCEPTIONREPORTRECORD a)
     2201inline ULONG _DosRaiseException(PEXCEPTIONREPORTRECORD a)
    22022202{
    22032203 ULONG yyrc;
    … …  
    22132213#define DosRaiseException _DosRaiseException
    22142214
    2215 inline ULONG APIENTRY _DosSendSignalException(PID a, ULONG b)
     2215inline ULONG _DosSendSignalException(PID a, ULONG b)
    22162216{
    22172217 ULONG yyrc;
    … …  
    22272227#define DosSendSignalException _DosSendSignalException
    22282228
    2229 inline ULONG APIENTRY _DosSetExceptionHandler(PEXCEPTIONREGISTRATIONRECORD a)
     2229inline ULONG _DosSetExceptionHandler(PEXCEPTIONREGISTRATIONRECORD a)
    22302230{
    22312231 ULONG yyrc;
    … …  
    22412241#define DosSetExceptionHandler _DosSetExceptionHandler
    22422242
    2243 inline ULONG APIENTRY _DosSetSignalExceptionFocus(BOOL32 a, PULONG b)
     2243inline ULONG _DosSetSignalExceptionFocus(BOOL32 a, PULONG b)
    22442244{
    22452245 ULONG yyrc;
    … …  
    22552255#define DosSetSignalExceptionFocus _DosSetSignalExceptionFocus
    22562256
    2257 inline ULONG APIENTRY _DosUnsetExceptionHandler(PEXCEPTIONREGISTRATIONRECORD a)
     2257inline ULONG _DosUnsetExceptionHandler(PEXCEPTIONREGISTRATIONRECORD a)
    22582258{
    22592259 ULONG yyrc;
    … …  
    22692269#define DosUnsetExceptionHandler _DosUnsetExceptionHandler
    22702270
    2271 inline ULONG APIENTRY _DosUnwindException(PEXCEPTIONREGISTRATIONRECORD a, PVOID b, PEXCEPTIONREPORTRECORD c)
     2271inline ULONG _DosUnwindException(PEXCEPTIONREGISTRATIONRECORD a, PVOID b, PEXCEPTIONREPORTRECORD c)
    22722272{
    22732273 ULONG yyrc;
    … …  
    22852285#endif
    22862286#ifdef INCL_DOSMISC
    2287 inline ULONG APIENTRY _DosQuerySysInfo(ULONG a, ULONG b, PVOID c, ULONG d)
     2287inline ULONG _DosQuerySysInfo(ULONG a, ULONG b, PVOID c, ULONG d)
    22882288{
    22892289 ULONG yyrc;
    … …  
    22992299#define DosQuerySysInfo _DosQuerySysInfo
    23002300
    2301 inline ULONG APIENTRY _DosScanEnv(PCSZ a, PCSZ *b)
     2301inline ULONG _DosScanEnv(PCSZ a, PCSZ *b)
    23022302{
    23032303 ULONG yyrc;
    … …  
    23132313#define DosScanEnv _DosScanEnv
    23142314
    2315 inline ULONG APIENTRY _DosQueryRASInfo(ULONG a, PPVOID b)
     2315inline ULONG _DosQueryRASInfo(ULONG a, PPVOID b)
    23162316{
    23172317 ULONG yyrc;
    … …  
    23292329#endif
    23302330#ifdef INCL_DOSDATETIME
    2331 inline ULONG APIENTRY _DosGetDateTime(PDATETIME a)
     2331inline ULONG _DosGetDateTime(PDATETIME a)
    23322332{
    23332333 ULONG yyrc;
    … …  
    23432343#define DosGetDateTime _DosGetDateTime
    23442344
    2345 inline ULONG APIENTRY _DosSetDateTime(PDATETIME a)
     2345inline ULONG _DosSetDateTime(PDATETIME a)
    23462346{
    23472347 ULONG yyrc;
    … …  
    23572357#define DosSetDateTime _DosSetDateTime
    23582358
    2359 inline ULONG APIENTRY _DosAsyncTimer(ULONG a, HSEM b, PHTIMER c)
     2359inline ULONG _DosAsyncTimer(ULONG a, HSEM b, PHTIMER c)
    23602360{
    23612361 ULONG yyrc;
    … …  
    23712371#define DosAsyncTimer _DosAsyncTimer
    23722372
    2373 inline ULONG APIENTRY _DosStartTimer(ULONG a, HSEM b, PHTIMER c)
     2373inline ULONG _DosStartTimer(ULONG a, HSEM b, PHTIMER c)
    23742374{
    23752375 ULONG yyrc;
    … …  
    23852385#define DosStartTimer _DosStartTimer
    23862386
    2387 inline ULONG APIENTRY _DosStopTimer(HTIMER a)
     2387inline ULONG _DosStopTimer(HTIMER a)
    23882388{
    23892389 ULONG yyrc;
    … …  
    24012401#endif
    24022402#ifdef DosTmrQueryFreq
    2403 inline ULONG APIENTRY _DosTmrQueryFreq(PULONG a)
     2403inline ULONG _DosTmrQueryFreq(PULONG a)
    24042404{
    24052405 ULONG yyrc;
    … …  
    24152415#define DosTmrQueryFreq _DosTmrQueryFreq
    24162416
    2417 inline ULONG APIENTRY _DosTmrQueryTime(PQWORD a)
     2417inline ULONG _DosTmrQueryTime(PQWORD a)
    24182418{
    24192419 ULONG yyrc;
    … …  
    24312431#endif
    24322432#ifdef INCL_DOSMVDM
    2433 inline ULONG APIENTRY _DosCloseVDD(HVDD a)
     2433inline ULONG _DosCloseVDD(HVDD a)
    24342434{
    24352435 ULONG yyrc;
    … …  
    24452445#define DosCloseVDD _DosCloseVDD
    24462446
    2447 inline ULONG APIENTRY _DosOpenVDD(PCSZ a, PHVDD b)
     2447inline ULONG _DosOpenVDD(PCSZ a, PHVDD b)
    24482448{
    24492449 ULONG yyrc;
    … …  
    24592459#define DosOpenVDD _DosOpenVDD
    24602460
    2461 inline ULONG APIENTRY _DosQueryDOSProperty(SGID a, PCSZ b, ULONG c, PSZ d)
     2461inline ULONG _DosQueryDOSProperty(SGID a, PCSZ b, ULONG c, PSZ d)
    24622462{
    24632463 ULONG yyrc;
    … …  
    24732473#define DosQueryDOSProperty _DosQueryDOSProperty
    24742474
    2475 inline ULONG APIENTRY _DosRequestVDD(HVDD a, SGID b, ULONG c, ULONG d, PVOID e, ULONG f, PVOID g)
     2475inline ULONG _DosRequestVDD(HVDD a, SGID b, ULONG c, ULONG d, PVOID e, ULONG f, PVOID g)
    24762476{
    24772477 ULONG yyrc;
    … …  
    24872487#define DosRequestVDD _DosRequestVDD
    24882488
    2489 inline ULONG APIENTRY _DosSetDOSProperty(SGID a, PCSZ b, ULONG c, PCSZ d)
     2489inline ULONG _DosSetDOSProperty(SGID a, PCSZ b, ULONG c, PCSZ d)
    24902490{
    24912491 ULONG yyrc;
    … …  
    25032503#endif
    25042504#ifdef INCL_DOSPROCESS
    2505 inline ULONG APIENTRY _DosDebug(uDB_t *a)
     2505inline ULONG _DosDebug(uDB_t *a)
    25062506{
    25072507 ULONG yyrc;
    … …  
    25192519#endif
    25202520#ifdef INCL_DOSMISC
    2521 inline ULONG APIENTRY _DosGetMessage(PCHAR *a, ULONG b, PCHAR c, ULONG d, ULONG e, PCSZ f, PULONG g)
     2521inline ULONG _DosGetMessage(PCHAR *a, ULONG b, PCHAR c, ULONG d, ULONG e, PCSZ f, PULONG g)
    25222522{
    25232523 ULONG yyrc;
    … …  
    25332533#define DosGetMessage _DosGetMessage
    25342534
    2535 inline ULONG APIENTRY _DosInsertMessage(PCHAR *a, ULONG b, PCSZ c, ULONG d, PCHAR e, ULONG f, PULONG g)
     2535inline ULONG _DosInsertMessage(PCHAR *a, ULONG b, PCSZ c, ULONG d, PCHAR e, ULONG f, PULONG g)
    25362536{
    25372537 ULONG yyrc;
    … …  
    25472547#define DosInsertMessage _DosInsertMessage
    25482548
    2549 inline ULONG APIENTRY _DosPutMessage(HFILE a, ULONG b, PCHAR c)
     2549inline ULONG _DosPutMessage(HFILE a, ULONG b, PCHAR c)
    25502550{
    25512551 ULONG yyrc;
    … …  
    25612561#define DosPutMessage _DosPutMessage
    25622562
    2563 inline ULONG APIENTRY _DosQueryMessageCP(PCHAR a, ULONG b, PCSZ c, PULONG d)
     2563inline ULONG _DosQueryMessageCP(PCHAR a, ULONG b, PCSZ c, PULONG d)
    25642564{
    25652565 ULONG yyrc;
    … …  
    25772577#endif
    25782578#ifdef INCL_DOSRAS
    2579 inline ULONG APIENTRY _DosDumpProcess(ULONG a, ULONG b, PID c)
     2579inline ULONG _DosDumpProcess(ULONG a, ULONG b, PID c)
    25802580{
    25812581 ULONG yyrc;
    … …  
    25912591#define DosDumpProcess _DosDumpProcess
    25922592
    2593 inline ULONG APIENTRY _DosForceSystemDump(ULONG a)
     2593inline ULONG _DosForceSystemDump(ULONG a)
    25942594{
    25952595 ULONG yyrc;
    … …  
    26052605#define DosForceSystemDump _DosForceSystemDump
    26062606
    2607 inline ULONG APIENTRY _DosQueryRASInfo(ULONG a, PPVOID b)
     2607inline ULONG _DosQueryRASInfo(ULONG a, PPVOID b)
    26082608{
    26092609 ULONG yyrc;
    … …  
    26192619#define DosQueryRASInfo _DosQueryRASInfo
    26202620
    2621 inline ULONG APIENTRY _DosSuppressPopUps(ULONG a, ULONG b)
     2621inline ULONG _DosSuppressPopUps(ULONG a, ULONG b)
    26222622{
    26232623 ULONG yyrc;
    … …  
    26352635#endif
    26362636#ifdef INCL_RXSUBCOM
    2637 inline ULONG APIENTRY _RexxDeregisterSubcom(PCSZ a, PCSZ b)
     2637inline ULONG _RexxDeregisterSubcom(PCSZ a, PCSZ b)
    26382638{
    26392639 ULONG yyrc;
    … …  
    26492649#define RexxDeregisterSubcom _RexxDeregisterSubcom
    26502650
    2651 inline ULONG APIENTRY _RexxQuerySubcom(PCSZ a, PCSZ b, PUSHORT c, PUCHAR d)
     2651inline ULONG _RexxQuerySubcom(PCSZ a, PCSZ b, PUSHORT c, PUCHAR d)
    26522652{
    26532653 ULONG yyrc;
    … …  
    26632663#define RexxQuerySubcom _RexxQuerySubcom
    26642664
    2665 inline ULONG APIENTRY _RexxRegisterSubcomDll(PCSZ a, PCSZ b, PCSZ c, PUCHAR d, ULONG e)
     2665inline ULONG _RexxRegisterSubcomDll(PCSZ a, PCSZ b, PCSZ c, PUCHAR d, ULONG e)
    26662666{
    26672667 ULONG yyrc;
    … …  
    26772677#define RexxRegisterSubcomDll _RexxRegisterSubcomDll
    26782678
    2679 inline ULONG APIENTRY _RexxRegisterSubcomExe(PCSZ a, PFN b, PUCHAR c)
     2679inline ULONG _RexxRegisterSubcomExe(PCSZ a, PFN b, PUCHAR c)
    26802680{
    26812681 ULONG yyrc;
    … …  
    26932693#endif
    26942694#ifdef INCL_RXSHV
    2695 inline ULONG APIENTRY _RexxVariablePool(PSHVBLOCK a)
     2695inline ULONG _RexxVariablePool(PSHVBLOCK a)
    26962696{
    26972697 ULONG yyrc;
    … …  
    27092709#endif
    27102710#ifdef INCL_RXFUNC
    2711 inline ULONG APIENTRY _RexxDeregisterFunction(PCSZ a)
     2711inline ULONG _RexxDeregisterFunction(PCSZ a)
    27122712{
    27132713 ULONG yyrc;
    … …  
    27232723#define RexxDeregisterFunction _RexxDeregisterFunction
    27242724
    2725 inline ULONG APIENTRY _RexxQueryFunction(PCSZ a)
     2725inline ULONG _RexxQueryFunction(PCSZ a)
    27262726{
    27272727 ULONG yyrc;
    … …  
    27372737#define RexxQueryFunction _RexxQueryFunction
    27382738
    2739 inline ULONG APIENTRY _RexxRegisterFunctionDll(PCSZ a, PCSZ b, PCSZ c)
     2739inline ULONG _RexxRegisterFunctionDll(PCSZ a, PCSZ b, PCSZ c)
    27402740{
    27412741 ULONG yyrc;
    … …  
    27512751#define RexxRegisterFunctionDll _RexxRegisterFunctionDll
    27522752
    2753 inline ULONG APIENTRY _RexxRegisterFunctionExe(PCSZ a, RexxFunctionHandler *b)
     2753inline ULONG _RexxRegisterFunctionExe(PCSZ a, RexxFunctionHandler *b)
    27542754{
    27552755 ULONG yyrc;
    … …  
    27672767#endif
    27682768#ifdef INCL_RXSYSEXIT
    2769 inline ULONG APIENTRY _RexxDeregisterExit(PCSZ a, PCSZ b)
     2769inline ULONG _RexxDeregisterExit(PCSZ a, PCSZ b)
    27702770{
    27712771 ULONG yyrc;
    … …  
    27812781#define RexxDeregisterExit _RexxDeregisterExit
    27822782
    2783 inline ULONG APIENTRY _RexxQueryExit(PCSZ a, PCSZ b, PUSHORT c, PUCHAR d)
     2783inline ULONG _RexxQueryExit(PCSZ a, PCSZ b, PUSHORT c, PUCHAR d)
    27842784{
    27852785 ULONG yyrc;
    … …  
    27952795#define RexxQueryExit _RexxQueryExit
    27962796
    2797 inline ULONG APIENTRY _RexxRegisterExitDll(PCSZ a, PCSZ b, PCSZ c, PUCHAR d, ULONG e)
     2797inline ULONG _RexxRegisterExitDll(PCSZ a, PCSZ b, PCSZ c, PUCHAR d, ULONG e)
    27982798{
    27992799 ULONG yyrc;
    … …  
    28092809#define RexxRegisterExitDll _RexxRegisterExitDll
    28102810
    2811 inline ULONG APIENTRY _RexxRegisterExitExe(PCSZ a, PFN b, PUCHAR c)
     2811inline ULONG _RexxRegisterExitExe(PCSZ a, PFN b, PUCHAR c)
    28122812{
    28132813 ULONG yyrc;
    … …  
    28252825#endif
    28262826#ifdef INCL_RXARI
    2827 inline ULONG APIENTRY _RexxResetTrace(PID a, TID b)
     2827inline ULONG _RexxResetTrace(PID a, TID b)
    28282828{
    28292829 ULONG yyrc;
    … …  
    28392839#define RexxResetTrace _RexxResetTrace
    28402840
    2841 inline ULONG APIENTRY _RexxSetHalt(PID a, TID b)
     2841inline ULONG _RexxSetHalt(PID a, TID b)
    28422842{
    28432843 ULONG yyrc;
    … …  
    28532853#define RexxSetHalt _RexxSetHalt
    28542854
    2855 inline ULONG APIENTRY _RexxSetTrace(PID a, TID b)
     2855inline ULONG _RexxSetTrace(PID a, TID b)
    28562856{
    28572857 ULONG yyrc;
    … …  
    28692869#endif
    28702870#ifdef INCL_RXMACRO
    2871 inline ULONG APIENTRY _RexxAddMacro(PCSZ a, PCSZ b, ULONG c)
     2871inline ULONG _RexxAddMacro(PCSZ a, PCSZ b, ULONG c)
    28722872{
    28732873 ULONG yyrc;
    … …  
    28832883#define RexxAddMacro _RexxAddMacro
    28842884
    2885 inline ULONG APIENTRY _RexxClearMacroSpace()
     2885inline ULONG _RexxClearMacroSpace()
    28862886{
    28872887 ULONG yyrc;
    … …  
    28972897#define RexxClearMacroSpace _RexxClearMacroSpace
    28982898
    2899 inline ULONG APIENTRY _RexxDropMacro(PCSZ a)
     2899inline ULONG _RexxDropMacro(PCSZ a)
    29002900{
    29012901 ULONG yyrc;
    … …  
    29112911#define RexxDropMacro _RexxDropMacro
    29122912
    2913 inline ULONG APIENTRY _RexxLoadMacroSpace(ULONG a, PCSZ *b, PCSZ c)
     2913inline ULONG _RexxLoadMacroSpace(ULONG a, PCSZ *b, PCSZ c)
    29142914{
    29152915 ULONG yyrc;
    … …  
    29252925#define RexxLoadMacroSpace _RexxLoadMacroSpace
    29262926
    2927 inline ULONG APIENTRY _RexxQueryMacro(PCSZ a, PUSHORT b)
     2927inline ULONG _RexxQueryMacro(PCSZ a, PUSHORT b)
    29282928{
    29292929 ULONG yyrc;
    … …  
    29392939#define RexxQueryMacro _RexxQueryMacro
    29402940
    2941 inline ULONG APIENTRY _RexxReorderMacro(PCSZ a, ULONG b)
     2941inline ULONG _RexxReorderMacro(PCSZ a, ULONG b)
    29422942{
    29432943 ULONG yyrc;
    … …  
    29532953#define RexxReorderMacro _RexxReorderMacro
    29542954
    2955 inline ULONG APIENTRY _RexxSaveMacroSpace(ULONG a, PCSZ *b, PCSZ c)
     2955inline ULONG _RexxSaveMacroSpace(ULONG a, PCSZ *b, PCSZ c)
    29562956{
    29572957 ULONG yyrc;
    … …  
    29672967#define RexxSaveMacroSpace _RexxSaveMacroSpace
    29682968
    2969 inline LONG APIENTRY _RexxStart(LONG a, PRXSTRING b, PCSZ c, PRXSTRING d, PCSZ e, LONG f, PRXSYSEXIT g, PSHORT h, PRXSTRING i)
     2969inline LONG _RexxStart(LONG a, PRXSTRING b, PCSZ c, PRXSTRING d, PCSZ e, LONG f, PRXSYSEXIT g, PSHORT h, PRXSTRING i)
    29702970{
    29712971 LONG yyrc;
    … …  
    29842984#ifdef INCL_WIN
    29852985#ifdef INCL_WINMESSAGEMGR
    2986 inline BOOL APIENTRY _WinCancelShutdown(HMQ a, BOOL b)
     2986inline BOOL _WinCancelShutdown(HMQ a, BOOL b)
    29872987{
    29882988 BOOL yyrc;
    … …  
    29982998#define WinCancelShutdown _WinCancelShutdown
    29992999
    3000 inline HMQ APIENTRY _WinCreateMsgQueue(HAB a, LONG b)
     3000inline HMQ _WinCreateMsgQueue(HAB a, LONG b)
    30013001{
    30023002 HMQ yyrc;
    … …  
    30123012#define WinCreateMsgQueue _WinCreateMsgQueue
    30133013
    3014 inline BOOL APIENTRY _WinDestroyMsgQueue(HMQ a)
     3014inline BOOL _WinDestroyMsgQueue(HMQ a)
    30153015{
    30163016 BOOL yyrc;
    … …  
    30263026#define WinDestroyMsgQueue _WinDestroyMsgQueue
    30273027
    3028 inline MRESULT APIENTRY _WinDispatchMsg(HAB a, PQMSG b)
     3028inline MRESULT _WinDispatchMsg(HAB a, PQMSG b)
    30293029{
    30303030 MRESULT yyrc;
    … …  
    30403040#define WinDispatchMsg _WinDispatchMsg
    30413041
    3042 inline BOOL APIENTRY _WinGetMsg(HAB a, PQMSG b, HWND c, ULONG d, ULONG e)
     3042inline BOOL _WinGetMsg(HAB a, PQMSG b, HWND c, ULONG d, ULONG e)
    30433043{
    30443044 BOOL yyrc;
    … …  
    30543054#define WinGetMsg _WinGetMsg
    30553055
    3056 inline BOOL APIENTRY _WinLockInput(HMQ a, ULONG b)
     3056inline BOOL _WinLockInput(HMQ a, ULONG b)
    30573057{
    30583058 BOOL yyrc;
    … …  
    30683068#define WinLockInput _WinLockInput
    30693069
    3070 inline BOOL APIENTRY _WinPeekMsg(HAB a, PQMSG b, HWND c, ULONG d, ULONG e, ULONG f)
     3070inline BOOL _WinPeekMsg(HAB a, PQMSG b, HWND c, ULONG d, ULONG e, ULONG f)
    30713071{
    30723072 BOOL yyrc;
    … …  
    30823082#define WinPeekMsg _WinPeekMsg
    30833083
    3084 inline BOOL APIENTRY _WinPostMsg(HWND a, ULONG b, MPARAM c, MPARAM d)
     3084inline BOOL _WinPostMsg(HWND a, ULONG b, MPARAM c, MPARAM d)
    30853085{
    30863086 BOOL yyrc;
    … …  
    30963096#define WinPostMsg _WinPostMsg
    30973097
    3098 inline HMQ APIENTRY _WinQueueFromID(HAB a, PID b, TID c)
     3098inline HMQ _WinQueueFromID(HAB a, PID b, TID c)
    30993099{
    31003100 HMQ yyrc;
    … …  
    31103110#define WinQueueFromID _WinQueueFromID
    31113111
    3112 inline BOOL APIENTRY _WinQueryQueueInfo(HMQ a, PMQINFO b, ULONG c)
     3112inline BOOL _WinQueryQueueInfo(HMQ a, PMQINFO b, ULONG c)
    31133113{
    31143114 BOOL yyrc;
    … …  
    31243124#define WinQueryQueueInfo _WinQueryQueueInfo
    31253125
    3126 inline HMQ APIENTRY _WinQuerySendMsg(HAB a, HMQ b, HMQ c, PQMSG d)
     3126inline HMQ _WinQuerySendMsg(HAB a, HMQ b, HMQ c, PQMSG d)
    31273127{
    31283128 HMQ yyrc;
    … …  
    31383138#define WinQuerySendMsg _WinQuerySendMsg
    31393139
    3140 inline BOOL APIENTRY _WinRegisterUserDatatype(HAB a, LONG b, LONG c, PLONG d)
     3140inline BOOL _WinRegisterUserDatatype(HAB a, LONG b, LONG c, PLONG d)
    31413141{
    31423142 BOOL yyrc;
    … …  
    31523152#define WinRegisterUserDatatype _WinRegisterUserDatatype
    31533153
    3154 inline BOOL APIENTRY _WinRegisterUserMsg(HAB a, ULONG b, LONG c, LONG d, LONG e, LONG f, LONG g)
     3154inline BOOL _WinRegisterUserMsg(HAB a, ULONG b, LONG c, LONG d, LONG e, LONG f, LONG g)
    31553155{
    31563156 BOOL yyrc;
    … …  
    31663166#define WinRegisterUserMsg _WinRegisterUserMsg
    31673167
    3168 inline BOOL APIENTRY _WinReplyMsg(HAB a, HMQ b, HMQ c, MRESULT d)
     3168inline BOOL _WinReplyMsg(HAB a, HMQ b, HMQ c, MRESULT d)
    31693169{
    31703170 BOOL yyrc;
    … …  
    31803180#define WinReplyMsg _WinReplyMsg
    31813181
    3182 inline MRESULT APIENTRY _WinSendMsg(HWND a, ULONG b, MPARAM c, MPARAM d)
     3182inline MRESULT _WinSendMsg(HWND a, ULONG b, MPARAM c, MPARAM d)
    31833183{
    31843184 MRESULT yyrc;
    … …  
    31943194#define WinSendMsg _WinSendMsg
    31953195
    3196 inline BOOL APIENTRY _WinSetMsgMode(HAB a, PCSZ b, LONG c)
     3196inline BOOL _WinSetMsgMode(HAB a, PCSZ b, LONG c)
    31973197{
    31983198 BOOL yyrc;
    … …  
    32083208#define WinSetMsgMode _WinSetMsgMode
    32093209
    3210 inline BOOL APIENTRY _WinSetSynchroMode(HAB a, LONG b)
     3210inline BOOL _WinSetSynchroMode(HAB a, LONG b)
    32113211{
    32123212 BOOL yyrc;
    … …  
    32223222#define WinSetSynchroMode _WinSetSynchroMode
    32233223
    3224 inline BOOL APIENTRY _WinThreadAssocQueue(HAB a, HMQ b)
     3224inline BOOL _WinThreadAssocQueue(HAB a, HMQ b)
    32253225{
    32263226 BOOL yyrc;
    … …  
    32363236#define WinThreadAssocQueue _WinThreadAssocQueue
    32373237
    3238 inline BOOL APIENTRY _WinWakeThread(HMQ a)
     3238inline BOOL _WinWakeThread(HMQ a)
    32393239{
    32403240 BOOL yyrc;
    … …  
    32513251
    32523252#endif
    3253 inline HWND APIENTRY _WinCreateWindow(HWND a, PCSZ b, PCSZ c, ULONG d, LONG e, LONG f, LONG g, LONG h, HWND i, HWND j, ULONG k, PVOID l, PVOID m)
     3253inline HWND _WinCreateWindow(HWND a, PCSZ b, PCSZ c, ULONG d, LONG e, LONG f, LONG g, LONG h, HWND i, HWND j, ULONG k, PVOID l, PVOID m)
    32543254{
    32553255 HWND yyrc;
    … …  
    32653265#define WinCreateWindow _WinCreateWindow
    32663266
    3267 inline BOOL APIENTRY _WinDrawBitmap(HPS a, HBITMAP b, PRECTL c, PPOINTL d, LONG e, LONG f, ULONG g)
     3267inline BOOL _WinDrawBitmap(HPS a, HBITMAP b, PRECTL c, PPOINTL d, LONG e, LONG f, ULONG g)
    32683268{
    32693269 BOOL yyrc;
    … …  
    32793279#define WinDrawBitmap _WinDrawBitmap
    32803280
    3281 inline BOOL APIENTRY _WinDrawBorder(HPS a, PRECTL b, LONG c, LONG d, LONG e, LONG f, ULONG g)
     3281inline BOOL _WinDrawBorder(HPS a, PRECTL b, LONG c, LONG d, LONG e, LONG f, ULONG g)
    32823282{
    32833283 BOOL yyrc;
    … …  
    32933293#define WinDrawBorder _WinDrawBorder
    32943294
    3295 inline LONG APIENTRY _WinDrawText(HPS a, LONG b, PCH c, PRECTL d, LONG e, LONG f, ULONG g)
     3295inline LONG _WinDrawText(HPS a, LONG b, PCH c, PRECTL d, LONG e, LONG f, ULONG g)
    32963296{
    32973297 LONG yyrc;
    … …  
    33073307#define WinDrawText _WinDrawText
    33083308
    3309 inline BOOL APIENTRY _WinEnableWindow(HWND a, BOOL b)
     3309inline BOOL _WinEnableWindow(HWND a, BOOL b)
    33103310{
    33113311 BOOL yyrc;
    … …  
    33213321#define WinEnableWindow _WinEnableWindow
    33223322
    3323 inline BOOL APIENTRY _WinEnableWindowUpdate(HWND a, BOOL b)
     3323inline BOOL _WinEnableWindowUpdate(HWND a, BOOL b)
    33243324{
    33253325 BOOL yyrc;
    … …  
    33353335#define WinEnableWindowUpdate _WinEnableWindowUpdate
    33363336
    3337 inline BOOL APIENTRY _WinInvalidateRect(HWND a, PRECTL b, BOOL c)
     3337inline BOOL _WinInvalidateRect(HWND a, PRECTL b, BOOL c)
    33383338{
    33393339 BOOL yyrc;
    … …  
    33493349#define WinInvalidateRect _WinInvalidateRect
    33503350
    3351 inline BOOL APIENTRY _WinInvalidateRegion(HWND a, HRGN b, BOOL c)
     3351inline BOOL _WinInvalidateRegion(HWND a, HRGN b, BOOL c)
    33523352{
    33533353 BOOL yyrc;
    … …  
    33633363#define WinInvalidateRegion _WinInvalidateRegion
    33643364
    3365 inline BOOL APIENTRY _WinInvertRect(HPS a, PRECTL b)
     3365inline BOOL _WinInvertRect(HPS a, PRECTL b)
    33663366{
    33673367 BOOL yyrc;
    … …  
    33773377#define WinInvertRect _WinInvertRect
    33783378
    3379 inline BOOL APIENTRY _WinIsChild(HWND a, HWND b)
     3379inline BOOL _WinIsChild(HWND a, HWND b)
    33803380{
    33813381 BOOL yyrc;
    … …  
    33913391#define WinIsChild _WinIsChild
    33923392
    3393 inline BOOL APIENTRY _WinIsWindow(HAB a, HWND b)
     3393inline BOOL _WinIsWindow(HAB a, HWND b)
    33943394{
    33953395 BOOL yyrc;
    … …  
    34053405#define WinIsWindow _WinIsWindow
    34063406
    3407 inline BOOL APIENTRY _WinIsWindowEnabled(HWND a)
     3407inline BOOL _WinIsWindowEnabled(HWND a)
    34083408{
    34093409 BOOL yyrc;
    … …  
    34193419#define WinIsWindowEnabled _WinIsWindowEnabled
    34203420
    3421 inline BOOL APIENTRY _WinIsWindowVisible(HWND a)
     3421inline BOOL _WinIsWindowVisible(HWND a)
    34223422{
    34233423 BOOL yyrc;
    … …  
    34333433#define WinIsWindowVisible _WinIsWindowVisible
    34343434
    3435 inline LONG APIENTRY _WinLoadMessage(HAB a, HMODULE b, ULONG c, LONG d, PSZ e)
     3435inline LONG _WinLoadMessage(HAB a, HMODULE b, ULONG c, LONG d, PSZ e)
    34363436{
    34373437 LONG yyrc;
    … …  
    34473447#define WinLoadMessage _WinLoadMessage
    34483448
    3449 inline LONG APIENTRY _WinLoadString(HAB a, HMODULE b, ULONG c, LONG d, PSZ e)
     3449inline LONG _WinLoadString(HAB a, HMODULE b, ULONG c, LONG d, PSZ e)
    34503450{
    34513451 LONG yyrc;
    … …  
    34613461#define WinLoadString _WinLoadString
    34623462
    3463 inline LONG APIENTRY _WinMultWindowFromIDs(HWND a, PHWND b, ULONG c, ULONG d)
     3463inline LONG _WinMultWindowFromIDs(HWND a, PHWND b, ULONG c, ULONG d)
    34643464{
    34653465 LONG yyrc;
    … …  
    34753475#define WinMultWindowFromIDs _WinMultWindowFromIDs
    34763476
    3477 inline HWND APIENTRY _WinQueryDesktopWindow(HAB a, HDC b)
     3477inline HWND _WinQueryDesktopWindow(HAB a, HDC b)
    34783478{
    34793479 HWND yyrc;
    … …  
    34893489#define WinQueryDesktopWindow _WinQueryDesktopWindow
    34903490
    3491 inline HWND APIENTRY _WinQueryObjectWindow(HWND a)
     3491inline HWND _WinQueryObjectWindow(HWND a)
    34923492{
    34933493 HWND yyrc;
    … …  
    35033503#define WinQueryObjectWindow _WinQueryObjectWindow
    35043504
    3505 inline HPOINTER APIENTRY _WinQueryPointer(HWND a)
     3505inline HPOINTER _WinQueryPointer(HWND a)
    35063506{
    35073507 HPOINTER yyrc;
    … …  
    35173517#define WinQueryPointer _WinQueryPointer
    35183518
    3519 inline HWND APIENTRY _WinQueryWindow(HWND a, LONG b)
     3519inline HWND _WinQueryWindow(HWND a, LONG b)
    35203520{
    35213521 HWND yyrc;
    … …  
    35313531#define WinQueryWindow _WinQueryWindow
    35323532
    3533 inline BOOL APIENTRY _WinQueryWindowPos(HWND a, PSWP b)
     3533inline BOOL _WinQueryWindowPos(HWND a, PSWP b)
    35343534{
    35353535 BOOL yyrc;
    … …  
    35453545#define WinQueryWindowPos _WinQueryWindowPos
    35463546
    3547 inline BOOL APIENTRY _WinQueryWindowProcess(HWND a, PPID b, PTID c)
     3547inline BOOL _WinQueryWindowProcess(HWND a, PPID b, PTID c)
    35483548{
    35493549 BOOL yyrc;
    … …  
    35593559#define WinQueryWindowProcess _WinQueryWindowProcess
    35603560
    3561 inline LONG APIENTRY _WinQueryWindowText(HWND a, LONG b, PCH c)
     3561inline LONG _WinQueryWindowText(HWND a, LONG b, PCH c)
    35623562{
    35633563 LONG yyrc;
    … …  
    35733573#define WinQueryWindowText _WinQueryWindowText
    35743574
    3575 inline LONG APIENTRY _WinQueryWindowTextLength(HWND a)
     3575inline LONG _WinQueryWindowTextLength(HWND a)
    35763576{
    35773577 LONG yyrc;
    … …  
    35873587#define WinQueryWindowTextLength _WinQueryWindowTextLength
    35883588
    3589 inline BOOL APIENTRY _WinSetMultWindowPos(HAB a, PSWP b, ULONG c)
     3589inline BOOL _WinSetMultWindowPos(HAB a, PSWP b, ULONG c)
    35903590{
    35913591 BOOL yyrc;
    … …  
    36013601#define WinSetMultWindowPos _WinSetMultWindowPos
    36023602
    3603 inline BOOL APIENTRY _WinSetOwner(HWND a, HWND b)
     3603inline BOOL _WinSetOwner(HWND a, HWND b)
    36043604{
    36053605 BOOL yyrc;
    … …  
    36153615#define WinSetOwner _WinSetOwner
    36163616
    3617 inline BOOL APIENTRY _WinSetParent(HWND a, HWND b, BOOL c)
     3617inline BOOL _WinSetParent(HWND a, HWND b, BOOL c)
    36183618{
    36193619 BOOL yyrc;
    … …  
    36293629#define WinSetParent _WinSetParent
    36303630
    3631 inline BOOL APIENTRY _WinSetWindowPos(HWND a, HWND b, LONG c, LONG d, LONG e, LONG f, ULONG g)
     3631inline BOOL _WinSetWindowPos(HWND a, HWND b, LONG c, LONG d, LONG e, LONG f, ULONG g)
    36323632{
    36333633 BOOL yyrc;
    … …  
    36433643#define WinSetWindowPos _WinSetWindowPos
    36443644
    3645 inline BOOL APIENTRY _WinSetWindowText(HWND a, PCSZ b)
     3645inline BOOL _WinSetWindowText(HWND a, PCSZ b)
    36463646{
    36473647 BOOL yyrc;
    … …  
    36573657#define WinSetWindowText _WinSetWindowText
    36583658
    3659 inline BOOL APIENTRY _WinUpdateWindow(HWND a)
     3659inline BOOL _WinUpdateWindow(HWND a)
    36603660{
    36613661 BOOL yyrc;
    … …  
    36713671#define WinUpdateWindow _WinUpdateWindow
    36723672
    3673 inline HWND APIENTRY _WinWindowFromID(HWND a, ULONG b)
     3673inline HWND _WinWindowFromID(HWND a, ULONG b)
    36743674{
    36753675 HWND yyrc;
    … …  
    36863686
    36873687#ifdef INCL_WINFRAMEMGR
    3688 inline HWND APIENTRY _WinCreateStdWindow(HWND a, ULONG b, PULONG c, PCSZ d, PCSZ e, ULONG f, HMODULE g, ULONG h, PHWND i)
     3688inline HWND _WinCreateStdWindow(HWND a, ULONG b, PULONG c, PCSZ d, PCSZ e, ULONG f, HMODULE g, ULONG h, PHWND i)
    36893689{
    36903690 HWND yyrc;
    … …  
    37003700#define WinCreateStdWindow _WinCreateStdWindow
    37013701
    3702 inline BOOL APIENTRY _WinCalcFrameRect(HWND a, PRECTL b, BOOL c)
     3702inline BOOL _WinCalcFrameRect(HWND a, PRECTL b, BOOL c)
    37033703{
    37043704 BOOL yyrc;
    … …  
    37143714#define WinCalcFrameRect _WinCalcFrameRect
    37153715
    3716 inline BOOL APIENTRY _WinCreateFrameControls(HWND a, PFRAMECDATA b, PCSZ c)
     3716inline BOOL _WinCreateFrameControls(HWND a, PFRAMECDATA b, PCSZ c)
    37173717{
    37183718 BOOL yyrc;
    … …  
    37283728#define WinCreateFrameControls _WinCreateFrameControls
    37293729
    3730 inline BOOL APIENTRY _WinFlashWindow(HWND a, BOOL b)
     3730inline BOOL _WinFlashWindow(HWND a, BOOL b)
    37313731{
    37323732 BOOL yyrc;
    … …  
    37423742#define WinFlashWindow _WinFlashWindow
    37433743
    3744 inline BOOL APIENTRY _WinGetMaxPosition(HWND a, PSWP b)
     3744inline BOOL _WinGetMaxPosition(HWND a, PSWP b)
    37453745{
    37463746 BOOL yyrc;
    … …  
    37563756#define WinGetMaxPosition _WinGetMaxPosition
    37573757
    3758 inline BOOL APIENTRY _WinGetMinPosition(HWND a, PSWP b, PPOINTL c)
     3758inline BOOL _WinGetMinPosition(HWND a, PSWP b, PPOINTL c)
    37593759{
    37603760 BOOL yyrc;
    … …  
    37703770#define WinGetMinPosition _WinGetMinPosition
    37713771
    3772 inline BOOL APIENTRY _WinSaveWindowPos(HSAVEWP a, PSWP b, ULONG c)
     3772inline BOOL _WinSaveWindowPos(HSAVEWP a, PSWP b, ULONG c)
    37733773{
    37743774 BOOL yyrc;
    … …  
    37863786#endif
    37873787#ifdef INCL_WINWINDOWMGR
    3788 inline HPS APIENTRY _WinBeginPaint(HWND a, HPS b, PRECTL c)
     3788inline HPS _WinBeginPaint(HWND a, HPS b, PRECTL c)
    37893789{
    37903790 HPS yyrc;
    … …  
    38003800#define WinBeginPaint _WinBeginPaint
    38013801
    3802 inline MRESULT APIENTRY _WinDefWindowProc(HWND a, ULONG b, MPARAM c, MPARAM d)
     3802inline MRESULT _WinDefWindowProc(HWND a, ULONG b, MPARAM c, MPARAM d)
    38033803{
    38043804 MRESULT yyrc;
    … …  
    38143814#define WinDefWindowProc _WinDefWindowProc
    38153815
    3816 inline BOOL APIENTRY _WinDestroyWindow(HWND a)
     3816inline BOOL _WinDestroyWindow(HWND a)
    38173817{
    38183818 BOOL yyrc;
    … …  
    38283828#define WinDestroyWindow _WinDestroyWindow
    38293829
    3830 inline BOOL APIENTRY _WinEndPaint(HPS a)
     3830inline BOOL _WinEndPaint(HPS a)
    38313831{
    38323832 BOOL yyrc;
    … …  
    38423842#define WinEndPaint _WinEndPaint
    38433843
    3844 inline BOOL APIENTRY _WinFillRect(HPS a, PRECTL b, LONG c)
     3844inline BOOL _WinFillRect(HPS a, PRECTL b, LONG c)
    38453845{
    38463846 BOOL yyrc;
    … …  
    38563856#define WinFillRect _WinFillRect
    38573857
    3858 inline HPS APIENTRY _WinGetClipPS(HWND a, HWND b, ULONG c)
     3858inline HPS _WinGetClipPS(HWND a, HWND b, ULONG c)
    38593859{
    38603860 HPS yyrc;
    … …  
    38703870#define WinGetClipPS _WinGetClipPS
    38713871
    3872 inline HPS APIENTRY _WinGetPS(HWND a)
     3872inline HPS _WinGetPS(HWND a)
    38733873{
    38743874 HPS yyrc;
    … …  
    38843884#define WinGetPS _WinGetPS
    38853885
    3886 inline HAB APIENTRY _WinInitialize(ULONG a)
     3886inline HAB _WinInitialize(ULONG a)
    38873887{
    38883888 HAB yyrc;
    … …  
    38983898#define WinInitialize _WinInitialize
    38993899
    3900 inline BOOL APIENTRY _WinIsWindowShowing(HWND a)
     3900inline BOOL _WinIsWindowShowing(HWND a)
    39013901{
    39023902 BOOL yyrc;
    … …  
    39123912#define WinIsWindowShowing _WinIsWindowShowing
    39133913
    3914 inline HDC APIENTRY _WinOpenWindowDC(HWND a)
     3914inline HDC _WinOpenWindowDC(HWND a)
    39153915{
    39163916 HDC yyrc;
    … …  
    39263926#define WinOpenWindowDC _WinOpenWindowDC
    39273927
    3928 inline HAB APIENTRY _WinQueryAnchorBlock(HWND a)
     3928inline HAB _WinQueryAnchorBlock(HWND a)
    39293929{
    39303930 HAB yyrc;
    … …  
    39403940#define WinQueryAnchorBlock _WinQueryAnchorBlock
    39413941
    3942 inline ULONG APIENTRY _WinQueryVersion(HAB a)
     3942inline ULONG _WinQueryVersion(HAB a)
    39433943{
    39443944 ULONG yyrc;
    … …  
    39543954#define WinQueryVersion _WinQueryVersion
    39553955
    3956 inline BOOL APIENTRY _WinQueryWindowRect(HWND a, PRECTL b)
     3956inline BOOL _WinQueryWindowRect(HWND a, PRECTL b)
    39573957{
    39583958 BOOL yyrc;
    … …  
    39683968#define WinQueryWindowRect _WinQueryWindowRect
    39693969
    3970 inline BOOL APIENTRY _WinRegisterClass(HAB a, PCSZ b, PFNWP c, ULONG d, ULONG e)
     3970inline BOOL _WinRegisterClass(HAB a, PCSZ b, PFNWP c, ULONG d, ULONG e)
    39713971{
    39723972 BOOL yyrc;
    … …  
    39823982#define WinRegisterClass _WinRegisterClass
    39833983
    3984 inline BOOL APIENTRY _WinReleasePS(HPS a)
     3984inline BOOL _WinReleasePS(HPS a)
    39853985{
    39863986 BOOL yyrc;
    … …  
    39963996#define WinReleasePS _WinReleasePS
    39973997
    3998 inline LONG APIENTRY _WinScrollWindow(HWND a, LONG b, LONG c, PRECTL d, PRECTL e, HRGN f, PRECTL g, ULONG h)
     3998inline LONG _WinScrollWindow(HWND a, LONG b, LONG c, PRECTL d, PRECTL e, HRGN f, PRECTL g, ULONG h)
    39993999{
    40004000 LONG yyrc;
    … …  
    40104010#define WinScrollWindow _WinScrollWindow
    40114011
    4012 inline BOOL APIENTRY _WinSetActiveWindow(HWND a, HWND b)
     4012inline BOOL _WinSetActiveWindow(HWND a, HWND b)
    40134013{
    40144014 BOOL yyrc;
    … …  
    40244024#define WinSetActiveWindow _WinSetActiveWindow
    40254025
    4026 inline BOOL APIENTRY _WinShowWindow(HWND a, BOOL b)
     4026inline BOOL _WinShowWindow(HWND a, BOOL b)
    40274027{
    40284028 BOOL yyrc;
    … …  
    40384038#define WinShowWindow _WinShowWindow
    40394039
    4040 inline BOOL APIENTRY _WinTerminate(HAB a)
     4040inline BOOL _WinTerminate(HAB a)
    40414041{
    40424042 BOOL yyrc;
    … …  
    40544054#endif
    40554055#ifdef INCL_WINWINDOWMGR
    4056 inline HENUM APIENTRY _WinBeginEnumWindows(HWND a)
     4056inline HENUM _WinBeginEnumWindows(HWND a)
    40574057{
    40584058 HENUM yyrc;
    … …  
    40684068#define WinBeginEnumWindows _WinBeginEnumWindows
    40694069
    4070 inline BOOL APIENTRY _WinEndEnumWindows(HENUM a)
     4070inline BOOL _WinEndEnumWindows(HENUM a)
    40714071{
    40724072 BOOL yyrc;
    … …  
    40824082#define WinEndEnumWindows _WinEndEnumWindows
    40834083
    4084 inline LONG APIENTRY _WinExcludeUpdateRegion(HPS a, HWND b)
     4084inline LONG _WinExcludeUpdateRegion(HPS a, HWND b)
    40854085{
    40864086 LONG yyrc;
    … …  
    40964096#define WinExcludeUpdateRegion _WinExcludeUpdateRegion
    40974097
    4098 inline HWND APIENTRY _WinGetNextWindow(HENUM a)
     4098inline HWND _WinGetNextWindow(HENUM a)
    40994099{
    41004100 HWND yyrc;
    … …  
    41104110#define WinGetNextWindow _WinGetNextWindow
    41114111
    4112 inline HPS APIENTRY _WinGetScreenPS(HWND a)
     4112inline HPS _WinGetScreenPS(HWND a)
    41134113{
    41144114 HPS yyrc;
    … …  
    41244124#define WinGetScreenPS _WinGetScreenPS
    41254125
    4126 inline BOOL APIENTRY _WinIsThreadActive(HAB a)
     4126inline BOOL _WinIsThreadActive(HAB a)
    41274127{
    41284128 BOOL yyrc;
    … …  
    41384138#define WinIsThreadActive _WinIsThreadActive
    41394139
    4140 inline BOOL APIENTRY _WinLockVisRegions(HWND a, BOOL b)
     4140inline BOOL _WinLockVisRegions(HWND a, BOOL b)
    41414141{
    41424142 BOOL yyrc;
    … …  
    41524152#define WinLockVisRegions _WinLockVisRegions
    41534153
    4154 inline BOOL APIENTRY _WinLockWindowUpdate(HWND a, HWND b)
     4154inline BOOL _WinLockWindowUpdate(HWND a, HWND b)
    41554155{
    41564156 BOOL yyrc;
    … …  
    41664166#define WinLockWindowUpdate _WinLockWindowUpdate
    41674167
    4168 inline BOOL APIENTRY _WinMapWindowPoints(HWND a, HWND b, PPOINTL c, LONG d)
     4168inline BOOL _WinMapWindowPoints(HWND a, HWND b, PPOINTL c, LONG d)
    41694169{
    41704170 BOOL yyrc;
    … …  
    41804180#define WinMapWindowPoints _WinMapWindowPoints
    41814181
    4182 inline HWND APIENTRY _WinQueryActiveWindow(HWND a)
     4182inline HWND _WinQueryActiveWindow(HWND a)
    41834183{
    41844184 HWND yyrc;
    … …  
    41944194#define WinQueryActiveWindow _WinQueryActiveWindow
    41954195
    4196 inline BOOL APIENTRY _WinQueryClassInfo(HAB a, PCSZ b, PCLASSINFO c)
     4196inline BOOL _WinQueryClassInfo(HAB a, PCSZ b, PCLASSINFO c)
    41974197{
    41984198 BOOL yyrc;
    … …  
    42084208#define WinQueryClassInfo _WinQueryClassInfo
    42094209
    4210 inline LONG APIENTRY _WinQueryClassName(HWND a, LONG b, PCH c)
     4210inline LONG _WinQueryClassName(HWND a, LONG b, PCH c)
    42114211{
    42124212 LONG yyrc;
    … …  
    42224222#define WinQueryClassName _WinQueryClassName
    42234223
    4224 inline BOOL APIENTRY _WinQueryUpdateRect(HWND a, PRECTL b)
     4224inline BOOL _WinQueryUpdateRect(HWND a, PRECTL b)
    42254225{
    42264226 BOOL yyrc;
    … …  
    42364236#define WinQueryUpdateRect _WinQueryUpdateRect
    42374237
    4238 inline LONG APIENTRY _WinQueryUpdateRegion(HWND a, HRGN b)
     4238inline LONG _WinQueryUpdateRegion(HWND a, HRGN b)
    42394239{
    42404240 LONG yyrc;
    … …  
    42504250#define WinQueryUpdateRegion _WinQueryUpdateRegion
    42514251
    4252 inline HWND APIENTRY _WinQuerySysModalWindow(HWND a)
     4252inline HWND _WinQuerySysModalWindow(HWND a)
    42534253{
    42544254 HWND yyrc;
    … …  
    42644264#define WinQuerySysModalWindow _WinQuerySysModalWindow
    42654265
    4266 inline HDC APIENTRY _WinQueryWindowDC(HWND a)
     4266inline HDC _WinQueryWindowDC(HWND a)
    42674267{
    42684268 HDC yyrc;
    … …  
    42784278#define WinQueryWindowDC _WinQueryWindowDC
    42794279
    4280 inline PVOID APIENTRY _WinQueryWindowPtr(HWND a, LONG b)
     4280inline PVOID _WinQueryWindowPtr(HWND a, LONG b)
    42814281{
    42824282 PVOID yyrc;
    … …  
    42924292#define WinQueryWindowPtr _WinQueryWindowPtr
    42934293
    4294 inline ULONG APIENTRY _WinQueryWindowULong(HWND a, LONG b)
     4294inline ULONG _WinQueryWindowULong(HWND a, LONG b)
    42954295{
    42964296 ULONG yyrc;
    … …  
    43064306#define WinQueryWindowULong _WinQueryWindowULong
    43074307
    4308 inline USHORT APIENTRY _WinQueryWindowUShort(HWND a, LONG b)
     4308inline USHORT _WinQueryWindowUShort(HWND a, LONG b)
    43094309{
    43104310 USHORT yyrc;
    … …  
    43204320#define WinQueryWindowUShort _WinQueryWindowUShort
    43214321
    4322 inline BOOL APIENTRY _WinSetSysModalWindow(HWND a, HWND b)
     4322inline BOOL _WinSetSysModalWindow(HWND a, HWND b)
    43234323{
    43244324 BOOL yyrc;
    … …  
    43344334#define WinSetSysModalWindow _WinSetSysModalWindow
    43354335
    4336 inline BOOL APIENTRY _WinSetWindowBits(HWND a, LONG b, ULONG c, ULONG d)
     4336inline BOOL _WinSetWindowBits(HWND a, LONG b, ULONG c, ULONG d)
    43374337{
    43384338 BOOL yyrc;
    … …  
    43484348#define WinSetWindowBits _WinSetWindowBits
    43494349
    4350 inline BOOL APIENTRY _WinSetWindowPtr(HWND a, LONG b, PVOID c)
     4350inline BOOL _WinSetWindowPtr(HWND a, LONG b, PVOID c)
    43514351{
    43524352 BOOL yyrc;
    … …  
    43624362#define WinSetWindowPtr _WinSetWindowPtr
    43634363
    4364 inline BOOL APIENTRY _WinSetWindowULong(HWND a, LONG b, ULONG c)
     4364inline BOOL _WinSetWindowULong(HWND a, LONG b, ULONG c)
    43654365{
    43664366 BOOL yyrc;
    … …  
    43764376#define WinSetWindowULong _WinSetWindowULong
    43774377
    4378 inline BOOL APIENTRY _WinSetWindowUShort(HWND a, LONG b, USHORT c)
     4378inline BOOL _WinSetWindowUShort(HWND a, LONG b, USHORT c)
    43794379{
    43804380 BOOL yyrc;
    … …  
    43904390#define WinSetWindowUShort _WinSetWindowUShort
    43914391
    4392 inline PFNWP APIENTRY _WinSubclassWindow(HWND a, PFNWP b)
     4392inline PFNWP _WinSubclassWindow(HWND a, PFNWP b)
    43934393{
    43944394 PFNWP yyrc;
    … …  
    44044404#define WinSubclassWindow _WinSubclassWindow
    44054405
    4406 inline BOOL APIENTRY _WinValidateRect(HWND a, PRECTL b, BOOL c)
     4406inline BOOL _WinValidateRect(HWND a, PRECTL b, BOOL c)
    44074407{
    44084408 BOOL yyrc;
    … …  
    44184418#define WinValidateRect _WinValidateRect
    44194419
    4420 inline BOOL APIENTRY _WinValidateRegion(HWND a, HRGN b, BOOL c)
     4420inline BOOL _WinValidateRegion(HWND a, HRGN b, BOOL c)
    44214421{
    44224422 BOOL yyrc;
    … …  
    44324432#define WinValidateRegion _WinValidateRegion
    44334433
    4434 inline HWND APIENTRY _WinWindowFromDC(HDC a)
     4434inline HWND _WinWindowFromDC(HDC a)
    44354435{
    44364436 HWND yyrc;
    … …  
    44464446#define WinWindowFromDC _WinWindowFromDC
    44474447
    4448 inline HWND APIENTRY _WinWindowFromPoint(HWND a, PPOINTL b, BOOL c)
     4448inline HWND _WinWindowFromPoint(HWND a, PPOINTL b, BOOL c)
    44494449{
    44504450 HWND yyrc;
    … …  
    44624462#endif
    44634463#ifdef INCL_WINACCELERATORS
    4464 inline ULONG APIENTRY _WinCopyAccelTable(HACCEL a, PACCELTABLE b, ULONG c)
     4464inline ULONG _WinCopyAccelTable(HACCEL a, PACCELTABLE b, ULONG c)
    44654465{
    44664466 ULONG yyrc;
    … …  
    44764476#define WinCopyAccelTable _WinCopyAccelTable
    44774477
    4478 inline HACCEL APIENTRY _WinCreateAccelTable(HAB a, PACCELTABLE b)
     4478inline HACCEL _WinCreateAccelTable(HAB a, PACCELTABLE b)
    44794479{
    44804480 HACCEL yyrc;
    … …  
    44904490#define WinCreateAccelTable _WinCreateAccelTable
    44914491
    4492 inline BOOL APIENTRY _WinDestroyAccelTable(HACCEL a)
     4492inline BOOL _WinDestroyAccelTable(HACCEL a)
    44934493{
    44944494 BOOL yyrc;
    … …  
    45044504#define WinDestroyAccelTable _WinDestroyAccelTable
    45054505
    4506 inline HACCEL APIENTRY _WinLoadAccelTable(HAB a, HMODULE b, ULONG c)
     4506inline HACCEL _WinLoadAccelTable(HAB a, HMODULE b, ULONG c)
    45074507{
    45084508 HACCEL yyrc;
    … …  
    45184518#define WinLoadAccelTable _WinLoadAccelTable
    45194519
    4520 inline HACCEL APIENTRY _WinQueryAccelTable(HAB a, HWND b)
     4520inline HACCEL _WinQueryAccelTable(HAB a, HWND b)
    45214521{
    45224522 HACCEL yyrc;
    … …  
    45324532#define WinQueryAccelTable _WinQueryAccelTable
    45334533
    4534 inline BOOL APIENTRY _WinSetAccelTable(HAB a, HACCEL b, HWND c)
     4534inline BOOL _WinSetAccelTable(HAB a, HACCEL b, HWND c)
    45354535{
    45364536 BOOL yyrc;
    … …  
    45464546#define WinSetAccelTable _WinSetAccelTable
    45474547
    4548 inline BOOL APIENTRY _WinTranslateAccel(HAB a, HWND b, HACCEL c, PQMSG d)
     4548inline BOOL _WinTranslateAccel(HAB a, HWND b, HACCEL c, PQMSG d)
    45494549{
    45504550 BOOL yyrc;
    … …  
    45624562#endif
    45634563#ifdef INCL_WINATOM
    4564 inline ATOM APIENTRY _WinAddAtom(HATOMTBL a, PCSZ b)
     4564inline ATOM _WinAddAtom(HATOMTBL a, PCSZ b)
    45654565{
    45664566 ATOM yyrc;
    … …  
    45764576#define WinAddAtom _WinAddAtom
    45774577
    4578 inline HATOMTBL APIENTRY _WinCreateAtomTable(ULONG a, ULONG b)
     4578inline HATOMTBL _WinCreateAtomTable(ULONG a, ULONG b)
    45794579{
    45804580 HATOMTBL yyrc;
    … …  
    45904590#define WinCreateAtomTable _WinCreateAtomTable
    45914591
    4592 inline ATOM APIENTRY _WinDeleteAtom(HATOMTBL a, ATOM b)
     4592inline ATOM _WinDeleteAtom(HATOMTBL a, ATOM b)
    45934593{
    45944594 ATOM yyrc;
    … …  
    46044604#define WinDeleteAtom _WinDeleteAtom
    46054605
    4606 inline HATOMTBL APIENTRY _WinDestroyAtomTable(HATOMTBL a)
     4606inline HATOMTBL _WinDestroyAtomTable(HATOMTBL a)
    46074607{
    46084608 HATOMTBL yyrc;
    … …  
    46184618#define WinDestroyAtomTable _WinDestroyAtomTable
    46194619
    4620 inline ATOM APIENTRY _WinFindAtom(HATOMTBL a, PCSZ b)
     4620inline ATOM _WinFindAtom(HATOMTBL a, PCSZ b)
    46214621{
    46224622 ATOM yyrc;
    … …  
    46324632#define WinFindAtom _WinFindAtom
    46334633
    4634 inline ULONG APIENTRY _WinQueryAtomLength(HATOMTBL a, ATOM b)
     4634inline ULONG _WinQueryAtomLength(HATOMTBL a, ATOM b)
    46354635{
    46364636 ULONG yyrc;
    … …  
    46464646#define WinQueryAtomLength _WinQueryAtomLength
    46474647
    4648 inline ULONG APIENTRY _WinQueryAtomName(HATOMTBL a, ATOM b, PSZ c, ULONG d)
     4648inline ULONG _WinQueryAtomName(HATOMTBL a, ATOM b, PSZ c, ULONG d)
    46494649{
    46504650 ULONG yyrc;
    … …  
    46604660#define WinQueryAtomName _WinQueryAtomName
    46614661
    4662 inline ULONG APIENTRY _WinQueryAtomUsage(HATOMTBL a, ATOM b)
     4662inline ULONG _WinQueryAtomUsage(HATOMTBL a, ATOM b)
    46634663{
    46644664 ULONG yyrc;
    … …  
    46744674#define WinQueryAtomUsage _WinQueryAtomUsage
    46754675
    4676 inline HATOMTBL APIENTRY _WinQuerySystemAtomTable()
     4676inline HATOMTBL _WinQuerySystemAtomTable()
    46774677{
    46784678 HATOMTBL yyrc;
    … …  
    46904690#endif
    46914691#ifdef INCL_WINCLIPBOARD
    4692 inline BOOL APIENTRY _WinCloseClipbrd(HAB a)
     4692inline BOOL _WinCloseClipbrd(HAB a)
    46934693{
    46944694 BOOL yyrc;
    … …  
    47044704#define WinCloseClipbrd _WinCloseClipbrd
    47054705
    4706 inline BOOL APIENTRY _WinEmptyClipbrd(HAB a)
     4706inline BOOL _WinEmptyClipbrd(HAB a)
    47074707{
    47084708 BOOL yyrc;
    … …  
    47184718#define WinEmptyClipbrd _WinEmptyClipbrd
    47194719
    4720 inline ULONG APIENTRY _WinEnumClipbrdFmts(HAB a, ULONG b)
     4720inline ULONG _WinEnumClipbrdFmts(HAB a, ULONG b)
    47214721{
    47224722 ULONG yyrc;
    … …  
    47324732#define WinEnumClipbrdFmts _WinEnumClipbrdFmts
    47334733
    4734 inline BOOL APIENTRY _WinOpenClipbrd(HAB a)
     4734inline BOOL _WinOpenClipbrd(HAB a)
    47354735{
    47364736 BOOL yyrc;
    … …  
    47464746#define WinOpenClipbrd _WinOpenClipbrd
    47474747
    4748 inline ULONG APIENTRY _WinQueryClipbrdData(HAB a, ULONG b)
     4748inline ULONG _WinQueryClipbrdData(HAB a, ULONG b)
    47494749{
    47504750 ULONG yyrc;
    … …  
    47604760#define WinQueryClipbrdData _WinQueryClipbrdData
    47614761
    4762 inline BOOL APIENTRY _WinQueryClipbrdFmtInfo(HAB a, ULONG b, PULONG c)
     4762inline BOOL _WinQueryClipbrdFmtInfo(HAB a, ULONG b, PULONG c)
    47634763{
    47644764 BOOL yyrc;
    … …  
    47744774#define WinQueryClipbrdFmtInfo _WinQueryClipbrdFmtInfo
    47754775
    4776 inline HWND APIENTRY _WinQueryClipbrdOwner(HAB a)
     4776inline HWND _WinQueryClipbrdOwner(HAB a)
    47774777{
    47784778 HWND yyrc;
    … …  
    47884788#define WinQueryClipbrdOwner _WinQueryClipbrdOwner
    47894789
    4790 inline HWND APIENTRY _WinQueryClipbrdViewer(HAB a)
     4790inline HWND _WinQueryClipbrdViewer(HAB a)
    47914791{
    47924792 HWND yyrc;
    … …  
    48024802#define WinQueryClipbrdViewer _WinQueryClipbrdViewer
    48034803
    4804 inline BOOL APIENTRY _WinSetClipbrdData(HAB a, ULONG b, ULONG c, ULONG d)
     4804inline BOOL _WinSetClipbrdData(HAB a, ULONG b, ULONG c, ULONG d)
    48054805{
    48064806 BOOL yyrc;
    … …  
    48164816#define WinSetClipbrdData _WinSetClipbrdData
    48174817
    4818 inline BOOL APIENTRY _WinSetClipbrdOwner(HAB a, HWND b)
     4818inline BOOL _WinSetClipbrdOwner(HAB a, HWND b)
    48194819{
    48204820 BOOL yyrc;
    … …  
    48304830#define WinSetClipbrdOwner _WinSetClipbrdOwner
    48314831
    4832 inline BOOL APIENTRY _WinSetClipbrdViewer(HAB a, HWND b)
     4832inline BOOL _WinSetClipbrdViewer(HAB a, HWND b)
    48334833{
    48344834 BOOL yyrc;
    … …  
    48464846#endif
    48474847#ifdef INCL_WINDDE
    4848 inline BOOL APIENTRY _WinDdeInitiate(HWND a, PCSZ b, PCSZ c, PCONVCONTEXT d)
     4848inline BOOL _WinDdeInitiate(HWND a, PCSZ b, PCSZ c, PCONVCONTEXT d)
    48494849{
    48504850 BOOL yyrc;
    … …  
    48604860#define WinDdeInitiate _WinDdeInitiate
    48614861
    4862 inline BOOL APIENTRY _WinDdePostMsg(HWND a, HWND b, ULONG c, PDDESTRUCT d, ULONG e)
     4862inline BOOL _WinDdePostMsg(HWND a, HWND b, ULONG c, PDDESTRUCT d, ULONG e)
    48634863{
    48644864 BOOL yyrc;
    … …  
    48744874#define WinDdePostMsg _WinDdePostMsg
    48754875
    4876 inline MRESULT APIENTRY _WinDdeRespond(HWND a, HWND b, PCSZ c, PCSZ d, PCONVCONTEXT e)
     4876inline MRESULT _WinDdeRespond(HWND a, HWND b, PCSZ c, PCSZ d, PCONVCONTEXT e)
    48774877{
    48784878 MRESULT yyrc;
    … …  
    48904890#endif
    48914891#ifdef INCL_WINCOUNTRY
    4892 inline ULONG APIENTRY _WinCompareStrings(HAB a, ULONG b, ULONG c, PCSZ d, PCSZ e, ULONG f)
     4892inline ULONG _WinCompareStrings(HAB a, ULONG b, ULONG c, PCSZ d, PCSZ e, ULONG f)
    48934893{
    48944894 ULONG yyrc;
    … …  
    49044904#define WinCompareStrings _WinCompareStrings
    49054905
    4906 inline UCHAR APIENTRY _WinCpTranslateChar(HAB a, ULONG b, UCHAR c, ULONG d)
     4906inline UCHAR _WinCpTranslateChar(HAB a, ULONG b, UCHAR c, ULONG d)
    49074907{
    49084908 UCHAR yyrc;
    … …  
    49184918#define WinCpTranslateChar _WinCpTranslateChar
    49194919
    4920 inline BOOL APIENTRY _WinCpTranslateString(HAB a, ULONG b, PCSZ c, ULONG d, ULONG e, PSZ f)
     4920inline BOOL _WinCpTranslateString(HAB a, ULONG b, PCSZ c, ULONG d, ULONG e, PSZ f)
    49214921{
    49224922 BOOL yyrc;
    … …  
    49324932#define WinCpTranslateString _WinCpTranslateString
    49334933
    4934 inline PCSZ APIENTRY _WinNextChar(HAB a, ULONG b, ULONG c, PCSZ d)
     4934inline PCSZ _WinNextChar(HAB a, ULONG b, ULONG c, PCSZ d)
    49354935{
    49364936 PCSZ yyrc;
    … …  
    49464946#define WinNextChar _WinNextChar
    49474947
    4948 inline PCSZ APIENTRY _WinPrevChar(HAB a, ULONG b, ULONG c, PCSZ d, PCSZ e)
     4948inline PCSZ _WinPrevChar(HAB a, ULONG b, ULONG c, PCSZ d, PCSZ e)
    49494949{
    49504950 PCSZ yyrc;
    … …  
    49604960#define WinPrevChar _WinPrevChar
    49614961
    4962 inline ULONG APIENTRY _WinQueryCp(HMQ a)
     4962inline ULONG _WinQueryCp(HMQ a)
    49634963{
    49644964 ULONG yyrc;
    … …  
    49744974#define WinQueryCp _WinQueryCp
    49754975
    4976 inline ULONG APIENTRY _WinQueryCpList(HAB a, ULONG b, PULONG c)
     4976inline ULONG _WinQueryCpList(HAB a, ULONG b, PULONG c)
    49774977{
    49784978 ULONG yyrc;
    … …  
    49884988#define WinQueryCpList _WinQueryCpList
    49894989
    4990 inline BOOL APIENTRY _WinSetCp(HMQ a, ULONG b)
     4990inline BOOL _WinSetCp(HMQ a, ULONG b)
    49914991{
    49924992 BOOL yyrc;
    … …  
    50025002#define WinSetCp _WinSetCp
    50035003
    5004 inline ULONG APIENTRY _WinUpper(HAB a, ULONG b, ULONG c, PSZ d)
     5004inline ULONG _WinUpper(HAB a, ULONG b, ULONG c, PSZ d)
    50055005{
    50065006 ULONG yyrc;
    … …  
    50165016#define WinUpper _WinUpper
    50175017
    5018 inline ULONG APIENTRY _WinUpperChar(HAB a, ULONG b, ULONG c, ULONG d)
     5018inline ULONG _WinUpperChar(HAB a, ULONG b, ULONG c, ULONG d)
    50195019{
    50205020 ULONG yyrc;
    … …  
    50325032#endif
    50335033#ifdef INCL_WINCURSORS
    5034 inline BOOL APIENTRY _WinCreateCursor(HWND a, LONG b, LONG c, LONG d, LONG e, ULONG f, PRECTL g)
     5034inline BOOL _WinCreateCursor(HWND a, LONG b, LONG c, LONG d, LONG e, ULONG f, PRECTL g)
    50355035{
    50365036 BOOL yyrc;
    … …  
    50465046#define WinCreateCursor _WinCreateCursor
    50475047
    5048 inline BOOL APIENTRY _WinDestroyCursor(HWND a)
     5048inline BOOL _WinDestroyCursor(HWND a)
    50495049{
    50505050 BOOL yyrc;
    … …  
    50605060#define WinDestroyCursor _WinDestroyCursor
    50615061
    5062 inline BOOL APIENTRY _WinShowCursor(HWND a, BOOL b)
     5062inline BOOL _WinShowCursor(HWND a, BOOL b)
    50635063{
    50645064 BOOL yyrc;
    … …  
    50745074#define WinShowCursor _WinShowCursor
    50755075
    5076 inline BOOL APIENTRY _WinQueryCursorInfo(HWND a, PCURSORINFO b)
     5076inline BOOL _WinQueryCursorInfo(HWND a, PCURSORINFO b)
    50775077{
    50785078 BOOL yyrc;
    … …  
    50905090#endif
    50915091#ifdef INCL_WINDESKTOP
    5092 inline BOOL APIENTRY _WinQueryDesktopBkgnd(HWND a, PDESKTOP b)
     5092inline BOOL _WinQueryDesktopBkgnd(HWND a, PDESKTOP b)
    50935093{
    50945094 BOOL yyrc;
    … …  
    51045104#define WinQueryDesktopBkgnd _WinQueryDesktopBkgnd
    51055105
    5106 inline HBITMAP APIENTRY _WinSetDesktopBkgnd(HWND a, PDESKTOP b)
     5106inline HBITMAP _WinSetDesktopBkgnd(HWND a, PDESKTOP b)
    51075107{
    51085108 HBITMAP yyrc;
    … …  
    51205120#endif
    51215121#ifdef INCL_WINDIALOGS
    5122 inline BOOL APIENTRY _WinAlarm(HWND a, ULONG b)
     5122inline BOOL _WinAlarm(HWND a, ULONG b)
    51235123{
    51245124 BOOL yyrc;
    … …  
    51345134#define WinAlarm _WinAlarm
    51355135
    5136 inline MRESULT APIENTRY _WinDefDlgProc(HWND a, ULONG b, MPARAM c, MPARAM d)
     5136inline MRESULT _WinDefDlgProc(HWND a, ULONG b, MPARAM c, MPARAM d)
    51375137{
    51385138 MRESULT yyrc;
    … …  
    51485148#define WinDefDlgProc _WinDefDlgProc
    51495149
    5150 inline BOOL APIENTRY _WinDismissDlg(HWND a, ULONG b)
     5150inline BOOL _WinDismissDlg(HWND a, ULONG b)
    51515151{
    51525152 BOOL yyrc;
    … …  
    51625162#define WinDismissDlg _WinDismissDlg
    51635163
    5164 inline ULONG APIENTRY _WinDlgBox(HWND a, HWND b, PFNWP c, HMODULE d, ULONG e, PVOID f)
     5164inline ULONG _WinDlgBox(HWND a, HWND b, PFNWP c, HMODULE d, ULONG e, PVOID f)
    51655165{
    51665166 ULONG yyrc;
    … …  
    51765176#define WinDlgBox _WinDlgBox
    51775177
    5178 inline BOOL APIENTRY _WinGetDlgMsg(HWND a, PQMSG b)
     5178inline BOOL _WinGetDlgMsg(HWND a, PQMSG b)
    51795179{
    51805180 BOOL yyrc;
    … …  
    51905190#define WinGetDlgMsg _WinGetDlgMsg
    51915191
    5192 inline HWND APIENTRY _WinLoadDlg(HWND a, HWND b, PFNWP c, HMODULE d, ULONG e, PVOID f)
     5192inline HWND _WinLoadDlg(HWND a, HWND b, PFNWP c, HMODULE d, ULONG e, PVOID f)
    51935193{
    51945194 HWND yyrc;
    … …  
    52045204#define WinLoadDlg _WinLoadDlg
    52055205
    5206 inline ULONG APIENTRY _WinMessageBox(HWND a, HWND b, PCSZ c, PCSZ d, ULONG e, ULONG f)
     5206inline ULONG _WinMessageBox(HWND a, HWND b, PCSZ c, PCSZ d, ULONG e, ULONG f)
    52075207{
    52085208 ULONG yyrc;
    … …  
    52185218#define WinMessageBox _WinMessageBox
    52195219
    5220 inline ULONG APIENTRY _WinMessageBox2(HWND a, HWND b, PSZ c, PSZ d, ULONG e, PMB2INFO f)
     5220inline ULONG _WinMessageBox2(HWND a, HWND b, PSZ c, PSZ d, ULONG e, PMB2INFO f)
    52215221{
    52225222 ULONG yyrc;
    … …  
    52325232#define WinMessageBox2 _WinMessageBox2
    52335233
    5234 inline BOOL APIENTRY _WinQueryDlgItemShort(HWND a, ULONG b, PSHORT c, BOOL d)
     5234inline BOOL _WinQueryDlgItemShort(HWND a, ULONG b, PSHORT c, BOOL d)
    52355235{
    52365236 BOOL yyrc;
    … …  
    52465246#define WinQueryDlgItemShort _WinQueryDlgItemShort
    52475247
    5248 inline ULONG APIENTRY _WinQueryDlgItemText(HWND a, ULONG b, LONG c, PSZ d)
     5248inline ULONG _WinQueryDlgItemText(HWND a, ULONG b, LONG c, PSZ d)
    52495249{
    52505250 ULONG yyrc;
    … …  
    52605260#define WinQueryDlgItemText _WinQueryDlgItemText
    52615261
    5262 inline LONG APIENTRY _WinQueryDlgItemTextLength(HWND a, ULONG b)
     5262inline LONG _WinQueryDlgItemTextLength(HWND a, ULONG b)
    52635263{
    52645264 LONG yyrc;
    … …  
    52745274#define WinQueryDlgItemTextLength _WinQueryDlgItemTextLength
    52755275
    5276 inline BOOL APIENTRY _WinSetDlgItemShort(HWND a, ULONG b, USHORT c, BOOL d)
     5276inline BOOL _WinSetDlgItemShort(HWND a, ULONG b, USHORT c, BOOL d)
    52775277{
    52785278 BOOL yyrc;
    … …  
    52885288#define WinSetDlgItemShort _WinSetDlgItemShort
    52895289
    5290 inline BOOL APIENTRY _WinSetDlgItemText(HWND a, ULONG b, PCSZ c)
     5290inline BOOL _WinSetDlgItemText(HWND a, ULONG b, PCSZ c)
    52915291{
    52925292 BOOL yyrc;
    … …  
    53025302#define WinSetDlgItemText _WinSetDlgItemText
    53035303
    5304 inline HWND APIENTRY _WinCreateDlg(HWND a, HWND b, PFNWP c, PDLGTEMPLATE d, PVOID e)
     5304inline HWND _WinCreateDlg(HWND a, HWND b, PFNWP c, PDLGTEMPLATE d, PVOID e)
    53055305{
    53065306 HWND yyrc;
    … …  
    53165316#define WinCreateDlg _WinCreateDlg
    53175317
    5318 inline HWND APIENTRY _WinEnumDlgItem(HWND a, HWND b, ULONG c)
     5318inline HWND _WinEnumDlgItem(HWND a, HWND b, ULONG c)
    53195319{
    53205320 HWND yyrc;
    … …  
    53305330#define WinEnumDlgItem _WinEnumDlgItem
    53315331
    5332 inline BOOL APIENTRY _WinMapDlgPoints(HWND a, PPOINTL b, ULONG c, BOOL d)
     5332inline BOOL _WinMapDlgPoints(HWND a, PPOINTL b, ULONG c, BOOL d)
    53335333{
    53345334 BOOL yyrc;
    … …  
    53445344#define WinMapDlgPoints _WinMapDlgPoints
    53455345
    5346 inline ULONG APIENTRY _WinProcessDlg(HWND a)
     5346inline ULONG _WinProcessDlg(HWND a)
    53475347{
    53485348 ULONG yyrc;
    … …  
    53585358#define WinProcessDlg _WinProcessDlg
    53595359
    5360 inline MRESULT APIENTRY _WinSendDlgItemMsg(HWND a, ULONG b, ULONG c, MPARAM d, MPARAM e)
     5360inline MRESULT _WinSendDlgItemMsg(HWND a, ULONG b, ULONG c, MPARAM d, MPARAM e)
    53615361{
    53625362 MRESULT yyrc;
    … …  
    53725372#define WinSendDlgItemMsg _WinSendDlgItemMsg
    53735373
    5374 inline LONG APIENTRY _WinSubstituteStrings(HWND a, PCSZ b, LONG c, PSZ d)
     5374inline LONG _WinSubstituteStrings(HWND a, PCSZ b, LONG c, PSZ d)
    53755375{
    53765376 LONG yyrc;
    … …  
    53885388#endif
    53895389#ifdef INCL_WINERRORS
    5390 inline ERRORID APIENTRY _WinGetLastError(HAB a)
     5390inline ERRORID _WinGetLastError(HAB a)
    53915391{
    53925392 ERRORID yyrc;
    … …  
    54025402#define WinGetLastError _WinGetLastError
    54035403
    5404 inline BOOL APIENTRY _WinFreeErrorInfo(PERRINFO a)
     5404inline BOOL _WinFreeErrorInfo(PERRINFO a)
    54055405{
    54065406 BOOL yyrc;
    … …  
    54165416#define WinFreeErrorInfo _WinFreeErrorInfo
    54175417
    5418 inline PERRINFO APIENTRY _WinGetErrorInfo(HAB a)
     5418inline PERRINFO _WinGetErrorInfo(HAB a)
    54195419{
    54205420 PERRINFO yyrc;
    … …  
    54325432#endif
    54335433#ifdef INCL_WINHOOKS
    5434 inline BOOL APIENTRY _WinCallMsgFilter(HAB a, PQMSG b, ULONG c)
     5434inline BOOL _WinCallMsgFilter(HAB a, PQMSG b, ULONG c)
    54355435{
    54365436 BOOL yyrc;
    … …  
    54465446#define WinCallMsgFilter _WinCallMsgFilter
    54475447
    5448 inline BOOL APIENTRY _WinReleaseHook(HAB a, HMQ b, LONG c, PFN d, HMODULE e)
     5448inline BOOL _WinReleaseHook(HAB a, HMQ b, LONG c, PFN d, HMODULE e)
    54495449{
    54505450 BOOL yyrc;
    … …  
    54605460#define WinReleaseHook _WinReleaseHook
    54615461
    5462 inline BOOL APIENTRY _WinSetHook(HAB a, HMQ b, LONG c, PFN d, HMODULE e)
     5462inline BOOL _WinSetHook(HAB a, HMQ b, LONG c, PFN d, HMODULE e)
    54635463{
    54645464 BOOL yyrc;
    … …  
    54765476#endif
    54775477#ifdef INCL_WININPUT
    5478 inline BOOL APIENTRY _WinFocusChange(HWND a, HWND b, ULONG c)
     5478inline BOOL _WinFocusChange(HWND a, HWND b, ULONG c)
    54795479{
    54805480 BOOL yyrc;
    … …  
    54905490#define WinFocusChange _WinFocusChange
    54915491
    5492 inline BOOL APIENTRY _WinLockupSystem(HAB a)
     5492inline BOOL _WinLockupSystem(HAB a)
    54935493{
    54945494 BOOL yyrc;
    … …  
    55045504#define WinLockupSystem _WinLockupSystem
    55055505
    5506 inline BOOL APIENTRY _WinSetFocus(HWND a, HWND b)
     5506inline BOOL _WinSetFocus(HWND a, HWND b)
    55075507{
    55085508 BOOL yyrc;
    … …  
    55185518#define WinSetFocus _WinSetFocus
    55195519
    5520 inline BOOL APIENTRY _WinUnlockSystem(HAB a, PSZ b)
     5520inline BOOL _WinUnlockSystem(HAB a, PSZ b)
    55215521{
    55225522 BOOL yyrc;
    … …  
    55325532#define WinUnlockSystem _WinUnlockSystem
    55335533
    5534 inline BOOL APIENTRY _WinCheckInput(HAB a)
     5534inline BOOL _WinCheckInput(HAB a)
    55355535{
    55365536 BOOL yyrc;
    … …  
    55465546#define WinCheckInput _WinCheckInput
    55475547
    5548 inline BOOL APIENTRY _WinEnablePhysInput(HWND a, BOOL b)
     5548inline BOOL _WinEnablePhysInput(HWND a, BOOL b)
    55495549{
    55505550 BOOL yyrc;
    … …  
    55605560#define WinEnablePhysInput _WinEnablePhysInput
    55615561
    5562 inline LONG APIENTRY _WinGetKeyState(HWND a, LONG b)
     5562inline LONG _WinGetKeyState(HWND a, LONG b)
    55635563{
    55645564 LONG yyrc;
    … …  
    55745574#define WinGetKeyState _WinGetKeyState
    55755575
    5576 inline LONG APIENTRY _WinGetPhysKeyState(HWND a, LONG b)
     5576inline LONG _WinGetPhysKeyState(HWND a, LONG b)
    55775577{
    55785578 LONG yyrc;
    … …  
    55885588#define WinGetPhysKeyState _WinGetPhysKeyState
    55895589
    5590 inline BOOL APIENTRY _WinIsPhysInputEnabled(HWND a)
     5590inline BOOL _WinIsPhysInputEnabled(HWND a)
    55915591{
    55925592 BOOL yyrc;
    … …  
    56025602#define WinIsPhysInputEnabled _WinIsPhysInputEnabled
    56035603
    5604 inline HWND APIENTRY _WinQueryCapture(HWND a)
     5604inline HWND _WinQueryCapture(HWND a)
    56055605{
    56065606 HWND yyrc;
    … …  
    56165616#define WinQueryCapture _WinQueryCapture
    56175617
    5618 inline HWND APIENTRY _WinQueryFocus(HWND a)
     5618inline HWND _WinQueryFocus(HWND a)
    56195619{
    56205620 HWND yyrc;
    … …  
    56305630#define WinQueryFocus _WinQueryFocus
    56315631
    5632 inline ULONG APIENTRY _WinQueryVisibleRegion(HWND a, HRGN b)
     5632inline ULONG _WinQueryVisibleRegion(HWND a, HRGN b)
    56335633{
    56345634 ULONG yyrc;
    … …  
    56445644#define WinQueryVisibleRegion _WinQueryVisibleRegion
    56455645
    5646 inline BOOL APIENTRY _WinSetCapture(HWND a, HWND b)
     5646inline BOOL _WinSetCapture(HWND a, HWND b)
    56475647{
    56485648 BOOL yyrc;
    … …  
    56585658#define WinSetCapture _WinSetCapture
    56595659
    5660 inline BOOL APIENTRY _WinSetKeyboardStateTable(HWND a, PBYTE b, BOOL c)
     5660inline BOOL _WinSetKeyboardStateTable(HWND a, PBYTE b, BOOL c)
    56615661{
    56625662 BOOL yyrc;
    … …  
    56725672#define WinSetKeyboardStateTable _WinSetKeyboardStateTable
    56735673
    5674 inline BOOL APIENTRY _WinSetVisibleRegionNotify(HWND a, BOOL b)
     5674inline BOOL _WinSetVisibleRegionNotify(HWND a, BOOL b)
    56755675{
    56765676 BOOL yyrc;
    … …  
    56885688#endif
    56895689#ifdef INCL_WINLOAD
    5690 inline BOOL APIENTRY _WinDeleteLibrary(HAB a, HLIB b)
     5690inline BOOL _WinDeleteLibrary(HAB a, HLIB b)
    56915691{
    56925692 BOOL yyrc;
    … …  
    57025702#define WinDeleteLibrary _WinDeleteLibrary
    57035703
    5704 inline BOOL APIENTRY _WinDeleteProcedure(HAB a, PFNWP b)
     5704inline BOOL _WinDeleteProcedure(HAB a, PFNWP b)
    57055705{
    57065706 BOOL yyrc;
    … …  
    57165716#define WinDeleteProcedure _WinDeleteProcedure
    57175717
    5718 inline HLIB APIENTRY _WinLoadLibrary(HAB a, PCSZ b)
     5718inline HLIB _WinLoadLibrary(HAB a, PCSZ b)
    57195719{
    57205720 HLIB yyrc;
    … …  
    57305730#define WinLoadLibrary _WinLoadLibrary
    57315731
    5732 inline PFNWP APIENTRY _WinLoadProcedure(HAB a, HLIB b, PSZ c)
     5732inline PFNWP _WinLoadProcedure(HAB a, HLIB b, PSZ c)
    57335733{
    57345734 PFNWP yyrc;
    … …  
    57465746#endif
    57475747#ifdef INCL_WINMENUS
    5748 inline HWND APIENTRY _WinCreateMenu(HWND a, PVOID b)
     5748inline HWND _WinCreateMenu(HWND a, PVOID b)
    57495749{
    57505750 HWND yyrc;
    … …  
    57605760#define WinCreateMenu _WinCreateMenu
    57615761
    5762 inline HWND APIENTRY _WinLoadMenu(HWND a, HMODULE b, ULONG c)
     5762inline HWND _WinLoadMenu(HWND a, HMODULE b, ULONG c)
    57635763{
    57645764 HWND yyrc;
    … …  
    57745774#define WinLoadMenu _WinLoadMenu
    57755775
    5776 inline BOOL APIENTRY _WinPopupMenu(HWND a, HWND b, HWND c, LONG d, LONG e, LONG f, ULONG g)
     5776inline BOOL _WinPopupMenu(HWND a, HWND b, HWND c, LONG d, LONG e, LONG f, ULONG g)
    57775777{
    57785778 BOOL yyrc;
    … …  
    57905790#endif
    57915791#ifdef INCL_WINMESSAGEMGR
    5792 inline BOOL APIENTRY _WinBroadcastMsg(HWND a, ULONG b, MPARAM c, MPARAM d, ULONG e)
     5792inline BOOL _WinBroadcastMsg(HWND a, ULONG b, MPARAM c, MPARAM d, ULONG e)
    57935793{
    57945794 BOOL yyrc;
    … …  
    58045804#define WinBroadcastMsg _WinBroadcastMsg
    58055805
    5806 inline BOOL APIENTRY _WinInSendMsg(HAB a)
     5806inline BOOL _WinInSendMsg(HAB a)
    58075807{
    58085808 BOOL yyrc;
    … …  
    58185818#define WinInSendMsg _WinInSendMsg
    58195819
    5820 inline BOOL APIENTRY _WinPostQueueMsg(HMQ a, ULONG b, MPARAM c, MPARAM d)
     5820inline BOOL _WinPostQueueMsg(HMQ a, ULONG b, MPARAM c, MPARAM d)
    58215821{
    58225822 BOOL yyrc;
    … …  
    58325832#define WinPostQueueMsg _WinPostQueueMsg
    58335833
    5834 inline BOOL APIENTRY _WinQueryMsgPos(HAB a, PPOINTL b)
     5834inline BOOL _WinQueryMsgPos(HAB a, PPOINTL b)
    58355835{
    58365836 BOOL yyrc;
    … …  
    58465846#define WinQueryMsgPos _WinQueryMsgPos
    58475847
    5848 inline ULONG APIENTRY _WinQueryMsgTime(HAB a)
     5848inline ULONG _WinQueryMsgTime(HAB a)
    58495849{
    58505850 ULONG yyrc;
    … …  
    58605860#define WinQueryMsgTime _WinQueryMsgTime
    58615861
    5862 inline ULONG APIENTRY _WinQueryQueueStatus(HWND a)
     5862inline ULONG _WinQueryQueueStatus(HWND a)
    58635863{
    58645864 ULONG yyrc;
    … …  
    58745874#define WinQueryQueueStatus _WinQueryQueueStatus
    58755875
    5876 inline ULONG APIENTRY _WinRequestMutexSem(HMTX a, ULONG b)
     5876inline ULONG _WinRequestMutexSem(HMTX a, ULONG b)
    58775877{
    58785878 ULONG yyrc;
    … …  
    58885888#define WinRequestMutexSem _WinRequestMutexSem
    58895889
    5890 inline BOOL APIENTRY _WinSetClassMsgInterest(HAB a, PCSZ b, ULONG c, LONG d)
     5890inline BOOL _WinSetClassMsgInterest(HAB a, PCSZ b, ULONG c, LONG d)
    58915891{
    58925892 BOOL yyrc;
    … …  
    59025902#define WinSetClassMsgInterest _WinSetClassMsgInterest
    59035903
    5904 inline BOOL APIENTRY _WinSetMsgInterest(HWND a, ULONG b, LONG c)
     5904inline BOOL _WinSetMsgInterest(HWND a, ULONG b, LONG c)
    59055905{
    59065906 BOOL yyrc;
    … …  
    59165916#define WinSetMsgInterest _WinSetMsgInterest
    59175917
    5918 inline ULONG APIENTRY _WinWaitEventSem(HEV a, ULONG b)
     5918inline ULONG _WinWaitEventSem(HEV a, ULONG b)
    59195919{
    59205920 ULONG yyrc;
    … …  
    59305930#define WinWaitEventSem _WinWaitEventSem
    59315931
    5932 inline BOOL APIENTRY _WinWaitMsg(HAB a, ULONG b, ULONG c)
     5932inline BOOL _WinWaitMsg(HAB a, ULONG b, ULONG c)
    59335933{
    59345934 BOOL yyrc;
    … …  
    59445944#define WinWaitMsg _WinWaitMsg
    59455945
    5946 inline ULONG APIENTRY _WinWaitMuxWaitSem(HMUX a, ULONG b, PULONG c)
     5946inline ULONG _WinWaitMuxWaitSem(HMUX a, ULONG b, PULONG c)
    59475947{
    59485948 ULONG yyrc;
    … …  
    59605960#endif
    59615961#ifdef INCL_WINPALETTE
    5962 inline LONG APIENTRY _WinRealizePalette(HWND a, HPS b, PULONG c)
     5962inline LONG _WinRealizePalette(HWND a, HPS b, PULONG c)
    59635963{
    59645964 LONG yyrc;
    … …  
    59765976#endif
    59775977#ifdef INCL_WINPOINTERS
    5978 inline HPOINTER APIENTRY _WinCreatePointer(HWND a, HBITMAP b, BOOL c, LONG d, LONG e)
     5978inline HPOINTER _WinCreatePointer(HWND a, HBITMAP b, BOOL c, LONG d, LONG e)
    59795979{
    59805980 HPOINTER yyrc;
    … …  
    59905990#define WinCreatePointer _WinCreatePointer
    59915991
    5992 inline HPOINTER APIENTRY _WinCreatePointerIndirect(HWND a, PPOINTERINFO b)
     5992inline HPOINTER _WinCreatePointerIndirect(HWND a, PPOINTERINFO b)
    59935993{
    59945994 HPOINTER yyrc;
    … …  
    60046004#define WinCreatePointerIndirect _WinCreatePointerIndirect
    60056005
    6006 inline BOOL APIENTRY _WinDestroyPointer(HPOINTER a)
     6006inline BOOL _WinDestroyPointer(HPOINTER a)
    60076007{
    60086008 BOOL yyrc;
    … …  
    60186018#define WinDestroyPointer _WinDestroyPointer
    60196019
    6020 inline BOOL APIENTRY _WinDrawPointer(HPS a, LONG b, LONG c, HPOINTER d, ULONG e)
     6020inline BOOL _WinDrawPointer(HPS a, LONG b, LONG c, HPOINTER d, ULONG e)
    60216021{
    60226022 BOOL yyrc;
    … …  
    60326032#define WinDrawPointer _WinDrawPointer
    60336033
    6034 inline HBITMAP APIENTRY _WinGetSysBitmap(HWND a, ULONG b)
     6034inline HBITMAP _WinGetSysBitmap(HWND a, ULONG b)
    60356035{
    60366036 HBITMAP yyrc;
    … …  
    60466046#define WinGetSysBitmap _WinGetSysBitmap
    60476047
    6048 inline HPOINTER APIENTRY _WinLoadPointer(HWND a, HMODULE b, ULONG c)
     6048inline HPOINTER _WinLoadPointer(HWND a, HMODULE b, ULONG c)
    60496049{
    60506050 HPOINTER yyrc;
    … …  
    60606060#define WinLoadPointer _WinLoadPointer
    60616061
    6062 inline BOOL APIENTRY _WinLockPointerUpdate(HWND a, HPOINTER b, ULONG c)
     6062inline BOOL _WinLockPointerUpdate(HWND a, HPOINTER b, ULONG c)
    60636063{
    60646064 BOOL yyrc;
    … …  
    60746074#define WinLockPointerUpdate _WinLockPointerUpdate
    60756075
    6076 inline BOOL APIENTRY _WinQueryPointerPos(HWND a, PPOINTL b)
     6076inline BOOL _WinQueryPointerPos(HWND a, PPOINTL b)
    60776077{
    60786078 BOOL yyrc;
    … …  
    60886088#define WinQueryPointerPos _WinQueryPointerPos
    60896089
    6090 inline BOOL APIENTRY _WinQueryPointerInfo(HPOINTER a, PPOINTERINFO b)
     6090inline BOOL _WinQueryPointerInfo(HPOINTER a, PPOINTERINFO b)
    60916091{
    60926092 BOOL yyrc;
    … …  
    61026102#define WinQueryPointerInfo _WinQueryPointerInfo
    61036103
    6104 inline HPOINTER APIENTRY _WinQuerySysPointer(HWND a, LONG b, BOOL c)
     6104inline HPOINTER _WinQuerySysPointer(HWND a, LONG b, BOOL c)
    61056105{
    61066106 HPOINTER yyrc;
    … …  
    61166116#define WinQuerySysPointer _WinQuerySysPointer
    61176117
    6118 inline BOOL APIENTRY _WinQuerySysPointerData(HWND a, ULONG b, PICONINFO c)
     6118inline BOOL _WinQuerySysPointerData(HWND a, ULONG b, PICONINFO c)
    61196119{
    61206120 BOOL yyrc;
    … …  
    61306130#define WinQuerySysPointerData _WinQuerySysPointerData
    61316131
    6132 inline BOOL APIENTRY _WinSetPointer(HWND a, HPOINTER b)
     6132inline BOOL _WinSetPointer(HWND a, HPOINTER b)
    61336133{
    61346134 BOOL yyrc;
    … …  
    61446144#define WinSetPointer _WinSetPointer
    61456145
    6146 inline BOOL APIENTRY _WinSetPointerOwner(HPOINTER a, PID b, BOOL c)
     6146inline BOOL _WinSetPointerOwner(HPOINTER a, PID b, BOOL c)
    61476147{
    61486148 BOOL yyrc;
    … …  
    61586158#define WinSetPointerOwner _WinSetPointerOwner
    61596159
    6160 inline BOOL APIENTRY _WinSetPointerPos(HWND a, LONG b, LONG c)
     6160inline BOOL _WinSetPointerPos(HWND a, LONG b, LONG c)
    61616161{
    61626162 BOOL yyrc;
    … …  
    61726172#define WinSetPointerPos _WinSetPointerPos
    61736173
    6174 inline BOOL APIENTRY _WinSetSysPointerData(HWND a, ULONG b, PICONINFO c)
     6174inline BOOL _WinSetSysPointerData(HWND a, ULONG b, PICONINFO c)
    61756175{
    61766176 BOOL yyrc;
    … …  
    61866186#define WinSetSysPointerData _WinSetSysPointerData
    61876187
    6188 inline BOOL APIENTRY _WinShowPointer(HWND a, BOOL b)
     6188inline BOOL _WinShowPointer(HWND a, BOOL b)
    61896189{
    61906190 BOOL yyrc;
    … …  
    62026202#endif
    62036203#ifdef INCL_WINRECTANGLES
    6204 inline BOOL APIENTRY _WinCopyRect(HAB a, PRECTL b, PRECTL c)
     6204inline BOOL _WinCopyRect(HAB a, PRECTL b, PRECTL c)
    62056205{
    62066206 BOOL yyrc;
    … …  
    62166216#define WinCopyRect _WinCopyRect
    62176217
    6218 inline BOOL APIENTRY _WinEqualRect(HAB a, PRECTL b, PRECTL c)
     6218inline BOOL _WinEqualRect(HAB a, PRECTL b, PRECTL c)
    62196219{
    62206220 BOOL yyrc;
    … …  
    62306230#define WinEqualRect _WinEqualRect
    62316231
    6232 inline BOOL APIENTRY _WinInflateRect(HAB a, PRECTL b, LONG c, LONG d)
     6232inline BOOL _WinInflateRect(HAB a, PRECTL b, LONG c, LONG d)
    62336233{
    62346234 BOOL yyrc;
    … …  
    62446244#define WinInflateRect _WinInflateRect
    62456245
    6246 inline BOOL APIENTRY _WinIntersectRect(HAB a, PRECTL b, PRECTL c, PRECTL d)
     6246inline BOOL _WinIntersectRect(HAB a, PRECTL b, PRECTL c, PRECTL d)
    62476247{
    62486248 BOOL yyrc;
    … …  
    62586258#define WinIntersectRect _WinIntersectRect
    62596259
    6260 inline BOOL APIENTRY _WinIsRectEmpty(HAB a, PRECTL b)
     6260inline BOOL _WinIsRectEmpty(HAB a, PRECTL b)
    62616261{
    62626262 BOOL yyrc;
    … …  
    62726272#define WinIsRectEmpty _WinIsRectEmpty
    62736273
    6274 inline BOOL APIENTRY _WinMakePoints(HAB a, PPOINTL b, ULONG c)
     6274inline BOOL _WinMakePoints(HAB a, PPOINTL b, ULONG c)
    62756275{
    62766276 BOOL yyrc;
    … …  
    62866286#define WinMakePoints _WinMakePoints
    62876287
    6288 inline BOOL APIENTRY _WinMakeRect(HAB a, PRECTL b)
     6288inline BOOL _WinMakeRect(HAB a, PRECTL b)
    62896289{
    62906290 BOOL yyrc;
    … …  
    63006300#define WinMakeRect _WinMakeRect
    63016301
    6302 inline BOOL APIENTRY _WinOffsetRect(HAB a, PRECTL b, LONG c, LONG d)
     6302inline BOOL _WinOffsetRect(HAB a, PRECTL b, LONG c, LONG d)
    63036303{
    63046304 BOOL yyrc;
    … …  
    63146314#define WinOffsetRect _WinOffsetRect
    63156315
    6316 inline BOOL APIENTRY _WinPtInRect(HAB a, PRECTL b, PPOINTL c)
     6316inline BOOL _WinPtInRect(HAB a, PRECTL b, PPOINTL c)
    63176317{
    63186318 BOOL yyrc;
    … …  
    63286328#define WinPtInRect _WinPtInRect
    63296329
    6330 inline BOOL APIENTRY _WinSetRect(HAB a, PRECTL b, LONG c, LONG d, LONG e, LONG f)
     6330inline BOOL _WinSetRect(HAB a, PRECTL b, LONG c, LONG d, LONG e, LONG f)
    63316331{
    63326332 BOOL yyrc;
    … …  
    63426342#define WinSetRect _WinSetRect
    63436343
    6344 inline BOOL APIENTRY _WinSetRectEmpty(HAB a, PRECTL b)
     6344inline BOOL _WinSetRectEmpty(HAB a, PRECTL b)
    63456345{
    63466346 BOOL yyrc;
    … …  
    63566356#define WinSetRectEmpty _WinSetRectEmpty
    63576357
    6358 inline BOOL APIENTRY _WinSubtractRect(HAB a, PRECTL b, PRECTL c, PRECTL d)
     6358inline BOOL _WinSubtractRect(HAB a, PRECTL b, PRECTL c, PRECTL d)
    63596359{
    63606360 BOOL yyrc;
    … …  
    63706370#define WinSubtractRect _WinSubtractRect
    63716371
    6372 inline BOOL APIENTRY _WinUnionRect(HAB a, PRECTL b, PRECTL c, PRECTL d)
     6372inline BOOL _WinUnionRect(HAB a, PRECTL b, PRECTL c, PRECTL d)
    63736373{
    63746374 BOOL yyrc;
    … …  
    63866386#endif
    63876387#ifdef INCL_WINSYS
    6388 inline LONG APIENTRY _WinQueryControlColors(HWND a, LONG b, ULONG c, ULONG d, PCTLCOLOR e)
     6388inline LONG _WinQueryControlColors(HWND a, LONG b, ULONG c, ULONG d, PCTLCOLOR e)
    63896389{
    63906390 LONG yyrc;
    … …  
    64006400#define WinQueryControlColors _WinQueryControlColors
    64016401
    6402 inline ULONG APIENTRY _WinQueryPresParam(HWND a, ULONG b, ULONG c, PULONG d, ULONG e, PVOID f, ULONG g)
     6402inline ULONG _WinQueryPresParam(HWND a, ULONG b, ULONG c, PULONG d, ULONG e, PVOID f, ULONG g)
    64036403{
    64046404 ULONG yyrc;
    … …  
    64146414#define WinQueryPresParam _WinQueryPresParam
    64156415
    6416 inline LONG APIENTRY _WinQuerySysColor(HWND a, LONG b, LONG c)
     6416inline LONG _WinQuerySysColor(HWND a, LONG b, LONG c)
    64176417{
    64186418 LONG yyrc;
    … …  
    64286428#define WinQuerySysColor _WinQuerySysColor
    64296429
    6430 inline LONG APIENTRY _WinQuerySysValue(HWND a, LONG b)
     6430inline LONG _WinQuerySysValue(HWND a, LONG b)
    64316431{
    64326432 LONG yyrc;
    … …  
    64426442#define WinQuerySysValue _WinQuerySysValue
    64436443
    6444 inline BOOL APIENTRY _WinRemovePresParam(HWND a, ULONG b)
     6444inline BOOL _WinRemovePresParam(HWND a, ULONG b)
    64456445{
    64466446 BOOL yyrc;
    … …  
    64566456#define WinRemovePresParam _WinRemovePresParam
    64576457
    6458 inline LONG APIENTRY _WinSetControlColors(HWND a, LONG b, ULONG c, ULONG d, PCTLCOLOR e)
     6458inline LONG _WinSetControlColors(HWND a, LONG b, ULONG c, ULONG d, PCTLCOLOR e)
    64596459{
    64606460 LONG yyrc;
    … …  
    64706470#define WinSetControlColors _WinSetControlColors
    64716471
    6472 inline BOOL APIENTRY _WinSetPresParam(HWND a, ULONG b, ULONG c, PVOID d)
     6472inline BOOL _WinSetPresParam(HWND a, ULONG b, ULONG c, PVOID d)
    64736473{
    64746474 BOOL yyrc;
    … …  
    64846484#define WinSetPresParam _WinSetPresParam
    64856485
    6486 inline BOOL APIENTRY _WinSetSysColors(HWND a, ULONG b, ULONG c, LONG d, ULONG e, PLONG f)
     6486inline BOOL _WinSetSysColors(HWND a, ULONG b, ULONG c, LONG d, ULONG e, PLONG f)
    64876487{
    64886488 BOOL yyrc;
    … …  
    64986498#define WinSetSysColors _WinSetSysColors
    64996499
    6500 inline BOOL APIENTRY _WinSetSysValue(HWND a, LONG b, LONG c)
     6500inline BOOL _WinSetSysValue(HWND a, LONG b, LONG c)
    65016501{
    65026502 BOOL yyrc;
    … …  
    65146514#endif
    65156515#ifdef INCL_WINTHUNKAPI
    6516 inline PFN APIENTRY _WinQueryClassThunkProc(PCSZ a)
     6516inline PFN _WinQueryClassThunkProc(PCSZ a)
    65176517{
    65186518 PFN yyrc;
    … …  
    65286528#define WinQueryClassThunkProc _WinQueryClassThunkProc
    65296529
    6530 inline LONG APIENTRY _WinQueryWindowModel(HWND a)
     6530inline LONG _WinQueryWindowModel(HWND a)
    65316531{
    65326532 LONG yyrc;
    … …  
    65426542#define WinQueryWindowModel _WinQueryWindowModel
    65436543
    6544 inline PFN APIENTRY _WinQueryWindowThunkProc(HWND a)
     6544inline PFN _WinQueryWindowThunkProc(HWND a)
    65456545{
    65466546 PFN yyrc;
    … …  
    65566556#define WinQueryWindowThunkProc _WinQueryWindowThunkProc
    65576557
    6558 inline BOOL APIENTRY _WinSetClassThunkProc(PCSZ a, PFN b)
     6558inline BOOL _WinSetClassThunkProc(PCSZ a, PFN b)
    65596559{
    65606560 BOOL yyrc;
    … …  
    65706570#define WinSetClassThunkProc _WinSetClassThunkProc
    65716571
    6572 inline BOOL APIENTRY _WinSetWindowThunkProc(HWND a, PFN b)
     6572inline BOOL _WinSetWindowThunkProc(HWND a, PFN b)
    65736573{
    65746574 BOOL yyrc;
    … …  
    65866586#endif
    65876587#ifdef INCL_WINTIMER
    6588 inline ULONG APIENTRY _WinGetCurrentTime(HAB a)
     6588inline ULONG _WinGetCurrentTime(HAB a)
    65896589{
    65906590 ULONG yyrc;
    … …  
    66006600#define WinGetCurrentTime _WinGetCurrentTime
    66016601
    6602 inline ULONG APIENTRY _WinStartTimer(HAB a, HWND b, ULONG c, ULONG d)
     6602inline ULONG _WinStartTimer(HAB a, HWND b, ULONG c, ULONG d)
    66036603{
    66046604 ULONG yyrc;
    … …  
    66146614#define WinStartTimer _WinStartTimer
    66156615
    6616 inline BOOL APIENTRY _WinStopTimer(HAB a, HWND b, ULONG c)
     6616inline BOOL _WinStopTimer(HAB a, HWND b, ULONG c)
    66176617{
    66186618 BOOL yyrc;
    … …  
    66306630#endif
    66316631#ifdef INCL_WINTRACKRECT
    6632 inline BOOL APIENTRY _WinShowTrackRect(HWND a, BOOL b)
     6632inline BOOL _WinShowTrackRect(HWND a, BOOL b)
    66336633{
    66346634 BOOL yyrc;
    … …  
    66446644#define WinShowTrackRect _WinShowTrackRect
    66456645
    6646 inline BOOL APIENTRY _WinTrackRect(HWND a, HPS b, PTRACKINFO c)
     6646inline BOOL _WinTrackRect(HWND a, HPS b, PTRACKINFO c)
    66476647{
    66486648 BOOL yyrc;
    … …  
    66616661#endif
    66626662#ifdef INCL_GPI
    6663 inline LONG APIENTRY _GpiAnimatePalette(HPAL a, ULONG b, ULONG c, ULONG d, PULONG e)
     6663inline LONG _GpiAnimatePalette(HPAL a, ULONG b, ULONG c, ULONG d, PULONG e)
    66646664{
    66656665 LONG yyrc;
    … …  
    66756675#define GpiAnimatePalette _GpiAnimatePalette
    66766676
    6677 inline BOOL APIENTRY _GpiBeginArea(HPS a, ULONG b)
     6677inline BOOL _GpiBeginArea(HPS a, ULONG b)
    66786678{
    66796679 BOOL yyrc;
    … …  
    66896689#define GpiBeginArea _GpiBeginArea
    66906690
    6691 inline BOOL APIENTRY _GpiBeginElement(HPS a, LONG b, PCSZ c)
     6691inline BOOL _GpiBeginElement(HPS a, LONG b, PCSZ c)
    66926692{
    66936693 BOOL yyrc;
    … …  
    67036703#define GpiBeginElement _GpiBeginElement
    67046704
    6705 inline BOOL APIENTRY _GpiBeginPath(HPS a, LONG b)
     6705inline BOOL _GpiBeginPath(HPS a, LONG b)
    67066706{
    67076707 BOOL yyrc;
    … …  
    67176717#define GpiBeginPath _GpiBeginPath
    67186718
    6719 inline LONG APIENTRY _GpiBox(HPS a, LONG b, PPOINTL c, LONG d, LONG e)
     6719inline LONG _GpiBox(HPS a, LONG b, PPOINTL c, LONG d, LONG e)
    67206720{
    67216721 LONG yyrc;
    … …  
    67316731#define GpiBox _GpiBox
    67326732
    6733 inline LONG APIENTRY _GpiCallSegmentMatrix(HPS a, LONG b, LONG c, PMATRIXLF d, LONG e)
     6733inline LONG _GpiCallSegmentMatrix(HPS a, LONG b, LONG c, PMATRIXLF d, LONG e)
    67346734{
    67356735 LONG yyrc;
    … …  
    67456745#define GpiCallSegmentMatrix _GpiCallSegmentMatrix
    67466746
    6747 inline LONG APIENTRY _GpiCharString(HPS a, LONG b, PCH c)
     6747inline LONG _GpiCharString(HPS a, LONG b, PCH c)
    67486748{
    67496749 LONG yyrc;
    … …  
    67596759#define GpiCharString _GpiCharString
    67606760
    6761 inline LONG APIENTRY _GpiCharStringAt(HPS a, PPOINTL b, LONG c, PCH d)
     6761inline LONG _GpiCharStringAt(HPS a, PPOINTL b, LONG c, PCH d)
    67626762{
    67636763 LONG yyrc;
    … …  
    67736773#define GpiCharStringAt _GpiCharStringAt
    67746774
    6775 inline LONG APIENTRY _GpiCharStringPos(HPS a, PRECTL b, ULONG c, LONG d, PCH e, PLONG f)
     6775inline LONG _GpiCharStringPos(HPS a, PRECTL b, ULONG c, LONG d, PCH e, PLONG f)
    67766776{
    67776777 LONG yyrc;
    … …  
    67876787#define GpiCharStringPos _GpiCharStringPos
    67886788
    6789 inline LONG APIENTRY _GpiCharStringPosAt(HPS a, PPOINTL b, PRECTL c, ULONG d, LONG e, PCH f, PLONG g)
     6789inline LONG _GpiCharStringPosAt(HPS a, PPOINTL b, PRECTL c, ULONG d, LONG e, PCH f, PLONG g)
    67906790{
    67916791 LONG yyrc;
    … …  
    68016801#define GpiCharStringPosAt _GpiCharStringPosAt
    68026802
    6803 inline BOOL APIENTRY _GpiCloseFigure(HPS a)
     6803inline BOOL _GpiCloseFigure(HPS a)
    68046804{
    68056805 BOOL yyrc;
    … …  
    68156815#define GpiCloseFigure _GpiCloseFigure
    68166816
    6817 inline LONG APIENTRY _GpiCombineRegion(HPS a, HRGN b, HRGN c, HRGN d, LONG e)
     6817inline LONG _GpiCombineRegion(HPS a, HRGN b, HRGN c, HRGN d, LONG e)
    68186818{
    68196819 LONG yyrc;
    … …  
    68296829#define GpiCombineRegion _GpiCombineRegion
    68306830
    6831 inline BOOL APIENTRY _GpiComment(HPS a, LONG b, PBYTE c)
     6831inline BOOL _GpiComment(HPS a, LONG b, PBYTE c)
    68326832{
    68336833 BOOL yyrc;
    … …  
    68436843#define GpiComment _GpiComment
    68446844
    6845 inline BOOL APIENTRY _GpiConvert(HPS a, LONG b, LONG c, LONG d, PPOINTL e)
     6845inline BOOL _GpiConvert(HPS a, LONG b, LONG c, LONG d, PPOINTL e)
    68466846{
    68476847 BOOL yyrc;
    … …  
    68576857#define GpiConvert _GpiConvert
    68586858
    6859 inline BOOL APIENTRY _GpiConvertWithMatrix(HPS a, LONG b, PPOINTL c, LONG d, PMATRIXLF e)
     6859inline BOOL _GpiConvertWithMatrix(HPS a, LONG b, PPOINTL c, LONG d, PMATRIXLF e)
    68606860{
    68616861 BOOL yyrc;
    … …  
    68716871#define GpiConvertWithMatrix _GpiConvertWithMatrix
    68726872
    6873 inline HMF APIENTRY _GpiCopyMetaFile(HMF a)
     6873inline HMF _GpiCopyMetaFile(HMF a)
    68746874{
    68756875 HMF yyrc;
    … …  
    68856885#define GpiCopyMetaFile _GpiCopyMetaFile
    68866886
    6887 inline BOOL APIENTRY _GpiCreateLogColorTable(HPS a, ULONG b, LONG c, LONG d, LONG e, PLONG f)
     6887inline BOOL _GpiCreateLogColorTable(HPS a, ULONG b, LONG c, LONG d, LONG e, PLONG f)
    68886888{
    68896889 BOOL yyrc;
    … …  
    68996899#define GpiCreateLogColorTable _GpiCreateLogColorTable
    69006900
    6901 inline LONG APIENTRY _GpiCreateLogFont(HPS a, STR8 *b, LONG c, PFATTRS d)
     6901inline LONG _GpiCreateLogFont(HPS a, STR8 *b, LONG c, PFATTRS d)
    69026902{
    69036903 LONG yyrc;
    … …  
    69136913#define GpiCreateLogFont _GpiCreateLogFont
    69146914
    6915 inline HPAL APIENTRY _GpiCreatePalette(HAB a, ULONG b, ULONG c, ULONG d, PULONG e)
     6915inline HPAL _GpiCreatePalette(HAB a, ULONG b, ULONG c, ULONG d, PULONG e)
    69166916{
    69176917 HPAL yyrc;
    … …  
    69276927#define GpiCreatePalette _GpiCreatePalette
    69286928
    6929 inline HRGN APIENTRY _GpiCreateRegion(HPS a, LONG b, PRECTL c)
     6929inline HRGN _GpiCreateRegion(HPS a, LONG b, PRECTL c)
    69306930{
    69316931 HRGN yyrc;
    … …  
    69416941#define GpiCreateRegion _GpiCreateRegion
    69426942
    6943 inline BOOL APIENTRY _GpiDeleteElement(HPS a)
     6943inline BOOL _GpiDeleteElement(HPS a)
    69446944{
    69456945 BOOL yyrc;
    … …  
    69556955#define GpiDeleteElement _GpiDeleteElement
    69566956
    6957 inline BOOL APIENTRY _GpiDeleteElementRange(HPS a, LONG b, LONG c)
     6957inline BOOL _GpiDeleteElementRange(HPS a, LONG b, LONG c)
    69586958{
    69596959 BOOL yyrc;
    … …  
    69696969#define GpiDeleteElementRange _GpiDeleteElementRange
    69706970
    6971 inline BOOL APIENTRY _GpiDeleteElementsBetweenLabels(HPS a, LONG b, LONG c)
     6971inline BOOL _GpiDeleteElementsBetweenLabels(HPS a, LONG b, LONG c)
    69726972{
    69736973 BOOL yyrc;
    … …  
    69836983#define GpiDeleteElementsBetweenLabels _GpiDeleteElementsBetweenLabels
    69846984
    6985 inline BOOL APIENTRY _GpiDeleteMetaFile(HMF a)
     6985inline BOOL _GpiDeleteMetaFile(HMF a)
    69866986{
    69876987 BOOL yyrc;
    … …  
    69976997#define GpiDeleteMetaFile _GpiDeleteMetaFile
    69986998
    6999 inline BOOL APIENTRY _GpiDeletePalette(HPAL a)
     6999inline BOOL _GpiDeletePalette(HPAL a)
    70007000{
    70017001 BOOL yyrc;
    … …  
    70117011#define GpiDeletePalette _GpiDeletePalette
    70127012
    7013 inline BOOL APIENTRY _GpiDeleteSetId(HPS a, LONG b)
     7013inline BOOL _GpiDeleteSetId(HPS a, LONG b)
    70147014{
    70157015 BOOL yyrc;
    … …  
    70257025#define GpiDeleteSetId _GpiDeleteSetId
    70267026
    7027 inline BOOL APIENTRY _GpiDestroyRegion(HPS a, HRGN b)
     7027inline BOOL _GpiDestroyRegion(HPS a, HRGN b)
    70287028{
    70297029 BOOL yyrc;
    … …  
    70397039#define GpiDestroyRegion _GpiDestroyRegion
    70407040
    7041 inline LONG APIENTRY _GpiElement(HPS a, LONG b, PCSZ c, LONG d, PBYTE e)
     7041inline LONG _GpiElement(HPS a, LONG b, PCSZ c, LONG d, PBYTE e)
    70427042{
    70437043 LONG yyrc;
    … …  
    70537053#define GpiElement _GpiElement
    70547054
    7055 inline LONG APIENTRY _GpiEndArea(HPS a)
     7055inline LONG _GpiEndArea(HPS a)
    70567056{
    70577057 LONG yyrc;
    … …  
    70677067#define GpiEndArea _GpiEndArea
    70687068
    7069 inline BOOL APIENTRY _GpiEndElement(HPS a)
     7069inline BOOL _GpiEndElement(HPS a)
    70707070{
    70717071 BOOL yyrc;
    … …  
    70817081#define GpiEndElement _GpiEndElement
    70827082
    7083 inline BOOL APIENTRY _GpiEndPath(HPS a)
     7083inline BOOL _GpiEndPath(HPS a)
    70847084{
    70857085 BOOL yyrc;
    … …  
    70957095#define GpiEndPath _GpiEndPath
    70967096
    7097 inline LONG APIENTRY _GpiEqualRegion(HPS a, HRGN b, HRGN c)
     7097inline LONG _GpiEqualRegion(HPS a, HRGN b, HRGN c)
    70987098{
    70997099 LONG yyrc;
    … …  
    71097109#define GpiEqualRegion _GpiEqualRegion
    71107110
    7111 inline LONG APIENTRY _GpiExcludeClipRectangle(HPS a, PRECTL b)
     7111inline LONG _GpiExcludeClipRectangle(HPS a, PRECTL b)
    71127112{
    71137113 LONG yyrc;
    … …  
    71237123#define GpiExcludeClipRectangle _GpiExcludeClipRectangle
    71247124
    7125 inline LONG APIENTRY _GpiFillPath(HPS a, LONG b, LONG c)
     7125inline LONG _GpiFillPath(HPS a, LONG b, LONG c)
    71267126{
    71277127 LONG yyrc;
    … …  
    71377137#define GpiFillPath _GpiFillPath
    71387138
    7139 inline LONG APIENTRY _GpiFrameRegion(HPS a, HRGN b, PSIZEL c)
     7139inline LONG _GpiFrameRegion(HPS a, HRGN b, PSIZEL c)
    71407140{
    71417141 LONG yyrc;
    … …  
    71517151#define GpiFrameRegion _GpiFrameRegion
    71527152
    7153 inline LONG APIENTRY _GpiFullArc(HPS a, LONG b, FIXED c)
     7153inline LONG _GpiFullArc(HPS a, LONG b, FIXED c)
    71547154{
    71557155 LONG yyrc;
    … …  
    71657165#define GpiFullArc _GpiFullArc
    71667166
    7167 inline LONG APIENTRY _GpiImage(HPS a, LONG b, PSIZEL c, LONG d, PBYTE e)
     7167inline LONG _GpiImage(HPS a, LONG b, PSIZEL c, LONG d, PBYTE e)
    71687168{
    71697169 LONG yyrc;
    … …  
    71797179#define GpiImage _GpiImage
    71807180
    7181 inline LONG APIENTRY _GpiIntersectClipRectangle(HPS a, PRECTL b)
     7181inline LONG _GpiIntersectClipRectangle(HPS a, PRECTL b)
    71827182{
    71837183 LONG yyrc;
    … …  
    71937193#define GpiIntersectClipRectangle _GpiIntersectClipRectangle
    71947194
    7195 inline BOOL APIENTRY _GpiLabel(HPS a, LONG b)
     7195inline BOOL _GpiLabel(HPS a, LONG b)
    71967196{
    71977197 BOOL yyrc;
    … …  
    72077207#define GpiLabel _GpiLabel
    72087208
    7209 inline LONG APIENTRY _GpiLine(HPS a, PPOINTL b)
     7209inline LONG _GpiLine(HPS a, PPOINTL b)
    72107210{
    72117211 LONG yyrc;
    … …  
    72217221#define GpiLine _GpiLine
    72227222
    7223 inline BOOL APIENTRY _GpiLoadFonts(HAB a, PCSZ b)
     7223inline BOOL _GpiLoadFonts(HAB a, PCSZ b)
    72247224{
    72257225 BOOL yyrc;
    … …  
    72357235#define GpiLoadFonts _GpiLoadFonts
    72367236
    7237 inline HMF APIENTRY _GpiLoadMetaFile(HAB a, PCSZ b)
     7237inline HMF _GpiLoadMetaFile(HAB a, PCSZ b)
    72387238{
    72397239 HMF yyrc;
    … …  
    72497249#define GpiLoadMetaFile _GpiLoadMetaFile
    72507250
    7251 inline BOOL APIENTRY _GpiLoadPublicFonts(HAB a, PCSZ b)
     7251inline BOOL _GpiLoadPublicFonts(HAB a, PCSZ b)
    72527252{
    72537253 BOOL yyrc;
    … …  
    72637263#define GpiLoadPublicFonts _GpiLoadPublicFonts
    72647264
    7265 inline LONG APIENTRY _GpiMarker(HPS a, PPOINTL b)
     7265inline LONG _GpiMarker(HPS a, PPOINTL b)
    72667266{
    72677267 LONG yyrc;
    … …  
    72777277#define GpiMarker _GpiMarker
    72787278
    7279 inline BOOL APIENTRY _GpiModifyPath(HPS a, LONG b, LONG c)
     7279inline BOOL _GpiModifyPath(HPS a, LONG b, LONG c)
    72807280{
    72817281 BOOL yyrc;
    … …  
    72917291#define GpiModifyPath _GpiModifyPath
    72927292
    7293 inline BOOL APIENTRY _GpiMove(HPS a, PPOINTL b)
     7293inline BOOL _GpiMove(HPS a, PPOINTL b)
    72947294{
    72957295 BOOL yyrc;
    … …  
    73057305#define GpiMove _GpiMove
    73067306
    7307 inline LONG APIENTRY _GpiOffsetClipRegion(HPS a, PPOINTL b)
     7307inline LONG _GpiOffsetClipRegion(HPS a, PPOINTL b)
    73087308{
    73097309 LONG yyrc;
    … …  
    73197319#define GpiOffsetClipRegion _GpiOffsetClipRegion
    73207320
    7321 inline BOOL APIENTRY _GpiOffsetElementPointer(HPS a, LONG b)
     7321inline BOOL _GpiOffsetElementPointer(HPS a, LONG b)
    73227322{
    73237323 BOOL yyrc;
    … …  
    73337333#define GpiOffsetElementPointer _GpiOffsetElementPointer
    73347334
    7335 inline BOOL APIENTRY _GpiOffsetRegion(HPS a, HRGN b, PPOINTL c)
     7335inline BOOL _GpiOffsetRegion(HPS a, HRGN b, PPOINTL c)
    73367336{
    73377337 BOOL yyrc;
    … …  
    73477347#define GpiOffsetRegion _GpiOffsetRegion
    73487348
    7349 inline LONG APIENTRY _GpiOutlinePath(HPS a, LONG b, LONG c)
     7349inline LONG _GpiOutlinePath(HPS a, LONG b, LONG c)
    73507350{
    73517351 LONG yyrc;
    … …  
    73617361#define GpiOutlinePath _GpiOutlinePath
    73627362
    7363 inline LONG APIENTRY _GpiPaintRegion(HPS a, HRGN b)
     7363inline LONG _GpiPaintRegion(HPS a, HRGN b)
    73647364{
    73657365 LONG yyrc;
    … …  
    73757375#define GpiPaintRegion _GpiPaintRegion
    73767376
    7377 inline LONG APIENTRY _GpiPartialArc(HPS a, PPOINTL b, FIXED c, FIXED d, FIXED e)
     7377inline LONG _GpiPartialArc(HPS a, PPOINTL b, FIXED c, FIXED d, FIXED e)
    73787378{
    73797379 LONG yyrc;
    … …  
    73897389#define GpiPartialArc _GpiPartialArc
    73907390
    7391 inline HRGN APIENTRY _GpiPathToRegion(HPS a, LONG b, LONG c)
     7391inline HRGN _GpiPathToRegion(HPS a, LONG b, LONG c)
    73927392{
    73937393 HRGN yyrc;
    … …  
    74037403#define GpiPathToRegion _GpiPathToRegion
    74047404
    7405 inline LONG APIENTRY _GpiPlayMetaFile(HPS a, HMF b, LONG c, PLONG d, PLONG e, LONG f, PSZ g)
     7405inline LONG _GpiPlayMetaFile(HPS a, HMF b, LONG c, PLONG d, PLONG e, LONG f, PSZ g)
    74067406{
    74077407 LONG yyrc;
    … …  
    74177417#define GpiPlayMetaFile _GpiPlayMetaFile
    74187418
    7419 inline LONG APIENTRY _GpiPointArc(HPS a, PPOINTL b)
     7419inline LONG _GpiPointArc(HPS a, PPOINTL b)
    74207420{
    74217421 LONG yyrc;
    … …  
    74317431#define GpiPointArc _GpiPointArc
    74327432
    7433 inline LONG APIENTRY _GpiPolyFillet(HPS a, LONG b, PPOINTL c)
     7433inline LONG _GpiPolyFillet(HPS a, LONG b, PPOINTL c)
    74347434{
    74357435 LONG yyrc;
    … …  
    74457445#define GpiPolyFillet _GpiPolyFillet
    74467446
    7447 inline LONG APIENTRY _GpiPolyFilletSharp(HPS a, LONG b, PPOINTL c, PFIXED d)
     7447inline LONG _GpiPolyFilletSharp(HPS a, LONG b, PPOINTL c, PFIXED d)
    74487448{
    74497449 LONG yyrc;
    … …  
    74597459#define GpiPolyFilletSharp _GpiPolyFilletSharp
    74607460
    7461 inline LONG APIENTRY _GpiPolygons(HPS a, ULONG b, PPOLYGON c, ULONG d, ULONG e)
     7461inline LONG _GpiPolygons(HPS a, ULONG b, PPOLYGON c, ULONG d, ULONG e)
    74627462{
    74637463 LONG yyrc;
    … …  
    74737473#define GpiPolygons _GpiPolygons
    74747474
    7475 inline LONG APIENTRY _GpiPolyLine(HPS a, LONG b, PPOINTL c)
     7475inline LONG _GpiPolyLine(HPS a, LONG b, PPOINTL c)
    74767476{
    74777477 LONG yyrc;
    … …  
    74877487#define GpiPolyLine _GpiPolyLine
    74887488
    7489 inline LONG APIENTRY _GpiPolyLineDisjoint(HPS a, LONG b, PPOINTL c)
     7489inline LONG _GpiPolyLineDisjoint(HPS a, LONG b, PPOINTL c)
    74907490{
    74917491 LONG yyrc;
    … …  
    75017501#define GpiPolyLineDisjoint _GpiPolyLineDisjoint
    75027502
    7503 inline LONG APIENTRY _GpiPolyMarker(HPS a, LONG b, PPOINTL c)
     7503inline LONG _GpiPolyMarker(HPS a, LONG b, PPOINTL c)
    75047504{
    75057505 LONG yyrc;
    … …  
    75157515#define GpiPolyMarker _GpiPolyMarker
    75167516
    7517 inline LONG APIENTRY _GpiPolySpline(HPS a, LONG b, PPOINTL c)
     7517inline LONG _GpiPolySpline(HPS a, LONG b, PPOINTL c)
    75187518{
    75197519 LONG yyrc;
    … …  
    75297529#define GpiPolySpline _GpiPolySpline
    75307530
    7531 inline BOOL APIENTRY _GpiPop(HPS a, LONG b)
     7531inline BOOL _GpiPop(HPS a, LONG b)
    75327532{
    75337533 BOOL yyrc;
    … …  
    75437543#define GpiPop _GpiPop
    75447544
    7545 inline LONG APIENTRY _GpiPtInRegion(HPS a, HRGN b, PPOINTL c)
     7545inline LONG _GpiPtInRegion(HPS a, HRGN b, PPOINTL c)
    75467546{
    75477547 LONG yyrc;
    … …  
    75577557#define GpiPtInRegion _GpiPtInRegion
    75587558
    7559 inline LONG APIENTRY _GpiPtVisible(HPS a, PPOINTL b)
     7559inline LONG _GpiPtVisible(HPS a, PPOINTL b)
    75607560{
    75617561 LONG yyrc;
    … …  
    75717571#define GpiPtVisible _GpiPtVisible
    75727572
    7573 inline BOOL APIENTRY _GpiQueryArcParams(HPS a, PARCPARAMS b)
     7573inline BOOL _GpiQueryArcParams(HPS a, PARCPARAMS b)
    75747574{
    75757575 BOOL yyrc;
    … …  
    75857585#define GpiQueryArcParams _GpiQueryArcParams
    75867586
    7587 inline LONG APIENTRY _GpiQueryAttrMode(HPS a)
     7587inline LONG _GpiQueryAttrMode(HPS a)
    75887588{
    75897589 LONG yyrc;
    … …  
    75997599#define GpiQueryAttrMode _GpiQueryAttrMode
    76007600
    7601 inline LONG APIENTRY _GpiQueryAttrs(HPS a, LONG b, ULONG c, PBUNDLE d)
     7601inline LONG _GpiQueryAttrs(HPS a, LONG b, ULONG c, PBUNDLE d)
    76027602{
    76037603 LONG yyrc;
    … …  
    76137613#define GpiQueryAttrs _GpiQueryAttrs
    76147614
    7615 inline LONG APIENTRY _GpiQueryBackColor(HPS a)
     7615inline LONG _GpiQueryBackColor(HPS a)
    76167616{
    76177617 LONG yyrc;
    … …  
    76277627#define GpiQueryBackColor _GpiQueryBackColor
    76287628
    7629 inline LONG APIENTRY _GpiQueryBackMix(HPS a)
     7629inline LONG _GpiQueryBackMix(HPS a)
    76307630{
    76317631 LONG yyrc;
    … …  
    76417641#define GpiQueryBackMix _GpiQueryBackMix
    76427642
    7643 inline BOOL APIENTRY _GpiQueryCharAngle(HPS a, PGRADIENTL b)
     7643inline BOOL _GpiQueryCharAngle(HPS a, PGRADIENTL b)
    76447644{
    76457645 BOOL yyrc;
    … …  
    76557655#define GpiQueryCharAngle _GpiQueryCharAngle
    76567656
    7657 inline BOOL APIENTRY _GpiQueryCharBox(HPS a, PSIZEF b)
     7657inline BOOL _GpiQueryCharBox(HPS a, PSIZEF b)
    76587658{
    76597659 BOOL yyrc;
    … …  
    76697669#define GpiQueryCharBox _GpiQueryCharBox
    76707670
    7671 inline BOOL APIENTRY _GpiQueryCharBreakExtra(HPS a, PFIXED b)
     7671inline BOOL _GpiQueryCharBreakExtra(HPS a, PFIXED b)
    76727672{
    76737673 BOOL yyrc;
    … …  
    76837683#define GpiQueryCharBreakExtra _GpiQueryCharBreakExtra
    76847684
    7685 inline LONG APIENTRY _GpiQueryCharDirection(HPS a)
     7685inline LONG _GpiQueryCharDirection(HPS a)
    76867686{
    76877687 LONG yyrc;
    … …  
    76977697#define GpiQueryCharDirection _GpiQueryCharDirection
    76987698
    7699 inline BOOL APIENTRY _GpiQueryCharExtra(HPS a, PFIXED b)
     7699inline BOOL _GpiQueryCharExtra(HPS a, PFIXED b)
    77007700{
    77017701 BOOL yyrc;
    … …  
    77117711#define GpiQueryCharExtra _GpiQueryCharExtra
    77127712
    7713 inline LONG APIENTRY _GpiQueryCharMode(HPS a)
     7713inline LONG _GpiQueryCharMode(HPS a)
    77147714{
    77157715 LONG yyrc;
    … …  
    77257725#define GpiQueryCharMode _GpiQueryCharMode
    77267726
    7727 inline LONG APIENTRY _GpiQueryCharSet(HPS a)
     7727inline LONG _GpiQueryCharSet(HPS a)
    77287728{
    77297729 LONG yyrc;
    … …  
    77397739#define GpiQueryCharSet _GpiQueryCharSet
    77407740
    7741 inline BOOL APIENTRY _GpiQueryCharShear(HPS a, PPOINTL b)
     7741inline BOOL _GpiQueryCharShear(HPS a, PPOINTL b)
    77427742{
    77437743 BOOL yyrc;
    … …  
    77537753#define GpiQueryCharShear _GpiQueryCharShear
    77547754
    7755 inline BOOL APIENTRY _GpiQueryCharStringPos(HPS a, ULONG b, LONG c, PCH d, PLONG e, PPOINTL f)
     7755inline BOOL _GpiQueryCharStringPos(HPS a, ULONG b, LONG c, PCH d, PLONG e, PPOINTL f)
    77567756{
    77577757 BOOL yyrc;
    … …  
    77677767#define GpiQueryCharStringPos _GpiQueryCharStringPos
    77687768
    7769 inline BOOL APIENTRY _GpiQueryCharStringPosAt(HPS a, PPOINTL b, ULONG c, LONG d, PCH e, PLONG f, PPOINTL g)
     7769inline BOOL _GpiQueryCharStringPosAt(HPS a, PPOINTL b, ULONG c, LONG d, PCH e, PLONG f, PPOINTL g)
    77707770{
    77717771 BOOL yyrc;
    … …  
    77817781#define GpiQueryCharStringPosAt _GpiQueryCharStringPosAt
    77827782
    7783 inline LONG APIENTRY _GpiQueryClipBox(HPS a, PRECTL b)
     7783inline LONG _GpiQueryClipBox(HPS a, PRECTL b)
    77847784{
    77857785 LONG yyrc;
    … …  
    77957795#define GpiQueryClipBox _GpiQueryClipBox
    77967796
    7797 inline HRGN APIENTRY _GpiQueryClipRegion(HPS a)
     7797inline HRGN _GpiQueryClipRegion(HPS a)
    77987798{
    77997799 HRGN yyrc;
    … …  
    78097809#define GpiQueryClipRegion _GpiQueryClipRegion
    78107810
    7811 inline LONG APIENTRY _GpiQueryColor(HPS a)
     7811inline LONG _GpiQueryColor(HPS a)
    78127812{
    78137813 LONG yyrc;
    … …  
    78237823#define GpiQueryColor _GpiQueryColor
    78247824
    7825 inline BOOL APIENTRY _GpiQueryColorData(HPS a, LONG b, PLONG c)
     7825inline BOOL _GpiQueryColorData(HPS a, LONG b, PLONG c)
    78267826{
    78277827 BOOL yyrc;
    … …  
    78377837#define GpiQueryColorData _GpiQueryColorData
    78387838
    7839 inline LONG APIENTRY _GpiQueryColorIndex(HPS a, ULONG b, LONG c)
     7839inline LONG _GpiQueryColorIndex(HPS a, ULONG b, LONG c)
    78407840{
    78417841 LONG yyrc;
    … …  
    78517851#define GpiQueryColorIndex _GpiQueryColorIndex
    78527852
    7853 inline ULONG APIENTRY _GpiQueryCp(HPS a)
     7853inline ULONG _GpiQueryCp(HPS a)
    78547854{
    78557855 ULONG yyrc;
    … …  
    78657865#define GpiQueryCp _GpiQueryCp
    78667866
    7867 inline BOOL APIENTRY _GpiQueryCurrentPosition(HPS a, PPOINTL b)
     7867inline BOOL _GpiQueryCurrentPosition(HPS a, PPOINTL b)
    78687868{
    78697869 BOOL yyrc;
    … …  
    78797879#define GpiQueryCurrentPosition _GpiQueryCurrentPosition
    78807880
    7881 inline BOOL APIENTRY _GpiQueryDefArcParams(HPS a, PARCPARAMS b)
     7881inline BOOL _GpiQueryDefArcParams(HPS a, PARCPARAMS b)
    78827882{
    78837883 BOOL yyrc;
    … …  
    78937893#define GpiQueryDefArcParams _GpiQueryDefArcParams
    78947894
    7895 inline BOOL APIENTRY _GpiQueryDefAttrs(HPS a, LONG b, ULONG c, PBUNDLE d)
     7895inline BOOL _GpiQueryDefAttrs(HPS a, LONG b, ULONG c, PBUNDLE d)
    78967896{
    78977897 BOOL yyrc;
    … …  
    79077907#define GpiQueryDefAttrs _GpiQueryDefAttrs
    79087908
    7909 inline BOOL APIENTRY _GpiQueryDefCharBox(HPS a, PSIZEL b)
     7909inline BOOL _GpiQueryDefCharBox(HPS a, PSIZEL b)
    79107910{
    79117911 BOOL yyrc;
    … …  
    79217921#define GpiQueryDefCharBox _GpiQueryDefCharBox
    79227922
    7923 inline BOOL APIENTRY _GpiQueryDefTag(HPS a, PLONG b)
     7923inline BOOL _GpiQueryDefTag(HPS a, PLONG b)
    79247924{
    79257925 BOOL yyrc;
    … …  
    79357935#define GpiQueryDefTag _GpiQueryDefTag
    79367936
    7937 inline BOOL APIENTRY _GpiQueryDefViewingLimits(HPS a, PRECTL b)
     7937inline BOOL _GpiQueryDefViewingLimits(HPS a, PRECTL b)
    79387938{
    79397939 BOOL yyrc;
    … …  
    79497949#define GpiQueryDefViewingLimits _GpiQueryDefViewingLimits
    79507950
    7951 inline BOOL APIENTRY _GpiQueryDefaultViewMatrix(HPS a, LONG b, PMATRIXLF c)
     7951inline BOOL _GpiQueryDefaultViewMatrix(HPS a, LONG b, PMATRIXLF c)
    79527952{
    79537953 BOOL yyrc;
    … …  
    79637963#define GpiQueryDefaultViewMatrix _GpiQueryDefaultViewMatrix
    79647964
    7965 inline LONG APIENTRY _GpiQueryEditMode(HPS a)
     7965inline LONG _GpiQueryEditMode(HPS a)
    79667966{
    79677967 LONG yyrc;
    … …  
    79777977#define GpiQueryEditMode _GpiQueryEditMode
    79787978
    7979 inline LONG APIENTRY _GpiQueryElement(HPS a, LONG b, LONG c, PBYTE d)
     7979inline LONG _GpiQueryElement(HPS a, LONG b, LONG c, PBYTE d)
    79807980{
    79817981 LONG yyrc;
    … …  
    79917991#define GpiQueryElement _GpiQueryElement
    79927992
    7993 inline LONG APIENTRY _GpiQueryElementPointer(HPS a)
     7993inline LONG _GpiQueryElementPointer(HPS a)
    79947994{
    79957995 LONG yyrc;
    … …  
    80058005#define GpiQueryElementPointer _GpiQueryElementPointer
    80068006
    8007 inline LONG APIENTRY _GpiQueryElementType(HPS a, PLONG b, LONG c, PSZ d)
     8007inline LONG _GpiQueryElementType(HPS a, PLONG b, LONG c, PSZ d)
    80088008{
    80098009 LONG yyrc;
    … …  
    80198019#define GpiQueryElementType _GpiQueryElementType
    80208020
    8021 inline ULONG APIENTRY _GpiQueryFaceString(HPS a, PCSZ b, PFACENAMEDESC c, LONG d, PSZ e)
     8021inline ULONG _GpiQueryFaceString(HPS a, PCSZ b, PFACENAMEDESC c, LONG d, PSZ e)
    80228022{
    80238023 ULONG yyrc;
    … …  
    80338033#define GpiQueryFaceString _GpiQueryFaceString
    80348034
    8035 inline ULONG APIENTRY _GpiQueryFontAction(HAB a, ULONG b)
     8035inline ULONG _GpiQueryFontAction(HAB a, ULONG b)
    80368036{
    80378037 ULONG yyrc;
    … …  
    80478047#define GpiQueryFontAction _GpiQueryFontAction
    80488048
    8049 inline LONG APIENTRY _GpiQueryFontFileDescriptions(HAB a, PCSZ b, PLONG c, PFFDESCS d)
     8049inline LONG _GpiQueryFontFileDescriptions(HAB a, PCSZ b, PLONG c, PFFDESCS d)
    80508050{
    80518051 LONG yyrc;
    … …  
    80618061#define GpiQueryFontFileDescriptions _GpiQueryFontFileDescriptions
    80628062
    8063 inline BOOL APIENTRY _GpiQueryFontMetrics(HPS a, LONG b, PFONTMETRICS c)
     8063inline BOOL _GpiQueryFontMetrics(HPS a, LONG b, PFONTMETRICS c)
    80648064{
    80658065 BOOL yyrc;
    … …  
    80758075#define GpiQueryFontMetrics _GpiQueryFontMetrics
    80768076
    8077 inline LONG APIENTRY _GpiQueryFonts(HPS a, ULONG b, PCSZ c, PLONG d, LONG e, PFONTMETRICS f)
     8077inline LONG _GpiQueryFonts(HPS a, ULONG b, PCSZ c, PLONG d, LONG e, PFONTMETRICS f)
    80788078{
    80798079 LONG yyrc;
    … …  
    80898089#define GpiQueryFonts _GpiQueryFonts
    80908090
    8091 inline LONG APIENTRY _GpiQueryFullFontFileDescs(HAB a, PCSZ b, PLONG c, PVOID d, PLONG e)
     8091inline LONG _GpiQueryFullFontFileDescs(HAB a, PCSZ b, PLONG c, PVOID d, PLONG e)
    80928092{
    80938093 LONG yyrc;
    … …  
    81038103#define GpiQueryFullFontFileDescs _GpiQueryFullFontFileDescs
    81048104
    8105 inline BOOL APIENTRY _GpiQueryGraphicsField(HPS a, PRECTL b)
     8105inline BOOL _GpiQueryGraphicsField(HPS a, PRECTL b)
    81068106{
    81078107 BOOL yyrc;
    … …  
    81178117#define GpiQueryGraphicsField _GpiQueryGraphicsField
    81188118
    8119 inline LONG APIENTRY _GpiQueryKerningPairs(HPS a, LONG b, PKERNINGPAIRS c)
     8119inline LONG _GpiQueryKerningPairs(HPS a, LONG b, PKERNINGPAIRS c)
    81208120{
    81218121 LONG yyrc;
    … …  
    81318131#define GpiQueryKerningPairs _GpiQueryKerningPairs
    81328132
    8133 inline LONG APIENTRY _GpiQueryLineEnd(HPS a)
     8133inline LONG _GpiQueryLineEnd(HPS a)
    81348134{
    81358135 LONG yyrc;
    … …  
    81458145#define GpiQueryLineEnd _GpiQueryLineEnd
    81468146
    8147 inline LONG APIENTRY _GpiQueryLineJoin(HPS a)
     8147inline LONG _GpiQueryLineJoin(HPS a)
    81488148{
    81498149 LONG yyrc;
    … …  
    81598159#define GpiQueryLineJoin _GpiQueryLineJoin
    81608160
    8161 inline LONG APIENTRY _GpiQueryLineType(HPS a)
     8161inline LONG _GpiQueryLineType(HPS a)
    81628162{
    81638163 LONG yyrc;
    … …  
    81738173#define GpiQueryLineType _GpiQueryLineType
    81748174
    8175 inline FIXED APIENTRY _GpiQueryLineWidth(HPS a)
     8175inline FIXED _GpiQueryLineWidth(HPS a)
    81768176{
    81778177 FIXED yyrc;
    … …  
    81878187#define GpiQueryLineWidth _GpiQueryLineWidth
    81888188
    8189 inline LONG APIENTRY _GpiQueryLineWidthGeom(HPS a)
     8189inline LONG _GpiQueryLineWidthGeom(HPS a)
    81908190{
    81918191 LONG yyrc;
    … …  
    82018201#define GpiQueryLineWidthGeom _GpiQueryLineWidthGeom
    82028202
    8203 inline LONG APIENTRY _GpiQueryLogColorTable(HPS a, ULONG b, LONG c, LONG d, PLONG e)
     8203inline LONG _GpiQueryLogColorTable(HPS a, ULONG b, LONG c, LONG d, PLONG e)
    82048204{
    82058205 LONG yyrc;
    … …  
    82158215#define GpiQueryLogColorTable _GpiQueryLogColorTable
    82168216
    8217 inline BOOL APIENTRY _GpiQueryLogicalFont(HPS a, LONG b, PSTR8 c, PFATTRS d, LONG e)
     8217inline BOOL _GpiQueryLogicalFont(HPS a, LONG b, PSTR8 c, PFATTRS d, LONG e)
    82188218{
    82198219 BOOL yyrc;
    … …  
    82298229#define GpiQueryLogicalFont _GpiQueryLogicalFont
    82308230
    8231 inline LONG APIENTRY _GpiQueryMarker(HPS a)
     8231inline LONG _GpiQueryMarker(HPS a)
    82328232{
    82338233 LONG yyrc;
    … …  
    82438243#define GpiQueryMarker _GpiQueryMarker
    82448244
    8245 inline BOOL APIENTRY _GpiQueryMarkerBox(HPS a, PSIZEF b)
     8245inline BOOL _GpiQueryMarkerBox(HPS a, PSIZEF b)
    82468246{
    82478247 BOOL yyrc;
    … …  
    82578257#define GpiQueryMarkerBox _GpiQueryMarkerBox
    82588258
    8259 inline LONG APIENTRY _GpiQueryMarkerSet(HPS a)
     8259inline LONG _GpiQueryMarkerSet(HPS a)
    82608260{
    82618261 LONG yyrc;
    … …  
    82718271#define GpiQueryMarkerSet _GpiQueryMarkerSet
    82728272
    8273 inline BOOL APIENTRY _GpiQueryMetaFileBits(HMF a, LONG b, LONG c, PBYTE d)
     8273inline BOOL _GpiQueryMetaFileBits(HMF a, LONG b, LONG c, PBYTE d)
    82748274{
    82758275 BOOL yyrc;
    … …  
    82858285#define GpiQueryMetaFileBits _GpiQueryMetaFileBits
    82868286
    8287 inline LONG APIENTRY _GpiQueryMetaFileLength(HMF a)
     8287inline LONG _GpiQueryMetaFileLength(HMF a)
    82888288{
    82898289 LONG yyrc;
    … …  
    82998299#define GpiQueryMetaFileLength _GpiQueryMetaFileLength
    83008300
    8301 inline LONG APIENTRY _GpiQueryMix(HPS a)
     8301inline LONG _GpiQueryMix(HPS a)
    83028302{
    83038303 LONG yyrc;
    … …  
    83138313#define GpiQueryMix _GpiQueryMix
    83148314
    8315 inline BOOL APIENTRY _GpiQueryModelTransformMatrix(HPS a, LONG b, PMATRIXLF c)
     8315inline BOOL _GpiQueryModelTransformMatrix(HPS a, LONG b, PMATRIXLF c)
    83168316{
    83178317 BOOL yyrc;
    … …  
    83278327#define GpiQueryModelTransformMatrix _GpiQueryModelTransformMatrix
    83288328
    8329 inline LONG APIENTRY _GpiQueryNearestColor(HPS a, ULONG b, LONG c)
     8329inline LONG _GpiQueryNearestColor(HPS a, ULONG b, LONG c)
    83308330{
    83318331 LONG yyrc;
    … …  
    83418341#define GpiQueryNearestColor _GpiQueryNearestColor
    83428342
    8343 inline LONG APIENTRY _GpiQueryNumberSetIds(HPS a)
     8343inline LONG _GpiQueryNumberSetIds(HPS a)
    83448344{
    83458345 LONG yyrc;
    … …  
    83558355#define GpiQueryNumberSetIds _GpiQueryNumberSetIds
    83568356
    8357 inline BOOL APIENTRY _GpiQueryPageViewport(HPS a, PRECTL b)
     8357inline BOOL _GpiQueryPageViewport(HPS a, PRECTL b)
    83588358{
    83598359 BOOL yyrc;
    … …  
    83698369#define GpiQueryPageViewport _GpiQueryPageViewport
    83708370
    8371 inline HPAL APIENTRY _GpiQueryPalette(HPS a)
     8371inline HPAL _GpiQueryPalette(HPS a)
    83728372{
    83738373 HPAL yyrc;
    … …  
    83838383#define GpiQueryPalette _GpiQueryPalette
    83848384
    8385 inline LONG APIENTRY _GpiQueryPaletteInfo(HPAL a, HPS b, ULONG c, ULONG d, ULONG e, PULONG f)
     8385inline LONG _GpiQueryPaletteInfo(HPAL a, HPS b, ULONG c, ULONG d, ULONG e, PULONG f)
    83868386{
    83878387 LONG yyrc;
    … …  
    83978397#define GpiQueryPaletteInfo _GpiQueryPaletteInfo
    83988398
    8399 inline LONG APIENTRY _GpiQueryPattern(HPS a)
     8399inline LONG _GpiQueryPattern(HPS a)
    84008400{
    84018401 LONG yyrc;
    … …  
    84118411#define GpiQueryPattern _GpiQueryPattern
    84128412
    8413 inline BOOL APIENTRY _GpiQueryPatternRefPoint(HPS a, PPOINTL b)
     8413inline BOOL _GpiQueryPatternRefPoint(HPS a, PPOINTL b)
    84148414{
    84158415 BOOL yyrc;
    … …  
    84258425#define GpiQueryPatternRefPoint _GpiQueryPatternRefPoint
    84268426
    8427 inline LONG APIENTRY _GpiQueryPatternSet(HPS a)
     8427inline LONG _GpiQueryPatternSet(HPS a)
    84288428{
    84298429 LONG yyrc;
    … …  
    84398439#define GpiQueryPatternSet _GpiQueryPatternSet
    84408440
    8441 inline LONG APIENTRY _GpiQueryRealColors(HPS a, ULONG b, LONG c, LONG d, PLONG e)
     8441inline LONG _GpiQueryRealColors(HPS a, ULONG b, LONG c, LONG d, PLONG e)
    84428442{
    84438443 LONG yyrc;
    … …  
    84538453#define GpiQueryRealColors _GpiQueryRealColors
    84548454
    8455 inline LONG APIENTRY _GpiQueryRegionBox(HPS a, HRGN b, PRECTL c)
     8455inline LONG _GpiQueryRegionBox(HPS a, HRGN b, PRECTL c)
    84568456{
    84578457 LONG yyrc;
    … …  
    84678467#define GpiQueryRegionBox _GpiQueryRegionBox
    84688468
    8469 inline BOOL APIENTRY _GpiQueryRegionRects(HPS a, HRGN b, PRECTL c, PRGNRECT d, PRECTL e)
     8469inline BOOL _GpiQueryRegionRects(HPS a, HRGN b, PRECTL c, PRGNRECT d, PRECTL e)
    84708470{
    84718471 BOOL yyrc;
    … …  
    84818481#define GpiQueryRegionRects _GpiQueryRegionRects
    84828482
    8483 inline LONG APIENTRY _GpiQueryRGBColor(HPS a, ULONG b, LONG c)
     8483inline LONG _GpiQueryRGBColor(HPS a, ULONG b, LONG c)
    84848484{
    84858485 LONG yyrc;
    … …  
    84958495#define GpiQueryRGBColor _GpiQueryRGBColor
    84968496
    8497 inline BOOL APIENTRY _GpiQuerySegmentTransformMatrix(HPS a, LONG b, LONG c, PMATRIXLF d)
     8497inline BOOL _GpiQuerySegmentTransformMatrix(HPS a, LONG b, LONG c, PMATRIXLF d)
    84988498{
    84998499 BOOL yyrc;
    … …  
    85098509#define GpiQuerySegmentTransformMatrix _GpiQuerySegmentTransformMatrix
    85108510
    8511 inline BOOL APIENTRY _GpiQuerySetIds(HPS a, LONG b, PLONG c, PSTR8 d, PLONG e)
     8511inline BOOL _GpiQuerySetIds(HPS a, LONG b, PLONG c, PSTR8 d, PLONG e)
    85128512{
    85138513 BOOL yyrc;
    … …  
    85238523#define GpiQuerySetIds _GpiQuerySetIds
    85248524
    8525 inline BOOL APIENTRY _GpiQueryTextAlignment(HPS a, PLONG b, PLONG c)
     8525inline BOOL _GpiQueryTextAlignment(HPS a, PLONG b, PLONG c)
    85268526{
    85278527 BOOL yyrc;
    … …  
    85378537#define GpiQueryTextAlignment _GpiQueryTextAlignment
    85388538
    8539 inline BOOL APIENTRY _GpiQueryTextBox(HPS a, LONG b, PCH c, LONG d, PPOINTL e)
     8539inline BOOL _GpiQueryTextBox(HPS a, LONG b, PCH c, LONG d, PPOINTL e)
    85408540{
    85418541 BOOL yyrc;
    … …  
    85518551#define GpiQueryTextBox _GpiQueryTextBox
    85528552
    8553 inline BOOL APIENTRY _GpiQueryViewingLimits(HPS a, PRECTL b)
     8553inline BOOL _GpiQueryViewingLimits(HPS a, PRECTL b)
    85548554{
    85558555 BOOL yyrc;
    … …  
    85658565#define GpiQueryViewingLimits _GpiQueryViewingLimits
    85668566
    8567 inline BOOL APIENTRY _GpiQueryViewingTransformMatrix(HPS a, LONG b, PMATRIXLF c)
     8567inline BOOL _GpiQueryViewingTransformMatrix(HPS a, LONG b, PMATRIXLF c)
    85688568{
    85698569 BOOL yyrc;
    … …  
    85798579#define GpiQueryViewingTransformMatrix _GpiQueryViewingTransformMatrix
    85808580
    8581 inline BOOL APIENTRY _GpiQueryWidthTable(HPS a, LONG b, LONG c, PLONG d)
     8581inline BOOL _GpiQueryWidthTable(HPS a, LONG b, LONG c, PLONG d)
    85828582{
    85838583 BOOL yyrc;
    … …  
    85938593#define GpiQueryWidthTable _GpiQueryWidthTable
    85948594
    8595 inline LONG APIENTRY _GpiRectInRegion(HPS a, HRGN b, PRECTL c)
     8595inline LONG _GpiRectInRegion(HPS a, HRGN b, PRECTL c)
    85968596{
    85978597 LONG yyrc;
    … …  
    86078607#define GpiRectInRegion _GpiRectInRegion
    86088608
    8609 inline LONG APIENTRY _GpiRectVisible(HPS a, PRECTL b)
     8609inline LONG _GpiRectVisible(HPS a, PRECTL b)
    86108610{
    86118611 LONG yyrc;
    … …  
    86218621#define GpiRectVisible _GpiRectVisible
    86228622
    8623 inline BOOL APIENTRY _GpiRotate(HPS a, PMATRIXLF b, LONG c, FIXED d, PPOINTL e)
     8623inline BOOL _GpiRotate(HPS a, PMATRIXLF b, LONG c, FIXED d, PPOINTL e)
    86248624{
    86258625 BOOL yyrc;
    … …  
    86358635#define GpiRotate _GpiRotate
    86368636
    8637 inline BOOL APIENTRY _GpiSaveMetaFile(HMF a, PCSZ b)
     8637inline BOOL _GpiSaveMetaFile(HMF a, PCSZ b)
    86388638{
    86398639 BOOL yyrc;
    … …  
    86498649#define GpiSaveMetaFile _GpiSaveMetaFile
    86508650
    8651 inline BOOL APIENTRY _GpiScale(HPS a, PMATRIXLF b, LONG c, PFIXED d, PPOINTL e)
     8651inline BOOL _GpiScale(HPS a, PMATRIXLF b, LONG c, PFIXED d, PPOINTL e)
    86528652{
    86538653 BOOL yyrc;
    … …  
    86638663#define GpiScale _GpiScale
    86648664
    8665 inline HPAL APIENTRY _GpiSelectPalette(HPS a, HPAL b)
     8665inline HPAL _GpiSelectPalette(HPS a, HPAL b)
    86668666{
    86678667 HPAL yyrc;
    … …  
    86778677#define GpiSelectPalette _GpiSelectPalette
    86788678
    8679 inline BOOL APIENTRY _GpiSetArcParams(HPS a, PARCPARAMS b)
     8679inline BOOL _GpiSetArcParams(HPS a, PARCPARAMS b)
    86808680{
    86818681 BOOL yyrc;
    … …  
    86918691#define GpiSetArcParams _GpiSetArcParams
    86928692
    8693 inline BOOL APIENTRY _GpiSetAttrMode(HPS a, LONG b)
     8693inline BOOL _GpiSetAttrMode(HPS a, LONG b)
    86948694{
    86958695 BOOL yyrc;
    … …  
    87058705#define GpiSetAttrMode _GpiSetAttrMode
    87068706
    8707 inline BOOL APIENTRY _GpiSetAttrs(HPS a, LONG b, ULONG c, ULONG d, PVOID e)
     8707inline BOOL _GpiSetAttrs(HPS a, LONG b, ULONG c, ULONG d, PVOID e)
    87088708{
    87098709 BOOL yyrc;
    … …  
    87198719#define GpiSetAttrs _GpiSetAttrs
    87208720
    8721 inline BOOL APIENTRY _GpiSetBackColor(HPS a, LONG b)
     8721inline BOOL _GpiSetBackColor(HPS a, LONG b)
    87228722{
    87238723 BOOL yyrc;
    … …  
    87338733#define GpiSetBackColor _GpiSetBackColor
    87348734
    8735 inline BOOL APIENTRY _GpiSetBackMix(HPS a, LONG b)
     8735inline BOOL _GpiSetBackMix(HPS a, LONG b)
    87368736{
    87378737 BOOL yyrc;
    … …  
    87478747#define GpiSetBackMix _GpiSetBackMix
    87488748
    8749 inline BOOL APIENTRY _GpiSetCharAngle(HPS a, PGRADIENTL b)
     8749inline BOOL _GpiSetCharAngle(HPS a, PGRADIENTL b)
    87508750{
    87518751 BOOL yyrc;
    … …  
    87618761#define GpiSetCharAngle _GpiSetCharAngle
    87628762
    8763 inline BOOL APIENTRY _GpiSetCharBox(HPS a, PSIZEF b)
     8763inline BOOL _GpiSetCharBox(HPS a, PSIZEF b)
    87648764{
    87658765 BOOL yyrc;
    … …  
    87758775#define GpiSetCharBox _GpiSetCharBox
    87768776
    8777 inline BOOL APIENTRY _GpiSetCharBreakExtra(HPS a, FIXED b)
     8777inline BOOL _GpiSetCharBreakExtra(HPS a, FIXED b)
    87788778{
    87798779 BOOL yyrc;
    … …  
    87898789#define GpiSetCharBreakExtra _GpiSetCharBreakExtra
    87908790
    8791 inline BOOL APIENTRY _GpiSetCharDirection(HPS a, LONG b)
     8791inline BOOL _GpiSetCharDirection(HPS a, LONG b)
    87928792{
    87938793 BOOL yyrc;
    … …  
    88038803#define GpiSetCharDirection _GpiSetCharDirection
    88048804
    8805 inline BOOL APIENTRY _GpiSetCharExtra(HPS a, FIXED b)
     8805inline BOOL _GpiSetCharExtra(HPS a, FIXED b)
    88068806{
    88078807 BOOL yyrc;
    … …  
    88178817#define GpiSetCharExtra _GpiSetCharExtra
    88188818
    8819 inline BOOL APIENTRY _GpiSetCharMode(HPS a, LONG b)
     8819inline BOOL _GpiSetCharMode(HPS a, LONG b)
    88208820{
    88218821 BOOL yyrc;
    … …  
    88318831#define GpiSetCharMode _GpiSetCharMode
    88328832
    8833 inline BOOL APIENTRY _GpiSetCharSet(HPS a, LONG b)
     8833inline BOOL _GpiSetCharSet(HPS a, LONG b)
    88348834{
    88358835 BOOL yyrc;
    … …  
    88458845#define GpiSetCharSet _GpiSetCharSet
    88468846
    8847 inline BOOL APIENTRY _GpiSetCharShear(HPS a, PPOINTL b)
     8847inline BOOL _GpiSetCharShear(HPS a, PPOINTL b)
    88488848{
    88498849 BOOL yyrc;
    … …  
    88598859#define GpiSetCharShear _GpiSetCharShear
    88608860
    8861 inline BOOL APIENTRY _GpiSetClipPath(HPS a, LONG b, LONG c)
     8861inline BOOL _GpiSetClipPath(HPS a, LONG b, LONG c)
    88628862{
    88638863 BOOL yyrc;
    … …  
    88738873#define GpiSetClipPath _GpiSetClipPath
    88748874
    8875 inline LONG APIENTRY _GpiSetClipRegion(HPS a, HRGN b, PHRGN c)
     8875inline LONG _GpiSetClipRegion(HPS a, HRGN b, PHRGN c)
    88768876{
    88778877 LONG yyrc;
    … …  
    88878887#define GpiSetClipRegion _GpiSetClipRegion
    88888888
    8889 inline BOOL APIENTRY _GpiSetColor(HPS a, LONG b)
     8889inline BOOL _GpiSetColor(HPS a, LONG b)
    88908890{
    88918891 BOOL yyrc;
    … …  
    89018901#define GpiSetColor _GpiSetColor
    89028902
    8903 inline BOOL APIENTRY _GpiSetCp(HPS a, ULONG b)
     8903inline BOOL _GpiSetCp(HPS a, ULONG b)
    89048904{
    89058905 BOOL yyrc;
    … …  
    89158915#define GpiSetCp _GpiSetCp
    89168916
    8917 inline BOOL APIENTRY _GpiSetCurrentPosition(HPS a, PPOINTL b)
     8917inline BOOL _GpiSetCurrentPosition(HPS a, PPOINTL b)
    89188918{
    89198919 BOOL yyrc;
    … …  
    89298929#define GpiSetCurrentPosition _GpiSetCurrentPosition
    89308930
    8931 inline BOOL APIENTRY _GpiSetDefArcParams(HPS a, PARCPARAMS b)
     8931inline BOOL _GpiSetDefArcParams(HPS a, PARCPARAMS b)
    89328932{
    89338933 BOOL yyrc;
    … …  
    89438943#define GpiSetDefArcParams _GpiSetDefArcParams
    89448944
    8945 inline BOOL APIENTRY _GpiSetDefAttrs(HPS a, LONG b, ULONG c, PVOID d)
     8945inline BOOL _GpiSetDefAttrs(HPS a, LONG b, ULONG c, PVOID d)
    89468946{
    89478947 BOOL yyrc;
    … …  
    89578957#define GpiSetDefAttrs _GpiSetDefAttrs
    89588958
    8959 inline BOOL APIENTRY _GpiSetDefaultViewMatrix(HPS a, LONG b, PMATRIXLF c, LONG d)
     8959inline BOOL _GpiSetDefaultViewMatrix(HPS a, LONG b, PMATRIXLF c, LONG d)
    89608960{
    89618961 BOOL yyrc;
    … …  
    89718971#define GpiSetDefaultViewMatrix _GpiSetDefaultViewMatrix
    89728972
    8973 inline BOOL APIENTRY _GpiSetDefTag(HPS a, LONG b)
     8973inline BOOL _GpiSetDefTag(HPS a, LONG b)
    89748974{
    89758975 BOOL yyrc;
    … …  
    89858985#define GpiSetDefTag _GpiSetDefTag
    89868986
    8987 inline BOOL APIENTRY _GpiSetDefViewingLimits(HPS a, PRECTL b)
     8987inline BOOL _GpiSetDefViewingLimits(HPS a, PRECTL b)
    89888988{
    89898989 BOOL yyrc;
    … …  
    89998999#define GpiSetDefViewingLimits _GpiSetDefViewingLimits
    90009000
    9001 inline BOOL APIENTRY _GpiSetEditMode(HPS a, LONG b)
     9001inline BOOL _GpiSetEditMode(HPS a, LONG b)
    90029002{
    90039003 BOOL yyrc;
    … …  
    90139013#define GpiSetEditMode _GpiSetEditMode
    90149014
    9015 inline BOOL APIENTRY _GpiSetElementPointer(HPS a, LONG b)
     9015inline BOOL _GpiSetElementPointer(HPS a, LONG b)
    90169016{
    90179017 BOOL yyrc;
    … …  
    90279027#define GpiSetElementPointer _GpiSetElementPointer
    90289028
    9029 inline BOOL APIENTRY _GpiSetElementPointerAtLabel(HPS a, LONG b)
     9029inline BOOL _GpiSetElementPointerAtLabel(HPS a, LONG b)
    90309030{
    90319031 BOOL yyrc;
    … …  
    90419041#define GpiSetElementPointerAtLabel _GpiSetElementPointerAtLabel
    90429042
    9043 inline BOOL APIENTRY _GpiSetGraphicsField(HPS a, PRECTL b)
     9043inline BOOL _GpiSetGraphicsField(HPS a, PRECTL b)
    90449044{
    90459045 BOOL yyrc;
    … …  
    90559055#define GpiSetGraphicsField _GpiSetGraphicsField
    90569056
    9057 inline BOOL APIENTRY _GpiSetLineEnd(HPS a, LONG b)
     9057inline BOOL _GpiSetLineEnd(HPS a, LONG b)
    90589058{
    90599059 BOOL yyrc;
    … …  
    90699069#define GpiSetLineEnd _GpiSetLineEnd
    90709070
    9071 inline BOOL APIENTRY _GpiSetLineJoin(HPS a, LONG b)
     9071inline BOOL _GpiSetLineJoin(HPS a, LONG b)
    90729072{
    90739073 BOOL yyrc;
    … …  
    90839083#define GpiSetLineJoin _GpiSetLineJoin
    90849084
    9085 inline BOOL APIENTRY _GpiSetLineType(HPS a, LONG b)
     9085inline BOOL _GpiSetLineType(HPS a, LONG b)
    90869086{
    90879087 BOOL yyrc;
    … …  
    90979097#define GpiSetLineType _GpiSetLineType
    90989098
    9099 inline BOOL APIENTRY _GpiSetLineWidth(HPS a, FIXED b)
     9099inline BOOL _GpiSetLineWidth(HPS a, FIXED b)
    91009100{
    91019101 BOOL yyrc;
    … …  
    91119111#define GpiSetLineWidth _GpiSetLineWidth
    91129112
    9113 inline BOOL APIENTRY _GpiSetLineWidthGeom(HPS a, LONG b)
     9113inline BOOL _GpiSetLineWidthGeom(HPS a, LONG b)
    91149114{
    91159115 BOOL yyrc;
    … …  
    91259125#define GpiSetLineWidthGeom _GpiSetLineWidthGeom
    91269126
    9127 inline BOOL APIENTRY _GpiSetMarker(HPS a, LONG b)
     9127inline BOOL _GpiSetMarker(HPS a, LONG b)
    91289128{
    91299129 BOOL yyrc;
    … …  
    91399139#define GpiSetMarker _GpiSetMarker
    91409140
    9141 inline BOOL APIENTRY _GpiSetMarkerBox(HPS a, PSIZEF b)
     9141inline BOOL _GpiSetMarkerBox(HPS a, PSIZEF b)
    91429142{
    91439143 BOOL yyrc;
    … …  
    91539153#define GpiSetMarkerBox _GpiSetMarkerBox
    91549154
    9155 inline BOOL APIENTRY _GpiSetMarkerSet(HPS a, LONG b)
     9155inline BOOL _GpiSetMarkerSet(HPS a, LONG b)
    91569156{
    91579157 BOOL yyrc;
    … …  
    91679167#define GpiSetMarkerSet _GpiSetMarkerSet
    91689168
    9169 inline BOOL APIENTRY _GpiSetMetaFileBits(HMF a, LONG b, LONG c, PBYTE d)
     9169inline BOOL _GpiSetMetaFileBits(HMF a, LONG b, LONG c, PBYTE d)
    91709170{
    91719171 BOOL yyrc;
    … …  
    91819181#define GpiSetMetaFileBits _GpiSetMetaFileBits
    91829182
    9183 inline BOOL APIENTRY _GpiSetMix(HPS a, LONG b)
     9183inline BOOL _GpiSetMix(HPS a, LONG b)
    91849184{
    91859185 BOOL yyrc;
    … …  
    91959195#define GpiSetMix _GpiSetMix
    91969196
    9197 inline BOOL APIENTRY _GpiSetModelTransformMatrix(HPS a, LONG b, PMATRIXLF c, LONG d)
     9197inline BOOL _GpiSetModelTransformMatrix(HPS a, LONG b, PMATRIXLF c, LONG d)
    91989198{
    91999199 BOOL yyrc;
    … …  
    92099209#define GpiSetModelTransformMatrix _GpiSetModelTransformMatrix
    92109210
    9211 inline BOOL APIENTRY _GpiSetPageViewport(HPS a, PRECTL b)
     9211inline BOOL _GpiSetPageViewport(HPS a, PRECTL b)
    92129212{
    92139213 BOOL yyrc;
    … …  
    92239223#define GpiSetPageViewport _GpiSetPageViewport
    92249224
    9225 inline BOOL APIENTRY _GpiSetPaletteEntries(HPAL a, ULONG b, ULONG c, ULONG d, ULONG *e)
     9225inline BOOL _GpiSetPaletteEntries(HPAL a, ULONG b, ULONG c, ULONG d, ULONG *e)
    92269226{
    92279227 BOOL yyrc;
    … …  
    92379237#define GpiSetPaletteEntries _GpiSetPaletteEntries
    92389238
    9239 inline BOOL APIENTRY _GpiSetPattern(HPS a, LONG b)
     9239inline BOOL _GpiSetPattern(HPS a, LONG b)
    92409240{
    92419241 BOOL yyrc;
    … …  
    92519251#define GpiSetPattern _GpiSetPattern
    92529252
    9253 inline BOOL APIENTRY _GpiSetPatternRefPoint(HPS a, PPOINTL b)
     9253inline BOOL _GpiSetPatternRefPoint(HPS a, PPOINTL b)
    92549254{
    92559255 BOOL yyrc;
    … …  
    92659265#define GpiSetPatternRefPoint _GpiSetPatternRefPoint
    92669266
    9267 inline BOOL APIENTRY _GpiSetPatternSet(HPS a, LONG b)
     9267inline BOOL _GpiSetPatternSet(HPS a, LONG b)
    92689268{
    92699269 BOOL yyrc;
    … …  
    92799279#define GpiSetPatternSet _GpiSetPatternSet
    92809280
    9281 inline BOOL APIENTRY _GpiSetRegion(HPS a, HRGN b, LONG c, PRECTL d)
     9281inline BOOL _GpiSetRegion(HPS a, HRGN b, LONG c, PRECTL d)
    92829282{
    92839283 BOOL yyrc;
    … …  
    92939293#define GpiSetRegion _GpiSetRegion
    92949294
    9295 inline BOOL APIENTRY _GpiSetSegmentTransformMatrix(HPS a, LONG b, LONG c, MATRIXLF *d, LONG e)
     9295inline BOOL _GpiSetSegmentTransformMatrix(HPS a, LONG b, LONG c, MATRIXLF *d, LONG e)
    92969296{
    92979297 BOOL yyrc;
    … …  
    93079307#define GpiSetSegmentTransformMatrix _GpiSetSegmentTransformMatrix
    93089308
    9309 inline BOOL APIENTRY _GpiSetTextAlignment(HPS a, LONG b, LONG c)
     9309inline BOOL _GpiSetTextAlignment(HPS a, LONG b, LONG c)
    93109310{
    93119311 BOOL yyrc;
    … …  
    93219321#define GpiSetTextAlignment _GpiSetTextAlignment
    93229322
    9323 inline BOOL APIENTRY _GpiSetViewingLimits(HPS a, PRECTL b)
     9323inline BOOL _GpiSetViewingLimits(HPS a, PRECTL b)
    93249324{
    93259325 BOOL yyrc;
    … …  
    93359335#define GpiSetViewingLimits _GpiSetViewingLimits
    93369336
    9337 inline BOOL APIENTRY _GpiSetViewingTransformMatrix(HPS a, LONG b, MATRIXLF *c, LONG d)
     9337inline BOOL _GpiSetViewingTransformMatrix(HPS a, LONG b, MATRIXLF *c, LONG d)
    93389338{
    93399339 BOOL yyrc;
    … …  
    93499349#define GpiSetViewingTransformMatrix _GpiSetViewingTransformMatrix
    93509350
    9351 inline LONG APIENTRY _GpiStrokePath(HPS a, LONG b, ULONG c)
     9351inline LONG _GpiStrokePath(HPS a, LONG b, ULONG c)
    93529352{
    93539353 LONG yyrc;
    … …  
    93639363#define GpiStrokePath _GpiStrokePath
    93649364
    9365 inline BOOL APIENTRY _GpiTranslate(HPS a, PMATRIXLF b, LONG c, PPOINTL d)
     9365inline BOOL _GpiTranslate(HPS a, PMATRIXLF b, LONG c, PPOINTL d)
    93669366{
    93679367 BOOL yyrc;
    … …  
    93779377#define GpiTranslate _GpiTranslate
    93789378
    9379 inline BOOL APIENTRY _GpiUnloadFonts(HAB a, PCSZ b)
     9379inline BOOL _GpiUnloadFonts(HAB a, PCSZ b)
    93809380{
    93819381 BOOL yyrc;
    … …  
    93919391#define GpiUnloadFonts _GpiUnloadFonts
    93929392
    9393 inline BOOL APIENTRY _GpiUnloadPublicFonts(HAB a, PCSZ b)
     9393inline BOOL _GpiUnloadPublicFonts(HAB a, PCSZ b)
    93949394{
    93959395 BOOL yyrc;
    … …  
    94069406
    94079407#ifdef INCL_GPIBITMAPS
    9408 inline LONG APIENTRY _GpiBitBlt(HPS a, HPS b, LONG c, PPOINTL d, LONG e, ULONG f)
     9408inline LONG _GpiBitBlt(HPS a, HPS b, LONG c, PPOINTL d, LONG e, ULONG f)
    94099409{
    94109410 LONG yyrc;
    … …  
    94209420#define GpiBitBlt _GpiBitBlt
    94219421
    9422 inline BOOL APIENTRY _GpiDeleteBitmap(HBITMAP a)
     9422inline BOOL _GpiDeleteBitmap(HBITMAP a)
    94239423{
    94249424 BOOL yyrc;
    … …  
    94349434#define GpiDeleteBitmap _GpiDeleteBitmap
    94359435
    9436 inline HBITMAP APIENTRY _GpiLoadBitmap(HPS a, HMODULE b, ULONG c, LONG d, LONG e)
     9436inline HBITMAP _GpiLoadBitmap(HPS a, HMODULE b, ULONG c, LONG d, LONG e)
    94379437{
    94389438 HBITMAP yyrc;
    … …  
    94489448#define GpiLoadBitmap _GpiLoadBitmap
    94499449
    9450 inline HBITMAP APIENTRY _GpiSetBitmap(HPS a, HBITMAP b)
     9450inline HBITMAP _GpiSetBitmap(HPS a, HBITMAP b)
    94519451{
    94529452 HBITMAP yyrc;
    … …  
    94629462#define GpiSetBitmap _GpiSetBitmap
    94639463
    9464 inline LONG APIENTRY _GpiWCBitBlt(HPS a, HBITMAP b, LONG c, PPOINTL d, LONG e, ULONG f)
     9464inline LONG _GpiWCBitBlt(HPS a, HBITMAP b, LONG c, PPOINTL d, LONG e, ULONG f)
    94659465{
    94669466 LONG yyrc;
    … …  
    94769476#define GpiWCBitBlt _GpiWCBitBlt
    94779477
    9478 inline HBITMAP APIENTRY _GpiCreateBitmap(HPS a, BITMAPINFOHEADER2 *b, ULONG c, PBYTE d, BITMAPINFO2 *e)
     9478inline HBITMAP _GpiCreateBitmap(HPS a, BITMAPINFOHEADER2 *b, ULONG c, PBYTE d, BITMAPINFO2 *e)
    94799479{
    94809480 HBITMAP yyrc;
    … …  
    94909490#define GpiCreateBitmap _GpiCreateBitmap
    94919491
    9492 inline LONG APIENTRY _GpiDrawBits(HPS a, PVOID b, BITMAPINFO2 *c, LONG d, PPOINTL e, LONG f, ULONG g)
     9492inline LONG _GpiDrawBits(HPS a, PVOID b, BITMAPINFO2 *c, LONG d, PPOINTL e, LONG f, ULONG g)
    94939493{
    94949494 LONG yyrc;
    … …  
    95049504#define GpiDrawBits _GpiDrawBits
    95059505
    9506 inline LONG APIENTRY _GpiFloodFill(HPS a, LONG b, LONG c)
     9506inline LONG _GpiFloodFill(HPS a, LONG b, LONG c)
    95079507{
    95089508 LONG yyrc;
    … …  
    95189518#define GpiFloodFill _GpiFloodFill
    95199519
    9520 inline LONG APIENTRY _GpiQueryBitmapBits(HPS a, LONG b, LONG c, PBYTE d, PBITMAPINFO2 e)
     9520inline LONG _GpiQueryBitmapBits(HPS a, LONG b, LONG c, PBYTE d, PBITMAPINFO2 e)
    95219521{
    95229522 LONG yyrc;
    … …  
    95329532#define GpiQueryBitmapBits _GpiQueryBitmapBits
    95339533
    9534 inline BOOL APIENTRY _GpiQueryBitmapDimension(HBITMAP a, PSIZEL b)
     9534inline BOOL _GpiQueryBitmapDimension(HBITMAP a, PSIZEL b)
    95359535{
    95369536 BOOL yyrc;
    … …  
    95469546#define GpiQueryBitmapDimension _GpiQueryBitmapDimension
    95479547
    9548 inline HBITMAP APIENTRY _GpiQueryBitmapHandle(HPS a, LONG b)
     9548inline HBITMAP _GpiQueryBitmapHandle(HPS a, LONG b)
    95499549{
    95509550 HBITMAP yyrc;
    … …  
    95609560#define GpiQueryBitmapHandle _GpiQueryBitmapHandle
    95619561
    9562 inline BOOL APIENTRY _GpiQueryBitmapInfoHeader(HBITMAP a, PBITMAPINFOHEADER2 b)
     9562inline BOOL _GpiQueryBitmapInfoHeader(HBITMAP a, PBITMAPINFOHEADER2 b)
    95639563{
    95649564 BOOL yyrc;
    … …  
    95749574#define GpiQueryBitmapInfoHeader _GpiQueryBitmapInfoHeader
    95759575
    9576 inline BOOL APIENTRY _GpiQueryBitmapParameters(HBITMAP a, PBITMAPINFOHEADER b)
     9576inline BOOL _GpiQueryBitmapParameters(HBITMAP a, PBITMAPINFOHEADER b)
    95779577{
    95789578 BOOL yyrc;
    … …  
    95889588#define GpiQueryBitmapParameters _GpiQueryBitmapParameters
    95899589
    9590 inline BOOL APIENTRY _GpiQueryDeviceBitmapFormats(HPS a, LONG b, PLONG c)
     9590inline BOOL _GpiQueryDeviceBitmapFormats(HPS a, LONG b, PLONG c)
    95919591{
    95929592 BOOL yyrc;
    … …  
    96029602#define GpiQueryDeviceBitmapFormats _GpiQueryDeviceBitmapFormats
    96039603
    9604 inline LONG APIENTRY _GpiSetBitmapBits(HPS a, LONG b, LONG c, PBYTE d, BITMAPINFO2 *e)
     9604inline LONG _GpiSetBitmapBits(HPS a, LONG b, LONG c, PBYTE d, BITMAPINFO2 *e)
    96059605{
    96069606 LONG yyrc;
    … …  
    96169616#define GpiSetBitmapBits _GpiSetBitmapBits
    96179617
    9618 inline LONG APIENTRY _GpiQueryPel(HPS a, PPOINTL b)
     9618inline LONG _GpiQueryPel(HPS a, PPOINTL b)
    96199619{
    96209620 LONG yyrc;
    … …  
    96309630#define GpiQueryPel _GpiQueryPel
    96319631
    9632 inline BOOL APIENTRY _GpiSetBitmapDimension(HBITMAP a, SIZEL *b)
     9632inline BOOL _GpiSetBitmapDimension(HBITMAP a, SIZEL *b)
    96339633{
    96349634 BOOL yyrc;
    … …  
    96449644#define GpiSetBitmapDimension _GpiSetBitmapDimension
    96459645
    9646 inline BOOL APIENTRY _GpiSetBitmapId(HPS a, HBITMAP b, LONG c)
     9646inline BOOL _GpiSetBitmapId(HPS a, HBITMAP b, LONG c)
    96479647{
    96489648 BOOL yyrc;
    … …  
    96589658#define GpiSetBitmapId _GpiSetBitmapId
    96599659
    9660 inline LONG APIENTRY _GpiSetPel(HPS a, PPOINTL b)
     9660inline LONG _GpiSetPel(HPS a, PPOINTL b)
    96619661{
    96629662 LONG yyrc;
    … …  
    96749674#endif
    96759675#ifdef INCL_GPICONTROL
    9676 inline BOOL APIENTRY _GpiAssociate(HPS a, HDC b)
     9676inline BOOL _GpiAssociate(HPS a, HDC b)
    96779677{
    96789678 BOOL yyrc;
    … …  
    96889688#define GpiAssociate _GpiAssociate
    96899689
    9690 inline HPS APIENTRY _GpiCreatePS(HAB a, HDC b, PSIZEL c, ULONG d)
     9690inline HPS _GpiCreatePS(HAB a, HDC b, PSIZEL c, ULONG d)
    96919691{
    96929692 HPS yyrc;
    … …  
    97029702#define GpiCreatePS _GpiCreatePS
    97039703
    9704 inline BOOL APIENTRY _GpiDestroyPS(HPS a)
     9704inline BOOL _GpiDestroyPS(HPS a)
    97059705{
    97069706 BOOL yyrc;
    … …  
    97169716#define GpiDestroyPS _GpiDestroyPS
    97179717
    9718 inline BOOL APIENTRY _GpiErase(HPS a)
     9718inline BOOL _GpiErase(HPS a)
    97199719{
    97209720 BOOL yyrc;
    … …  
    97309730#define GpiErase _GpiErase
    97319731
    9732 inline HDC APIENTRY _GpiQueryDevice(HPS a)
     9732inline HDC _GpiQueryDevice(HPS a)
    97339733{
    97349734 HDC yyrc;
    … …  
    97449744#define GpiQueryDevice _GpiQueryDevice
    97459745
    9746 inline BOOL APIENTRY _GpiRestorePS(HPS a, LONG b)
     9746inline BOOL _GpiRestorePS(HPS a, LONG b)
    97479747{
    97489748 BOOL yyrc;
    … …  
    97589758#define GpiRestorePS _GpiRestorePS
    97599759
    9760 inline LONG APIENTRY _GpiSavePS(HPS a)
     9760inline LONG _GpiSavePS(HPS a)
    97619761{
    97629762 LONG yyrc;
    … …  
    97729772#define GpiSavePS _GpiSavePS
    97739773
    9774 inline LONG APIENTRY _GpiErrorSegmentData(HPS a, PLONG b, PLONG c)
     9774inline LONG _GpiErrorSegmentData(HPS a, PLONG b, PLONG c)
    97759775{
    97769776 LONG yyrc;
    … …  
    97869786#define GpiErrorSegmentData _GpiErrorSegmentData
    97879787
    9788 inline LONG APIENTRY _GpiQueryDrawControl(HPS a, LONG b)
     9788inline LONG _GpiQueryDrawControl(HPS a, LONG b)
    97899789{
    97909790 LONG yyrc;
    … …  
    98009800#define GpiQueryDrawControl _GpiQueryDrawControl
    98019801
    9802 inline LONG APIENTRY _GpiQueryDrawingMode(HPS a)
     9802inline LONG _GpiQueryDrawingMode(HPS a)
    98039803{
    98049804 LONG yyrc;
    … …  
    98149814#define GpiQueryDrawingMode _GpiQueryDrawingMode
    98159815
    9816 inline ULONG APIENTRY _GpiQueryPS(HPS a, PSIZEL b)
     9816inline ULONG _GpiQueryPS(HPS a, PSIZEL b)
    98179817{
    98189818 ULONG yyrc;
    … …  
    98289828#define GpiQueryPS _GpiQueryPS
    98299829
    9830 inline BOOL APIENTRY _GpiResetPS(HPS a, ULONG b)
     9830inline BOOL _GpiResetPS(HPS a, ULONG b)
    98319831{
    98329832 BOOL yyrc;
    … …  
    98429842#define GpiResetPS _GpiResetPS
    98439843
    9844 inline LONG APIENTRY _GpiQueryStopDraw(HPS a)
     9844inline LONG _GpiQueryStopDraw(HPS a)
    98459845{
    98469846 LONG yyrc;
    … …  
    98569856#define GpiQueryStopDraw _GpiQueryStopDraw
    98579857
    9858 inline BOOL APIENTRY _GpiSetDrawControl(HPS a, LONG b, LONG c)
     9858inline BOOL _GpiSetDrawControl(HPS a, LONG b, LONG c)
    98599859{
    98609860 BOOL yyrc;
    … …  
    98709870#define GpiSetDrawControl _GpiSetDrawControl
    98719871
    9872 inline BOOL APIENTRY _GpiSetDrawingMode(HPS a, LONG b)
     9872inline BOOL _GpiSetDrawingMode(HPS a, LONG b)
    98739873{
    98749874 BOOL yyrc;
    … …  
    98849884#define GpiSetDrawingMode _GpiSetDrawingMode
    98859885
    9886 inline BOOL APIENTRY _GpiSetPS(HPS a, SIZEL *b, ULONG c)
     9886inline BOOL _GpiSetPS(HPS a, SIZEL *b, ULONG c)
    98879887{
    98889888 BOOL yyrc;
    … …  
    98989898#define GpiSetPS _GpiSetPS
    98999899
    9900 inline BOOL APIENTRY _GpiSetStopDraw(HPS a, LONG b)
     9900inline BOOL _GpiSetStopDraw(HPS a, LONG b)
    99019901{
    99029902 BOOL yyrc;
    … …  
    99149914#endif
    99159915#ifdef INCL_GPICORRELATION
    9916 inline LONG APIENTRY _GpiCorrelateChain(HPS a, LONG b, PPOINTL c, LONG d, LONG e, PLONG f)
     9916inline LONG _GpiCorrelateChain(HPS a, LONG b, PPOINTL c, LONG d, LONG e, PLONG f)
    99179917{
    99189918 LONG yyrc;
    … …  
    99289928#define GpiCorrelateChain _GpiCorrelateChain
    99299929
    9930 inline LONG APIENTRY _GpiCorrelateFrom(HPS a, LONG b, LONG c, LONG d, PPOINTL e, LONG f, LONG g, PLONG h)
     9930inline LONG _GpiCorrelateFrom(HPS a, LONG b, LONG c, LONG d, PPOINTL e, LONG f, LONG g, PLONG h)
    99319931{
    99329932 LONG yyrc;
    … …  
    99429942#define GpiCorrelateFrom _GpiCorrelateFrom
    99439943
    9944 inline LONG APIENTRY _GpiCorrelateSegment(HPS a, LONG b, LONG c, PPOINTL d, LONG e, LONG f, PLONG g)
     9944inline LONG _GpiCorrelateSegment(HPS a, LONG b, LONG c, PPOINTL d, LONG e, LONG f, PLONG g)
    99459945{
    99469946 LONG yyrc;
    … …  
    99569956#define GpiCorrelateSegment _GpiCorrelateSegment
    99579957
    9958 inline BOOL APIENTRY _GpiQueryBoundaryData(HPS a, PRECTL b)
     9958inline BOOL _GpiQueryBoundaryData(HPS a, PRECTL b)
    99599959{
    99609960 BOOL yyrc;
    … …  
    99709970#define GpiQueryBoundaryData _GpiQueryBoundaryData
    99719971
    9972 inline BOOL APIENTRY _GpiQueryPickAperturePosition(HPS a, PPOINTL b)
     9972inline BOOL _GpiQueryPickAperturePosition(HPS a, PPOINTL b)
    99739973{
    99749974 BOOL yyrc;
    … …  
    99849984#define GpiQueryPickAperturePosition _GpiQueryPickAperturePosition
    99859985
    9986 inline BOOL APIENTRY _GpiQueryPickApertureSize(HPS a, PSIZEL b)
     9986inline BOOL _GpiQueryPickApertureSize(HPS a, PSIZEL b)
    99879987{
    99889988 BOOL yyrc;
    … …  
    99989998#define GpiQueryPickApertureSize _GpiQueryPickApertureSize
    99999999
    10000 inline BOOL APIENTRY _GpiQueryTag(HPS a, PLONG b)
     10000inline BOOL _GpiQueryTag(HPS a, PLONG b)
    1000110001{
    1000210002 BOOL yyrc;
    … …  
    1001210012#define GpiQueryTag _GpiQueryTag
    1001310013
    10014 inline BOOL APIENTRY _GpiResetBoundaryData(HPS a)
     10014inline BOOL _GpiResetBoundaryData(HPS a)
    1001510015{
    1001610016 BOOL yyrc;
    … …  
    1002610026#define GpiResetBoundaryData _GpiResetBoundaryData
    1002710027
    10028 inline BOOL APIENTRY _GpiSetPickAperturePosition(HPS a, PPOINTL b)
     10028inline BOOL _GpiSetPickAperturePosition(HPS a, PPOINTL b)
    1002910029{
    1003010030 BOOL yyrc;
    … …  
    1004010040#define GpiSetPickAperturePosition _GpiSetPickAperturePosition
    1004110041
    10042 inline BOOL APIENTRY _GpiSetPickApertureSize(HPS a, LONG b, SIZEL *c)
     10042inline BOOL _GpiSetPickApertureSize(HPS a, LONG b, SIZEL *c)
    1004310043{
    1004410044 BOOL yyrc;
    … …  
    1005410054#define GpiSetPickApertureSize _GpiSetPickApertureSize
    1005510055
    10056 inline BOOL APIENTRY _GpiSetTag(HPS a, LONG b)
     10056inline BOOL _GpiSetTag(HPS a, LONG b)
    1005710057{
    1005810058 BOOL yyrc;
    … …  
    1007010070#endif
    1007110071#ifdef INCL_GPIINK
    10072 inline BOOL APIENTRY _GpiBeginInkPath(HPS a, LONG b, ULONG c)
     10072inline BOOL _GpiBeginInkPath(HPS a, LONG b, ULONG c)
    1007310073{
    1007410074 BOOL yyrc;
    … …  
    1008410084#define GpiBeginInkPath _GpiBeginInkPath
    1008510085
    10086 inline BOOL APIENTRY _GpiEndInkPath(HPS a, ULONG b)
     10086inline BOOL _GpiEndInkPath(HPS a, ULONG b)
    1008710087{
    1008810088 BOOL yyrc;
    … …  
    1009810098#define GpiEndInkPath _GpiEndInkPath
    1009910099
    10100 inline LONG APIENTRY _GpiStrokeInkPath(HPS a, LONG b, LONG c, PPOINTL d, ULONG e)
     10100inline LONG _GpiStrokeInkPath(HPS a, LONG b, LONG c, PPOINTL d, ULONG e)
    1010110101{
    1010210102 LONG yyrc;
    … …  
    1011410114#endif
    1011510115#ifdef INCL_GPISEGMENTS
    10116 inline BOOL APIENTRY _GpiCloseSegment(HPS a)
     10116inline BOOL _GpiCloseSegment(HPS a)
    1011710117{
    1011810118 BOOL yyrc;
    … …  
    1012810128#define GpiCloseSegment _GpiCloseSegment
    1012910129
    10130 inline BOOL APIENTRY _GpiDeleteSegment(HPS a, LONG b)
     10130inline BOOL _GpiDeleteSegment(HPS a, LONG b)
    1013110131{
    1013210132 BOOL yyrc;
    … …  
    1014210142#define GpiDeleteSegment _GpiDeleteSegment
    1014310143
    10144 inline BOOL APIENTRY _GpiDeleteSegments(HPS a, LONG b, LONG c)
     10144inline BOOL _GpiDeleteSegments(HPS a, LONG b, LONG c)
    1014510145{
    1014610146 BOOL yyrc;
    … …  
    1015610156#define GpiDeleteSegments _GpiDeleteSegments
    1015710157
    10158 inline BOOL APIENTRY _GpiDrawChain(HPS a)
     10158inline BOOL _GpiDrawChain(HPS a)
    1015910159{
    1016010160 BOOL yyrc;
    … …  
    1017010170#define GpiDrawChain _GpiDrawChain
    1017110171
    10172 inline BOOL APIENTRY _GpiDrawDynamics(HPS a)
     10172inline BOOL _GpiDrawDynamics(HPS a)
    1017310173{
    1017410174 BOOL yyrc;
    … …  
    1018410184#define GpiDrawDynamics _GpiDrawDynamics
    1018510185
    10186 inline BOOL APIENTRY _GpiDrawFrom(HPS a, LONG b, LONG c)
     10186inline BOOL _GpiDrawFrom(HPS a, LONG b, LONG c)
    1018710187{
    1018810188 BOOL yyrc;
    … …  
    1019810198#define GpiDrawFrom _GpiDrawFrom
    1019910199
    10200 inline BOOL APIENTRY _GpiDrawSegment(HPS a, LONG b)
     10200inline BOOL _GpiDrawSegment(HPS a, LONG b)
    1020110201{
    1020210202 BOOL yyrc;
    … …  
    1021210212#define GpiDrawSegment _GpiDrawSegment
    1021310213
    10214 inline LONG APIENTRY _GpiGetData(HPS a, LONG b, PLONG c, LONG d, LONG e, PBYTE f)
     10214inline LONG _GpiGetData(HPS a, LONG b, PLONG c, LONG d, LONG e, PBYTE f)
    1021510215{
    1021610216 LONG yyrc;
    … …  
    1022610226#define GpiGetData _GpiGetData
    1022710227
    10228 inline BOOL APIENTRY _GpiOpenSegment(HPS a, LONG b)
     10228inline BOOL _GpiOpenSegment(HPS a, LONG b)
    1022910229{
    1023010230 BOOL yyrc;
    … …  
    1024010240#define GpiOpenSegment _GpiOpenSegment
    1024110241
    10242 inline LONG APIENTRY _GpiPutData(HPS a, LONG b, PLONG c, PBYTE d)
     10242inline LONG _GpiPutData(HPS a, LONG b, PLONG c, PBYTE d)
    1024310243{
    1024410244 LONG yyrc;
    … …  
    1025410254#define GpiPutData _GpiPutData
    1025510255
    10256 inline LONG APIENTRY _GpiQueryInitialSegmentAttrs(HPS a, LONG b)
     10256inline LONG _GpiQueryInitialSegmentAttrs(HPS a, LONG b)
    1025710257{
    1025810258 LONG yyrc;
    … …  
    1026810268#define GpiQueryInitialSegmentAttrs _GpiQueryInitialSegmentAttrs
    1026910269
    10270 inline LONG APIENTRY _GpiQuerySegmentAttrs(HPS a, LONG b, LONG c)
     10270inline LONG _GpiQuerySegmentAttrs(HPS a, LONG b, LONG c)
    1027110271{
    1027210272 LONG yyrc;
    … …  
    1028210282#define GpiQuerySegmentAttrs _GpiQuerySegmentAttrs
    1028310283
    10284 inline LONG APIENTRY _GpiQuerySegmentNames(HPS a, LONG b, LONG c, LONG d, PLONG e)
     10284inline LONG _GpiQuerySegmentNames(HPS a, LONG b, LONG c, LONG d, PLONG e)
    1028510285{
    1028610286 LONG yyrc;
    … …  
    1029610296#define GpiQuerySegmentNames _GpiQuerySegmentNames
    1029710297
    10298 inline LONG APIENTRY _GpiQuerySegmentPriority(HPS a, LONG b, LONG c)
     10298inline LONG _GpiQuerySegmentPriority(HPS a, LONG b, LONG c)
    1029910299{
    1030010300 LONG yyrc;
    … …  
    1031010310#define GpiQuerySegmentPriority _GpiQuerySegmentPriority
    1031110311
    10312 inline BOOL APIENTRY _GpiRemoveDynamics(HPS a, LONG b, LONG c)
     10312inline BOOL _GpiRemoveDynamics(HPS a, LONG b, LONG c)
    1031310313{
    1031410314 BOOL yyrc;
    … …  
    1032410324#define GpiRemoveDynamics _GpiRemoveDynamics
    1032510325
    10326 inline BOOL APIENTRY _GpiSetInitialSegmentAttrs(HPS a, LONG b, LONG c)
     10326inline BOOL _GpiSetInitialSegmentAttrs(HPS a, LONG b, LONG c)
    1032710327{
    1032810328 BOOL yyrc;
    … …  
    1033810338#define GpiSetInitialSegmentAttrs _GpiSetInitialSegmentAttrs
    1033910339
    10340 inline BOOL APIENTRY _GpiSetSegmentAttrs(HPS a, LONG b, LONG c, LONG d)
     10340inline BOOL _GpiSetSegmentAttrs(HPS a, LONG b, LONG c, LONG d)
    1034110341{
    1034210342 BOOL yyrc;
    … …  
    1035210352#define GpiSetSegmentAttrs _GpiSetSegmentAttrs
    1035310353
    10354 inline BOOL APIENTRY _GpiSetSegmentPriority(HPS a, LONG b, LONG c, LONG d)
     10354inline BOOL _GpiSetSegmentPriority(HPS a, LONG b, LONG c, LONG d)
    1035510355{
    1035610356 BOOL yyrc;
    … …  
    1036810368#endif
    1036910369#ifdef INCL_DEV
    10370 inline LONG APIENTRY _DevEscape(HDC a, LONG b, LONG c, PBYTE d, PLONG e, PBYTE f)
     10370inline LONG _DevEscape(HDC a, LONG b, LONG c, PBYTE d, PLONG e, PBYTE f)
    1037110371{
    1037210372 LONG yyrc;
    … …  
    1038210382#define DevEscape _DevEscape
    1038310383
    10384 inline LONG APIENTRY _DevPostEscape(PCSZ a, PCSZ b, PCSZ c, PCSZ d, ULONG e, ULONG f, PBYTE g, ULONG h, PBYTE i)
     10384inline LONG _DevPostEscape(PCSZ a, PCSZ b, PCSZ c, PCSZ d, ULONG e, ULONG f, PBYTE g, ULONG h, PBYTE i)
    1038510385{
    1038610386 LONG yyrc;
    … …  
    1039610396#define DevPostEscape _DevPostEscape
    1039710397
    10398 inline LONG APIENTRY _DevPostDeviceModes(HAB a, PDRIVDATA b, PCSZ c, PCSZ d, PCSZ e, ULONG f)
     10398inline LONG _DevPostDeviceModes(HAB a, PDRIVDATA b, PCSZ c, PCSZ d, PCSZ e, ULONG f)
    1039910399{
    1040010400 LONG yyrc;
    … …  
    1041010410#define DevPostDeviceModes _DevPostDeviceModes
    1041110411
    10412 inline BOOL APIENTRY _DevQueryDeviceNames(HAB a, PCSZ b, PLONG c, PSTR32 d, PSTR64 e, PLONG f, PSTR16 g)
     10412inline BOOL _DevQueryDeviceNames(HAB a, PCSZ b, PLONG c, PSTR32 d, PSTR64 e, PLONG f, PSTR16 g)
    1041310413{
    1041410414 BOOL yyrc;
    … …  
    1042410424#define DevQueryDeviceNames _DevQueryDeviceNames
    1042510425
    10426 inline LONG APIENTRY _DevQueryHardcopyCaps(HDC a, LONG b, LONG c, PHCINFO d)
     10426inline LONG _DevQueryHardcopyCaps(HDC a, LONG b, LONG c, PHCINFO d)
    1042710427{
    1042810428 LONG yyrc;
    … …  
    1043910439
    1044010440#endif
    10441 inline HMF APIENTRY _DevCloseDC(HDC a)
     10441inline HMF _DevCloseDC(HDC a)
    1044210442{
    1044310443 HMF yyrc;
    … …  
    1045310453#define DevCloseDC _DevCloseDC
    1045410454
    10455 inline HDC APIENTRY _DevOpenDC(HAB a, LONG b, PCSZ c, LONG d, PDEVOPENDATA e, HDC f)
     10455inline HDC _DevOpenDC(HAB a, LONG b, PCSZ c, LONG d, PDEVOPENDATA e, HDC f)
    1045610456{
    1045710457 HDC yyrc;
    … …  
    1046710467#define DevOpenDC _DevOpenDC
    1046810468
    10469 inline BOOL APIENTRY _DevQueryCaps(HDC a, LONG b, LONG c, PLONG d)
     10469inline BOOL _DevQueryCaps(HDC a, LONG b, LONG c, PLONG d)
    1047010470{
    1047110471 BOOL yyrc;
    … …  
    1048310483#endif
    1048410484#ifdef INCL_WINPROGRAMLIST
    10485 inline HPROGRAM APIENTRY _PrfAddProgram(HINI a, PPROGDETAILS b, HPROGRAM c)
     10485inline HPROGRAM _PrfAddProgram(HINI a, PPROGDETAILS b, HPROGRAM c)
    1048610486{
    1048710487 HPROGRAM yyrc;
    … …  
    1049710497#define PrfAddProgram _PrfAddProgram
    1049810498
    10499 inline BOOL APIENTRY _PrfChangeProgram(HINI a, HPROGRAM b, PPROGDETAILS c)
     10499inline BOOL _PrfChangeProgram(HINI a, HPROGRAM b, PPROGDETAILS c)
    1050010500{
    1050110501 BOOL yyrc;
    … …  
    1051110511#define PrfChangeProgram _PrfChangeProgram
    1051210512
    10513 inline HPROGRAM APIENTRY _PrfCreateGroup(HINI a, PCSZ b, UCHAR c)
     10513inline HPROGRAM _PrfCreateGroup(HINI a, PCSZ b, UCHAR c)
    1051410514{
    1051510515 HPROGRAM yyrc;
    … …  
    1052510525#define PrfCreateGroup _PrfCreateGroup
    1052610526
    10527 inline BOOL APIENTRY _PrfDestroyGroup(HINI a, HPROGRAM b)
     10527inline BOOL _PrfDestroyGroup(HINI a, HPROGRAM b)
    1052810528{
    1052910529 BOOL yyrc;
    … …  
    1053910539#define PrfDestroyGroup _PrfDestroyGroup
    1054010540
    10541 inline PROGCATEGORY APIENTRY _PrfQueryProgramCategory(HINI a, PCSZ b)
     10541inline PROGCATEGORY _PrfQueryProgramCategory(HINI a, PCSZ b)
    1054210542{
    1054310543 PROGCATEGORY yyrc;
    … …  
    1055310553#define PrfQueryProgramCategory _PrfQueryProgramCategory
    1055410554
    10555 inline ULONG APIENTRY _PrfQueryProgramHandle(HINI a, PCSZ b, PHPROGARRAY c, ULONG d, PULONG e)
     10555inline ULONG _PrfQueryProgramHandle(HINI a, PCSZ b, PHPROGARRAY c, ULONG d, PULONG e)
    1055610556{
    1055710557 ULONG yyrc;
    … …  
    1056710567#define PrfQueryProgramHandle _PrfQueryProgramHandle
    1056810568
    10569 inline ULONG APIENTRY _PrfQueryProgramTitles(HINI a, HPROGRAM b, PPROGTITLE c, ULONG d, PULONG e)
     10569inline ULONG _PrfQueryProgramTitles(HINI a, HPROGRAM b, PPROGTITLE c, ULONG d, PULONG e)
    1057010570{
    1057110571 ULONG yyrc;
    … …  
    1058110581#define PrfQueryProgramTitles _PrfQueryProgramTitles
    1058210582
    10583 inline ULONG APIENTRY _PrfQueryDefinition(HINI a, HPROGRAM b, PPROGDETAILS c, ULONG d)
     10583inline ULONG _PrfQueryDefinition(HINI a, HPROGRAM b, PPROGDETAILS c, ULONG d)
    1058410584{
    1058510585 ULONG yyrc;
    … …  
    1059510595#define PrfQueryDefinition _PrfQueryDefinition
    1059610596
    10597 inline BOOL APIENTRY _PrfRemoveProgram(HINI a, HPROGRAM b)
     10597inline BOOL _PrfRemoveProgram(HINI a, HPROGRAM b)
    1059810598{
    1059910599 BOOL yyrc;
    … …  
    1060910609#define PrfRemoveProgram _PrfRemoveProgram
    1061010610
    10611 inline HAPP APIENTRY _WinStartApp(HWND a, PPROGDETAILS b, PCSZ c, PVOID d, ULONG e)
     10611inline HAPP _WinStartApp(HWND a, PPROGDETAILS b, PCSZ c, PVOID d, ULONG e)
    1061210612{
    1061310613 HAPP yyrc;
    … …  
    1062310623#define WinStartApp _WinStartApp
    1062410624
    10625 inline BOOL APIENTRY _WinTerminateApp(HAPP a)
     10625inline BOOL _WinTerminateApp(HAPP a)
    1062610626{
    1062710627 BOOL yyrc;
    … …  
    1063910639#endif
    1064010640#ifdef INCL_WINSWITCHLIST
    10641 inline HSWITCH APIENTRY _WinAddSwitchEntry(PSWCNTRL a)
     10641inline HSWITCH _WinAddSwitchEntry(PSWCNTRL a)
    1064210642{
    1064310643 HSWITCH yyrc;
    … …  
    1065310653#define WinAddSwitchEntry _WinAddSwitchEntry
    1065410654
    10655 inline ULONG APIENTRY _WinRemoveSwitchEntry(HSWITCH a)
     10655inline ULONG _WinRemoveSwitchEntry(HSWITCH a)
    1065610656{
    1065710657 ULONG yyrc;
    … …  
    1066710667#define WinRemoveSwitchEntry _WinRemoveSwitchEntry
    1066810668
    10669 inline ULONG APIENTRY _WinChangeSwitchEntry(HSWITCH a, PSWCNTRL b)
     10669inline ULONG _WinChangeSwitchEntry(HSWITCH a, PSWCNTRL b)
    1067010670{
    1067110671 ULONG yyrc;
    … …  
    1068110681#define WinChangeSwitchEntry _WinChangeSwitchEntry
    1068210682
    10683 inline HSWITCH APIENTRY _WinCreateSwitchEntry(HAB a, PSWCNTRL b)
     10683inline HSWITCH _WinCreateSwitchEntry(HAB a, PSWCNTRL b)
    1068410684{
    1068510685 HSWITCH yyrc;
    … …  
    1069510695#define WinCreateSwitchEntry _WinCreateSwitchEntry
    1069610696
    10697 inline ULONG APIENTRY _WinQuerySessionTitle(HAB a, ULONG b, PSZ c, ULONG d)
     10697inline ULONG _WinQuerySessionTitle(HAB a, ULONG b, PSZ c, ULONG d)
    1069810698{
    1069910699 ULONG yyrc;
    … …  
    1070910709#define WinQuerySessionTitle _WinQuerySessionTitle
    1071010710
    10711 inline ULONG APIENTRY _WinQuerySwitchEntry(HSWITCH a, PSWCNTRL b)
     10711inline ULONG _WinQuerySwitchEntry(HSWITCH a, PSWCNTRL b)
    1071210712{
    1071310713 ULONG yyrc;
    … …  
    1072310723#define WinQuerySwitchEntry _WinQuerySwitchEntry
    1072410724
    10725 inline HSWITCH APIENTRY _WinQuerySwitchHandle(HWND a, PID b)
     10725inline HSWITCH _WinQuerySwitchHandle(HWND a, PID b)
    1072610726{
    1072710727 HSWITCH yyrc;
    … …  
    1073710737#define WinQuerySwitchHandle _WinQuerySwitchHandle
    1073810738
    10739 inline ULONG APIENTRY _WinQuerySwitchList(HAB a, PSWBLOCK b, ULONG c)
     10739inline ULONG _WinQuerySwitchList(HAB a, PSWBLOCK b, ULONG c)
    1074010740{
    1074110741 ULONG yyrc;
    … …  
    1075110751#define WinQuerySwitchList _WinQuerySwitchList
    1075210752
    10753 inline ULONG APIENTRY _WinQueryTaskSizePos(HAB a, ULONG b, PSWP c)
     10753inline ULONG _WinQueryTaskSizePos(HAB a, ULONG b, PSWP c)
    1075410754{
    1075510755 ULONG yyrc;
    … …  
    1076510765#define WinQueryTaskSizePos _WinQueryTaskSizePos
    1076610766
    10767 inline ULONG APIENTRY _WinQueryTaskTitle(ULONG a, PSZ b, ULONG c)
     10767inline ULONG _WinQueryTaskTitle(ULONG a, PSZ b, ULONG c)
    1076810768{
    1076910769 ULONG yyrc;
    … …  
    1077910779#define WinQueryTaskTitle _WinQueryTaskTitle
    1078010780
    10781 inline ULONG APIENTRY _WinSwitchToProgram(HSWITCH a)
     10781inline ULONG _WinSwitchToProgram(HSWITCH a)
    1078210782{
    1078310783 ULONG yyrc;
    … …  
    1079510795#endif
    1079610796#ifdef INCL_WINSHELLDATA
    10797 inline BOOL APIENTRY _PrfCloseProfile(HINI a)
     10797inline BOOL _PrfCloseProfile(HINI a)
    1079810798{
    1079910799 BOOL yyrc;
    … …  
    1080910809#define PrfCloseProfile _PrfCloseProfile
    1081010810
    10811 inline HINI APIENTRY _PrfOpenProfile(HAB a, PCSZ b)
     10811inline HINI _PrfOpenProfile(HAB a, PCSZ b)
    1081210812{
    1081310813 HINI yyrc;
    … …  
    1082310823#define PrfOpenProfile _PrfOpenProfile
    1082410824
    10825 inline BOOL APIENTRY _PrfQueryProfile(HAB a, PPRFPROFILE b)
     10825inline BOOL _PrfQueryProfile(HAB a, PPRFPROFILE b)
    1082610826{
    1082710827 BOOL yyrc;
    … …  
    1083710837#define PrfQueryProfile _PrfQueryProfile
    1083810838
    10839 inline BOOL APIENTRY _PrfQueryProfileData(HINI a, PCSZ b, PCSZ c, PVOID d, PULONG e)
     10839inline BOOL _PrfQueryProfileData(HINI a, PCSZ b, PCSZ c, PVOID d, PULONG e)
    1084010840{
    1084110841 BOOL yyrc;
    … …  
    1085110851#define PrfQueryProfileData _PrfQueryProfileData
    1085210852
    10853 inline LONG APIENTRY _PrfQueryProfileInt(HINI a, PCSZ b, PCSZ c, LONG d)
     10853inline LONG _PrfQueryProfileInt(HINI a, PCSZ b, PCSZ c, LONG d)
    1085410854{
    1085510855 LONG yyrc;
    … …  
    1086510865#define PrfQueryProfileInt _PrfQueryProfileInt
    1086610866
    10867 inline BOOL APIENTRY _PrfQueryProfileSize(HINI a, PCSZ b, PCSZ c, PULONG d)
     10867inline BOOL _PrfQueryProfileSize(HINI a, PCSZ b, PCSZ c, PULONG d)
    1086810868{
    1086910869 BOOL yyrc;
    … …  
    1087910879#define PrfQueryProfileSize _PrfQueryProfileSize
    1088010880
    10881 inline ULONG APIENTRY _PrfQueryProfileString(HINI a, PCSZ b, PCSZ c, PCSZ d, PVOID e, ULONG f)
     10881inline ULONG _PrfQueryProfileString(HINI a, PCSZ b, PCSZ c, PCSZ d, PVOID e, ULONG f)
    1088210882{
    1088310883 ULONG yyrc;
    … …  
    1089310893#define PrfQueryProfileString _PrfQueryProfileString
    1089410894
    10895 inline BOOL APIENTRY _PrfReset(HAB a, PPRFPROFILE b)
     10895inline BOOL _PrfReset(HAB a, PPRFPROFILE b)
    1089610896{
    1089710897 BOOL yyrc;
    … …  
    1090710907#define PrfReset _PrfReset
    1090810908
    10909 inline BOOL APIENTRY _PrfWriteProfileData(HINI a, PCSZ b, PCSZ c, PVOID d, ULONG e)
     10909inline BOOL _PrfWriteProfileData(HINI a, PCSZ b, PCSZ c, PVOID d, ULONG e)
    1091010910{
    1091110911 BOOL yyrc;
    … …  
    1092110921#define PrfWriteProfileData _PrfWriteProfileData
    1092210922
    10923 inline BOOL APIENTRY _PrfWriteProfileString(HINI a, PCSZ b, PCSZ c, PCSZ d)
     10923inline BOOL _PrfWriteProfileString(HINI a, PCSZ b, PCSZ c, PCSZ d)
    1092410924{
    1092510925 BOOL yyrc;
    … …  
    1093710937#endif
    1093810938#ifdef INCL_WINSTDFILE
    10939 inline MRESULT APIENTRY _WinDefFileDlgProc(HWND a, ULONG b, MPARAM c, MPARAM d)
     10939inline MRESULT _WinDefFileDlgProc(HWND a, ULONG b, MPARAM c, MPARAM d)
    1094010940{
    1094110941 MRESULT yyrc;
    … …  
    1095110951#define WinDefFileDlgProc _WinDefFileDlgProc
    1095210952
    10953 inline HWND APIENTRY _WinFileDlg(HWND a, HWND b, PFILEDLG c)
     10953inline HWND _WinFileDlg(HWND a, HWND b, PFILEDLG c)
    1095410954{
    1095510955 HWND yyrc;
    … …  
    1096510965#define WinFileDlg _WinFileDlg
    1096610966
    10967 inline BOOL APIENTRY _WinFreeFileDlgList(PAPSZ a)
     10967inline BOOL _WinFreeFileDlgList(PAPSZ a)
    1096810968{
    1096910969 BOOL yyrc;
    … …  
    1098110981#endif
    1098210982#ifdef INCL_WINSTDFONT
    10983 inline HWND APIENTRY _WinFontDlg(HWND a, HWND b, PFONTDLG c)
     10983inline HWND _WinFontDlg(HWND a, HWND b, PFONTDLG c)
    1098410984{
    1098510985 HWND yyrc;
    … …  
    1099510995#define WinFontDlg _WinFontDlg
    1099610996
    10997 inline MRESULT APIENTRY _WinDefFontDlgProc(HWND a, ULONG b, MPARAM c, MPARAM d)
     10997inline MRESULT _WinDefFontDlgProc(HWND a, ULONG b, MPARAM c, MPARAM d)
    1099810998{
    1099910999 MRESULT yyrc;
    … …  
    1101111011#endif
    1101211012#ifdef INCL_WINSTDDRAG
    11013 inline BOOL APIENTRY _DrgAcceptDroppedFiles(HWND a, PCSZ b, PCSZ c, ULONG d, ULONG e)
     11013inline BOOL _DrgAcceptDroppedFiles(HWND a, PCSZ b, PCSZ c, ULONG d, ULONG e)
    1101411014{
    1101511015 BOOL yyrc;
    … …  
    1102511025#define DrgAcceptDroppedFiles _DrgAcceptDroppedFiles
    1102611026
    11027 inline BOOL APIENTRY _DrgAccessDraginfo(PDRAGINFO a)
     11027inline BOOL _DrgAccessDraginfo(PDRAGINFO a)
    1102811028{
    1102911029 BOOL yyrc;
    … …  
    1103911039#define DrgAccessDraginfo _DrgAccessDraginfo
    1104011040
    11041 inline HSTR APIENTRY _DrgAddStrHandle(PCSZ a)
     11041inline HSTR _DrgAddStrHandle(PCSZ a)
    1104211042{
    1104311043 HSTR yyrc;
    … …  
    1105311053#define DrgAddStrHandle _DrgAddStrHandle
    1105411054
    11055 inline PDRAGINFO APIENTRY _DrgAllocDraginfo(ULONG a)
     11055inline PDRAGINFO _DrgAllocDraginfo(ULONG a)
    1105611056{
    1105711057 PDRAGINFO yyrc;
    … …  
    1106711067#define DrgAllocDraginfo _DrgAllocDraginfo
    1106811068
    11069 inline PDRAGTRANSFER APIENTRY _DrgAllocDragtransfer(ULONG a)
     11069inline PDRAGTRANSFER _DrgAllocDragtransfer(ULONG a)
    1107011070{
    1107111071 PDRAGTRANSFER yyrc;
    … …  
    1108111081#define DrgAllocDragtransfer _DrgAllocDragtransfer
    1108211082
    11083 inline BOOL APIENTRY _DrgCancelLazyDrag()
     11083inline BOOL _DrgCancelLazyDrag()
    1108411084{
    1108511085 BOOL yyrc;
    … …  
    1109511095#define DrgCancelLazyDrag _DrgCancelLazyDrag
    1109611096
    11097 inline BOOL APIENTRY _DrgDeleteDraginfoStrHandles(PDRAGINFO a)
     11097inline BOOL _DrgDeleteDraginfoStrHandles(PDRAGINFO a)
    1109811098{
    1109911099 BOOL yyrc;
    … …  
    1110911109#define DrgDeleteDraginfoStrHandles _DrgDeleteDraginfoStrHandles
    1111011110
    11111 inline BOOL APIENTRY _DrgDeleteStrHandle(HSTR a)
     11111inline BOOL _DrgDeleteStrHandle(HSTR a)
    1111211112{
    1111311113 BOOL yyrc;
    … …  
    1112311123#define DrgDeleteStrHandle _DrgDeleteStrHandle
    1112411124
    11125 inline HWND APIENTRY _DrgDrag(HWND a, PDRAGINFO b, PDRAGIMAGE c, ULONG d, LONG e, PVOID f)
     11125inline HWND _DrgDrag(HWND a, PDRAGINFO b, PDRAGIMAGE c, ULONG d, LONG e, PVOID f)
    1112611126{
    1112711127 HWND yyrc;
    … …  
    1113711137#define DrgDrag _DrgDrag
    1113811138
    11139 inline BOOL APIENTRY _DrgDragFiles(HWND a, PCSZ *b, PCSZ *c, PCSZ *d, ULONG e, HPOINTER f, ULONG g, BOOL h, ULONG i)
     11139inline BOOL _DrgDragFiles(HWND a, PCSZ *b, PCSZ *c, PCSZ *d, ULONG e, HPOINTER f, ULONG g, BOOL h, ULONG i)
    1114011140{
    1114111141 BOOL yyrc;
    … …  
    1115111151#define DrgDragFiles _DrgDragFiles
    1115211152
    11153 inline BOOL APIENTRY _DrgFreeDraginfo(PDRAGINFO a)
     11153inline BOOL _DrgFreeDraginfo(PDRAGINFO a)
    1115411154{
    1115511155 BOOL yyrc;
    … …  
    1116511165#define DrgFreeDraginfo _DrgFreeDraginfo
    1116611166
    11167 inline BOOL APIENTRY _DrgFreeDragtransfer(PDRAGTRANSFER a)
     11167inline BOOL _DrgFreeDragtransfer(PDRAGTRANSFER a)
    1116811168{
    1116911169 BOOL yyrc;
    … …  
    1117911179#define DrgFreeDragtransfer _DrgFreeDragtransfer
    1118011180
    11181 inline HPS APIENTRY _DrgGetPS(HWND a)
     11181inline HPS _DrgGetPS(HWND a)
    1118211182{
    1118311183 HPS yyrc;
    … …  
    1119311193#define DrgGetPS _DrgGetPS
    1119411194
    11195 inline BOOL APIENTRY _DrgLazyDrag(HWND a, PDRAGINFO b, PDRAGIMAGE c, ULONG d, PVOID e)
     11195inline BOOL _DrgLazyDrag(HWND a, PDRAGINFO b, PDRAGIMAGE c, ULONG d, PVOID e)
    1119611196{
    1119711197 BOOL yyrc;
    … …  
    1120711207#define DrgLazyDrag _DrgLazyDrag
    1120811208
    11209 inline BOOL APIENTRY _DrgLazyDrop(HWND a, ULONG b, PPOINTL c)
     11209inline BOOL _DrgLazyDrop(HWND a, ULONG b, PPOINTL c)
    1121011210{
    1121111211 BOOL yyrc;
    … …  
    1122111221#define DrgLazyDrop _DrgLazyDrop
    1122211222
    11223 inline BOOL APIENTRY _DrgPostTransferMsg(HWND a, ULONG b, PDRAGTRANSFER c, ULONG d, ULONG e, BOOL f)
     11223inline BOOL _DrgPostTransferMsg(HWND a, ULONG b, PDRAGTRANSFER c, ULONG d, ULONG e, BOOL f)
    1122411224{
    1122511225 BOOL yyrc;
    … …  
    1123511235#define DrgPostTransferMsg _DrgPostTransferMsg
    1123611236
    11237 inline BOOL APIENTRY _DrgPushDraginfo(PDRAGINFO a, HWND b)
     11237inline BOOL _DrgPushDraginfo(PDRAGINFO a, HWND b)
    1123811238{
    1123911239 BOOL yyrc;
    … …  
    1124911249#define DrgPushDraginfo _DrgPushDraginfo
    1125011250
    11251 inline PDRAGINFO APIENTRY _DrgQueryDraginfoPtr(PDRAGINFO a)
     11251inline PDRAGINFO _DrgQueryDraginfoPtr(PDRAGINFO a)
    1125211252{
    1125311253 PDRAGINFO yyrc;
    … …  
    1126311263#define DrgQueryDraginfoPtr _DrgQueryDraginfoPtr
    1126411264
    11265 inline PDRAGINFO APIENTRY _DrgQueryDraginfoPtrFromHwnd(HWND a)
     11265inline PDRAGINFO _DrgQueryDraginfoPtrFromHwnd(HWND a)
    1126611266{
    1126711267 PDRAGINFO yyrc;
    … …  
    1127711277#define DrgQueryDraginfoPtrFromHwnd _DrgQueryDraginfoPtrFromHwnd
    1127811278
    11279 inline PDRAGINFO APIENTRY _DrgQueryDraginfoPtrFromDragitem(PDRAGITEM a)
     11279inline PDRAGINFO _DrgQueryDraginfoPtrFromDragitem(PDRAGITEM a)
    1128011280{
    1128111281 PDRAGINFO yyrc;
    … …  
    1129111291#define DrgQueryDraginfoPtrFromDragitem _DrgQueryDraginfoPtrFromDragitem
    1129211292
    11293 inline BOOL APIENTRY _DrgQueryDragitem(PDRAGINFO a, ULONG b, PDRAGITEM c, ULONG d)
     11293inline BOOL _DrgQueryDragitem(PDRAGINFO a, ULONG b, PDRAGITEM c, ULONG d)
    1129411294{
    1129511295 BOOL yyrc;
    … …  
    1130511305#define DrgQueryDragitem _DrgQueryDragitem
    1130611306
    11307 inline ULONG APIENTRY _DrgQueryDragitemCount(PDRAGINFO a)
     11307inline ULONG _DrgQueryDragitemCount(PDRAGINFO a)
    1130811308{
    1130911309 ULONG yyrc;
    … …  
    1131911319#define DrgQueryDragitemCount _DrgQueryDragitemCount
    1132011320
    11321 inline PDRAGITEM APIENTRY _DrgQueryDragitemPtr(PDRAGINFO a, ULONG b)
     11321inline PDRAGITEM _DrgQueryDragitemPtr(PDRAGINFO a, ULONG b)
    1132211322{
    1132311323 PDRAGITEM yyrc;
    … …  
    1133311333#define DrgQueryDragitemPtr _DrgQueryDragitemPtr
    1133411334
    11335 inline ULONG APIENTRY _DrgQueryDragStatus()
     11335inline ULONG _DrgQueryDragStatus()
    1133611336{
    1133711337 ULONG yyrc;
    … …  
    1134711347#define DrgQueryDragStatus _DrgQueryDragStatus
    1134811348
    11349 inline BOOL APIENTRY _DrgQueryNativeRMF(PDRAGITEM a, ULONG b, PCHAR c)
     11349inline BOOL _DrgQueryNativeRMF(PDRAGITEM a, ULONG b, PCHAR c)
    1135011350{
    1135111351 BOOL yyrc;
    … …  
    1136111361#define DrgQueryNativeRMF _DrgQueryNativeRMF
    1136211362
    11363 inline ULONG APIENTRY _DrgQueryNativeRMFLen(PDRAGITEM a)
     11363inline ULONG _DrgQueryNativeRMFLen(PDRAGITEM a)
    1136411364{
    1136511365 ULONG yyrc;
    … …  
    1137511375#define DrgQueryNativeRMFLen _DrgQueryNativeRMFLen
    1137611376
    11377 inline ULONG APIENTRY _DrgQueryStrName(HSTR a, ULONG b, PSZ c)
     11377inline ULONG _DrgQueryStrName(HSTR a, ULONG b, PSZ c)
    1137811378{
    1137911379 ULONG yyrc;
    … …  
    1138911389#define DrgQueryStrName _DrgQueryStrName
    1139011390
    11391 inline ULONG APIENTRY _DrgQueryStrNameLen(HSTR a)
     11391inline ULONG _DrgQueryStrNameLen(HSTR a)
    1139211392{
    1139311393 ULONG yyrc;
    … …  
    1140311403#define DrgQueryStrNameLen _DrgQueryStrNameLen
    1140411404
    11405 inline BOOL APIENTRY _DrgQueryTrueType(PDRAGITEM a, ULONG b, PSZ c)
     11405inline BOOL _DrgQueryTrueType(PDRAGITEM a, ULONG b, PSZ c)
    1140611406{
    1140711407 BOOL yyrc;
    … …  
    1141711417#define DrgQueryTrueType _DrgQueryTrueType
    1141811418
    11419 inline ULONG APIENTRY _DrgQueryTrueTypeLen(PDRAGITEM a)
     11419inline ULONG _DrgQueryTrueTypeLen(PDRAGITEM a)
    1142011420{
    1142111421 ULONG yyrc;
    … …  
    1143111431#define DrgQueryTrueTypeLen _DrgQueryTrueTypeLen
    1143211432
    11433 inline PDRAGINFO APIENTRY _DrgReallocDraginfo(PDRAGINFO a, ULONG b)
     11433inline PDRAGINFO _DrgReallocDraginfo(PDRAGINFO a, ULONG b)
    1143411434{
    1143511435 PDRAGINFO yyrc;
    … …  
    1144511445#define DrgReallocDraginfo _DrgReallocDraginfo
    1144611446
    11447 inline BOOL APIENTRY _DrgReleasePS(HPS a)
     11447inline BOOL _DrgReleasePS(HPS a)
    1144811448{
    1144911449 BOOL yyrc;
    … …  
    1145911459#define DrgReleasePS _DrgReleasePS
    1146011460
    11461 inline MRESULT APIENTRY _DrgSendTransferMsg(HWND a, ULONG b, MPARAM c, MPARAM d)
     11461inline MRESULT _DrgSendTransferMsg(HWND a, ULONG b, MPARAM c, MPARAM d)
    1146211462{
    1146311463 MRESULT yyrc;
    … …  
    1147311473#define DrgSendTransferMsg _DrgSendTransferMsg
    1147411474
    11475 inline BOOL APIENTRY _DrgSetDragImage(PDRAGINFO a, PDRAGIMAGE b, ULONG c, PVOID d)
     11475inline BOOL _DrgSetDragImage(PDRAGINFO a, PDRAGIMAGE b, ULONG c, PVOID d)
    1147611476{
    1147711477 BOOL yyrc;
    … …  
    1148711487#define DrgSetDragImage _DrgSetDragImage
    1148811488
    11489 inline BOOL APIENTRY _DrgSetDragitem(PDRAGINFO a, PDRAGITEM b, ULONG c, ULONG d)
     11489inline BOOL _DrgSetDragitem(PDRAGINFO a, PDRAGITEM b, ULONG c, ULONG d)
    1149011490{
    1149111491 BOOL yyrc;
    … …  
    1150111501#define DrgSetDragitem _DrgSetDragitem
    1150211502
    11503 inline BOOL APIENTRY _DrgSetDragPointer(PDRAGINFO a, HPOINTER b)
     11503inline BOOL _DrgSetDragPointer(PDRAGINFO a, HPOINTER b)
    1150411504{
    1150511505 BOOL yyrc;
    … …  
    1151511515#define DrgSetDragPointer _DrgSetDragPointer
    1151611516
    11517 inline BOOL APIENTRY _DrgVerifyNativeRMF(PDRAGITEM a, PCSZ b)
     11517inline BOOL _DrgVerifyNativeRMF(PDRAGITEM a, PCSZ b)
    1151811518{
    1151911519 BOOL yyrc;
    … …  
    1152911529#define DrgVerifyNativeRMF _DrgVerifyNativeRMF
    1153011530
    11531 inline BOOL APIENTRY _DrgVerifyRMF(PDRAGITEM a, PCSZ b, PCSZ c)
     11531inline BOOL _DrgVerifyRMF(PDRAGITEM a, PCSZ b, PCSZ c)
    1153211532{
    1153311533 BOOL yyrc;
    … …  
    1154311543#define DrgVerifyRMF _DrgVerifyRMF
    1154411544
    11545 inline BOOL APIENTRY _DrgVerifyTrueType(PDRAGITEM a, PCSZ b)
     11545inline BOOL _DrgVerifyTrueType(PDRAGITEM a, PCSZ b)
    1154611546{
    1154711547 BOOL yyrc;
    … …  
    1155711557#define DrgVerifyTrueType _DrgVerifyTrueType
    1155811558
    11559 inline BOOL APIENTRY _DrgVerifyType(PDRAGITEM a, PCSZ b)
     11559inline BOOL _DrgVerifyType(PDRAGITEM a, PCSZ b)
    1156011560{
    1156111561 BOOL yyrc;
    … …  
    1157111571#define DrgVerifyType _DrgVerifyType
    1157211572
    11573 inline BOOL APIENTRY _DrgVerifyTypeSet(PDRAGITEM a, PCSZ b, ULONG c, PSZ d)
     11573inline BOOL _DrgVerifyTypeSet(PDRAGITEM a, PCSZ b, ULONG c, PSZ d)
    1157411574{
    1157511575 BOOL yyrc;
    … …  
    1158711587#endif
    1158811588#ifdef INCL_WPCLASS
    11589 inline HOBJECT APIENTRY _WinCopyObject(HOBJECT a, HOBJECT b, ULONG c)
     11589inline HOBJECT _WinCopyObject(HOBJECT a, HOBJECT b, ULONG c)
    1159011590{
    1159111591 HOBJECT yyrc;
    … …  
    1160111601#define WinCopyObject _WinCopyObject
    1160211602
    11603 inline HOBJECT APIENTRY _WinCreateObject(PCSZ a, PCSZ b, PCSZ c, PCSZ d, ULONG e)
     11603inline HOBJECT _WinCreateObject(PCSZ a, PCSZ b, PCSZ c, PCSZ d, ULONG e)
    1160411604{
    1160511605 HOBJECT yyrc;
    … …  
    1161511615#define WinCreateObject _WinCreateObject
    1161611616
    11617 inline HOBJECT APIENTRY _WinCreateShadow(HOBJECT a, HOBJECT b, ULONG c)
     11617inline HOBJECT _WinCreateShadow(HOBJECT a, HOBJECT b, ULONG c)
    1161811618{
    1161911619 HOBJECT yyrc;
    … …  
    1162911629#define WinCreateShadow _WinCreateShadow
    1163011630
    11631 inline BOOL APIENTRY _WinDeregisterObjectClass(PCSZ a)
     11631inline BOOL _WinDeregisterObjectClass(PCSZ a)
    1163211632{
    1163311633 BOOL yyrc;
    … …  
    1164311643#define WinDeregisterObjectClass _WinDeregisterObjectClass
    1164411644
    11645 inline BOOL APIENTRY _WinDestroyObject(HOBJECT a)
     11645inline BOOL _WinDestroyObject(HOBJECT a)
    1164611646{
    1164711647 BOOL yyrc;
    … …  
    1165711657#define WinDestroyObject _WinDestroyObject
    1165811658
    11659 inline BOOL APIENTRY _WinEnumObjectClasses(POBJCLASS a, PULONG b)
     11659inline BOOL _WinEnumObjectClasses(POBJCLASS a, PULONG b)
    1166011660{
    1166111661 BOOL yyrc;
    … …  
    1167111671#define WinEnumObjectClasses _WinEnumObjectClasses
    1167211672
    11673 inline BOOL APIENTRY _WinIsSOMDDReady()
     11673inline BOOL _WinIsSOMDDReady()
    1167411674{
    1167511675 BOOL yyrc;
    … …  
    1168511685#define WinIsSOMDDReady _WinIsSOMDDReady
    1168611686
    11687 inline BOOL APIENTRY _WinIsWPDServerReady()
     11687inline BOOL _WinIsWPDServerReady()
    1168811688{
    1168911689 BOOL yyrc;
    … …  
    1169911699#define WinIsWPDServerReady _WinIsWPDServerReady
    1170011700
    11701 inline HOBJECT APIENTRY _WinMoveObject(HOBJECT a, HOBJECT b, ULONG c)
     11701inline HOBJECT _WinMoveObject(HOBJECT a, HOBJECT b, ULONG c)
    1170211702{
    1170311703 HOBJECT yyrc;
    … …  
    1171311713#define WinMoveObject _WinMoveObject
    1171411714
    11715 inline BOOL APIENTRY _WinOpenObject(HOBJECT a, ULONG b, BOOL c)
     11715inline BOOL _WinOpenObject(HOBJECT a, ULONG b, BOOL c)
    1171611716{
    1171711717 BOOL yyrc;
    … …  
    1172711727#define WinOpenObject _WinOpenObject
    1172811728
    11729 inline BOOL APIENTRY _WinQueryActiveDesktopPathname(PSZ a, ULONG b)
     11729inline BOOL _WinQueryActiveDesktopPathname(PSZ a, ULONG b)
    1173011730{
    1173111731 BOOL yyrc;
    … …  
    1174111741#define WinQueryActiveDesktopPathname _WinQueryActiveDesktopPathname
    1174211742
    11743 inline HOBJECT APIENTRY _WinQueryObject(PCSZ a)
     11743inline HOBJECT _WinQueryObject(PCSZ a)
    1174411744{
    1174511745 HOBJECT yyrc;
    … …  
    1175511755#define WinQueryObject _WinQueryObject
    1175611756
    11757 inline BOOL APIENTRY _WinQueryObjectPath(HOBJECT a, PSZ b, ULONG c)
     11757inline BOOL _WinQueryObjectPath(HOBJECT a, PSZ b, ULONG c)
    1175811758{
    1175911759 BOOL yyrc;
    … …  
    1176911769#define WinQueryObjectPath _WinQueryObjectPath
    1177011770
    11771 inline BOOL APIENTRY _WinRegisterObjectClass(PCSZ a, PCSZ b)
     11771inline BOOL _WinRegisterObjectClass(PCSZ a, PCSZ b)
    1177211772{
    1177311773 BOOL yyrc;
    … …  
    1178311783#define WinRegisterObjectClass _WinRegisterObjectClass
    1178411784
    11785 inline BOOL APIENTRY _WinReplaceObjectClass(PCSZ a, PCSZ b, BOOL c)
     11785inline BOOL _WinReplaceObjectClass(PCSZ a, PCSZ b, BOOL c)
    1178611786{
    1178711787 BOOL yyrc;
    … …  
    1179711797#define WinReplaceObjectClass _WinReplaceObjectClass
    1179811798
    11799 inline ULONG APIENTRY _WinRestartSOMDD(BOOL a)
     11799inline ULONG _WinRestartSOMDD(BOOL a)
    1180011800{
    1180111801 ULONG yyrc;
    … …  
    1181111811#define WinRestartSOMDD _WinRestartSOMDD
    1181211812
    11813 inline ULONG APIENTRY _WinRestartWPDServer(BOOL a)
     11813inline ULONG _WinRestartWPDServer(BOOL a)
    1181411814{
    1181511815 ULONG yyrc;
    … …  
    1182511825#define WinRestartWPDServer _WinRestartWPDServer
    1182611826
    11827 inline BOOL APIENTRY _WinSaveObject(HOBJECT a, BOOL b)
     11827inline BOOL _WinSaveObject(HOBJECT a, BOOL b)
    1182811828{
    1182911829 BOOL yyrc;
    … …  
    1183911839#define WinSaveObject _WinSaveObject
    1184011840
    11841 inline BOOL APIENTRY _WinSetObjectData(HOBJECT a, PCSZ b)
     11841inline BOOL _WinSetObjectData(HOBJECT a, PCSZ b)
    1184211842{
    1184311843 BOOL yyrc;
    … …  
    1185311853#define WinSetObjectData _WinSetObjectData
    1185411854
    11855 inline BOOL APIENTRY _WinFreeFileIcon(HPOINTER a)
     11855inline BOOL _WinFreeFileIcon(HPOINTER a)
    1185611856{
    1185711857 BOOL yyrc;
    … …  
    1186711867#define WinFreeFileIcon _WinFreeFileIcon
    1186811868
    11869 inline HPOINTER APIENTRY _WinLoadFileIcon(PCSZ a, BOOL b)
     11869inline HPOINTER _WinLoadFileIcon(PCSZ a, BOOL b)
    1187011870{
    1187111871 HPOINTER yyrc;
    … …  
    1188111881#define WinLoadFileIcon _WinLoadFileIcon
    1188211882
    11883 inline BOOL APIENTRY _WinRestoreWindowPos(PCSZ a, PCSZ b, HWND c)
     11883inline BOOL _WinRestoreWindowPos(PCSZ a, PCSZ b, HWND c)
    1188411884{
    1188511885 BOOL yyrc;
    … …  
    1189511895#define WinRestoreWindowPos _WinRestoreWindowPos
    1189611896
    11897 inline BOOL APIENTRY _WinSetFileIcon(PCSZ a, PICONINFO b)
     11897inline BOOL _WinSetFileIcon(PCSZ a, PICONINFO b)
    1189811898{
    1189911899 BOOL yyrc;
    … …  
    1190911909#define WinSetFileIcon _WinSetFileIcon
    1191011910
    11911 inline BOOL APIENTRY _WinShutdownSystem(HAB a, HMQ b)
     11911inline BOOL _WinShutdownSystem(HAB a, HMQ b)
    1191211912{
    1191311913 BOOL yyrc;
    … …  
    1192311923#define WinShutdownSystem _WinShutdownSystem
    1192411924
    11925 inline BOOL APIENTRY _WinStoreWindowPos(PCSZ a, PCSZ b, HWND c)
     11925inline BOOL _WinStoreWindowPos(PCSZ a, PCSZ b, HWND c)
    1192611926{
    1192711927 BOOL yyrc;
    … …  
    1193911939#endif
    1194011940#ifdef INCL_SPL
    11941 inline BOOL APIENTRY _SplStdClose(HDC a)
     11941inline BOOL _SplStdClose(HDC a)
    1194211942{
    1194311943 BOOL yyrc;
    … …  
    1195311953#define SplStdClose _SplStdClose
    1195411954
    11955 inline BOOL APIENTRY _SplStdDelete(HSTD a)
     11955inline BOOL _SplStdDelete(HSTD a)
    1195611956{
    1195711957 BOOL yyrc;
    … …  
    1196711967#define SplStdDelete _SplStdDelete
    1196811968
    11969 inline BOOL APIENTRY _SplStdGetBits(HSTD a, LONG b, LONG c, PCH d)
     11969inline BOOL _SplStdGetBits(HSTD a, LONG b, LONG c, PCH d)
    1197011970{
    1197111971 BOOL yyrc;
    … …  
    1198111981#define SplStdGetBits _SplStdGetBits
    1198211982
    11983 inline BOOL APIENTRY _SplStdOpen(HDC a)
     11983inline BOOL _SplStdOpen(HDC a)
    1198411984{
    1198511985 BOOL yyrc;
    … …  
    1199511995#define SplStdOpen _SplStdOpen
    1199611996
    11997 inline LONG APIENTRY _SplStdQueryLength(HSTD a)
     11997inline LONG _SplStdQueryLength(HSTD a)
    1199811998{
    1199911999 LONG yyrc;
    … …  
    1200912009#define SplStdQueryLength _SplStdQueryLength
    1201012010
    12011 inline BOOL APIENTRY _SplStdStart(HDC a)
     12011inline BOOL _SplStdStart(HDC a)
    1201212012{
    1201312013 BOOL yyrc;
    … …  
    1202312023#define SplStdStart _SplStdStart
    1202412024
    12025 inline HSTD APIENTRY _SplStdStop(HDC a)
     12025inline HSTD _SplStdStop(HDC a)
    1202612026{
    1202712027 HSTD yyrc;
    … …  
    1203712037#define SplStdStop _SplStdStop
    1203812038
    12039 inline SPLERR APIENTRY _SplControlDevice(PSZ a, PSZ b, ULONG c)
     12039inline SPLERR _SplControlDevice(PSZ a, PSZ b, ULONG c)
    1204012040{
    1204112041 SPLERR yyrc;
    … …  
    1205112051#define SplControlDevice _SplControlDevice
    1205212052
    12053 inline SPLERR APIENTRY _SplCopyJob(PCSZ a, PCSZ b, ULONG c, PCSZ d, PCSZ e, PULONG f)
     12053inline SPLERR _SplCopyJob(PCSZ a, PCSZ b, ULONG c, PCSZ d, PCSZ e, PULONG f)
    1205412054{
    1205512055 SPLERR yyrc;
    … …  
    1206512065#define SplCopyJob _SplCopyJob
    1206612066
    12067 inline SPLERR APIENTRY _SplCreateDevice(PSZ a, ULONG b, PVOID c, ULONG d)
     12067inline SPLERR _SplCreateDevice(PSZ a, ULONG b, PVOID c, ULONG d)
    1206812068{
    1206912069 SPLERR yyrc;
    … …  
    1207912079#define SplCreateDevice _SplCreateDevice
    1208012080
    12081 inline SPLERR APIENTRY _SplCreatePort(PCSZ a, PCSZ b, PCSZ c, ULONG d, PVOID e, ULONG f)
     12081inline SPLERR _SplCreatePort(PCSZ a, PCSZ b, PCSZ c, ULONG d, PVOID e, ULONG f)
    1208212082{
    1208312083 SPLERR yyrc;
    … …  
    1209312093#define SplCreatePort _SplCreatePort
    1209412094
    12095 inline SPLERR APIENTRY _SplCreateQueue(PSZ a, ULONG b, PVOID c, ULONG d)
     12095inline SPLERR _SplCreateQueue(PSZ a, ULONG b, PVOID c, ULONG d)
    1209612096{
    1209712097 SPLERR yyrc;
    … …  
    1210712107#define SplCreateQueue _SplCreateQueue
    1210812108
    12109 inline SPLERR APIENTRY _SplDeleteDevice(PSZ a, PSZ b)
     12109inline SPLERR _SplDeleteDevice(PSZ a, PSZ b)
    1211012110{
    1211112111 SPLERR yyrc;
    … …  
    1212112121#define SplDeleteDevice _SplDeleteDevice
    1212212122
    12123 inline SPLERR APIENTRY _SplDeleteJob(PSZ a, PSZ b, ULONG c)
     12123inline SPLERR _SplDeleteJob(PSZ a, PSZ b, ULONG c)
    1212412124{
    1212512125 SPLERR yyrc;
    … …  
    1213512135#define SplDeleteJob _SplDeleteJob
    1213612136
    12137 inline SPLERR APIENTRY _SplDeletePort(PCSZ a, PCSZ b)
     12137inline SPLERR _SplDeletePort(PCSZ a, PCSZ b)
    1213812138{
    1213912139 SPLERR yyrc;
    … …  
    1214912149#define SplDeletePort _SplDeletePort
    1215012150
    12151 inline SPLERR APIENTRY _SplDeleteQueue(PSZ a, PSZ b)
     12151inline SPLERR _SplDeleteQueue(PSZ a, PSZ b)
    1215212152{
    1215312153 SPLERR yyrc;
    … …  
    1216312163#define SplDeleteQueue _SplDeleteQueue
    1216412164
    12165 inline SPLERR APIENTRY _SplEnumDevice(PSZ a, ULONG b, PVOID c, ULONG d, PULONG e, PULONG f, PULONG g, PVOID h)
     12165inline SPLERR _SplEnumDevice(PSZ a, ULONG b, PVOID c, ULONG d, PULONG e, PULONG f, PULONG g, PVOID h)
    1216612166{
    1216712167 SPLERR yyrc;
    … …  
    1217712177#define SplEnumDevice _SplEnumDevice
    1217812178
    12179 inline SPLERR APIENTRY _SplEnumDriver(PSZ a, ULONG b, PVOID c, ULONG d, PULONG e, PULONG f, PULONG g, PVOID h)
     12179inline SPLERR _SplEnumDriver(PSZ a, ULONG b, PVOID c, ULONG d, PULONG e, PULONG f, PULONG g, PVOID h)
    1218012180{
    1218112181 SPLERR yyrc;
    … …  
    1219112191#define SplEnumDriver _SplEnumDriver
    1219212192
    12193 inline SPLERR APIENTRY _SplEnumJob(PSZ a, PSZ b, ULONG c, PVOID d, ULONG e, PULONG f, PULONG g, PULONG h, PVOID i)
     12193inline SPLERR _SplEnumJob(PSZ a, PSZ b, ULONG c, PVOID d, ULONG e, PULONG f, PULONG g, PULONG h, PVOID i)
    1219412194{
    1219512195 SPLERR yyrc;
    … …  
    1220512205#define SplEnumJob _SplEnumJob
    1220612206
    12207 inline SPLERR APIENTRY _SplEnumPort(PCSZ a, ULONG b, PVOID c, ULONG d, PULONG e, PULONG f, PULONG g, PVOID h)
     12207inline SPLERR _SplEnumPort(PCSZ a, ULONG b, PVOID c, ULONG d, PULONG e, PULONG f, PULONG g, PVOID h)
    1220812208{
    1220912209 SPLERR yyrc;
    … …  
    1221912219#define SplEnumPort _SplEnumPort
    1222012220
    12221 inline SPLERR APIENTRY _SplEnumPrinter(PSZ a, ULONG b, ULONG c, PVOID d, ULONG e, PULONG f, PULONG g, PULONG h, PVOID i)
     12221inline SPLERR _SplEnumPrinter(PSZ a, ULONG b, ULONG c, PVOID d, ULONG e, PULONG f, PULONG g, PULONG h, PVOID i)
    1222212222{
    1222312223 SPLERR yyrc;
    … …  
    1223312233#define SplEnumPrinter _SplEnumPrinter
    1223412234
    12235 inline SPLERR APIENTRY _SplEnumQueue(PSZ a, ULONG b, PVOID c, ULONG d, PULONG e, PULONG f, PULONG g, PVOID h)
     12235inline SPLERR _SplEnumQueue(PSZ a, ULONG b, PVOID c, ULONG d, PULONG e, PULONG f, PULONG g, PVOID h)
    1223612236{
    1223712237 SPLERR yyrc;
    … …  
    1224712247#define SplEnumQueue _SplEnumQueue
    1224812248
    12249 inline SPLERR APIENTRY _SplEnumQueueProcessor(PSZ a, ULONG b, PVOID c, ULONG d, PULONG e, PULONG f, PULONG g, PVOID h)
     12249inline SPLERR _SplEnumQueueProcessor(PSZ a, ULONG b, PVOID c, ULONG d, PULONG e, PULONG f, PULONG g, PVOID h)
    1225012250{
    1225112251 SPLERR yyrc;
    … …  
    1226112261#define SplEnumQueueProcessor _SplEnumQueueProcessor
    1226212262
    12263 inline SPLERR APIENTRY _SplHoldJob(PCSZ a, PCSZ b, ULONG c)
     12263inline SPLERR _SplHoldJob(PCSZ a, PCSZ b, ULONG c)
    1226412264{
    1226512265 SPLERR yyrc;
    … …  
    1227512275#define SplHoldJob _SplHoldJob
    1227612276
    12277 inline SPLERR APIENTRY _SplHoldQueue(PSZ a, PSZ b)
     12277inline SPLERR _SplHoldQueue(PSZ a, PSZ b)
    1227812278{
    1227912279 SPLERR yyrc;
    … …  
    1228912289#define SplHoldQueue _SplHoldQueue
    1229012290
    12291 inline SPLERR APIENTRY _SplPurgeQueue(PSZ a, PSZ b)
     12291inline SPLERR _SplPurgeQueue(PSZ a, PSZ b)
    1229212292{
    1229312293 SPLERR yyrc;
    … …  
    1230312303#define SplPurgeQueue _SplPurgeQueue
    1230412304
    12305 inline SPLERR APIENTRY _SplQueryDevice(PSZ a, PSZ b, ULONG c, PVOID d, ULONG e, PULONG f)
     12305inline SPLERR _SplQueryDevice(PSZ a, PSZ b, ULONG c, PVOID d, ULONG e, PULONG f)
    1230612306{
    1230712307 SPLERR yyrc;
    … …  
    1231712317#define SplQueryDevice _SplQueryDevice
    1231812318
    12319 inline SPLERR APIENTRY _SplQueryDriver(PCSZ a, PCSZ b, PCSZ c, ULONG d, PVOID e, ULONG f, PULONG g)
     12319inline SPLERR _SplQueryDriver(PCSZ a, PCSZ b, PCSZ c, ULONG d, PVOID e, ULONG f, PULONG g)
    1232012320{
    1232112321 SPLERR yyrc;
    … …  
    1233112331#define SplQueryDriver _SplQueryDriver
    1233212332
    12333 inline SPLERR APIENTRY _SplQueryJob(PSZ a, PSZ b, ULONG c, ULONG d, PVOID e, ULONG f, PULONG g)
     12333inline SPLERR _SplQueryJob(PSZ a, PSZ b, ULONG c, ULONG d, PVOID e, ULONG f, PULONG g)
    1233412334{
    1233512335 SPLERR yyrc;
    … …  
    1234512345#define SplQueryJob _SplQueryJob
    1234612346
    12347 inline SPLERR APIENTRY _SplQueryPort(PCSZ a, PCSZ b, ULONG c, PVOID d, ULONG e, PULONG f)
     12347inline SPLERR _SplQueryPort(PCSZ a, PCSZ b, ULONG c, PVOID d, ULONG e, PULONG f)
    1234812348{
    1234912349 SPLERR yyrc;
    … …  
    1235912359#define SplQueryPort _SplQueryPort
    1236012360
    12361 inline SPLERR APIENTRY _SplQueryQueue(PSZ a, PSZ b, ULONG c, PVOID d, ULONG e, PULONG f)
     12361inline SPLERR _SplQueryQueue(PSZ a, PSZ b, ULONG c, PVOID d, ULONG e, PULONG f)
    1236212362{
    1236312363 SPLERR yyrc;
    … …  
    1237312373#define SplQueryQueue _SplQueryQueue
    1237412374
    12375 inline SPLERR APIENTRY _SplReleaseJob(PCSZ a, PCSZ b, ULONG c)
     12375inline SPLERR _SplReleaseJob(PCSZ a, PCSZ b, ULONG c)
    1237612376{
    1237712377 SPLERR yyrc;
    … …  
    1238712387#define SplReleaseJob _SplReleaseJob
    1238812388
    12389 inline SPLERR APIENTRY _SplReleaseQueue(PSZ a, PSZ b)
     12389inline SPLERR _SplReleaseQueue(PSZ a, PSZ b)
    1239012390{
    1239112391 SPLERR yyrc;
    … …  
    1240112401#define SplReleaseQueue _SplReleaseQueue
    1240212402
    12403 inline SPLERR APIENTRY _SplSetDevice(PSZ a, PSZ b, ULONG c, PVOID d, ULONG e, ULONG f)
     12403inline SPLERR _SplSetDevice(PSZ a, PSZ b, ULONG c, PVOID d, ULONG e, ULONG f)
    1240412404{
    1240512405 SPLERR yyrc;
    … …  
    1241512415#define SplSetDevice _SplSetDevice
    1241612416
    12417 inline SPLERR APIENTRY _SplSetDriver(PCSZ a, PCSZ b, PCSZ c, ULONG d, PVOID e, ULONG f, ULONG g)
     12417inline SPLERR _SplSetDriver(PCSZ a, PCSZ b, PCSZ c, ULONG d, PVOID e, ULONG f, ULONG g)
    1241812418{
    1241912419 SPLERR yyrc;
    … …  
    1242912429#define SplSetDriver _SplSetDriver
    1243012430
    12431 inline SPLERR APIENTRY _SplSetJob(PSZ a, PSZ b, ULONG c, ULONG d, PVOID e, ULONG f, ULONG g)
     12431inline SPLERR _SplSetJob(PSZ a, PSZ b, ULONG c, ULONG d, PVOID e, ULONG f, ULONG g)
    1243212432{
    1243312433 SPLERR yyrc;
    … …  
    1244312443#define SplSetJob _SplSetJob
    1244412444
    12445 inline SPLERR APIENTRY _SplSetPort(PCSZ a, PCSZ b, ULONG c, PVOID d, ULONG e, ULONG f)
     12445inline SPLERR _SplSetPort(PCSZ a, PCSZ b, ULONG c, PVOID d, ULONG e, ULONG f)
    1244612446{
    1244712447 SPLERR yyrc;
    … …  
    1245712457#define SplSetPort _SplSetPort
    1245812458
    12459 inline SPLERR APIENTRY _SplSetQueue(PSZ a, PSZ b, ULONG c, PVOID d, ULONG e, ULONG f)
     12459inline SPLERR _SplSetQueue(PSZ a, PSZ b, ULONG c, PVOID d, ULONG e, ULONG f)
    1246012460{
    1246112461 SPLERR yyrc;
    … …  
    1247112471#define SplSetQueue _SplSetQueue
    1247212472
    12473 inline ULONG APIENTRY _SplMessageBox(PSZ a, ULONG b, ULONG c, PSZ d, PSZ e, ULONG f, ULONG g)
     12473inline ULONG _SplMessageBox(PSZ a, ULONG b, ULONG c, PSZ d, PSZ e, ULONG f, ULONG g)
    1247412474{
    1247512475 ULONG yyrc;
    … …  
    1248512485#define SplMessageBox _SplMessageBox
    1248612486
    12487 inline BOOL APIENTRY _SplQmAbort(HSPL a)
     12487inline BOOL _SplQmAbort(HSPL a)
    1248812488{
    1248912489 BOOL yyrc;
    … …  
    1249912499#define SplQmAbort _SplQmAbort
    1250012500
    12501 inline BOOL APIENTRY _SplQmAbortDoc(HSPL a)
     12501inline BOOL _SplQmAbortDoc(HSPL a)
    1250212502{
    1250312503 BOOL yyrc;
    … …  
    1251312513#define SplQmAbortDoc _SplQmAbortDoc
    1251412514
    12515 inline BOOL APIENTRY _SplQmClose(HSPL a)
     12515inline BOOL _SplQmClose(HSPL a)
    1251612516{
    1251712517 BOOL yyrc;
    … …  
    1252712527#define SplQmClose _SplQmClose
    1252812528
    12529 inline BOOL APIENTRY _SplQmEndDoc(HSPL a)
     12529inline BOOL _SplQmEndDoc(HSPL a)
    1253012530{
    1253112531 BOOL yyrc;
    … …  
    1254112541#define SplQmEndDoc _SplQmEndDoc
    1254212542
    12543 inline ULONG APIENTRY _SplQmGetJobID(HSPL a, ULONG b, PVOID c, ULONG d, PULONG e)
     12543inline ULONG _SplQmGetJobID(HSPL a, ULONG b, PVOID c, ULONG d, PULONG e)
    1254412544{
    1254512545 ULONG yyrc;
    … …  
    1255512555#define SplQmGetJobID _SplQmGetJobID
    1255612556
    12557 inline BOOL APIENTRY _SplQmNewPage(HSPL a, ULONG b)
     12557inline BOOL _SplQmNewPage(HSPL a, ULONG b)
    1255812558{
    1255912559 BOOL yyrc;
    … …  
    1256912569#define SplQmNewPage _SplQmNewPage
    1257012570
    12571 inline HSPL APIENTRY _SplQmOpen(PSZ a, LONG b, PQMOPENDATA c)
     12571inline HSPL _SplQmOpen(PSZ a, LONG b, PQMOPENDATA c)
    1257212572{
    1257312573 HSPL yyrc;
    … …  
    1258312583#define SplQmOpen _SplQmOpen
    1258412584
    12585 inline BOOL APIENTRY _SplQmStartDoc(HSPL a, PSZ b)
     12585inline BOOL _SplQmStartDoc(HSPL a, PSZ b)
    1258612586{
    1258712587 BOOL yyrc;
    … …  
    1259712597#define SplQmStartDoc _SplQmStartDoc
    1259812598
    12599 inline BOOL APIENTRY _SplQmWrite(HSPL a, LONG b, PVOID c)
     12599inline BOOL _SplQmWrite(HSPL a, LONG b, PVOID c)
    1260012600{
    1260112601 BOOL yyrc;
    … …  
    1261312613#endif
    1261412614#ifdef INCL_WINHELP
    12615 inline BOOL APIENTRY _WinAssociateHelpInstance(HWND a, HWND b)
     12615inline BOOL _WinAssociateHelpInstance(HWND a, HWND b)
    1261612616{
    1261712617 BOOL yyrc;
    … …  
    1262712627#define WinAssociateHelpInstance _WinAssociateHelpInstance
    1262812628
    12629 inline HWND APIENTRY _WinCreateHelpInstance(HAB a, PHELPINIT b)
     12629inline HWND _WinCreateHelpInstance(HAB a, PHELPINIT b)
    1263012630{
    1263112631 HWND yyrc;
    … …  
    1264112641#define WinCreateHelpInstance _WinCreateHelpInstance
    1264212642
    12643 inline BOOL APIENTRY _WinCreateHelpTable(HWND a, PHELPTABLE b)
     12643inline BOOL _WinCreateHelpTable(HWND a, PHELPTABLE b)
    1264412644{
    1264512645 BOOL yyrc;
    … …  
    1265512655#define WinCreateHelpTable _WinCreateHelpTable
    1265612656
    12657 inline BOOL APIENTRY _WinDestroyHelpInstance(HWND a)
     12657inline BOOL _WinDestroyHelpInstance(HWND a)
    1265812658{
    1265912659 BOOL yyrc;
    … …  
    1266912669#define WinDestroyHelpInstance _WinDestroyHelpInstance
    1267012670
    12671 inline BOOL APIENTRY _WinLoadHelpTable(HWND a, ULONG b, HMODULE c)
     12671inline BOOL _WinLoadHelpTable(HWND a, ULONG b, HMODULE c)
    1267212672{
    1267312673 BOOL yyrc;
    … …  
    1268312683#define WinLoadHelpTable _WinLoadHelpTable
    1268412684
    12685 inline HWND APIENTRY _WinQueryHelpInstance(HWND a)
     12685inline HWND _WinQueryHelpInstance(HWND a)
    1268612686{
    1268712687 HWND yyrc;
    … …  
    1269912699#endif
    1270012700#ifdef INCL_DDF
    12701 inline BOOL APIENTRY _DdfBeginList(HDDF a, ULONG b, ULONG c, ULONG d)
     12701inline BOOL _DdfBeginList(HDDF a, ULONG b, ULONG c, ULONG d)
    1270212702{
    1270312703 BOOL yyrc;
    … …  
    1271312713#define DdfBeginList _DdfBeginList
    1271412714
    12715 inline BOOL APIENTRY _DdfBitmap(HDDF a, HBITMAP b, ULONG c)
     12715inline BOOL _DdfBitmap(HDDF a, HBITMAP b, ULONG c)
    1271612716{
    1271712717 BOOL yyrc;
    … …  
    1272712727#define DdfBitmap _DdfBitmap
    1272812728
    12729 inline BOOL APIENTRY _DdfEndList(HDDF a)
     12729inline BOOL _DdfEndList(HDDF a)
    1273012730{
    1273112731 BOOL yyrc;
    … …  
    1274112741#define DdfEndList _DdfEndList
    1274212742
    12743 inline BOOL APIENTRY _DdfHyperText(HDDF a, PCSZ b, PCSZ c, ULONG d)
     12743inline BOOL _DdfHyperText(HDDF a, PCSZ b, PCSZ c, ULONG d)
    1274412744{
    1274512745 BOOL yyrc;
    … …  
    1275512755#define DdfHyperText _DdfHyperText
    1275612756
    12757 inline BOOL APIENTRY _DdfInform(HDDF a, PCSZ b, ULONG c)
     12757inline BOOL _DdfInform(HDDF a, PCSZ b, ULONG c)
    1275812758{
    1275912759 BOOL yyrc;
    … …  
    1276912769#define DdfInform _DdfInform
    1277012770
    12771 inline HDDF APIENTRY _DdfInitialize(HWND a, ULONG b, ULONG c)
     12771inline HDDF _DdfInitialize(HWND a, ULONG b, ULONG c)
    1277212772{
    1277312773 HDDF yyrc;
    … …  
    1278312783#define DdfInitialize _DdfInitialize
    1278412784
    12785 inline BOOL APIENTRY _DdfListItem(HDDF a, PCSZ b, PCSZ c)
     12785inline BOOL _DdfListItem(HDDF a, PCSZ b, PCSZ c)
    1278612786{
    1278712787 BOOL yyrc;
    … …  
    1279712797#define DdfListItem _DdfListItem
    1279812798
    12799 inline BOOL APIENTRY _DdfMetafile(HDDF a, HMF b, PRECTL c)
     12799inline BOOL _DdfMetafile(HDDF a, HMF b, PRECTL c)
    1280012800{
    1280112801 BOOL yyrc;
    … …  
    1281112811#define DdfMetafile _DdfMetafile
    1281212812
    12813 inline BOOL APIENTRY _DdfPara(HDDF a)
     12813inline BOOL _DdfPara(HDDF a)
    1281412814{
    1281512815 BOOL yyrc;
    … …  
    1282512825#define DdfPara _DdfPara
    1282612826
    12827 inline BOOL APIENTRY _DdfSetColor(HDDF a, COLOR b, COLOR c)
     12827inline BOOL _DdfSetColor(HDDF a, COLOR b, COLOR c)
    1282812828{
    1282912829 BOOL yyrc;
    … …  
    1283912839#define DdfSetColor _DdfSetColor
    1284012840
    12841 inline BOOL APIENTRY _DdfSetFont(HDDF a, PCSZ b, ULONG c, ULONG d)
     12841inline BOOL _DdfSetFont(HDDF a, PCSZ b, ULONG c, ULONG d)
    1284212842{
    1284312843 BOOL yyrc;
    … …  
    1285312853#define DdfSetFont _DdfSetFont
    1285412854
    12855 inline BOOL APIENTRY _DdfSetFontStyle(HDDF a, ULONG b)
     12855inline BOOL _DdfSetFontStyle(HDDF a, ULONG b)
    1285612856{
    1285712857 BOOL yyrc;
    … …  
    1286712867#define DdfSetFontStyle _DdfSetFontStyle
    1286812868
    12869 inline BOOL APIENTRY _DdfSetFormat(HDDF a, ULONG b)
     12869inline BOOL _DdfSetFormat(HDDF a, ULONG b)
    1287012870{
    1287112871 BOOL yyrc;
    … …  
    1288112881#define DdfSetFormat _DdfSetFormat
    1288212882
    12883 inline BOOL APIENTRY _DdfSetTextAlign(HDDF a, ULONG b)
     12883inline BOOL _DdfSetTextAlign(HDDF a, ULONG b)
    1288412884{
    1288512885 BOOL yyrc;
    … …  
    1289512895#define DdfSetTextAlign _DdfSetTextAlign
    1289612896
    12897 inline BOOL APIENTRY _DdfText(HDDF a, PCSZ b)
     12897inline BOOL _DdfText(HDDF a, PCSZ b)
    1289812898{
    1289912899 BOOL yyrc;
    … …  
    1291112911#endif
    1291212912#ifdef INCL_AVIO
    12913 inline USHORT APIENTRY _VioAssociate(HDC a, HVPS b)
     12913inline USHORT _VioAssociate(HDC a, HVPS b)
    1291412914{
    1291512915 USHORT yyrc;
    … …  
    1292512925#define VioAssociate _VioAssociate
    1292612926
    12927 inline USHORT APIENTRY16 _VioCreateLogFont(PFATTRS a, LONG b, PSTR8 c, HVPS d)
     12927inline USHORT _VioCreateLogFont(PFATTRS a, LONG b, PSTR8 c, HVPS d)
    1292812928{
    1292912929 USHORT yyrc;
    … …  
    1293912939#define VioCreateLogFont _VioCreateLogFont
    1294012940
    12941 inline USHORT APIENTRY16 _VioCreatePS(PHVPS a, SHORT b, SHORT c, SHORT d, SHORT e, HVPS f)
     12941inline USHORT _VioCreatePS(PHVPS a, SHORT b, SHORT c, SHORT d, SHORT e, HVPS f)
    1294212942{
    1294312943 USHORT yyrc;
    … …  
    1295312953#define VioCreatePS _VioCreatePS
    1295412954
    12955 inline USHORT APIENTRY16 _VioDeleteSetId(LONG a, HVPS b)
     12955inline USHORT _VioDeleteSetId(LONG a, HVPS b)
    1295612956{
    1295712957 USHORT yyrc;
    … …  
    1296712967#define VioDeleteSetId _VioDeleteSetId
    1296812968
    12969 inline USHORT APIENTRY16 _VioDestroyPS(HVPS a)
     12969inline USHORT _VioDestroyPS(HVPS a)
    1297012970{
    1297112971 USHORT yyrc;
    … …  
    1298112981#define VioDestroyPS _VioDestroyPS
    1298212982
    12983 inline USHORT APIENTRY16 _VioGetDeviceCellSize(PSHORT a, PSHORT b, HVPS c)
     12983inline USHORT _VioGetDeviceCellSize(PSHORT a, PSHORT b, HVPS c)
    1298412984{
    1298512985 USHORT yyrc;
    … …  
    1299512995#define VioGetDeviceCellSize _VioGetDeviceCellSize
    1299612996
    12997 inline USHORT APIENTRY16 _VioGetOrg(PSHORT a, PSHORT b, HVPS c)
     12997inline USHORT _VioGetOrg(PSHORT a, PSHORT b, HVPS c)
    1299812998{
    1299912999 USHORT yyrc;
    … …  
    1300913009#define VioGetOrg _VioGetOrg
    1301013010
    13011 inline USHORT APIENTRY16 _VioQueryFonts(PLONG a, PFONTMETRICS b, LONG c, PLONG d, PSZ e, ULONG f, HVPS g)
     13011inline USHORT _VioQueryFonts(PLONG a, PFONTMETRICS b, LONG c, PLONG d, PSZ e, ULONG f, HVPS g)
    1301213012{
    1301313013 USHORT yyrc;
    … …  
    1302313023#define VioQueryFonts _VioQueryFonts
    1302413024
    13025 inline USHORT APIENTRY16 _VioQuerySetIds(PLONG a, PSTR8 b, PLONG c, LONG d, HVPS e)
     13025inline USHORT _VioQuerySetIds(PLONG a, PSTR8 b, PLONG c, LONG d, HVPS e)
    1302613026{
    1302713027 USHORT yyrc;
    … …  
    1303713037#define VioQuerySetIds _VioQuerySetIds
    1303813038
    13039 inline USHORT APIENTRY16 _VioSetDeviceCellSize(SHORT a, SHORT b, HVPS c)
     13039inline USHORT _VioSetDeviceCellSize(SHORT a, SHORT b, HVPS c)
    1304013040{
    1304113041 USHORT yyrc;
    … …  
    1305113051#define VioSetDeviceCellSize _VioSetDeviceCellSize
    1305213052
    13053 inline USHORT APIENTRY16 _VioSetOrg(SHORT a, SHORT b, HVPS c)
     13053inline USHORT _VioSetOrg(SHORT a, SHORT b, HVPS c)
    1305413054{
    1305513055 USHORT yyrc;
    … …  
    1306513065#define VioSetOrg _VioSetOrg
    1306613066
    13067 inline USHORT APIENTRY16 _VioShowPS(SHORT a, SHORT b, SHORT c, HVPS d)
     13067inline USHORT _VioShowPS(SHORT a, SHORT b, SHORT c, HVPS d)
    1306813068{
    1306913069 USHORT yyrc;
    … …  
    1307913079#define VioShowPS _VioShowPS
    1308013080
    13081 inline MRESULT APIENTRY16 _WinDefAVioWindowProc(HWND a, USHORT b, ULONG c, ULONG d)
     13081inline MRESULT _WinDefAVioWindowProc(HWND a, USHORT b, ULONG c, ULONG d)
    1308213082{
    1308313083 MRESULT yyrc;
    … …  
    1309513095#endif
    1309613096#ifdef INCL_KBD
    13097 inline USHORT APIENTRY _KbdCharIn(PKBDKEYINFO a, USHORT b, HKBD c)
     13097inline USHORT _KbdCharIn(PKBDKEYINFO a, USHORT b, HKBD c)
    1309813098{
    1309913099 USHORT yyrc;
    … …  
    1310913109#define KbdCharIn _KbdCharIn
    1311013110
    13111 inline USHORT APIENTRY16 _KbdClose(HKBD a)
     13111inline USHORT _KbdClose(HKBD a)
    1311213112{
    1311313113 USHORT yyrc;
    … …  
    1312313123#define KbdClose _KbdClose
    1312413124
    13125 inline USHORT APIENTRY16 _KbdDeRegister()
     13125inline USHORT _KbdDeRegister()
    1312613126{
    1312713127 USHORT yyrc;
    … …  
    1313713137#define KbdDeRegister _KbdDeRegister
    1313813138
    13139 inline USHORT APIENTRY16 _KbdFlushBuffer(HKBD a)
     13139inline USHORT _KbdFlushBuffer(HKBD a)
    1314013140{
    1314113141 USHORT yyrc;
    … …  
    1315113151#define KbdFlushBuffer _KbdFlushBuffer
    1315213152
    13153 inline USHORT APIENTRY16 _KbdFreeFocus(HKBD a)
     13153inline USHORT _KbdFreeFocus(HKBD a)
    1315413154{
    1315513155 USHORT yyrc;
    … …  
    1316513165#define KbdFreeFocus _KbdFreeFocus
    1316613166
    13167 inline USHORT APIENTRY16 _KbdGetCp(ULONG a, PUSHORT b, HKBD c)
     13167inline USHORT _KbdGetCp(ULONG a, PUSHORT b, HKBD c)
    1316813168{
    1316913169 USHORT yyrc;
    … …  
    1317913179#define KbdGetCp _KbdGetCp
    1318013180
    13181 inline USHORT APIENTRY16 _KbdGetFocus(USHORT a, HKBD b)
     13181inline USHORT _KbdGetFocus(USHORT a, HKBD b)
    1318213182{
    1318313183 USHORT yyrc;
    … …  
    1319313193#define KbdGetFocus _KbdGetFocus
    1319413194
    13195 inline USHORT APIENTRY16 _KbdGetHWID(PKBDHWID a, HKBD b)
     13195inline USHORT _KbdGetHWID(PKBDHWID a, HKBD b)
    1319613196{
    1319713197 USHORT yyrc;
    … …  
    1320713207#define KbdGetHWID _KbdGetHWID
    1320813208
    13209 inline USHORT APIENTRY16 _KbdGetStatus(PKBDINFO a, HKBD b)
     13209inline USHORT _KbdGetStatus(PKBDINFO a, HKBD b)
    1321013210{
    1321113211 USHORT yyrc;
    … …  
    1322113221#define KbdGetStatus _KbdGetStatus
    1322213222
    13223 inline USHORT APIENTRY16 _KbdOpen(PHKBD a)
     13223inline USHORT _KbdOpen(PHKBD a)
    1322413224{
    1322513225 USHORT yyrc;
    … …  
    1323513235#define KbdOpen _KbdOpen
    1323613236
    13237 inline USHORT APIENTRY16 _KbdPeek(PKBDKEYINFO a, HKBD b)
     13237inline USHORT _KbdPeek(PKBDKEYINFO a, HKBD b)
    1323813238{
    1323913239 USHORT yyrc;
    … …  
    1324913249#define KbdPeek _KbdPeek
    1325013250
    13251 inline USHORT APIENTRY16 _KbdRegister(PSZ a, PSZ b, ULONG c)
     13251inline USHORT _KbdRegister(PSZ a, PSZ b, ULONG c)
    1325213252{
    1325313253 USHORT yyrc;
    … …  
    1326313263#define KbdRegister _KbdRegister
    1326413264
    13265 inline USHORT APIENTRY16 _KbdSetCp(USHORT a, USHORT b, HKBD c)
     13265inline USHORT _KbdSetCp(USHORT a, USHORT b, HKBD c)
    1326613266{
    1326713267 USHORT yyrc;
    … …  
    1327713277#define KbdSetCp _KbdSetCp
    1327813278
    13279 inline USHORT APIENTRY16 _KbdSetCustXt(PUSHORT a, HKBD b)
     13279inline USHORT _KbdSetCustXt(PUSHORT a, HKBD b)
    1328013280{
    1328113281 USHORT yyrc;
    … …  
    1329113291#define KbdSetCustXt _KbdSetCustXt
    1329213292
    13293 inline USHORT APIENTRY16 _KbdSetFgnd()
     13293inline USHORT _KbdSetFgnd()
    1329413294{
    1329513295 USHORT yyrc;
    … …  
    1330513305#define KbdSetFgnd _KbdSetFgnd
    1330613306
    13307 inline USHORT APIENTRY16 _KbdSetHWID(PKBDHWID a, HKBD b)
     13307inline USHORT _KbdSetHWID(PKBDHWID a, HKBD b)
    1330813308{
    1330913309 USHORT yyrc;
    … …  
    1331913319#define KbdSetHWID _KbdSetHWID
    1332013320
    13321 inline USHORT APIENTRY16 _KbdSetStatus(PKBDINFO a, HKBD b)
     13321inline USHORT _KbdSetStatus(PKBDINFO a, HKBD b)
    1332213322{
    1332313323 USHORT yyrc;
    … …  
    1333313333#define KbdSetStatus _KbdSetStatus
    1333413334
    13335 inline USHORT APIENTRY16 _KbdStringIn(PCH a, PSTRINGINBUF b, USHORT c, HKBD d)
     13335inline USHORT _KbdStringIn(PCH a, PSTRINGINBUF b, USHORT c, HKBD d)
    1333613336{
    1333713337 USHORT yyrc;
    … …  
    1334713347#define KbdStringIn _KbdStringIn
    1334813348
    13349 inline USHORT APIENTRY16 _KbdSynch(USHORT a)
     13349inline USHORT _KbdSynch(USHORT a)
    1335013350{
    1335113351 USHORT yyrc;
    … …  
    1336113361#define KbdSynch _KbdSynch
    1336213362
    13363 inline USHORT APIENTRY16 _KbdXlate(PKBDTRANS a, HKBD b)
     13363inline USHORT _KbdXlate(PKBDTRANS a, HKBD b)
    1336413364{
    1336513365 USHORT yyrc;
    … …  
    1337713377#endif
    1337813378#ifdef INCL_VIO
    13379 inline USHORT APIENTRY16 _VioCheckCharType(PUSHORT a, USHORT b, USHORT c, HVIO d)
     13379inline USHORT _VioCheckCharType(PUSHORT a, USHORT b, USHORT c, HVIO d)
    1338013380{
    1338113381 USHORT yyrc;
    … …  
    1339113391#define VioCheckCharType _VioCheckCharType
    1339213392
    13393 inline USHORT APIENTRY16 _VioDeRegister()
     13393inline USHORT _VioDeRegister()
    1339413394{
    1339513395 USHORT yyrc;
    … …  
    1340513405#define VioDeRegister _VioDeRegister
    1340613406
    13407 inline USHORT APIENTRY16 _VioEndPopUp(HVIO a)
     13407inline USHORT _VioEndPopUp(HVIO a)
    1340813408{
    1340913409 USHORT yyrc;
    … …  
    1341913419#define VioEndPopUp _VioEndPopUp
    1342013420
    13421 inline USHORT APIENTRY16 _VioGetAnsi(PUSHORT a, HVIO b)
     13421inline USHORT _VioGetAnsi(PUSHORT a, HVIO b)
    1342213422{
    1342313423 USHORT yyrc;
    … …  
    1343313433#define VioGetAnsi _VioGetAnsi
    1343413434
    13435 inline USHORT APIENTRY16 _VioGetBuf(PULONG a, PUSHORT b, HVIO c)
     13435inline USHORT _VioGetBuf(PULONG a, PUSHORT b, HVIO c)
    1343613436{
    1343713437 USHORT yyrc;
    … …  
    1344713447#define VioGetBuf _VioGetBuf
    1344813448
    13449 inline USHORT APIENTRY16 _VioGetConfig(USHORT a, PVIOCONFIGINFO b, HVIO c)
     13449inline USHORT _VioGetConfig(USHORT a, PVIOCONFIGINFO b, HVIO c)
    1345013450{
    1345113451 USHORT yyrc;
    … …  
    1346113461#define VioGetConfig _VioGetConfig
    1346213462
    13463 inline USHORT APIENTRY16 _VioGetCp(USHORT a, PUSHORT b, HVIO c)
     13463inline USHORT _VioGetCp(USHORT a, PUSHORT b, HVIO c)
    1346413464{
    1346513465 USHORT yyrc;
    … …  
    1347513475#define VioGetCp _VioGetCp
    1347613476
    13477 inline USHORT APIENTRY16 _VioGetCurPos(PUSHORT a, PUSHORT b, HVIO c)
     13477inline USHORT _VioGetCurPos(PUSHORT a, PUSHORT b, HVIO c)
    1347813478{
    1347913479 USHORT yyrc;
    … …  
    1348913489#define VioGetCurPos _VioGetCurPos
    1349013490
    13491 inline USHORT APIENTRY16 _VioGetCurType(PVIOCURSORINFO a, HVIO b)
     13491inline USHORT _VioGetCurType(PVIOCURSORINFO a, HVIO b)
    1349213492{
    1349313493 USHORT yyrc;
    … …  
    1350313503#define VioGetCurType _VioGetCurType
    1350413504
    13505 inline USHORT APIENTRY16 _VioGetFont(PVIOFONTINFO a, HVIO b)
     13505inline USHORT _VioGetFont(PVIOFONTINFO a, HVIO b)
    1350613506{
    1350713507 USHORT yyrc;
    … …  
    1351713517#define VioGetFont _VioGetFont
    1351813518
    13519 inline USHORT APIENTRY16 _VioGetMode(PVIOMODEINFO a, HVIO b)
     13519inline USHORT _VioGetMode(PVIOMODEINFO a, HVIO b)
    1352013520{
    1352113521 USHORT yyrc;
    … …  
    1353113531#define VioGetMode _VioGetMode
    1353213532
    13533 inline USHORT APIENTRY16 _VioGetPhysBuf(PVIOPHYSBUF a, USHORT b)
     13533inline USHORT _VioGetPhysBuf(PVIOPHYSBUF a, USHORT b)
    1353413534{
    1353513535 USHORT yyrc;
    … …  
    1354513545#define VioGetPhysBuf _VioGetPhysBuf
    1354613546
    13547 inline USHORT APIENTRY16 _VioGetState(PVOID a, HVIO b)
     13547inline USHORT _VioGetState(PVOID a, HVIO b)
    1354813548{
    1354913549 USHORT yyrc;
    … …  
    1355913559#define VioGetState _VioGetState
    1356013560
    13561 inline USHORT APIENTRY16 _VioModeUndo(USHORT a, USHORT b, USHORT c)
     13561inline USHORT _VioModeUndo(USHORT a, USHORT b, USHORT c)
    1356213562{
    1356313563 USHORT yyrc;
    … …  
    1357313573#define VioModeUndo _VioModeUndo
    1357413574
    13575 inline USHORT APIENTRY16 _VioModeWait(USHORT a, PUSHORT b, USHORT c)
     13575inline USHORT _VioModeWait(USHORT a, PUSHORT b, USHORT c)
    1357613576{
    1357713577 USHORT yyrc;
    … …  
    1358713587#define VioModeWait _VioModeWait
    1358813588
    13589 inline USHORT APIENTRY16 _VioPopUp(PUSHORT a, HVIO b)
     13589inline USHORT _VioPopUp(PUSHORT a, HVIO b)
    1359013590{
    1359113591 USHORT yyrc;
    … …  
    1360113601#define VioPopUp _VioPopUp
    1360213602
    13603 inline USHORT APIENTRY16 _VioPrtSc(HVIO a)
     13603inline USHORT _VioPrtSc(HVIO a)
    1360413604{
    1360513605 USHORT yyrc;
    … …  
    1361513615#define VioPrtSc _VioPrtSc
    1361613616
    13617 inline USHORT APIENTRY16 _VioPrtScToggle(HVIO a)
     13617inline USHORT _VioPrtScToggle(HVIO a)
    1361813618{
    1361913619 USHORT yyrc;
    … …  
    1362913629#define VioPrtScToggle _VioPrtScToggle
    1363013630
    13631 inline USHORT APIENTRY16 _VioReadCellStr(PCH a, PUSHORT b, USHORT c, USHORT d, HVIO e)
     13631inline USHORT _VioReadCellStr(PCH a, PUSHORT b, USHORT c, USHORT d, HVIO e)
    1363213632{
    1363313633 USHORT yyrc;
    … …  
    1364313643#define VioReadCellStr _VioReadCellStr
    1364413644
    13645 inline USHORT APIENTRY16 _VioReadCharStr(PCH a, PUSHORT b, USHORT c, USHORT d, HVIO e)
     13645inline USHORT _VioReadCharStr(PCH a, PUSHORT b, USHORT c, USHORT d, HVIO e)
    1364613646{
    1364713647 USHORT yyrc;
    … …  
    1365713657#define VioReadCharStr _VioReadCharStr
    1365813658
    13659 inline USHORT APIENTRY16 _VioRegister(PSZ a, PSZ b, ULONG c, ULONG d)
     13659inline USHORT _VioRegister(PSZ a, PSZ b, ULONG c, ULONG d)
    1366013660{
    1366113661 USHORT yyrc;
    … …  
    1367113671#define VioRegister _VioRegister
    1367213672
    13673 inline USHORT APIENTRY16 _VioSavRedrawUndo(USHORT a, USHORT b, USHORT c)
     13673inline USHORT _VioSavRedrawUndo(USHORT a, USHORT b, USHORT c)
    1367413674{
    1367513675 USHORT yyrc;
    … …  
    1368513685#define VioSavRedrawUndo _VioSavRedrawUndo
    1368613686
    13687 inline USHORT APIENTRY16 _VioSavRedrawWait(USHORT a, PUSHORT b, USHORT c)
     13687inline USHORT _VioSavRedrawWait(USHORT a, PUSHORT b, USHORT c)
    1368813688{
    1368913689 USHORT yyrc;
    … …  
    1369913699#define VioSavRedrawWait _VioSavRedrawWait
    1370013700
    13701 inline USHORT APIENTRY16 _VioScrLock(USHORT a, PUCHAR b, HVIO c)
     13701inline USHORT _VioScrLock(USHORT a, PUCHAR b, HVIO c)
    1370213702{
    1370313703 USHORT yyrc;
    … …  
    1371313713#define VioScrLock _VioScrLock
    1371413714
    13715 inline USHORT APIENTRY16 _VioScrollDn(USHORT a, USHORT b, USHORT c, USHORT d, USHORT e, PBYTE f, HVIO g)
     13715inline USHORT _VioScrollDn(USHORT a, USHORT b, USHORT c, USHORT d, USHORT e, PBYTE f, HVIO g)
    1371613716{
    1371713717 USHORT yyrc;
    … …  
    1372713727#define VioScrollDn _VioScrollDn
    1372813728
    13729 inline USHORT APIENTRY16 _VioScrollLf(USHORT a, USHORT b, USHORT c, USHORT d, USHORT e, PBYTE f, HVIO g)
     13729inline USHORT _VioScrollLf(USHORT a, USHORT b, USHORT c, USHORT d, USHORT e, PBYTE f, HVIO g)
    1373013730{
    1373113731 USHORT yyrc;
    … …  
    1374113741#define VioScrollLf _VioScrollLf
    1374213742
    13743 inline USHORT APIENTRY16 _VioScrollRt(USHORT a, USHORT b, USHORT c, USHORT d, USHORT e, PBYTE f, HVIO g)
     13743inline USHORT _VioScrollRt(USHORT a, USHORT b, USHORT c, USHORT d, USHORT e, PBYTE f, HVIO g)
    1374413744{
    1374513745 USHORT yyrc;
    … …  
    1375513755#define VioScrollRt _VioScrollRt
    1375613756
    13757 inline USHORT APIENTRY16 _VioScrollUp(USHORT a, USHORT b, USHORT c, USHORT d, USHORT e, PBYTE f, HVIO g)
     13757inline USHORT _VioScrollUp(USHORT a, USHORT b, USHORT c, USHORT d, USHORT e, PBYTE f, HVIO g)
    1375813758{
    1375913759 USHORT yyrc;
    … …  
    1376913769#define VioScrollUp _VioScrollUp
    1377013770
    13771 inline USHORT APIENTRY16 _VioScrUnLock(HVIO a)
     13771inline USHORT _VioScrUnLock(HVIO a)
    1377213772{
    1377313773 USHORT yyrc;
    … …  
    1378313783#define VioScrUnLock _VioScrUnLock
    1378413784
    13785 inline USHORT APIENTRY16 _VioSetAnsi(USHORT a, HVIO b)
     13785inline USHORT _VioSetAnsi(USHORT a, HVIO b)
    1378613786{
    1378713787 USHORT yyrc;
    … …  
    1379713797#define VioSetAnsi _VioSetAnsi
    1379813798
    13799 inline USHORT APIENTRY16 _VioSetCp(USHORT a, USHORT b, HVIO c)
     13799inline USHORT _VioSetCp(USHORT a, USHORT b, HVIO c)
    1380013800{
    1380113801 USHORT yyrc;
    … …  
    1381113811#define VioSetCp _VioSetCp
    1381213812
    13813 inline USHORT APIENTRY16 _VioSetCurPos(USHORT a, USHORT b, HVIO c)
     13813inline USHORT _VioSetCurPos(USHORT a, USHORT b, HVIO c)
    1381413814{
    1381513815 USHORT yyrc;
    … …  
    1382513825#define VioSetCurPos _VioSetCurPos
    1382613826
    13827 inline USHORT APIENTRY16 _VioSetCurType(PVIOCURSORINFO a, HVIO b)
     13827inline USHORT _VioSetCurType(PVIOCURSORINFO a, HVIO b)
    1382813828{
    1382913829 USHORT yyrc;
    … …  
    1383913839#define VioSetCurType _VioSetCurType
    1384013840
    13841 inline USHORT APIENTRY16 _VioSetFont(PVIOFONTINFO a, HVIO b)
     13841inline USHORT _VioSetFont(PVIOFONTINFO a, HVIO b)
    1384213842{
    1384313843 USHORT yyrc;
    … …  
    1385313853#define VioSetFont _VioSetFont
    1385413854
    13855 inline USHORT APIENTRY16 _VioSetMode(PVIOMODEINFO a, HVIO b)
     13855inline USHORT _VioSetMode(PVIOMODEINFO a, HVIO b)
    1385613856{
    1385713857 USHORT yyrc;
    … …  
    1386713867#define VioSetMode _VioSetMode
    1386813868
    13869 inline USHORT APIENTRY16 _VioSetState(PVOID a, HVIO b)
     13869inline USHORT _VioSetState(PVOID a, HVIO b)
    1387013870{
    1387113871 USHORT yyrc;
    … …  
    1388113881#define VioSetState _VioSetState
    1388213882
    13883 inline USHORT APIENTRY16 _VioShowBuf(USHORT a, USHORT b, HVIO c)
     13883inline USHORT _VioShowBuf(USHORT a, USHORT b, HVIO c)
    1388413884{
    1388513885 USHORT yyrc;
    … …  
    1389513895#define VioShowBuf _VioShowBuf
    1389613896
    13897 inline USHORT APIENTRY16 _VioWrtCellStr(PCH a, USHORT b, USHORT c, USHORT d, HVIO e)
     13897inline USHORT _VioWrtCellStr(PCH a, USHORT b, USHORT c, USHORT d, HVIO e)
    1389813898{
    1389913899 USHORT yyrc;
    … …  
    1390913909#define VioWrtCellStr _VioWrtCellStr
    1391013910
    13911 inline USHORT APIENTRY16 _VioWrtCharStr(PCH a, USHORT b, USHORT c, USHORT d, HVIO e)
     13911inline USHORT _VioWrtCharStr(PCH a, USHORT b, USHORT c, USHORT d, HVIO e)
    1391213912{
    1391313913 USHORT yyrc;
    … …  
    1392313923#define VioWrtCharStr _VioWrtCharStr
    1392413924
    13925 inline USHORT APIENTRY16 _VioWrtCharStrAtt(PCH a, USHORT b, USHORT c, USHORT d, PBYTE e, HVIO f)
     13925inline USHORT _VioWrtCharStrAtt(PCH a, USHORT b, USHORT c, USHORT d, PBYTE e, HVIO f)
    1392613926{
    1392713927 USHORT yyrc;
    … …  
    1393713937#define VioWrtCharStrAtt _VioWrtCharStrAtt
    1393813938
    13939 inline USHORT APIENTRY16 _VioWrtNAttr(PBYTE a, USHORT b, USHORT c, USHORT d, HVIO e)
     13939inline USHORT _VioWrtNAttr(PBYTE a, USHORT b, USHORT c, USHORT d, HVIO e)
    1394013940{
    1394113941 USHORT yyrc;
    … …  
    1395113951#define VioWrtNAttr _VioWrtNAttr
    1395213952
    13953 inline USHORT APIENTRY16 _VioWrtNCell(PBYTE a, USHORT b, USHORT c, USHORT d, HVIO e)
     13953inline USHORT _VioWrtNCell(PBYTE a, USHORT b, USHORT c, USHORT d, HVIO e)
    1395413954{
    1395513955 USHORT yyrc;
    … …  
    1396513965#define VioWrtNCell _VioWrtNCell
    1396613966
    13967 inline USHORT APIENTRY16 _VioWrtNChar(PCH a, USHORT b, USHORT c, USHORT d, HVIO e)
     13967inline USHORT _VioWrtNChar(PCH a, USHORT b, USHORT c, USHORT d, HVIO e)
    1396813968{
    1396913969 USHORT yyrc;
    … …  
    1397913979#define VioWrtNChar _VioWrtNChar
    1398013980
    13981 inline USHORT APIENTRY16 _VioWrtTTY(PCH a, USHORT b, HVIO c)
     13981inline USHORT _VioWrtTTY(PCH a, USHORT b, HVIO c)
    1398213982{
    1398313983 USHORT yyrc;
    … …  
    1399513995#endif
    1399613996#ifdef INCL_MOU
    13997 inline USHORT APIENTRY16 _MouClose(HMOU a)
     13997inline USHORT _MouClose(HMOU a)
    1399813998{
    1399913999 USHORT yyrc;
    … …  
    1400914009#define MouClose _MouClose
    1401014010
    14011 inline USHORT APIENTRY16 _MouDeRegister()
     14011inline USHORT _MouDeRegister()
    1401214012{
    1401314013 USHORT yyrc;
    … …  
    1402314023#define MouDeRegister _MouDeRegister
    1402414024
    14025 inline USHORT APIENTRY16 _MouDrawPtr(HMOU a)
     14025inline USHORT _MouDrawPtr(HMOU a)
    1402614026{
    1402714027 USHORT yyrc;
    … …  
    1403714037#define MouDrawPtr _MouDrawPtr
    1403814038
    14039 inline USHORT APIENTRY16 _MouFlushQue(HMOU a)
     14039inline USHORT _MouFlushQue(HMOU a)
    1404014040{
    1404114041 USHORT yyrc;
    … …  
    1405114051#define MouFlushQue _MouFlushQue
    1405214052
    14053 inline USHORT APIENTRY16 _MouGetDevStatus(PUSHORT a, HMOU b)
     14053inline USHORT _MouGetDevStatus(PUSHORT a, HMOU b)
    1405414054{
    1405514055 USHORT yyrc;
    … …  
    1406514065#define MouGetDevStatus _MouGetDevStatus
    1406614066
    14067 inline USHORT APIENTRY16 _MouGetEventMask(PUSHORT a, HMOU b)
     14067inline USHORT _MouGetEventMask(PUSHORT a, HMOU b)
    1406814068{
    1406914069 USHORT yyrc;
    … …  
    1407914079#define MouGetEventMask _MouGetEventMask
    1408014080
    14081 inline USHORT APIENTRY16 _MouGetNumButtons(PUSHORT a, HMOU b)
     14081inline USHORT _MouGetNumButtons(PUSHORT a, HMOU b)
    1408214082{
    1408314083 USHORT yyrc;
    … …  
    1409314093#define MouGetNumButtons _MouGetNumButtons
    1409414094
    14095 inline USHORT APIENTRY16 _MouGetNumMickeys(PUSHORT a, HMOU b)
     14095inline USHORT _MouGetNumMickeys(PUSHORT a, HMOU b)
    1409614096{
    1409714097 USHORT yyrc;
    … …  
    1410714107#define MouGetNumMickeys _MouGetNumMickeys
    1410814108
    14109 inline USHORT APIENTRY16 _MouGetNumQueEl(PMOUQUEINFO a, HMOU b)
     14109inline USHORT _MouGetNumQueEl(PMOUQUEINFO a, HMOU b)
    1411014110{
    1411114111 USHORT yyrc;
    … …  
    1412114121#define MouGetNumQueEl _MouGetNumQueEl
    1412214122
    14123 inline USHORT APIENTRY16 _MouGetPtrPos(PPTRLOC a, HMOU b)
     14123inline USHORT _MouGetPtrPos(PPTRLOC a, HMOU b)
    1412414124{
    1412514125 USHORT yyrc;
    … …  
    1413514135#define MouGetPtrPos _MouGetPtrPos
    1413614136
    14137 inline USHORT APIENTRY16 _MouGetPtrShape(PBYTE a, PPTRSHAPE b, HMOU c)
     14137inline USHORT _MouGetPtrShape(PBYTE a, PPTRSHAPE b, HMOU c)
    1413814138{
    1413914139 USHORT yyrc;
    … …  
    1414914149#define MouGetPtrShape _MouGetPtrShape
    1415014150
    14151 inline USHORT APIENTRY16 _MouGetScaleFact(PSCALEFACT a, HMOU b)
     14151inline USHORT _MouGetScaleFact(PSCALEFACT a, HMOU b)
    1415214152{
    1415314153 USHORT yyrc;
    … …  
    1416314163#define MouGetScaleFact _MouGetScaleFact
    1416414164
    14165 inline USHORT APIENTRY16 _MouGetThreshold(PTHRESHOLD a, HMOU b)
     14165inline USHORT _MouGetThreshold(PTHRESHOLD a, HMOU b)
    1416614166{
    1416714167 USHORT yyrc;
    … …  
    1417714177#define MouGetThreshold _MouGetThreshold
    1417814178
    14179 inline USHORT APIENTRY16 _MouInitReal(PSZ a)
     14179inline USHORT _MouInitReal(PSZ a)
    1418014180{
    1418114181 USHORT yyrc;
    … …  
    1419114191#define MouInitReal _MouInitReal
    1419214192
    14193 inline USHORT APIENTRY16 _MouOpen(PSZ a, PHMOU b)
     14193inline USHORT _MouOpen(PSZ a, PHMOU b)
    1419414194{
    1419514195 USHORT yyrc;
    … …  
    1420514205#define MouOpen _MouOpen
    1420614206
    14207 inline USHORT APIENTRY16 _MouReadEventQue(PMOUEVENTINFO a, PUSHORT b, HMOU c)
     14207inline USHORT _MouReadEventQue(PMOUEVENTINFO a, PUSHORT b, HMOU c)
    1420814208{
    1420914209 USHORT yyrc;
    … …  
    1421914219#define MouReadEventQue _MouReadEventQue
    1422014220
    14221 inline USHORT APIENTRY16 _MouRegister(PSZ a, PSZ b, ULONG c)
     14221inline USHORT _MouRegister(PSZ a, PSZ b, ULONG c)
    1422214222{
    1422314223 USHORT yyrc;
    … …  
    1423314233#define MouRegister _MouRegister
    1423414234
    14235 inline USHORT APIENTRY16 _MouRemovePtr(PNOPTRRECT a, HMOU b)
     14235inline USHORT _MouRemovePtr(PNOPTRRECT a, HMOU b)
    1423614236{
    1423714237 USHORT yyrc;
    … …  
    1424714247#define MouRemovePtr _MouRemovePtr
    1424814248
    14249 inline USHORT APIENTRY16 _MouSetDevStatus(PUSHORT a, HMOU b)
     14249inline USHORT _MouSetDevStatus(PUSHORT a, HMOU b)
    1425014250{
    1425114251 USHORT yyrc;
    … …  
    1426114261#define MouSetDevStatus _MouSetDevStatus
    1426214262
    14263 inline USHORT APIENTRY16 _MouSetEventMask(PUSHORT a, HMOU b)
     14263inline USHORT _MouSetEventMask(PUSHORT a, HMOU b)
    1426414264{
    1426514265 USHORT yyrc;
    … …  
    1427514275#define MouSetEventMask _MouSetEventMask
    1427614276
    14277 inline USHORT APIENTRY16 _MouSetPtrPos(PPTRLOC a, HMOU b)
     14277inline USHORT _MouSetPtrPos(PPTRLOC a, HMOU b)
    1427814278{
    1427914279 USHORT yyrc;
    … …  
    1428914289#define MouSetPtrPos _MouSetPtrPos
    1429014290
    14291 inline USHORT APIENTRY16 _MouSetPtrShape(PBYTE a, PPTRSHAPE b, HMOU c)
     14291inline USHORT _MouSetPtrShape(PBYTE a, PPTRSHAPE b, HMOU c)
    1429214292{
    1429314293 USHORT yyrc;
    … …  
    1430314303#define MouSetPtrShape _MouSetPtrShape
    1430414304
    14305 inline USHORT APIENTRY16 _MouSetScaleFact(PSCALEFACT a, HMOU b)
     14305inline USHORT _MouSetScaleFact(PSCALEFACT a, HMOU b)
    1430614306{
    1430714307 USHORT yyrc;
    … …  
    1431714317#define MouSetScaleFact _MouSetScaleFact
    1431814318
    14319 inline USHORT APIENTRY16 _MouSetThreshold(PTHRESHOLD a, HMOU b)
     14319inline USHORT _MouSetThreshold(PTHRESHOLD a, HMOU b)
    1432014320{
    1432114321 USHORT yyrc;
    … …  
    1433114331#define MouSetThreshold _MouSetThreshold
    1433214332
    14333 inline USHORT APIENTRY16 _MouSynch(USHORT a)
     14333inline USHORT _MouSynch(USHORT a)
    1433414334{
    1433514335 USHORT yyrc;
Note: See TracChangeset for help on using the changeset viewer.