Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-31 19:42:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Write source file and line in the setup install log

Browse source 
svn path=/trunk/; revision=27587
This commit is contained in:
Hervé Poussineau 2007-07-11 09:04:22 +00:00
parent 3a9951f710
commit 01e4b9b9ac
4 changed files with 56 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
reactos/dll/win32/syssetup/logfile.c
View file

@ -16,8 +16,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/* $Id$
*
/*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries
* PURPOSE: Log file functions
@ -33,7 +32,6 @@
#include <syssetup/syssetup.h>
/* GLOBALS ******************************************************************/
HANDLE hLogFile = NULL;
@ -41,28 +39,26 @@ HANDLE hLogFile = NULL;
/* FUNCTIONS ****************************************************************/
BOOL STDCALL
BOOL WINAPI
InitializeSetupActionLog (BOOL bDeleteOldLogFile)
{
WCHAR szFileName[MAX_PATH];
GetWindowsDirectoryW (szFileName,
MAX_PATH);
GetWindowsDirectoryW(szFileName, MAX_PATH);
if (szFileName[wcslen (szFileName)] != L'\\')
if (szFileName[wcslen(szFileName)] != L'\\')
{
wcsncat(szFileName,
L"\\",
MAX_PATH);
L"\\",
MAX_PATH);
}
wcsncat(szFileName,
L"setuplog.txt",
MAX_PATH);
MAX_PATH);
if (bDeleteOldLogFile != FALSE)
if (bDeleteOldLogFile)
{
SetFileAttributesW(szFileName,
FILE_ATTRIBUTE_NORMAL);
SetFileAttributesW(szFileName, FILE_ATTRIBUTE_NORMAL);
DeleteFileW(szFileName);
}
@ -83,8 +79,8 @@ InitializeSetupActionLog (BOOL bDeleteOldLogFile)
}
VOID STDCALL
TerminateSetupActionLog (VOID)
VOID WINAPI
TerminateSetupActionLog(VOID)
{
if (hLogFile != NULL)
{
@ -94,16 +90,19 @@ TerminateSetupActionLog (VOID)
}
BOOL STDCALL
LogItem(DWORD dwSeverity,
LPWSTR lpMessageText)
BOOL WINAPI
SYSSETUP_LogItem(IN const LPSTR lpFileName,
IN DWORD dwLineNumber,
IN DWORD dwSeverity,
IN LPWSTR lpMessageText)
{
LPSTR lpNewLine = "\r\n";
LPSTR lpSeverityString;
const LPCSTR lpNewLine = "\r\n";
LPCSTR lpSeverityString;
LPSTR lpMessageString;
DWORD dwMessageLength;
DWORD dwMessageSize;
DWORD dwWritten;
CHAR Buffer[6];
/* Get the severity code string */
switch (dwSeverity)
@ -136,13 +135,11 @@ LogItem(DWORD dwSeverity,
dwMessageLength);
/* Allocate message string buffer */
lpMessageString = (LPSTR) HeapAlloc(GetProcessHeap (),
lpMessageString = (LPSTR) HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY,
dwMessageSize);
if (lpMessageString == NULL)
{
if (!lpMessageString)
return FALSE;
}
/* Convert unicode to ansi */
RtlUnicodeToMultiByteN(lpMessageString,
@ -157,6 +154,27 @@ LogItem(DWORD dwSeverity,
NULL,
FILE_END);
/* Write file name */
WriteFile(hLogFile,
lpFileName,
strlen(lpFileName),
&dwWritten,
NULL);
/* Write comma */
WriteFile(hLogFile, ",", 1, &dwWritten, NULL);
/* Write line number */
snprintf(Buffer, sizeof(Buffer), "%lu", dwLineNumber);
WriteFile(hLogFile,
Buffer,
strlen(Buffer),
&dwWritten,
NULL);
/* Write comma */
WriteFile(hLogFile, ",", 1, &dwWritten, NULL);
/* Write severity code */
WriteFile(hLogFile,
lpSeverityString,
@ -174,7 +192,7 @@ LogItem(DWORD dwSeverity,
/* Write newline */
WriteFile(hLogFile,
lpNewLine,
2,
sizeof(lpNewLine),
&dwWritten,
NULL);

2
reactos/dll/win32/syssetup/syssetup.def
View file

@ -7,7 +7,7 @@ InitializeSetupActionLog@4
InstallLiveCD@4
InstallReactOS@4
KeyboardClassInstaller@12
LogItem@8
;LogItem@8
;LogItem0
;LogItem1
;LogItem2

2
reactos/dll/win32/syssetup/wizard.c
View file

@ -572,7 +572,7 @@ ComputerPageDlgProc(HWND hwndDlg,
TCHAR Password2[15];
PWCHAR Password;
WCHAR Title[64];
WCHAR EmptyComputerName[256], EmptyPassword[256], NotMatchPassword[256], WrongPassword[256];
WCHAR EmptyComputerName[256], NotMatchPassword[256], WrongPassword[256];
DWORD Length;
LPNMHDR lpnm;

18
reactos/include/reactos/libs/syssetup/syssetup.h
View file

@ -39,16 +39,20 @@ InstallReactOS (HINSTANCE hInstance);
#define SYSSETUP_SEVERITY_FATAL_ERROR 3
BOOL STDCALL
InitializeSetupActionLog (BOOL bDeleteOldLogFile);
BOOL WINAPI
InitializeSetupActionLog(IN BOOL bDeleteOldLogFile);
VOID STDCALL
TerminateSetupActionLog (VOID);
VOID WINAPI
TerminateSetupActionLog(VOID);
BOOL STDCALL
LogItem (DWORD dwSeverity,
LPWSTR lpMessageText);
BOOL WINAPI
SYSSETUP_LogItem(IN const LPSTR lpFileName,
IN DWORD dwLineNumber,
IN DWORD dwSeverity,
IN LPWSTR lpMessageText);
#define LogItem(dwSeverity, lpMessageText) \
SYSSETUP_LogItem(__FILE__, __LINE__, dwSeverity, lpMessageText)
#endif /* __SYSSETUP_H_INCLUDED__ */