mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS mingwport03 (1.19.10); FILE MERGED

Browse Source 
2007/03/19 16:05:15 vg 1.19.10.3: RESYNC: (1.20-1.21); FILE MERGED
2006/11/07 13:42:37 vg 1.19.10.2: RESYNC: (1.19-1.20); FILE MERGED
2006/10/31 09:50:48 vg 1.19.10.1: #i53572# MinGW port
This commit is contained in:
Vladimir Glazounov
2007-03-26 13:03:55 +00:00
parent 295c706322
commit f2dac103f5
1 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
crashrep/source/win32/soreport.cpp
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: soreport.cpp,v $ * $RCSfile: soreport.cpp,v $
* *
* $Revision: 1.21 $ * $Revision: 1.22 $
* *
* last change: $Author: rt $ $Date: 2007-01-29 15:15:06 $ * last change: $Author: vg $ $Date: 2007-03-26 14:03:55 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -91,7 +91,11 @@
#define MAX_TEXT_BUFFER (32*1024-1) #define MAX_TEXT_BUFFER (32*1024-1)
#define MAX_HOSTNAME (1024) #define MAX_HOSTNAME (1024)
#ifdef __MINGW32__
#include <imagehlp.h>
#else
#include <dbghelp.h> #include <dbghelp.h>
#endif
#ifdef _UNICODE #ifdef _UNICODE
#define tstring wstring #define tstring wstring
@@ -203,7 +207,7 @@ static BOOL GetCrashDataPath( LPTSTR szBuffer )
result = ::osl::FileBase::getSystemPathFromFileURL( ustrValue, ustrPath ); result = ::osl::FileBase::getSystemPathFromFileURL( ustrValue, ustrPath );
if ( ::osl::FileBase::E_None == result ) if ( ::osl::FileBase::E_None == result )
{ {
_tcsncpy( szBuffer, ustrPath.getStr(), MAX_PATH ); _tcsncpy( szBuffer, reinterpret_cast<LPCWSTR>(ustrPath.getStr()), MAX_PATH );
return TRUE; return TRUE;
} }
} }
@@ -1983,7 +1987,41 @@ static DWORD FindProcessForImage( LPCTSTR lpImagePath )
static bool ParseCommandArgs( LPDWORD pdwProcessId, PEXCEPTION_POINTERS* ppException, LPDWORD pdwThreadId ) static bool ParseCommandArgs( LPDWORD pdwProcessId, PEXCEPTION_POINTERS* ppException, LPDWORD pdwThreadId )
{ {
int argc = __argc; int argc = __argc;
#ifdef __MINGW32__
#ifdef _UNICODE
TCHAR **argv = reinterpret_cast<TCHAR **>(alloca((argc+1)*sizeof(WCHAR*)));
int *sizes = reinterpret_cast<int *>(alloca(argc*sizeof(int)));
int argsize=0;
char **ptr;
int i;
ptr=__argv;
for (i = 0; i < argc; ++i)
{
sizes[i]=MultiByteToWideChar(CP_ACP, 0, *ptr, -1, NULL, 0);
argsize+=sizes[i]+1;
++ptr;
}
++argsize;
TCHAR *args = reinterpret_cast<TCHAR *>(alloca(argsize*sizeof(WCHAR)));
ptr=__argv;
TCHAR *cptr=args;
for (i = 0; i < argc; ++i)
{
argv[i]=cptr;
MultiByteToWideChar( CP_ACP, 0, *ptr, -1, cptr, sizes[i] );
++ptr;
cptr+=sizes[i];
*cptr=0;
++cptr;
}
argv[i]=cptr;
*cptr=0;
#else
TCHAR **argv = __argv;
#endif
#else
TCHAR **argv = __targv; TCHAR **argv = __targv;
#endif
bool bSuccess = true; bool bSuccess = true;
for ( int argn = 1; bSuccess && argn < argc; argn++ ) for ( int argn = 1; bSuccess && argn < argc; argn++ )
@@ -2742,11 +2780,18 @@ bool SendCrashReport( HWND hwndParent, const CrashReportParams &rParams )
//*************************************************************************** //***************************************************************************
#ifdef __MINGW32__
int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE, LPSTR /*lpCmdLine*/, int )
#else
int WINAPI _tWinMain( HINSTANCE hInstance, HINSTANCE, LPTSTR /*lpCmdLine*/, int ) int WINAPI _tWinMain( HINSTANCE hInstance, HINSTANCE, LPTSTR /*lpCmdLine*/, int )
#endif
{ {
int exitcode = -1; int exitcode = -1;
int argc = __argc; int argc = __argc;
#ifdef __MINGW32__
char **argv = __argv;
#else
#ifdef _UNICODE #ifdef _UNICODE
char **argv = new char *[argc + 1]; char **argv = new char *[argc + 1];
@@ -2759,6 +2804,7 @@ int WINAPI _tWinMain( HINSTANCE hInstance, HINSTANCE, LPTSTR /*lpCmdLine*/, int
argv[argc] = NULL; argv[argc] = NULL;
#else #else
char **argv = __targv; char **argv = __targv;
#endif
#endif #endif
osl_setCommandArgs( argc, argv ); osl_setCommandArgs( argc, argv );