Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[ros-arm-bringup] 42220: - This is a HIGH RISK patch. It has been tested on multiple emulators and configurations but requires broader input. - Implement several changes to PFN database management: - The PTEs for the PFN Database are now created by ARM3. Unlike the old code which create PTE for every page on the machine, ARM3 only creates PTEs to account for pages that should be in the PFN database. - A second related change is what "pages should be in the PFN database". Previously, reserved or
by ros-arm-bringup＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: ros-arm-bringup Date: Sat Jul 25 23:35:31 2009 New Revision: 42220 URL: http://svn.reactos.org/svn/reactos?rev=42220&view=rev Log: - This is a HIGH RISK patch. It has been tested on multiple emulators and configurations but requires broader input. - Implement several changes to PFN database management: - The PTEs for the PFN Database are now created by ARM3. Unlike the old code which create PTE for every page on the machine, ARM3 only creates PTEs to account for pages that should be in the PFN database. - A second related change is what "pages should be in the PFN database". Previously, reserved or otherwise non-existing (ie: holes) memory regions would get a PFN entry created and marked as "BIOS". This is wasteful and not compatible with Windows: there should not be PFN entries created at all. - So we removed BIOS PFN entries, and now only create PTEs for valid pages as listed in the physical memory ranges. - This allows machines with "holes" in their physical address space not to waste dozens of MBs of nonpaged pool - Also saves memory on regular machines too, since 1-4MB worth of memory will now not be in the DB anymore - To keep track of pages that are invalid/unknown/ignored, there is now a "PFN Bitmap". This bitmap has one bit set for each valid PFN in the database. - And so, MiGetPfnEntry now also validates that, if there is a PFN Bitmap, the requested PFN is actually present in the database. - This introduces a major functional change: device pages, reserved pages, and other BIOS pages cannot be referenced, shared, or managed in any meaningful way. - We have attempted to fix parts of the OS that depended on this, but there may still be bugs. - A known issue may be an assertion during reboot and/or shutdown in the hyperspace mapping function. It is currently safe to simply "cont" in the debugger a couple of times. - We are working on a fix. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sat Jul 25 23:35:31 2009 @@ -1045,9 +1045,13 @@ MiGetPfnEntry(IN PFN_TYPE Pfn) { PMMPFN Page; + extern RTL_BITMAP MiPfnBitMap; /* Make sure the PFN number is valid */ if (Pfn > MmHighestPhysicalPage) return NULL; + + /* Make sure this page actually has a PFN entry */ + if ((MiPfnBitMap.Buffer) && !(RtlTestBit(&MiPfnBitMap, Pfn))) return NULL; /* Get the entry */ Page = &MmPfnDatabase[Pfn]; Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/i386/init… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c [iso-8859-1] Sat Jul 25 23:35:31 2009 @@ -169,6 +169,20 @@ // In Windows, this includes the Quark Color Table, but not in ARMÂ³ // ULONG MxPfnAllocation; + +// +// Unlike the old ReactOS Memory Manager, ARMÂ³ (and Windows) does not keep track +// of pages that are not actually valid physical memory, such as ACPI reserved +// regions, BIOS address ranges, or holes in physical memory address space which +// could indicate device-mapped I/O memory. +// +// In fact, the lack of a PFN entry for a page usually indicates that this is +// I/O space instead. +// +// A bitmap, called the PFN bitmap, keeps track of all page frames by assigning +// a bit to each. If the bit is set, then the page is valid physical RAM. +// +RTL_BITMAP MiPfnBitMap; // // This structure describes the different pieces of RAM-backed address space @@ -596,6 +610,9 @@ ULONG OldCount; BOOLEAN IncludeType[LoaderMaximum]; ULONG i; + PVOID Bitmap; + PPHYSICAL_MEMORY_RUN Run; + PFN_NUMBER FreePage, FreePageCount, PagesLeft, BasePage, PageCount; BoundaryAddressMultiple.QuadPart = 0; if (Phase == 0) @@ -1108,9 +1125,138 @@ // Now go ahead and initialize the ARMÂ³ nonpaged pool // MiInitializeArmPool(); + + // + // Get current page data, since we won't be using MxGetNextPage as it + // would corrupt our state + // + FreePage = MxFreeDescriptor->BasePage; + FreePageCount = MxFreeDescriptor->PageCount; + PagesLeft = 0; + + // + // Loop the memory descriptors + // + NextEntry = KeLoaderBlock->MemoryDescriptorListHead.Flink; + while (NextEntry != &KeLoaderBlock->MemoryDescriptorListHead) + { + // + // Get the descriptor + // + MdBlock = CONTAINING_RECORD(NextEntry, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + if ((MdBlock->MemoryType == LoaderFirmwarePermanent) || + (MdBlock->MemoryType == LoaderBBTMemory) || + (MdBlock->MemoryType == LoaderSpecialMemory)) + { + // + // These pages are not part of the PFN database + // + NextEntry = MdBlock->ListEntry.Flink; + continue; + } + + // + // Next, check if this is our special free descriptor we've found + // + if (MdBlock == MxFreeDescriptor) + { + // + // Use the real numbers instead + // + BasePage = MxOldFreeDescriptor.BasePage; + PageCount = MxOldFreeDescriptor.PageCount; + } + else + { + // + // Use the descriptor's numbers + // + BasePage = MdBlock->BasePage; + PageCount = MdBlock->PageCount; + } + + // + // Get the PTEs for this range + // + PointerPte = MiAddressToPte(&MmPfnDatabase[BasePage]); + LastPte = MiAddressToPte(((ULONG_PTR)&MmPfnDatabase[BasePage + PageCount]) - 1); + DPRINT("MD Type: %lx Base: %lx Count: %lx\n", MdBlock->MemoryType, BasePage, PageCount); + + // + // Loop them + // + while (PointerPte <= LastPte) + { + // + // We'll only touch PTEs that aren't already valid + // + if (PointerPte->u.Hard.Valid == 0) + { + // + // Use the next free page + // + TempPte.u.Hard.PageFrameNumber = FreePage; + ASSERT(FreePageCount != 0); + + // + // Consume free pages + // + FreePage++; + FreePageCount--; + if (!FreePageCount) + { + // + // Out of memory + // + KeBugCheckEx(INSTALL_MORE_MEMORY, + MmNumberOfPhysicalPages, + FreePageCount, + MxOldFreeDescriptor.PageCount, + 1); + } + + // + // Write out this PTE + // + PagesLeft++; + ASSERT(PointerPte->u.Hard.Valid == 0); + ASSERT(TempPte.u.Hard.Valid == 1); + *PointerPte = TempPte; + + // + // Zero this page + // + RtlZeroMemory(MiPteToAddress(PointerPte), PAGE_SIZE); + } + + // + // Next! + // + PointerPte++; + } + + // + // Do the next address range + // + NextEntry = MdBlock->ListEntry.Flink; + } + + // + // Now update the free descriptors to consume the pages we used up during + // the PFN allocation loop + // + MxFreeDescriptor->BasePage = FreePage; + MxFreeDescriptor->PageCount = FreePageCount; } else if (Phase == 1) // IN BETWEEN, THE PFN DATABASE IS NOW CREATED - { + { + // + // Reset the descriptor back so we can create the correct memory blocks + // + *MxFreeDescriptor = MxOldFreeDescriptor; + // // Initialize the nonpaged pool // @@ -1197,16 +1343,57 @@ // MmPhysicalMemoryBlock = MmInitializeMemoryLimits(LoaderBlock, IncludeType); + + // + // Allocate enough buffer for the PFN bitmap + // Align it up to a 32-bit boundary + // + Bitmap = ExAllocatePoolWithTag(NonPagedPool, + (((MmHighestPhysicalPage + 1) + 31) / 32) * 4, + ' mM'); + if (!Bitmap) + { + // + // This is critical + // + KeBugCheckEx(INSTALL_MORE_MEMORY, + MmNumberOfPhysicalPages, + MmLowestPhysicalPage, + MmHighestPhysicalPage, + 0x101); + } + + // + // Initialize it and clear all the bits to begin with + // + RtlInitializeBitMap(&MiPfnBitMap, + Bitmap, + MmHighestPhysicalPage + 1); + RtlClearAllBits(&MiPfnBitMap); + + // + // Loop physical memory runs + // for (i = 0; i < MmPhysicalMemoryBlock->NumberOfRuns; i++) { // - // Dump it for debugging - // - PPHYSICAL_MEMORY_RUN Run; + // Get the run + // Run = &MmPhysicalMemoryBlock->Run[i]; DPRINT("PHYSICAL RAM [0x%08p to 0x%08p]\n", Run->BasePage << PAGE_SHIFT, (Run->BasePage + Run->PageCount) << PAGE_SHIFT); + + // + // Make sure it has pages inside it + // + if (Run->PageCount) + { + // + // Set the bits in the PFN bitmap + // + RtlSetBits(&MiPfnBitMap, Run->BasePage, Run->PageCount); + } } // Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sat Jul 25 23:35:31 2009 @@ -133,6 +133,7 @@ extern MEMORY_ALLOCATION_DESCRIPTOR MxOldFreeDescriptor; extern ULONG MxPfnAllocation; extern MM_PAGED_POOL_INFO MmPagedPoolInfo; +extern RTL_BITMAP MiPfnBitMap; VOID NTAPI Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Sat Jul 25 23:35:31 2009 @@ -25,7 +25,6 @@ #define MM_PHYSICAL_PAGE_FREE (0x1) #define MM_PHYSICAL_PAGE_USED (0x2) -#define MM_PHYSICAL_PAGE_BIOS (0x3) /* GLOBALS ****************************************************************/ @@ -98,6 +97,7 @@ oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); + ASSERT(Page); ASSERT(Page->Flags.Type == MM_PHYSICAL_PAGE_USED); ASSERT(Page->Flags.Consumer == MC_USER); InsertTailList(&UserPageListHead, &Page->ListEntry); @@ -115,6 +115,7 @@ oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(PreviousPfn); + ASSERT(Page); ASSERT(Page->Flags.Type == MM_PHYSICAL_PAGE_USED); ASSERT(Page->Flags.Consumer == MC_USER); NextListEntry = (PLIST_ENTRY)Page->ListEntry.Flink; @@ -495,6 +496,7 @@ // Get the PFN entry for this page // Pfn1 = MiGetPfnEntry(Page); + ASSERT(Pfn1); // // Make sure it's free and if this is our first pass, zeroed @@ -591,6 +593,7 @@ // Get the PFN entry for the page and check if we should zero it out // Pfn1 = MiGetPfnEntry(Page); + ASSERT(Pfn1); if (Pfn1->Flags.Zero == 0) MiZeroPage(Page); } @@ -610,7 +613,7 @@ PPHYSICAL_PAGE Pfn1; PCHAR State = "????", Consumer = "Unknown"; KIRQL OldIrql; - ULONG Totals[5] = {0}, BiosPages = 0, FreePages = 0; + ULONG Totals[5] = {0}, FreePages = 0; KeRaiseIrql(HIGH_LEVEL, &OldIrql); @@ -620,6 +623,7 @@ for (i = 0; i <= MmHighestPhysicalPage; i++) { Pfn1 = MiGetPfnEntry(i); + if (!Pfn1) continue; // // Get the consumer @@ -668,13 +672,6 @@ State = "Free"; Consumer = "Free"; FreePages++; - break; - - case MM_PHYSICAL_PAGE_BIOS: - - State = "BIOS"; - Consumer = "System Reserved"; - BiosPages++; break; } @@ -696,63 +693,24 @@ DbgPrint("File System Cache: %d pages\t[%d KB]\n", Totals[MC_CACHE], (Totals[MC_CACHE] << PAGE_SHIFT) / 1024); DbgPrint("Process Working Set: %d pages\t[%d KB]\n", Totals[MC_USER], (Totals[MC_USER] << PAGE_SHIFT) / 1024); DbgPrint("System: %d pages\t[%d KB]\n", Totals[MC_SYSTEM], (Totals[MC_SYSTEM] << PAGE_SHIFT) / 1024); - DbgPrint("BIOS: %d pages\t[%d KB]\n", BiosPages, (BiosPages << PAGE_SHIFT) / 1024); DbgPrint("Free: %d pages\t[%d KB]\n", FreePages, (FreePages << PAGE_SHIFT) / 1024); KeLowerIrql(OldIrql); } -PFN_NUMBER -NTAPI -MxGetNextPage(IN PFN_NUMBER PageCount); - VOID NTAPI MmInitializePageList(VOID) { ULONG i; - NTSTATUS Status; - PFN_TYPE Pfn = 0; PHYSICAL_PAGE UsedPage; + PMEMORY_ALLOCATION_DESCRIPTOR Md; PLIST_ENTRY NextEntry; - PMEMORY_ALLOCATION_DESCRIPTOR Md; /* Initialize the page lists */ InitializeListHead(&UserPageListHead); InitializeListHead(&FreeUnzeroedPageListHead); InitializeListHead(&FreeZeroedPageListHead); - - /* Loop every page required to hold the PFN database */ - for (i = 0; i < MxPfnAllocation; i++) - { - PVOID Address = (char*)MmPfnDatabase + (i * PAGE_SIZE); - - /* Check if FreeLDR has already allocated it for us */ - if (!MmIsPagePresent(NULL, Address)) - { - /* Use one of our highest usable pages */ - Pfn = MxGetNextPage(1); - - /* Set the PFN */ - Status = MmCreateVirtualMappingForKernel(Address, - PAGE_READWRITE, - &Pfn, - 1); - if (!NT_SUCCESS(Status)) - { - DPRINT1("Unable to create virtual mapping\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - } - else - { - /* Setting the page protection is necessary to set the global bit */ - MmSetPageProtect(NULL, Address, PAGE_READWRITE); - } - } - - /* Clear the PFN database */ - RtlZeroMemory(MmPfnDatabase, (MmHighestPhysicalPage + 1) * sizeof(PHYSICAL_PAGE)); /* This is what a used page looks like */ RtlZeroMemory(&UsedPage, sizeof(UsedPage)); @@ -779,17 +737,10 @@ (Md->MemoryType == LoaderSpecialMemory) || (Md->MemoryType == LoaderBad)) { - /* Loop every page part of the block but valid in the database */ - for (i = 0; i < Md->PageCount; i++) - { - /* Skip memory we ignore completely */ - if ((Md->BasePage + i) > MmHighestPhysicalPage) break; - - /* These are pages reserved by the BIOS/ROMs */ - MmPfnDatabase[Md->BasePage + i].Flags.Type = MM_PHYSICAL_PAGE_BIOS; - MmPfnDatabase[Md->BasePage + i].Flags.Consumer = MC_NPPOOL; - MmStats.NrSystemPages++; - } + // + // We do not build PFN entries for this + // + continue; } else if ((Md->MemoryType == LoaderFree) || (Md->MemoryType == LoaderLoadedProgram) || @@ -872,13 +823,16 @@ { oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); - if (Page->Flags.Type == MM_PHYSICAL_PAGE_FREE) + if (Page) { - DPRINT1("Mapping non-used page\n"); - KeBugCheck(MEMORY_MANAGEMENT); + if (Page->Flags.Type == MM_PHYSICAL_PAGE_FREE) + { + DPRINT1("Mapping non-used page\n"); + KeBugCheck(MEMORY_MANAGEMENT); + } + Page->MapCount++; + Page->ReferenceCount++; } - Page->MapCount++; - Page->ReferenceCount++; KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } } @@ -894,18 +848,21 @@ { oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); - if (Page->Flags.Type == MM_PHYSICAL_PAGE_FREE) + if (Page) { - DPRINT1("Unmapping non-used page\n"); - KeBugCheck(MEMORY_MANAGEMENT); + if (Page->Flags.Type == MM_PHYSICAL_PAGE_FREE) + { + DPRINT1("Unmapping non-used page\n"); + KeBugCheck(MEMORY_MANAGEMENT); + } + if (Page->MapCount == 0) + { + DPRINT1("Unmapping not mapped page\n"); + KeBugCheck(MEMORY_MANAGEMENT); + } + Page->MapCount--; + Page->ReferenceCount--; } - if (Page->MapCount == 0) - { - DPRINT1("Unmapping not mapped page\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - Page->MapCount--; - Page->ReferenceCount--; KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); } } @@ -952,6 +909,7 @@ oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); + ASSERT(Page); if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Referencing non-used page\n"); @@ -983,6 +941,7 @@ oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); + ASSERT(Page); if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Getting reference count for free page\n"); @@ -1017,6 +976,7 @@ oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); + ASSERT(Page); if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { @@ -1088,6 +1048,7 @@ oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); + ASSERT(Page); if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Getting lock count for free page\n"); @@ -1112,6 +1073,7 @@ oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); + ASSERT(Page); if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Locking free page\n"); @@ -1143,6 +1105,7 @@ oldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); Page = MiGetPfnEntry(Pfn); + ASSERT(Page); if (Page->Flags.Type != MM_PHYSICAL_PAGE_USED) { DPRINT1("Unlocking free page\n"); @@ -1173,7 +1136,7 @@ /* Check if this allocation is for the PFN DB itself */ if (MmStats.NrTotalPages == 0) { - MxGetNextPage(1); + ASSERT(FALSE); } DPRINT1("MmAllocPage(): Out of memory\n");

