Changeset 21859


Ignore:
Timestamp:
Dec 7, 2011, 7:45:52 PM (13 years ago)
Author:
dmik
Message:

Fix Vio/Kbd/Mou declarations under GCC.

We abuse _Pascal for that. It's not very clear but other solutions
require a fix to OS/2 Toolkit headers...

Location:
branches/gcc-kmk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified branches/gcc-kmk/include/os2wrap.h

    r21804 r21859  
    1919#define INCL_LONGLONG_STRUCTS
    2020
     21#else // ifndef USE_OS2_TOOLKIT_HEADERS
     22
     23#undef _Pascal
     24#define _Pascal _System // For Vio/Kbd/Mou
     25
    2126#endif // ifndef USE_OS2_TOOLKIT_HEADERS
    2227

  • TabularUnified branches/gcc-kmk/src/kernel32/exceptions.cpp

    r21838 r21859  
    182182
    183183/*****************************************************************************
    184  * Name      : VOID _Pascal OS2RaiseException
     184 * Name      : VOID __cdecl OS2RaiseException
    185185 * Purpose   : Unwinds exception handlers (heavily influenced by Wine)
    186186 * Parameters: ...
    … …  
    195195void WIN32API RtlRaiseException(WINEXCEPTION_RECORD *rec, WINCONTEXT *context);
    196196
    197 VOID _Pascal OS2RaiseException(DWORD dwExceptionCode,
     197VOID __cdecl OS2RaiseException(DWORD dwExceptionCode,
    198198                               DWORD dwExceptionFlags,
    199199                               DWORD cArguments,
    … …  
    442442}
    443443/*****************************************************************************
    444  * Name      : int _Pascal OS2RtlUnwind
     444 * Name      : int __cdecl OS2RtlUnwind
    445445 * Purpose   : Unwinds exception handlers (heavily influenced by Wine)
    446446 * Parameters: ...
    … …  
    453453 *****************************************************************************/
    454454
    455 int _Pascal OS2RtlUnwind(PWINEXCEPTION_FRAME  pEndFrame,
     455int __cdecl OS2RtlUnwind(PWINEXCEPTION_FRAME  pEndFrame,
    456456                         LPVOID unusedEip,
    457457                         PWINEXCEPTION_RECORD pRecord,

  • TabularUnified branches/gcc-kmk/src/kernel32/exceptutil.asm

    r21838 r21859  
    4040_RaiseException@16 proc near
    4141
    42 ifdef __GNUC__
    4342        ; _OS2RaiseException is _cdecl
    4443
    … …  
    8382        pop eax
    8483        pop ebp
    85 else
    86         ; _OS2RaiseException _Pascal
    87         push dword ptr [esp+4]  ;DWORD dwExceptionCode
    88         push dword ptr [esp+12] ;DWORD dwExceptionFlags
    89         push dword ptr [esp+20] ;DWORD cArguments
    90         push dword ptr [esp+28] ;DWORD *lpArguments
    91         push dword ptr [esp+16] ;return address
    92         push esp
    93         add  dword ptr [esp], 20
    94         push ebp
    95         pushfd
    96         push eax
    97         push ebx
    98         push ecx
    99         push edx
    100         push edi
    101         push esi
    102         xor  eax, eax
    103         mov  eax, cs
    104         push eax
    105         mov  eax, ds
    106         push eax
    107         mov  eax, es
    108         push eax
    109         mov  eax, fs
    110         push eax
    111         mov  eax, gs
    112         push eax
    113         mov  eax, ss
    114         push eax
    115         call _OS2RaiseException
    116 endif
    11784
    11885        ret 16      ;__stdcall
    … …  
    12693_RtlUnwind@16 proc near
    12794
    128 ifdef __GNUC__
    12995        ; OS2RtlUnwind is _cdecl
    13096
    … …  
    169135        pop eax
    170136        pop ebp
    171 else
    172         ; OS2RtlUnwind is _Pascal
    173         push dword ptr [esp+4]  ;PWINEXCEPTION_FRAME  pEndFrame
    174         push dword ptr [esp+12] ;LPVOID unusedEip
    175         push dword ptr [esp+20] ;PWINEXCEPTION_RECORD pRecord
    176         push dword ptr [esp+28] ;DWORD  returnEax
    177         push dword ptr [esp+16] ;return address
    178         push esp
    179         add  dword ptr [esp], 20
    180         push ebp
    181         pushfd
    182         push eax
    183         push ebx
    184         push ecx
    185         push edx
    186         push edi
    187         push esi
    188         xor  eax, eax
    189         mov  eax, cs
    190         push eax
    191         mov  eax, ds
    192         push eax
    193         mov  eax, es
    194         push eax
    195         mov  eax, fs
    196         push eax
    197         mov  eax, gs
    198         push eax
    199         mov  eax, ss
    200         push eax
    201         call _OS2RtlUnwind
    202 endif
    203137
    204138        ret 16      ;__stdcall
Note: See TracChangeset for help on using the changeset viewer.