X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0c44ec973759a24442c3e97f3db7ad4fa5005928..77a1771911ed222ba6861ead327c3735fc16a0b1:/src/common/log.cpp?ds=sidebyside

diff --git a/src/common/log.cpp b/src/common/log.cpp
index 6d6bfde0bd..c17db339d9 100644
--- a/src/common/log.cpp
+++ b/src/common/log.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        log.cpp
+// Name:        src/common/log.cpp
 // Purpose:     Assorted wxLogXXX functions, and wxLog (sink for logs)
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "log.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -32,19 +28,19 @@
 
 // wxWidgets
 #ifndef WX_PRECOMP
+    #include "wx/log.h"
     #include "wx/app.h"
     #include "wx/arrstr.h"
     #include "wx/intl.h"
     #include "wx/string.h"
+    #include "wx/utils.h"
 #endif //WX_PRECOMP
 
 #include "wx/apptrait.h"
 #include "wx/file.h"
-#include "wx/log.h"
 #include "wx/msgout.h"
 #include "wx/textfile.h"
 #include "wx/thread.h"
-#include "wx/utils.h"
 #include "wx/wxchar.h"
 
 // other standard headers
@@ -100,12 +96,6 @@ static wxCriticalSection gs_csLogBuf;
 
 #endif // wxUSE_THREADS
 
-// return true if we have a non NULL non disabled log target
-static inline bool IsLoggingEnabled()
-{
-    return wxLog::IsEnabled() && (wxLog::GetActiveTarget() != NULL);
-}
-
 // ----------------------------------------------------------------------------
 // implementation of Log functions
 //
@@ -114,7 +104,7 @@ static inline bool IsLoggingEnabled()
 // ----------------------------------------------------------------------------
 
 // wrapper for wxVsnprintf(s_szBuf) which always NULL-terminates it
