strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove visual noise from crashrep

Browse source 
Change-Id: I9e13aa176cf6ca1d97e52d059423fc59018671f5
Reviewed-on: https://gerrit.libreoffice.org/8249
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Alexander Wilms 2014-02-25 18:03:30 +01:00 committed by Caolán McNamara
parent 2fbd9825bc
commit 86709d62ab
5 changed files with 62 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crashrep/source/unx/main.cxx
View file

@ -579,7 +579,7 @@ static void setup_program_dir( const char* progname )
} }
} }
//*************************************************************************
static long setup_commandline_arguments( int argc, char** argv, int *pSignal ) static long setup_commandline_arguments( int argc, char** argv, int *pSignal )
{ {
@ -650,7 +650,7 @@ static long setup_commandline_arguments( int argc, char** argv, int *pSignal )
return pid; return pid;
} }
//*************************************************************************
static bool read_line( FILE *fp, string& rLine ) static bool read_line( FILE *fp, string& rLine )
{ {

4
crashrep/source/win32/rcheader.txt
View file

@ -33,9 +33,9 @@
#define LANG_JAPANESE 81 #define LANG_JAPANESE 81
#define PLACEHOLDER LANGUAGE #define PLACEHOLDER LANGUAGE
// -----------------------------------------------------------------------
// version information // version information
// -----------------------------------------------------------------------
VS_VERSION_INFO versioninfo VS_VERSION_INFO versioninfo
fileversion VERSION, SUBVERSION, MICROVERSION, VERVARIANT fileversion VERSION, SUBVERSION, MICROVERSION, VERVARIANT

22
crashrep/source/win32/rctemplate.txt
View file

@ -1,12 +1,12 @@
//
// This file is part of the LibreOffice project. // This file is part of the LibreOffice project.
//
// This Source Code Form is subject to the terms of the Mozilla Public // This Source Code Form is subject to the terms of the Mozilla Public
// License, v. 2.0. If a copy of the MPL was not distributed with this // License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at http://mozilla.org/MPL/2.0/. // file, You can obtain one at http://mozilla.org/MPL/2.0/.
//
// This file incorporates work covered by the following license notice: // This file incorporates work covered by the following license notice:
//
// Licensed to the Apache Software Foundation (ASF) under one or more // Licensed to the Apache Software Foundation (ASF) under one or more
// contributor license agreements. See the NOTICE file distributed // contributor license agreements. See the NOTICE file distributed
// with this work for additional information regarding copyright // with this work for additional information regarding copyright
@ -14,7 +14,7 @@
// License, Version 2.0 (the "License"); you may not use this file // License, Version 2.0 (the "License"); you may not use this file
// except in compliance with the License. You may obtain a copy of // except in compliance with the License. You may obtain a copy of
// the License at http://www.apache.org/licenses/LICENSE-2.0 . // the License at http://www.apache.org/licenses/LICENSE-2.0 .
//
#ifdef FONTSIZE #ifdef FONTSIZE
#undef FONTSIZE #undef FONTSIZE
@ -29,10 +29,10 @@
#define FONTSIZE 9 #define FONTSIZE 9
/////////////////////////////////////////////////////////////////////////////
//
// Dialog // Dialog
//
IDD_WELCOME_PAGE DIALOGEX 0, 41, 327, 195 IDD_WELCOME_PAGE DIALOGEX 0, 41, 327, 195
STYLE DS_SETFONT | DS_CONTROL | WS_CHILD STYLE DS_SETFONT | DS_CONTROL | WS_CHILD
@ -145,10 +145,10 @@ BEGIN
LTEXT "3",IDC_SENDING_REPORT_STATUS,7,7,202,34 LTEXT "3",IDC_SENDING_REPORT_STATUS,7,7,202,34
END END
/////////////////////////////////////////////////////////////////////////////
//
// String Table // String Table
//
STRINGTABLE STRINGTABLE
BEGIN BEGIN

4
crashrep/source/win32/resource.h
View file

@ -20,7 +20,7 @@
//{{NO_DEPENDENCIES}} //{{NO_DEPENDENCIES}}
// Microsoft Visual C++ generated include file. // Microsoft Visual C++ generated include file.
// Used by soreport.rc // Used by soreport.rc
//
#define IDD_DIALOG_FRAME 101 #define IDD_DIALOG_FRAME 101
#define IDS_WELCOME_CAPTION 102 #define IDS_WELCOME_CAPTION 102
#define IDS_WELCOME_HEADER 103 #define IDS_WELCOME_HEADER 103
@ -101,7 +101,7 @@
#define IDC_PROXY_DESCRIPTION 1033 #define IDC_PROXY_DESCRIPTION 1033
#define IDC_SENDING_REPORT_STATUS 1034 #define IDC_SENDING_REPORT_STATUS 1034
// Next default values for new objects // Next default values for new objects
//
#ifdef APSTUDIO_INVOKED #ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NO_MFC 1 #define _APS_NO_MFC 1

90
crashrep/source/win32/soreport.cxx
View file

@ -116,7 +116,7 @@ bool g_bLoadReport = false;
#define REPORT_PORT g_uReportPort #define REPORT_PORT g_uReportPort
//***************************************************************************
// tmpfile from msvcrt creates the temporary file in the root of the current // tmpfile from msvcrt creates the temporary file in the root of the current
// volume and can fail. // volume and can fail.
@ -157,7 +157,7 @@ static FILE *_tmpfile(void)
return fp; return fp;
} }
//***************************************************************************
static BOOL GetCrashDataPath( LPTSTR szBuffer ) static BOOL GetCrashDataPath( LPTSTR szBuffer )
{ {
@ -203,7 +203,7 @@ static FILE *_open_reportfile( LPCTSTR lpExt, LPCTSTR lpMode )
return fp; return fp;
} }
//***************************************************************************
struct CrashReportParams struct CrashReportParams
{ {
@ -225,7 +225,7 @@ struct CrashReportParams
bool SendCrashReport( HWND hwndParent, const CrashReportParams &rParams ); bool SendCrashReport( HWND hwndParent, const CrashReportParams &rParams );
BOOL WriteCommentFile( LPCTSTR lpComment ); BOOL WriteCommentFile( LPCTSTR lpComment );
//***************************************************************************
LONG RegReadValue( HKEY hBaseKey, LPCTSTR lpSubKey, LPCTSTR lpValueName, LPVOID lpData, DWORD cbData ) LONG RegReadValue( HKEY hBaseKey, LPCTSTR lpSubKey, LPCTSTR lpValueName, LPVOID lpData, DWORD cbData )
{ {
@ -243,7 +243,7 @@ LONG RegReadValue( HKEY hBaseKey, LPCTSTR lpSubKey, LPCTSTR lpValueName, LPVOID
return lResult; return lResult;
} }
//***************************************************************************
LONG RegWriteValue( HKEY hBaseKey, LPCTSTR lpSubKey, LPCTSTR lpValueName, DWORD dwType, LPCVOID lpData, DWORD cbData ) LONG RegWriteValue( HKEY hBaseKey, LPCTSTR lpSubKey, LPCTSTR lpValueName, DWORD dwType, LPCVOID lpData, DWORD cbData )
{ {
@ -261,7 +261,7 @@ LONG RegWriteValue( HKEY hBaseKey, LPCTSTR lpSubKey, LPCTSTR lpValueName, DWORD
return lResult; return lResult;
} }
//***************************************************************************
CrashReportParams::CrashReportParams() CrashReportParams::CrashReportParams()
{ {
@ -274,7 +274,7 @@ CrashReportParams::CrashReportParams()
sProxyPort = TEXT(""); sProxyPort = TEXT("");
} }
//***************************************************************************
void CrashReportParams::ReadFromRegistry() void CrashReportParams::ReadFromRegistry()
{ {
@ -324,7 +324,7 @@ void CrashReportParams::ReadFromRegistry()
sizeof(uInternetConnection) ); sizeof(uInternetConnection) );
} }
//***************************************************************************
void CrashReportParams::WriteToRegistry() void CrashReportParams::WriteToRegistry()
{ {
@ -368,7 +368,7 @@ void CrashReportParams::WriteToRegistry()
sizeof(TCHAR) * (sEmail.length() + 1) ); sizeof(TCHAR) * (sEmail.length() + 1) );
} }
//***************************************************************************
void CrashReportParams::ReadFromEnvironment() void CrashReportParams::ReadFromEnvironment()
{ {
@ -437,7 +437,7 @@ void CrashReportParams::ReadFromEnvironment()
} }
} }
//***************************************************************************
typedef BOOL (WINAPI *MiniDumpWriteDump_PROC)( typedef BOOL (WINAPI *MiniDumpWriteDump_PROC)(
IN HANDLE hProcess, IN HANDLE hProcess,
@ -449,21 +449,21 @@ typedef BOOL (WINAPI *MiniDumpWriteDump_PROC)(
IN CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam OPTIONAL IN CONST PMINIDUMP_CALLBACK_INFORMATION CallbackParam OPTIONAL
); );
//***************************************************************************
static BOOL WINAPI InitRichEdit() static BOOL WINAPI InitRichEdit()
{ {
return (NULL != LoadLibrary( RICHEDIT )); return (NULL != LoadLibrary( RICHEDIT ));
} }
//***************************************************************************
static BOOL WINAPI DeinitRichEdit() static BOOL WINAPI DeinitRichEdit()
{ {
return FreeLibrary( GetModuleHandle( RICHEDIT ) ); return FreeLibrary( GetModuleHandle( RICHEDIT ) );
} }
//***************************************************************************
static string trim_string( const string& rString ) static string trim_string( const string& rString )
{ {
@ -483,7 +483,7 @@ static string trim_string( const string& rString )
return temp; return temp;
} }
//***************************************************************************
static int LoadAndFormatString( HINSTANCE hInstance, UINT uID, LPTSTR lpBuffer, int nBufferMax ) static int LoadAndFormatString( HINSTANCE hInstance, UINT uID, LPTSTR lpBuffer, int nBufferMax )
{ {
@ -525,7 +525,7 @@ static int LoadAndFormatString( HINSTANCE hInstance, UINT uID, LPTSTR lpBuffer,
} }
//***************************************************************************
static string wstring2utf8( const wstring &rString ) static string wstring2utf8( const wstring &rString )
{ {
@ -538,7 +538,7 @@ static string wstring2utf8( const wstring &rString )
return string( pBuffer ); return string( pBuffer );
} }
//***************************************************************************
static string xml_encode( const string &rString ) static string xml_encode( const string &rString )
{ {
@ -560,7 +560,7 @@ static string xml_encode( const string &rString )
return temp; return temp;
} }
//***************************************************************************
static size_t fcopy( FILE *fpin, FILE *fpout ) static size_t fcopy( FILE *fpin, FILE *fpout )
{ {
@ -579,7 +579,7 @@ static size_t fcopy( FILE *fpin, FILE *fpout )
return nBytesWritten; return nBytesWritten;
} }
//***************************************************************************
static string GetModuleDirectory( HMODULE hModule ) static string GetModuleDirectory( HMODULE hModule )
{ {
@ -601,7 +601,7 @@ static string GetModuleDirectory( HMODULE hModule )
return string( szModuleNameUTF8 ); return string( szModuleNameUTF8 );
} }
//***************************************************************************
string GetFileDirectory( const string& rFilePath ) string GetFileDirectory( const string& rFilePath )
{ {
@ -616,7 +616,7 @@ string GetFileDirectory( const string& rFilePath )
return aDir; return aDir;
} }
//***************************************************************************
string GetFileName( const string& rFilePath ) string GetFileName( const string& rFilePath )
{ {
@ -629,7 +629,7 @@ string GetFileName( const string& rFilePath )
return aName; return aName;
} }
//***************************************************************************
BOOL WriteReportFile( CrashReportParams *pParams ) BOOL WriteReportFile( CrashReportParams *pParams )
{ {
@ -728,7 +728,7 @@ BOOL WriteReportFile( CrashReportParams *pParams )
return fSuccess; return fSuccess;
} }
//***************************************************************************
static BOOL SaveDumpFile( HWND hwndOwner ) static BOOL SaveDumpFile( HWND hwndOwner )
{ {
@ -752,7 +752,7 @@ static BOOL SaveDumpFile( HWND hwndOwner )
return FALSE; return FALSE;
} }
//***************************************************************************
static BOOL ScreenToClientRect( HWND hwnd, LPRECT lprc ) static BOOL ScreenToClientRect( HWND hwnd, LPRECT lprc )
{ {
@ -946,7 +946,7 @@ BOOL CALLBACK PreviewDialogProc(
return FALSE; return FALSE;
} }
//***************************************************************************
static void PreviewReport( HWND hwndParent, CrashReportParams *pParams ) static void PreviewReport( HWND hwndParent, CrashReportParams *pParams )
{ {
@ -964,7 +964,7 @@ static void PreviewReport( HWND hwndParent, CrashReportParams *pParams )
DeleteFileA( g_szReportFileNameA ); DeleteFileA( g_szReportFileNameA );
} }
//***************************************************************************
void UpdateOptionsDialogControls( HWND hwndDlg ) void UpdateOptionsDialogControls( HWND hwndDlg )
{ {
if ( Button_GetCheck( GetDlgItem(hwndDlg, IDC_RADIO_MANUAL) ) & BST_CHECKED ) if ( Button_GetCheck( GetDlgItem(hwndDlg, IDC_RADIO_MANUAL) ) & BST_CHECKED )
@ -979,7 +979,7 @@ void UpdateOptionsDialogControls( HWND hwndDlg )
} }
} }
//***************************************************************************
BOOL CALLBACK OptionsDialogProc( BOOL CALLBACK OptionsDialogProc(
HWND hwndDlg, HWND hwndDlg,
@ -1081,7 +1081,7 @@ BOOL CALLBACK OptionsDialogProc(
return FALSE; return FALSE;
} }
//***************************************************************************
static void OptionsDialog( HWND hwndParent, CrashReportParams *pParams ) static void OptionsDialog( HWND hwndParent, CrashReportParams *pParams )
{ {
@ -1097,7 +1097,7 @@ static void OptionsDialog( HWND hwndParent, CrashReportParams *pParams )
pParams->WriteToRegistry(); pParams->WriteToRegistry();
} }
//***************************************************************************
void UpdateReportDialogControls( HWND hwndDlg ) void UpdateReportDialogControls( HWND hwndDlg )
{ {
@ -1109,7 +1109,7 @@ void UpdateReportDialogControls( HWND hwndDlg )
Button_GetCheck(GetDlgItem(hwndDlg, IDC_ALLOW_CONTACT)) & BST_CHECKED ? TRUE : FALSE ); Button_GetCheck(GetDlgItem(hwndDlg, IDC_ALLOW_CONTACT)) & BST_CHECKED ? TRUE : FALSE );
} }
//***************************************************************************
BOOL CALLBACK ReportDialogProc( BOOL CALLBACK ReportDialogProc(
HWND hwndDlg, HWND hwndDlg,
@ -1235,7 +1235,7 @@ BOOL CALLBACK ReportDialogProc(
return FALSE; return FALSE;
} }
//***************************************************************************
BOOL CALLBACK WelcomeDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ) BOOL CALLBACK WelcomeDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam )
{ {
@ -1325,7 +1325,7 @@ BOOL CALLBACK WelcomeDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM
return FALSE; return FALSE;
} }
//***************************************************************************
BOOL CALLBACK DialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam ) BOOL CALLBACK DialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam )
{ {
@ -1453,9 +1453,9 @@ BOOL CALLBACK DialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam
//*****************************************************************************
//* Generate MD5 checksum //* Generate MD5 checksum
//*****************************************************************************
#define MAGIC_DESCRIPTION_FILLER 'x' #define MAGIC_DESCRIPTION_FILLER 'x'
#define MAGIC_DESCRIPTION_COUNT 80 #define MAGIC_DESCRIPTION_COUNT 80
@ -1595,7 +1595,7 @@ static sal_uInt32 calc_md5_checksum( const char *filename, sal_uInt8 *pChecksum
return nBytesProcessed; return nBytesProcessed;
} }
//***************************************************************************
static bool WriteStackFile( FILE *fout, boost::unordered_map< string, string >& rLibraries, DWORD dwProcessId, PEXCEPTION_POINTERS pExceptionPointers ) static bool WriteStackFile( FILE *fout, boost::unordered_map< string, string >& rLibraries, DWORD dwProcessId, PEXCEPTION_POINTERS pExceptionPointers )
{ {
@ -1755,7 +1755,7 @@ bool WriteChecksumFile( FILE *fchksum, const boost::unordered_map< string, strin
return success; return success;
} }
//***************************************************************************
BOOL FindDumpFile() BOOL FindDumpFile()
{ {
@ -1881,7 +1881,7 @@ BOOL WriteDumpFile( DWORD dwProcessId, PEXCEPTION_POINTERS pExceptionPointers, D
return fSuccess; return fSuccess;
} }
//***************************************************************************
static DWORD FindProcessForImage( LPCTSTR lpImagePath ) static DWORD FindProcessForImage( LPCTSTR lpImagePath )
{ {
@ -1921,7 +1921,7 @@ static DWORD FindProcessForImage( LPCTSTR lpImagePath )
return dwProcessId; return dwProcessId;
} }
//***************************************************************************
static bool ParseCommandArgs( LPDWORD pdwProcessId, PEXCEPTION_POINTERS* ppException, LPDWORD pdwThreadId ) static bool ParseCommandArgs( LPDWORD pdwProcessId, PEXCEPTION_POINTERS* ppException, LPDWORD pdwThreadId )
{ {
@ -2069,7 +2069,7 @@ static bool ParseCommandArgs( LPDWORD pdwProcessId, PEXCEPTION_POINTERS* ppExcep
return bSuccess; return bSuccess;
} }
//***************************************************************************
BOOL WriteCommentFile( LPCTSTR lpComment ) BOOL WriteCommentFile( LPCTSTR lpComment )
{ {
@ -2112,7 +2112,7 @@ BOOL WriteCommentFile( LPCTSTR lpComment )
return fSuccess; return fSuccess;
} }
//***************************************************************************
static int _tsetenv( const _TCHAR *lpVar, const _TCHAR *lpValue ) static int _tsetenv( const _TCHAR *lpVar, const _TCHAR *lpValue )
{ {
@ -2301,7 +2301,7 @@ static bool ReadBootstrapParams( CrashReportParams &rParams )
return bSuccess; return bSuccess;
} }
//***************************************************************************
bool SendHTTPRequest( bool SendHTTPRequest(
FILE *fp, FILE *fp,
@ -2398,7 +2398,7 @@ bool SendHTTPRequest(
return success; return success;
} }
//***************************************************************************
static void WriteSOAPRequest( FILE *fp ) static void WriteSOAPRequest( FILE *fp )
{ {
@ -2473,7 +2473,7 @@ static void WriteSOAPRequest( FILE *fp )
); );
} }
//***************************************************************************
struct RequestParams struct RequestParams
{ {
@ -2495,7 +2495,7 @@ void _cdecl SendingThread( void *lpArgs )
PostMessage( pParams->hwndStatus, WM_COMMAND, IDOK, 0 ); PostMessage( pParams->hwndStatus, WM_COMMAND, IDOK, 0 );
} }
//***************************************************************************
BOOL CALLBACK SendingStatusDialogProc( BOOL CALLBACK SendingStatusDialogProc(
HWND hwndDlg, HWND hwndDlg,
@ -2549,7 +2549,7 @@ BOOL CALLBACK SendingStatusDialogProc(
return FALSE; return FALSE;
} }
//***************************************************************************
bool SendCrashReport( HWND hwndParent, const CrashReportParams &rParams ) bool SendCrashReport( HWND hwndParent, const CrashReportParams &rParams )
{ {
@ -2716,7 +2716,7 @@ bool SendCrashReport( HWND hwndParent, const CrashReportParams &rParams )
return success; return success;
} }
//***************************************************************************
#ifdef __MINGW32__ #ifdef __MINGW32__
int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE, LPSTR /*lpCmdLine*/, int ) int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE, LPSTR /*lpCmdLine*/, int )