Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-29 02:52:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix incompatible pointer type warnings

Browse source 
svn path=/trunk/; revision=27961
This commit is contained in:
Thomas Bluemel 2007-07-28 18:24:09 +00:00
parent f3ad83cca1
commit b6b71503a4
9 changed files with 64 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

4
reactos/base/setup/usetup/cabinet.c
View file

@ -46,8 +46,8 @@ static WCHAR DestPath[MAX_PATH];
static HANDLE FileHandle;
static HANDLE FileSectionHandle;
static PUCHAR FileBuffer;
static ULONG DestFileSize;
static ULONG FileSize;
static SIZE_T DestFileSize;
static SIZE_T FileSize;
static BOOL FileOpen = FALSE;
static PCFHEADER PCABHeader;
static PCFFOLDER CabinetFolders;

2
reactos/base/setup/usetup/fslist.c
View file

@ -138,7 +138,7 @@ DrawFileSystemList(
PLIST_ENTRY ListEntry;
PFILE_SYSTEM_ITEM Item;
COORD coPos;
ULONG Written;
DWORD Written;
ULONG Index = 0;
CHAR Buffer[70];

4
reactos/base/setup/usetup/genlist.c
View file

@ -115,7 +115,7 @@ static VOID
DrawListFrame(PGENERIC_LIST GenericList)
{
COORD coPos;
ULONG Written;
DWORD Written;
SHORT i;
/* Draw upper left corner */
@ -199,7 +199,7 @@ DrawListEntries(PGENERIC_LIST GenericList)
PGENERIC_LIST_ENTRY ListEntry;
PLIST_ENTRY Entry;
COORD coPos;
ULONG Written;
DWORD Written;
USHORT Width;
coPos.X = GenericList->Left + 1;

18
reactos/base/setup/usetup/inffile.c
View file

@ -76,10 +76,10 @@ InfpFindNextLine(
BOOL WINAPI
InfpGetBinaryField(
IN PINFCONTEXT Context,
IN DWORD FieldIndex,
IN ULONG FieldIndex,
IN OUT BYTE* ReturnBuffer,
IN DWORD ReturnBufferSize,
OUT LPDWORD RequiredSize)
IN ULONG ReturnBufferSize,
OUT PULONG RequiredSize)
{
return InfGetBinaryField(Context, FieldIndex, ReturnBuffer, ReturnBufferSize, RequiredSize);
}
@ -108,10 +108,10 @@ InfpGetIntField(
BOOL WINAPI
InfpGetMultiSzFieldW(
IN PINFCONTEXT Context,
IN DWORD FieldIndex,
IN ULONG FieldIndex,
IN OUT PWSTR ReturnBuffer,
IN DWORD ReturnBufferSize,
OUT LPDWORD RequiredSize)
IN ULONG ReturnBufferSize,
OUT PULONG RequiredSize)
{
return InfGetMultiSzField(Context, FieldIndex, ReturnBuffer, ReturnBufferSize, RequiredSize);
}
@ -119,10 +119,10 @@ InfpGetMultiSzFieldW(
BOOL WINAPI
InfpGetStringFieldW(
IN PINFCONTEXT Context,
IN DWORD FieldIndex,
IN ULONG FieldIndex,
IN OUT PWSTR ReturnBuffer,
IN DWORD ReturnBufferSize,
OUT PDWORD RequiredSize)
IN ULONG ReturnBufferSize,
OUT PULONG RequiredSize)
{
return InfGetStringField(Context, FieldIndex, ReturnBuffer, ReturnBufferSize, RequiredSize);
}

18
reactos/base/setup/usetup/inffile.h
View file

@ -75,10 +75,10 @@ InfpFindNextLine(
BOOL WINAPI
InfpGetBinaryField(
IN PINFCONTEXT Context,
IN DWORD FieldIndex,
IN ULONG FieldIndex,
IN OUT BYTE* ReturnBuffer,
IN DWORD ReturnBufferSize,
OUT LPDWORD RequiredSize);
IN ULONG ReturnBufferSize,
OUT PULONG RequiredSize);
DWORD WINAPI
InfpGetFieldCount(
@ -93,18 +93,18 @@ InfpGetIntField(
BOOL WINAPI
InfpGetMultiSzFieldW(
IN PINFCONTEXT Context,
IN DWORD FieldIndex,
IN ULONG FieldIndex,
IN OUT PWSTR ReturnBuffer,
IN DWORD ReturnBufferSize,
OUT LPDWORD RequiredSize);
IN ULONG ReturnBufferSize,
OUT PULONG RequiredSize);
BOOL WINAPI
InfpGetStringFieldW(
IN PINFCONTEXT Context,
IN DWORD FieldIndex,
IN ULONG FieldIndex,
IN OUT PWSTR ReturnBuffer,
IN DWORD ReturnBufferSize,
OUT PDWORD RequiredSize);
IN ULONG ReturnBufferSize,
OUT PULONG RequiredSize);
HINF WINAPI
InfpOpenInfFileW(

36
reactos/base/setup/usetup/interface/consup.c
View file

@ -62,7 +62,7 @@ VOID
CONSOLE_ConInKey(
OUT PINPUT_RECORD Buffer)
{
ULONG Read;
DWORD Read;
while (TRUE)
{
@ -78,7 +78,7 @@ VOID
CONSOLE_ConOutChar(
IN CHAR c)
{
ULONG Written;
DWORD Written;
WriteConsole(
StdOutput,
@ -92,7 +92,7 @@ VOID
CONSOLE_ConOutPuts(
IN LPCSTR szText)
{
ULONG Written;
DWORD Written;
WriteConsole(
StdOutput,
@ -113,7 +113,7 @@ CONSOLE_ConOutPrintf(
IN LPCSTR szFormat, ...)
{
CHAR szOut[256];
ULONG dwWritten;
DWORD dwWritten;
va_list arg_ptr;
va_start(arg_ptr, szFormat);
@ -177,7 +177,7 @@ VOID
CONSOLE_ClearScreen(VOID)
{
COORD coPos;
ULONG Written;
DWORD Written;
coPos.X = 0;
coPos.Y = 0;
@ -204,7 +204,7 @@ CONSOLE_SetStatusText(
CHAR Buffer[128];
va_list ap;
COORD coPos;
ULONG Written;
DWORD Written;
va_start(ap, fmt);
vsprintf(Buffer, fmt, ap);
@ -243,7 +243,7 @@ CONSOLE_InvertTextXY(
IN SHORT row)
{
COORD coPos;
ULONG Written;
DWORD Written;
for (coPos.Y = y; coPos.Y < y + row; coPos.Y++)
{
@ -266,7 +266,7 @@ CONSOLE_NormalTextXY(
IN SHORT row)
{
COORD coPos;
ULONG Written;
DWORD Written;
for (coPos.Y = y; coPos.Y < y + row; coPos.Y++)
{
@ -288,7 +288,7 @@ CONSOLE_SetTextXY(
IN LPCSTR Text)
{
COORD coPos;
ULONG Written;
DWORD Written;
coPos.X = x;
coPos.Y = y;
@ -310,7 +310,7 @@ CONSOLE_SetInputTextXY(
{
COORD coPos;
SHORT Length;
ULONG Written;
DWORD Written;
coPos.X = x;
coPos.Y = y;
@ -360,8 +360,8 @@ CONSOLE_SetUnderlinedTextXY(
IN LPCSTR Text)
{
COORD coPos;
ULONG Length;
ULONG Written;
DWORD Length;
DWORD Written;
coPos.X = x;
coPos.Y = y;
@ -391,8 +391,8 @@ CONSOLE_SetInvertedTextXY(
IN LPCSTR Text)
{
COORD coPos;
ULONG Length;
ULONG Written;
DWORD Length;
DWORD Written;
coPos.X = x;
coPos.Y = y;
@ -421,8 +421,8 @@ CONSOLE_SetHighlightedTextXY(
IN LPCSTR Text)
{
COORD coPos;
ULONG Length;
ULONG Written;
DWORD Length;
DWORD Written;
coPos.X = x;
coPos.Y = y;
@ -453,7 +453,7 @@ CONSOLE_PrintTextXY(
CHAR buffer[512];
va_list ap;
COORD coPos;
ULONG Written;
DWORD Written;
va_start(ap, fmt);
vsprintf(buffer, fmt, ap);
@ -481,7 +481,7 @@ CONSOLE_PrintTextXYN(
va_list ap;
COORD coPos;
SHORT Length;
ULONG Written;
DWORD Written;
va_start(ap, fmt);
vsprintf(buffer, fmt, ap);

16
reactos/base/setup/usetup/interface/usetup.c
View file

@ -146,7 +146,7 @@ DrawBox(
IN SHORT Height)
{
COORD coPos;
ULONG Written;
DWORD Written;
/* draw upper left corner */
coPos.X = xLeft;
@ -246,7 +246,7 @@ PopupError(PCHAR Text,
SHORT yTop;
SHORT xLeft;
COORD coPos;
ULONG Written;
DWORD Written;
ULONG Length;
ULONG MaxLength;
ULONG Lines;
@ -599,7 +599,7 @@ SetupStartPage(PINPUT_RECORD Ir)
INFCONTEXT Context;
PWCHAR Value;
UINT ErrorLine;
ULONG ReturnSize;
SIZE_T ReturnSize;
CONSOLE_SetStatusText(" Please wait...");
@ -1486,7 +1486,7 @@ DrawInputField(ULONG FieldLength,
{
CHAR buf[100];
COORD coPos;
ULONG Written;
DWORD Written;
coPos.X = Left;
coPos.Y = Top;
@ -1516,7 +1516,7 @@ ShowPartitionSizeInputBox(SHORT Left,
{
INPUT_RECORD Ir;
COORD coPos;
ULONG Written;
DWORD Written;
CHAR Buffer[100];
ULONG Index;
CHAR ch;
@ -1543,7 +1543,7 @@ ShowPartitionSizeInputBox(SHORT Left,
coPos,
&Written);
sprintf (Buffer, "MB (max. %lu MB)", MaxSize);
sprintf (Buffer, "MB (max. %u MB)", MaxSize);
coPos.X = iLeft + PARTITION_SIZE_INPUT_FIELD_LENGTH + 1;
coPos.Y = iTop;
WriteConsoleOutputCharacterA (StdOutput,
@ -1552,7 +1552,7 @@ ShowPartitionSizeInputBox(SHORT Left,
coPos,
&Written);
sprintf(Buffer, "%lu", MaxSize);
sprintf(Buffer, "%u", MaxSize);
Index = strlen(Buffer);
DrawInputField (PARTITION_SIZE_INPUT_FIELD_LENGTH,
iLeft,
@ -2465,7 +2465,7 @@ CheckFileSystemPage(PINPUT_RECORD Ir)
{
DPRINT("ChkdskPartition() failed with status 0x%08lx\n", Status);
sprintf(Buffer, "Setup failed to verify the selected partition.\n"
"(Status 0x%08lx).\n", Status);
"(Status 0x%08x).\n", Status);
PopupError(Buffer,
"ENTER = Reboot computer",
Ir, POPUP_WAIT_ENTER);

14
reactos/base/setup/usetup/partlist.c
View file

@ -893,7 +893,7 @@ CreatePartitionList (SHORT Left,
OBJECT_ATTRIBUTES ObjectAttributes;
SYSTEM_DEVICE_INFORMATION Sdi;
IO_STATUS_BLOCK Iosb;
ULONG ReturnSize;
SIZE_T ReturnSize;
NTSTATUS Status;
ULONG DiskNumber;
WCHAR Buffer[MAX_PATH];
@ -1049,7 +1049,7 @@ static VOID
PrintEmptyLine (PPARTLIST List)
{
COORD coPos;
ULONG Written;
DWORD Written;
USHORT Width;
USHORT Height;
@ -1085,7 +1085,7 @@ PrintPartitionData (PPARTLIST List,
{
CHAR LineBuffer[128];
COORD coPos;
ULONG Written;
DWORD Written;
USHORT Width;
USHORT Height;
@ -1240,7 +1240,7 @@ PrintDiskData (PPARTLIST List,
PPARTENTRY PartEntry;
CHAR LineBuffer[128];
COORD coPos;
ULONG Written;
DWORD Written;
USHORT Width;
USHORT Height;
ULARGE_INTEGER DiskSize;
@ -1271,7 +1271,7 @@ PrintDiskData (PPARTLIST List,
if (DiskEntry->DriverName.Length > 0)
{
sprintf (LineBuffer,
"%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) on %S",
"%6lu %s Harddisk %u (Port=%hu, Bus=%hu, Id=%hu) on %S",
DiskSize.u.LowPart,
Unit,
DiskEntry->DiskNumber,
@ -1283,7 +1283,7 @@ PrintDiskData (PPARTLIST List,
else
{
sprintf (LineBuffer,
"%6lu %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)",
"%6lu %s Harddisk %u (Port=%hu, Bus=%hu, Id=%hu)",
DiskSize.u.LowPart,
Unit,
DiskEntry->DiskNumber,
@ -1341,7 +1341,7 @@ DrawPartitionList (PPARTLIST List)
PDISKENTRY DiskEntry;
PPARTENTRY PartEntry = NULL;
COORD coPos;
ULONG Written;
DWORD Written;
SHORT i;
SHORT CurrentDiskLine;
SHORT CurrentPartLine;

16
reactos/base/setup/usetup/progress.c
View file

@ -13,7 +13,7 @@ static VOID
DrawBorder(PPROGRESSBAR Bar)
{
COORD coPos;
ULONG Written;
DWORD Written;
SHORT i;
/* draw upper left corner */
@ -94,7 +94,7 @@ static VOID
DrawThickBorder(PPROGRESSBAR Bar)
{
COORD coPos;
ULONG Written;
DWORD Written;
SHORT i;
/* draw upper left corner */
@ -176,11 +176,11 @@ DrawProgressBar(PPROGRESSBAR Bar)
{
CHAR TextBuffer[8];
COORD coPos;
ULONG Written;
DWORD Written;
PROGRESSBAR BarBorder = *Bar;
/* Print percentage */
sprintf(TextBuffer, "%-3lu%%", Bar->Percent);
sprintf(TextBuffer, "%-3u%%", Bar->Percent);
coPos.X = Bar->Left + (Bar->Width - 2) / 2;
coPos.Y = Bar->Top;
@ -292,7 +292,7 @@ ProgressNextStep(PPROGRESSBAR Bar)
{
CHAR TextBuffer[8];
COORD coPos;
ULONG Written;
DWORD Written;
ULONG NewPercent;
ULONG NewPos;
@ -310,7 +310,7 @@ ProgressNextStep(PPROGRESSBAR Bar)
{
Bar->Percent = NewPercent;
sprintf(TextBuffer, "%-3lu%%", Bar->Percent);
sprintf(TextBuffer, "%-3u%%", Bar->Percent);
coPos.X = Bar->Left + (Bar->Width - 2) / 2;
coPos.Y = Bar->Top;
@ -368,7 +368,7 @@ ProgressSetStep (PPROGRESSBAR Bar,
{
CHAR TextBuffer[8];
COORD coPos;
ULONG Written;
DWORD Written;
ULONG NewPercent;
ULONG NewPos;
@ -385,7 +385,7 @@ ProgressSetStep (PPROGRESSBAR Bar,
{
Bar->Percent = NewPercent;
sprintf(TextBuffer, "%-3lu%%", Bar->Percent);
sprintf(TextBuffer, "%-3u%%", Bar->Percent);
coPos.X = Bar->Left + (Bar->Width - 2) / 2;
coPos.Y = Bar->Top;