Ros-diffs July 2007

ros-diffs@reactos.org

20 participants
707 discussions

[fireball] 27446: - Separate common buffer allocation routine from ScsiPortGetUncachedExtension() into SpiAllocateCommonBuffer(), along with a code reformat. - Use this function in ScsiPortInitialize() and in ScsiPortGetUncachedExtension().
by fireball＠svn.reactos.org 07 Jul '07

07 Jul '07

Author: fireball Date: Sat Jul 7 13:56:55 2007 New Revision: 27446 URL: http://svn.reactos.org/svn/reactos?rev=27446&view=rev Log: - Separate common buffer allocation routine from ScsiPortGetUncachedExtension() into SpiAllocateCommonBuffer(), along with a code reformat. - Use this function in ScsiPortInitialize() and in ScsiPortGetUncachedExtension(). Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c Sat Jul 7 13:56:55 2007 @@ -204,6 +204,10 @@ SpiHandleAttachRelease(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, PIRP Irp); +static NTSTATUS +SpiAllocateCommonBuffer(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, ULONG NonCachedSize); + + /* FUNCTIONS *****************************************************************/ @@ -599,70 +603,178 @@ IN PPORT_CONFIGURATION_INFORMATION ConfigInfo, IN ULONG NumberOfBytes) { - PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; - DEVICE_DESCRIPTION DeviceDescription; - - DPRINT("ScsiPortGetUncachedExtension(%p %p %lu)\n", - HwDeviceExtension, ConfigInfo, NumberOfBytes); - - DeviceExtension = CONTAINING_RECORD(HwDeviceExtension, - SCSI_PORT_DEVICE_EXTENSION, - MiniPortDeviceExtension); - - /* Check for allocated common DMA buffer */ - if (DeviceExtension->VirtualAddress != NULL) - { - DPRINT1("The HBA has already got a common DMA buffer!\n"); - return NULL; - } - - /* Check for DMA adapter object */ - if (DeviceExtension->AdapterObject == NULL) - { - /* Initialize DMA adapter description */ - RtlZeroMemory(&DeviceDescription, - sizeof(DEVICE_DESCRIPTION)); - DeviceDescription.Version = DEVICE_DESCRIPTION_VERSION; - DeviceDescription.Master = ConfigInfo->Master; - DeviceDescription.ScatterGather = ConfigInfo->ScatterGather; - DeviceDescription.DemandMode = ConfigInfo->DemandMode; - DeviceDescription.Dma32BitAddresses = ConfigInfo->Dma32BitAddresses; - DeviceDescription.BusNumber = ConfigInfo->SystemIoBusNumber; - DeviceDescription.DmaChannel = ConfigInfo->DmaChannel; - DeviceDescription.InterfaceType = ConfigInfo->AdapterInterfaceType; - DeviceDescription.DmaWidth = ConfigInfo->DmaWidth; - DeviceDescription.DmaSpeed = ConfigInfo->DmaSpeed; - DeviceDescription.MaximumLength = ConfigInfo->MaximumTransferLength; - DeviceDescription.DmaPort = ConfigInfo->DmaPort; - - /* Get a DMA adapter object */ - DeviceExtension->AdapterObject = HalGetAdapter(&DeviceDescription, - &DeviceExtension->MapRegisterCount); - if (DeviceExtension->AdapterObject == NULL) - { - DPRINT1("HalGetAdapter() failed\n"); - return NULL; - } - } - - /* Allocate a common DMA buffer */ - DeviceExtension->CommonBufferLength = - NumberOfBytes + DeviceExtension->SrbExtensionSize; - DeviceExtension->VirtualAddress = - HalAllocateCommonBuffer(DeviceExtension->AdapterObject, - DeviceExtension->CommonBufferLength, - &DeviceExtension->PhysicalAddress, - FALSE); - if (DeviceExtension->VirtualAddress == NULL) - { - DPRINT1("HalAllocateCommonBuffer() failed!\n"); - DeviceExtension->CommonBufferLength = 0; - return NULL; - } - - return (PVOID)((ULONG_PTR)DeviceExtension->VirtualAddress + - DeviceExtension->SrbExtensionSize); + PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; + DEVICE_DESCRIPTION DeviceDescription; + ULONG MapRegistersCount; + NTSTATUS Status; + + DPRINT("ScsiPortGetUncachedExtension(%p %p %lu)\n", + HwDeviceExtension, ConfigInfo, NumberOfBytes); + + DeviceExtension = CONTAINING_RECORD(HwDeviceExtension, + SCSI_PORT_DEVICE_EXTENSION, + MiniPortDeviceExtension); + + /* Check for allocated common DMA buffer */ + if (DeviceExtension->SrbExtensionBuffer != NULL) + { + DPRINT1("The HBA has already got a common DMA buffer!\n"); + return NULL; + } + + /* Check for DMA adapter object */ + if (DeviceExtension->AdapterObject == NULL) + { + /* Initialize DMA adapter description */ + RtlZeroMemory(&DeviceDescription, sizeof(DEVICE_DESCRIPTION)); + + DeviceDescription.Version = DEVICE_DESCRIPTION_VERSION; + DeviceDescription.Master = ConfigInfo->Master; + DeviceDescription.ScatterGather = ConfigInfo->ScatterGather; + DeviceDescription.DemandMode = ConfigInfo->DemandMode; + DeviceDescription.Dma32BitAddresses = ConfigInfo->Dma32BitAddresses; + DeviceDescription.BusNumber = ConfigInfo->SystemIoBusNumber; + DeviceDescription.DmaChannel = ConfigInfo->DmaChannel; + DeviceDescription.InterfaceType = ConfigInfo->AdapterInterfaceType; + DeviceDescription.DmaWidth = ConfigInfo->DmaWidth; + DeviceDescription.DmaSpeed = ConfigInfo->DmaSpeed; + DeviceDescription.MaximumLength = ConfigInfo->MaximumTransferLength; + DeviceDescription.DmaPort = ConfigInfo->DmaPort; + + /* Get a DMA adapter object */ + DeviceExtension->AdapterObject = + HalGetAdapter(&DeviceDescription, &MapRegistersCount); + + /* Fail in case of error */ + if (DeviceExtension->AdapterObject == NULL) + { + DPRINT1("HalGetAdapter() failed\n"); + return NULL; + } + + /* Set number of physical breaks */ + if (ConfigInfo->NumberOfPhysicalBreaks != 0 && + MapRegistersCount > ConfigInfo->NumberOfPhysicalBreaks) + { + DeviceExtension->PortCapabilities.MaximumPhysicalPages = + ConfigInfo->NumberOfPhysicalBreaks; + } + else + { + DeviceExtension->PortCapabilities.MaximumPhysicalPages = MapRegistersCount; + } + } + + /* Update auto request sense feature */ + DeviceExtension->SupportsAutoSense = ConfigInfo->AutoRequestSense; + + /* Update Srb extension size */ + if (DeviceExtension->SrbExtensionSize != ConfigInfo->SrbExtensionSize) + DeviceExtension->SrbExtensionSize = ConfigInfo->SrbExtensionSize; + + /* Update Srb extension alloc flag */ + if (ConfigInfo->AutoRequestSense || DeviceExtension->SrbExtensionSize) + DeviceExtension->NeedSrbExtensionAlloc = TRUE; + + /* Allocate a common DMA buffer */ + Status = SpiAllocateCommonBuffer(DeviceExtension, NumberOfBytes); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("SpiAllocateCommonBuffer() failed with Status = 0x%08X!\n", Status); + return NULL; + } + + return DeviceExtension->NonCachedExtension; } + +static NTSTATUS +SpiAllocateCommonBuffer(PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, ULONG NonCachedSize) +{ + PVOID *SrbExtension, CommonBuffer; + ULONG CommonBufferLength, BufSize; + + /* If size is 0, set it to 16 */ + if (!DeviceExtension->SrbExtensionSize) + DeviceExtension->SrbExtensionSize = 16; + + /* Calculate size */ + BufSize = DeviceExtension->SrbExtensionSize; + + /* Add autosense data size if needed */ + if (DeviceExtension->SupportsAutoSense) + BufSize += sizeof(SENSE_DATA); + + + /* Round it */ + BufSize = (BufSize + sizeof(LONGLONG) - 1) & ~(sizeof(LONGLONG) - 1); + + /* Sum up into the total common buffer length, and round it to page size */ + CommonBufferLength = + ROUND_TO_PAGES(NonCachedSize + BufSize * DeviceExtension->RequestsNumber); + + /* Allocate it */ + if (!DeviceExtension->AdapterObject) + { + /* From nonpaged pool if there is no DMA */ + CommonBuffer = ExAllocatePool(NonPagedPool, CommonBufferLength); + } + else + { + /* Perform a full request since we have a DMA adapter*/ + CommonBuffer = HalAllocateCommonBuffer(DeviceExtension->AdapterObject, + CommonBufferLength, + &DeviceExtension->PhysicalAddress, + FALSE ); + } + + /* Fail in case of error */ + if (!CommonBuffer) + return STATUS_INSUFFICIENT_RESOURCES; + + /* Zero it */ + RtlZeroMemory(CommonBuffer, CommonBufferLength); + + /* Store its size in Device Extension */ + DeviceExtension->CommonBufferLength = CommonBufferLength; + + /* SrbExtension buffer is located at the beginning of the buffer */ + DeviceExtension->SrbExtensionBuffer = CommonBuffer; + + /* Non-cached extension buffer is located at the end of + the common buffer */ + if (NonCachedSize) + { + CommonBufferLength -= NonCachedSize; + DeviceExtension->NonCachedExtension = (PUCHAR)CommonBuffer + CommonBufferLength; + } + else + { + DeviceExtension->NonCachedExtension = NULL; + } + + if (DeviceExtension->NeedSrbExtensionAlloc) + { + /* Look up how many SRB data structures we need */ + DeviceExtension->SrbDataCount = CommonBufferLength / BufSize; + + /* Initialize the free SRB extensions list */ + SrbExtension = (PVOID *)CommonBuffer; + DeviceExtension->FreeSrbExtensions = SrbExtension; + + /* Fill the remainding pointers (if we have more than 1 SRB) */ + while (CommonBufferLength >= 2 * BufSize) + { + *SrbExtension = (PVOID*)((PCHAR)SrbExtension + BufSize); + SrbExtension = *SrbExtension; + + CommonBufferLength -= BufSize; + } + } + + return STATUS_SUCCESS; +} + /* @@ -1204,9 +1316,8 @@ DeviceExtension->SupportsAutoSense = PortConfig->AutoRequestSense; DeviceExtension->NeedSrbExtensionAlloc = TRUE; - //Status = STATUS_UNSUCCESFUL; - /* TODO: Allocate common buffer */ - ASSERT(FALSE); + /* Allocate common buffer */ + Status = SpiAllocateCommonBuffer(DeviceExtension, 0); /* Check for failure */ if (!NT_SUCCESS(Status))

