Correct signature of HitTest()

[wxWidgets.git] / src / common / debugrpt.cpp

diff --git a/src/common/debugrpt.cpp b/src/common/debugrpt.cpp
index ef86029ab8a29eb41f472db3d9d693caf8820db3..542715a0f06f8fa5cc0e0ecc221a79175d064941 100644 (file)
--- a/src/common/debugrpt.cpp
+++ b/src/common/debugrpt.cpp
@@ -27,12 +27,14 @@
     #include "wx/app.h"
     #include "wx/log.h"
     #include "wx/intl.h"
     #include "wx/app.h"
     #include "wx/log.h"
     #include "wx/intl.h"

+    #include "wx/utils.h"

 #endif // WX_PRECOMP
 
 #endif // WX_PRECOMP
 

-#if wxUSE_DEBUGREPORT
+#if wxUSE_DEBUGREPORT && wxUSE_XML

 
 #include "wx/debugrpt.h"
 
 
 #include "wx/debugrpt.h"
 

+#include "wx/ffile.h"

 #include "wx/filename.h"
 #include "wx/dir.h"
 #include "wx/dynlib.h"
 #include "wx/filename.h"
 #include "wx/dir.h"
 #include "wx/dynlib.h"


@@ -52,12 +54,14 @@
     #include "wx/zipstrm.h"
 #endif // wxUSE_ZIPSTREAM
 
     #include "wx/zipstrm.h"
 #endif // wxUSE_ZIPSTREAM
 

-#if wxUSE_STACKWALKER
+WX_CHECK_BUILD_OPTIONS("wxQA")

 
 // ----------------------------------------------------------------------------
 // XmlStackWalker: stack walker specialization which dumps stack in XML
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // XmlStackWalker: stack walker specialization which dumps stack in XML
 // ----------------------------------------------------------------------------
 

+#if wxUSE_STACKWALKER
+

 class XmlStackWalker : public wxStackWalker
 {
 public:
 class XmlStackWalker : public wxStackWalker
 {
 public:


@@ -76,8 +80,6 @@ protected:
     bool m_isOk;
 };
 
     bool m_isOk;
 };
 

-#endif // wxUSE_STACKWALKER
-

 // ----------------------------------------------------------------------------
 // local functions
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // local functions
 // ----------------------------------------------------------------------------


@@ -85,13 +87,13 @@ protected:
 static inline void
 HexProperty(wxXmlNode *node, const wxChar *name, unsigned long value)
 {
 static inline void
 HexProperty(wxXmlNode *node, const wxChar *name, unsigned long value)
 {

-    node->AddProperty(name, wxString::Format(_T("%08lx"), value));
+    node->AddAttribute(name, wxString::Format(_T("%08lx"), value));

 }
 
 static inline void
 NumProperty(wxXmlNode *node, const wxChar *name, unsigned long value)
 {
 }
 
 static inline void
 NumProperty(wxXmlNode *node, const wxChar *name, unsigned long value)
 {

-    node->AddProperty(name, wxString::Format(_T("%lu"), value));
+    node->AddAttribute(name, wxString::Format(_T("%lu"), value));

 }
 
 static inline void
 }
 
 static inline void


@@ -99,16 +101,18 @@ TextElement(wxXmlNode *node, const wxChar *name, const wxString& value)
 {
     wxXmlNode *nodeChild = new wxXmlNode(wxXML_ELEMENT_NODE, name);
     node->AddChild(nodeChild);
 {
     wxXmlNode *nodeChild = new wxXmlNode(wxXML_ELEMENT_NODE, name);
     node->AddChild(nodeChild);

-    nodeChild->AddChild(new wxXmlNode(wxXML_TEXT_NODE, _T(""), value));
+    nodeChild->AddChild(new wxXmlNode(wxXML_TEXT_NODE, wxEmptyString, value));

 }
 
 }
 

+#if wxUSE_CRASHREPORT && defined(__INTEL__)
+

 static inline void
 HexElement(wxXmlNode *node, const wxChar *name, unsigned long value)
 {
     TextElement(node, name, wxString::Format(_T("%08lx"), value));
 }
 
 static inline void
 HexElement(wxXmlNode *node, const wxChar *name, unsigned long value)
 {
     TextElement(node, name, wxString::Format(_T("%08lx"), value));
 }
 