1 0

[sginsberg] 42219: - RamdiskWorkerThread: Don't return IoCompleteRequest as we return void (IoCompleteRequest returns void though), msvc doesn't like this. - Fix calling convention declaration for scsi function prototypes
by sginsberg＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: sginsberg Date: Sat Jul 25 22:24:50 2009 New Revision: 42219 URL: http://svn.reactos.org/svn/reactos?rev=42219&view=rev Log: - RamdiskWorkerThread: Don't return IoCompleteRequest as we return void (IoCompleteRequest returns void though), msvc doesn't like this. - Fix calling convention declaration for scsi function prototypes Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c trunk/reactos/include/ddk/scsiwmi.h trunk/reactos/include/ddk/srb.h Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sat Jul 25 22:24:50 2009 @@ -1012,7 +1012,8 @@ IoReleaseRemoveLock(&DeviceExtension->RemoveLock, Irp); Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; - return IoCompleteRequest(Irp, IO_DISK_INCREMENT); + IoCompleteRequest(Irp, IO_DISK_INCREMENT); + return; } // @@ -1020,7 +1021,8 @@ // Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; - return IoCompleteRequest(Irp, IO_NO_INCREMENT); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return; } NTSTATUS Modified: trunk/reactos/include/ddk/scsiwmi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/scsiwmi.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/scsiwmi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/scsiwmi.h [iso-8859-1] Sat Jul 25 22:24:50 2009 @@ -60,14 +60,14 @@ ULONG Flags; } SCSIWMIGUIDREGINFO, *PSCSIWMIGUIDREGINFO; -typedef UCHAR DDKAPI -(*PSCSIWMI_QUERY_REGINFO)( +typedef UCHAR +(DDKAPI *PSCSIWMI_QUERY_REGINFO)( IN PVOID DeviceContext, IN PSCSIWMI_REQUEST_CONTEXT RequestContext, OUT PWCHAR *MofResourceName); -typedef BOOLEAN DDKAPI -(*PSCSIWMI_QUERY_DATABLOCK)( +typedef BOOLEAN +(DDKAPI *PSCSIWMI_QUERY_DATABLOCK)( IN PVOID Context, IN PSCSIWMI_REQUEST_CONTEXT DispatchContext, IN ULONG GuidIndex, @@ -77,8 +77,8 @@ IN ULONG BufferAvail, OUT PUCHAR Buffer); -typedef BOOLEAN DDKAPI -(*PSCSIWMI_SET_DATABLOCK)( +typedef BOOLEAN +(DDKAPI *PSCSIWMI_SET_DATABLOCK)( IN PVOID DeviceContext, IN PSCSIWMI_REQUEST_CONTEXT RequestContext, IN ULONG GuidIndex, @@ -86,8 +86,8 @@ IN ULONG BufferSize, IN PUCHAR Buffer); -typedef BOOLEAN DDKAPI -(*PSCSIWMI_SET_DATAITEM)( +typedef BOOLEAN +(DDKAPI *PSCSIWMI_SET_DATAITEM)( IN PVOID DeviceContext, IN PSCSIWMI_REQUEST_CONTEXT RequestContext, IN ULONG GuidIndex, @@ -96,8 +96,8 @@ IN ULONG BufferSize, IN PUCHAR Buffer); -typedef BOOLEAN DDKAPI -(*PSCSIWMI_EXECUTE_METHOD)( +typedef BOOLEAN +(DDKAPI *PSCSIWMI_EXECUTE_METHOD)( IN PVOID DeviceContext, IN PSCSIWMI_REQUEST_CONTEXT RequestContext, IN ULONG GuidIndex, @@ -112,8 +112,8 @@ ScsiWmiDataBlockControl } SCSIWMI_ENABLE_DISABLE_CONTROL; -typedef BOOLEAN DDKAPI -(*PSCSIWMI_FUNCTION_CONTROL)( +typedef BOOLEAN +(DDKAPI *PSCSIWMI_FUNCTION_CONTROL)( IN PVOID DeviceContext, IN PSCSIWMI_REQUEST_CONTEXT RequestContext, IN ULONG GuidIndex, Modified: trunk/reactos/include/ddk/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/srb.h?rev=4221… ============================================================================== --- trunk/reactos/include/ddk/srb.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/srb.h [iso-8859-1] Sat Jul 25 22:24:50 2009 @@ -300,14 +300,14 @@ BOOLEAN SupportedTypeList[0]; } SCSI_SUPPORTED_CONTROL_TYPE_LIST, *PSCSI_SUPPORTED_CONTROL_TYPE_LIST; -typedef SCSI_ADAPTER_CONTROL_STATUS DDKAPI -(*PHW_ADAPTER_CONTROL)( +typedef SCSI_ADAPTER_CONTROL_STATUS +(DDKAPI *PHW_ADAPTER_CONTROL)( IN PVOID DeviceExtension, IN SCSI_ADAPTER_CONTROL_TYPE ControlType, IN PVOID Parameters); -typedef BOOLEAN DDKAPI -(*PHW_ADAPTER_STATE)( +typedef BOOLEAN +(DDKAPI *PHW_ADAPTER_STATE)( IN PVOID DeviceExtension, IN PVOID Context, IN BOOLEAN SaveState); @@ -317,8 +317,8 @@ #define SP_RETURN_ERROR 2 #define SP_RETURN_BAD_CONFIG 3 -typedef ULONG DDKAPI -(*PHW_FIND_ADAPTER)( +typedef ULONG +(DDKAPI *PHW_FIND_ADAPTER)( IN PVOID DeviceExtension, IN PVOID HwContext, IN PVOID BusInformation, @@ -326,30 +326,30 @@ IN OUT PPORT_CONFIGURATION_INFORMATION ConfigInfo, OUT PBOOLEAN Again); -typedef BOOLEAN DDKAPI -(*PHW_INITIALIZE)( +typedef BOOLEAN +(DDKAPI *PHW_INITIALIZE)( IN PVOID DeviceExtension); -typedef BOOLEAN DDKAPI -(*PHW_INTERRUPT)( +typedef BOOLEAN +(DDKAPI *PHW_INTERRUPT)( IN PVOID DeviceExtension); -typedef BOOLEAN DDKAPI -(*PHW_RESET_BUS)( +typedef BOOLEAN +(DDKAPI *PHW_RESET_BUS)( IN PVOID DeviceExtension, IN ULONG PathId); -typedef VOID DDKAPI -(*PHW_DMA_STARTED)( +typedef VOID +(DDKAPI *PHW_DMA_STARTED)( IN PVOID DeviceExtension); -typedef BOOLEAN DDKAPI -(*PHW_STARTIO)( +typedef BOOLEAN +(DDKAPI *PHW_STARTIO)( IN PVOID DeviceExtension, IN PSCSI_REQUEST_BLOCK Srb); -typedef VOID DDKAPI -(*PHW_TIMER)( +typedef VOID +(DDKAPI *PHW_TIMER)( IN PVOID DeviceExtension); typedef struct _HW_INITIALIZATION_DATA {