1 0

[fireball] 27445: - Zero initialize a variable (I have no idea how PREfast missed this important flaw). - Fix PCI bus enumeration, so that finding SCSI controllers on PCI bus works now.
by fireball＠svn.reactos.org 07 Jul '07

07 Jul '07

Author: fireball Date: Sat Jul 7 12:52:35 2007 New Revision: 27445 URL: http://svn.reactos.org/svn/reactos?rev=27445&view=rev Log: - Zero initialize a variable (I have no idea how PREfast missed this important flaw). - Fix PCI bus enumeration, so that finding SCSI controllers on PCI bus works now. Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c Sat Jul 7 12:52:35 2007 @@ -849,6 +849,9 @@ /* Zero the internal configuration info structure */ RtlZeroMemory(&ConfigInfo, sizeof(CONFIGURATION_INFO)); + /* Zero starting slot number */ + SlotNumber.u.AsULONG = 0; + /* Allocate space for access ranges */ if (HwInitializationData->NumberOfAccessRanges) { @@ -1025,7 +1028,7 @@ HwInitializationData, PortConfig, RegistryPath, - BusNumber, + ConfigInfo.BusNumber, &SlotNumber)) { /* Continue to the next bus, nothing here */ @@ -2087,10 +2090,12 @@ &PciConfig, sizeof(ULONG)); - /* There is nothing there */ - if (DataSize < sizeof(ULONG)) + /* If result of HalGetBusData is 0, then the bus is wrong */ + if (DataSize == 0) return FALSE; + /* If result is PCI_INVALID_VENDORID, then this device has no more + "Functions" */ if (PciConfig.VendorID == PCI_INVALID_VENDORID) break;

1 0

[arty] 27444: Resolve imports at boot time by loading the appropriate modules. We still need to fix the same stuff in ntoskrnl for pnp loading. Thanks to hpoussin for fixing pnp so this works.
by arty＠svn.reactos.org 07 Jul '07

07 Jul '07

Author: arty Date: Sat Jul 7 08:43:08 2007 New Revision: 27444 URL: http://svn.reactos.org/svn/reactos?rev=27444&view=rev Log: Resolve imports at boot time by loading the appropriate modules. We still need to fix the same stuff in ntoskrnl for pnp loading. Thanks to hpoussin for fixing pnp so this works. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/loader.c Sat Jul 7 08:43:08 2007 @@ -454,6 +454,8 @@ return STATUS_SUCCESS; } +extern BOOLEAN FrLdrLoadDriver(PCHAR szFileName, INT nPos); + NTSTATUS NTAPI LdrPEGetOrLoadModule(IN PCHAR ModuleName, @@ -465,31 +467,15 @@ *ImportedModule = LdrGetModuleObject(ImportedName); if (*ImportedModule == NULL) { - /* - * For now, we only support import-loading the HAL. - * Later, FrLdrLoadDriver should be made to share the same - * code, and we'll just call it instead. - */ - if (!_stricmp(ImportedName, "hal.dll") || - !_stricmp(ImportedName, "kdcom.dll") || - !_stricmp(ImportedName, "bootvid.dll")) - { - /* Load the HAL */ - FrLdrLoadImage(ImportedName, 10, FALSE); - - /* Return the new module */ - *ImportedModule = LdrGetModuleObject(ImportedName); - if (*ImportedModule == NULL) - { - DbgPrint("Error loading import: %s\n", ImportedName); - return STATUS_UNSUCCESSFUL; - } - } - else - { - DbgPrint("Don't yet support loading new modules from imports\n"); - Status = STATUS_NOT_IMPLEMENTED; - } + if (!FrLdrLoadDriver(ImportedName, 0)) + { + return STATUS_UNSUCCESSFUL; + } + else + { + return LdrPEGetOrLoadModule + (ModuleName, ImportedName, ImportedModule); + } } return Status; @@ -512,7 +498,7 @@ TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &Size); - while (ImportModuleDirectory->Name) + while (ImportModuleDirectory && ImportModuleDirectory->Name) { /* Check to make sure that import lib is kernel */ ImportedName = (PCHAR) DllBase + ImportModuleDirectory->Name; @@ -651,9 +637,6 @@ /* Increase the next Load Base */ NextModuleBase = ROUND_UP(NextModuleBase + ImageSize, PAGE_SIZE); - /* Load HAL if this is the kernel */ - if (ImageType == 1) FrLdrLoadImage("hal.dll", 10, FALSE); - /* Perform import fixups */ if (!NT_SUCCESS(LdrPEFixupImports(LoadBase, Name))) { Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c Sat Jul 7 08:43:08 2007 @@ -33,9 +33,92 @@ unsigned long reactos_disk_count = 0; CHAR szHalName[255]; CHAR szBootPath[255]; +CHAR SystemRoot[255]; static CHAR szLoadingMsg[] = "Loading ReactOS..."; BOOLEAN FrLdrBootType; extern ULONG_PTR KernelBase, KernelEntry; + +BOOLEAN +FrLdrLoadDriver(PCHAR szFileName, + INT nPos) +{ + PFILE FilePointer; + CHAR value[256], *FinalSlash; + LPSTR p; + + if (!_stricmp(szFileName, "hal.dll")) + { + /* Use the boot.ini name instead */ + szFileName = szHalName; + } + + FinalSlash = strrchr(szFileName, '\\'); + if(FinalSlash) + szFileName = FinalSlash + 1; + + /* Open the Driver */ + FilePointer = FsOpenFile(szFileName); + + /* Try under the system root in the main dir and drivers */ + if (FilePointer == NULL) + { + strcpy(value, SystemRoot); + if(value[strlen(value)-1] != '\\') + strcat(value, "\\"); + strcat(value, szFileName); + FilePointer = FsOpenFile(value); + } + + if (FilePointer == NULL) + { + strcpy(value, SystemRoot); + if(value[strlen(value)-1] != '\\') + strcat(value, "\\"); + strcat(value, "SYSTEM32\\"); + strcat(value, szFileName); + FilePointer = FsOpenFile(value); + } + + if (FilePointer == NULL) + { + strcpy(value, SystemRoot); + if(value[strlen(value)-1] != '\\') + strcat(value, "\\"); + strcat(value, "SYSTEM32\\DRIVERS\\"); + strcat(value, szFileName); + FilePointer = FsOpenFile(value); + } + + /* Make sure we did */ + if (FilePointer == NULL) { + + /* Fail if file wasn't opened */ + strcpy(value, szFileName); + strcat(value, " not found."); + return(FALSE); + } + + /* Update the status bar with the current file */ + strcpy(value, "Reading "); + p = strrchr(szFileName, '\\'); + if (p == NULL) { + + strcat(value, szFileName); + + } else { + + strcat(value, p + 1); + + } + UiDrawStatusText(value); + + /* Load the driver */ + FrLdrMapImage(FilePointer, szFileName, 0); + + /* Update status and return */ + UiDrawProgressBarCenter(nPos, 100, szLoadingMsg); + return(TRUE); +} PVOID NTAPI @@ -47,13 +130,6 @@ PCHAR szShortName; CHAR szBuffer[256], szFullPath[256]; PVOID LoadBase; - - /* Check if this the HAL being loaded */ - if (!_stricmp(szFileName, "hal.dll")) - { - /* Use the boot.ini name instead */ - szFileName = szHalName; - } /* Extract filename without path */ szShortName = strrchr(szFileName, '\\'); @@ -618,6 +694,7 @@ strcat(szBootPath, "\\"); DbgPrint((DPRINT_REACTOS,"SystemRoot: '%s'\n", szBootPath)); + strcpy(SystemRoot, szBootPath); /* * Find the kernel image name Modified: trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c Sat Jul 7 08:43:08 2007 @@ -30,8 +30,10 @@ memory_map_t reactos_memory_map[32]; // Memory map char szBootPath[256]; char szHalName[256]; +CHAR SystemRoot[255]; extern ULONG_PTR KernelBase, KernelEntry; +extern BOOLEAN FrLdrLoadDriver(PCHAR szFileName, INT nPos); #define USE_UI @@ -91,65 +93,7 @@ static BOOLEAN LoadDriver(PCSTR szSourcePath, PCSTR szFileName) { - CHAR szFullName[256]; -#ifdef USE_UI - CHAR szBuffer[80]; -#endif - PFILE FilePointer; - PCSTR szShortName; - - if (szSourcePath[0] != '\\') - { - strcpy(szFullName, "\\"); - strcat(szFullName, szSourcePath); - } - else - { - strcpy(szFullName, szSourcePath); - } - - if (szFullName[strlen(szFullName)] != '\\') - { - strcat(szFullName, "\\"); - } - - if (szFileName[0] != '\\') - { - strcat(szFullName, szFileName); - } - else - { - strcat(szFullName, szFileName + 1); - } - - szShortName = strrchr(szFileName, '\\'); - if (szShortName == NULL) - szShortName = szFileName; - else - szShortName = szShortName + 1; - - - FilePointer = FsOpenFile(szFullName); - if (FilePointer == NULL) - { - printf("Could not find %s\n", szFileName); - return(FALSE); - } - - /* - * Update the status bar with the current file - */ -#ifdef USE_UI - sprintf(szBuffer, "Setup is loading files (%s)", szShortName); - UiDrawStatusText(szBuffer); -#else - printf("Reading %s\n", szShortName); -#endif - - /* Load the driver */ - FrLdrMapImage(FilePointer, (LPSTR)szFileName, 2); - - return(TRUE); + return FrLdrLoadDriver((PCHAR)szFileName, 0); } @@ -342,6 +286,9 @@ strcat(strcat(strcat(reactos_kernel_cmdline, SourcePath), " "), LoadOptions); + strcpy(SystemRoot, SourcePath); + strcat(SystemRoot, "\\"); + /* Setup the boot path and kernel path */ strcpy(szBootPath, SourcePath); strcpy(szKernelName, szBootPath);

1 0

[cwittich] 27443: -fix a memory leak -don't use uninitialized memory
by cwittich＠svn.reactos.org 07 Jul '07

07 Jul '07

Author: cwittich Date: Sat Jul 7 05:39:19 2007 New Revision: 27443 URL: http://svn.reactos.org/svn/reactos?rev=27443&view=rev Log: -fix a memory leak -don't use uninitialized memory Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c Sat Jul 7 05:39:19 2007 @@ -68,6 +68,7 @@ ScsiPortCreateClose(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +static DRIVER_DISPATCH ScsiPortDispatchScsi; static NTSTATUS STDCALL ScsiPortDispatchScsi(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); @@ -76,6 +77,7 @@ ScsiPortDeviceControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); +static DRIVER_STARTIO ScsiPortStartIo; static VOID STDCALL ScsiPortStartIo(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); @@ -111,6 +113,7 @@ IN UCHAR Lun, IN UCHAR QueueTag); +static KSERVICE_ROUTINE ScsiPortIsr; static BOOLEAN STDCALL ScsiPortIsr(IN PKINTERRUPT Interrupt, IN PVOID ServiceContext); @@ -136,6 +139,7 @@ SpiSendRequestSense(IN PSCSI_PORT_DEVICE_EXTENSION DeviceExtension, IN PSCSI_REQUEST_BLOCK Srb); +static IO_COMPLETION_ROUTINE SpiCompletionRoutine; NTSTATUS STDCALL SpiCompletionRoutine(PDEVICE_OBJECT DeviceObject, PIRP Irp, @@ -2063,6 +2067,7 @@ DPRINT ("SpiGetPciConfiguration() called\n"); + RtlZeroMemory(&ResourceList, sizeof(PCM_RESOURCE_LIST)); SlotNumber.u.AsULONG = 0; /* Loop through all devices */ @@ -3022,7 +3027,10 @@ SenseBuffer = ExAllocatePoolWithTag (NonPagedPool, SENSE_BUFFER_SIZE, TAG_SCSIPORT); if (SenseBuffer == NULL) + { + ExFreePool(InquiryBuffer); return STATUS_INSUFFICIENT_RESOURCES; + } while (KeepTrying) { @@ -4304,6 +4312,8 @@ /* We need to acquire spinlock */ KeAcquireSpinLockAtDpcLevel(&DeviceExtension->SpinLock); + + RtlZeroMemory(&InterruptData, sizeof(SCSI_PORT_INTERRUPT_DATA)); TryAgain:

1 0

[cwittich] 27442: -use ExAllocatePoolWithTag instead of ExAllocatePool
by cwittich＠svn.reactos.org 07 Jul '07

07 Jul '07

Author: cwittich Date: Sat Jul 7 05:16:58 2007 New Revision: 27442 URL: http://svn.reactos.org/svn/reactos?rev=27442&view=rev Log: -use ExAllocatePoolWithTag instead of ExAllocatePool Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c trunk/reactos/drivers/storage/scsiport/scsiport_int.h Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c Sat Jul 7 05:16:58 2007 @@ -39,7 +39,7 @@ #ifndef NDEBUG #define NDEBUG -#endif NDEBUG +#endif #include <debug.h> #include "scsiport_int.h" @@ -416,8 +416,8 @@ NumberOfBytes, FALSE); - DeviceBase = ExAllocatePool(NonPagedPool, - sizeof(MAPPED_ADDRESS)); + DeviceBase = ExAllocatePoolWithTag(NonPagedPool, + sizeof(MAPPED_ADDRESS), TAG_SCSIPORT); if (DeviceBase == NULL) return MappedAddress; @@ -849,8 +849,8 @@ if (HwInitializationData->NumberOfAccessRanges) { ConfigInfo.AccessRanges = - ExAllocatePool(PagedPool, - HwInitializationData->NumberOfAccessRanges * sizeof(ACCESS_RANGE)); + ExAllocatePoolWithTag(PagedPool, + HwInitializationData->NumberOfAccessRanges * sizeof(ACCESS_RANGE), TAG_SCSIPORT); /* Fail if failed */ if (ConfigInfo.AccessRanges == NULL) @@ -964,7 +964,7 @@ PortConfigSize = (sizeof(PORT_CONFIGURATION_INFORMATION) + HwInitializationData->NumberOfAccessRanges * sizeof(ACCESS_RANGE) + 7) & ~7; - DeviceExtension->PortConfig = ExAllocatePool(NonPagedPool, PortConfigSize); + DeviceExtension->PortConfig = ExAllocatePoolWithTag(NonPagedPool, PortConfigSize, TAG_SCSIPORT); /* Fail if failed */ if (DeviceExtension->PortConfig == NULL) @@ -1218,7 +1218,7 @@ Count = DeviceExtension->RequestsNumber * 2; /* Allocate the data */ - SrbData = ExAllocatePool(NonPagedPool, Count * sizeof(SCSI_REQUEST_BLOCK_INFO)); + SrbData = ExAllocatePoolWithTag(NonPagedPool, Count * sizeof(SCSI_REQUEST_BLOCK_INFO), TAG_SCSIPORT); if (SrbData == NULL) return STATUS_INSUFFICIENT_RESOURCES; @@ -1401,9 +1401,9 @@ IoStartTimer(PortDeviceObject); /* Initialize bus scanning information */ - DeviceExtension->BusesConfig = ExAllocatePool(PagedPool, + DeviceExtension->BusesConfig = ExAllocatePoolWithTag(PagedPool, sizeof(PSCSI_BUS_SCAN_INFO) * DeviceExtension->PortConfig->NumberOfBuses - + sizeof(ULONG)); + + sizeof(ULONG), TAG_SCSIPORT); if (!DeviceExtension->BusesConfig) { @@ -1928,7 +1928,7 @@ FullSize = sizeof(CM_RESOURCE_LIST) + (ListLength - 1) * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR); - ResourceList = (PCM_RESOURCE_LIST)ExAllocatePool(PagedPool, FullSize); + ResourceList = (PCM_RESOURCE_LIST)ExAllocatePoolWithTag(PagedPool, FullSize, TAG_SCSIPORT); if (!ResourceList) return NULL; @@ -2933,7 +2933,7 @@ LunExtensionSize += sizeof(SCSI_PORT_LUN_EXTENSION); DPRINT("LunExtensionSize %lu\n", LunExtensionSize); - LunExtension = ExAllocatePool(NonPagedPool, LunExtensionSize); + LunExtension = ExAllocatePoolWithTag(NonPagedPool, LunExtensionSize, TAG_SCSIPORT); if (LunExtension == NULL) { DPRINT1("Out of resources!\n"); @@ -3016,11 +3016,11 @@ DeviceExtension = (PSCSI_PORT_DEVICE_EXTENSION)DeviceObject->DeviceExtension; - InquiryBuffer = ExAllocatePool (NonPagedPool, INQUIRYDATABUFFERSIZE); + InquiryBuffer = ExAllocatePoolWithTag (NonPagedPool, INQUIRYDATABUFFERSIZE, TAG_SCSIPORT); if (InquiryBuffer == NULL) return STATUS_INSUFFICIENT_RESOURCES; - SenseBuffer = ExAllocatePool (NonPagedPool, SENSE_BUFFER_SIZE); + SenseBuffer = ExAllocatePoolWithTag (NonPagedPool, SENSE_BUFFER_SIZE, TAG_SCSIPORT); if (SenseBuffer == NULL) return STATUS_INSUFFICIENT_RESOURCES; @@ -3236,7 +3236,7 @@ else { /* We need to allocate this buffer */ - BusScanInfo = ExAllocatePool(NonPagedPool, sizeof(SCSI_BUS_SCAN_INFO)); + BusScanInfo = ExAllocatePoolWithTag(NonPagedPool, sizeof(SCSI_BUS_SCAN_INFO), TAG_SCSIPORT); if (!BusScanInfo) { @@ -3258,7 +3258,7 @@ } /* Create LUN information structure */ - LunInfo = ExAllocatePool(PagedPool, sizeof(SCSI_LUN_INFO)); + LunInfo = ExAllocatePoolWithTag(PagedPool, sizeof(SCSI_LUN_INFO), TAG_SCSIPORT); if (LunInfo == NULL) { @@ -3364,7 +3364,7 @@ LunInfo->DeviceObject = DeviceExtension->DeviceObject; /* Allocate another buffer */ - LunInfo = ExAllocatePool(PagedPool, sizeof(SCSI_LUN_INFO)); + LunInfo = ExAllocatePoolWithTag(PagedPool, sizeof(SCSI_LUN_INFO), TAG_SCSIPORT); if (!LunInfo) { @@ -3571,7 +3571,7 @@ DPRINT("SpiSendRequestSense() entered, InitialSrb %p\n", InitialSrb); /* Allocate Srb */ - Srb = ExAllocatePool(NonPagedPool, sizeof(SCSI_REQUEST_BLOCK) + sizeof(PVOID)); + Srb = ExAllocatePoolWithTag(NonPagedPool, sizeof(SCSI_REQUEST_BLOCK) + sizeof(PVOID), TAG_SCSIPORT); RtlZeroMemory(Srb, sizeof(SCSI_REQUEST_BLOCK)); /* Allocate IRP */ @@ -5480,8 +5480,8 @@ ExFreePool(InternalConfigInfo->Parameter); /* Allocate it */ - InternalConfigInfo->Parameter = ExAllocatePool(NonPagedPool, - KeyValueInformation->DataLength); + InternalConfigInfo->Parameter = ExAllocatePoolWithTag(NonPagedPool, + KeyValueInformation->DataLength, TAG_SCSIPORT); if (InternalConfigInfo->Parameter != NULL) { Modified: trunk/reactos/drivers/storage/scsiport/scsiport_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport_int.h (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport_int.h Sat Jul 7 05:16:58 2007 @@ -15,6 +15,7 @@ #endif #define TAG(A, B, C, D) (ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) +#define TAG_SCSIPORT TAG('S', 'C', 'S', 'I') /* Defines how many logical unit arrays will be in a device extension */ #define LUS_NUMBER 8

1 0

[cwittich] 27441: -some changes to be able to build the driver with PREfast
by cwittich＠svn.reactos.org 07 Jul '07

07 Jul '07

Author: cwittich Date: Sat Jul 7 05:09:55 2007 New Revision: 27441 URL: http://svn.reactos.org/svn/reactos?rev=27441&view=rev Log: -some changes to be able to build the driver with PREfast Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c Sat Jul 7 05:09:55 2007 @@ -37,10 +37,17 @@ #include <stdio.h> #include <stdarg.h> +#ifndef NDEBUG #define NDEBUG +#endif NDEBUG #include <debug.h> #include "scsiport_int.h" + +#ifdef _MSC_VER + #define STDCALL + #define DDKAPI +#endif ULONG InternalDebugLevel = 0x00; @@ -1411,7 +1418,7 @@ + sizeof(ULONG)); /* Store number of buses there */ - DeviceExtension->BusesConfig->NumberOfBuses = DeviceExtension->BusNum; + DeviceExtension->BusesConfig->NumberOfBuses = (UCHAR)DeviceExtension->BusNum; /* Scan the adapter for devices */ SpiScanAdapter(DeviceExtension); @@ -3306,9 +3313,9 @@ DeviceExtension->LunExtensionList[Hint] = LunExtension; /* Fill Path, Target, Lun fields */ - LunExtension->PathId = LunInfo->PathId = Bus; - LunExtension->TargetId = LunInfo->TargetId = Target; - LunExtension->Lun = LunInfo->Lun = Lun; + LunExtension->PathId = LunInfo->PathId = (UCHAR)Bus; + LunExtension->TargetId = LunInfo->TargetId = (UCHAR) Target; + LunExtension->Lun = LunInfo->Lun = (UCHAR)Lun; /* Set flag to prevent race conditions */ LunExtension->Flags |= SCSI_PORT_SCAN_IN_PROGRESS; @@ -3395,7 +3402,7 @@ ExFreePool(LunInfo); /* Sum what we found */ - BusScanInfo->LogicalUnitsCount += DevicesFound; + BusScanInfo->LogicalUnitsCount += (UCHAR) DevicesFound; DPRINT(" Found %d devices on bus %d\n", DevicesFound, Bus); } @@ -4904,9 +4911,9 @@ for (Lun = 0; Lun < SCSI_MAXIMUM_LOGICAL_UNITS; Lun++) { LunExtension = SpiGetLunExtension(DeviceExtension, - BusNumber, - Target, - Lun); + (UCHAR)BusNumber, + (UCHAR)Target, + (UCHAR)Lun); if (LunExtension != NULL) { if (Target != CurrentTarget)