-#if wxUSE_STACKWALKER
+#endif // wxUSE_CRASHREPORT

 
 // ============================================================================
 // XmlStackWalker implementation
 
 // ============================================================================
 // XmlStackWalker implementation


@@ -125,13 +129,13 @@ void XmlStackWalker::OnStackFrame(const wxStackFrame& frame)
     wxString func = frame.GetName();
     if ( !func.empty() )
     {
     wxString func = frame.GetName();
     if ( !func.empty() )
     {

-        nodeFrame->AddProperty(_T("function"), func);
+        nodeFrame->AddAttribute(_T("function"), func);

         HexProperty(nodeFrame, _T("offset"), frame.GetOffset());
     }
 
     if ( frame.HasSourceLocation() )
     {
         HexProperty(nodeFrame, _T("offset"), frame.GetOffset());
     }
 
     if ( frame.HasSourceLocation() )
     {

-        nodeFrame->AddProperty(_T("file"), frame.GetFileName());
+        nodeFrame->AddAttribute(_T("file"), frame.GetFileName());

         NumProperty(nodeFrame, _T("line"), frame.GetLine());
     }
 
         NumProperty(nodeFrame, _T("line"), frame.GetLine());
     }
 


@@ -178,7 +182,7 @@ void XmlStackWalker::OnStackFrame(const wxStackFrame& frame)
 wxDebugReport::wxDebugReport()
 {
     // get a temporary directory name
 wxDebugReport::wxDebugReport()
 {
     // get a temporary directory name

-    wxString appname(wxTheApp ? wxTheApp->GetAppName() : _T("wx"));
+    wxString appname = GetReportName();

 
     // we can't use CreateTempFileName() because it creates a file, not a
     // directory, so do our best to create a unique name ourselves
 
     // we can't use CreateTempFileName() because it creates a file, not a
     // directory, so do our best to create a unique name ourselves


@@ -186,10 +190,16 @@ wxDebugReport::wxDebugReport()
     // of course, this doesn't protect us against malicious users...
     wxFileName fn;
     fn.AssignTempFileName(appname);
     // of course, this doesn't protect us against malicious users...
     wxFileName fn;
     fn.AssignTempFileName(appname);

+#if wxUSE_DATETIME

     m_dir.Printf(_T("%s%c%s_dbgrpt-%lu-%s"),
                  fn.GetPath().c_str(), wxFILE_SEP_PATH, appname.c_str(),
                  wxGetProcessId(),
                  wxDateTime::Now().Format(_T("%Y%m%dT%H%M%S")).c_str());
     m_dir.Printf(_T("%s%c%s_dbgrpt-%lu-%s"),
                  fn.GetPath().c_str(), wxFILE_SEP_PATH, appname.c_str(),
                  wxGetProcessId(),
                  wxDateTime::Now().Format(_T("%Y%m%dT%H%M%S")).c_str());

+#else
+    m_dir.Printf(_T("%s%c%s_dbgrpt-%lu"),
+                 fn.GetPath().c_str(), wxFILE_SEP_PATH, appname.c_str(),
+                 wxGetProcessId());
+#endif

 
     // as we are going to save the process state there use restrictive
     // permissions
 
     // as we are going to save the process state there use restrictive
     // permissions


@@ -223,7 +233,12 @@ wxDebugReport::~wxDebugReport()
 
     if ( !m_dir.empty() )
     {
 
     if ( !m_dir.empty() )
     {

-        if ( wxRmDir(m_dir) != 0 )
+        // Temp fix: what should this be? eVC++ doesn't like wxRmDir
+#ifdef __WXWINCE__
+        if ( wxRmdir(m_dir.fn_str()) != 0 )
+#else
+        if ( wxRmDir(m_dir.fn_str()) != 0 )
+#endif

         {
             wxLogSysError(_("Failed to clean up debug report directory \"%s\""),
                           m_dir.c_str());
         {
             wxLogSysError(_("Failed to clean up debug report directory \"%s\""),
                           m_dir.c_str());


@@ -237,15 +252,55 @@ wxDebugReport::~wxDebugReport()
 
 wxString wxDebugReport::GetReportName() const
 {
 
 wxString wxDebugReport::GetReportName() const
 {

-    return wxString(wxTheApp ? wxTheApp->GetAppName() : _T("wx"));
+    if(wxTheApp)
+        return wxTheApp->GetAppName();
+
+    return _T("wx");

 }
 
 }
 

-void wxDebugReport::AddFile(const wxString& name, const wxString& description)
+void
+wxDebugReport::AddFile(const wxString& filename, const wxString& description)

 {
 {

+    wxString name;
+    wxFileName fn(filename);
+    if ( fn.IsAbsolute() )
+    {
+        // we need to copy the file to the debug report directory: give it the
+        // same name there
+        name = fn.GetFullName();
+        wxCopyFile(fn.GetFullPath(),
+                   wxFileName(GetDirectory(), name).GetFullPath());
+    }
+    else // file relative to the report directory
+    {
+        name = filename;
+
+        wxASSERT_MSG( wxFileName(GetDirectory(), name).FileExists(),
+                      _T("file should exist in debug report directory") );
+    }
+

     m_files.Add(name);
     m_descriptions.Add(description);
 }
 
     m_files.Add(name);
     m_descriptions.Add(description);
 }
 

+bool
+wxDebugReport::AddText(const wxString& filename,
+                       const wxString& text,
+                       const wxString& description)
+{
+    wxASSERT_MSG( !wxFileName(filename).IsAbsolute(),
+                  _T("filename should be relative to debug report directory") );
+
+    wxFileName fn(GetDirectory(), filename);
+    wxFFile file(fn.GetFullPath(), _T("w"));
+    if ( !file.IsOpened() || !file.Write(text) )
+        return false;
+
+    AddFile(filename, description);
+
+    return true;
+}
+

 void wxDebugReport::RemoveFile(const wxString& name)
 {
     const int n = m_files.Index(name);
 void wxDebugReport::RemoveFile(const wxString& name)
 {
     const int n = m_files.Index(name);


@@ -279,6 +334,10 @@ void wxDebugReport::AddAll(Context context)
 #if wxUSE_CRASHREPORT
     AddDump(context);
 #endif // wxUSE_CRASHREPORT
 #if wxUSE_CRASHREPORT
     AddDump(context);
 #endif // wxUSE_CRASHREPORT

+
+#if !wxUSE_STACKWALKER && !wxUSE_CRASHREPORT
+    wxUnusedVar(context);
+#endif

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -289,7 +348,7 @@ void wxDebugReport::AddAll(Context context)
 
 bool wxDebugReport::DoAddSystemInfo(wxXmlNode *nodeSystemInfo)
 {
 
 bool wxDebugReport::DoAddSystemInfo(wxXmlNode *nodeSystemInfo)
 {

-    nodeSystemInfo->AddProperty(_T("description"), wxGetOsDescription());
+    nodeSystemInfo->AddAttribute(_T("description"), wxGetOsDescription());

 
     return true;
 }
 
     return true;
 }


@@ -312,20 +371,20 @@ bool wxDebugReport::DoAddLoadedModules(wxXmlNode *nodeModules)
         if ( path.empty() )
             path = info.GetName();
         if ( !path.empty() )
         if ( path.empty() )
             path = info.GetName();
         if ( !path.empty() )

-            nodeModule->AddProperty(_T("path"), path);
+            nodeModule->AddAttribute(_T("path"), path);

 
 

-        void *addr;
-        size_t len;
+        void *addr = NULL;
+        size_t len = 0;

         if ( info.GetAddress(&addr, &len) )
         {
         if ( info.GetAddress(&addr, &len) )
         {

-            HexProperty(nodeModule, _T("address"), (unsigned long)addr);
+            HexProperty(nodeModule, _T("address"), wxPtrToUInt(addr));

             HexProperty(nodeModule, _T("size"), len);
         }
 
         wxString ver = info.GetVersion();
         if ( !ver.empty() )
         {
             HexProperty(nodeModule, _T("size"), len);
         }
 
         wxString ver = info.GetVersion();
         if ( !ver.empty() )
         {

-            nodeModule->AddProperty(_T("version"), ver);
+            nodeModule->AddAttribute(_T("version"), ver);

         }
     }
 
         }
     }
 


@@ -343,8 +402,8 @@ bool wxDebugReport::DoAddExceptionInfo(wxXmlNode *nodeContext)
     nodeContext->AddChild(nodeExc);
 
     HexProperty(nodeExc, _T("code"), c.code);
     nodeContext->AddChild(nodeExc);
 
     HexProperty(nodeExc, _T("code"), c.code);

-    nodeExc->AddProperty(_T("name"), c.GetExceptionString());
-    HexProperty(nodeExc, _T("address"), (unsigned long)c.addr);
+    nodeExc->AddAttribute(_T("name"), c.GetExceptionString());
+    HexProperty(nodeExc, _T("address"), wxPtrToUInt(c.addr));

 
 #ifdef __INTEL__
     wxXmlNode *nodeRegs = new wxXmlNode(wxXML_ELEMENT_NODE, _T("registers"));
 
 #ifdef __INTEL__
     wxXmlNode *nodeRegs = new wxXmlNode(wxXML_ELEMENT_NODE, _T("registers"));


@@ -386,9 +445,9 @@ bool wxDebugReport::AddContext(wxDebugReport::Context ctx)
     wxXmlDocument xmldoc;
     wxXmlNode *nodeRoot = new wxXmlNode(wxXML_ELEMENT_NODE, _T("report"));
     xmldoc.SetRoot(nodeRoot);
     wxXmlDocument xmldoc;
     wxXmlNode *nodeRoot = new wxXmlNode(wxXML_ELEMENT_NODE, _T("report"));
     xmldoc.SetRoot(nodeRoot);

-    nodeRoot->AddProperty(_T("version"), _T("1.0"));
-    nodeRoot->AddProperty(_T("kind"), ctx == Context_Curent ? _T("user")
-                                                            : _T("exception"));
+    nodeRoot->AddAttribute(_T("version"), _T("1.0"));
+    nodeRoot->AddAttribute(_T("kind"), ctx == Context_Current ? _T("user")
+                                                             : _T("exception"));

 
     // add system information
     wxXmlNode *nodeSystemInfo = new wxXmlNode(wxXML_ELEMENT_NODE, _T("system"));
 
     // add system information
     wxXmlNode *nodeSystemInfo = new wxXmlNode(wxXML_ELEMENT_NODE, _T("system"));


@@ -423,7 +482,7 @@ bool wxDebugReport::AddContext(wxDebugReport::Context ctx)
     {
         sw.WalkFromException();
     }
     {
         sw.WalkFromException();
     }

-    else // Context_Curent
+    else // Context_Current

     {
         sw.Walk();
     }
     {
         sw.Walk();
     }


@@ -503,10 +562,10 @@ bool wxDebugReport::Process()
 
 bool wxDebugReport::DoProcess()
 {
 
 bool wxDebugReport::DoProcess()
 {

-    wxString msg = _("*** A debug report has been generated\n");
-    msg += wxString::Format(_("*** It can be found in \"%s\"\n"),
-                            GetDirectory().c_str());
-    msg += _("*** And includes the following files:\n");
+    wxString msg(_("A debug report has been generated. It can be found in"));
+    msg << _T("\n")
+           _T("\t") << GetDirectory() << _T("\n\n")
+        << _("And includes the following files:\n");

 
     wxString name, desc;
     const size_t count = GetFilesCount();
 
     wxString name, desc;
     const size_t count = GetFilesCount();


@@ -560,7 +619,8 @@ bool wxDebugReportCompress::DoProcess()
         if ( !zos.PutNextEntry(ze) )
             return false;
 
         if ( !zos.PutNextEntry(ze) )
             return false;
 

-        wxFFileInputStream is(wxFileName(fn.GetPath(), name).GetFullPath());
+        wxFileName filename(fn.GetPath(), name);
+        wxFFileInputStream is(filename.GetFullPath());

         if ( !is.IsOk() || !zos.Write(is).IsOk() )
             return false;
     }
         if ( !is.IsOk() || !zos.Write(is).IsOk() )
             return false;
     }


@@ -599,7 +659,7 @@ bool wxDebugReportUpload::DoProcess()
     wxArrayString output, errors;
     int rc = wxExecute(wxString::Format
                        (
     wxArrayString output, errors;
     int rc = wxExecute(wxString::Format
                        (

-                            _T("%s -F %s=@%s %s"),
+                            _T("%s -F %s=@\"%s\" %s"),

                             m_curlCmd.c_str(),
                             m_inputField.c_str(),
                             GetCompressedFileName().c_str(),
                             m_curlCmd.c_str(),
                             m_inputField.c_str(),
                             GetCompressedFileName().c_str(),


@@ -636,4 +696,3 @@ bool wxDebugReportUpload::DoProcess()
 #endif // wxUSE_ZIPSTREAM
 
 #endif // wxUSE_DEBUGREPORT
 #endif // wxUSE_ZIPSTREAM
 
 #endif // wxUSE_DEBUGREPORT

-