1 0

[sginsberg] 42218: - Fix most freeldr compilation issues, most notably: - Define structure packing correctly for msvc. - Define Ke386EraseFlags for msvc too. - Don't return a function returning void in a function returning void. - VideoFadeIn: Don't rely on some fishy gcc extension for allocating memory from the stack -- just use the heap instead. - Winldr remains
by sginsberg＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: sginsberg Date: Sat Jul 25 22:17:23 2009 New Revision: 42218 URL: http://svn.reactos.org/svn/reactos?rev=42218&view=rev Log: - Fix most freeldr compilation issues, most notably: - Define structure packing correctly for msvc. - Define Ke386EraseFlags for msvc too. - Don't return a function returning void in a function returning void. - VideoFadeIn: Don't rely on some fishy gcc extension for allocating memory from the stack -- just use the heap instead. - Winldr remains Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/boot/freeldr/freeldr/machine.c trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c trunk/reactos/boot/freeldr/freeldr/ui/tui.c trunk/reactos/boot/freeldr/freeldr/video/fade.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -22,12 +22,7 @@ #define NDEBUG #include <debug.h> -/* non-standard specifier from windef.h -- please deprecate */ -#undef PACKED -#ifdef __GNUC__ -#define PACKED __attribute__((packed)) -#endif - +#include <pshpack2.h> typedef struct { UCHAR Signature[4]; // (ret) signature ("VESA") @@ -55,7 +50,8 @@ // accelerated video modes (list of words terminated with FFFFh) UCHAR Reserved[216]; // reserved for VBE implementation UCHAR ScratchPad[256]; // OEM scratchpad (for OEM strings, etc.) -} PACKED VESA_SVGA_INFO, *PVESA_SVGA_INFO; +} VESA_SVGA_INFO, *PVESA_SVGA_INFO; +#include <poppack.h> // Bitfields for VESA capabilities: // Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -22,12 +22,7 @@ #define NDEBUG #include <debug.h> -/* non-standard specifier from windef.h -- please deprecate */ -#undef PACKED -#ifdef __GNUC__ -#define PACKED __attribute__((packed)) -#endif - +#include <pshpack2.h> typedef struct { UCHAR PacketSize; // 00h - Size of packet (10h or 18h) @@ -40,7 +35,8 @@ // used if DWORD at 04h is FFFFh:FFFFh // Commented since some earlier BIOSes refuse to work with // such extended structure -} PACKED I386_DISK_ADDRESS_PACKET, *PI386_DISK_ADDRESS_PACKET; +} I386_DISK_ADDRESS_PACKET, *PI386_DISK_ADDRESS_PACKET; +#include <poppack.h> ///////////////////////////////////////////////////////////////////////////////////////////// // FUNCTIONS Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -22,12 +22,6 @@ #define NDEBUG #include <debug.h> -/* non-standard specifier from windef.h -- please deprecate */ -#undef PACKED -#ifdef __GNUC__ -#define PACKED __attribute__((packed)) -#endif - #define VIDEOPORT_PALETTE_READ 0x03C7 #define VIDEOPORT_PALETTE_WRITE 0x03C8 #define VIDEOPORT_PALETTE_DATA 0x03C9 @@ -57,6 +51,7 @@ #define VERTRES_350_SCANLINES 0x01 #define VERTRES_400_SCANLINES 0x02 +#include <pshpack2.h> typedef struct { USHORT ModeAttributes; /* mode attributes (see #00080) */ @@ -110,7 +105,8 @@ UCHAR LinearReservedMaskPosition; /* linear modes:Bit position of reserved mask LSB */ ULONG MaximumPixelClock; /* maximum pixel clock for graphics video mode, in Hz */ UCHAR Reserved2[190]; /* 190 BYTEs reserved (0) */ -} PACKED SVGA_MODE_INFORMATION, *PSVGA_MODE_INFORMATION; +} SVGA_MODE_INFORMATION, *PSVGA_MODE_INFORMATION; +#include <poppack.h> static ULONG BiosVideoMode; /* Current video mode as known by BIOS */ static ULONG ScreenWidth = 80; /* Screen Width in characters */ Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -29,8 +29,8 @@ VOID PcMachInit(const char *CmdLine); VOID PcConsPutChar(int Ch); -BOOLEAN PcConsKbHit(); -int PcConsGetCh(); +BOOLEAN PcConsKbHit(VOID); +int PcConsGetCh(VOID); VOID PcVideoClearScreen(UCHAR Attr); VIDEODISPLAYMODE PcVideoSetDisplayMode(char *DisplayMode, BOOLEAN Init); Modified: trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -29,8 +29,8 @@ VOID XboxMachInit(const char *CmdLine); VOID XboxConsPutChar(int Ch); -BOOLEAN XboxConsKbHit(); -int XboxConsGetCh(); +BOOLEAN XboxConsKbHit(VOID); +int XboxConsGetCh(VOID); VOID XboxVideoInit(VOID); VOID XboxVideoClearScreen(UCHAR Attr); Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -110,12 +110,22 @@ #include <bytesex.h> /* arch defines */ +#ifdef __GNUC__ #ifdef _X86_ -#define Ke386EraseFlags(x) __asm__ __volatile__("pushl $0 ; popfl\n") +#define Ke386EraseFlags() __asm__ __volatile__("pushl $0 ; popfl\n") #endif #ifdef _M_AMD64 -#define KeAmd64EraseFlags(x) __asm__ __volatile__("pushq $0 ; popfq\n") +#define KeAmd64EraseFlags() __asm__ __volatile__("pushq $0 ; popfq\n") +#endif +#else +#ifdef _X86_ +#define Ke386EraseFlags() __asm push 0; __asm popf; +#endif + +#ifdef _M_AMD64 +#error FIXME +#endif #endif VOID BootMain(LPSTR CmdLine); Modified: trunk/reactos/boot/freeldr/freeldr/machine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/machi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/machine.c [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -83,7 +83,7 @@ VOID MachVideoGetDisplaySize(PULONG Width, PULONG Height, PULONG Depth) { - return MachVtbl.VideoGetDisplaySize(Width, Height, Depth); + MachVtbl.VideoGetDisplaySize(Width, Height, Depth); } ULONG @@ -95,7 +95,7 @@ VOID MachVideoSetTextCursorPosition(ULONG X, ULONG Y) { - return MachVtbl.VideoSetTextCursorPosition(X, Y); + MachVtbl.VideoSetTextCursorPosition(X, Y); } VOID @@ -125,13 +125,13 @@ VOID MachVideoSetPaletteColor(UCHAR Color, UCHAR Red, UCHAR Green, UCHAR Blue) { - return MachVtbl.VideoSetPaletteColor(Color, Red, Green, Blue); + MachVtbl.VideoSetPaletteColor(Color, Red, Green, Blue); } VOID MachVideoGetPaletteColor(UCHAR Color, UCHAR *Red, UCHAR *Green, UCHAR *Blue) { - return MachVtbl.VideoGetPaletteColor(Color, Red, Green, Blue); + MachVtbl.VideoGetPaletteColor(Color, Red, Green, Blue); } VOID Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -40,7 +40,7 @@ NTAPI CmpFree (PVOID Ptr, IN ULONG Quota) { - return MmHeapFree(Ptr); + MmHeapFree(Ptr); } static BOOLEAN 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 [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/setupldr.c [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -60,11 +60,12 @@ NULL }; CHAR FileName[256]; - HINF InfHandle; - ULONG ErrorLine; - INFCONTEXT InfContext; + HINF InfHandle; + ULONG ErrorLine; + INFCONTEXT InfContext; PIMAGE_NT_HEADERS NtHeader; PVOID LoadBase; + extern BOOLEAN FrLdrBootType; /* Setup multiboot information structure */ LoaderBlock.CommandLine = reactos_kernel_cmdline; @@ -108,8 +109,7 @@ #endif UiDrawStatusText(""); - extern BOOLEAN FrLdrBootType; - FrLdrBootType = TRUE; + FrLdrBootType = TRUE; /* Detect hardware */ UiDrawStatusText("Detecting hardware..."); Modified: trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/rtl/l… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/rtl/libsupp.c [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -42,5 +42,5 @@ RtlpFreeMemory(PVOID Mem, ULONG Tag) { - return MmHeapFree(Mem); + MmHeapFree(Mem); } Modified: trunk/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/tu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/tui.c [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -27,9 +27,9 @@ */ int TuiPrintf(const char *format, ... ) { + char c, *ptr, str[16]; va_list ap; va_start(ap,format); - char c, *ptr, str[16]; while ((c = *(format++))) { Modified: trunk/reactos/boot/freeldr/freeldr/video/fade.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/video… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/video/fade.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/video/fade.c [iso-8859-1] Sat Jul 25 22:17:23 2009 @@ -38,7 +38,10 @@ { ULONG Index; ULONG Color; - PALETTE_ENTRY PaletteColors[ColorCount]; + PPALETTE_ENTRY PaletteColors; + + PaletteColors = MmHeapAlloc(sizeof(PALETTE_ENTRY) * ColorCount); + if (!PaletteColors) return; for (Index=0; Index<RGB_MAX; Index++) {

