Ros-diffs

ros-diffs@reactos.org

81390 discussions

[navaraf] 17487: Shut up PREFAST warnings about shadowing declarations.
by navaraf＠svn.reactos.com 23 Aug '05

23 Aug '05

Shut up PREFAST warnings about shadowing declarations. Modified: trunk/reactos/drivers/net/ndis/ndis/config.c _____ Modified: trunk/reactos/drivers/net/ndis/ndis/config.c --- trunk/reactos/drivers/net/ndis/ndis/config.c 2005-08-23 20:13:31 UTC (rev 17486) +++ trunk/reactos/drivers/net/ndis/ndis/config.c 2005-08-23 20:18:55 UTC (rev 17487) @@ -508,7 +508,6 @@ case NdisParameterString: case NdisParameterMultiString: { - PMINIPORT_RESOURCE MiniportResource = 0; PWCHAR RegData = 0; if(KeyInformation->Type != REG_SZ && KeyInformation->Type != REG_MULTI_SZ) @@ -571,8 +570,6 @@ case NdisParameterBinary: { - PMINIPORT_RESOURCE MiniportResource; - if(KeyInformation->Type != REG_BINARY) { NDIS_DbgPrint(MIN_TRACE,("requested type does not match actual value type\n"));

1 0

[navaraf] 17486: Fix incorrect string manipulation in NdisOpenProtocolConfiguration and add few casts to make compiler happy.
by navaraf＠svn.reactos.com 23 Aug '05

23 Aug '05

Fix incorrect string manipulation in NdisOpenProtocolConfiguration and add few casts to make compiler happy. Modified: trunk/reactos/drivers/net/ndis/ndis/config.c _____ Modified: trunk/reactos/drivers/net/ndis/ndis/config.c --- trunk/reactos/drivers/net/ndis/ndis/config.c 2005-08-23 17:43:58 UTC (rev 17485) +++ trunk/reactos/drivers/net/ndis/ndis/config.c 2005-08-23 20:13:31 UTC (rev 17486) @@ -31,7 +31,6 @@ * - All the routines in this file are PASSIVE_LEVEL only, and all memory is PagedPool */ -#include <roscfg.h> #include "ndissys.h" #define NDIS_VERSION 0x00040000 /* the version of NDIS we claim to be to miniport drivers */ @@ -236,12 +235,13 @@ { OBJECT_ATTRIBUTES KeyAttributes; UNICODE_STRING KeyNameU; - WCHAR *KeyName; HANDLE KeyHandle; PMINIPORT_CONFIGURATION_CONTEXT ConfigurationContext; - KeyName = ExAllocatePool(PagedPool, ProtocolSection->Length + sizeof(PARAMETERS_KEY) + sizeof(WCHAR)); - if(!KeyName) + KeyNameU.Length = 0; + KeyNameU.MaximumLength = ProtocolSection->Length + sizeof(PARAMETERS_KEY) + sizeof(UNICODE_NULL); + KeyNameU.Buffer = ExAllocatePool(PagedPool, KeyNameU.MaximumLength); + if(!KeyNameU.Buffer) { NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); *ConfigurationHandle = NULL; @@ -249,14 +249,13 @@ return; } - wcsncpy(KeyName, ProtocolSection->Buffer, ProtocolSection->Length/sizeof(WCHAR)); - wcscpy(KeyName + ProtocolSection->Length, PARAMETERS_KEY); - RtlInitUnicodeString(&KeyNameU, KeyName); + RtlCopyUnicodeString(&KeyNameU, ProtocolSection); + RtlAppendUnicodeToString(&KeyNameU, PARAMETERS_KEY); InitializeObjectAttributes(&KeyAttributes, &KeyNameU, OBJ_CASE_INSENSITIVE, NULL, NULL); *Status = ZwOpenKey(&KeyHandle, KEY_ALL_ACCESS, &KeyAttributes); - ExFreePool(KeyName); + ExFreePool(KeyNameU.Buffer); if(*Status != NDIS_STATUS_SUCCESS) { @@ -490,7 +489,7 @@ return; } - str.Length = str.MaximumLength = KeyInformation->DataLength; + str.Length = str.MaximumLength = (USHORT)KeyInformation->DataLength; str.Buffer = (PWCHAR)KeyInformation->Data; (*ParameterValue)->ParameterType = ParameterType; @@ -560,7 +559,7 @@ memcpy(RegData, KeyInformation->Data, KeyInformation->DataLength); (*ParameterValue)->ParameterType = ParameterType; - (*ParameterValue)->ParameterData.StringData.Length = KeyInformation->DataLength; + (*ParameterValue)->ParameterData.StringData.Length = (USHORT)KeyInformation->DataLength; (*ParameterValue)->ParameterData.StringData.Buffer = RegData; ExFreePool(KeyInformation); @@ -805,7 +804,7 @@ /* should i fail instead if the passed-in string isn't long enough? */ wcsncpy(KeyName->Buffer, KeyInformation->Name, KeyName->MaximumLength/sizeof(WCHAR)); - KeyName->Length = KeyInformation->NameLength; + KeyName->Length = (USHORT)KeyInformation->NameLength; InitializeObjectAttributes(&KeyAttributes, KeyName, OBJ_CASE_INSENSITIVE, ConfigurationHandle, NULL);

1 0

[hbirr] 17485: ReturnRecognizedPartitions in HalIoReadPartitionTable means that used and real partitions should be returned.
by hbirr＠svn.reactos.com 23 Aug '05

23 Aug '05

ReturnRecognizedPartitions in HalIoReadPartitionTable means that used and real partitions should be returned. Modified: trunk/reactos/ntoskrnl/io/disk.c _____ Modified: trunk/reactos/ntoskrnl/io/disk.c --- trunk/reactos/ntoskrnl/io/disk.c 2005-08-23 17:42:12 UTC (rev 17484) +++ trunk/reactos/ntoskrnl/io/disk.c 2005-08-23 17:43:58 UTC (rev 17485) @@ -907,7 +907,8 @@ if ((ReturnRecognizedPartitions == FALSE) || ((ReturnRecognizedPartitions == TRUE) && - IsRecognizedPartition(PartitionSector->Partition[i].PartitionType))) + !IsContainerPartition(PartitionSector->Partition[i].PartitionType) && + PartitionSector->Partition[i].PartitionType != PARTITION_ENTRY_UNUSED)) { /* handle normal partition */ DPRINT("Partition %u: Normal Partition\n", i); @@ -936,13 +937,17 @@ LayoutBuffer->PartitionEntry[Count].HiddenSectors = PartitionSector->Partition[i].StartingBlock; - if (IsRecognizedPartition(PartitionSector->Partition[i].PartitionType)) + if (!IsContainerPartition(PartitionSector->Partition[i].PartitionType) && + PartitionSector->Partition[i].PartitionType != PARTITION_ENTRY_UNUSED) { + LayoutBuffer->PartitionEntry[Count].RecognizedPartition = TRUE; + /* WinXP returns garbage as PartitionNumber */ LayoutBuffer->PartitionEntry[Count].PartitionNumber = Number; Number++; } else { + LayoutBuffer->PartitionEntry[Count].RecognizedPartition = FALSE; LayoutBuffer->PartitionEntry[Count].PartitionNumber = 0; } @@ -950,8 +955,6 @@ PartitionSector->Partition[i].PartitionType; LayoutBuffer->PartitionEntry[Count].BootIndicator = (PartitionSector->Partition[i].BootFlags & 0x80)?TRUE:FALSE; - LayoutBuffer->PartitionEntry[Count].RecognizedPartition = - IsRecognizedPartition (PartitionSector->Partition[i].PartitionType); LayoutBuffer->PartitionEntry[Count].RewritePartition = FALSE; DPRINT(" %ld: nr: %d boot: %1x type: %x start: 0x%I64x count: 0x%I64x rec: %d\n",

1 0

[hbirr] 17484: Fixed the calculation of the boot disk number in i386DiskGetSystemVolume.
by hbirr＠svn.reactos.com 23 Aug '05

23 Aug '05

Fixed the calculation of the boot disk number in i386DiskGetSystemVolume. We have to count all used partititions instead of the known one. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c 2005-08-23 17:38:14 UTC (rev 17483) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386disk.c 2005-08-23 17:42:12 UTC (rev 17484) @@ -165,6 +165,36 @@ memcpy(Buffer, Ptr, BufferSize); + DbgPrint((DPRINT_DISK, "size of buffer: %x\n", Ptr[0])); + DbgPrint((DPRINT_DISK, "information flags: %x\n", Ptr[1])); + DbgPrint((DPRINT_DISK, "number of physical cylinders on drive: %u\n", *(PULONG)&Ptr[2])); + DbgPrint((DPRINT_DISK, "number of physical heads on drive: %u\n", *(PULONG)&Ptr[4])); + DbgPrint((DPRINT_DISK, "number of physical sectors per track: %u\n", *(PULONG)&Ptr[6])); + DbgPrint((DPRINT_DISK, "total number of sectors on drive: %I64u\n", *(unsigned long long*)&Ptr[8])); + DbgPrint((DPRINT_DISK, "bytes per sector: %u\n", Ptr[12])); + if (Ptr[0] >= 0x1e) + { + DbgPrint((DPRINT_HB, "EED configuration parameters: %x:%x\n", Ptr[13], Ptr[14])); + if (Ptr[13] != 0xffff && Ptr[14] != 0xffff) + { + PUCHAR SpecPtr = (PUCHAR)((Ptr[13] << 4) + Ptr[14]); + DbgPrint((DPRINT_DISK, "SpecPtr: %x\n", SpecPtr)); + DbgPrint((DPRINT_DISK, "physical I/O port base address: %x\n", *(PUSHORT)&SpecPtr[0])); + DbgPrint((DPRINT_DISK, "disk-drive control port address: %x\n", *(PUSHORT)&SpecPtr[2])); + DbgPrint((DPRINT_DISK, "drive flags: %x\n", SpecPtr[4])); + DbgPrint((DPRINT_DISK, "proprietary information: %x\n", SpecPtr[5])); + DbgPrint((DPRINT_DISK, "IRQ for drive: %u\n", SpecPtr[6])); + DbgPrint((DPRINT_DISK, "sector count for multi-sector transfers: %u\n", SpecPtr[7])); + DbgPrint((DPRINT_DISK, "DMA control: %x\n", SpecPtr[8])); + DbgPrint((DPRINT_DISK, "programmed I/O control: %x\n", SpecPtr[9])); + DbgPrint((DPRINT_DISK, "drive options: %x\n", *(PUSHORT)&SpecPtr[10])); + } + } + if (Ptr[0] >= 0x42) + { + DbgPrint((DPRINT_HB, "signature: %x\n", Ptr[15])); + } + return TRUE; } @@ -301,6 +331,10 @@ (P) == PARTITION_FAT32_XINT13 || \ (P) == PARTITION_XINT13) +#define IsContainerPartition(P) \ + ((P) == PARTITION_EXTENDED || \ + (P) == PARTITION_XINT13_EXTENDED) + BOOL i386DiskGetSystemVolume(char *SystemPath, char *RemainingPath, PULONG Device, @@ -344,7 +378,8 @@ { return FALSE; } - if (IsRecognizedPartition(PartitionTableEntry.SystemIndicator)) + if (!IsContainerPartition(PartitionTableEntry.SystemIndicator) && + PartitionTableEntry.SystemIndicator != PARTITION_ENTRY_UNUSED) { if (++RosPartition == PartitionNumber) {

1 0

[hpoussin] 17483: Fix special case in SetupGetLineTextA/W and SetupGetStringFieldA/W when Buffer is NULL and BufferSize is 0, by reverting part of r17162
by hpoussin＠svn.reactos.com 23 Aug '05

23 Aug '05

Fix special case in SetupGetLineTextA/W and SetupGetStringFieldA/W when Buffer is NULL and BufferSize is 0, by reverting part of r17162 Fixes bug #724, spotted by GvG Do according changes in SetupDiBuildDriverInfoList Modified: trunk/reactos/lib/setupapi/devinst.c Modified: trunk/reactos/lib/setupapi/parser.c _____ Modified: trunk/reactos/lib/setupapi/devinst.c --- trunk/reactos/lib/setupapi/devinst.c 2005-08-23 14:56:38 UTC (rev 17482) +++ trunk/reactos/lib/setupapi/devinst.c 2005-08-23 17:38:14 UTC (rev 17483) @@ -3564,8 +3564,9 @@ 0, /* Field index */ NULL, 0, &RequiredSize); - if (!Result && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + if (Result) { + /* We got the needed size for the buffer */ ManufacturerName = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); if (!ManufacturerName) { @@ -3583,8 +3584,9 @@ 1, /* Field index */ NULL, 0, &RequiredSize); - if (!Result && GetLastError() == ERROR_INSUFFICIENT_BUFFER) + if (Result) { + /* We got the needed size for the buffer */ ManufacturerSection = HeapAlloc(GetProcessHeap(), 0, RequiredSize * sizeof(WCHAR)); if (!ManufacturerSection) { _____ Modified: trunk/reactos/lib/setupapi/parser.c --- trunk/reactos/lib/setupapi/parser.c 2005-08-23 14:56:38 UTC (rev 17482) +++ trunk/reactos/lib/setupapi/parser.c 2005-08-23 17:38:14 UTC (rev 17483) @@ -1523,13 +1523,13 @@ total += PARSER_string_substW( file, field->text, NULL, 0 ) + 1; if (required) *required = total; - if (total > size) - { - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return FALSE; - } if (buffer) { + if (total > size) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } for (i = 0, field = &file->fields[line->first_field]; i < line->nb_fields; i++, field++) { unsigned int len = PARSER_string_substW( file, field->text, buffer, size ); @@ -1574,13 +1574,13 @@ total += PARSER_string_substA( file, field->text, NULL, 0 ) + 1; if (required) *required = total; - if (total > size) - { - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return FALSE; - } if (buffer) { + if (total > size) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } for (i = 0, field = &file->fields[line->first_field]; i < line->nb_fields; i++, field++) { unsigned int len = PARSER_string_substA( file, field->text, buffer, size ); @@ -1619,13 +1619,13 @@ if (!field) return FALSE; len = PARSER_string_substA( file, field->text, NULL, 0 ); if (required) *required = len + 1; - if (size <= len) - { - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return FALSE; - } if (buffer) { + if (size <= len) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } PARSER_string_substA( file, field->text, buffer, size ); TRACE( "context %p/%p/%d/%d index %ld returning %s\n", @@ -1650,13 +1650,13 @@ if (!field) return FALSE; len = PARSER_string_substW( file, field->text, NULL, 0 ); if (required) *required = len + 1; - if (size <= len) - { - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - return FALSE; - } if (buffer) { + if (size <= len) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } PARSER_string_substW( file, field->text, buffer, size ); TRACE( "context %p/%p/%d/%d index %ld returning %s\n",

1 0

[navaraf] 17482: Name the proxy makefiles "GNUmakefile" instead of "makefile".
by navaraf＠svn.reactos.com 23 Aug '05

23 Aug '05

Name the proxy makefiles "GNUmakefile" instead of "makefile". Modified: trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp _____ Modified: trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp --- trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp 2005-08-23 14:51:03 UTC (rev 17481) +++ trunk/reactos/tools/rbuild/backend/mingw/proxymakefile.cpp 2005-08-23 14:56:38 UTC (rev 17482) @@ -108,7 +108,7 @@ base = module.GetBasePath (); pathToTopDirectory = GetPathToTopDirectory ( module ); } - string proxyMakefile = NormalizeFilename ( base + SSEP "makefile" ); + string proxyMakefile = NormalizeFilename ( base + SSEP "GNUmakefile" ); string defaultTarget = module.name; buf = (char*) malloc ( 10*1024 );