1 0

[cwittich] 27440: -added msbuild target to rbuild to be able to test drivers with PREfast
by cwittich＠svn.reactos.org 07 Jul '07

07 Jul '07

Author: cwittich Date: Sat Jul 7 04:38:59 2007 New Revision: 27440 URL: http://svn.reactos.org/svn/reactos?rev=27440&view=rev Log: -added msbuild target to rbuild to be able to test drivers with PREfast Added: trunk/reactos/tools/rbuild/backend/msbuild/ trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp trunk/reactos/tools/rbuild/backend/msbuild/msbuild.h Modified: trunk/reactos/Makefile trunk/reactos/tools/rbuild/rbuild.mak Modified: trunk/reactos/Makefile URL: http://svn.reactos.org/svn/reactos/trunk/reactos/Makefile?rev=27440&r1=2743… ============================================================================== --- trunk/reactos/Makefile (original) +++ trunk/reactos/Makefile Sat Jul 7 04:38:59 2007 @@ -472,6 +472,16 @@ $(ECHO_RBUILD) $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) cb +.PHONY: msbuild +msbuild: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) msbuild + +.PHONY: msbuild_clean +msbuild_clean: $(RBUILD_TARGET) + $(ECHO_RBUILD) + $(Q)$(RBUILD_TARGET) $(ROS_RBUILDFLAGS) -c msbuild + .PHONY: depmap depmap: $(RBUILD_TARGET) $(ECHO_RBUILD) Added: trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msbui… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp (added) +++ trunk/reactos/tools/rbuild/backend/msbuild/msbuild.cpp Sat Jul 7 04:38:59 2007 @@ -1,0 +1,274 @@ +/* + * Copyright (C) 2007 Christoph von Wittich + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#ifdef _MSC_VER +#pragma warning ( disable : 4786 ) +#endif//_MSC_VER + +#include <iostream> +#include <fstream> +#include <string> +#include <vector> + +#include <stdio.h> + +#include "msbuild.h" +#include "../mingw/mingw.h" + +using std::string; +using std::vector; +using std::map; +using std::ifstream; + +#ifdef OUT +#undef OUT +#endif//OUT + + +static class MsBuildFactory : public Backend::Factory +{ + public: + + MsBuildFactory() : Factory("MsBuild", "Ms Build") {} + Backend *operator() (Project &project, + Configuration& configuration) + { + return new MsBuildBackend(project, configuration); + } + +} factory; + + +MsBuildBackend::MsBuildBackend(Project &project, + Configuration& configuration) : Backend(project, configuration) +{ + +} + +void MsBuildBackend::Process() +{ + if ( configuration.CleanAsYouGo ) { + _clean_project_files(); + return; + } + + ProcessModules(); +} + +void +MsBuildBackend::_generate_makefile ( const Module& module ) +{ + string makefile = module.GetBasePath() + "\\makefile"; + FILE* OUT = fopen ( makefile.c_str(), "wb" ); + fprintf ( OUT, "!INCLUDE $(NTMAKEENV)\\makefile.def\r\n" ); + fclose ( OUT ); +} + +void +MsBuildBackend::_generate_sources ( const Module& module ) +{ + size_t i; + + string module_type = GetExtension(module.GetTargetName()); + vector<string> source_files, resource_files, includes, libraries; + vector<string> header_files, common_defines, compiler_flags; + vector<string> vars, values; + string sourcesfile = module.GetBasePath() + "\\sources"; + string proj_path = module.GetBasePath(); + + FILE* OUT = fopen ( sourcesfile.c_str(), "wb" ); + fprintf ( OUT, "TARGETNAME=%s\r\n", module.name.c_str() ); + + vector<const IfableData*> ifs_list; + ifs_list.push_back ( &module.project.non_if_data ); + ifs_list.push_back ( &module.non_if_data ); + while ( ifs_list.size() ) + { + const IfableData& data = *ifs_list.back(); + ifs_list.pop_back(); + for ( i = 0; i < data.ifs.size(); i++ ) + { + const Property* property = _lookup_property( module, data.ifs[i]->property ); + if ( property != NULL ) + { + if ( data.ifs[i]->value == property->value && data.ifs[i]->negated == false || + data.ifs[i]->value != property->value && data.ifs[i]->negated) + ifs_list.push_back ( &data.ifs[i]->data ); + } + } + const vector<File*>& files = data.files; + for ( i = 0; i < files.size(); i++ ) + { + string file = &files[i]->name[proj_path.size()+1]; + source_files.push_back ( file ); + } + const vector<Include*>& incs = data.includes; + for ( i = 0; i < incs.size(); i++ ) + { + string path = Path::RelativeFromDirectory ( + incs[i]->directory, + module.GetBasePath() ); + + includes.push_back ( path ); + } + const vector<Library*>& libs = data.libraries; + for ( i = 0; i < libs.size(); i++ ) + { + libraries.push_back ( libs[i]->name ); + } + const vector<CompilerFlag*>& cflags = data.compilerFlags; + for ( i = 0; i < cflags.size(); i++ ) + { + compiler_flags.push_back ( cflags[i]->flag ); + } + const vector<Define*>& defs = data.defines; + for ( i = 0; i < defs.size(); i++ ) + { + if ( defs[i]->value[0] ) + { + const string& escaped = _replace_str(defs[i]->value, "\"","""); + common_defines.push_back( defs[i]->name + "=" + escaped ); + } + else + { + common_defines.push_back( defs[i]->name ); + } + } + } + + + if (module_type == ".sys") + fprintf ( OUT, "TARGETTYPE=DRIVER\r\n" ); + + fprintf ( OUT, "\r\nMSC_WARNING_LEVEL=/W3 /WX\r\n\r\n" ); + + /* Disable deprecated function uage warnings */ + fprintf ( OUT, "C_DEFINES=$(C_DEFINES) /wd4996\r\n" ); + + + /* includes */ + fprintf ( OUT, "INCLUDES=.; \\\r\n" ); + for ( i = 1; i < includes.size() -1; i++ ) + { + const string& include = includes[i]; + + /* don't include psdk / ddk */ + std::string::size_type pos = include.find("ddk"); + std::string::size_type pos2 = include.find("psdk"); + if ((std::string::npos == pos) && (std::string::npos == pos2)) + fprintf ( OUT, "\t%s; \\\r\n", include.c_str() ); + } + if (includes.size() > 1) + { + const string& include = includes[includes.size()-1]; + fprintf ( OUT, "\t%s \r\n\r\n", include.c_str() ); + } + + fprintf ( OUT, "TARGETLIBS= $(DDK_LIB_PATH)\\ntstrsafe.lib\r\n\r\n" ); + + string source_file = ""; + if (source_files.size() > 0) + { + source_file = DosSeparator(source_files[0]); + fprintf ( OUT, "SOURCES=%s \\\r\n", source_file.c_str() ); + + for ( size_t isrcfile = 1; isrcfile < source_files.size()-1; isrcfile++ ) + { + source_file = DosSeparator(source_files[isrcfile]); + fprintf ( OUT, "\t%s \\\r\n", source_file.c_str() ); + } + } + if (source_files.size() > 1) + { + source_file = DosSeparator(source_files[source_files.size()-1]); + fprintf ( OUT, "\t%s \r\n", source_file.c_str() ); + } + + fprintf ( OUT, "TARGET_DESTINATION=retail\r\n" ); + + + fclose ( OUT ); +} + +void MsBuildBackend::ProcessModules() +{ + for(size_t i = 0; i < ProjectNode.modules.size(); i++) + { + Module &module = *ProjectNode.modules[i]; + _generate_makefile ( module ); + _generate_sources ( module ); + } +} + +void +MsBuildBackend::_clean_project_files ( void ) +{ + for ( size_t i = 0; i < ProjectNode.modules.size(); i++ ) + { + Module& module = *ProjectNode.modules[i]; + printf("Cleaning project %s %s\n", module.name.c_str (), module.GetBasePath ().c_str () ); + + string makefile = module.GetBasePath() + "\\makefile"; + string sourcesfile = module.GetBasePath() + "\\sources"; + + string basepath = module.GetBasePath (); + remove ( makefile.c_str() ); + remove ( sourcesfile.c_str() ); + } +} + +MsBuildConfiguration::MsBuildConfiguration ( const std::string &name ) +{ + /* nothing to do here */ +} + +const Property* +MsBuildBackend::_lookup_property ( const Module& module, const std::string& name ) const +{ + /* Check local values */ + for ( size_t i = 0; i < module.non_if_data.properties.size(); i++ ) + { + const Property& property = *module.non_if_data.properties[i]; + if ( property.name == name ) + return &property; + } + // TODO FIXME - should we check local if-ed properties? + for ( size_t i = 0; i < module.project.non_if_data.properties.size(); i++ ) + { + const Property& property = *module.project.non_if_data.properties[i]; + if ( property.name == name ) + return &property; + } + // TODO FIXME - should we check global if-ed properties? + return NULL; +} + +std::string +MsBuildBackend::_replace_str(std::string string1, const std::string &find_str, const std::string &replace_str) +{ + std::string::size_type pos = string1.find(find_str, 0); + int intLen = find_str.length(); + + while(std::string::npos != pos) + { + string1.replace(pos, intLen, replace_str); + pos = string1.find(find_str, intLen + pos); + } + + return string1; +} + Added: trunk/reactos/tools/rbuild/backend/msbuild/msbuild.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msbui… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msbuild/msbuild.h (added) +++ trunk/reactos/tools/rbuild/backend/msbuild/msbuild.h Sat Jul 7 04:38:59 2007 @@ -1,0 +1,72 @@ +/* + * Copyright (C) 2007 Christoph von Wittich + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ +#ifndef __MSBUILD_H__ +#define __MSBUILD_H__ + +#include <fstream> +#include <vector> +#include <string> + +#include "../backend.h" + +class MsBuildConfiguration +{ + public: + MsBuildConfiguration(const std::string &name = ""); + virtual ~MsBuildConfiguration() {} + std::string name; +}; + +class MsBuildBackend : public Backend +{ + public: + + MsBuildBackend(Project &project, + Configuration& configuration); + virtual ~MsBuildBackend() {} + + virtual void Process(); + + private: + + FILE* m_MsBuildFile; + + std::vector<MsBuildConfiguration*> m_configurations; + void _generate_makefile ( const Module& module ); + void _generate_sources ( const Module& module ); + void _clean_project_files ( void ); + void ProcessModules(); + const Property* _lookup_property ( const Module& module, const std::string& name ) const; + std::string _replace_str(std::string string1, const std::string &find_str, const std::string &replace_str); + + struct module_data + { + std::vector <std::string> libraries; + std::vector <std::string> references; + + module_data() + {} + ~module_data() + {} + }; + +}; + + +#endif // __MsBuild_H__ + Modified: trunk/reactos/tools/rbuild/rbuild.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/rbuild.mak?re… ============================================================================== --- trunk/reactos/tools/rbuild/rbuild.mak (original) +++ trunk/reactos/tools/rbuild/rbuild.mak Sat Jul 7 04:38:59 2007 @@ -119,6 +119,24 @@ ${mkdir} $@ endif + +RBUILD_MSBUILD_BASE = $(RBUILD_BACKEND_BASE_)msbuild +RBUILD_MSBUILD_BASE_ = $(RBUILD_MSBUILD_BASE)$(SEP) +RBUILD_MSBUILD_INT = $(INTERMEDIATE_)$(RBUILD_MSBUILD_BASE) +RBUILD_MSBUILD_INT_ = $(RBUILD_MSBUILD_INT)$(SEP) +RBUILD_MSBUILD_OUT = $(OUTPUT_)$(RBUILD_MSBUILD_BASE) +RBUILD_MSBUILD_OUT_ = $(RBUILD_MSBUILD_OUT)$(SEP) + +$(RBUILD_MSBUILD_INT): | $(RBUILD_BACKEND_INT) + $(ECHO_MKDIR) + ${mkdir} $@ + +ifneq ($(INTERMEDIATE),$(OUTPUT)) +$(RBUILD_MSBUILD_OUT): | $(RBUILD_BACKEND_OUT) + $(ECHO_MKDIR) + ${mkdir} $@ +endif + RBUILD_DEPMAP_BASE = $(RBUILD_BACKEND_BASE_)dependencymap RBUILD_DEPMAP_BASE_ = $(RBUILD_DEPMAP_BASE)$(SEP) RBUILD_DEPMAP_INT = $(INTERMEDIATE_)$(RBUILD_DEPMAP_BASE) @@ -179,6 +197,9 @@ dependencymap.cpp \ ) +RBUILD_BACKEND_MSBUILD_BASE_SOURCES = $(addprefix $(RBUILD_MSBUILD_BASE_), \ + msbuild.cpp \ + ) RBUILD_BACKEND_MSVC_BASE_SOURCES = $(addprefix $(RBUILD_MSVC_BASE_), \ genguid.cpp \ @@ -193,6 +214,7 @@ $(RBUILD_BACKEND_MSVC_BASE_SOURCES) \ $(RBUILD_BACKEND_CODEBLOCKS_BASE_SOURCES) \ $(RBUILD_BACKEND_DEPMAP_BASE_SOURCES) \ + $(RBUILD_BACKEND_MSBUILD_BASE_SOURCES) \ $(RBUILD_BACKEND_BASE_)backend.cpp RBUILD_COMMON_SOURCES = \ @@ -251,6 +273,9 @@ RBUILD_BACKEND_DEPMAP_HEADERS = \ dependencymap.h +RBUILD_BACKEND_MSBUILD_HEADERS = \ + msbuild.h + RBUILD_BACKEND_MINGW_HEADERS = \ mingw.h \ modulehandler.h @@ -261,6 +286,7 @@ $(addprefix msvc$(SEP), $(RBUILD_BACKEND_MSVC_HEADERS)) \ $(addprefix mingw$(SEP), $(RBUILD_BACKEND_MINGW_HEADERS)) \ $(addprefix codeblocks$(SEP), $(RBUILD_BACKEND_CODEBLOCKS_HEADERS)) \ + $(addprefix msbuild$(SEP), $(RBUILD_BACKEND_MSBUILD_HEADERS)) \ $(addprefix dependencymap$(SEP), $(RBUILD_BACKEND_DEPMAP_HEADERS)) RBUILD_HEADERS = \ @@ -434,6 +460,10 @@ $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ +$(RBUILD_MSBUILD_INT_)msbuild.o: $(RBUILD_MSBUILD_BASE_)msbuild.cpp $(RBUILD_HEADERS) | $(RBUILD_MSBUILD_INT) + $(ECHO_CC) + ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@ + $(RBUILD_MSVC_INT_)genguid.o: $(RBUILD_MSVC_BASE_)genguid.cpp $(RBUILD_HEADERS) | $(RBUILD_MSVC_INT) $(ECHO_CC) ${host_gpp} $(RBUILD_HOST_CXXFLAGS) -c $< -o $@

1 0

[hpoussin] 27439: Fix traces Do an unicode build
by hpoussin＠svn.reactos.org 06 Jul '07

06 Jul '07

Author: hpoussin Date: Sat Jul 7 02:47:39 2007 New Revision: 27439 URL: http://svn.reactos.org/svn/reactos?rev=27439&view=rev Log: Fix traces Do an unicode build Modified: trunk/reactos/dll/win32/newdev/newdev.c trunk/reactos/dll/win32/newdev/newdev.rbuild trunk/reactos/dll/win32/newdev/newdev_private.h trunk/reactos/dll/win32/newdev/wizard.c Modified: trunk/reactos/dll/win32/newdev/newdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.c (original) +++ trunk/reactos/dll/win32/newdev/newdev.c Sat Jul 7 02:47:39 2007 @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define YDEBUG +//#define YDEBUG #include "newdev_private.h" WINE_DEFAULT_DEBUG_CHANNEL(newdev); @@ -54,8 +54,8 @@ DevInstData.hDevInfo = INVALID_HANDLE_VALUE; - TRACE("UpdateDriverForPlugAndPlayDevicesW(%p %S %S 0x%lx %p)\n", - hwndParent, HardwareId, FullInfPath, InstallFlags, bRebootRequired); + TRACE("UpdateDriverForPlugAndPlayDevicesW(%p %s %s 0x%x %p)\n", + hwndParent, debugstr_w(HardwareId), debugstr_w(FullInfPath), InstallFlags, bRebootRequired); /* FIXME: InstallFlags bRebootRequired ignored! */ @@ -78,7 +78,7 @@ { if (GetLastError() != ERROR_NO_MORE_ITEMS) { - TRACE("SetupDiEnumDeviceInfo() failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiEnumDeviceInfo() failed with error 0x%x\n", GetLastError()); goto cleanup; } /* This error was expected */ @@ -105,7 +105,7 @@ } else if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) { - TRACE("SetupDiGetDeviceRegistryPropertyW() failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiGetDeviceRegistryPropertyW() failed with error 0x%x\n", GetLastError()); goto cleanup; } /* This error was expected */ @@ -147,7 +147,7 @@ } else if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) { - TRACE("SetupDiGetDeviceInstanceIdW() failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiGetDeviceInstanceIdW() failed with error 0x%x\n", GetLastError()); goto cleanup; } else if ((Buffer = HeapAlloc(GetProcessHeap(), 0, BufferSize)) == NULL) @@ -158,15 +158,15 @@ } else if (!SetupDiGetDeviceInstanceIdW(DevInstData.hDevInfo, &DevInstData.devInfoData, Buffer, BufferSize, NULL)) { - TRACE("SetupDiGetDeviceInstanceIdW() failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiGetDeviceInstanceIdW() failed with error 0x%x\n", GetLastError()); goto cleanup; } - TRACE("Trying to update the driver of %S\n", Buffer); + TRACE("Trying to update the driver of %s\n", debugstr_w(Buffer)); /* Search driver in the specified .inf file */ if (!SearchDriver(&DevInstData, NULL, FullInfPath)) { - TRACE("SearchDriver() failed with error 0x%lx\n", GetLastError()); + TRACE("SearchDriver() failed with error 0x%x\n", GetLastError()); continue; } @@ -174,7 +174,7 @@ //if (!InstallCurrentDriver(&DevInstData)) if (!InstallCurrentDriver(&DevInstData) && GetLastError() != ERROR_PRIVILEGE_NOT_HELD) { - TRACE("InstallCurrentDriver() failed with error 0x%lx\n", GetLastError()); + TRACE("InstallCurrentDriver() failed with error 0x%x\n", GetLastError()); continue; } @@ -188,7 +188,7 @@ } else { - TRACE("No device found with HardwareID %S\n", HardwareId); + TRACE("No device found with HardwareID %s\n", debugstr_w(HardwareId)); SetLastError(ERROR_NO_SUCH_DEVINST); } @@ -259,7 +259,7 @@ DevInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); if (!SetupDiGetDeviceInstallParamsW(DevInstData->hDevInfo, &DevInstData->devInfoData, &DevInstallParams)) { - TRACE("SetupDiGetDeviceInstallParams() failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiGetDeviceInstallParams() failed with error 0x%x\n", GetLastError()); return FALSE; } DevInstallParams.FlagsEx |= DI_FLAGSEX_ALLOWEXCLUDEDDRVS; @@ -286,7 +286,7 @@ &DevInstallParams); if (!ret) { - TRACE("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiSetDeviceInstallParams() failed with error 0x%x\n", GetLastError()); return FALSE; } @@ -296,7 +296,7 @@ SPDIT_COMPATDRIVER); if (!ret) { - TRACE("SetupDiBuildDriverInfoList() failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiBuildDriverInfoList() failed with error 0x%x\n", GetLastError()); return FALSE; } @@ -311,7 +311,7 @@ { if (GetLastError() == ERROR_NO_MORE_ITEMS) return FALSE; - TRACE("SetupDiEnumDriverInfo() failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiEnumDriverInfo() failed with error 0x%x\n", GetLastError()); return FALSE; } @@ -425,7 +425,7 @@ LPCWSTR Path; for (Path = DevInstData->CustomSearchPath; *Path != '\0'; Path += wcslen(Path) + 1) { - TRACE("Search driver in %S\n", Path); + TRACE("Search driver in %s\n", debugstr_w(Path)); if (wcslen(Path) == 2 && Path[1] == ':') { if (SearchDriverRecursive(DevInstData, Path)) @@ -522,7 +522,9 @@ { BOOL ret; - TRACE("Installing driver %s: %s\n", DevInstData->drvInfoData.MfgName, DevInstData->drvInfoData.Description); + TRACE("Installing driver %s: %s\n", + debugstr_w(DevInstData->drvInfoData.MfgName), + debugstr_w(DevInstData->drvInfoData.Description)); ret = SetupDiCallClassInstaller( DIF_SELECTBESTCOMPATDRV, @@ -530,7 +532,7 @@ &DevInstData->devInfoData); if (!ret) { - TRACE("SetupDiCallClassInstaller(DIF_SELECTBESTCOMPATDRV) failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiCallClassInstaller(DIF_SELECTBESTCOMPATDRV) failed with error 0x%x\n", GetLastError()); return FALSE; } @@ -540,7 +542,7 @@ &DevInstData->devInfoData); if (!ret) { - TRACE("SetupDiCallClassInstaller(DIF_ALLOW_INSTALL) failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiCallClassInstaller(DIF_ALLOW_INSTALL) failed with error 0x%x\n", GetLastError()); return FALSE; } @@ -550,7 +552,7 @@ &DevInstData->devInfoData); if (!ret) { - TRACE("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_PREANALYZE) failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_PREANALYZE) failed with error 0x%x\n", GetLastError()); return FALSE; } @@ -560,7 +562,7 @@ &DevInstData->devInfoData); if (!ret) { - TRACE("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_POSTANALYZE) failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_POSTANALYZE) failed with error 0x%x\n", GetLastError()); return FALSE; } @@ -570,7 +572,7 @@ &DevInstData->devInfoData); if (!ret) { - TRACE("SetupDiCallClassInstaller(DIF_INSTALLDEVICEFILES) failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiCallClassInstaller(DIF_INSTALLDEVICEFILES) failed with error 0x%x\n", GetLastError()); return FALSE; } @@ -580,7 +582,7 @@ &DevInstData->devInfoData); if (!ret) { - TRACE("SetupDiCallClassInstaller(DIF_REGISTER_COINSTALLERS) failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiCallClassInstaller(DIF_REGISTER_COINSTALLERS) failed with error 0x%x\n", GetLastError()); return FALSE; } @@ -590,7 +592,7 @@ &DevInstData->devInfoData); if (!ret) { - TRACE("SetupDiCallClassInstaller(DIF_INSTALLINTERFACES) failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiCallClassInstaller(DIF_INSTALLINTERFACES) failed with error 0x%x\n", GetLastError()); return FALSE; } @@ -600,7 +602,7 @@ &DevInstData->devInfoData); if (!ret) { - TRACE("SetupDiCallClassInstaller(DIF_INSTALLDEVICE) failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiCallClassInstaller(DIF_INSTALLDEVICE) failed with error 0x%x\n", GetLastError()); return FALSE; } @@ -610,7 +612,7 @@ &DevInstData->devInfoData); if (!ret) { - TRACE("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_FINISHINSTALL) failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiCallClassInstaller(DIF_NEWDEVICEWIZARD_FINISHINSTALL) failed with error 0x%x\n", GetLastError()); return FALSE; } @@ -620,7 +622,7 @@ &DevInstData->devInfoData); if (!ret) { - TRACE("SetupDiCallClassInstaller(DIF_DESTROYPRIVATEDATA) failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiCallClassInstaller(DIF_DESTROYPRIVATEDATA) failed with error 0x%x\n", GetLastError()); return FALSE; } @@ -664,7 +666,7 @@ DevInstData->hDevInfo = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); if (DevInstData->hDevInfo == INVALID_HANDLE_VALUE) { - TRACE("SetupDiCreateDeviceInfoListExW() failed with error 0x%lx\n", GetLastError()); + TRACE("SetupDiCreateDeviceInfoListExW() failed with error 0x%x\n", GetLastError()); goto cleanup; } @@ -677,7 +679,8 @@ &DevInstData->devInfoData); if (!ret) { - TRACE("SetupDiOpenDeviceInfoW() failed with error 0x%lx (InstanceId %S)\n", GetLastError(), InstanceId); + TRACE("SetupDiOpenDeviceInfoW() failed with error 0x%x (InstanceId %s)\n", + GetLastError(), debugstr_w(InstanceId)); DevInstData->devInfoData.cbSize = 0; goto cleanup; } @@ -701,7 +704,7 @@ } else { - ret = SetupDiGetDeviceRegistryProperty( + ret = SetupDiGetDeviceRegistryPropertyW( DevInstData->hDevInfo, &DevInstData->devInfoData, SPDRP_DEVICEDESC, @@ -712,11 +715,12 @@ } if (!ret) { - TRACE("SetupDiGetDeviceRegistryProperty() failed with error 0x%lx (InstanceId %S)\n", GetLastError(), InstanceId); + TRACE("SetupDiGetDeviceRegistryProperty() failed with error 0x%x (InstanceId %s)\n", + GetLastError(), debugstr_w(InstanceId)); goto cleanup; } - if (SetupDiGetDeviceRegistryProperty( + if (SetupDiGetDeviceRegistryPropertyW( DevInstData->hDevInfo, &DevInstData->devInfoData, SPDRP_CONFIGFLAGS, @@ -733,7 +737,7 @@ } } - TRACE("Installing %s (%S)\n", DevInstData->buffer, InstanceId); + TRACE("Installing %s (%s)\n", debugstr_w((PCWSTR)DevInstData->buffer), debugstr_w(InstanceId)); /* Search driver in default location and removable devices */ if (!PrepareFoldersToScan(DevInstData, FALSE, FALSE, NULL)) Modified: trunk/reactos/dll/win32/newdev/newdev.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev.rb… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev.rbuild (original) +++ trunk/reactos/dll/win32/newdev/newdev.rbuild Sat Jul 7 02:47:39 2007 @@ -1,4 +1,4 @@ -<module name="newdev" type="win32dll" installbase="system32" installname="newdev.dll"> +<module name="newdev" type="win32dll" installbase="system32" installname="newdev.dll" unicode="true"> <include base="newdev">.</include> <importlibrary definition="newdev.spec.def" /> <define name="_WIN32_IE">0x0600</define> Modified: trunk/reactos/dll/win32/newdev/newdev_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/newdev_pr… ============================================================================== --- trunk/reactos/dll/win32/newdev/newdev_private.h (original) +++ trunk/reactos/dll/win32/newdev/newdev_private.h Sat Jul 7 02:47:39 2007 @@ -27,7 +27,7 @@ HWND hDialog; HDEVINFO hDevInfo; SP_DEVINFO_DATA devInfoData; - SP_DRVINFO_DATA drvInfoData; + SP_DRVINFO_DATA_W drvInfoData; LPWSTR CustomSearchPath; /* MULTI_SZ string */ } DEVINSTDATA, *PDEVINSTDATA; Modified: trunk/reactos/dll/win32/newdev/wizard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/wizard.c?… ============================================================================== --- trunk/reactos/dll/win32/newdev/wizard.c (original) +++ trunk/reactos/dll/win32/newdev/wizard.c Sat Jul 7 02:47:39 2007 @@ -205,7 +205,7 @@ NULL)) { config_flags |= CONFIGFLAG_FAILEDINSTALL; - SetupDiSetDeviceRegistryProperty( + SetupDiSetDeviceRegistryPropertyW( DevInstData->hDevInfo, &DevInstData->devInfoData, SPDRP_CONFIGFLAGS,

1 0

[cwittich] 27438: fix some PREfast warnings
by cwittich＠svn.reactos.org 06 Jul '07

06 Jul '07

Author: cwittich Date: Sat Jul 7 01:50:48 2007 New Revision: 27438 URL: http://svn.reactos.org/svn/reactos?rev=27438&view=rev Log: fix some PREfast warnings Modified: trunk/reactos/drivers/bus/pci/pci.c Modified: trunk/reactos/drivers/bus/pci/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pci/pci.c?rev=… ============================================================================== --- trunk/reactos/drivers/bus/pci/pci.c (original) +++ trunk/reactos/drivers/bus/pci/pci.c Sat Jul 7 01:50:48 2007 @@ -14,6 +14,18 @@ #define NDEBUG #endif #include <debug.h> + +static DRIVER_DISPATCH PciDispatchDeviceControl; +static NTSTATUS STDCALL PciDispatchDeviceControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); + +static DRIVER_ADD_DEVICE PciAddDevice; +static NTSTATUS STDCALL PciAddDevice(IN PDRIVER_OBJECT DriverObject, IN PDEVICE_OBJECT PhysicalDeviceObject); + +static DRIVER_DISPATCH PciPowerControl; +static NTSTATUS STDCALL PciPowerControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); + +static DRIVER_DISPATCH PciPnpControl; +static NTSTATUS STDCALL PciPnpControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); #ifdef ALLOC_PRAGMA