1 0

[cgutman] 42217: - Make ipconfig /renew work even if we haven't got an address yet - Fix several potential crashes - Fix an infinite loop caused by us sending a discover packet without adding a protocol first (this is exposed by releasing then renewing) - Fixes bug 4630
by cgutman＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: cgutman Date: Sat Jul 25 21:51:54 2009 New Revision: 42217 URL: http://svn.reactos.org/svn/reactos?rev=42217&view=rev Log: - Make ipconfig /renew work even if we haven't got an address yet - Fix several potential crashes - Fix an infinite loop caused by us sending a discover packet without adding a protocol first (this is exposed by releasing then renewing) - Fixes bug 4630 Modified: trunk/reactos/base/services/dhcp/api.c Modified: trunk/reactos/base/services/dhcp/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/api.c?r… ============================================================================== --- trunk/reactos/base/services/dhcp/api.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/api.c [iso-8859-1] Sat Jul 25 21:51:54 2009 @@ -78,6 +78,7 @@ DWORD DSReleaseIpAddressLease( PipeSendFunc Send, COMM_DHCP_REQ *Req ) { COMM_DHCP_REPLY Reply; PDHCP_ADAPTER Adapter; + struct protocol* proto; ApiLock(); @@ -86,8 +87,12 @@ Reply.Reply = Adapter ? 1 : 0; if( Adapter ) { - DeleteIPAddress( Adapter->NteContext ); - remove_protocol( find_protocol_by_adapter( &Adapter->DhclientInfo ) ); + if (Adapter->NteContext) + DeleteIPAddress( Adapter->NteContext ); + + proto = find_protocol_by_adapter( &Adapter->DhclientInfo ); + if (proto) + remove_protocol(proto); } ApiUnlock(); @@ -103,7 +108,7 @@ Adapter = AdapterFindIndex( Req->AdapterIndex ); - if( !Adapter || Adapter->DhclientState.state != S_BOUND ) { + if( !Adapter || Adapter->DhclientState.state == S_STATIC ) { Reply.Reply = 0; ApiUnlock(); return Send( &Reply ); @@ -111,8 +116,11 @@ Reply.Reply = 1; - send_discover( &Adapter->DhclientInfo ); - state_bound( &Adapter->DhclientInfo ); + add_protocol( Adapter->DhclientInfo.name, + Adapter->DhclientInfo.rfdesc, got_one, + &Adapter->DhclientInfo ); + Adapter->DhclientInfo.client->state = S_INIT; + state_reboot(&Adapter->DhclientInfo); ApiUnlock(); @@ -123,6 +131,7 @@ NTSTATUS Status; COMM_DHCP_REPLY Reply; PDHCP_ADAPTER Adapter; + struct protocol* proto; ApiLock(); @@ -131,9 +140,12 @@ Reply.Reply = Adapter ? 1 : 0; if( Adapter ) { - DeleteIPAddress( Adapter->NteContext ); + if (Adapter->NteContext) + DeleteIPAddress( Adapter->NteContext ); Adapter->DhclientState.state = S_STATIC; - remove_protocol( find_protocol_by_adapter( &Adapter->DhclientInfo ) ); + proto = find_protocol_by_adapter( &Adapter->DhclientInfo ); + if (proto) + remove_protocol(proto); Status = AddIPAddress( Req->Body.StaticRefreshParams.IPAddress, Req->Body.StaticRefreshParams.Netmask, Req->AdapterIndex,

1 0

[sginsberg] 42216: - FIELD_OFFSET returns LONG, not LONG_PTR or size_t. - Define TYPE_ALIGNMENT for msvc. - Define DbgPrintEx the same way in NDK and DDK - C_ASSERT is a typedef, so don't put it inside functions as msvc doesn't allow this. - Kernel now *compiles* with RosBE + msvc _and_ our DDK. Linker errors from the ninth circle of hell remains.
by sginsberg＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: sginsberg Date: Sat Jul 25 21:38:52 2009 New Revision: 42216 URL: http://svn.reactos.org/svn/reactos?rev=42216&view=rev Log: - FIELD_OFFSET returns LONG, not LONG_PTR or size_t. - Define TYPE_ALIGNMENT for msvc. - Define DbgPrintEx the same way in NDK and DDK - C_ASSERT is a typedef, so don't put it inside functions as msvc doesn't allow this. - Kernel now *compiles* with RosBE + msvc _and_ our DDK. Linker errors from the ninth circle of hell remains. Modified: trunk/reactos/include/ddk/ntdef.h trunk/reactos/include/ddk/winddk.h trunk/reactos/include/host/typedefs.h trunk/reactos/include/psdk/winnt.h trunk/reactos/ntoskrnl/ke/wait.c trunk/reactos/ntoskrnl/mm/pe.c Modified: trunk/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdef.h?rev=42… ============================================================================== --- trunk/reactos/include/ddk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntdef.h [iso-8859-1] Sat Jul 25 21:38:52 2009 @@ -155,20 +155,20 @@ // // Returns the byte offset of the specified structure's member // -#ifndef FIELD_OFFSET #ifndef __GNUC__ -#define FIELD_OFFSET(Type, Field) \ - ((LONG)(LONG_PTR) (&(((Type *) 0)->Field))) +#define FIELD_OFFSET(Type, Field) ((LONG)(LONG_PTR)&(((Type*) 0)->Field)) #else #define FIELD_OFFSET(Type, Field) __builtin_offsetof(Type, Field) #endif -#endif // // Returns the type's alignment // +#if defined(_MSC_VER) && (_MSC_VER >= 1300) +#define TYPE_ALIGNMENT(t) __alignof(t) +#else #define TYPE_ALIGNMENT(t) FIELD_OFFSET( struct { char x; t test; }, test ) - +#endif // // Calling Conventions Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sat Jul 25 21:38:52 2009 @@ -10277,6 +10277,7 @@ IN PCCH Format, IN ...); +NTSYSAPI ULONG DDKCDECLAPI DbgPrintEx( Modified: trunk/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/host/typedefs.h?re… ============================================================================== --- trunk/reactos/include/host/typedefs.h [iso-8859-1] (original) +++ trunk/reactos/include/host/typedefs.h [iso-8859-1] Sat Jul 25 21:38:52 2009 @@ -219,9 +219,9 @@ #define NT_SUCCESS(x) ((x)>=0) #if !defined(__GNUC__) -#define FIELD_OFFSET(t,f) ((LONG_PTR)&(((t*)0)->f)) +#define FIELD_OFFSET(t,f) ((LONG)(LONG_PTR)&(((t*) 0)->f)) #else -#define FIELD_OFFSET(t,f) __builtin_offsetof(t,f) +#define FIELD_OFFSET(t,f) ((LONG)__builtin_offsetof(t,f)) #endif #define RTL_CONSTANT_STRING(s) { sizeof(s)-sizeof((s)[0]), sizeof(s), s } #define CONTAINING_RECORD(address, type, field) ((type *)(((ULONG_PTR)address) - (ULONG_PTR)(&(((type *)0)->field)))) Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Jul 25 21:38:52 2009 @@ -1311,10 +1311,10 @@ #define RTL_CRITSECT_TYPE 0 #define RTL_RESOURCE_TYPE 1 /* Also in winddk.h */ -#ifndef __GNUC__ -#define FIELD_OFFSET(t,f) ((LONG_PTR)&(((t*)0)->f)) +#if !defined(__GNUC__) +#define FIELD_OFFSET(t,f) ((LONG)(LONG_PTR)&(((t*) 0)->f)) #else -#define FIELD_OFFSET(t,f) __builtin_offsetof(t,f) +#define FIELD_OFFSET(t,f) ((LONG)__builtin_offsetof(t,f)) #endif #ifndef CONTAINING_RECORD #define CONTAINING_RECORD(address, type, field) \ Modified: trunk/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/wait.c?rev=422… ============================================================================== --- trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/wait.c [iso-8859-1] Sat Jul 25 21:38:52 2009 @@ -116,6 +116,9 @@ FALSE, NULL); } + +/* KiAcquireGuardedMutex depends on these bits being right */ +C_ASSERT((GM_LOCK_WAITER_WOKEN * 2) == GM_LOCK_WAITER_INC); VOID FASTCALL @@ -181,9 +184,6 @@ /* Ok, the wait is done, so set the new bits */ BitsToRemove = GM_LOCK_BIT | GM_LOCK_WAITER_WOKEN; BitsToAdd = GM_LOCK_WAITER_WOKEN; - - /* We depend on these bits being just right */ - C_ASSERT((GM_LOCK_WAITER_WOKEN * 2) == GM_LOCK_WAITER_INC); } } Modified: trunk/reactos/ntoskrnl/mm/pe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pe.c?rev=42216… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pe.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pe.c [iso-8859-1] Sat Jul 25 21:38:52 2009 @@ -136,6 +136,84 @@ (RTL_FIELD_SIZE(TYPE1_, FIELD_) == RTL_FIELD_SIZE(TYPE2_, FIELD_)) \ ) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +// +// FIXME: All this whitespace is "padding" so the C_ASSERTs aren't on the same lines as asserts in other headers. +// This is necessary because of the way we define C_ASSERT in a gcc compatible way. +// This can be removed once we upgrade to gcc 4.3.x or later (which implements __COUNTER__). +// + + + + + + + + + + + + + + + + + + + + + + + + +// +// PeFmtCreateSection depends on the following: +// +C_ASSERT(EXEFMT_LOAD_HEADER_SIZE >= sizeof(IMAGE_DOS_HEADER)); +C_ASSERT(sizeof(IMAGE_NT_HEADERS32) <= sizeof(IMAGE_NT_HEADERS64)); + +C_ASSERT(TYPE_ALIGNMENT(IMAGE_NT_HEADERS32) == TYPE_ALIGNMENT(IMAGE_NT_HEADERS64)); +C_ASSERT(RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS32, FileHeader) == RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS64, FileHeader)); +C_ASSERT(FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader) == FIELD_OFFSET(IMAGE_NT_HEADERS64, OptionalHeader)); + +C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Magic)); +C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SectionAlignment)); +C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, FileAlignment)); +C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Subsystem)); +C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MinorSubsystemVersion)); +C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MajorSubsystemVersion)); +C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, AddressOfEntryPoint)); +C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfCode)); +C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfHeaders)); + /* References: [1] Microsoft Corporation, "Microsoft Portable Executable and Common Object @@ -178,7 +256,6 @@ ASSERT(Intsafe_CanOffsetPointer(FileHeader, FileHeaderSize)); - C_ASSERT(EXEFMT_LOAD_HEADER_SIZE >= sizeof(IMAGE_DOS_HEADER)); ASSERT(((UINT_PTR)FileHeader % TYPE_ALIGNMENT(IMAGE_DOS_HEADER)) == 0); #define DIE(ARGS_) { DPRINT ARGS_; goto l_Return; } @@ -219,11 +296,6 @@ pinhNtHeader = (PVOID)((UINT_PTR)FileHeader + pidhDosHeader->e_lfanew); } - C_ASSERT(sizeof(IMAGE_NT_HEADERS32) <= sizeof(IMAGE_NT_HEADERS64)); - C_ASSERT(TYPE_ALIGNMENT(IMAGE_NT_HEADERS32) == TYPE_ALIGNMENT(IMAGE_NT_HEADERS64)); - C_ASSERT(RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS32, FileHeader) == RTL_SIZEOF_THROUGH_FIELD(IMAGE_NT_HEADERS64, FileHeader)); - C_ASSERT(FIELD_OFFSET(IMAGE_NT_HEADERS32, OptionalHeader) == FIELD_OFFSET(IMAGE_NT_HEADERS64, OptionalHeader)); - /* * the buffer doesn't contain the NT file header, or the alignment is wrong: we * need to read the header from the file @@ -307,8 +379,6 @@ nStatus = STATUS_INVALID_IMAGE_FORMAT; - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Magic)); - if(!RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, Magic)) DIE(("The optional header doesn't contain the Magic field, SizeOfOptionalHeader is %X\n", cbOptHeaderSize)); @@ -323,9 +393,6 @@ default: DIE(("Unrecognized optional header, Magic is %X\n", piohOptHeader->Magic)); } - - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SectionAlignment)); - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, FileAlignment)); if (RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SectionAlignment) && RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, FileAlignment)) @@ -421,10 +488,6 @@ if((ULONG_PTR)ImageSectionObject->ImageBase % 0x10000) DIE(("ImageBase is not aligned on a 64KB boundary")); - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, Subsystem)); - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MinorSubsystemVersion)); - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, MajorSubsystemVersion)); - if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, Subsystem)) { ImageSectionObject->Subsystem = piohOptHeader->Subsystem; @@ -437,15 +500,11 @@ } } - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, AddressOfEntryPoint)); - if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, AddressOfEntryPoint)) { ImageSectionObject->EntryPoint = piohOptHeader->ImageBase + piohOptHeader->AddressOfEntryPoint; } - - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfCode)); if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfCode)) ImageSectionObject->Executable = piohOptHeader->SizeOfCode != 0; @@ -482,8 +541,6 @@ if(!Intsafe_AddULong32(&cbSectionHeadersOffsetSize, cbSectionHeadersOffset, cbSectionHeadersSize)) DIE(("Section headers too large\n")); - - C_ASSERT(PEFMT_FIELDS_EQUAL(IMAGE_OPTIONAL_HEADER32, IMAGE_OPTIONAL_HEADER64, SizeOfHeaders)); /* size of the executable's headers */ if(RTL_CONTAINS_FIELD(piohOptHeader, cbOptHeaderSize, SizeOfHeaders))