1 0

[gvg] 17481: Rewrite project target
by gvg＠svn.reactos.com 23 Aug '05

23 Aug '05

Rewrite project target Modified: trunk/reactos/bootdata/readme.txt _____ Modified: trunk/reactos/bootdata/readme.txt --- trunk/reactos/bootdata/readme.txt 2005-08-23 14:26:00 UTC (rev 17480) +++ trunk/reactos/bootdata/readme.txt 2005-08-23 14:51:03 UTC (rev 17481) @@ -7,7 +7,8 @@ ------------------- ReactOS is an Open Source effort to develop a quality operating system that is -compatible with Windows NT applications and drivers. +compatible with applications and drivers written for the Microsoft Windows NT +family of operating systems (NT4, 2000, XP, 2003). Website: http://www.reactos.com @@ -51,4 +52,4 @@ 6. Author --------- -This document was written by Jason Filby (jasonfilby(a)yahoo.com). \ No newline at end of file +This document was written by Jason Filby (jasonfilby(a)yahoo.com).

1 0

[navaraf] 17480: Set the service group for i8042prt.
by navaraf＠svn.reactos.com 23 Aug '05

23 Aug '05

Set the service group for i8042prt. Modified: trunk/reactos/bootdata/hivesys.inf _____ Modified: trunk/reactos/bootdata/hivesys.inf --- trunk/reactos/bootdata/hivesys.inf 2005-08-22 23:33:51 UTC (rev 17479) +++ trunk/reactos/bootdata/hivesys.inf 2005-08-23 14:26:00 UTC (rev 17480) @@ -484,6 +484,7 @@ ; i8042 port driver HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","ErrorControl",0x00010 001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Group",0x00000000,"K eyboard Port" HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Start",0x00010001,0x0 0000001 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Type",0x00010001,0x00 000001 ;HKLM,"SYSTEM\CurrentControlSet\Enum\ACPI\PNP0303\0000","Service",0x0000 0000,"i8042prt"

