5 Jul
2005
5 Jul
'05
10:36 p.m.
fixed some signed/unsigned comparison warnings with -Wsign-compare
Modified: trunk/reactos/apps/utils/net/arp/arp.c
Modified: trunk/reactos/apps/utils/net/finger/net.c
Modified: trunk/reactos/apps/utils/net/ftp/fake.c
Modified: trunk/reactos/apps/utils/net/ftp/ftp.c
Modified: trunk/reactos/apps/utils/net/route/route.c
Modified: trunk/reactos/apps/utils/ps/ps.c
Modified: trunk/reactos/apps/utils/rosperf/fill.c
Modified: trunk/reactos/apps/utils/rosperf/lines.c
Modified: trunk/reactos/apps/utils/rosperf/rosperf.h
Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c
Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c
Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c
Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c
Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c
Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c
Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c
Modified: trunk/reactos/boot/freeldr/freeldr/multiboot.c
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c
Modified: trunk/reactos/boot/freeldr/freeldr/rtl/print.c
Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c
Modified: trunk/reactos/drivers/dd/blue/blue.c
Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c
Modified: trunk/reactos/drivers/dd/parallel/parallel.c
Modified: trunk/reactos/drivers/fs/ntfs/attrib.c
Modified: trunk/reactos/drivers/fs/ntfs/mft.c
Modified: trunk/reactos/drivers/fs/vfat/rw.c
Modified: trunk/reactos/drivers/net/afd/afd/select.c
Modified: trunk/reactos/drivers/net/ndis/ndis/buffer.c
Modified: trunk/reactos/drivers/net/ndis/ndis/miniport.c
Modified: trunk/reactos/drivers/net/npf/read.c
Modified: trunk/reactos/drivers/net/npf/win_bpf_filter.c
Modified: trunk/reactos/drivers/storage/disk/disk.c
Modified: trunk/reactos/drivers/usb/cromwell/linux/usb.h
Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c
Modified: trunk/reactos/drivers/video/displays/vga/objects/lineto.c
Modified: trunk/reactos/drivers/video/displays/vga/objects/paint.c
Modified: trunk/reactos/drivers/video/displays/vga/objects/pointer.c
Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c
Modified: trunk/reactos/drivers/video/miniport/vga/initvga.c
Modified: trunk/reactos/include/ndk/ketypes.h
Modified: trunk/reactos/include/reactos/exeformat.h
Modified: trunk/reactos/lib/aclui/checklist.c
Modified: trunk/reactos/lib/adns/src/check.c
Modified: trunk/reactos/lib/adns/src/query.c
Modified: trunk/reactos/lib/adns/src/reply.c
Modified: trunk/reactos/lib/adns/src/setup.c
Modified: trunk/reactos/lib/adns/src/types.c
Modified: trunk/reactos/lib/advapi32/crypt/crypt.c
Modified: trunk/reactos/lib/advpack/advpack.c
Modified: trunk/reactos/lib/cpl/desk/settings.c
Modified: trunk/reactos/lib/cpl/intl/locale.c
Modified: trunk/reactos/lib/cpl/intl/time.c
Modified: trunk/reactos/lib/crt/direct/getcwd.c
Modified: trunk/reactos/lib/crt/io/access.c
Modified: trunk/reactos/lib/crt/io/chmod.c
Modified: trunk/reactos/lib/crt/process/process.c
Modified: trunk/reactos/lib/crt/search/lfind.c
Modified: trunk/reactos/lib/crt/signal/signal.c
Modified: trunk/reactos/lib/crt/stdio/fread.c
Modified: trunk/reactos/lib/crt/stdio/fwrite.c
Modified: trunk/reactos/lib/crt/stdlib/fcvtbuf.c
Modified: trunk/reactos/lib/crt/stdlib/getenv.c
Modified: trunk/reactos/lib/crt/string/strset.c
Modified: trunk/reactos/lib/crt/time/ctime.c
Modified: trunk/reactos/lib/crt/time/strftime.c
Modified: trunk/reactos/lib/crt/wine/cppexcept.c
Modified: trunk/reactos/lib/crt/wstring/wcsset.c
Modified: trunk/reactos/lib/dnsapi/dnsapi/query.c
Modified: trunk/reactos/lib/fslib/vfatlib/fat16.c
Modified: trunk/reactos/lib/fslib/vfatlib/fat32.c
Modified: trunk/reactos/lib/fslib/vfatlib/vfatlib.c
Modified: trunk/reactos/lib/gdi32/misc/misc.c
Modified: trunk/reactos/lib/gdi32/objects/dc.c
Modified: trunk/reactos/lib/gdi32/objects/font.c
Modified: trunk/reactos/lib/kernel32/file/bintype.c
Modified: trunk/reactos/lib/kernel32/file/file.c
Modified: trunk/reactos/lib/kernel32/misc/console.c
Modified: trunk/reactos/lib/kernel32/misc/errormsg.c
Modified: trunk/reactos/lib/kernel32/misc/lang.c
Modified: trunk/reactos/lib/kernel32/misc/lzexpand_main.c
Modified: trunk/reactos/lib/kernel32/misc/nls.c
Modified: trunk/reactos/lib/kernel32/misc/profile.c
Modified: trunk/reactos/lib/kernel32/misc/time.c
Modified: trunk/reactos/lib/kernel32/process/create.c
Modified: trunk/reactos/lib/ntdll/stdlib/lfind.c
Modified: trunk/reactos/lib/rossym/frommem.c
Modified: trunk/reactos/lib/rtl/i386/exception.c
Modified: trunk/reactos/lib/rtl/unicode.c
Modified: trunk/reactos/lib/syssetup/wizard.c
Modified: trunk/reactos/lib/ws2_32/misc/dllmain.c
Modified: trunk/reactos/lib/ws2_32/misc/ns.c
Modified: trunk/reactos/ntoskrnl/ex/list.c
Modified: trunk/reactos/ntoskrnl/ex/sysinfo.c
Modified: trunk/reactos/ntoskrnl/ex/uuid.c
Modified: trunk/reactos/ntoskrnl/io/file.c
Modified: trunk/reactos/ntoskrnl/io/iomgr.c
Modified: trunk/reactos/ntoskrnl/io/irq.c
Modified: trunk/reactos/ntoskrnl/io/pnpdma.c
[truncated at 100 lines; 41 more skipped]
_____
Modified: trunk/reactos/apps/utils/net/arp/arp.c
--- trunk/reactos/apps/utils/net/arp/arp.c 2005-07-05 22:14:07 UTC
(rev 16440)
+++ trunk/reactos/apps/utils/net/arp/arp.c 2005-07-05 22:35:29 UTC
(rev 16441)
@@ -53,7 +53,8 @@
/* FIXME: allow user to specify an interface address, via pszIfAddr */
INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr)
{
- INT i, k, iRet;
+ INT iRet;
+ UINT i, k;
PMIB_IPNETTABLE pIpNetTable;
PMIB_IPADDRTABLE pIpAddrTable;
ULONG ulSize = 0;
_____
Modified: trunk/reactos/apps/utils/net/finger/net.c
--- trunk/reactos/apps/utils/net/finger/net.c 2005-07-05 22:14:07 UTC
(rev 16440)
+++ trunk/reactos/apps/utils/net/finger/net.c 2005-07-05 22:35:29 UTC
(rev 16441)
@@ -59,7 +59,7 @@
return;
*host++ = '\0';
- if (isdigit(*host) && (defaddr.s_addr = inet_addr(host)) != -1)
{
+ if (isdigit(*host) && (defaddr.s_addr = inet_addr(host)) !=
(unsigned long)-1) {
def.h_name = host;
def.h_addr_list = alist;
def.h_addr = (char *)&defaddr;
_____
Modified: trunk/reactos/apps/utils/net/ftp/fake.c
--- trunk/reactos/apps/utils/net/ftp/fake.c 2005-07-05 22:14:07 UTC
(rev 16440)
+++ trunk/reactos/apps/utils/net/ftp/fake.c 2005-07-05 22:35:29 UTC
(rev 16441)
@@ -100,7 +100,7 @@
index = 0;
total = recv(s, buffer, sizeof(buffer), 0);
- if (total == INVALID_SOCKET)
+ if (total == SOCKET_ERROR)
{
total = 0;
return ERROR;
_____
Modified: trunk/reactos/apps/utils/net/ftp/ftp.c
--- trunk/reactos/apps/utils/net/ftp/ftp.c 2005-07-05 22:14:07 UTC
(rev 16440)
+++ trunk/reactos/apps/utils/net/ftp/ftp.c 2005-07-05 22:35:29 UTC
(rev 16441)
@@ -119,7 +119,7 @@
bzero((char *)&hisctladdr, sizeof (hisctladdr));
hisctladdr.sin_addr.s_addr = inet_addr(host);
- if (hisctladdr.sin_addr.s_addr != -1) {
+ if (hisctladdr.sin_addr.s_addr != (unsigned long)-1) {
hisctladdr.sin_family = AF_INET;
(void) strncpy(hostnamebuf, host, sizeof(hostnamebuf));
} else {
_____
Modified: trunk/reactos/apps/utils/net/route/route.c
--- trunk/reactos/apps/utils/net/route/route.c 2005-07-05 22:14:07 UTC
(rev 16440)
+++ trunk/reactos/apps/utils/net/route/route.c 2005-07-05 22:35:29 UTC
(rev 16441)
@@ -36,7 +36,7 @@
DWORD Error;
ULONG Size = 0;
char Destination[IPBUF], Gateway[IPBUF], Netmask[IPBUF];
- int i;
+ unsigned int i;
if( (Error = GetIpForwardTable( NULL, &Size, TRUE )) ==
ERROR_INSUFFICIENT_BUFFER ) {
_____
Modified: trunk/reactos/apps/utils/ps/ps.c
--- trunk/reactos/apps/utils/ps/ps.c 2005-07-05 22:14:07 UTC (rev
16440)
+++ trunk/reactos/apps/utils/ps/ps.c 2005-07-05 22:35:29 UTC (rev
16441)
@@ -213,7 +213,7 @@
unsigned char minute, minute1, tmin, tmin1;
unsigned char seconds, seconds1, tsec, tsec1;
- int ti;
+ unsigned int ti;
LARGE_INTEGER ptime;
ptime.QuadPart = CurrentProcess->KernelTime.QuadPart;
_____
Modified: trunk/reactos/apps/utils/rosperf/fill.c
--- trunk/reactos/apps/utils/rosperf/fill.c 2005-07-05 22:14:07 UTC
(rev 16440)
+++ trunk/reactos/apps/utils/rosperf/fill.c 2005-07-05 22:35:29 UTC
(rev 16441)
@@ -36,7 +36,7 @@
{
#define SMALL_SIZE 16
unsigned Rep;
- unsigned x, y;
+ int x, y;
x = 0;
y = 0;
_____
Modified: trunk/reactos/apps/utils/rosperf/lines.c
--- trunk/reactos/apps/utils/rosperf/lines.c 2005-07-05 22:14:07 UTC
(rev 16440)
+++ trunk/reactos/apps/utils/rosperf/lines.c 2005-07-05 22:35:29 UTC
(rev 16441)
@@ -60,7 +60,7 @@
LinesHorizontalProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps)
{
unsigned Rep;
- unsigned y;
+ int y;
HDC Dc;
for (Rep = 0; Rep < Reps; )
@@ -79,7 +79,7 @@
LinesVerticalProc(void *Context, PPERF_INFO PerfInfo, unsigned Reps)
{
unsigned Rep;
- unsigned x;
+ int x;
HDC Dc;
for (Rep = 0; Rep < Reps; )
_____
Modified: trunk/reactos/apps/utils/rosperf/rosperf.h
--- trunk/reactos/apps/utils/rosperf/rosperf.h 2005-07-05 22:14:07 UTC
(rev 16440)
+++ trunk/reactos/apps/utils/rosperf/rosperf.h 2005-07-05 22:35:29 UTC
(rev 16441)
@@ -28,8 +28,8 @@
COLORREF BackgroundColor;
HDC ForegroundDc;
HDC BackgroundDc;
- ULONG WndWidth;
- ULONG WndHeight;
+ INT WndWidth;
+ INT WndHeight;
} PERF_INFO, *PPERF_INFO;
typedef unsigned (*INITTESTPROC)(void **Context, PPERF_INFO PerfInfo,
unsigned Reps);
_____
Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c
--- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c 2005-07-05
22:14:07 UTC (rev 16440)
+++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c 2005-07-05
22:35:29 UTC (rev 16441)
@@ -192,7 +192,7 @@
*/
BOOL Ext2LookupFile(PCHAR FileName, PEXT2_FILE_INFO
Ext2FileInfoPointer)
{
- int i;
+ UINT i;
ULONG NumberOfPathParts;
CHAR PathPart[261];
PVOID DirectoryBuffer;
_____
Modified: trunk/reactos/boot/freeldr/freeldr/fs/fat.c
--- trunk/reactos/boot/freeldr/freeldr/fs/fat.c 2005-07-05 22:14:07 UTC
(rev 16440)
+++ trunk/reactos/boot/freeldr/freeldr/fs/fat.c 2005-07-05 22:35:29 UTC
(rev 16441)
@@ -689,7 +689,7 @@
*/
BOOL FatLookupFile(PCHAR FileName, PFAT_FILE_INFO FatFileInfoPointer)
{
- int i;
+ UINT i;
ULONG NumberOfPathParts;
CHAR PathPart[261];
PVOID DirectoryBuffer;
@@ -827,9 +827,9 @@
BOOL FatGetFatEntry(ULONG Cluster, ULONG* ClusterPointer)
{
ULONG fat = 0;
- int FatOffset;
- int ThisFatSecNum;
- int ThisFatEntOffset;
+ UINT FatOffset;
+ UINT ThisFatSecNum;
+ UINT ThisFatEntOffset;
DbgPrint((DPRINT_FILESYSTEM, "FatGetFatEntry() Retrieving FAT
entry for cluster %d.\n", Cluster));
_____
Modified: trunk/reactos/boot/freeldr/freeldr/fs/fs.c
--- trunk/reactos/boot/freeldr/freeldr/fs/fs.c 2005-07-05 22:14:07 UTC
(rev 16440)
+++ trunk/reactos/boot/freeldr/freeldr/fs/fs.c 2005-07-05 22:35:29 UTC
(rev 16441)
@@ -339,10 +339,10 @@
*/
ULONG FsGetNumPathParts(PCHAR Path)
{
- ULONG i;
+ size_t i;
ULONG num;
- for (i=0,num=0; i<(int)strlen(Path); i++)
+ for (i=0,num=0; i<strlen(Path); i++)
{
if ((Path[i] == '\\') || (Path[i] == '/'))
{
@@ -364,12 +364,12 @@
*/
VOID FsGetFirstNameFromPath(PCHAR Buffer, PCHAR Path)
{
- ULONG i;
+ size_t i;
// Copy all the characters up to the end of the
// string or until we hit a '\' character
// and put them in Buffer
- for (i=0; i<(int)strlen(Path); i++)
+ for (i=0; i<strlen(Path); i++)
{
if ((Path[i] == '\\') || (Path[i] == '/'))
{
_____
Modified: trunk/reactos/boot/freeldr/freeldr/fs/iso.c
--- trunk/reactos/boot/freeldr/freeldr/fs/iso.c 2005-07-05 22:14:07 UTC
(rev 16440)
+++ trunk/reactos/boot/freeldr/freeldr/fs/iso.c 2005-07-05 22:35:29 UTC
(rev 16441)
@@ -182,7 +182,7 @@
*/
static BOOL IsoLookupFile(PCHAR FileName, PISO_FILE_INFO
IsoFileInfoPointer)
{
- int i;
+ UINT i;
ULONG NumberOfPathParts;
CHAR PathPart[261];
PVOID DirectoryBuffer;
_____
Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c
--- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c 2005-07-05
22:14:07 UTC (rev 16440)
+++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c 2005-07-05
22:35:29 UTC (rev 16441)
@@ -168,7 +168,7 @@
}
/* II. Read all complete 64-sector blocks. */
- while (Length >= 64 * NtfsBootSector->BytesPerSector)
+ while (Length >= (ULONGLONG)64 *
(ULONGLONG)NtfsBootSector->BytesPerSector)
{
if (!MachDiskReadLogicalSectors(NtfsDriveNumber,
NtfsSectorOfClusterZero + (Offset / NtfsBootSector->BytesPerSector), 64,
(PCHAR)DISKREADBUFFER))
return FALSE;
_____
Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c
--- trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c
2005-07-05 22:14:07 UTC (rev 16440)
+++ trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c
2005-07-05 22:35:29 UTC (rev 16441)
@@ -56,7 +56,7 @@
struct _INFCACHELINE *Next;
struct _INFCACHELINE *Prev;
- LONG FieldCount;
+ ULONG FieldCount;
PCHAR Key;
@@ -437,7 +437,7 @@
/* push data from current token start up to pos into the current token
*/
static int push_token( struct parser *parser, const CHAR *pos )
{
- int len = pos - parser->start;
+ unsigned int len = pos - parser->start;
const CHAR *src = parser->start;
CHAR *dst = parser->token + parser->token_len;
_____
Modified: trunk/reactos/boot/freeldr/freeldr/mm/meminit.c
--- trunk/reactos/boot/freeldr/freeldr/mm/meminit.c 2005-07-05
22:14:07 UTC (rev 16440)
+++ trunk/reactos/boot/freeldr/freeldr/mm/meminit.c 2005-07-05
22:35:29 UTC (rev 16441)
@@ -384,8 +384,8 @@
VOID MmFixupSystemMemoryMap(PBIOS_MEMORY_MAP BiosMemoryMap, ULONG*
MapCount)
{
- int Index;
- int Index2;
+ UINT Index;
+ UINT Index2;
// Loop through each entry in the array
for (Index=0; Index<*MapCount; Index++)
_____
Modified: trunk/reactos/boot/freeldr/freeldr/multiboot.c
--- trunk/reactos/boot/freeldr/freeldr/multiboot.c 2005-07-05
22:14:07 UTC (rev 16440)
+++ trunk/reactos/boot/freeldr/freeldr/multiboot.c 2005-07-05
22:35:29 UTC (rev 16441)
@@ -528,7 +528,7 @@
ULONG_PTR SourceSection;
ULONG_PTR TargetSection;
ULONG SectionSize;
- LONG i;
+ INT i;
PIMAGE_DATA_DIRECTORY RelocationDDir;
PIMAGE_BASE_RELOCATION RelocationDir, RelocationEnd;
ULONG Count;
@@ -588,7 +588,7 @@
Section += SectionCount;
/* Walk each section backwards */
- for (i=SectionCount; i >= 0; i--, Section--) {
+ for (i=(INT)SectionCount; i >= 0; i--, Section--) {
/* Get the disk location and the memory location, and the size
*/
SourceSection = RaToPa(Section->PointerToRawData);
@@ -636,7 +636,7 @@
/* Calculate the Offset of the Type */
TypeOffset = (PUSHORT)(RelocationDir + 1);
- for (i = 0; i < Count; i++) {
+ for (i = 0; i < (INT)Count; i++) {
ShortPtr = (PUSHORT)(Address + (*TypeOffset & 0xFFF));
@@ -765,7 +765,7 @@
if (ModuleData) {
/* Make sure this is the right module and that it hasn't been
closed */
- if ((ModuleBase == ModuleData->ModuleStart) &&
(ModuleData->ModuleEnd == -1)) {
+ if ((ModuleBase == ModuleData->ModuleStart) &&
(ModuleData->ModuleEnd == (ULONG_PTR)-1)) {
/* Close the Module */
ModuleData->ModuleEnd = ModuleData->ModuleStart +
ModuleSize;
_____
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c
--- trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c
2005-07-05 22:14:07 UTC (rev 16440)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c
2005-07-05 22:35:29 UTC (rev 16441)
@@ -1360,10 +1360,10 @@
PWCHAR wName;
PCHAR cName;
LONG Error;
- LONG DataSize;
+ ULONG DataSize;
PCHAR cBuffer;
PWCHAR wBuffer;
- LONG i;
+ ULONG i;
if (ValueCell->CellSize >= 0 || ValueCell->Id != REG_VALUE_CELL_ID)
{
_____
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c
--- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c
2005-07-05 22:14:07 UTC (rev 16440)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c
2005-07-05 22:35:29 UTC (rev 16441)
@@ -558,7 +558,7 @@
CHAR szHalName[1024];
CHAR szFileName[1024];
CHAR szBootPath[256];
- INT i;
+ UINT i;
CHAR MsgBuffer[256];
ULONG SectionId;
_____
Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c
--- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c
2005-07-05 22:14:07 UTC (rev 16440)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c
2005-07-05 22:35:29 UTC (rev 16441)
@@ -240,7 +240,7 @@
ULONG Size;
char *SourcePath;
char *LoadOptions;
- int i;
+ UINT i;
HINF InfHandle;
ULONG ErrorLine;
_____
Modified: trunk/reactos/boot/freeldr/freeldr/rtl/print.c
--- trunk/reactos/boot/freeldr/freeldr/rtl/print.c 2005-07-05
22:14:07 UTC (rev 16440)
+++ trunk/reactos/boot/freeldr/freeldr/rtl/print.c 2005-07-05
22:35:29 UTC (rev 16441)
@@ -27,7 +27,7 @@
*/
void print(char *str)
{
- int i;
+ size_t i;
for (i = 0; i < strlen(str); i++)
MachConsPutChar(str[i]);
_____
Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c
--- trunk/reactos/boot/freeldr/freeldr/ui/tui.c 2005-07-05 22:14:07 UTC
(rev 16440)
+++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c 2005-07-05 22:35:29 UTC
(rev 16441)
@@ -517,9 +517,10 @@
VOID TuiMessageBoxCritical(PCHAR MessageText)
{
int width = 8;
- int height = 1;
+ unsigned int height = 1;
int curline = 0;
- int i , j, k;
+ int k;
+ size_t i , j;
int x1, x2, y1, y2;
char temp[260];
char key;
@@ -768,16 +769,17 @@
BOOL TuiEditBox(PCHAR MessageText, PCHAR EditTextBuffer, ULONG Length)
{
int width = 8;
- int height = 1;
+ unsigned int height = 1;
int curline = 0;
- int i , j, k;
+ int k;
+ size_t i , j;
int x1, x2, y1, y2;
char temp[260];
char key;
int EditBoxLine;
- int EditBoxStartX, EditBoxEndX;
+ ULONG EditBoxStartX, EditBoxEndX;
int EditBoxCursorX;
- int EditBoxTextCount;
+ unsigned int EditBoxTextCount;
int EditBoxTextDisplayIndex;
BOOL ReturnCode;
PVOID ScreenBuffer;
_____
Modified: trunk/reactos/drivers/dd/blue/blue.c
--- trunk/reactos/drivers/dd/blue/blue.c 2005-07-05 22:14:07 UTC
(rev 16440)
+++ trunk/reactos/drivers/dd/blue/blue.c 2005-07-05 22:35:29 UTC
(rev 16441)
@@ -165,7 +165,8 @@
NTSTATUS Status;
char *pch = Irp->UserBuffer;
PBYTE vidmem;
- int i, j, offset;
+ unsigned int i;
+ int j, offset;
int cursorx, cursory;
int rows, columns;
int processed = DeviceExtension->Mode & ENABLE_PROCESSED_OUTPUT;
_____
Modified: trunk/reactos/drivers/dd/bootvid/bootvid.c
--- trunk/reactos/drivers/dd/bootvid/bootvid.c 2005-07-05 22:14:07 UTC
(rev 16440)
+++ trunk/reactos/drivers/dd/bootvid/bootvid.c 2005-07-05 22:35:29 UTC
(rev 16441)
@@ -158,7 +158,7 @@
STATIC VOID FASTCALL
vgaSetRegisters(PVGA_REGISTERS Registers)
{
- int i;
+ UINT i;
/* Update misc output register */
WRITE_PORT_UCHAR(MISC, Registers->Misc);
_____
Modified: trunk/reactos/drivers/dd/parallel/parallel.c
--- trunk/reactos/drivers/dd/parallel/parallel.c 2005-07-05
22:14:07 UTC (rev 16440)
+++ trunk/reactos/drivers/dd/parallel/parallel.c 2005-07-05
22:35:29 UTC (rev 16441)
@@ -80,7 +80,7 @@
{
PIO_STACK_LOCATION Stack = IoGetCurrentIrpStackLocation(Irp);
NTSTATUS status;
- int i;
+ UINT i;
switch (Stack->MajorFunction)
{
_____
Modified: trunk/reactos/drivers/fs/ntfs/attrib.c
--- trunk/reactos/drivers/fs/ntfs/attrib.c 2005-07-05 22:14:07 UTC
(rev 16440)
+++ trunk/reactos/drivers/fs/ntfs/attrib.c 2005-07-05 22:35:29 UTC
(rev 16441)
@@ -280,7 +280,7 @@
Attribute = (PATTRIBUTE)((ULONG_PTR)FileRecord +
FileRecord->AttributeOffset);
while (Attribute < (PATTRIBUTE)((ULONG_PTR)FileRecord +
FileRecord->BytesInUse) &&
- Attribute->AttributeType != -1)
+ Attribute->AttributeType != (ATTRIBUTE_TYPE)-1)
{
NtfsDumpAttribute (Attribute);
_____
Modified: trunk/reactos/drivers/fs/ntfs/mft.c
--- trunk/reactos/drivers/fs/ntfs/mft.c 2005-07-05 22:14:07 UTC (rev
16440)
+++ trunk/reactos/drivers/fs/ntfs/mft.c 2005-07-05 22:35:29 UTC (rev
16441)
@@ -128,7 +128,7 @@
Attribute = (PATTRIBUTE)((ULONG_PTR)FileRecord +
FileRecord->AttributeOffset);
while (Attribute < (PATTRIBUTE)((ULONG_PTR)FileRecord +
FileRecord->BytesInUse) &&
- Attribute->AttributeType != -1)
+ Attribute->AttributeType != (ATTRIBUTE_TYPE)-1)
{
if (Attribute->AttributeType == Type)
{
_____
Modified: trunk/reactos/drivers/fs/vfat/rw.c
--- trunk/reactos/drivers/fs/vfat/rw.c 2005-07-05 22:14:07 UTC (rev
16440)
+++ trunk/reactos/drivers/fs/vfat/rw.c 2005-07-05 22:35:29 UTC (rev
16441)
@@ -831,7 +831,7 @@
ByteOffset = IrpContext->Stack->Parameters.Write.ByteOffset;
if (ByteOffset.u.LowPart == FILE_WRITE_TO_END_OF_FILE &&
- ByteOffset.u.HighPart == 0xffffffff)
+ ByteOffset.u.HighPart == -1)
{
ByteOffset.QuadPart = Fcb->RFCB.FileSize.QuadPart;
}
_____
Modified: trunk/reactos/drivers/net/afd/afd/select.c
--- trunk/reactos/drivers/net/afd/afd/select.c 2005-07-05 22:14:07 UTC
(rev 16440)
+++ trunk/reactos/drivers/net/afd/afd/select.c 2005-07-05 22:35:29 UTC
(rev 16441)
@@ -62,7 +62,7 @@
VOID SignalSocket( PAFD_ACTIVE_POLL Poll, PAFD_POLL_INFO PollReq,
NTSTATUS Status ) {
- int i;
+ UINT i;
PIRP Irp = Poll->Irp;
AFD_DbgPrint(MID_TRACE,("Called (Status %x)\n", Status));
KeCancelTimer( &Poll->Timer );
@@ -121,7 +121,7 @@
PIRP Irp;
PAFD_POLL_INFO PollReq;
PAFD_HANDLE HandleArray;
- int i;
+ UINT i;
AFD_DbgPrint(MID_TRACE,("Killing selects that refer to %x\n",
FileObject));
_____
Modified: trunk/reactos/drivers/net/ndis/ndis/buffer.c
--- trunk/reactos/drivers/net/ndis/ndis/buffer.c 2005-07-05
22:14:07 UTC (rev 16440)
+++ trunk/reactos/drivers/net/ndis/ndis/buffer.c 2005-07-05
22:35:29 UTC (rev 16441)
@@ -34,7 +34,7 @@
for (;;) {
if (!Buffer)
- return -1;
+ return 0xFFFFFFFF;
NdisQueryBuffer(Buffer, (PVOID)Data, Size);
@@ -77,7 +77,7 @@
NDIS_DbgPrint(MAX_TRACE, ("DstBuffer (0x%X) DstOffset (0x%X)
SrcData (0x%X) Length (%d)\n", DstBuffer, DstOffset, SrcData, Length));
/* Skip DstOffset bytes in the destination buffer chain */
- if (SkipToOffset(DstBuffer, DstOffset, &DstData, &DstSize) == -1)
+ if (SkipToOffset(DstBuffer, DstOffset, &DstData, &DstSize) ==
0xFFFFFFFF)
return 0;
/* Start copying the data */
@@ -134,7 +134,7 @@
NDIS_DbgPrint(MAX_TRACE, ("DstData 0x%X SrcBuffer 0x%X SrcOffset
0x%X Length %d\n",DstData,SrcBuffer, SrcOffset, Length));
/* Skip SrcOffset bytes in the source buffer chain */
- if (SkipToOffset(SrcBuffer, SrcOffset, &SrcData, &SrcSize) == -1)
+ if (SkipToOffset(SrcBuffer, SrcOffset, &SrcData, &SrcSize) ==
0xFFFFFFFF)
return 0;
/* Start copying the data */
@@ -234,11 +234,11 @@
/* Skip DstOffset bytes in the destination buffer chain */
NdisQueryBuffer(DstBuffer, (PVOID)&DstData, &DstSize);
- if (SkipToOffset(DstBuffer, DstOffset, &DstData, &DstSize) == -1)
+ if (SkipToOffset(DstBuffer, DstOffset, &DstData, &DstSize) ==
0xFFFFFFFF)
return 0;
/* Skip SrcOffset bytes in the source packet */
NdisGetFirstBufferFromPacket(SrcPacket, &SrcBuffer,
(PVOID)&SrcData, &SrcSize, &Total);
- if (SkipToOffset(SrcBuffer, SrcOffset, &SrcData, &SrcSize) == -1)
+ if (SkipToOffset(SrcBuffer, SrcOffset, &SrcData, &SrcSize) ==
0xFFFFFFFF)
return 0;
/* Copy the data */
for (Total = 0;;) {
@@ -669,12 +669,12 @@
/* Skip DestinationOffset bytes in the destination packet */
NdisGetFirstBufferFromPacket(Destination, &DstBuffer,
(PVOID)&DstData, &DstSize, &Total);
- if (SkipToOffset(DstBuffer, DestinationOffset, &DstData, &DstSize)
== -1)
+ if (SkipToOffset(DstBuffer, DestinationOffset, &DstData, &DstSize)
== 0xFFFFFFFF)
return;
/* Skip SourceOffset bytes in the source packet */
NdisGetFirstBufferFromPacket(Source, &SrcBuffer, (PVOID)&SrcData,
&SrcSize, &Total);
- if (SkipToOffset(SrcBuffer, SourceOffset, &SrcData, &SrcSize) ==
-1)
+ if (SkipToOffset(SrcBuffer, SourceOffset, &SrcData, &SrcSize) ==
0xFFFFFFFF)
return;
/* Copy the data */
_____
Modified: trunk/reactos/drivers/net/ndis/ndis/miniport.c
--- trunk/reactos/drivers/net/ndis/ndis/miniport.c 2005-07-05
22:14:07 UTC (rev 16440)
+++ trunk/reactos/drivers/net/ndis/ndis/miniport.c 2005-07-05
22:35:29 UTC (rev 16441)
@@ -1395,7 +1395,7 @@
Status =
IoGetDeviceProperty(Adapter->NdisMiniportBlock.PhysicalDeviceObject,
DevicePropertyLegacyBusType, Size,
&Adapter->NdisMiniportBlock.BusType,
&Size);
- if (!NT_SUCCESS(Status) || Adapter->NdisMiniportBlock.BusType == -1)
+ if (!NT_SUCCESS(Status) || Adapter->NdisMiniportBlock.BusType ==
(NDIS_INTERFACE_TYPE)-1)
{
NdisInitUnicodeString(&ParamName, L"BusType");
NdisReadConfiguration(&NdisStatus, &ConfigParam, ConfigHandle,
@@ -1409,7 +1409,7 @@
Status =
IoGetDeviceProperty(Adapter->NdisMiniportBlock.PhysicalDeviceObject,
DevicePropertyBusNumber, Size,
&Adapter->NdisMiniportBlock.BusNumber,
&Size);
- if (!NT_SUCCESS(Status) || Adapter->NdisMiniportBlock.BusNumber ==
-1)
+ if (!NT_SUCCESS(Status) || Adapter->NdisMiniportBlock.BusNumber ==
(NDIS_INTERFACE_TYPE)-1)
{
NdisInitUnicodeString(&ParamName, L"BusNumber");
NdisReadConfiguration(&NdisStatus, &ConfigParam, ConfigHandle,
@@ -1424,7 +1424,7 @@
Status =
IoGetDeviceProperty(Adapter->NdisMiniportBlock.PhysicalDeviceObject,
DevicePropertyAddress, Size,
&Adapter->NdisMiniportBlock.SlotNumber,
&Size);
- if (!NT_SUCCESS(Status) || Adapter->NdisMiniportBlock.SlotNumber ==
-1)
+ if (!NT_SUCCESS(Status) || Adapter->NdisMiniportBlock.SlotNumber ==
(NDIS_INTERFACE_TYPE)-1)
{
NdisInitUnicodeString(&ParamName, L"SlotNumber");
NdisReadConfiguration(&NdisStatus, &ConfigParam, ConfigHandle,
_____
Modified: trunk/reactos/drivers/net/npf/read.c
--- trunk/reactos/drivers/net/npf/read.c 2005-07-05 22:14:07 UTC
(rev 16440)
+++ trunk/reactos/drivers/net/npf/read.c 2005-07-05 22:35:29 UTC
(rev 16441)
@@ -437,7 +437,7 @@
return NDIS_STATUS_NOT_ACCEPTED;
//if the filter returns -1 the whole packet must be accepted
- if(fres==-1 || fres >
PacketSize+HeaderBufferSize)fres=PacketSize+HeaderBufferSize;
+ if(fres==(UINT)-1 || fres >
PacketSize+HeaderBufferSize)fres=PacketSize+HeaderBufferSize;
if(Open->mode & MODE_STAT){
// we are in statistics mode
_____
Modified: trunk/reactos/drivers/net/npf/win_bpf_filter.c
--- trunk/reactos/drivers/net/npf/win_bpf_filter.c 2005-07-05
22:14:07 UTC (rev 16440)
+++ trunk/reactos/drivers/net/npf/win_bpf_filter.c 2005-07-05
22:35:29 UTC (rev 16441)
@@ -906,7 +906,7 @@
IF_LOUD(DbgPrint("Validating program");)
flag=0;
- for(j=0;j<VALID_INSTRUCTIONS_LEN;j++)
+ for(j=0;j<(int32)VALID_INSTRUCTIONS_LEN;j++)
if (p->code==valid_instructions[j])
flag=1;
if (flag==0)
_____
Modified: trunk/reactos/drivers/storage/disk/disk.c
--- trunk/reactos/drivers/storage/disk/disk.c 2005-07-05 22:14:07 UTC
(rev 16440)
+++ trunk/reactos/drivers/storage/disk/disk.c 2005-07-05 22:35:29 UTC
(rev 16441)
@@ -384,7 +384,7 @@
PDEVICE_EXTENSION DeviceExtension;
PDISK_DATA DiskData;
PIO_STACK_LOCATION IrpStack;
- ULARGE_INTEGER EndingOffset;
+ LARGE_INTEGER EndingOffset;
DPRINT("DiskClassCheckReadWrite() called\n");
_____
Modified: trunk/reactos/drivers/usb/cromwell/linux/usb.h
--- trunk/reactos/drivers/usb/cromwell/linux/usb.h 2005-07-05
22:14:07 UTC (rev 16440)
+++ trunk/reactos/drivers/usb/cromwell/linux/usb.h 2005-07-05
22:35:29 UTC (rev 16441)
@@ -327,7 +327,7 @@
{
int actual;
actual = snprintf (buf, size, "usb-%s-%s", dev->bus->bus_name,
dev->devpath);
- return (actual >= size) ? -1 : actual;
+ return (actual >= (int)size) ? -1 : actual;
}
/*----------------------------------------------------------------------
---*/
_____
Modified: trunk/reactos/drivers/video/displays/vga/objects/bitblt.c
--- trunk/reactos/drivers/video/displays/vga/objects/bitblt.c
2005-07-05 22:14:07 UTC (rev 16440)
+++ trunk/reactos/drivers/video/displays/vga/objects/bitblt.c
2005-07-05 22:35:29 UTC (rev 16441)
@@ -174,11 +174,11 @@
BRUSHOBJ* Brush, POINTL* BrushPoint, ROP4 Rop4)
{
UCHAR SolidColor = 0;
- ULONG Left;
- ULONG Length;
+ LONG Left;
+ LONG Length;
PUCHAR Video;
UCHAR Mask;
- ULONG i, j;
+ INT i, j;
ULONG RasterOp = VGA_NORMAL;
/* Punt brush blts to non-device surfaces. */
_____
Modified: trunk/reactos/drivers/video/displays/vga/objects/lineto.c
--- trunk/reactos/drivers/video/displays/vga/objects/lineto.c
2005-07-05 22:14:07 UTC (rev 16440)
+++ trunk/reactos/drivers/video/displays/vga/objects/lineto.c
2005-07-05 22:35:29 UTC (rev 16441)
@@ -301,7 +301,8 @@
RECTL *RectBounds,
MIX mix)
{
- LONG x, y, deltax, deltay, i, xchange, ychange, hx, vy;
+ LONG x, y, deltax, deltay, xchange, ychange, hx, vy;
+ ULONG i;
ULONG Pixel = Brush->iSolidColor;
RECT_ENUM RectEnum;
BOOL EnumMore;
@@ -342,7 +343,7 @@
CLIPOBJ_cEnumStart(Clip, FALSE, CT_RECTANGLES, CD_RIGHTDOWN, 0);
do
{
- EnumMore = CLIPOBJ_bEnum(Clip, (ULONG) sizeof(RectEnum),
(PVOID) &RectEnum);
+ EnumMore = CLIPOBJ_bEnum(Clip, sizeof(RectEnum), (PVOID)
&RectEnum);
for (i = 0; i < RectEnum.c && RectEnum.arcl[i].top <= y1; i++)
{
if (y1 < RectEnum.arcl[i].bottom &&
_____
Modified: trunk/reactos/drivers/video/displays/vga/objects/paint.c
--- trunk/reactos/drivers/video/displays/vga/objects/paint.c
2005-07-05 22:14:07 UTC (rev 16440)
+++ trunk/reactos/drivers/video/displays/vga/objects/paint.c
2005-07-05 22:35:29 UTC (rev 16441)
@@ -7,10 +7,10 @@
BOOL VGADDIFillSolid(SURFOBJ *Surface, RECTL Dimensions, ULONG iColor)
{
- int x, y, x2, y2, w, h;
- ULONG offset, j, pre1;
+ int x, y, x2, y2, w, h, j;
+ ULONG offset, pre1;
ULONG orgpre1, orgx, midpre1, tmppre1;
- ULONG ileftpix, imidpix, irightpix;
+ int ileftpix, imidpix, irightpix;
/* double leftpix, midpix, rightpix;*/
UCHAR a;
@@ -150,7 +150,7 @@
CLIPOBJ_cEnumStart(ClipRegion, FALSE, CT_RECTANGLES, CD_ANY,
0);
do {
- int i;
+ UINT i;
EnumMore = CLIPOBJ_bEnum(ClipRegion, sizeof(RectEnum),
(PVOID) &RectEnum);
DPRINT("EnumMore: %d, count: %d\n", EnumMore,
RectEnum.c);
for( i=0; i<RectEnum.c; i++){
_____
Modified: trunk/reactos/drivers/video/displays/vga/objects/pointer.c
--- trunk/reactos/drivers/video/displays/vga/objects/pointer.c
2005-07-05 22:14:07 UTC (rev 16440)
+++ trunk/reactos/drivers/video/displays/vga/objects/pointer.c
2005-07-05 22:35:29 UTC (rev 16441)
@@ -303,9 +303,9 @@
{
ULONG SizeX, SizeY;
- SizeX = min(((X + ppdev->pPointerAttributes->Width) + 7) & ~0x7,
ppdev->sizeSurf.cx);
+ SizeX = min(((X + (LONG)ppdev->pPointerAttributes->Width) + 7) &
~0x7, ppdev->sizeSurf.cx);
SizeX -= (X & ~0x7);
- SizeY = min(ppdev->pPointerAttributes->Height, ppdev->sizeSurf.cy -
Y);
+ SizeY = min((LONG)ppdev->pPointerAttributes->Height,
ppdev->sizeSurf.cy - Y);
Rect->left = max(X, 0) & ~0x7;
Rect->top = max(Y, 0);
@@ -365,8 +365,8 @@
Rect.bottom - Rect.top);
/* Display the cursor. */
- SizeX = min(ppdev->pPointerAttributes->Width, ppdev->sizeSurf.cx -
cx);
- SizeY = min(ppdev->pPointerAttributes->Height, ppdev->sizeSurf.cy -
cy);
+ SizeX = min((LONG)ppdev->pPointerAttributes->Width,
ppdev->sizeSurf.cx - cx);
+ SizeY = min((LONG)ppdev->pPointerAttributes->Height,
ppdev->sizeSurf.cy - cy);
AndMask = ppdev->pPointerAttributes->Pixels +
(ppdev->pPointerAttributes->Height - SizeY) *
ppdev->pPointerAttributes->WidthInBytes;
VGADDI_BltPointerToVGA(cx,
_____
Modified: trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c
--- trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c
2005-07-05 22:14:07 UTC (rev 16440)
+++ trunk/reactos/drivers/video/displays/vga/vgavideo/vgavideo.c
2005-07-05 22:35:29 UTC (rev 16441)
@@ -266,7 +266,7 @@
UCHAR a;
ULONG pre1;
ULONG orgpre1, orgx, midpre1;
- ULONG ileftpix, imidpix, irightpix;
+ LONG ileftpix, imidpix, irightpix;
orgx = x;
@@ -341,7 +341,7 @@
BOOL vgaVLine(INT x, INT y, INT len, UCHAR c)
{
- ULONG offset, i;
+ INT offset, i;
UCHAR a;
offset = xconv[x]+y80[y];
@@ -391,9 +391,9 @@
ULONG left = x >> 3;
ULONG shift = x - (x & ~0x7);
UCHAR pixel, nextpixel;
- ULONG rightcount;
- ULONG i, j;
- ULONG stride = w >> 3;
+ LONG rightcount;
+ INT i, j;
+ LONG stride = w >> 3;
/* Calculate the number of rightmost bytes not in a dword block. */
if (w >= 8)
@@ -528,9 +528,9 @@
void DIB_BltToVGA(int x, int y, int w, int h, void *b, int
Source_lDelta, int StartMod)
{
PBYTE pb, opb = b;
- ULONG i, j;
- ULONG x2 = x + w;
- ULONG y2 = y + h;
+ LONG i, j;
+ LONG x2 = x + w;
+ LONG y2 = y + h;
ULONG offset;
UCHAR a;
_____
Modified: trunk/reactos/drivers/video/miniport/vga/initvga.c
--- trunk/reactos/drivers/video/miniport/vga/initvga.c 2005-07-05
22:14:07 UTC (rev 16440)
+++ trunk/reactos/drivers/video/miniport/vga/initvga.c 2005-07-05
22:35:29 UTC (rev 16441)
@@ -27,7 +27,7 @@
STATIC VOID FASTCALL
vgaSaveRegisters(PVGA_REGISTERS Registers)
{
- int i;
+ UINT i;
for (i = 0; i < sizeof(Registers->CRT); i++)
{
@@ -60,7 +60,7 @@
STATIC VOID FASTCALL
vgaSetRegisters(PVGA_REGISTERS Registers)
{
- int i;
+ UINT i;
/* Update misc output register */
VideoPortWritePortUchar(MISC, Registers->Misc);
_____
Modified: trunk/reactos/include/ndk/ketypes.h
--- trunk/reactos/include/ndk/ketypes.h 2005-07-05 22:14:07 UTC (rev
16440)
+++ trunk/reactos/include/ndk/ketypes.h 2005-07-05 22:35:29 UTC (rev
16441)
@@ -98,7 +98,7 @@
PVOID RegionEnd;
ULONG BucketShift;
PVOID Buffer;
- CSHORT Source;
+ KPROFILE_SOURCE Source;
ULONG Affinity;
BOOLEAN Active;
struct _KPROCESS *Process;
_____
Modified: trunk/reactos/include/reactos/exeformat.h
--- trunk/reactos/include/reactos/exeformat.h 2005-07-05 22:14:07 UTC
(rev 16440)
+++ trunk/reactos/include/reactos/exeformat.h 2005-07-05 22:35:29 UTC
(rev 16441)
@@ -69,7 +69,7 @@
* as opposed to STATUS_INVALID_IMAGE_FORMAT meaning the format is
supported,
* but the particular file is malformed
*/
-#define STATUS_ROS_EXEFMT_UNKNOWN_FORMAT (0xA0100001)
+#define STATUS_ROS_EXEFMT_UNKNOWN_FORMAT ((NTSTATUS)0xA0100001)
/*
* Returned by MmCreateSection to signal successful loading of an
executable
@@ -78,7 +78,7 @@
* STATUS_ROS_EXEFMT_LOADED_FORMAT and the appropriate
EXEFMT_LOADED_XXX
*/
#define FACILITY_ROS_EXEFMT_FORMAT (0x11)
-#define STATUS_ROS_EXEFMT_LOADED_FORMAT (0x60110000)
+#define STATUS_ROS_EXEFMT_LOADED_FORMAT ((NTSTATUS)0x60110000)
/* non-standard format, ZwQuerySection required to retrieve the format
tag */
#define EXEFMT_LOADED_EXTENDED (0x0000FFFF)
_____
Modified: trunk/reactos/lib/aclui/checklist.c
--- trunk/reactos/lib/aclui/checklist.c 2005-07-05 22:14:07 UTC (rev
16440)
+++ trunk/reactos/lib/aclui/checklist.c 2005-07-05 22:35:29 UTC (rev
16441)
@@ -63,7 +63,7 @@
BOOL FocusVisible;
COLORREF TextColor[2];
- UINT CheckBoxLeft[2];
+ INT CheckBoxLeft[2];
BOOL QuickSearchEnabled;
PCHECKITEM QuickSearchHitItem;
@@ -531,7 +531,7 @@
VisibleItems = (rcClient.bottom - rcClient.top) /
infoPtr->ItemHeight;
- if (ScrollInfo.nPage == VisibleItems && ScrollInfo.nMax > 0)
+ if (ScrollInfo.nPage == (UINT)VisibleItems && ScrollInfo.nMax > 0)
{
ScrollInfo.nMax--;
}
@@ -1456,7 +1456,7 @@
default:
{
INT SearchLen = wcslen(infoPtr->QuickSearchText);
- if (SearchLen < (sizeof(infoPtr->QuickSearchText) /
sizeof(infoPtr->QuickSearchText[0])) - 1)
+ if (SearchLen < (INT)(sizeof(infoPtr->QuickSearchText)
/ sizeof(infoPtr->QuickSearchText[0])) - 1)
{
infoPtr->QuickSearchText[SearchLen++] = c;
infoPtr->QuickSearchText[SearchLen] = L'\0';
@@ -1832,7 +1832,7 @@
case CLM_SETCHECKBOXCOLUMN:
{
- infoPtr->CheckBoxLeft[wParam != CLB_DENY] = (UINT)lParam;
+ infoPtr->CheckBoxLeft[wParam != CLB_DENY] = (INT)lParam;
Ret = 1;
break;
}
@@ -1894,7 +1894,7 @@
{
LPSTYLESTRUCT Style = (LPSTYLESTRUCT)lParam;
- if (wParam == GWL_STYLE)
+ if (wParam == (WPARAM)GWL_STYLE)
{
BOOL AllowChangeStyle;
_____
Modified: trunk/reactos/lib/adns/src/check.c
--- trunk/reactos/lib/adns/src/check.c 2005-07-05 22:14:07 UTC (rev
16440)
+++ trunk/reactos/lib/adns/src/check.c 2005-07-05 22:35:29 UTC (rev
16441)
@@ -116,7 +116,7 @@
break;
case server_disconnected:
case server_broken:
- assert(ads->tcpsocket == -1);
+ assert(ads->tcpsocket == INVALID_SOCKET);
checkc_notcpbuf(ads);
break;
case server_ok:
_____
Modified: trunk/reactos/lib/adns/src/query.c
--- trunk/reactos/lib/adns/src/query.c 2005-07-05 22:14:07 UTC (rev
16440)
+++ trunk/reactos/lib/adns/src/query.c 2005-07-05 22:35:29 UTC (rev
16441)
@@ -286,7 +286,7 @@
iaddr= (const unsigned char*) &(((const struct sockaddr_in*)addr) ->
sin_addr);
lreq= strlen(zone) + 4*4 + 1;
- if (lreq > sizeof(shortbuf)) {
+ if (lreq > (int)sizeof(shortbuf)) {
buf= malloc( strlen(zone) + 4*4 + 1 );
if (!buf) return errno;
buf_free= buf;
_____
Modified: trunk/reactos/lib/adns/src/reply.c
--- trunk/reactos/lib/adns/src/reply.c 2005-07-05 22:14:07 UTC (rev
16440)
+++ trunk/reactos/lib/adns/src/reply.c 2005-07-05 22:35:29 UTC (rev
16441)
@@ -222,7 +222,7 @@
* it contains the relevant info.
*/
}
- } else if (rrtype == (qu->typei->type & adns__rrt_typemask)) {
+ } else if (rrtype == ((INT)qu->typei->type &
(INT)adns__rrt_typemask)) {
wantedrrs++;
} else {
adns__debug(ads,serv,qu,"ignoring answer RR with irrelevant type
%d",rrtype);
@@ -322,7 +322,7 @@
&ownermatched);
assert(!st); assert(rrtype != -1);
if (rrclass != DNS_CLASS_IN ||
- rrtype != (qu->typei->type & adns__rrt_typemask) ||
+ rrtype != ((INT)qu->typei->type & (INT)adns__rrt_typemask) ||
!ownermatched)
continue;
adns__update_expires(qu,ttl,now);
_____
Modified: trunk/reactos/lib/adns/src/setup.c
--- trunk/reactos/lib/adns/src/setup.c 2005-07-05 22:14:07 UTC (rev
16440)
+++ trunk/reactos/lib/adns/src/setup.c 2005-07-05 22:35:29 UTC (rev
16441)
@@ -163,7 +163,7 @@
return;
}
- if (l >= sizeof(tbuf)) {
+ if (l >= (int)sizeof(tbuf)) {
configparseerr(ads,fn,lno,"sortlist entry `%.*s' too
long",l,word);
continue;
}
_____
Modified: trunk/reactos/lib/adns/src/types.c
--- trunk/reactos/lib/adns/src/types.c 2005-07-05 22:14:07 UTC (rev
16440)
+++ trunk/reactos/lib/adns/src/types.c 2005-07-05 22:35:29 UTC (rev
16441)
@@ -749,7 +749,7 @@
if (lablen>1 && pai->qu->query_dgram[labstart]=='0')
return adns_s_querydomainwrong;
}
- for (i=0; i<sizeof(expectdomain)/sizeof(*expectdomain); i++) {
+ for (i=0; i<(int)sizeof(expectdomain)/(int)sizeof(*expectdomain);
i++) {
st= adns__findlabel_next(&fls,&lablen,&labstart); assert(!st);
l= strlen(expectdomain[i]);
if (lablen != l || memcmp(pai->qu->query_dgram + labstart,
expectdomain[i], (size_t)l))
_____
Modified: trunk/reactos/lib/advapi32/crypt/crypt.c
--- trunk/reactos/lib/advapi32/crypt/crypt.c 2005-07-05 22:14:07 UTC
(rev 16440)
+++ trunk/reactos/lib/advapi32/crypt/crypt.c 2005-07-05 22:35:29 UTC
(rev 16441)
@@ -126,7 +126,7 @@
return TRUE;
}
wcount = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0);
- wcount = wcount < wstrsize/sizeof(WCHAR) ? wcount :
wstrsize/sizeof(WCHAR);
+ wcount = wcount < wstrsize/(int)sizeof(WCHAR) ? wcount :
wstrsize/(int)sizeof(WCHAR);
if (wstrsize == -1)
*wstr = CRYPT_Alloc(wcount * sizeof(WCHAR));
if (*wstr)
_____
Modified: trunk/reactos/lib/advpack/advpack.c
--- trunk/reactos/lib/advpack/advpack.c 2005-07-05 22:14:07 UTC (rev
16440)
+++ trunk/reactos/lib/advpack/advpack.c 2005-07-05 22:35:29 UTC (rev
16441)
@@ -272,7 +272,7 @@
PDWORD PReserved )
{
HANDLE Process, Token;
- INT i;
+ UINT i;
BOOL Good = FALSE;
DWORD Buffer[4096];
DWORD Size;
_____
Modified: trunk/reactos/lib/cpl/desk/settings.c
--- trunk/reactos/lib/cpl/desk/settings.c 2005-07-05 22:14:07 UTC
(rev 16440)
+++ trunk/reactos/lib/cpl/desk/settings.c 2005-07-05 22:35:29 UTC
(rev 16441)
@@ -247,7 +247,7 @@
if (LoadString(hApplet, (2900 + Current->dmBitsPerPel),
Buffer, sizeof(Buffer) / sizeof(TCHAR)))
{
index = SendDlgItemMessage(hwndDlg,
IDC_SETTINGS_BPP, CB_FINDSTRINGEXACT, (WPARAM)-1, (LPARAM)Buffer);
[truncated at 1000 lines; 4365 more skipped]
7148
days inactive
7148
days old
0 comments
1 participants
participants (1)
-
weiden＠svn.reactos.com