1 0

[sginsberg] 42215: - Fix a critical bug in ExAllocatePoolWithQuota spotted by msvc. Because of the current POOL_TAGGING mess in wdm.h, ExAllocatePoolWithQuotaTag is defined to ExAllocatePoolWithQuota, so when ExAllocatePoolWithQuota called the with-tag version, it ended up calling _itself_. Fix this by undefining the broken macro.
by sginsberg＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: sginsberg Date: Sat Jul 25 18:53:25 2009 New Revision: 42215 URL: http://svn.reactos.org/svn/reactos?rev=42215&view=rev Log: - Fix a critical bug in ExAllocatePoolWithQuota spotted by msvc. Because of the current POOL_TAGGING mess in wdm.h, ExAllocatePoolWithQuotaTag is defined to ExAllocatePoolWithQuota, so when ExAllocatePoolWithQuota called the with-tag version, it ended up calling _itself_. Fix this by undefining the broken macro. Modified: trunk/reactos/ntoskrnl/mm/pool.c Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=422… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Sat Jul 25 18:53:25 2009 @@ -164,6 +164,7 @@ * @implemented */ #undef ExAllocatePoolWithQuota +#undef ExAllocatePoolWithQuotaTag PVOID NTAPI ExAllocatePoolWithQuota (POOL_TYPE PoolType, ULONG NumberOfBytes) { @@ -201,7 +202,6 @@ /* * @implemented */ -#undef ExAllocatePoolWithQuotaTag PVOID NTAPI ExAllocatePoolWithQuotaTag (IN POOL_TYPE PoolType,