1 0

[ion] 17479: use correct wait mode when checking alertability in KeDelayExecuteThread. thanks to gunnar for noticing the bug
by ion＠svn.reactos.com 22 Aug '05

22 Aug '05

use correct wait mode when checking alertability in KeDelayExecuteThread. thanks to gunnar for noticing the bug Modified: trunk/reactos/ntoskrnl/ke/wait.c _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2005-08-22 21:35:41 UTC (rev 17478) +++ trunk/reactos/ntoskrnl/ke/wait.c 2005-08-22 23:33:51 UTC (rev 17479) @@ -111,7 +111,7 @@ do { /* We are going to wait no matter what (that's the point), so test Alertability */ - if (KiCheckAlertability(Alertable, CurrentThread, KernelMode, &Status)) + if (KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status)) break; /* Set Timer */

1 0

[navaraf] 17478: Actually break out of the wait loops if we got alerted.
by navaraf＠svn.reactos.com 22 Aug '05

22 Aug '05

Actually break out of the wait loops if we got alerted. Modified: trunk/reactos/ntoskrnl/ke/wait.c _____ Modified: trunk/reactos/ntoskrnl/ke/wait.c --- trunk/reactos/ntoskrnl/ke/wait.c 2005-08-22 15:20:49 UTC (rev 17477) +++ trunk/reactos/ntoskrnl/ke/wait.c 2005-08-22 21:35:41 UTC (rev 17478) @@ -27,7 +27,7 @@ /* FUNCTIONS *****************************************************************/ -VOID +BOOLEAN inline FASTCALL KiCheckAlertability(BOOLEAN Alertable, @@ -44,6 +44,7 @@ CurrentThread->Alerted[(int)WaitMode] = FALSE; DPRINT("Thread was Alerted\n"); *Status = STATUS_ALERTED; + return TRUE; /* If there are User APCs Pending, then we can't really be alertable */ } else if ((!IsListEmpty(&CurrentThread->ApcState.ApcListHead[UserMode])) && @@ -52,13 +53,17 @@ DPRINT("APCs are Pending\n"); CurrentThread->ApcState.UserApcPending = TRUE; *Status = STATUS_USER_APC; + return TRUE; } /* If there are User APCs Pending and we are waiting in usermode, then we must notify the caller */ } else if ((CurrentThread->ApcState.UserApcPending) && (WaitMode != KernelMode)) { DPRINT("APCs are Pending\n"); *Status = STATUS_USER_APC; + return TRUE; } + + return FALSE; } /* @@ -106,7 +111,8 @@ do { /* We are going to wait no matter what (that's the point), so test Alertability */ - KiCheckAlertability(Alertable, CurrentThread, KernelMode, &Status); + if (KiCheckAlertability(Alertable, CurrentThread, KernelMode, &Status)) + break; /* Set Timer */ ThreadTimer = &CurrentThread->Timer; @@ -256,7 +262,8 @@ WaitBlock->NextWaitBlock = WaitBlock; /* Make sure we can satisfy the Alertable request */ - KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status); + if (KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status)) + break; /* Set the Wait Status */ CurrentThread->WaitStatus = Status; @@ -485,7 +492,8 @@ } /* Make sure we can satisfy the Alertable request */ - KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status); + if (KiCheckAlertability(Alertable, CurrentThread, WaitMode, &Status)) + break; /* Set the Wait Status */ CurrentThread->WaitStatus = Status;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs