Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hpoussin] 26999: i8042prt is not a pnp driver yet
by hpoussin＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: hpoussin Date: Mon Jun 4 23:32:19 2007 New Revision: 26999 URL: http://svn.reactos.org/svn/reactos?rev=26999&view=rev Log: i8042prt is not a pnp driver yet Modified: trunk/reactos/media/inf/keyboard.inf trunk/reactos/media/inf/msmouse.inf Modified: trunk/reactos/media/inf/keyboard.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/keyboard.inf?rev… ============================================================================== --- trunk/reactos/media/inf/keyboard.inf (original) +++ trunk/reactos/media/inf/keyboard.inf Mon Jun 4 23:32:19 2007 @@ -9,7 +9,7 @@ Class = Keyboard ClassGUID = {4D36E96B-E325-11CE-BFC1-08002BE10318} Provider = %ReactOS% -DriverVer = 09/24/2006,1.03 +DriverVer = 06/04/2007,1.04 [DestinationDirs] DefaultDestDir = 12 @@ -44,7 +44,7 @@ [i8042prt_Service_Inst] ServiceType = 1 -StartType = 3 +StartType = 1 ErrorControl = 1 ServiceBinary = %12%\i8042prt.sys LoadOrderGroup = Keyboard Port Modified: trunk/reactos/media/inf/msmouse.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/msmouse.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/msmouse.inf (original) +++ trunk/reactos/media/inf/msmouse.inf Mon Jun 4 23:32:19 2007 @@ -9,7 +9,7 @@ Class = Mouse ClassGUID = {4D36E96F-E325-11CE-BFC1-08002BE10318} Provider = %ReactOS% -DriverVer = 04/30/2005,1.02 +DriverVer = 06/04/2007,1.03 [DestinationDirs] DefaultDestDir = 12 @@ -93,7 +93,7 @@ [i8042prt_Service_Inst] ServiceType = 1 -StartType = 3 +StartType = 1 ErrorControl = 1 ServiceBinary = %12%\i8042prt.sys LoadOrderGroup = Keyboard Port

1 0

[hpoussin] 26998: Add missing registry value
by hpoussin＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: hpoussin Date: Mon Jun 4 23:32:10 2007 New Revision: 26998 URL: http://svn.reactos.org/svn/reactos?rev=26998&view=rev Log: Add missing registry value Modified: trunk/reactos/boot/bootdata/hivesys.inf Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf (original) +++ trunk/reactos/boot/bootdata/hivesys.inf Mon Jun 4 23:32:10 2007 @@ -581,6 +581,7 @@ ; i8042 port driver HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Group",0x00000000,"Keyboard Port" +HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","ImagePath",0x00020000,"system32\drivers\i8042prt.sys" HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt","Type",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\i8042prt\Parameters","BreakOnSysRq",0x00010001,0x00000001

1 0

[dgorbachev] 26997: Update Polish translation. Bug #2280.
by dgorbachev＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: dgorbachev Date: Mon Jun 4 23:04:03 2007 New Revision: 26997 URL: http://svn.reactos.org/svn/reactos?rev=26997&view=rev Log: Update Polish translation. Bug #2280. Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc Modified: trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/syssetup/lang/pl… ============================================================================== --- trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc (original) +++ trunk/reactos/dll/win32/syssetup/lang/pl-PL.rc Mon Jun 4 23:04:03 2007 @@ -242,12 +242,12 @@ STRINGTABLE BEGIN - IDS_WZD_NAME "Setup cannot continue until you enter your name." - IDS_WZD_SETCOMPUTERNAME "Setup failed to set the computer name." - IDS_WZD_COMPUTERNAME "Setup cannot continue until you enter the name of your computer." - IDS_WZD_PASSWORDEMPTY "You must enter a password !" - IDS_WZD_PASSWORDMATCH "The passwords you entered do not match. Please enter the desired password again." - IDS_WZD_PASSWORDCHAR "The password you entered contains invalid characters. Please enter a cleaned password." - IDS_WZD_LOCALTIME "Setup was unable to set the local time." + IDS_WZD_NAME "Program instalacyjny nie mo¿e kontynuowaæ dopóki nie wpiszesz swojego imienia i nazwiska." + IDS_WZD_SETCOMPUTERNAME "Program instalacyjny nie zdo³a³ ustawiæ nowej nazwy komputera." + IDS_WZD_COMPUTERNAME "Program instalacyjny nie mo¿e kontynuowaæ dopóki nie wpiszesz nazwy komputera." + IDS_WZD_PASSWORDEMPTY "Musisz wprowadziæ has³o !" + IDS_WZD_PASSWORDMATCH "Oba wprowadzone has³a nie s¹ identyczne. Musisz wpisaæ to samo has³o dwa razy." + IDS_WZD_PASSWORDCHAR "Wprowadzone has³o zawiera nieodpowiednie znaki. Proszê wprowadziæ has³o bez ich udzia³u." + IDS_WZD_LOCALTIME "Program instalacyjny nie zdo³a³ ustawiæ czasu lokalnego." END /* EOF */

1 0