1 0

[cwittich] 27437: fix gcc build
by cwittich＠svn.reactos.org 06 Jul '07

06 Jul '07

Author: cwittich Date: Sat Jul 7 01:36:43 2007 New Revision: 27437 URL: http://svn.reactos.org/svn/reactos?rev=27437&view=rev Log: fix gcc build Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c trunk/reactos/drivers/input/i8042prt/keyboard.c Modified: trunk/reactos/drivers/input/i8042prt/i8042prt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/i80… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/i8042prt.c (original) +++ trunk/reactos/drivers/input/i8042prt/i8042prt.c Sat Jul 7 01:36:43 2007 @@ -29,17 +29,17 @@ UNICODE_STRING I8042RegistryPath; -DRIVER_ADD_DEVICE I8042AddDevice; +static DRIVER_ADD_DEVICE I8042AddDevice; static NTSTATUS STDCALL I8042AddDevice(PDRIVER_OBJECT DriverObject, PDEVICE_OBJECT Pdo); -DRIVER_STARTIO I8042StartIo; +static DRIVER_STARTIO I8042StartIo; static VOID STDCALL I8042StartIo(PDEVICE_OBJECT DeviceObject, PIRP Irp); -DRIVER_DISPATCH I8042CreateDispatch; +static DRIVER_DISPATCH I8042CreateDispatch; static NTSTATUS STDCALL I8042CreateDispatch(PDEVICE_OBJECT DeviceObject, PIRP Irp); -DRIVER_DISPATCH I8042InternalDeviceControl; +static DRIVER_DISPATCH I8042InternalDeviceControl; static NTSTATUS STDCALL I8042InternalDeviceControl(PDEVICE_OBJECT DeviceObject, PIRP Irp); /* FUNCTIONS *****************************************************************/ Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/key… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/keyboard.c (original) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c Sat Jul 7 01:36:43 2007 @@ -39,7 +39,7 @@ {0x45, KEYBOARD_NUM_LOCK_ON}, {0x46, KEYBOARD_SCROLL_LOCK_ON}}}; -IO_WORKITEM_ROUTINE I8042DebugWorkItem; +static IO_WORKITEM_ROUTINE I8042DebugWorkItem; static VOID STDCALL I8042DebugWorkItem(PDEVICE_OBJECT DeviceObject, PVOID Context);

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2007