#include "wx/app.h"
#include "wx/log.h"
#include "wx/intl.h"
+ #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"
#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:
bool m_isOk;
};
-#endif // wxUSE_STACKWALKER
-
// ----------------------------------------------------------------------------
// local functions
// ----------------------------------------------------------------------------
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)
{
- node->AddProperty(name, wxString::Format(_T("%lu"), value));
+ node->AddAttribute(name, wxString::Format(_T("%lu"), value));
}
static inline void
{
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
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() )
{
- nodeFrame->AddProperty(_T("file"), frame.GetFileName());
+ nodeFrame->AddAttribute(_T("file"), frame.GetFileName());
NumProperty(nodeFrame, _T("line"), frame.GetLine());
}
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
// 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());
+#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
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());
wxString wxDebugReport::GetReportName() const
{
- return wxString(wxTheApp ? wxTheApp->GetAppName() : _T("wx"));
+ if(wxTheApp)
+ return wxTheApp->GetAppDisplayName();
+
+ 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);
#if wxUSE_CRASHREPORT
AddDump(context);
#endif // wxUSE_CRASHREPORT
+
+#if !wxUSE_STACKWALKER && !wxUSE_CRASHREPORT
+ wxUnusedVar(context);
+#endif
}
// ----------------------------------------------------------------------------
bool wxDebugReport::DoAddSystemInfo(wxXmlNode *nodeSystemInfo)
{
- nodeSystemInfo->AddProperty(_T("description"), wxGetOsDescription());
+ nodeSystemInfo->AddAttribute(_T("description"), wxGetOsDescription());
return true;
}
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) )
{
- 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() )
{
- nodeModule->AddProperty(_T("version"), ver);
+ nodeModule->AddAttribute(_T("version"), ver);
}
}
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"));
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"));
{
sw.WalkFromException();
}
- else // Context_Curent
+ else // Context_Current
{
sw.Walk();
}
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();
for ( size_t n = 0; n < count; n++ )
{
GetFile(n, &name, &desc);
- msg += wxString::Format(_("\t%s: %s\n"), name.c_str(), desc.c_str());
+ msg += wxString::Format("\t%s: %s\n", name, desc);
}
msg += _("\nPlease send this report to the program maintainer, thank you!\n");
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;
}
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(),
#endif // wxUSE_ZIPSTREAM
#endif // wxUSE_DEBUGREPORT
-
projects / wxWidgets.git / blobdiff