[fireball] 26996: - Revert 26995 since it breaks booting.
by fireball＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: fireball Date: Mon Jun 4 22:59:08 2007 New Revision: 26996 URL: http://svn.reactos.org/svn/reactos?rev=26996&view=rev Log: - Revert 26995 since it breaks booting. Modified: trunk/reactos/media/inf/machine.inf Modified: trunk/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/machine.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/machine.inf (original) +++ trunk/reactos/media/inf/machine.inf Mon Jun 4 22:59:08 2007 @@ -77,8 +77,8 @@ isapnp.sys [PCI_ISA_Inst.NT.Services] -AddService = isapnp, 0x00000002, isapnp_Service_Inst -;AddService = , 0x00000002 +;AddService = isapnp, 0x00000002, isapnp_Service_Inst +AddService = , 0x00000002 [isapnp_Service_Inst] ServiceType = 1

1 0

[spetreolle] 26995: Install ISA PNP bus driver
by spetreolle＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: spetreolle Date: Mon Jun 4 20:34:19 2007 New Revision: 26995 URL: http://svn.reactos.org/svn/reactos?rev=26995&view=rev Log: Install ISA PNP bus driver Modified: trunk/reactos/media/inf/machine.inf Modified: trunk/reactos/media/inf/machine.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/machine.inf?rev=… ============================================================================== --- trunk/reactos/media/inf/machine.inf (original) +++ trunk/reactos/media/inf/machine.inf Mon Jun 4 20:34:19 2007 @@ -77,8 +77,8 @@ isapnp.sys [PCI_ISA_Inst.NT.Services] -;AddService = isapnp, 0x00000002, isapnp_Service_Inst -AddService = , 0x00000002 +AddService = isapnp, 0x00000002, isapnp_Service_Inst +;AddService = , 0x00000002 [isapnp_Service_Inst] ServiceType = 1

1 0

[fireball] 26994: - Correctly fill FullDllName for modules loaded by the bootloader. This prevents loading them again later by MmLoadSystemImage().
by fireball＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: fireball Date: Mon Jun 4 19:32:35 2007 New Revision: 26994 URL: http://svn.reactos.org/svn/reactos?rev=26994&view=rev Log: - Correctly fill FullDllName for modules loaded by the bootloader. This prevents loading them again later by MmLoadSystemImage(). Modified: trunk/reactos/ntoskrnl/ke/freeldr.c Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Mon Jun 4 19:32:35 2007 @@ -24,7 +24,7 @@ PROS_LOADER_PARAMETER_BLOCK KeRosLoaderBlock; BOOLEAN AcpiTableDetected; -/* NT Loader Data. Eats up about 50KB! */ +/* NT Loader Data. Eats up about 80KB! */ LOADER_PARAMETER_BLOCK BldrLoaderBlock; // 0x0000 LOADER_PARAMETER_EXTENSION BldrExtensionBlock; // 0x0060 CHAR BldrCommandLine[256]; // 0x00DC @@ -35,12 +35,13 @@ LDR_DATA_TABLE_ENTRY BldrModules[64]; // 0x02DC MEMORY_ALLOCATION_DESCRIPTOR BldrMemoryDescriptors[64]; // 0x14DC WCHAR BldrModuleStrings[64][260]; // 0x19DC -NLS_DATA_BLOCK BldrNlsDataBlock; // 0x9BDC -SETUP_LOADER_BLOCK BldrSetupBlock; // 0x9BE8 -ARC_DISK_INFORMATION BldrArcDiskInfo; // 0x9F34 -CHAR BldrArcNames[32][256]; // 0x9F3C -ARC_DISK_SIGNATURE BldrDiskInfo[32]; // 0xBF3C - // 0xC23C +WCHAR BldrModuleStringsFull[64][260]; // 0x9BDC +NLS_DATA_BLOCK BldrNlsDataBlock; // 0x11DDC +SETUP_LOADER_BLOCK BldrSetupBlock; // 0x11DE8 +ARC_DISK_INFORMATION BldrArcDiskInfo; // 0x12134 +CHAR BldrArcNames[32][256]; // 0x1213C +ARC_DISK_SIGNATURE BldrDiskInfo[32]; // 0x1413C + // 0x1443C /* FUNCTIONS *****************************************************************/ @@ -60,6 +61,9 @@ CHAR CommandLine[256]; PARC_DISK_SIGNATURE RosDiskInfo, ArcDiskInfo; PIMAGE_NT_HEADERS NtHeader; + WCHAR PathToDrivers[] = L"\\SystemRoot\\System32\\drivers\\"; + WCHAR PathToSystem32[] = L"\\SystemRoot\\System32\\"; + CHAR DriverNameLow[256]; /* First get some kernel-loader globals */ AcpiTableDetected = (RosLoaderBlock->Flags & MB_FLAGS_ACPI_TABLE) ? TRUE : FALSE; @@ -210,6 +214,10 @@ &MdEntry->ListEntry); } + /* Lowercase the drivername so we can check its extension later */ + strcpy(DriverNameLow, DriverName); + _strlwr(DriverNameLow); + /* Setup the loader entry */ LdrEntry = &BldrModules[i]; RtlZeroMemory(LdrEntry, sizeof(LDR_DATA_TABLE_ENTRY)); @@ -222,7 +230,29 @@ /* Setup driver name */ RtlInitUnicodeString(&LdrEntry->BaseDllName, BldrModuleStrings[i]); - RtlInitUnicodeString(&LdrEntry->FullDllName, BldrModuleStrings[i]); + + /* Construct a correct full name */ + BldrModuleStringsFull[i][0] = 0; + LdrEntry->FullDllName.MaximumLength = 260 * sizeof(WCHAR); + LdrEntry->FullDllName.Length = 0; + LdrEntry->FullDllName.Buffer = BldrModuleStringsFull[i]; + + /* Guess the path */ + if (strstr(DriverNameLow, ".dll") || strstr(DriverNameLow, ".exe")) + { + UNICODE_STRING TempString; + RtlInitUnicodeString(&TempString, PathToSystem32); + RtlAppendUnicodeStringToString(&LdrEntry->FullDllName, &TempString); + } + else /* .sys */ + { + UNICODE_STRING TempString; + RtlInitUnicodeString(&TempString, PathToDrivers); + RtlAppendUnicodeStringToString(&LdrEntry->FullDllName, &TempString); + } + + /* Append base name of the driver */ + RtlAppendUnicodeStringToString(&LdrEntry->FullDllName, &LdrEntry->BaseDllName); /* Copy data from Freeldr Module Entry */ LdrEntry->DllBase = ModStart;

1 0

[hpoussin] 26993: Reapply r18676/r18677 (dispatch.S part) on w3seek advice. Fixes vmwinst.exe crash on 2nd stage in qemu
by hpoussin＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: hpoussin Date: Mon Jun 4 18:49:28 2007 New Revision: 26993 URL: http://svn.reactos.org/svn/reactos?rev=26993&view=rev Log: Reapply r18676/r18677 (dispatch.S part) on w3seek advice. Fixes vmwinst.exe crash on 2nd stage in qemu Modified: trunk/reactos/dll/ntdll/main/i386/dispatch.S Modified: trunk/reactos/dll/ntdll/main/i386/dispatch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/main/i386/dispat… ============================================================================== --- trunk/reactos/dll/ntdll/main/i386/dispatch.S (original) +++ trunk/reactos/dll/ntdll/main/i386/dispatch.S Mon Jun 4 18:49:28 2007 @@ -211,9 +211,17 @@ mov ecx, [esp+4] mov ebx, [esp] - /* Dispatch the exception */ + /* Call the vectored exception handler */ push ecx push ebx + call _RtlpExecuteVectoredExceptionHandlers@8 + + /* Check for success */ + or al, al + jnz ContinueExecution + + /* Dispatch the exception */ + sub esp, 8 call _RtlDispatchException@8 /* Check for success */

1 0

[hpoussin] 26992: Add a bus number to the PCI resource descriptor
by hpoussin＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: hpoussin Date: Mon Jun 4 14:01:29 2007 New Revision: 26992 URL: http://svn.reactos.org/svn/reactos?rev=26992&view=rev Log: Add a bus number to the PCI resource descriptor Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c Mon Jun 4 14:01:29 2007 @@ -182,8 +182,8 @@ } /* Set 'Configuration Data' value */ - Size = sizeof(CM_FULL_RESOURCE_DESCRIPTOR) + - Table->Size; + Size = FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList.PartialDescriptors) + + 2 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + Table->Size; FullResourceDescriptor = MmAllocateMemory(Size); if (FullResourceDescriptor == NULL) { @@ -196,14 +196,22 @@ memset(FullResourceDescriptor, 0, Size); FullResourceDescriptor->InterfaceType = Isa; FullResourceDescriptor->BusNumber = 0; - FullResourceDescriptor->PartialResourceList.Count = 1; + FullResourceDescriptor->PartialResourceList.Version = 1; + FullResourceDescriptor->PartialResourceList.Revision = 1; + FullResourceDescriptor->PartialResourceList.Count = 2; PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[0]; + PartialDescriptor->Type = CmResourceTypeBusNumber; + PartialDescriptor->ShareDisposition = CmResourceShareDeviceExclusive; + PartialDescriptor->u.BusNumber.Start = 0; + PartialDescriptor->u.BusNumber.Length = 1; + + PartialDescriptor = &FullResourceDescriptor->PartialResourceList.PartialDescriptors[1]; PartialDescriptor->Type = CmResourceTypeDeviceSpecific; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; PartialDescriptor->u.DeviceSpecificData.DataSize = Table->Size; - memcpy((PVOID)((ULONG_PTR)FullResourceDescriptor + sizeof(CM_FULL_RESOURCE_DESCRIPTOR)), + memcpy(&FullResourceDescriptor->PartialResourceList.PartialDescriptors[2], Table, Table->Size);

1 0

