]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/log.cpp
added missing WXDLLEXPORT
[wxWidgets.git] / src / common / log.cpp
index be03d3c4c8b3a9e12f476e81d01dc663801b6cb9..ca6e355e28afbea2a590074f35e4764e6d6706d7 100644 (file)
@@ -36,6 +36,7 @@
 
     #if wxUSE_GUI
         #include "wx/window.h"
+        #include "wx/msgdlg.h"
         #ifdef __WXMSW__
             #include "wx/msw/private.h"
         #endif
   #include  "wx/msw/private.h"      // includes windows.h for OutputDebugString
 #endif
 
+#if defined(__WXMAC__)
+  #include  "wx/mac/private.h"  // includes mac headers
+#endif
+
 // ----------------------------------------------------------------------------
 // non member functions
 // ----------------------------------------------------------------------------
@@ -107,78 +112,118 @@ static inline bool IsLoggingEnabled()
 // ----------------------------------------------------------------------------
 
 // generic log function
-void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
+void wxVLogGeneric(wxLogLevel level, const wxChar *szFormat, va_list argptr)
 {
     if ( IsLoggingEnabled() ) {
         wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 
-        va_list argptr;
-        va_start(argptr, szFormat);
         wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
-        va_end(argptr);
 
         wxLog::OnLog(level, s_szBuf, time(NULL));
     }
 }
 
+void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
+{
+    va_list argptr;
+    va_start(argptr, szFormat);
+    wxVLogGeneric(level, szFormat, argptr);
+    va_end(argptr);
+}
+
 #define IMPLEMENT_LOG_FUNCTION(level)                               \
-  void wxLog##level(const wxChar *szFormat, ...)                    \
+  void wxVLog##level(const wxChar *szFormat, va_list argptr)        \
   {                                                                 \
     if ( IsLoggingEnabled() ) {                                     \
       wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);                      \
                                                                     \
-      va_list argptr;                                               \
-      va_start(argptr, szFormat);                                   \
       wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);    \
-      va_end(argptr);                                               \
                                                                     \
       wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL));             \
     }                                                               \
+  }                                                                 \
+  void wxLog##level(const wxChar *szFormat, ...)                    \
+  {                                                                 \
+    va_list argptr;                                                 \
+    va_start(argptr, szFormat);                                     \
+    wxVLog##level(szFormat, argptr);                                \
+    va_end(argptr);                                                 \
   }
 
-IMPLEMENT_LOG_FUNCTION(FatalError)
 IMPLEMENT_LOG_FUNCTION(Error)
 IMPLEMENT_LOG_FUNCTION(Warning)
 IMPLEMENT_LOG_FUNCTION(Message)
 IMPLEMENT_LOG_FUNCTION(Info)
 IMPLEMENT_LOG_FUNCTION(Status)
 
+// fatal errors can't be suppressed nor handled by the custom log target and
+// always terminate the program
+void wxVLogFatalError(const wxChar *szFormat, va_list argptr)
+{
+    wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
+
+#if wxUSE_GUI
+    wxMessageBox(s_szBuf, _("Fatal Error"), wxID_OK | wxICON_STOP);
+#else
+    fprintf(stderr, _("Fatal error: %s\n"), s_szBuf);
+#endif
+
+    abort();
+}
+
+void wxLogFatalError(const wxChar *szFormat, ...)
+{
+    va_list argptr;
+    va_start(argptr, szFormat);
+    wxVLogFatalError(szFormat, argptr);
+    va_end(argptr);
+}
+
 // same as info, but only if 'verbose' mode is on
-void wxLogVerbose(const wxChar *szFormat, ...)
+void wxVLogVerbose(const wxChar *szFormat, va_list argptr)
 {
     if ( IsLoggingEnabled() ) {
         wxLog *pLog = wxLog::GetActiveTarget();
         if ( pLog != NULL && pLog->GetVerbose() ) {
             wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 
-            va_list argptr;
-            va_start(argptr, szFormat);
             wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
-            va_end(argptr);
 
             wxLog::OnLog(wxLOG_Info, s_szBuf, time(NULL));
         }
     }
 }
 