1 0

[dchapyshev] 42214: - Add stubs for AppCleanup and videoThunk32 - Partially implement capCreateCaptureWindowW and capGetDriverDescriptionW
by dchapyshev＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: dchapyshev Date: Sat Jul 25 17:57:18 2009 New Revision: 42214 URL: http://svn.reactos.org/svn/reactos?rev=42214&view=rev Log: - Add stubs for AppCleanup and videoThunk32 - Partially implement capCreateCaptureWindowW and capGetDriverDescriptionW Modified: trunk/reactos/dll/win32/avicap32/avicap32.c trunk/reactos/dll/win32/avicap32/avicap32.spec Modified: trunk/reactos/dll/win32/avicap32/avicap32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avicap32/avicap3… ============================================================================== --- trunk/reactos/dll/win32/avicap32/avicap32.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avicap32/avicap32.c [iso-8859-1] Sat Jul 25 17:57:18 2009 @@ -8,6 +8,7 @@ #include <windows.h> #include <winternl.h> #include <vfw.h> +#include <wchar.h> #include "wine/debug.h" @@ -16,8 +17,35 @@ WINE_DEFAULT_DEBUG_CHANNEL(avicap32); -/* - * unimplemented +HINSTANCE hInstance; + + +/* INTRENAL FUNCTIONS **************************************************/ + +LRESULT +CALLBACK +CaptureWindowProc(HWND hwnd, UINT Msg, WPARAM wParam, LPARAM lParam) +{ + switch (Msg) + { + case WM_CREATE: + break; + + case WM_PAINT: + break; + + case WM_DESTROY: + break; + } + + return DefWindowProc(hwnd, Msg, wParam, lParam); +} + + +/* FUNCTIONS ***********************************************************/ + +/* + * implemented */ HWND VFWAPI @@ -30,8 +58,37 @@ HWND hWnd, INT nID) { - UNIMPLEMENTED; - return NULL; + WCHAR szWindowClass[] = L"ClsCapWin"; + WNDCLASSEXW WndClass = {0}; + DWORD dwExStyle = 0; + + FIXME("capCreateCaptureWindowW() not fully implemented!\n"); + + WndClass.cbSize = sizeof(WNDCLASSEXW); + WndClass.lpszClassName = szWindowClass; + WndClass.lpfnWndProc = CaptureWindowProc; /* TODO: Implement CaptureWindowProc */ + WndClass.hInstance = hInstance; + WndClass.style = CS_HREDRAW | CS_VREDRAW; + WndClass.hCursor = LoadCursorW(0, IDC_ARROW); + WndClass.hbrBackground = (HBRUSH)(COLOR_BTNFACE + 1); + + if (RegisterClassExW(&WndClass) == (ATOM)0) + { + if (GetLastError() != ERROR_ALREADY_EXISTS) + return NULL; + } + + return CreateWindowExW(dwExStyle, + szWindowClass, + lpszWindowName, + dwStyle, + x, y, + nWidth, + nHeight, + hWnd, + (HMENU)nID, + hInstance, + NULL); } /* @@ -70,7 +127,7 @@ /* - * unimplemented + * implemented */ BOOL VFWAPI @@ -80,7 +137,112 @@ LPWSTR lpszVer, INT cbVer) { - UNIMPLEMENTED; + DWORD dwSize, dwIndex = 0; + WCHAR szDriver[MAX_PATH]; + WCHAR szDriverName[MAX_PATH]; + WCHAR szFileName[MAX_PATH]; + WCHAR szVersion[MAX_PATH]; + HKEY hKey, hSubKey; + + /* TODO: Add support of data acquisition from system.ini */ + FIXME("capGetDriverDescriptionW() not fully implemented!\n"); + + if (lpszName && cbName) + lpszName[0] = L'\0'; + + if (lpszVer && cbVer) + lpszVer[0] = L'\0'; + + if (RegOpenKeyExW(HKEY_LOCAL_MACHINE, + L"SYSTEM\\CurrentControlSet\\Control\\MediaResources\\msvideo", + 0, + KEY_READ, + &hKey) != ERROR_SUCCESS) + { + return FALSE; + } + + dwSize = sizeof(szDriver) / sizeof(WCHAR); + + while (RegEnumKeyExW(hKey, dwIndex, + szDriver, &dwSize, + NULL, NULL, + NULL, NULL) == ERROR_SUCCESS) + { + if (RegOpenKeyW(hKey, szDriver, &hSubKey) == ERROR_SUCCESS) + { + dwSize = sizeof(szFileName) / sizeof(WCHAR); + + if (RegQueryValueExW(hSubKey, + L"Driver", + NULL, + NULL, + (LPBYTE)&szFileName, + &dwSize) == ERROR_SUCCESS) + { + dwSize = sizeof(szDriverName) / sizeof(WCHAR); + + if (RegQueryValueExW(hSubKey, + L"FriendlyName", + NULL, + NULL, + (LPBYTE)&szDriverName, + &dwSize) != ERROR_SUCCESS) + { + wcscpy(szDriverName, L"Unknown Driver Name"); + } + + if (dwIndex == (DWORD)wDriverIndex) + { + if (lpszName && cbName) + { + lstrcpynW(lpszName, szDriverName, cbName); + } + + if (lpszVer && cbVer) + { + LPVOID Version, Ms; + DWORD dwInfoSize; + VS_FIXEDFILEINFO FileInfo; + UINT Ls; + + dwInfoSize = GetFileVersionInfoSize(szFileName, NULL); + if (dwInfoSize) + { + Version = HeapAlloc(GetProcessHeap(), 0, dwInfoSize); + + GetFileVersionInfo(szFileName, 0, dwInfoSize, Version); + + if (VerQueryValueW(Version, L"\\", &Ms, &Ls)) + { + memmove(&FileInfo, Ms, Ls); + swprintf(szVersion, L"Version: %d.%d.%d.%d", + HIWORD(FileInfo.dwFileVersionMS), + LOWORD(FileInfo.dwFileVersionMS), + HIWORD(FileInfo.dwFileVersionLS), + LOWORD(FileInfo.dwFileVersionLS)); + + lstrcpynW(lpszVer, szVersion, cbVer); + } + HeapFree(GetProcessHeap(), 0, Version); + } + } + + RegCloseKey(hSubKey); + RegCloseKey(hKey); + return TRUE; + } + } + + RegCloseKey(hSubKey); + } + + dwSize = sizeof(szDriver) / sizeof(WCHAR); + dwIndex++; + } + + RegCloseKey(hKey); + return FALSE; } @@ -110,6 +272,29 @@ } +/* + * unimplemented + */ +VOID +VFWAPI +AppCleanup(HINSTANCE hInst) +{ + UNIMPLEMENTED; +} + + +/* + * unimplemented + */ +DWORD +VFWAPI +videoThunk32(DWORD dwUnknown1, DWORD dwUnknown2, DWORD dwUnknown3, DWORD dwUnknown4, DWORD dwUnknown5) +{ + UNIMPLEMENTED; + return 0; +} + + BOOL WINAPI DllMain(IN HINSTANCE hinstDLL, @@ -119,6 +304,8 @@ switch (dwReason) { case DLL_PROCESS_ATTACH: + TRACE("avicap32 attached!\n"); + hInstance = hinstDLL; break; } Modified: trunk/reactos/dll/win32/avicap32/avicap32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/avicap32/avicap3… ============================================================================== --- trunk/reactos/dll/win32/avicap32/avicap32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/avicap32/avicap32.spec [iso-8859-1] Sat Jul 25 17:57:18 2009 @@ -1,6 +1,6 @@ -@ stub AppCleanup -@ stdcall capCreateCaptureWindowA(str long long long long long long long) +@ stdcall AppCleanup(ptr) +@ stdcall capCreateCaptureWindowA(str long long long long long long long) @ stdcall capCreateCaptureWindowW(wstr long long long long long long long) @ stdcall capGetDriverDescriptionA(long ptr long ptr long) @ stdcall capGetDriverDescriptionW(long ptr long ptr long) -@ stub videoThunk32 +@ stdcall videoThunk32(long long long long long)

1 0

[sginsberg] 42213: - Fix incorrect definition of ZwCreateDebugObject after revision 41969 -- spotted by BugBoy
by sginsberg＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: sginsberg Date: Sat Jul 25 17:31:57 2009 New Revision: 42213 URL: http://svn.reactos.org/svn/reactos?rev=42213&view=rev Log: - Fix incorrect definition of ZwCreateDebugObject after revision 41969 -- spotted by BugBoy Modified: trunk/reactos/include/ndk/dbgkfuncs.h Modified: trunk/reactos/include/ndk/dbgkfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/dbgkfuncs.h?re… ============================================================================== --- trunk/reactos/include/ndk/dbgkfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/dbgkfuncs.h [iso-8859-1] Sat Jul 25 17:31:57 2009 @@ -99,7 +99,7 @@ OUT PHANDLE DebugHandle, IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes, - IN BOOLEAN KillProcessOnExit + IN ULONG Flags ); NTSYSAPI

1 0

[sginsberg] 42212: - Leftover 2 from 42210
by sginsberg＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: sginsberg Date: Sat Jul 25 16:55:52 2009 New Revision: 42212 URL: http://svn.reactos.org/svn/reactos?rev=42212&view=rev Log: - Leftover 2 from 42210 Modified: trunk/reactos/lib/drivers/ip/transport/tcp/if.c trunk/reactos/lib/drivers/ip/transport/udp/udp.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/if.c [iso-8859-1] Sat Jul 25 16:55:52 2009 @@ -33,14 +33,16 @@ POSK_IFADDR TCPGetInterfaceData( PIP_INTERFACE IF ) { NTSTATUS Status; POSK_IFADDR ifaddr = IF->TCPContext; + struct sockaddr_in *addr_in; + struct sockaddr_in *dstaddr_in; ASSERT(ifaddr); ASSERT_LOCKED(&TCPLock); RtlZeroMemory(ifaddr, sizeof(OSK_IFADDR) + 2 * sizeof( struct sockaddr_in )); - struct sockaddr_in *addr_in = (struct sockaddr_in *)&ifaddr[1]; - struct sockaddr_in *dstaddr_in = (struct sockaddr_in *)&addr_in[1]; + addr_in = (struct sockaddr_in *)&ifaddr[1]; + dstaddr_in = (struct sockaddr_in *)&addr_in[1]; TI_DbgPrint(DEBUG_TCPIF,("Called\n")); Modified: trunk/reactos/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/u… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Sat Jul 25 16:55:52 2009 @@ -312,12 +312,12 @@ * Status of operation */ { + NTSTATUS Status; + #ifdef __NTDRIVER__ RtlZeroMemory(&UDPStats, sizeof(UDP_STATISTICS)); #endif - NTSTATUS Status; - Status = PortsStartup( &UDPPorts, 1, UDP_STARTING_PORT + UDP_DYNAMIC_PORTS ); if( !NT_SUCCESS(Status) ) return Status;

1 0

[sginsberg] 42211: - Leftover from previous commit
by sginsberg＠svn.reactos.org 25 Jul '09

25 Jul '09

Author: sginsberg Date: Sat Jul 25 16:54:31 2009 New Revision: 42211 URL: http://svn.reactos.org/svn/reactos?rev=42211&view=rev Log: - Leftover from previous commit Modified: trunk/reactos/include/ddk/ndis.h Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=422… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Sat Jul 25 16:54:31 2009 @@ -1540,7 +1540,7 @@ } NDIS_PROTOCOL_CHARACTERISTICS, *PNDIS_PROTOCOL_CHARACTERISTICS; #elif defined(NDIS40) typedef struct _NDIS_PROTOCOL_CHARACTERISTICS { - NDIS40_PROTOCOL_CHARACTERISTICS_S; + NDIS40_PROTOCOL_CHARACTERISTICS_S } NDIS_PROTOCOL_CHARACTERISTICS, *PNDIS_PROTOCOL_CHARACTERISTICS; #else /* NDIS30 */ typedef struct _NDIS_PROTOCOL_CHARACTERISTICS {

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
61
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 2009