-static inline void PrintfInLogBug(const wxChar *szFormat, va_list argptr)
+static inline void PrintfInLogBuf(const wxChar *szFormat, va_list argptr)
 {
     if ( wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr) < 0 )
     {
@@ -127,10 +117,10 @@ static inline void PrintfInLogBug(const wxChar *szFormat, va_list argptr)
 // generic log function
 void wxVLogGeneric(wxLogLevel level, const wxChar *szFormat, va_list argptr)
 {
-    if ( IsLoggingEnabled() ) {
+    if ( wxLog::IsEnabled() ) {
         wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 
-        PrintfInLogBug(szFormat, argptr);
+        PrintfInLogBuf(szFormat, argptr);
 
         wxLog::OnLog(level, s_szBuf, time(NULL));
     }
@@ -147,10 +137,10 @@ void wxLogGeneric(wxLogLevel level, const wxChar *szFormat, ...)
 #define IMPLEMENT_LOG_FUNCTION(level)                               \
   void wxVLog##level(const wxChar *szFormat, va_list argptr)        \
   {                                                                 \
-    if ( IsLoggingEnabled() ) {                                     \
+    if ( wxLog::IsEnabled() ) {                                     \
       wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);                      \
                                                                     \
-      PrintfInLogBug(szFormat, argptr);                             \
+      PrintfInLogBuf(szFormat, argptr);                             \
                                                                     \
       wxLog::OnLog(wxLOG_##level, s_szBuf, time(NULL));             \
     }                                                               \
@@ -208,9 +198,8 @@ void wxLogFatalError(const wxChar *szFormat, ...)
 // same as info, but only if 'verbose' mode is on
 void wxVLogVerbose(const wxChar *szFormat, va_list argptr)
 {
-    if ( IsLoggingEnabled() ) {
-        wxLog *pLog = wxLog::GetActiveTarget();
-        if ( pLog != NULL && pLog->GetVerbose() ) {
+    if ( wxLog::IsEnabled() ) {
+        if ( wxLog::GetActiveTarget() != NULL && wxLog::GetVerbose() ) {
             wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 
             wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);
@@ -233,7 +222,7 @@ void wxLogVerbose(const wxChar *szFormat, ...)
 #define IMPLEMENT_LOG_DEBUG_FUNCTION(level)                         \
   void wxVLog##level(const wxChar *szFormat, va_list argptr)        \
   {                                                                 \
-    if ( IsLoggingEnabled() ) {                                     \
+    if ( wxLog::IsEnabled() ) {                                     \
       wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);                      \
                                                                     \
       wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);    \
@@ -251,7 +240,7 @@ void wxLogVerbose(const wxChar *szFormat, ...)
 
   void wxVLogTrace(const wxChar *mask, const wxChar *szFormat, va_list argptr)
   {
-    if ( IsLoggingEnabled() && wxLog::IsAllowedTraceMask(mask) ) {
+    if ( wxLog::IsEnabled() && wxLog::IsAllowedTraceMask(mask) ) {
       wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 
       wxChar *p = s_szBuf;
@@ -287,7 +276,7 @@ void wxLogVerbose(const wxChar *szFormat, ...)
     // we check that all of mask bits are set in the current mask, so
     // that wxLogTrace(wxTraceRefCount | wxTraceOle) will only do something
     // if both bits are set.
-    if ( IsLoggingEnabled() && ((wxLog::GetTraceMask() & mask) == mask) ) {
+    if ( wxLog::IsEnabled() && ((wxLog::GetTraceMask() & mask) == mask) ) {
       wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 
       wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);
@@ -327,7 +316,7 @@ void wxLogSysErrorHelper(long lErrCode)
 
 void WXDLLEXPORT wxVLogSysError(const wxChar *szFormat, va_list argptr)
 {
-    if ( IsLoggingEnabled() ) {
+    if ( wxLog::IsEnabled() ) {
         wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 
         wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);
@@ -346,7 +335,7 @@ void WXDLLEXPORT wxLogSysError(const wxChar *szFormat, ...)
 
 void WXDLLEXPORT wxVLogSysError(long lErrCode, const wxChar *szFormat, va_list argptr)
 {
-    if ( IsLoggingEnabled() ) {
+    if ( wxLog::IsEnabled() ) {
         wxCRIT_SECT_LOCKER(locker, gs_csLogBuf);
 
         wxVsnprintf(s_szBuf, s_szBufSize, szFormat, argptr);
@@ -367,10 +356,6 @@ void WXDLLEXPORT wxLogSysError(long lErrCode, const wxChar *szFormat, ...)
 // wxLog class implementation
 // ----------------------------------------------------------------------------
 
-wxLog::wxLog()
-{
-}
-
 wxChar *wxLog::SetLogBuffer( wxChar *buf, size_t size)
 {
     wxChar *oldbuf = s_szBuf;
@@ -527,6 +512,50 @@ void wxLog::Flush()
     return false;
 }
 
+// ----------------------------------------------------------------------------
+// wxLogBuffer implementation
+// ----------------------------------------------------------------------------
+
+void wxLogBuffer::Flush()
+{
+    if ( !m_str.empty() )
+    {
+        wxMessageOutputBest out;
+        out.Printf(_T("%s"), m_str.c_str());
+        m_str.clear();
+    }
+}
+
+void wxLogBuffer::DoLog(wxLogLevel level, const wxChar *szString, time_t t)
+{
+    switch ( level )
+    {
+        case wxLOG_Trace:
+        case wxLOG_Debug:
+#ifdef __WXDEBUG__
+            // don't put debug messages in the buffer, we don't want to show
+            // them to the user in a msg box, log them immediately
+            {
+                wxString str;
+                TimeStamp(&str);
+                str += szString;
+
+                wxMessageOutputDebug dbgout;
+                dbgout.Printf(_T("%s\n"), str.c_str());
+            }
+#endif // __WXDEBUG__
+            break;
+
+        default:
+            wxLog::DoLog(level, szString, t);
+    }
+}
+
+void wxLogBuffer::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
+{
+    m_str << szString << _T("\n");
+}
+
 // ----------------------------------------------------------------------------
 // wxLogStderr class implementation
 // ----------------------------------------------------------------------------
@@ -558,7 +587,8 @@ void wxLogStderr::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
         wxAppTraits *traits = wxTheApp ? wxTheApp->GetTraits() : NULL;
         if ( traits && !traits->HasStderr() )
         {
-            wxMessageOutputDebug().Printf(_T("%s"), str.c_str());
+            wxMessageOutputDebug dbgout;
+            dbgout.Printf(_T("%s\n"), str.c_str());
         }
     }
 }
@@ -581,7 +611,7 @@ void wxLogStream::DoLogString(const wxChar *szString, time_t WXUNUSED(t))
 {
     wxString str;
     TimeStamp(&str);
-    (*m_ostr) << str << wxConvertWX2MB(szString) << wxSTD endl;
+    (*m_ostr) << wxConvertWX2MB(str) << wxConvertWX2MB(szString) << wxSTD endl;
 }
 #endif // wxUSE_STD_IOSTREAM
 
@@ -741,16 +771,29 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
 
     // get error message from system
     LPVOID lpMsgBuf;
-    FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-            NULL, nErrCode,
+    if ( ::FormatMessage
+         (
+            FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+            NULL,
+            nErrCode,
             MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
             (LPTSTR)&lpMsgBuf,
-            0, NULL);
+            0,
+            NULL
+         ) == 0 )
+    {
+        // if this happens, something is seriously wrong, so don't use _() here
+        // for safety
+        wxSprintf(s_szBuf, _T("unknown error %lx"), nErrCode);
+        return s_szBuf;
+    }
+
 
     // copy it to our buffer and free memory
-    // Crashes on SmartPhone
+    // Crashes on SmartPhone (FIXME)
 #if !defined(__SMARTPHONE__) /* of WinCE */
-     if( lpMsgBuf != 0 ) {
+    if( lpMsgBuf != 0 )
+    {
         wxStrncpy(s_szBuf, (const wxChar *)lpMsgBuf, WXSIZEOF(s_szBuf) - 1);
         s_szBuf[WXSIZEOF(s_szBuf) - 1] = wxT('\0');
 
@@ -784,4 +827,3 @@ const wxChar *wxSysErrorMsg(unsigned long nErrCode)
 }
 
 #endif // wxUSE_LOG
-