Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-01 07:28:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

* fixed some warnings

Browse source 
svn path=/trunk/; revision=25316
This commit is contained in:
Christoph von Wittich 2007-01-05 20:22:44 +00:00
parent d2e64780de
commit d5de43d13e
11 changed files with 174 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/base/services/dhcp/adapter.c
View file

@ -31,7 +31,7 @@ PCHAR *GetSubkeyNames( PCHAR MainKeyName, PCHAR Append ) {
DH_DbgPrint(MID_TRACE,("AppendLen: %d, CharTotal: %d\n", DH_DbgPrint(MID_TRACE,("AppendLen: %d, CharTotal: %d\n",
AppendLen, CharTotal)); AppendLen, CharTotal));
Out = malloc( CharTotal ); Out = (CHAR**) malloc( CharTotal );
OutKeyName = ((PCHAR)&Out[MaxSubKeys+1]); OutKeyName = ((PCHAR)&Out[MaxSubKeys+1]);
if( !Out ) { RegCloseKey( MainKey ); return NULL; } if( !Out ) { RegCloseKey( MainKey ); return NULL; }
@ -73,7 +73,7 @@ PCHAR RegReadString( HKEY Root, PCHAR Subkey, PCHAR Value ) {
DH_DbgPrint(MID_TRACE,("Value %s has size %d\n", Value, SubOutLen)); DH_DbgPrint(MID_TRACE,("Value %s has size %d\n", Value, SubOutLen));
if( !(SubOut = malloc(SubOutLen)) ) if( !(SubOut = (CHAR*) malloc(SubOutLen)) )
goto regerror; goto regerror;
if( (Error = RegQueryValueEx( ValueKey, Value, NULL, NULL, if( (Error = RegQueryValueEx( ValueKey, Value, NULL, NULL,
@ -128,7 +128,7 @@ HKEY FindAdapterKey( PDHCP_ADAPTER Adapter ) {
RootDevice && RootDevice &&
!strcmp( DriverDesc, Adapter->DhclientInfo.name ) ) { !strcmp( DriverDesc, Adapter->DhclientInfo.name ) ) {
TargetKeyName = TargetKeyName =
malloc( strlen( TargetKeyNameStart ) + (CHAR*) malloc( strlen( TargetKeyNameStart ) +
strlen( RootDevice ) + strlen( RootDevice ) +
strlen( TargetKeyNameEnd ) + 1 ); strlen( TargetKeyNameEnd ) + 1 );
if( !TargetKeyName ) goto cleanup; if( !TargetKeyName ) goto cleanup;
@ -219,7 +219,7 @@ BOOL PrepareAdapterForService( PDHCP_ADAPTER Adapter ) {
*/ */
void AdapterInit() { void AdapterInit() {
PMIB_IFTABLE Table = malloc(sizeof(MIB_IFTABLE)); PMIB_IFTABLE Table = (PMIB_IFTABLE) malloc(sizeof(MIB_IFTABLE));
DWORD Error, Size, i; DWORD Error, Size, i;
PDHCP_ADAPTER Adapter = NULL; PDHCP_ADAPTER Adapter = NULL;
@ -233,7 +233,7 @@ void AdapterInit() {
ERROR_INSUFFICIENT_BUFFER ) { ERROR_INSUFFICIENT_BUFFER ) {
DH_DbgPrint(MID_TRACE,("Error %d, New Buffer Size: %d\n", Error, Size)); DH_DbgPrint(MID_TRACE,("Error %d, New Buffer Size: %d\n", Error, Size));
free( Table ); free( Table );
Table = malloc( Size ); Table = (PMIB_IFTABLE) malloc( Size );
} }
if( Error != NO_ERROR ) goto term; if( Error != NO_ERROR ) goto term;
@ -243,7 +243,7 @@ void AdapterInit() {
for( i = 0; i < Table->dwNumEntries; i++ ) { for( i = 0; i < Table->dwNumEntries; i++ ) {
DH_DbgPrint(MID_TRACE,("Getting adapter %d attributes\n", DH_DbgPrint(MID_TRACE,("Getting adapter %d attributes\n",
Table->table[i].dwIndex)); Table->table[i].dwIndex));
Adapter = calloc( sizeof( DHCP_ADAPTER ) + Table->table[i].dwMtu, 1 ); Adapter = (DHCP_ADAPTER*) calloc( sizeof( DHCP_ADAPTER ) + Table->table[i].dwMtu, 1 );
if( Adapter && Table->table[i].dwType == MIB_IF_TYPE_ETHERNET ) { if( Adapter && Table->table[i].dwType == MIB_IF_TYPE_ETHERNET ) {
memcpy( &Adapter->IfMib, &Table->table[i], memcpy( &Adapter->IfMib, &Table->table[i],
@ -258,9 +258,9 @@ void AdapterInit() {
Adapter->IfMib.dwPhysAddrLen); Adapter->IfMib.dwPhysAddrLen);
Adapter->DhclientInfo.hw_address.hlen = Adapter->DhclientInfo.hw_address.hlen =
Adapter->IfMib.dwPhysAddrLen; Adapter->IfMib.dwPhysAddrLen;
/* I'm not sure where else to set this, but /* I'm not sure where else to set this, but
some DHCP servers won't take a zero. some DHCP servers won't take a zero.
We checked the hardware type earlier in We checked the hardware type earlier in
the if statement. */ the if statement. */
Adapter->DhclientInfo.hw_address.htype = Adapter->DhclientInfo.hw_address.htype =
HTYPE_ETHER; HTYPE_ETHER;

248
reactos/base/services/eventlog/file.c
View file

@ -3,9 +3,9 @@
* LICENSE: GPL - See COPYING in the top level directory * LICENSE: GPL - See COPYING in the top level directory
* FILE: services/eventlog/file.c * FILE: services/eventlog/file.c
* PURPOSE: Event logging service * PURPOSE: Event logging service
* COPYRIGHT: Copyright 2005 Saveliy Tretiakov * COPYRIGHT: Copyright 2005 Saveliy Tretiakov
*/ */
#include "eventlog.h" #include "eventlog.h"
PLOGFILE LogListHead = NULL; PLOGFILE LogListHead = NULL;
@ -16,11 +16,11 @@ BOOL LogfInitializeNew(PLOGFILE LogFile)
{ {
DWORD dwWritten; DWORD dwWritten;
EOF_RECORD EofRec; EOF_RECORD EofRec;
ZeroMemory(&LogFile->Header, sizeof(FILE_HEADER)); ZeroMemory(&LogFile->Header, sizeof(FILE_HEADER));
SetFilePointer(LogFile->hFile, 0, NULL, FILE_BEGIN); SetFilePointer(LogFile->hFile, 0, NULL, FILE_BEGIN);
SetEndOfFile(LogFile->hFile); SetEndOfFile(LogFile->hFile);
LogFile->Header.SizeOfHeader = sizeof(FILE_HEADER); LogFile->Header.SizeOfHeader = sizeof(FILE_HEADER);
LogFile->Header.SizeOfHeader2 = sizeof(FILE_HEADER); LogFile->Header.SizeOfHeader2 = sizeof(FILE_HEADER);
LogFile->Header.FirstRecordOffset = sizeof(FILE_HEADER); LogFile->Header.FirstRecordOffset = sizeof(FILE_HEADER);
@ -51,22 +51,22 @@ BOOL LogfInitializeNew(PLOGFILE LogFile)
EofRec.StartOffset = LogFile->Header.FirstRecordOffset; EofRec.StartOffset = LogFile->Header.FirstRecordOffset;
EofRec.EndOffset = LogFile->Header.EofOffset; EofRec.EndOffset = LogFile->Header.EofOffset;
if(!WriteFile(LogFile->hFile, if(!WriteFile(LogFile->hFile,
&EofRec, &EofRec,
sizeof(EOF_RECORD), sizeof(EOF_RECORD),
&dwWritten, &dwWritten,
NULL)) NULL))
{ {
DPRINT1("WriteFile failed:%d!\n", GetLastError()); DPRINT1("WriteFile failed:%d!\n", GetLastError());
return FALSE; return FALSE;
} }
if(!FlushFileBuffers(LogFile->hFile)) if(!FlushFileBuffers(LogFile->hFile))
{ {
DPRINT1("FlushFileBuffers failed:%d!\n", GetLastError()); DPRINT1("FlushFileBuffers failed:%d!\n", GetLastError());
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
} }
@ -84,32 +84,32 @@ BOOL LogfInitializeExisting(PLOGFILE LogFile)
DPRINT1("SetFilePointer failed! %d\n", GetLastError()); DPRINT1("SetFilePointer failed! %d\n", GetLastError());
return FALSE; return FALSE;
} }
if(!ReadFile(LogFile->hFile, if(!ReadFile(LogFile->hFile,
&LogFile->Header, &LogFile->Header,
sizeof(FILE_HEADER), sizeof(FILE_HEADER),
&dwRead, NULL)) &dwRead, NULL))
{ {
DPRINT1("ReadFile failed! %d\n", GetLastError()); DPRINT1("ReadFile failed! %d\n", GetLastError());
return FALSE; return FALSE;
} }
if(dwRead != sizeof(FILE_HEADER)) if(dwRead != sizeof(FILE_HEADER))
{ {
DPRINT("EventLog: Invalid file %S.\n", LogFile->FileName); DPRINT("EventLog: Invalid file %S.\n", LogFile->FileName);
return LogfInitializeNew(LogFile); return LogfInitializeNew(LogFile);
} }
if(LogFile->Header.SizeOfHeader != sizeof(FILE_HEADER) || if(LogFile->Header.SizeOfHeader != sizeof(FILE_HEADER) ||
LogFile->Header.SizeOfHeader2 != sizeof(FILE_HEADER)) LogFile->Header.SizeOfHeader2 != sizeof(FILE_HEADER))
{ {
DPRINT("EventLog: Invalid header size in %S.\n", LogFile->FileName); DPRINT("EventLog: Invalid header size in %S.\n", LogFile->FileName);
return LogfInitializeNew(LogFile); return LogfInitializeNew(LogFile);
} }
if(LogFile->Header.Signature != LOGFILE_SIGNATURE) if(LogFile->Header.Signature != LOGFILE_SIGNATURE)
{ {
DPRINT("EventLog: Invalid signature %x in %S.\n", DPRINT("EventLog: Invalid signature %x in %S.\n",
LogFile->Header.Signature, LogFile->Header.Signature,
LogFile->FileName); LogFile->FileName);
return LogfInitializeNew(LogFile); return LogfInitializeNew(LogFile);
@ -117,7 +117,7 @@ BOOL LogfInitializeExisting(PLOGFILE LogFile)
if(LogFile->Header.EofOffset > GetFileSize(LogFile->hFile, NULL)+1) if(LogFile->Header.EofOffset > GetFileSize(LogFile->hFile, NULL)+1)
{ {
DPRINT("EventLog: Invalid eof offset %x in %S.\n", DPRINT("EventLog: Invalid eof offset %x in %S.\n",
LogFile->Header.EofOffset, LogFile->Header.EofOffset,
LogFile->FileName); LogFile->FileName);
return LogfInitializeNew(LogFile); return LogfInitializeNew(LogFile);
@ -125,21 +125,21 @@ BOOL LogfInitializeExisting(PLOGFILE LogFile)
for(;;) for(;;)
{ {
dwFilePointer = SetFilePointer(LogFile->hFile, dwFilePointer = SetFilePointer(LogFile->hFile,
0, 0,
NULL, NULL,
FILE_CURRENT); FILE_CURRENT);
if(dwFilePointer == INVALID_SET_FILE_POINTER) if(dwFilePointer == INVALID_SET_FILE_POINTER)
{ {
DPRINT1("SetFilePointer failed! %d\n", GetLastError()); DPRINT1("SetFilePointer failed! %d\n", GetLastError());
return FALSE; return FALSE;
} }
if(!ReadFile(LogFile->hFile, if(!ReadFile(LogFile->hFile,
&dwRecSize, &dwRecSize,
sizeof(dwRecSize), sizeof(dwRecSize),
&dwRead, &dwRead,
NULL)) NULL))
{ {
DPRINT1("ReadFile failed! %d\n", GetLastError()); DPRINT1("ReadFile failed! %d\n", GetLastError());
@ -158,34 +158,34 @@ BOOL LogfInitializeExisting(PLOGFILE LogFile)
DPRINT1("ReadFile() failed! %d\n", GetLastError()); DPRINT1("ReadFile() failed! %d\n", GetLastError());
return FALSE; return FALSE;
} }
if(dwRead != sizeof(dwRecSize)) if(dwRead != sizeof(dwRecSize))
break; break;
if(dwRecSign != LOGFILE_SIGNATURE || if(dwRecSign != LOGFILE_SIGNATURE ||
dwRecSize + dwFilePointer > GetFileSize(LogFile->hFile, NULL)+1 || dwRecSize + dwFilePointer > GetFileSize(LogFile->hFile, NULL)+1 ||
dwRecSize < sizeof(EVENTLOGRECORD)) dwRecSize < sizeof(EVENTLOGRECORD))
{ {
break; break;
} }
if(SetFilePointer(LogFile->hFile, if(SetFilePointer(LogFile->hFile,
-((LONG)sizeof(DWORD)*2), -((LONG)sizeof(DWORD)*2),
NULL, NULL,
FILE_CURRENT) == INVALID_SET_FILE_POINTER) FILE_CURRENT) == INVALID_SET_FILE_POINTER)
{ {
DPRINT1("SetFilePointer() failed! %d", GetLastError()); DPRINT1("SetFilePointer() failed! %d", GetLastError());
return FALSE; return FALSE;
} }
RecBuf = (PEVENTLOGRECORD) HeapAlloc(MyHeap, 0, dwRecSize); RecBuf = (PEVENTLOGRECORD) HeapAlloc(MyHeap, 0, dwRecSize);
if(!RecBuf) if(!RecBuf)
{ {
DPRINT1("Can't allocate heap!\n"); DPRINT1("Can't allocate heap!\n");
return FALSE; return FALSE;
} }
if(!ReadFile(LogFile->hFile, if(!ReadFile(LogFile->hFile,
RecBuf, RecBuf,
dwRecSize, dwRecSize,
@ -196,7 +196,7 @@ BOOL LogfInitializeExisting(PLOGFILE LogFile)
HeapFree(MyHeap, 0, RecBuf); HeapFree(MyHeap, 0, RecBuf);
return FALSE; return FALSE;
} }
if(dwRead != dwRecSize) if(dwRead != dwRecSize)
{ {
HeapFree(MyHeap, 0, RecBuf); HeapFree(MyHeap, 0, RecBuf);
@ -206,7 +206,7 @@ BOOL LogfInitializeExisting(PLOGFILE LogFile)
pdwRecSize2 = (PDWORD)(((PBYTE)RecBuf)+dwRecSize-4); pdwRecSize2 = (PDWORD)(((PBYTE)RecBuf)+dwRecSize-4);
if(*pdwRecSize2 != dwRecSize) if(*pdwRecSize2 != dwRecSize)
{ {
DPRINT1("Invalid size2 of record %d (%x) in %s\n", DPRINT1("Invalid size2 of record %d (%x) in %s\n",
dwRecordsNumber, dwRecordsNumber,
*pdwRecSize2, *pdwRecSize2,
LogFile->LogName); LogFile->LogName);
@ -215,7 +215,7 @@ BOOL LogfInitializeExisting(PLOGFILE LogFile)
} }
dwRecordsNumber++; dwRecordsNumber++;
if(!LogfAddOffsetInformation(LogFile, RecBuf->RecordNumber, dwFilePointer)) if(!LogfAddOffsetInformation(LogFile, RecBuf->RecordNumber, dwFilePointer))
{ {
DPRINT1("LogfAddOffsetInformation() failed!\n"); DPRINT1("LogfAddOffsetInformation() failed!\n");
@ -235,75 +235,75 @@ BOOL LogfInitializeExisting(PLOGFILE LogFile)
DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); DPRINT1("SetFilePointer() failed! %d\n", GetLastError());
return FALSE; return FALSE;
} }
if(!WriteFile(LogFile->hFile, if(!WriteFile(LogFile->hFile,
&LogFile->Header, &LogFile->Header,
sizeof(FILE_HEADER), sizeof(FILE_HEADER),
&dwRead, &dwRead,
NULL)) NULL))
{ {
DPRINT1("WriteFile failed! %d\n", GetLastError()); DPRINT1("WriteFile failed! %d\n", GetLastError());
return FALSE; return FALSE;
} }
if(!FlushFileBuffers(LogFile->hFile)) if(!FlushFileBuffers(LogFile->hFile))
{ {
DPRINT1("FlushFileBuffers failed! %d\n", GetLastError()); DPRINT1("FlushFileBuffers failed! %d\n", GetLastError());
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
} }
PLOGFILE LogfCreate(WCHAR *LogName, PLOGFILE LogfCreate(WCHAR *LogName,
WCHAR *FileName) WCHAR *FileName)
{ {
PLOGFILE LogFile; PLOGFILE LogFile;
BOOL bResult, bCreateNew = FALSE; BOOL bResult, bCreateNew = FALSE;
LogFile = HeapAlloc(MyHeap, LogFile = (LOGFILE*) HeapAlloc(MyHeap,
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
sizeof(LOGFILE)); sizeof(LOGFILE));
if(!LogFile) if(!LogFile)
{ {
DPRINT1("Can't allocate heap!\n"); DPRINT1("Can't allocate heap!\n");
return NULL; return NULL;
} }
LogFile->hFile = CreateFile(FileName, LogFile->hFile = CreateFile(FileName,
GENERIC_READ | GENERIC_WRITE, GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_READ, FILE_SHARE_READ,
NULL, NULL,
OPEN_ALWAYS, OPEN_ALWAYS,
FILE_ATTRIBUTE_NORMAL | FILE_ATTRIBUTE_NORMAL |
FILE_FLAG_RANDOM_ACCESS, FILE_FLAG_RANDOM_ACCESS,
NULL); NULL);
if(LogFile->hFile == INVALID_HANDLE_VALUE) if(LogFile->hFile == INVALID_HANDLE_VALUE)
{ {
DPRINT1("Can't create file %S.\n", FileName); DPRINT1("Can't create file %S.\n", FileName);
HeapFree(MyHeap, 0, LogFile); HeapFree(MyHeap, 0, LogFile);
return NULL; return NULL;
} }
bCreateNew = (GetLastError() == ERROR_ALREADY_EXISTS) ? FALSE : TRUE; bCreateNew = (GetLastError() == ERROR_ALREADY_EXISTS) ? FALSE : TRUE;
LogFile->LogName = HeapAlloc(MyHeap, LogFile->LogName = (WCHAR*) HeapAlloc(MyHeap,
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
(lstrlenW(LogName)+1)*sizeof(WCHAR)); (lstrlenW(LogName)+1)*sizeof(WCHAR));
if(LogFile->LogName) lstrcpyW(LogFile->LogName, LogName); if(LogFile->LogName) lstrcpyW(LogFile->LogName, LogName);
else else
{ {
DPRINT1("Can't allocate heap\n"); DPRINT1("Can't allocate heap\n");
HeapFree(MyHeap, 0, LogFile); HeapFree(MyHeap, 0, LogFile);
return NULL; return NULL;
} }
LogFile->FileName = HeapAlloc(MyHeap, LogFile->FileName = (WCHAR*) HeapAlloc(MyHeap,
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
(lstrlenW(FileName)+1)*sizeof(WCHAR)); (lstrlenW(FileName)+1)*sizeof(WCHAR));
if(LogFile->FileName) lstrcpyW(LogFile->FileName, FileName); if(LogFile->FileName) lstrcpyW(LogFile->FileName, FileName);
else else
{ {
@ -311,7 +311,7 @@ PLOGFILE LogfCreate(WCHAR *LogName,
goto fail; goto fail;
} }
LogFile->OffsetInfo = (PEVENT_OFFSET_INFO) LogFile->OffsetInfo = (PEVENT_OFFSET_INFO)
HeapAlloc(MyHeap, HEAP_ZERO_MEMORY, sizeof(EVENT_OFFSET_INFO)*64); HeapAlloc(MyHeap, HEAP_ZERO_MEMORY, sizeof(EVENT_OFFSET_INFO)*64);
if(!LogFile->OffsetInfo) if(!LogFile->OffsetInfo)
@ -327,7 +327,7 @@ PLOGFILE LogfCreate(WCHAR *LogName,
else bResult = LogfInitializeExisting(LogFile); else bResult = LogfInitializeExisting(LogFile);
if(!bResult) goto fail; if(!bResult) goto fail;
InitializeCriticalSection(&LogFile->cs); InitializeCriticalSection(&LogFile->cs);
LogfListAddItem(LogFile); LogfListAddItem(LogFile);
return LogFile; return LogFile;
@ -349,34 +349,34 @@ VOID LogfClose(PLOGFILE LogFile)
return; return;
EnterCriticalSection(&LogFile->cs); EnterCriticalSection(&LogFile->cs);
FlushFileBuffers(LogFile->hFile); FlushFileBuffers(LogFile->hFile);
CloseHandle(LogFile->hFile); CloseHandle(LogFile->hFile);
LogfListRemoveItem(LogFile); LogfListRemoveItem(LogFile);
DeleteCriticalSection(&LogFile->cs); DeleteCriticalSection(&LogFile->cs);
HeapFree(MyHeap, 0, LogFile->LogName); HeapFree(MyHeap, 0, LogFile->LogName);
HeapFree(MyHeap, 0, LogFile->FileName); HeapFree(MyHeap, 0, LogFile->FileName);
HeapFree(MyHeap, 0, LogFile->OffsetInfo); HeapFree(MyHeap, 0, LogFile->OffsetInfo);
HeapFree(MyHeap, 0, LogFile); HeapFree(MyHeap, 0, LogFile);
return; return;
} }
PLOGFILE LogfListItemByName(WCHAR *Name) PLOGFILE LogfListItemByName(WCHAR *Name)
{ {
PLOGFILE Item, Ret = NULL; PLOGFILE Item, Ret = NULL;
EnterCriticalSection(&LogListCs); EnterCriticalSection(&LogListCs);
for(Item = LogListHead; Item; Item = (PLOGFILE)Item->Next) for(Item = LogListHead; Item; Item = (PLOGFILE)Item->Next)
if(Item->LogName && lstrcmpi(Item->LogName, Name)==0) if(Item->LogName && lstrcmpi(Item->LogName, Name)==0)
{ {
Ret = Item; Ret = Item;
break; break;
} }
LeaveCriticalSection(&LogListCs); LeaveCriticalSection(&LogListCs);
return Ret; return Ret;
} }
@ -395,7 +395,7 @@ INT LogfListItemIndexByName(WCHAR *Name)
ret = i; ret = i;
break; break;
} }
LeaveCriticalSection(&LogListCs); LeaveCriticalSection(&LogListCs);
return ret; return ret;
} }
@ -405,11 +405,11 @@ PLOGFILE LogfListItemByIndex(INT Index)
{ {
INT i = 1; INT i = 1;
PLOGFILE Item = LogListHead; PLOGFILE Item = LogListHead;
EnterCriticalSection(&LogListCs); EnterCriticalSection(&LogListCs);
for(; Item && i<Index; Item = (PLOGFILE)Item->Next, i++); for(; Item && i<Index; Item = (PLOGFILE)Item->Next, i++);
LeaveCriticalSection(&LogListCs); LeaveCriticalSection(&LogListCs);
return Item; return Item;
} }
@ -417,40 +417,40 @@ INT LogfListItemCount()
{ {
PLOGFILE Item = LogListHead; PLOGFILE Item = LogListHead;
INT i = 0; INT i = 0;
EnterCriticalSection(&LogListCs); EnterCriticalSection(&LogListCs);
while(Item) while(Item)
{ {
i++; i++;
Item = (PLOGFILE) Item->Next; Item = (PLOGFILE) Item->Next;
} }
LeaveCriticalSection(&LogListCs); LeaveCriticalSection(&LogListCs);
return i; return i;
} }
VOID LogfListAddItem(PLOGFILE Item) VOID LogfListAddItem(PLOGFILE Item)
{ {
EnterCriticalSection(&LogListCs); EnterCriticalSection(&LogListCs);
if(LogListHead) if(LogListHead)
{ {
PLOGFILE List = LogListHead; PLOGFILE List = LogListHead;
while(List->Next) while(List->Next)
List = (PLOGFILE)List->Next; List = (PLOGFILE)List->Next;
Item->Prev = (PVOID)List; Item->Prev = (PVOID)List;
Item->Next = NULL; Item->Next = NULL;
List->Next = Item; List->Next = Item;
} }
else else
{ {
Item->Next = NULL; Item->Next = NULL;
Item->Prev = NULL; Item->Prev = NULL;
LogListHead = Item; LogListHead = Item;
} }
LeaveCriticalSection(&LogListCs); LeaveCriticalSection(&LogListCs);
} }
@ -458,7 +458,7 @@ VOID LogfListRemoveItem(PLOGFILE Item)
{ {
PLOGFILE prev = (PLOGFILE)Item->Prev; PLOGFILE prev = (PLOGFILE)Item->Prev;
PLOGFILE next = (PLOGFILE)Item->Next; PLOGFILE next = (PLOGFILE)Item->Next;
EnterCriticalSection(&LogListCs); EnterCriticalSection(&LogListCs);
if(prev && next) if(prev && next)
@ -473,7 +473,7 @@ VOID LogfListRemoveItem(PLOGFILE Item)
} }
else if(prev) prev->Next = NULL; else if(prev) prev->Next = NULL;
else LogListHead = NULL; else LogListHead = NULL;
LeaveCriticalSection(&LogListCs); LeaveCriticalSection(&LogListCs);
} }
@ -505,11 +505,11 @@ BOOL LogfReadEvent(PLOGFILE LogFile,
{ {
return FALSE; return FALSE;
} }
dwRecNum = RecordNumber; dwRecNum = RecordNumber;
EnterCriticalSection(&LogFile->cs); EnterCriticalSection(&LogFile->cs);
dwOffset = LogfOffsetByNumber(LogFile, dwRecNum); dwOffset = LogfOffsetByNumber(LogFile, dwRecNum);
if(!dwOffset) if(!dwOffset)
{ {
LeaveCriticalSection(&LogFile->cs); LeaveCriticalSection(&LogFile->cs);
@ -523,14 +523,14 @@ BOOL LogfReadEvent(PLOGFILE LogFile,
LeaveCriticalSection(&LogFile->cs); LeaveCriticalSection(&LogFile->cs);
return FALSE; return FALSE;
} }
if(!ReadFile(LogFile->hFile, &dwRecSize, sizeof(DWORD), &dwRead, NULL)) if(!ReadFile(LogFile->hFile, &dwRecSize, sizeof(DWORD), &dwRead, NULL))
{ {
DPRINT1("ReadFile() failed! %d\n", GetLastError()); DPRINT1("ReadFile() failed! %d\n", GetLastError());
LeaveCriticalSection(&LogFile->cs); LeaveCriticalSection(&LogFile->cs);
return FALSE; return FALSE;
} }
if(dwRecSize > BufSize) if(dwRecSize > BufSize)
{ {
*BytesRead = 0; *BytesRead = 0;
@ -540,9 +540,9 @@ BOOL LogfReadEvent(PLOGFILE LogFile,
return FALSE; return FALSE;
} }
if(SetFilePointer(LogFile->hFile, if(SetFilePointer(LogFile->hFile,
-((LONG)sizeof(DWORD)), -((LONG)sizeof(DWORD)),
NULL, NULL,
FILE_CURRENT) == INVALID_SET_FILE_POINTER) FILE_CURRENT) == INVALID_SET_FILE_POINTER)
{ {
DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); DPRINT1("SetFilePointer() failed! %d\n", GetLastError());
@ -556,7 +556,7 @@ BOOL LogfReadEvent(PLOGFILE LogFile,
LeaveCriticalSection(&LogFile->cs); LeaveCriticalSection(&LogFile->cs);
return FALSE; return FALSE;
} }
dwBufferUsage+=dwRead; dwBufferUsage+=dwRead;
while(dwBufferUsage<BufSize) while(dwBufferUsage<BufSize)
@ -575,17 +575,17 @@ BOOL LogfReadEvent(PLOGFILE LogFile,
LeaveCriticalSection(&LogFile->cs); LeaveCriticalSection(&LogFile->cs);
return FALSE; return FALSE;
} }
if(!ReadFile(LogFile->hFile, &dwRecSize, sizeof(DWORD), &dwRead, NULL)) if(!ReadFile(LogFile->hFile, &dwRecSize, sizeof(DWORD), &dwRead, NULL))
{ {
DPRINT1("ReadFile() failed! %d\n", GetLastError()); DPRINT1("ReadFile() failed! %d\n", GetLastError());
LeaveCriticalSection(&LogFile->cs); LeaveCriticalSection(&LogFile->cs);
return FALSE; return FALSE;
} }
if(dwBufferUsage+dwRecSize>BufSize)break; if(dwBufferUsage+dwRecSize>BufSize)break;
if(SetFilePointer(LogFile->hFile, if(SetFilePointer(LogFile->hFile,
-((LONG)sizeof(DWORD)), -((LONG)sizeof(DWORD)),
NULL, NULL,
FILE_CURRENT) == INVALID_SET_FILE_POINTER) FILE_CURRENT) == INVALID_SET_FILE_POINTER)
@ -594,8 +594,8 @@ BOOL LogfReadEvent(PLOGFILE LogFile,
LeaveCriticalSection(&LogFile->cs); LeaveCriticalSection(&LogFile->cs);
return FALSE; return FALSE;
} }
if(!ReadFile(LogFile->hFile, if(!ReadFile(LogFile->hFile,
Buffer+dwBufferUsage, Buffer+dwBufferUsage,
dwRecSize, dwRecSize,
&dwRead, &dwRead,
@ -629,18 +629,18 @@ BOOL LogfWriteData(PLOGFILE LogFile,
GetSystemTime(&st); GetSystemTime(&st);
SystemTimeToEventTime(&st, &((PEVENTLOGRECORD)Buffer)->TimeWritten); SystemTimeToEventTime(&st, &((PEVENTLOGRECORD)Buffer)->TimeWritten);
EnterCriticalSection(&LogFile->cs); EnterCriticalSection(&LogFile->cs);
if(SetFilePointer(LogFile->hFile, if(SetFilePointer(LogFile->hFile,
LogFile->Header.EofOffset, LogFile->Header.EofOffset,
NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER) NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER)
{ {
DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); DPRINT1("SetFilePointer() failed! %d\n", GetLastError());
LeaveCriticalSection(&LogFile->cs); LeaveCriticalSection(&LogFile->cs);
return FALSE; return FALSE;
} }
if(!WriteFile(LogFile->hFile, Buffer, BufSize, &dwWritten, NULL)) if(!WriteFile(LogFile->hFile, Buffer, BufSize, &dwWritten, NULL))
{ {
DPRINT1("WriteFile() failed! %d\n", GetLastError()); DPRINT1("WriteFile() failed! %d\n", GetLastError());
@ -648,8 +648,8 @@ BOOL LogfWriteData(PLOGFILE LogFile,
return FALSE; return FALSE;
} }
if(!LogfAddOffsetInformation(LogFile, if(!LogfAddOffsetInformation(LogFile,
LogFile->Header.NextRecord, LogFile->Header.NextRecord,
LogFile->Header.EofOffset)) LogFile->Header.EofOffset))
{ {
LeaveCriticalSection(&LogFile->cs); LeaveCriticalSection(&LogFile->cs);
@ -658,7 +658,7 @@ BOOL LogfWriteData(PLOGFILE LogFile,
LogFile->Header.NextRecord++; LogFile->Header.NextRecord++;
LogFile->Header.EofOffset += dwWritten; LogFile->Header.EofOffset += dwWritten;
if(LogFile->Header.OldestRecord == 0) if(LogFile->Header.OldestRecord == 0)
LogFile->Header.OldestRecord = 1; LogFile->Header.OldestRecord = 1;
@ -673,9 +673,9 @@ BOOL LogfWriteData(PLOGFILE LogFile,
EofRec.StartOffset = LogFile->Header.FirstRecordOffset; EofRec.StartOffset = LogFile->Header.FirstRecordOffset;
EofRec.EndOffset = LogFile->Header.EofOffset; EofRec.EndOffset = LogFile->Header.EofOffset;
if(!WriteFile(LogFile->hFile, if(!WriteFile(LogFile->hFile,
&EofRec, &EofRec,
sizeof(EOF_RECORD), sizeof(EOF_RECORD),
&dwWritten, NULL)) &dwWritten, NULL))
{ {
DPRINT1("WriteFile() failed! %d\n", GetLastError()); DPRINT1("WriteFile() failed! %d\n", GetLastError());
@ -683,25 +683,25 @@ BOOL LogfWriteData(PLOGFILE LogFile,
return FALSE; return FALSE;
} }
if(SetFilePointer(LogFile->hFile, 0, NULL, FILE_BEGIN) if(SetFilePointer(LogFile->hFile, 0, NULL, FILE_BEGIN)
== INVALID_SET_FILE_POINTER) == INVALID_SET_FILE_POINTER)
{ {
DPRINT1("SetFilePointer() failed! %d\n", GetLastError()); DPRINT1("SetFilePointer() failed! %d\n", GetLastError());
LeaveCriticalSection(&LogFile->cs); LeaveCriticalSection(&LogFile->cs);
return FALSE; return FALSE;
} }
if(!WriteFile(LogFile->hFile, if(!WriteFile(LogFile->hFile,
&LogFile->Header, &LogFile->Header,
sizeof(FILE_HEADER), sizeof(FILE_HEADER),
&dwWritten, &dwWritten,
NULL)) NULL))
{ {
DPRINT1("WriteFile failed! LastError = %d\n", GetLastError()); DPRINT1("WriteFile failed! LastError = %d\n", GetLastError());
LeaveCriticalSection(&LogFile->cs); LeaveCriticalSection(&LogFile->cs);
return FALSE; return FALSE;
} }
if(!FlushFileBuffers(LogFile->hFile)) if(!FlushFileBuffers(LogFile->hFile))
{ {
LeaveCriticalSection(&LogFile->cs); LeaveCriticalSection(&LogFile->cs);
@ -711,7 +711,7 @@ BOOL LogfWriteData(PLOGFILE LogFile,
LeaveCriticalSection(&LogFile->cs); LeaveCriticalSection(&LogFile->cs);
return TRUE; return TRUE;
} }
ULONG LogfOffsetByNumber(PLOGFILE LogFile, ULONG LogfOffsetByNumber(PLOGFILE LogFile,
DWORD RecordNumber) DWORD RecordNumber)
@ -729,15 +729,15 @@ DWORD LogfGetOldestRecord(PLOGFILE LogFile)
return LogFile->Header.OldestRecord; return LogFile->Header.OldestRecord;
} }
BOOL LogfAddOffsetInformation(PLOGFILE LogFile, BOOL LogfAddOffsetInformation(PLOGFILE LogFile,
ULONG ulNumber, ULONG ulNumber,
ULONG ulOffset) ULONG ulOffset)
{ {
LPVOID NewOffsetInfo; LPVOID NewOffsetInfo;
if(LogFile->OffsetInfoNext == LogFile->OffsetInfoSize) if(LogFile->OffsetInfoNext == LogFile->OffsetInfoSize)
{ {
NewOffsetInfo = HeapReAlloc(MyHeap, NewOffsetInfo = HeapReAlloc(MyHeap,
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
LogFile->OffsetInfo, LogFile->OffsetInfo,
(LogFile->OffsetInfoSize+64)* (LogFile->OffsetInfoSize+64)*
@ -780,7 +780,7 @@ PBYTE LogfAllocAndBuildNewRecord(LPDWORD lpRecSize,
UINT i, pos, nStrings; UINT i, pos, nStrings;
PBYTE Buffer; PBYTE Buffer;
dwRecSize = sizeof(EVENTLOGRECORD) + (lstrlenW(ComputerName) + dwRecSize = sizeof(EVENTLOGRECORD) + (lstrlenW(ComputerName) +
lstrlenW(SourceName) + 2)*sizeof(WCHAR); lstrlenW(SourceName) + 2)*sizeof(WCHAR);
if(dwRecSize % 4 != 0) dwRecSize += 4 - (dwRecSize % 4); if(dwRecSize % 4 != 0) dwRecSize += 4 - (dwRecSize % 4);
@ -796,7 +796,7 @@ PBYTE LogfAllocAndBuildNewRecord(LPDWORD lpRecSize,
if(dwRecSize % 4 != 0) dwRecSize += 4 - (dwRecSize % 4); if(dwRecSize % 4 != 0) dwRecSize += 4 - (dwRecSize % 4);
dwRecSize+=4; dwRecSize+=4;
Buffer = HeapAlloc(MyHeap, HEAP_ZERO_MEMORY, dwRecSize); Buffer = (BYTE*) HeapAlloc(MyHeap, HEAP_ZERO_MEMORY, dwRecSize);
if(!Buffer) if(!Buffer)
{ {
DPRINT1("Can't allocate heap!\n"); DPRINT1("Can't allocate heap!\n");
@ -854,7 +854,7 @@ PBYTE LogfAllocAndBuildNewRecord(LPDWORD lpRecSize,
if(pos % 4 != 0) pos += 4 - (pos % 4); if(pos % 4 != 0) pos += 4 - (pos % 4);
*((PDWORD)(Buffer+pos)) = dwRecSize; *((PDWORD)(Buffer+pos)) = dwRecSize;
*lpRecSize = dwRecSize; *lpRecSize = dwRecSize;
return Buffer; return Buffer;
} }

28
reactos/base/setup/welcome/welcome.c
View file

@ -300,7 +300,7 @@ GetButtonHeight(HDC hDC,
rect.top = 0; rect.top = 0;
rect.bottom = 25; rect.bottom = 25;
hOldFont = SelectObject(hDC, hFont); hOldFont = (HFONT) SelectObject(hDC, hFont);
DrawText(hDC, szText, -1, &rect, DT_TOP | DT_CALCRECT | DT_WORDBREAK); DrawText(hDC, szText, -1, &rect, DT_TOP | DT_CALCRECT | DT_WORDBREAK);
SelectObject(hDC, hOldFont); SelectObject(hDC, hOldFont);
@ -487,7 +487,7 @@ PaintBanner(HDC hdc, LPRECT rcPanel)
HBRUSH hOldBrush; HBRUSH hOldBrush;
/* Title bitmap */ /* Title bitmap */
hOldBitmap = SelectObject(hdcMem, hTitleBitmap); hOldBitmap = (HBITMAP) SelectObject(hdcMem, hTitleBitmap);
BitBlt(hdc, BitBlt(hdc,
rcPanel->left, rcPanel->left,
rcPanel->top, rcPanel->top,
@ -497,7 +497,7 @@ PaintBanner(HDC hdc, LPRECT rcPanel)
SelectObject(hdcMem, hOldBitmap); SelectObject(hdcMem, hOldBitmap);
/* Dark blue line */ /* Dark blue line */
hOldBrush = SelectObject(hdc, hbrDarkBlue); hOldBrush = (HBRUSH) SelectObject(hdc, hbrDarkBlue);
PatBlt(hdc, PatBlt(hdc,
rcPanel->left, rcPanel->left,
rcPanel->bottom - 3, rcPanel->bottom - 3,
@ -535,7 +535,7 @@ OnPaint(HWND hWnd, WPARAM wParam, LPARAM lParam)
PaintBanner(hdc, &rcTitlePanel); PaintBanner(hdc, &rcTitlePanel);
/* Left panel */ /* Left panel */
hOldBrush = SelectObject (hdc, hbrLightBlue); hOldBrush = (HBRUSH) SelectObject (hdc, hbrLightBlue);
PatBlt(hdc, PatBlt(hdc,
rcLeftPanel.left, rcLeftPanel.left,
rcLeftPanel.top, rcLeftPanel.top,
@ -545,7 +545,7 @@ OnPaint(HWND hWnd, WPARAM wParam, LPARAM lParam)
SelectObject(hdc, hOldBrush); SelectObject(hdc, hOldBrush);
/* Right panel */ /* Right panel */
hOldBrush = SelectObject (hdc, WHITE_BRUSH); hOldBrush = (HBRUSH) SelectObject (hdc, WHITE_BRUSH);
PatBlt(hdc, PatBlt(hdc,
rcRightPanel.left, rcRightPanel.left,
rcRightPanel.top, rcRightPanel.top,
@ -556,7 +556,7 @@ OnPaint(HWND hWnd, WPARAM wParam, LPARAM lParam)
/* Draw dark verical line */ /* Draw dark verical line */
hPen = CreatePen(PS_SOLID, 0, DARK_BLUE); hPen = CreatePen(PS_SOLID, 0, DARK_BLUE);
hOldPen = SelectObject(hdc, hPen); hOldPen = (HPEN) SelectObject(hdc, hPen);
MoveToEx(hdc, rcRightPanel.left, rcRightPanel.top, NULL); MoveToEx(hdc, rcRightPanel.left, rcRightPanel.top, NULL);
LineTo(hdc, rcRightPanel.left, rcRightPanel.bottom); LineTo(hdc, rcRightPanel.left, rcRightPanel.bottom);
SelectObject(hdc, hOldPen); SelectObject(hdc, hOldPen);
@ -566,7 +566,7 @@ OnPaint(HWND hWnd, WPARAM wParam, LPARAM lParam)
if ((nTopic == -1) && (hDefaultTopicBitmap != 0)) if ((nTopic == -1) && (hDefaultTopicBitmap != 0))
{ {
GetObject(hDefaultTopicBitmap, sizeof(BITMAP), &bmpInfo); GetObject(hDefaultTopicBitmap, sizeof(BITMAP), &bmpInfo);
hOldBitmap = SelectObject (hdcMem, hDefaultTopicBitmap); hOldBitmap = (HBITMAP) SelectObject (hdcMem, hDefaultTopicBitmap);
BitBlt(hdc, BitBlt(hdc,
rcRightPanel.right - bmpInfo.bmWidth, rcRightPanel.right - bmpInfo.bmWidth,
rcRightPanel.bottom - bmpInfo.bmHeight, rcRightPanel.bottom - bmpInfo.bmHeight,
@ -580,7 +580,7 @@ OnPaint(HWND hWnd, WPARAM wParam, LPARAM lParam)
else if ((nTopic != -1) && (hTopicBitmap[nTopic] != 0)) else if ((nTopic != -1) && (hTopicBitmap[nTopic] != 0))
{ {
GetObject(hTopicBitmap[nTopic], sizeof(BITMAP), &bmpInfo); GetObject(hTopicBitmap[nTopic], sizeof(BITMAP), &bmpInfo);
hOldBitmap = SelectObject (hdcMem, hTopicBitmap[nTopic]); hOldBitmap = (HBITMAP) SelectObject (hdcMem, hTopicBitmap[nTopic]);
BitBlt(hdc, BitBlt(hdc,
rcRightPanel.right - bmpInfo.bmWidth, rcRightPanel.right - bmpInfo.bmWidth,
rcRightPanel.bottom - bmpInfo.bmHeight, rcRightPanel.bottom - bmpInfo.bmHeight,
@ -626,7 +626,7 @@ OnPaint(HWND hWnd, WPARAM wParam, LPARAM lParam)
rcTitle.right = rcLeftPanel.right - 5; rcTitle.right = rcLeftPanel.right - 5;
rcTitle.top = rcLeftPanel.bottom - 40; rcTitle.top = rcLeftPanel.bottom - 40;
rcTitle.bottom = rcLeftPanel.bottom - 5; rcTitle.bottom = rcLeftPanel.bottom - 5;
hOldFont = SelectObject(hdc, hfontTopicDescription); hOldFont = (HFONT) SelectObject(hdc, hfontTopicDescription);
DrawText(hdc, version, -1, &rcTitle, DT_BOTTOM | DT_CALCRECT | DT_SINGLELINE); DrawText(hdc, version, -1, &rcTitle, DT_BOTTOM | DT_CALCRECT | DT_SINGLELINE);
DrawText(hdc, version, -1, &rcTitle, DT_BOTTOM | DT_SINGLELINE); DrawText(hdc, version, -1, &rcTitle, DT_BOTTOM | DT_SINGLELINE);
SelectObject(hdc, hOldFont); SelectObject(hdc, hOldFont);
@ -636,7 +636,7 @@ OnPaint(HWND hWnd, WPARAM wParam, LPARAM lParam)
rcTitle.right = rcRightPanel.right - 8; rcTitle.right = rcRightPanel.right - 8;
rcTitle.top = rcRightPanel.top + 8; rcTitle.top = rcRightPanel.top + 8;
rcTitle.bottom = rcTitle.top + 57; rcTitle.bottom = rcTitle.top + 57;
hOldFont = SelectObject(hdc, hfontTopicTitle); hOldFont = (HFONT) SelectObject(hdc, hfontTopicTitle);
DrawText(hdc, szTopicTitle, -1, &rcTitle, DT_TOP | DT_CALCRECT); DrawText(hdc, szTopicTitle, -1, &rcTitle, DT_TOP | DT_CALCRECT);
SetTextColor(hdc, DARK_BLUE); SetTextColor(hdc, DARK_BLUE);
@ -686,9 +686,9 @@ OnDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam)
else else
{ {
if (lpDis->CtlID == (ULONG)nTopic) if (lpDis->CtlID == (ULONG)nTopic)
hOldBrush = SelectObject(lpDis->hDC, hbrRightPanel); hOldBrush = (HBRUSH) SelectObject(lpDis->hDC, hbrRightPanel);
else else
hOldBrush = SelectObject(lpDis->hDC, hbrLightBlue); hOldBrush = (HBRUSH) SelectObject(lpDis->hDC, hbrLightBlue);
PatBlt(lpDis->hDC, PatBlt(lpDis->hDC,
lpDis->rcItem.left, lpDis->rcItem.left,
@ -699,7 +699,7 @@ OnDrawItem(HWND hWnd, WPARAM wParam, LPARAM lParam)
SelectObject(lpDis->hDC, hOldBrush); SelectObject(lpDis->hDC, hOldBrush);
hPen = CreatePen(PS_SOLID, 0, DARK_BLUE); hPen = CreatePen(PS_SOLID, 0, DARK_BLUE);
hOldPen = SelectObject(lpDis->hDC, hPen); hOldPen = (HPEN) SelectObject(lpDis->hDC, hPen);
MoveToEx(lpDis->hDC, lpDis->rcItem.left, lpDis->rcItem.bottom-1, NULL); MoveToEx(lpDis->hDC, lpDis->rcItem.left, lpDis->rcItem.bottom-1, NULL);
LineTo(lpDis->hDC, lpDis->rcItem.right, lpDis->rcItem.bottom-1); LineTo(lpDis->hDC, lpDis->rcItem.right, lpDis->rcItem.bottom-1);
SelectObject(lpDis->hDC, hOldPen); SelectObject(lpDis->hDC, hOldPen);
@ -723,7 +723,7 @@ OnMouseMove(HWND hWnd, WPARAM wParam, LPARAM lParam)
{ {
UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(wParam);
UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(lParam);
if (nTopic != -1) if (nTopic != -1)
{ {
nTopic = -1; nTopic = -1;

6
reactos/base/shell/cmd/batch.c
View file

@ -221,7 +221,7 @@ BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param)
SetLastError(0); SetLastError(0);
hFile = CreateFile (fullname, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, hFile = CreateFile (fullname, GENERIC_READ, FILE_SHARE_WRITE | FILE_SHARE_READ | FILE_SHARE_DELETE, NULL,
OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL | OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL |
FILE_FLAG_SEQUENTIAL_SCAN, NULL); FILE_FLAG_SEQUENTIAL_SCAN, NULL);
#ifdef _DEBUG #ifdef _DEBUG
DebugPrintf (_T("Batch: (\'%s\', \'%s\', \'%s\') hFile = %x\n"), DebugPrintf (_T("Batch: (\'%s\', \'%s\', \'%s\') hFile = %x\n"),
@ -264,7 +264,7 @@ BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param)
} }
bc->hBatchFile = hFile; bc->hBatchFile = hFile;
SetFilePointer (bc->hBatchFile, 0, NULL, FILE_BEGIN); SetFilePointer (bc->hBatchFile, 0, NULL, FILE_BEGIN);
bc->bEcho = bEcho; /* Preserve echo across batch calls */ bc->bEcho = bEcho; /* Preserve echo across batch calls */
bc->shiftlevel = 0; bc->shiftlevel = 0;
@ -275,7 +275,7 @@ BOOL Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param)
// //
// Allocate enough memory to hold the params and copy them over without modifications // Allocate enough memory to hold the params and copy them over without modifications
// //
bc->raw_params = malloc((_tcslen(param)+1) * sizeof(TCHAR)); bc->raw_params = (TCHAR*) malloc((_tcslen(param)+1) * sizeof(TCHAR));
if (bc->raw_params != NULL) if (bc->raw_params != NULL)
{ {
memset (bc->raw_params, 0, _tcslen(bc->raw_params) * sizeof(TCHAR)); memset (bc->raw_params, 0, _tcslen(bc->raw_params) * sizeof(TCHAR));

2
reactos/base/system/expand/expand.rbuild
View file

@ -2,7 +2,7 @@
<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd"> <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
<module name="expand" type="win32cui" installbase="system32" installname="expand.exe" usewrc="false"> <module name="expand" type="win32cui" installbase="system32" installname="expand.exe" usewrc="false">
<include base="ReactOS">include/reactos/wine</include> <include base="ReactOS">include/reactos/wine</include>
<include base="cmd">.</include> <include base="expand">.</include>
<define name="__USE_W32API" /> <define name="__USE_W32API" />
<define name="ANONYMOUSUNIONS" /> <define name="ANONYMOUSUNIONS" />
<define name="_WIN32_WINNT">0x0501</define> <define name="_WIN32_WINNT">0x0501</define>

24
reactos/base/system/msiexec/msiexec.c
View file

@ -135,7 +135,7 @@ static LPWSTR build_properties(struct string_list *property_list)
for(list = property_list; list; list = list->next) for(list = property_list; list; list = list->next)
len += lstrlenW(list->str) + 3; len += lstrlenW(list->str) + 3;
ret = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); ret = (WCHAR*) HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) );
/* add a space before each string, and quote the value */ /* add a space before each string, and quote the value */
p = ret; p = ret;
@ -179,7 +179,7 @@ static LPWSTR build_transforms(struct string_list *transform_list)
for(list = transform_list; list; list = list->next) for(list = transform_list; list; list = list->next)
len += lstrlenW(list->str) + 1; len += lstrlenW(list->str) + 1;
ret = HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) ); ret = (WCHAR*) HeapAlloc( GetProcessHeap(), 0, len*sizeof(WCHAR) );
/* add all the transforms with a semicolon between each one */ /* add all the transforms with a semicolon between each one */
p = ret; p = ret;
@ -211,7 +211,7 @@ static DWORD msi_atou(LPCWSTR str)
static LPWSTR msi_strdup(LPCWSTR str) static LPWSTR msi_strdup(LPCWSTR str)
{ {
DWORD len = lstrlenW(str)+1; DWORD len = lstrlenW(str)+1;
LPWSTR ret = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); LPWSTR ret = (WCHAR*) HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len);
lstrcpyW(ret, str); lstrcpyW(ret, str);
return ret; return ret;
} }
@ -227,7 +227,7 @@ static BOOL msi_strequal(LPCWSTR str1, LPCSTR str2)
return TRUE; return TRUE;
if( lstrlenW(str1) != (len-1) ) if( lstrlenW(str1) != (len-1) )
return TRUE; return TRUE;
strW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); strW = (WCHAR*) HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len);
MultiByteToWideChar( CP_ACP, 0, str2, -1, strW, len); MultiByteToWideChar( CP_ACP, 0, str2, -1, strW, len);
ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, str1, len, strW, len); ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, str1, len, strW, len);
HeapFree(GetProcessHeap(), 0, strW); HeapFree(GetProcessHeap(), 0, strW);
@ -245,7 +245,7 @@ static BOOL msi_strprefix(LPCWSTR str1, LPCSTR str2)
return TRUE; return TRUE;
if( lstrlenW(str1) < (len-1) ) if( lstrlenW(str1) < (len-1) )
return TRUE; return TRUE;
strW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len); strW = (WCHAR*) HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*len);
MultiByteToWideChar( CP_ACP, 0, str2, -1, strW, len); MultiByteToWideChar( CP_ACP, 0, str2, -1, strW, len);
ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, str1, len-1, strW, len-1); ret = CompareStringW(GetThreadLocale(), NORM_IGNORECASE, str1, len-1, strW, len-1);
HeapFree(GetProcessHeap(), 0, strW); HeapFree(GetProcessHeap(), 0, strW);
@ -393,7 +393,7 @@ static void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv )
int i, n; int i, n;
n = chomp( p ); n = chomp( p );
argv = HeapAlloc(GetProcessHeap(), 0, sizeof (WCHAR*)*(n+1)); argv = (WCHAR**) HeapAlloc(GetProcessHeap(), 0, sizeof (WCHAR*)*(n+1));
for( i=0; i<n; i++ ) for( i=0; i<n; i++ )
{ {
argv[i] = p; argv[i] = p;
@ -419,7 +419,7 @@ static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv )
r = RegQueryValueExW(hkey, ident, 0, &type, 0, &sz); r = RegQueryValueExW(hkey, ident, 0, &type, 0, &sz);
if(r == ERROR_SUCCESS && type == REG_SZ) if(r == ERROR_SUCCESS && type == REG_SZ)
{ {
buf = HeapAlloc(GetProcessHeap(), 0, sz); buf = (WCHAR*) HeapAlloc(GetProcessHeap(), 0, sz);
r = RegQueryValueExW(hkey, ident, 0, &type, (LPBYTE)buf, &sz); r = RegQueryValueExW(hkey, ident, 0, &type, (LPBYTE)buf, &sz);
if( r == ERROR_SUCCESS ) if( r == ERROR_SUCCESS )
{ {
@ -781,23 +781,23 @@ int main(int argc, char **argv)
} }
else if(!msi_strequal(argvW[i]+2, "f")) else if(!msi_strequal(argvW[i]+2, "f"))
{ {
InstallUILevel = INSTALLUILEVEL_FULL|INSTALLUILEVEL_ENDDIALOG; InstallUILevel = (INSTALLUILEVEL) (INSTALLUILEVEL_FULL|INSTALLUILEVEL_ENDDIALOG);
} }
else if(!msi_strequal(argvW[i]+2, "n+")) else if(!msi_strequal(argvW[i]+2, "n+"))
{ {
InstallUILevel = INSTALLUILEVEL_NONE|INSTALLUILEVEL_ENDDIALOG; InstallUILevel = (INSTALLUILEVEL) (INSTALLUILEVEL_NONE|INSTALLUILEVEL_ENDDIALOG);
} }
else if(!msi_strequal(argvW[i]+2, "b+")) else if(!msi_strequal(argvW[i]+2, "b+"))
{ {
InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG; InstallUILevel = (INSTALLUILEVEL) (INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG);
} }
else if(!msi_strequal(argvW[i]+2, "b-")) else if(!msi_strequal(argvW[i]+2, "b-"))
{ {
InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY; InstallUILevel = (INSTALLUILEVEL) (INSTALLUILEVEL_BASIC|INSTALLUILEVEL_PROGRESSONLY);
} }
else if(!msi_strequal(argvW[i]+2, "b+!")) else if(!msi_strequal(argvW[i]+2, "b+!"))
{ {
InstallUILevel = INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG; InstallUILevel = (INSTALLUILEVEL) (INSTALLUILEVEL_BASIC|INSTALLUILEVEL_ENDDIALOG);
WINE_FIXME("Unknown modifier: !\n"); WINE_FIXME("Unknown modifier: !\n");
} }
else else

8
reactos/base/system/services/database.c
View file

@ -137,7 +137,7 @@ ScmCreateNewServiceRecord(LPWSTR lpServiceName,
DPRINT("Service: '%S'\n", lpServiceName); DPRINT("Service: '%S'\n", lpServiceName);
/* Allocate service entry */ /* Allocate service entry */
lpService = HeapAlloc(GetProcessHeap(), lpService = (SERVICE*) HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
sizeof(SERVICE) + ((wcslen(lpServiceName) + 1) * sizeof(WCHAR))); sizeof(SERVICE) + ((wcslen(lpServiceName) + 1) * sizeof(WCHAR)));
if (lpService == NULL) if (lpService == NULL)
@ -449,7 +449,7 @@ ScmCheckDriver(PSERVICE Service)
BufferLength = sizeof(OBJECT_DIRECTORY_INFORMATION) + BufferLength = sizeof(OBJECT_DIRECTORY_INFORMATION) +
2 * MAX_PATH * sizeof(WCHAR); 2 * MAX_PATH * sizeof(WCHAR);
DirInfo = HeapAlloc(GetProcessHeap(), DirInfo = (OBJECT_DIRECTORY_INFORMATION*) HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
BufferLength); BufferLength);
@ -541,7 +541,7 @@ ScmControlService(PSERVICE Service,
DPRINT("ScmControlService() called\n"); DPRINT("ScmControlService() called\n");
ControlPacket = HeapAlloc(GetProcessHeap(), ControlPacket = (SCM_CONTROL_PACKET*) HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
sizeof(SCM_CONTROL_PACKET)); sizeof(SCM_CONTROL_PACKET));
if (ControlPacket == NULL) if (ControlPacket == NULL)
@ -600,7 +600,7 @@ ScmSendStartCommand(PSERVICE Service,
DPRINT("ArgsLength: %ld\nTotalLength: %ld\n\n", ArgsLength, TotalLength); DPRINT("ArgsLength: %ld\nTotalLength: %ld\n\n", ArgsLength, TotalLength);
/* Allocate a control packet */ /* Allocate a control packet */
ControlPacket = HeapAlloc(GetProcessHeap(), ControlPacket = (SCM_CONTROL_PACKET*) HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
sizeof(SCM_CONTROL_PACKET) + (TotalLength - 1) * sizeof(WCHAR)); sizeof(SCM_CONTROL_PACKET) + (TotalLength - 1) * sizeof(WCHAR));
if (ControlPacket == NULL) if (ControlPacket == NULL)

2
reactos/base/system/services/driver.c
View file

@ -123,7 +123,7 @@ ScmGetDriverStatus(PSERVICE lpService,
BufferLength = sizeof(OBJECT_DIRECTORY_INFORMATION) + BufferLength = sizeof(OBJECT_DIRECTORY_INFORMATION) +
2 * MAX_PATH * sizeof(WCHAR); 2 * MAX_PATH * sizeof(WCHAR);
DirInfo = HeapAlloc(GetProcessHeap(), DirInfo = (OBJECT_DIRECTORY_INFORMATION*) HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
BufferLength); BufferLength);

4
reactos/base/system/services/groupdb.c
View file

@ -139,13 +139,13 @@ CreateGroupListRoutine(PWSTR ValueName,
Group = (PSERVICE_GROUP)HeapAlloc(GetProcessHeap(), Group = (PSERVICE_GROUP)HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
sizeof(SERVICE_GROUP) + (wcslen(ValueData) * sizeof(WCHAR))); sizeof(SERVICE_GROUP) + (wcslen((const wchar_t*) ValueData) * sizeof(WCHAR)));
if (Group == NULL) if (Group == NULL)
{ {
return STATUS_INSUFFICIENT_RESOURCES; return STATUS_INSUFFICIENT_RESOURCES;
} }
wcscpy(Group->szGroupName, ValueData); wcscpy(Group->szGroupName, (const wchar_t*) ValueData);
Group->lpGroupName = Group->szGroupName; Group->lpGroupName = Group->szGroupName;
Group->dwRefCount = (DWORD)-1; Group->dwRefCount = (DWORD)-1;

8
reactos/base/system/services/rpcserver.c
View file

@ -146,7 +146,7 @@ ScmCreateManagerHandle(LPWSTR lpDatabaseName,
if (lpDatabaseName == NULL) if (lpDatabaseName == NULL)
lpDatabaseName = SERVICES_ACTIVE_DATABASEW; lpDatabaseName = SERVICES_ACTIVE_DATABASEW;
Ptr = HeapAlloc(GetProcessHeap(), Ptr = (MANAGER_HANDLE*) HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
sizeof(MANAGER_HANDLE) + wcslen(lpDatabaseName) * sizeof(WCHAR)); sizeof(MANAGER_HANDLE) + wcslen(lpDatabaseName) * sizeof(WCHAR));
if (Ptr == NULL) if (Ptr == NULL)
@ -171,7 +171,7 @@ ScmCreateServiceHandle(PSERVICE lpServiceEntry,
{ {
PSERVICE_HANDLE Ptr; PSERVICE_HANDLE Ptr;
Ptr = HeapAlloc(GetProcessHeap(), Ptr = (SERVICE_HANDLE*) HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
sizeof(SERVICE_HANDLE)); sizeof(SERVICE_HANDLE));
if (Ptr == NULL) if (Ptr == NULL)
@ -1033,7 +1033,7 @@ ScmrCreateServiceW(handle_t BindingHandle,
* first part of full file name is the OS directory */ * first part of full file name is the OS directory */
if (lpBinaryPathName[1] == ':') lpBinaryPathName += GetWindowsDirectoryW(NULL, 0); if (lpBinaryPathName[1] == ':') lpBinaryPathName += GetWindowsDirectoryW(NULL, 0);
lpImagePath = HeapAlloc(GetProcessHeap(), lpImagePath = (WCHAR*) HeapAlloc(GetProcessHeap(),
HEAP_ZERO_MEMORY, HEAP_ZERO_MEMORY,
(wcslen(lpBinaryPathName) + 1) * sizeof(WCHAR)); (wcslen(lpBinaryPathName) + 1) * sizeof(WCHAR));
if (lpImagePath == NULL) if (lpImagePath == NULL)
@ -1060,7 +1060,7 @@ ScmrCreateServiceW(handle_t BindingHandle,
*lpDisplayName != 0 && *lpDisplayName != 0 &&
wcsicmp(lpService->lpDisplayName, lpDisplayName) != 0) wcsicmp(lpService->lpDisplayName, lpDisplayName) != 0)
{ {
lpService->lpDisplayName = HeapAlloc(GetProcessHeap(), 0, lpService->lpDisplayName = (WCHAR*) HeapAlloc(GetProcessHeap(), 0,
(wcslen(lpDisplayName) + 1) * sizeof(WCHAR)); (wcslen(lpDisplayName) + 1) * sizeof(WCHAR));
if (lpService->lpDisplayName == NULL) if (lpService->lpDisplayName == NULL)
{ {

2
reactos/base/system/userinit/userinit.c
View file

@ -51,7 +51,7 @@ ReadRegSzKey(
return rc; return rc;
if (dwType != REG_SZ) if (dwType != REG_SZ)
return ERROR_FILE_NOT_FOUND; return ERROR_FILE_NOT_FOUND;
Value = HeapAlloc(GetProcessHeap(), 0, cbData + sizeof(WCHAR)); Value = (WCHAR*) HeapAlloc(GetProcessHeap(), 0, cbData + sizeof(WCHAR));
if (!Value) if (!Value)
return ERROR_NOT_ENOUGH_MEMORY; return ERROR_NOT_ENOUGH_MEMORY;
rc = RegQueryValueExW(hKey, pszKey, NULL, NULL, (LPBYTE)Value, &cbData); rc = RegQueryValueExW(hKey, pszKey, NULL, NULL, (LPBYTE)Value, &cbData);