#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"
#if wxUSE_ZIPSTREAM
#include "wx/wfstream.h"
#include "wx/zipstrm.h"
- #include "wx/ptr_scpd.h"
#endif // wxUSE_ZIPSTREAM
WX_CHECK_BUILD_OPTIONS("wxQA")
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());
}
// 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
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 = 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_Current ? _T("user")
+ nodeRoot->AddAttribute(_T("version"), _T("1.0"));
+ nodeRoot->AddAttribute(_T("kind"), ctx == Context_Current ? _T("user")
: _T("exception"));
// add system information
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();
#if wxUSE_ZIPSTREAM
-// leave the default name wxZipOutputStreamPtr free for users
-wxDECLARE_SCOPED_PTR(wxZipOutputStream, wxDbgZipOutputStreamPtr)
-wxDEFINE_SCOPED_PTR(wxZipOutputStream, wxDbgZipOutputStreamPtr)
-
// ----------------------------------------------------------------------------
// wxDebugReportCompress
// ----------------------------------------------------------------------------
// create the streams
wxFileName fn(GetDirectory(), GetReportName(), _T("zip"));
wxFFileOutputStream os(fn.GetFullPath(), _T("wb"));
-
- // create this one on the heap as a workaround since otherwise the mingw
- // 3.2.3 linker cannot find ~wxZipOutputStream() when building a dll
- // version of the library.
- wxDbgZipOutputStreamPtr zos(new wxZipOutputStream(os, 9));
+ wxZipOutputStream zos(os, 9);
// add all files to the ZIP one
wxString name, desc;
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();
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