+void wxLogVerbose(const wxChar *szFormat, ...)
+{
+    va_list argptr;
+    va_start(argptr, szFormat);
+    wxVLogVerbose(szFormat, argptr);
+    va_end(argptr);
+}
+
 // debug functions
 #ifdef __WXDEBUG__
 #define IMPLEMENT_LOG_DEBUG_FUNCTION(level)                         \
-  void wxLog##level(const wxChar *szFormat, ...)                    \
+  void wxVLog##level(const wxChar *szFormat, va_list argptr)        \
   {                                                                 \
     if ( IsLoggingEnabled() ) {                                     \
       wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);                      \
                                                                     \
-      va_list argptr;                                               \
-      va_start(argptr, szFormat);                                   \
       wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);    \
-      va_end(argptr);                                               \
                                                                     \
       wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL));             \
     }                                                               \
+  }                                                                 \
+  void wxLog##level(const wxChar *szFormat, ...)                    \
+  {                                                                 \
+    va_list argptr;                                                 \
+    va_start(argptr, szFormat);                                     \
+    wxVLog##level(szFormat, argptr);                                \
+    va_end(argptr);                                                 \
   }
 
-  void wxLogTrace(const wxChar *mask, const wxChar *szFormat, ...)
+  void wxVLogTrace(const wxChar *mask, const wxChar *szFormat, va_list argptr)
   {
     if ( IsLoggingEnabled() && wxLog::IsAllowedTraceMask(mask) ) {
       wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
@@ -197,16 +242,21 @@ void wxLogVerbose(const wxChar *szFormat, ...)
       len -= 2;
       p += 2;
 
-      va_list argptr;
-      va_start(argptr, szFormat);
       wxVsnprintf(p, len, szFormat, argptr);
-      va_end(argptr);
-
+      
       wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
     }
   }
 
-  void wxLogTrace(wxTraceMask mask, const wxChar *szFormat, ...)
+  void wxLogTrace(const wxChar *mask, const wxChar *szFormat, ...)
+  {
+    va_list argptr;
+    va_start(argptr, szFormat);
+    wxVLogTrace(mask, szFormat, argptr);
+    va_end(argptr);
+  }
+
+  void wxVLogTrace(wxTraceMask mask, const wxChar *szFormat, va_list argptr)
   {
     // we check that all of mask bits are set in the current mask, so
     // that wxLogTrace(wxTraceRefCount | wxTraceOle) will only do something
@@ -214,15 +264,20 @@ void wxLogVerbose(const wxChar *szFormat, ...)
     if ( IsLoggingEnabled() && ((wxLog::GetTraceMask() & mask) == mask) ) {
       wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 
-      va_list argptr;
-      va_start(argptr, szFormat);
       wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
-      va_end(argptr);
 
       wxLog::OnLog(wxLOG_Trace, s_szBuf, time(NULL));
     }
   }
 
+  void wxLogTrace(wxTraceMask mask, const wxChar *szFormat, ...)
+  {
+    va_list argptr;
+    va_start(argptr, szFormat);
+    wxVLogTrace(mask, szFormat, argptr);
+    va_end(argptr);
+  }
+
 #else // release
   #define IMPLEMENT_LOG_DEBUG_FUNCTION(level)
 #endif
@@ -244,34 +299,44 @@ void wxLogSysErrorHelper(long lErrCode)
     wxLog::OnLog(wxLOG_Error, s_szBuf, time(NULL));
 }
 
-void WXDLLEXPORT wxLogSysError(const wxChar *szFormat, ...)
+void WXDLLEXPORT wxVLogSysError(const wxChar *szFormat, va_list argptr)
 {
     if ( IsLoggingEnabled() ) {
         wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 
-        va_list argptr;
-        va_start(argptr, szFormat);
         wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
-        va_end(argptr);
 
         wxLogSysErrorHelper(wxSysErrorCode());
     }
 }
 
-void WXDLLEXPORT wxLogSysError(long lErrCode, const wxChar *szFormat, ...)
+void WXDLLEXPORT wxLogSysError(const wxChar *szFormat, ...)
+{
+    va_list argptr;
+    va_start(argptr, szFormat);
+    wxVLogSysError(szFormat, argptr);
+    va_end(argptr);
+}
+
+void WXDLLEXPORT wxVLogSysError(long lErrCode, const wxChar *szFormat, va_list argptr)
 {
     if ( IsLoggingEnabled() ) {
         wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 
-        va_list argptr;
-        va_start(argptr, szFormat);
         wxVsnprintf(s_szBuf, WXSIZEOF(s_szBuf), szFormat, argptr);
-        va_end(argptr);
 
         wxLogSysErrorHelper(lErrCode);
     }
 }
 
+void WXDLLEXPORT wxLogSysError(long lErrCode, const wxChar *szFormat, ...)
+{
+    va_list argptr;
+    va_start(argptr, szFormat);
+    wxVLogSysError(lErrCode, szFormat, argptr);
+    va_end(argptr);
+}
+
 // ----------------------------------------------------------------------------
 // wxLog class implementation
 // ----------------------------------------------------------------------------
@@ -418,86 +483,196 @@ wxLogStderr::wxLogStderr(FILE *fp)
         m_fp = fp;
 }
 
-#if defined(__WXMAC__) && !defined(__DARWIN__)
-#define kDebuggerSignature        'MWDB'
+#if defined(__WXMAC__) && !defined(__DARWIN__) && (__MWERKS__ > 0x5300)
 