[hpoussin] 26991: Copy usetup and welcome apps to the right cdrom directory
by hpoussin＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: hpoussin Date: Mon Jun 4 13:44:46 2007 New Revision: 26991 URL: http://svn.reactos.org/svn/reactos?rev=26991&view=rev Log: Copy usetup and welcome apps to the right cdrom directory Modified: trunk/reactos/base/setup/usetup/usetup.rbuild trunk/reactos/base/setup/welcome/welcome.rbuild Modified: trunk/reactos/base/setup/usetup/usetup.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/usetup.r… ============================================================================== --- trunk/reactos/base/setup/usetup/usetup.rbuild (original) +++ trunk/reactos/base/setup/usetup/usetup.rbuild Mon Jun 4 13:44:46 2007 @@ -1,5 +1,5 @@ <module name="usetup" type="nativecui" installbase="system32" installname="usetup.exe" allowwarnings="false"> - <bootstrap base="reactos/system32" nameoncd="smss.exe" /> + <bootstrap base="$(CDOUTPUT)/system32" nameoncd="smss.exe" /> <include base="usetup">.</include> <include base="zlib">.</include> <include base="inflib">.</include> Modified: trunk/reactos/base/setup/welcome/welcome.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… ============================================================================== --- trunk/reactos/base/setup/welcome/welcome.rbuild (original) +++ trunk/reactos/base/setup/welcome/welcome.rbuild Mon Jun 4 13:44:46 2007 @@ -1,5 +1,5 @@ <module name="welcome" type="win32gui" installbase="system32" installname="welcome.exe"> - <bootstrap base="reactos" /> + <bootstrap base="$(CDOUTPUT)" /> <include base="welcome">.</include> <define name="_WIN32_IE">0x0501</define> <define name="_WIN32_WINNT">0x0501</define>

1 0

[hpoussin] 26990: Use a tag when allocating/freeing some memory
by hpoussin＠svn.reactos.org 08 Jun '07

08 Jun '07

