- Fix compilation errors with GCC 4.0-20041212.

svn path=/trunk/; revision=12230
This commit is contained in:
Filip Navara 2004-12-19 19:35:05 +00:00
parent 2513acd5bf
commit 9367e001e8
5 changed files with 8 additions and 8 deletions

View file

@ -1049,7 +1049,7 @@ VOID DispTdiQueryInformationExComplete(
Count = CopyBufferToBufferChain( Count = CopyBufferToBufferChain(
QueryContext->InputMdl, QueryContext->InputMdl,
FIELD_OFFSET(TCP_REQUEST_QUERY_INFORMATION_EX, Context), FIELD_OFFSET(TCP_REQUEST_QUERY_INFORMATION_EX, Context),
(PUCHAR)&QueryContext->QueryInfo.Context, (PCHAR)&QueryContext->QueryInfo.Context,
CONTEXT_SIZE); CONTEXT_SIZE);
} }

View file

@ -19,7 +19,7 @@ TDI_STATUS InfoCopyOut( PCHAR DataOut, UINT SizeOut,
if( RememberedCBSize < SizeOut ) if( RememberedCBSize < SizeOut )
return TDI_BUFFER_TOO_SMALL; return TDI_BUFFER_TOO_SMALL;
else { else {
CopyBufferToBufferChain( ClientBuf, 0, (PUCHAR)DataOut, SizeOut ); CopyBufferToBufferChain( ClientBuf, 0, (PCHAR)DataOut, SizeOut );
return TDI_SUCCESS; return TDI_SUCCESS;
} }
} }
@ -99,7 +99,7 @@ TDI_STATUS InfoTdiQueryListEntities(PNDIS_BUFFER Buffer,
for( Count = 0; Count < EntityCount; Count++ ) { for( Count = 0; Count < EntityCount; Count++ ) {
CopyBufferToBufferChain(Buffer, CopyBufferToBufferChain(Buffer,
Count * sizeof(TDIEntityID), Count * sizeof(TDIEntityID),
(PUCHAR)&EntityList[Count], (PCHAR)&EntityList[Count],
sizeof(TDIEntityID)); sizeof(TDIEntityID));
} }

View file

@ -220,7 +220,7 @@ TDI_STATUS InfoNetworkLayerTdiSetEx( UINT InfoClass,
TI_DbgPrint(MID_TRACE,("Called\n")); TI_DbgPrint(MID_TRACE,("Called\n"));
OskitDumpBuffer( Buffer, BufferSize ); OskitDumpBuffer( (OSK_PCHAR)Buffer, BufferSize );
if( InfoClass == INFO_CLASS_PROTOCOL && if( InfoClass == INFO_CLASS_PROTOCOL &&
InfoType == INFO_TYPE_PROVIDER && InfoType == INFO_TYPE_PROVIDER &&

View file

@ -12,7 +12,7 @@
void void
RosRtlDevModeA2W ( LPDEVMODEW pW, const LPDEVMODEA pA ) RosRtlDevModeA2W ( LPDEVMODEW pW, const LPDEVMODEA pA )
{ {
#define COPYS(f,len) MultiByteToWideChar ( CP_THREAD_ACP, 0, pA->f, len, pW->f, len ) #define COPYS(f,len) MultiByteToWideChar ( CP_THREAD_ACP, 0, (LPSTR)pA->f, len, pW->f, len )
#define COPYN(f) pW->f = pA->f #define COPYN(f) pW->f = pA->f
memset ( pW, 0, sizeof(DEVMODEW) ); memset ( pW, 0, sizeof(DEVMODEW) );
COPYS(dmDeviceName, CCHDEVICENAME ); COPYS(dmDeviceName, CCHDEVICENAME );
@ -78,7 +78,7 @@ RosRtlDevModeA2W ( LPDEVMODEW pW, const LPDEVMODEA pA )
void void
RosRtlDevModeW2A( LPDEVMODEA pA, const LPDEVMODEW pW ) RosRtlDevModeW2A( LPDEVMODEA pA, const LPDEVMODEW pW )
{ {
#define COPYS(f,len) WideCharToMultiByte( CP_THREAD_ACP, 0, pW->f, len, pA->f, len, NULL, NULL ) #define COPYS(f,len) WideCharToMultiByte( CP_THREAD_ACP, 0, pW->f, len, (LPSTR)pA->f, len, NULL, NULL )
#define COPYN(f) pA->f = pW->f #define COPYN(f) pA->f = pW->f
memset ( pA, 0, sizeof(DEVMODEA) ); memset ( pA, 0, sizeof(DEVMODEA) );
COPYS(dmDeviceName, CCHDEVICENAME ); COPYS(dmDeviceName, CCHDEVICENAME );

View file

@ -246,7 +246,7 @@ int main(int argc, char* argv[])
for (Idx = 0; Idx < PEFileHeader.NumberOfSections; Idx++) for (Idx = 0; Idx < PEFileHeader.NumberOfSections; Idx++)
{ {
//printf("section: '%.08s'\n", PESectionHeaders[Idx].Name); //printf("section: '%.08s'\n", PESectionHeaders[Idx].Name);
if ((strncmp(PESectionHeaders[Idx].Name, ".stab", 5) == 0) if ((strncmp((char*)PESectionHeaders[Idx].Name, ".stab", 5) == 0)
&& (PESectionHeaders[Idx].Name[5] == 0)) && (PESectionHeaders[Idx].Name[5] == 0))
{ {
//printf(".stab section found. Size %d\n", //printf(".stab section found. Size %d\n",
@ -259,7 +259,7 @@ int main(int argc, char* argv[])
n_in = fread(SymbolsBase, 1, SymbolsLength, in); n_in = fread(SymbolsBase, 1, SymbolsLength, in);
} }
if (strncmp(PESectionHeaders[Idx].Name, ".stabstr", 8) == 0) if (strncmp((char*)PESectionHeaders[Idx].Name, ".stabstr", 8) == 0)
{ {
//printf(".stabstr section found. Size %d\n", //printf(".stabstr section found. Size %d\n",
// PESectionHeaders[Idx].SizeOfRawData); // PESectionHeaders[Idx].SizeOfRawData);