-static Boolean FindProcessBySignature(OSType signature, ProcessInfoRec* info)
-{
-    OSErr err;
-    ProcessSerialNumber psn;
-    Boolean found = false;
-    psn.highLongOfPSN = 0;
-    psn.lowLongOfPSN = kNoProcess;
+#if !TARGET_API_MAC_CARBON
+// MetroNub stuff doesn't seem to work in CodeWarrior 5.3 Carbon builds...
+
+#ifndef __MetroNubUtils__
+#include "MetroNubUtils.h"
+#endif
 
-    if (!info) return false;
+#ifdef __cplusplus
+       extern "C" {
+#endif
 
-    info->processInfoLength = sizeof(ProcessInfoRec);
-    info->processName = NULL;
-    info->processAppSpec = NULL;
+#ifndef __GESTALT__
+#include <Gestalt.h>
+#endif
 
-    err = noErr;
-    while (!found && err == noErr)
-    {
-        err = GetNextProcess(&psn);
-        if (err == noErr)
-        {
-            err = GetProcessInformation(&psn, info);
-            found = err == noErr && info->processSignature == signature;
-        }
-    }
-    return found;
-}
+#ifndef true
+#define true 1
+#endif
+
+#ifndef false
+#define false 0
+#endif
+
+#if TARGET_API_MAC_CARBON
+
+       #include <CodeFragments.h>
+
+       EXTERN_API_C( long )
+       CallUniversalProc(UniversalProcPtr theProcPtr, ProcInfoType procInfo, ...);
 
-pascal Boolean MWDebuggerIsRunning(void)
+       ProcPtr gCallUniversalProc_Proc = NULL;
+       
+#endif
+
+static MetroNubUserEntryBlock* gMetroNubEntry = NULL;
+
+static long fRunOnce = false;
+
+Boolean IsCompatibleVersion(short inVersion);
+
+/* ---------------------------------------------------------------------------
+               IsCompatibleVersion
+   --------------------------------------------------------------------------- */
+
+Boolean IsCompatibleVersion(short inVersion)
 {
-    ProcessInfoRec info;
-    return FindProcessBySignature(kDebuggerSignature, &info);
+       Boolean result = false;
+       
+       if (fRunOnce)
+       {
+               MetroNubUserEntryBlock* block = (MetroNubUserEntryBlock *)result;
+               
+               result = (inVersion <= block->apiHiVersion);
+       }
+       
+       return result;  
 }
 
-pascal OSErr AmIBeingMWDebugged(Boolean* result)
+/* ---------------------------------------------------------------------------
+               IsMetroNubInstalled
+   --------------------------------------------------------------------------- */
+
+Boolean IsMetroNubInstalled()
 {
-    OSErr err;
-    ProcessSerialNumber psn;
-    OSType sig = kDebuggerSignature;
-    AppleEvent    theAE = {typeNull, NULL};
-    AppleEvent    theReply = {typeNull, NULL};
-    AEAddressDesc addr  = {typeNull, NULL};
-    DescType actualType;
-    Size actualSize;
+       if (!fRunOnce)
+       {
+               long result, value;
+               
+               fRunOnce = true;
+               gMetroNubEntry = NULL;
+               
+               if (Gestalt(gestaltSystemVersion, &value) == noErr && value < 0x1000)
+               {
+                       /* look for MetroNub's Gestalt selector */
+                       if (Gestalt(kMetroNubUserSignature, &result) == noErr)
+                       {
+                       
+                       #if TARGET_API_MAC_CARBON
+                               if (gCallUniversalProc_Proc == NULL)
+                               {
+                                       CFragConnectionID       connectionID;
+                                       Ptr                                     mainAddress;
+                                       Str255                          errorString;
+                                       ProcPtr                         symbolAddress;
+                                       OSErr                           err;
+                                       CFragSymbolClass        symbolClass;
+                                       
+                                       symbolAddress = NULL;
+                                       err = GetSharedLibrary("\pInterfaceLib", kPowerPCCFragArch, kFindCFrag,
+                                                                                       &connectionID, &mainAddress, errorString);
+                                       
+                                       if (err != noErr)
+                                       {
+                                               gCallUniversalProc_Proc = NULL;
+                                               goto end;
+                                       }
+
+                                       err = FindSymbol(connectionID, "\pCallUniversalProc",
+                                                                       (Ptr *) &gCallUniversalProc_Proc, &symbolClass);
+                                       
+                                       if (err != noErr)
+                                       {
+                                               gCallUniversalProc_Proc = NULL;
+                                               goto end;
+                                       }
+                               }
+                       #endif
+                       
+                               {
+                                       MetroNubUserEntryBlock* block = (MetroNubUserEntryBlock *)result;
+                                       
+                                       /* make sure the version of the API is compatible */
+                                       if (block->apiLowVersion <= kMetroNubUserAPIVersion &&
+                                               kMetroNubUserAPIVersion <= block->apiHiVersion)
+                                               gMetroNubEntry = block;         /* success! */
+                               }
+
+                       }
+               }
+       }
+
+end:
+
+#if TARGET_API_MAC_CARBON
+       return (gMetroNubEntry != NULL && gCallUniversalProc_Proc != NULL);
+#else
+       return (gMetroNubEntry != NULL);
+#endif
+}
 
-    if (!result) return paramErr;
+/* ---------------------------------------------------------------------------
+               IsMWDebuggerRunning                                                                                     [v1 API]
+   --------------------------------------------------------------------------- */
 
-    err = AECreateDesc(typeApplSignature, &sig, sizeof(sig), &addr);
-    if (err != noErr) goto exit;
+Boolean IsMWDebuggerRunning()
+{
+       if (IsMetroNubInstalled())
+               return CallIsDebuggerRunningProc(gMetroNubEntry->isDebuggerRunning);
+       else
+               return false;
+}
 
-    err = AECreateAppleEvent(kDebuggerSignature, 'Dbg?', &addr,
-                kAutoGenerateReturnID, kAnyTransactionID, &theAE);
-    if (err != noErr) goto exit;
+/* ---------------------------------------------------------------------------
+               AmIBeingMWDebugged                                                                                      [v1 API]
+   --------------------------------------------------------------------------- */
 
-    GetCurrentProcess(&psn);
-    err = AEPutParamPtr(&theAE, keyDirectObject, typeProcessSerialNumber,
-            &psn, sizeof(psn));
-    if (err != noErr) goto exit;
+Boolean AmIBeingMWDebugged()
+{
+       if (IsMetroNubInstalled())
+               return CallAmIBeingDebuggedProc(gMetroNubEntry->amIBeingDebugged);
+       else
+               return false;
+}
 
-    err = AESend(&theAE, &theReply, kAEWaitReply, kAENormalPriority,
-                    kAEDefaultTimeout, NULL, NULL);
-    if (err != noErr) goto exit;
+/* ---------------------------------------------------------------------------
+               UserSetWatchPoint                                                                                       [v2 API]
+   --------------------------------------------------------------------------- */
 
-    err = AEGetParamPtr(&theReply, keyAEResult, typeBoolean, &actualType, result,
-                sizeof(Boolean), &actualSize);
+OSErr UserSetWatchPoint (Ptr address, long length, WatchPointIDT* watchPointID)
+{
+       if (IsMetroNubInstalled() && IsCompatibleVersion(kMetroNubUserAPIVersion))
+               return CallUserSetWatchPointProc(gMetroNubEntry->userSetWatchPoint,
+                                                                                       address, length, watchPointID);
+       else
+               return errProcessIsNotClient;
+}
 
-exit:
-    if (addr.dataHandle)
-        AEDisposeDesc(&addr);
-    if (theAE.dataHandle)
-        AEDisposeDesc(&theAE);
-    if (theReply.dataHandle)
-        AEDisposeDesc(&theReply);
+/* ---------------------------------------------------------------------------
+               ClearWatchPoint                                                                                         [v2 API]
+   --------------------------------------------------------------------------- */
 
-    return err;
+OSErr ClearWatchPoint (WatchPointIDT watchPointID)
+{
+       if (IsMetroNubInstalled() && IsCompatibleVersion(kMetroNubUserAPIVersion))
+               return CallClearWatchPointProc(gMetroNubEntry->clearWatchPoint,
+                                                                                       watchPointID);
+       else
+               return errProcessIsNotClient;
 }
+
+#ifdef __cplusplus
+       }
 #endif
 
+#endif // !TARGET_API_MAC_CARBON
+
+#endif // defined(__WXMAC__) && !defined(__DARWIN__) && (__MWERKS__ > 0x5300)
+
 void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 {
     wxString str;
@@ -519,30 +694,24 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
     strcpy( (char*) pstr , str.c_str() ) ;
     strcat( (char*) pstr , ";g" ) ;
     c2pstr( (char*) pstr ) ;
-#if __WXDEBUG__
+
     Boolean running = false ;
 
-/*
-    if ( MWDebuggerIsRunning() )
+#if !TARGET_API_MAC_CARBON && (__MWERKS__ > 0x5300)
+
+    if ( IsMWDebuggerRunning() && AmIBeingMWDebugged() )
     {
-        AmIBeingMWDebugged( &running ) ;
+        running = true ;
     }
-*/
+
+#endif
+
     if (running)
     {
 #ifdef __powerc
         DebugStr(pstr);
 #else
         SysBreakStr(pstr);
-#endif
-    }
-    else
-#endif
-    {
-#ifdef __powerc
-        DebugStr(pstr);
-#else
-        DebugStr(pstr);
 #endif
     }
 #endif // Mac
@@ -732,20 +901,23 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
             0, NULL);
 
     // copy it to our buffer and free memory
-    if( lpMsgBuf != 0 )
+    if( lpMsgBuf != 0 ) {
         wxStrncpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
-    else
+        s_szBuf[WXSIZEOF(s_szBuf) - 1] = wxT('\0');
+
+        LocalFree(lpMsgBuf);
+
+        // returned string is capitalized and ended with '\r\n' - bad
+        s_szBuf[0] = (wxChar)wxTolower(s_szBuf[0]);
+        size_t len = wxStrlen(s_szBuf);
+        if ( len > 0 ) {
+            // truncate string
+            if ( s_szBuf[len - 2] == wxT('\r') )
+                s_szBuf[len - 2] = wxT('\0');
+        }
+    }
+    else {
         s_szBuf[0] = wxT('\0');
-    s_szBuf[WXSIZEOF(s_szBuf) - 1] = wxT('\0');
-    LocalFree(lpMsgBuf);
-
-    // returned string is capitalized and ended with '\r\n' - bad
-    s_szBuf[0] = (wxChar)wxTolower(s_szBuf[0]);
-    size_t len = wxStrlen(s_szBuf);
-    if ( len > 0 ) {
-        // truncate string
-        if ( s_szBuf[len - 2] == wxT('\r') )
-            s_szBuf[len - 2] = wxT('\0');
     }
 
     return s_szBuf;