Author: hpoussin Date: Mon Jun 4 13:25:04 2007 New Revision: 26990 URL: http://svn.reactos.org/svn/reactos?rev=26990&view=rev Log: Use a tag when allocating/freeing some memory Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c trunk/reactos/drivers/input/kbdclass/kbdclass.h trunk/reactos/drivers/input/kbdclass/misc.c trunk/reactos/drivers/input/mouclass/misc.c trunk/reactos/drivers/input/mouclass/mouclass.c trunk/reactos/drivers/input/mouclass/mouclass.h trunk/reactos/drivers/input/sermouse/fdo.c trunk/reactos/drivers/input/sermouse/sermouse.c trunk/reactos/drivers/input/sermouse/sermouse.h Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.c (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.c Mon Jun 4 13:25:04 2007 @@ -9,6 +9,16 @@ #define INITGUID #include "kbdclass.h" + +static DRIVER_UNLOAD DriverUnload; +static DRIVER_DISPATCH ClassCreate; +static DRIVER_DISPATCH ClassClose; +static DRIVER_DISPATCH ClassCleanup; +static DRIVER_DISPATCH ClassRead; +static DRIVER_DISPATCH ClassDeviceControl; +static DRIVER_DISPATCH IrpStub; +static DRIVER_ADD_DEVICE ClassAddDevice; +static DRIVER_STARTIO ClassStartIo; static VOID NTAPI DriverUnload(IN PDRIVER_OBJECT DriverObject) @@ -212,11 +222,11 @@ ParametersRegistryKey.Length = 0; ParametersRegistryKey.MaximumLength = RegistryPath->Length + sizeof(L"\\Parameters") + sizeof(UNICODE_NULL); - ParametersRegistryKey.Buffer = ExAllocatePool(PagedPool, ParametersRegistryKey.MaximumLength); + ParametersRegistryKey.Buffer = ExAllocatePoolWithTag(PagedPool, ParametersRegistryKey.MaximumLength, CLASS_TAG); if (!ParametersRegistryKey.Buffer) { - DPRINT("ExAllocatePool() failed\n"); - return STATUS_INSUFFICIENT_RESOURCES; + DPRINT("ExAllocatePoolWithTag() failed\n"); + return STATUS_NO_MEMORY; } RtlCopyUnicodeString(&ParametersRegistryKey, RegistryPath); RtlAppendUnicodeToString(&ParametersRegistryKey, L"\\Parameters"); @@ -276,6 +286,7 @@ Status = STATUS_NO_MEMORY; } + ExFreePoolWithTag(ParametersRegistryKey.Buffer, CLASS_TAG); return Status; } @@ -303,11 +314,11 @@ + DriverExtension->DeviceBaseName.Length /* "KeyboardClass" */ + 4 * sizeof(WCHAR) /* Id between 0 and 9999 */ + sizeof(UNICODE_NULL); /* Final NULL char */ - DeviceNameU.Buffer = ExAllocatePool(PagedPool, DeviceNameU.MaximumLength); + DeviceNameU.Buffer = ExAllocatePoolWithTag(PagedPool, DeviceNameU.MaximumLength, CLASS_TAG); if (!DeviceNameU.Buffer) { - DPRINT("ExAllocatePool() failed\n"); - return STATUS_INSUFFICIENT_RESOURCES; + DPRINT("ExAllocatePoolWithTag() failed\n"); + return STATUS_NO_MEMORY; } Status = RtlAppendUnicodeToString(&DeviceNameU, L"\\Device\\"); if (!NT_SUCCESS(Status)) @@ -348,7 +359,7 @@ cleanup: if (!NT_SUCCESS(Status)) { - ExFreePool(DeviceNameU.Buffer); + ExFreePoolWithTag(DeviceNameU.Buffer, CLASS_TAG); return Status; } @@ -361,11 +372,11 @@ KeInitializeSpinLock(&DeviceExtension->SpinLock); DeviceExtension->ReadIsPending = FALSE; DeviceExtension->InputCount = 0; - DeviceExtension->PortData = ExAllocatePool(NonPagedPool, DeviceExtension->DriverExtension->DataQueueSize * sizeof(KEYBOARD_INPUT_DATA)); + DeviceExtension->PortData = ExAllocatePoolWithTag(NonPagedPool, DeviceExtension->DriverExtension->DataQueueSize * sizeof(KEYBOARD_INPUT_DATA), CLASS_TAG); if (!DeviceExtension->PortData) { - ExFreePool(DeviceNameU.Buffer); - return STATUS_INSUFFICIENT_RESOURCES; + ExFreePoolWithTag(DeviceNameU.Buffer, CLASS_TAG); + return STATUS_NO_MEMORY; } DeviceExtension->DeviceName = DeviceNameU.Buffer; Fdo->Flags |= DO_POWER_PAGABLE; @@ -548,8 +559,7 @@ CONNECT_DATA ConnectData; NTSTATUS Status; - DPRINT("Connecting PortDO %p [%wZ] to ClassDO %p\n", - PortDO, &PortDO->DriverObject->DriverName, ClassDO); + DPRINT("Connecting PortDO %p to ClassDO %p\n", PortDO, ClassDO); KeInitializeEvent(&Event, NotificationEvent, FALSE); @@ -605,8 +615,7 @@ KIRQL OldIrql; NTSTATUS Status; - DPRINT("Destroying PortDO %p [%wZ]\n", - PortDO, &PortDO->DriverObject->DriverName); + DPRINT("Destroying PortDO %p\n", PortDO); DeviceExtension = (PPORT_DEVICE_EXTENSION)PortDO->DeviceExtension; ClassDeviceExtension = DeviceExtension->ClassDO->DeviceExtension; @@ -644,8 +653,8 @@ if (!DriverExtension->ConnectMultiplePorts && DeviceExtension->ClassDO) { - ExFreePool(ClassDeviceExtension->PortData); - ExFreePool((PVOID)ClassDeviceExtension->DeviceName); + ExFreePoolWithTag(ClassDeviceExtension->PortData, CLASS_TAG); + ExFreePoolWithTag((PVOID)ClassDeviceExtension->DeviceName, CLASS_TAG); IoDeleteDevice(DeviceExtension->ClassDO); } @@ -838,11 +847,11 @@ /* Allocate memory */ Size = sizeof(KEY_VALUE_BASIC_INFORMATION) + MAX_PATH; - KeyValueInformation = ExAllocatePool(PagedPool, Size); + KeyValueInformation = ExAllocatePoolWithTag(PagedPool, Size, CLASS_TAG); if (!KeyValueInformation) { - DPRINT("ExAllocatePool() failed\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; + DPRINT("ExAllocatePoolWithTag() failed\n"); + Status = STATUS_NO_MEMORY; goto cleanup; } @@ -893,7 +902,7 @@ DPRINT("IoGetDeviceObjectPointer(%wZ) failed with status 0x%08lx\n", &PortName, Status); continue; } - DPRINT("Legacy driver found: %wZ\n", &PortDeviceObject->DriverObject->DriverName); + DPRINT("Legacy driver found\n"); Status = ClassAddDevice(DriverObject, PortDeviceObject); if (!NT_SUCCESS(Status)) @@ -905,7 +914,7 @@ cleanup: if (KeyValueInformation != NULL) - ExFreePool(KeyValueInformation); + ExFreePoolWithTag(KeyValueInformation, CLASS_TAG); if (hDeviceMapKey != (HANDLE)-1) ZwClose(hDeviceMapKey); if (hPortKey != (HANDLE)-1) Modified: trunk/reactos/drivers/input/kbdclass/kbdclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/kbd… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/kbdclass.h (original) +++ trunk/reactos/drivers/input/kbdclass/kbdclass.h Mon Jun 4 13:25:04 2007 @@ -2,26 +2,15 @@ #include <kbdmou.h> #include <ntddkbd.h> #include <stdio.h> - -#if defined(__GNUC__) - #include <pseh/pseh.h> - #include <debug.h> -#elif defined(_MSC_VER) - #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint - #define CHECKPOINT1 DbgPrint("(%s:%d)\n", __FILE__, __LINE__) - #define DPRINT - #define CHECKPOINT - #define _SEH_TRY __try - #define _SEH_HANDLE __except(1) - #define _SEH_END - #define _SEH_GetExceptionCode() GetExceptionCode() -#else - #error Unknown compiler! -#endif +#include <pseh/pseh.h> +#include <debug.h> #define MAX_PATH 260 #define MIN(a, b) ((a) < (b) ? (a) : (b)) + +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#define CLASS_TAG TAG('K', 'b', 'd', 'C') typedef enum { @@ -83,10 +72,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS NTAPI -ForwardIrpAndForget( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH ForwardIrpAndForget; NTSTATUS DuplicateUnicodeString( Modified: trunk/reactos/drivers/input/kbdclass/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/kbdclass/mis… ============================================================================== --- trunk/reactos/drivers/input/kbdclass/misc.c (original) +++ trunk/reactos/drivers/input/kbdclass/misc.c Mon Jun 4 13:25:04 2007 @@ -8,6 +8,8 @@ */ #include "kbdclass.h" + +static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; static NTSTATUS NTAPI ForwardIrpAndWaitCompletion( @@ -35,7 +37,7 @@ KeInitializeEvent(&Event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); - DPRINT("Calling lower device %p [%wZ]\n", LowerDevice, &LowerDevice->DriverObject->DriverName); + DPRINT("Calling lower device %p\n", LowerDevice); IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); Status = IoCallDriver(LowerDevice, Irp); @@ -93,7 +95,7 @@ if (Flags & RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE) DestMaxLength += sizeof(UNICODE_NULL); - DestinationString->Buffer = ExAllocatePool(PagedPool, DestMaxLength); + DestinationString->Buffer = ExAllocatePoolWithTag(PagedPool, DestMaxLength, CLASS_TAG); if (DestinationString->Buffer == NULL) return STATUS_NO_MEMORY; Modified: trunk/reactos/drivers/input/mouclass/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mis… ============================================================================== --- trunk/reactos/drivers/input/mouclass/misc.c (original) +++ trunk/reactos/drivers/input/mouclass/misc.c Mon Jun 4 13:25:04 2007 @@ -8,6 +8,8 @@ */ #include "mouclass.h" + +static IO_COMPLETION_ROUTINE ForwardIrpAndWaitCompletion; static NTSTATUS NTAPI ForwardIrpAndWaitCompletion( @@ -35,7 +37,7 @@ KeInitializeEvent(&Event, NotificationEvent, FALSE); IoCopyCurrentIrpStackLocationToNext(Irp); - DPRINT("Calling lower device %p [%wZ]\n", LowerDevice, &LowerDevice->DriverObject->DriverName); + DPRINT("Calling lower device %p\n", LowerDevice); IoSetCompletionRoutine(Irp, ForwardIrpAndWaitCompletion, &Event, TRUE, TRUE, TRUE); Status = IoCallDriver(LowerDevice, Irp); @@ -93,7 +95,7 @@ if (Flags & RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE) DestMaxLength += sizeof(UNICODE_NULL); - DestinationString->Buffer = ExAllocatePool(PagedPool, DestMaxLength); + DestinationString->Buffer = ExAllocatePoolWithTag(PagedPool, DestMaxLength, CLASS_TAG); if (DestinationString->Buffer == NULL) return STATUS_NO_MEMORY; Modified: trunk/reactos/drivers/input/mouclass/mouclass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.c (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.c Mon Jun 4 13:25:04 2007 @@ -9,6 +9,16 @@ #define INITGUID #include "mouclass.h" + +static DRIVER_UNLOAD DriverUnload; +static DRIVER_DISPATCH ClassCreate; +static DRIVER_DISPATCH ClassClose; +static DRIVER_DISPATCH ClassCleanup; +static DRIVER_DISPATCH ClassRead; +static DRIVER_DISPATCH ClassDeviceControl; +static DRIVER_DISPATCH IrpStub; +static DRIVER_ADD_DEVICE ClassAddDevice; +static DRIVER_STARTIO ClassStartIo; static VOID NTAPI DriverUnload(IN PDRIVER_OBJECT DriverObject) @@ -189,11 +199,11 @@ ParametersRegistryKey.Length = 0; ParametersRegistryKey.MaximumLength = RegistryPath->Length + sizeof(L"\\Parameters") + sizeof(UNICODE_NULL); - ParametersRegistryKey.Buffer = ExAllocatePool(PagedPool, ParametersRegistryKey.MaximumLength); + ParametersRegistryKey.Buffer = ExAllocatePoolWithTag(PagedPool, ParametersRegistryKey.MaximumLength, CLASS_TAG); if (!ParametersRegistryKey.Buffer) { - DPRINT("ExAllocatePool() failed\n"); - return STATUS_INSUFFICIENT_RESOURCES; + DPRINT("ExAllocatePoolWithTag() failed\n"); + return STATUS_NO_MEMORY; } RtlCopyUnicodeString(&ParametersRegistryKey, RegistryPath); RtlAppendUnicodeToString(&ParametersRegistryKey, L"\\Parameters"); @@ -253,6 +263,7 @@ Status = STATUS_NO_MEMORY; } + ExFreePoolWithTag(ParametersRegistryKey.Buffer, CLASS_TAG); return Status; } @@ -280,11 +291,11 @@ + DriverExtension->DeviceBaseName.Length /* "PointerClass" */ + 4 * sizeof(WCHAR) /* Id between 0 and 9999 */ + sizeof(UNICODE_NULL); /* Final NULL char */ - DeviceNameU.Buffer = ExAllocatePool(PagedPool, DeviceNameU.MaximumLength); + DeviceNameU.Buffer = ExAllocatePoolWithTag(PagedPool, DeviceNameU.MaximumLength, CLASS_TAG); if (!DeviceNameU.Buffer) { - DPRINT("ExAllocatePool() failed\n"); - return STATUS_INSUFFICIENT_RESOURCES; + DPRINT("ExAllocatePoolWithTag() failed\n"); + return STATUS_NO_MEMORY; } Status = RtlAppendUnicodeToString(&DeviceNameU, L"\\Device\\"); if (!NT_SUCCESS(Status)) @@ -325,7 +336,7 @@ cleanup: if (!NT_SUCCESS(Status)) { - ExFreePool(DeviceNameU.Buffer); + ExFreePoolWithTag(DeviceNameU.Buffer, CLASS_TAG); return Status; } @@ -338,11 +349,11 @@ KeInitializeSpinLock(&DeviceExtension->SpinLock); DeviceExtension->ReadIsPending = FALSE; DeviceExtension->InputCount = 0; - DeviceExtension->PortData = ExAllocatePool(NonPagedPool, DeviceExtension->DriverExtension->DataQueueSize * sizeof(MOUSE_INPUT_DATA)); + DeviceExtension->PortData = ExAllocatePoolWithTag(NonPagedPool, DeviceExtension->DriverExtension->DataQueueSize * sizeof(KEYBOARD_INPUT_DATA), CLASS_TAG); if (!DeviceExtension->PortData) { - ExFreePool(DeviceNameU.Buffer); - return STATUS_INSUFFICIENT_RESOURCES; + ExFreePoolWithTag(DeviceNameU.Buffer, CLASS_TAG); + return STATUS_NO_MEMORY; } DeviceExtension->DeviceName = DeviceNameU.Buffer; Fdo->Flags |= DO_POWER_PAGABLE; @@ -524,8 +535,7 @@ CONNECT_DATA ConnectData; NTSTATUS Status; - DPRINT("Connecting PortDO %p [%wZ] to ClassDO %p\n", - PortDO, &PortDO->DriverObject->DriverName, ClassDO); + DPRINT("Connecting PortDO %p to ClassDO %p\n", PortDO, ClassDO); KeInitializeEvent(&Event, NotificationEvent, FALSE); @@ -581,8 +591,7 @@ KIRQL OldIrql; NTSTATUS Status; - DPRINT("Destroying PortDO %p [%wZ]\n", - PortDO, &PortDO->DriverObject->DriverName); + DPRINT("Destroying PortDO %p\n", PortDO); DeviceExtension = (PPORT_DEVICE_EXTENSION)PortDO->DeviceExtension; ClassDeviceExtension = DeviceExtension->ClassDO->DeviceExtension; @@ -620,8 +629,8 @@ if (!DriverExtension->ConnectMultiplePorts && DeviceExtension->ClassDO) { - ExFreePool(ClassDeviceExtension->PortData); - ExFreePool((PVOID)ClassDeviceExtension->DeviceName); + ExFreePoolWithTag(ClassDeviceExtension->PortData, CLASS_TAG); + ExFreePoolWithTag((PVOID)ClassDeviceExtension->DeviceName, CLASS_TAG); IoDeleteDevice(DeviceExtension->ClassDO); } @@ -814,11 +823,11 @@ /* Allocate memory */ Size = sizeof(KEY_VALUE_BASIC_INFORMATION) + MAX_PATH; - KeyValueInformation = ExAllocatePool(PagedPool, Size); + KeyValueInformation = ExAllocatePoolWithTag(PagedPool, Size, CLASS_TAG); if (!KeyValueInformation) { - DPRINT("ExAllocatePool() failed\n"); - Status = STATUS_INSUFFICIENT_RESOURCES; + DPRINT("ExAllocatePoolWithTag() failed\n"); + Status = STATUS_NO_MEMORY; goto cleanup; } @@ -869,7 +878,7 @@ DPRINT("IoGetDeviceObjectPointer(%wZ) failed with status 0x%08lx\n", &PortName, Status); continue; } - DPRINT("Legacy driver found: %wZ\n", &PortDeviceObject->DriverObject->DriverName); + DPRINT("Legacy driver found\n"); Status = ClassAddDevice(DriverObject, PortDeviceObject); if (!NT_SUCCESS(Status)) @@ -881,7 +890,7 @@ cleanup: if (KeyValueInformation != NULL) - ExFreePool(KeyValueInformation); + ExFreePoolWithTag(KeyValueInformation, CLASS_TAG); if (hDeviceMapKey != (HANDLE)-1) ZwClose(hDeviceMapKey); if (hPortKey != (HANDLE)-1) Modified: trunk/reactos/drivers/input/mouclass/mouclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/mouclass/mou… ============================================================================== --- trunk/reactos/drivers/input/mouclass/mouclass.h (original) +++ trunk/reactos/drivers/input/mouclass/mouclass.h Mon Jun 4 13:25:04 2007 @@ -2,26 +2,15 @@ #include <kbdmou.h> #include <ntddkbd.h> #include <stdio.h> - -#if defined(__GNUC__) - #include <pseh/pseh.h> - #include <debug.h> -#elif defined(_MSC_VER) - #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint - #define CHECKPOINT1 DbgPrint("(%s:%d)\n", __FILE__, __LINE__) - #define DPRINT - #define CHECKPOINT - #define _SEH_TRY __try - #define _SEH_HANDLE __except(1) - #define _SEH_END - #define _SEH_GetExceptionCode() GetExceptionCode() -#else - #error Unknown compiler! -#endif +#include <pseh/pseh.h> +#include <debug.h> #define MAX_PATH 260 #define MIN(a, b) ((a) < (b) ? (a) : (b)) + +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#define CLASS_TAG TAG('M', 'o', 'u', 'C') typedef enum { @@ -83,10 +72,7 @@ IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); -NTSTATUS NTAPI -ForwardIrpAndForget( - IN PDEVICE_OBJECT DeviceObject, - IN PIRP Irp); +DRIVER_DISPATCH ForwardIrpAndForget; NTSTATUS DuplicateUnicodeString( Modified: trunk/reactos/drivers/input/sermouse/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/fdo… ============================================================================== --- trunk/reactos/drivers/input/sermouse/fdo.c (original) +++ trunk/reactos/drivers/input/sermouse/fdo.c Mon Jun 4 13:25:04 2007 @@ -186,9 +186,12 @@ PDEVICE_RELATIONS DeviceRelations = NULL; DPRINT("IRP_MJ_PNP / IRP_MN_QUERY_DEVICE_RELATIONS / TargetDeviceRelation\n"); - DeviceRelations = ExAllocatePool(PagedPool, FIELD_OFFSET(DEVICE_RELATIONS, Objects)); + DeviceRelations = ExAllocatePoolWithTag(PagedPool, FIELD_OFFSET(DEVICE_RELATIONS, Objects), SERMOUSE_TAG); if (!DeviceRelations) - Status = STATUS_INSUFFICIENT_RESOURCES; + { + DPRINT("ExAllocatePoolWithTag() failed\n"); + Status = STATUS_NO_MEMORY; + } else { DeviceRelations->Count = 0; Modified: trunk/reactos/drivers/input/sermouse/sermouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/ser… ============================================================================== --- trunk/reactos/drivers/input/sermouse/sermouse.c (original) +++ trunk/reactos/drivers/input/sermouse/sermouse.c Mon Jun 4 13:25:04 2007 @@ -43,11 +43,11 @@ ParametersRegistryKey.Length = 0; ParametersRegistryKey.MaximumLength = RegistryPath->Length + sizeof(L"\\Parameters") + sizeof(UNICODE_NULL); - ParametersRegistryKey.Buffer = ExAllocatePool(PagedPool, ParametersRegistryKey.MaximumLength); + ParametersRegistryKey.Buffer = ExAllocatePoolWithTag(PagedPool, ParametersRegistryKey.MaximumLength, SERMOUSE_TAG); if (!ParametersRegistryKey.Buffer) { - DPRINT("ExAllocatePool() failed\n"); - return STATUS_INSUFFICIENT_RESOURCES; + DPRINT("ExAllocatePoolWithTag() failed\n"); + return STATUS_NO_MEMORY; } RtlCopyUnicodeString(&ParametersRegistryKey, RegistryPath); RtlAppendUnicodeToString(&ParametersRegistryKey, L"\\Parameters"); @@ -80,7 +80,7 @@ Status = STATUS_SUCCESS; } - ExFreePool(ParametersRegistryKey.Buffer); + ExFreePoolWithTag(ParametersRegistryKey.Buffer, SERMOUSE_TAG); return Status; } Modified: trunk/reactos/drivers/input/sermouse/sermouse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/sermouse/ser… ============================================================================== --- trunk/reactos/drivers/input/sermouse/sermouse.h (original) +++ trunk/reactos/drivers/input/sermouse/sermouse.h Mon Jun 4 13:25:04 2007 @@ -2,17 +2,10 @@ #include <kbdmou.h> #include <ntddser.h> #include <ntddmou.h> +#include <debug.h> -#if defined(__GNUC__) - #include <debug.h> -#elif defined(_MSC_VER) - #define DPRINT1 DbgPrint("(%s:%d) ", __FILE__, __LINE__), DbgPrint - #define CHECKPOINT1 DbgPrint("(%s:%d)\n", __FILE__, __LINE__) - #define DPRINT - #define CHECKPOINT -#else - #error Unknown compiler! -#endif +#define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#define SERMOUSE_TAG TAG('S', 'M', 'o', 'u') typedef enum {

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