Ignore:
Timestamp:
Dec 18, 2011, 10:28:22 PM (14 years ago)
Author:
dmik
Message:

Merge branch gcc-kmk to trunk.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

    • Property svn:ignore

      •  

        old new  
        1 bin
        2 Makefile.inc
         1env.cmd
         2LocalConfig.kmk
    • Property svn:mergeinfo set to
      /branches/gcc-kmkmergedeligible

  • trunk/src/kernel32/exceptions.cpp

    r21662 r21916  
    109109static PEXCEPTION_HANDLER           StartupCodeHandler = NULL;
    110110
    111 extern "C" PWINEXCEPTION_FRAME GetExceptionRecord(ULONG offset, ULONG segment);
     111extern "C" {
     112
     113PWINEXCEPTION_FRAME GetExceptionRecord(ULONG offset, ULONG segment);
    112114
    113115LONG WIN32API UnhandledExceptionFilter(PWINEXCEPTION_POINTERS lpexpExceptionInfo);
    … …  
    118120                             PCONTEXTRECORD pCtxRec, PVOID p, PSZ szTrapDump);
    119121
    120 extern "C"
    121122int __cdecl __seh_handler(PWINEXCEPTION_RECORD pRec,
    122123                          PWINEXCEPTION_FRAME pFrame,
    123124                          PCONTEXTRECORD pContext, PVOID pVoid);
    124125
    125 extern "C"
    126126PWINEXCEPTION_FRAME __cdecl __seh_get_prev_frame(PWINEXCEPTION_FRAME pFrame);
    127127
    … …  
    162162}
    163163
    164 #if 0
     164#ifdef __EMX__
    165165static inline WINEXCEPTION_FRAME * EXC_push_frame( WINEXCEPTION_FRAME *frame )
    166166{
    … …  
    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,
    … …  
    308308}
    309309
    310 #if 1
     310#ifndef __EMX__
     311extern "C"
    311312DWORD EXC_CallHandler( WINEXCEPTION_RECORD *record, WINEXCEPTION_FRAME *frame,
    312313                       WINCONTEXT *context, WINEXCEPTION_FRAME **dispatcher,
    … …  
    441442}
    442443/*****************************************************************************
    443  * Name      : int _Pascal OS2RtlUnwind
     444 * Name      : int __cdecl OS2RtlUnwind
    444445 * Purpose   : Unwinds exception handlers (heavily influenced by Wine)
    445446 * Parameters: ...
    … …  
    452453 *****************************************************************************/
    453454
    454 int _Pascal OS2RtlUnwind(PWINEXCEPTION_FRAME  pEndFrame,
     455int __cdecl OS2RtlUnwind(PWINEXCEPTION_FRAME  pEndFrame,
    455456                         LPVOID unusedEip,
    456457                         PWINEXCEPTION_RECORD pRecord,
    … …  
    756757    }
    757758
    758     PSZ    pszExceptionName = "<unknown>";        /* points to name/type excpt */
     759    PCSZ   pszExceptionName = "<unknown>";        /* points to name/type excpt */
    759760    APIRET rc               = XCPT_CONTINUE_SEARCH;        /* excpt-dep.  code */
    760761    BOOL   fExcptSoftware   = FALSE;         /* software/hardware gen. exceptn */
    … …  
    11811182
    11821183            if(lpszExeName) {
    1183                 DosWrite(hFile, "\n", 2, &ulBytesWritten);
     1184                DosWrite(hFile, (PVOID)"\n", 2, &ulBytesWritten);
    11841185                DosWrite(hFile, lpszExeName, strlen(lpszExeName), &ulBytesWritten);
    1185                 DosWrite(hFile, "\n", 2, &ulBytesWritten);
     1186                DosWrite(hFile, (PVOID)"\n", 2, &ulBytesWritten);
    11861187            }
    11871188        }
    … …  
    17911792 * Author    : Sander van Leeuwen [Sun, 1999/08/21 12:16]
    17921793 *****************************************************************************/
    1793 void OS2SetExceptionHandler(void *exceptframe)
     1794void SYSTEM OS2SetExceptionHandler(void *exceptframe)
    17941795{
    17951796 PEXCEPTIONREGISTRATIONRECORD pExceptRec = (PEXCEPTIONREGISTRATIONRECORD)exceptframe;
    … …  
    19541955 * Author    : Sander van Leeuwen [Sun, 1999/08/21 12:16]
    19551956 *****************************************************************************/
    1956 void OS2UnsetExceptionHandler(void *exceptframe)
     1957void SYSTEM OS2UnsetExceptionHandler(void *exceptframe)
    19571958{
    19581959 PEXCEPTIONREGISTRATIONRECORD pExceptRec = (PEXCEPTIONREGISTRATIONRECORD)exceptframe;
    … …  
    19861987//*****************************************************************************
    19871988
     1989} // extern "C"
     1990
Note: See TracChangeset for help on using the changeset viewer.