diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-28 12:01:20 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-28 12:01:20 +0000 |
| commit | 81bf25794efd6804a7ac83ed88343f5a4a63e413 (patch) | |
| tree | 98f94cd3320a0845113bc08fafe36dee285477a2 /crashrep | |
| parent | e2262b5aee4aa5218180472588dfa5ef0ff68f88 (diff) | |
INTEGRATION: CWS nativefixer18 (1.16.24); FILE MERGED
2005/09/26 11:46:16 is 1.16.24.4: RESYNC: (1.16-1.17); FILE MERGED
2005/09/19 13:59:33 hro 1.16.24.3: #124960# ProductKey still resides in bootstrap.ini
2005/08/25 10:01:46 hro 1.16.24.2: #124960# User version.ini for build id
2005/08/25 09:38:33 hro 1.16.24.1: #124960# User version.ini for build id
Diffstat (limited to 'crashrep')
| -rwxr-xr-x | crashrep/source/win32/soreport.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/crashrep/source/win32/soreport.cpp b/crashrep/source/win32/soreport.cpp index c43c82471526..409f31f46a31 100755 --- a/crashrep/source/win32/soreport.cpp +++ b/crashrep/source/win32/soreport.cpp @@ -4,9 +4,9 @@ * * $RCSfile: soreport.cpp,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: rt $ $Date: 2005-09-08 09:45:30 $ + * last change: $Author: hr $ $Date: 2005-09-28 13:01:20 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -2205,6 +2205,7 @@ static bool ReadBootstrapParams( CrashReportParams &rParams ) { TCHAR szBuffer[256] = TEXT(""); TCHAR szModuleName[MAX_PATH]; + TCHAR szModuleVersionName[MAX_PATH]; TCHAR szDrive[_MAX_DRIVE]; TCHAR szDir[_MAX_DIR]; TCHAR szFName[_MAX_FNAME]; @@ -2216,6 +2217,7 @@ static bool ReadBootstrapParams( CrashReportParams &rParams ) GetModuleFileName( NULL, szModuleName, MAX_PATH ); _tsplitpath( szModuleName, szDrive, szDir, szFName, szExt ); _tmakepath( szModuleName, szDrive, szDir, _T("bootstrap"), _T(".ini") ); + _tmakepath( szModuleVersionName, szDrive, szDir, _T("version"), _T(".ini") ); if ( GetPrivateProfileString( @@ -2248,11 +2250,11 @@ static bool ReadBootstrapParams( CrashReportParams &rParams ) } GetPrivateProfileString( - TEXT("Bootstrap"), + TEXT("Version"), TEXT("buildid"), TEXT("unknown"), g_szBuildId, elementsof(g_szBuildId), - szModuleName ); + szModuleVersionName ); g_strDefaultLanguage = get_script_string( "instdb.inf", "DefaultLanguage" ); |