X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5e93b3586bb6b1ef4743b9c09d4a9ae42800c89..48271822ef3d56c8f91af882b68fd1b674a8e8e6:/src/common/debugrpt.cpp diff --git a/src/common/debugrpt.cpp b/src/common/debugrpt.cpp index eaa1ea0d04..542715a0f0 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" @@ -51,7 +52,6 @@ #if wxUSE_ZIPSTREAM #include "wx/wfstream.h" #include "wx/zipstrm.h" - #include "wx/ptr_scpd.h" #endif // wxUSE_ZIPSTREAM WX_CHECK_BUILD_OPTIONS("wxQA") @@ -80,8 +80,6 @@ protected: bool m_isOk; }; -#endif // wxUSE_STACKWALKER - // ---------------------------------------------------------------------------- // local functions // ---------------------------------------------------------------------------- @@ -89,13 +87,13 @@ protected: 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 @@ -103,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 @@ -129,13 +129,13 @@ void XmlStackWalker::OnStackFrame(const wxStackFrame& frame) 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()); } @@ -190,10 +190,16 @@ wxDebugReport::wxDebugReport() // 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 @@ -252,12 +258,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); @@ -305,7 +348,7 @@ void wxDebugReport::AddAll(Context context) bool wxDebugReport::DoAddSystemInfo(wxXmlNode *nodeSystemInfo) { - nodeSystemInfo->AddProperty(_T("description"), wxGetOsDescription()); + nodeSystemInfo->AddAttribute(_T("description"), wxGetOsDescription()); return true; } @@ -328,20 +371,20 @@ bool wxDebugReport::DoAddLoadedModules(wxXmlNode *nodeModules) if ( path.empty() ) path = info.GetName(); if ( !path.empty() ) - nodeModule->AddProperty(_T("path"), path); + nodeModule->AddAttribute(_T("path"), path); 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); } } @@ -359,8 +402,8 @@ bool wxDebugReport::DoAddExceptionInfo(wxXmlNode *nodeContext) 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")); @@ -402,8 +445,8 @@ bool wxDebugReport::AddContext(wxDebugReport::Context ctx) 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_Current ? _T("user") + nodeRoot->AddAttribute(_T("version"), _T("1.0")); + nodeRoot->AddAttribute(_T("kind"), ctx == Context_Current ? _T("user") : _T("exception")); // add system information @@ -519,10 +562,10 @@ bool wxDebugReport::Process() 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(); @@ -549,9 +592,6 @@ bool wxDebugReport::DoProcess() #if wxUSE_ZIPSTREAM -wxDECLARE_SCOPED_PTR(wxZipOutputStream, wxDbgZipOutputStreamPtr) -wxDEFINE_SCOPED_PTR(wxZipOutputStream, wxDbgZipOutputStreamPtr) - // ---------------------------------------------------------------------------- // wxDebugReportCompress // ---------------------------------------------------------------------------- @@ -565,7 +605,7 @@ bool wxDebugReportCompress::DoProcess() // create the streams wxFileName fn(GetDirectory(), GetReportName(), _T("zip")); wxFFileOutputStream os(fn.GetFullPath(), _T("wb")); - wxDbgZipOutputStreamPtr zos(new wxZipOutputStream(os, 9)); + wxZipOutputStream zos(os, 9); // add all files to the ZIP one wxString name, desc; @@ -576,16 +616,16 @@ bool wxDebugReportCompress::DoProcess() wxZipEntry *ze = new wxZipEntry(name); ze->SetComment(desc); - if ( !zos->PutNextEntry(ze) ) + if ( !zos.PutNextEntry(ze) ) return false; wxFileName filename(fn.GetPath(), name); wxFFileInputStream is(filename.GetFullPath()); - if ( !is.IsOk() || !zos->Write(is).IsOk() ) + if ( !is.IsOk() || !zos.Write(is).IsOk() ) return false; } - if ( !zos->Close() ) + if ( !zos.Close() ) return false; m_zipfile = fn.GetFullPath(); @@ -619,7 +659,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(), @@ -656,4 +696,3 @@ bool wxDebugReportUpload::DoProcess() #endif // wxUSE_ZIPSTREAM #endif // wxUSE_DEBUGREPORT -