X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b1d737b3e9413217302cde932cbc3af91d79024..eb5d9594dba44ee3bdec54dc085f74cfabcdf9b7:/src/common/debugrpt.cpp?ds=sidebyside

diff --git a/src/common/debugrpt.cpp b/src/common/debugrpt.cpp
index 96ccc60012..b52f6780b3 100644
--- a/src/common/debugrpt.cpp
+++ b/src/common/debugrpt.cpp
@@ -30,10 +30,11 @@
     #include "wx/utils.h"
 #endif // WX_PRECOMP
 
-#if wxUSE_DEBUGREPORT
+#if wxUSE_DEBUGREPORT && wxUSE_XML
 
 #include "wx/debugrpt.h"
 
+#include "wx/ffile.h"
 #include "wx/filename.h"
 #include "wx/dir.h"
 #include "wx/dynlib.h"
@@ -53,12 +54,14 @@
     #include "wx/zipstrm.h"
 #endif // wxUSE_ZIPSTREAM
 
-#if wxUSE_STACKWALKER
+WX_CHECK_BUILD_OPTIONS("wxQA")
 
 // ----------------------------------------------------------------------------
 // XmlStackWalker: stack walker specialization which dumps stack in XML
 // ----------------------------------------------------------------------------
 
+#if wxUSE_STACKWALKER
+
 class XmlStackWalker : public wxStackWalker
 {
 public:
@@ -77,8 +80,6 @@ protected:
     bool m_isOk;
 };
 
-#endif // wxUSE_STACKWALKER
-
 // ----------------------------------------------------------------------------
 // local functions
 // ----------------------------------------------------------------------------
@@ -100,16 +101,18 @@ TextElement(wxXmlNode *node, const wxChar *name, const wxString& value)
 {
     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));
 }
 
-#if wxUSE_STACKWALKER
+#endif // wxUSE_CRASHREPORT
 
 // ============================================================================
 // XmlStackWalker implementation
@@ -224,7 +227,12 @@ wxDebugReport::~wxDebugReport()
 
     if ( !m_dir.empty() )
     {
+        // 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());
@@ -244,12 +252,49 @@ wxString wxDebugReport::GetReportName() const
     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);
 }
 
+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);
@@ -322,11 +367,11 @@ bool wxDebugReport::DoAddLoadedModules(wxXmlNode *nodeModules)
         if ( !path.empty() )
             nodeModule->AddProperty(_T("path"), path);
 
-        void *addr;
-        size_t len;
+        void *addr = NULL;
+        size_t len = 0;
         if ( info.GetAddress(&addr, &len) )
         {
-            HexProperty(nodeModule, _T("address"), (unsigned long)addr);
+            HexProperty(nodeModule, _T("address"), wxPtrToUInt(addr));
             HexProperty(nodeModule, _T("size"), len);
         }
 
@@ -352,7 +397,7 @@ bool wxDebugReport::DoAddExceptionInfo(wxXmlNode *nodeContext)
 
     HexProperty(nodeExc, _T("code"), c.code);
     nodeExc->AddProperty(_T("name"), c.GetExceptionString());
-    HexProperty(nodeExc, _T("address"), (unsigned long)c.addr);
+    HexProperty(nodeExc, _T("address"), wxPtrToUInt(c.addr));
 
 #ifdef __INTEL__
     wxXmlNode *nodeRegs = new wxXmlNode(wxXML_ELEMENT_NODE, _T("registers"));
@@ -395,8 +440,8 @@ bool wxDebugReport::AddContext(wxDebugReport::Context ctx)
     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->AddProperty(_T("kind"), ctx == Context_Current ? _T("user")
+                                                             : _T("exception"));
 
     // add system information
     wxXmlNode *nodeSystemInfo = new wxXmlNode(wxXML_ELEMENT_NODE, _T("system"));
@@ -431,7 +476,7 @@ bool wxDebugReport::AddContext(wxDebugReport::Context ctx)
     {
         sw.WalkFromException();
     }
-    else // Context_Curent
+    else // Context_Current
     {
         sw.Walk();
     }
@@ -608,7 +653,7 @@ bool wxDebugReportUpload::DoProcess()
     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(),
@@ -645,4 +690,3 @@ bool wxDebugReportUpload::DoProcess()
 #endif // wxUSE_ZIPSTREAM
 
 #endif // wxUSE_DEBUGREPORT
-