Ros-diffs May 2010

ros-diffs@reactos.org

21 participants
438 discussions

[sir_richard] 47175: [NTOS]: Fix 4MB assumptions and use PDE_MAPPED_VA instead, which accurately describes the address space mapped by a PDE (which is different on PAE, x64, ARM, etc).

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed May 12 20:42:05 2010 New Revision: 47175 URL: http://svn.reactos.org/svn/reactos?rev=47175&view=rev Log: [NTOS]: Fix 4MB assumptions and use PDE_MAPPED_VA instead, which accurately describes the address space mapped by a PDE (which is different on PAE, x64, ARM, etc). Modified: trunk/reactos/ntoskrnl/mm/ARM3/i386/init.c trunk/reactos/ntoskrnl/mm/ARM3/mminit.c 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] Wed May 12 20:42:05 2010 @@ -339,7 +339,7 @@ MmNonPagedSystemStart = (PVOID)((ULONG_PTR)MmNonPagedPoolStart - (MmNumberOfSystemPtes + 1) * PAGE_SIZE); MmNonPagedSystemStart = (PVOID)((ULONG_PTR)MmNonPagedSystemStart & - ~((4 * 1024 * 1024) - 1)); + ~(PDE_MAPPED_VA - 1)); // // Don't let it go below the minimum @@ -387,7 +387,7 @@ // MmPfnDatabase[0] = (PVOID)0xB0000000; MmPfnDatabase[1] = &MmPfnDatabase[0][MmHighestPhysicalPage]; - ASSERT(((ULONG_PTR)MmPfnDatabase[0] & ((4 * 1024 * 1024) - 1)) == 0); + ASSERT(((ULONG_PTR)MmPfnDatabase[0] & (PDE_MAPPED_VA - 1)) == 0); // // Non paged pool comes after the PFN database Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Wed May 12 20:42:05 2010 @@ -1725,8 +1725,8 @@ // MmBootImageSize = KeLoaderBlock->Extension->LoaderPagesSpanned; MmBootImageSize *= PAGE_SIZE; - MmBootImageSize = (MmBootImageSize + (4 * 1024 * 1024) - 1) & ~((4 * 1024 * 1024) - 1); - ASSERT((MmBootImageSize % (4 * 1024 * 1024)) == 0); + MmBootImageSize = (MmBootImageSize + PDE_MAPPED_VA - 1) & ~(PDE_MAPPED_VA - 1); + ASSERT((MmBootImageSize % PDE_MAPPED_VA) == 0); // // Set the size of session view, pool, and image

14 years, 4 months

[sir_richard] 47174: [NTOS]: User pages are not used until Phase 1, they should not be setup in Phase 0. Fixes premature initalization.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed May 12 20:39:09 2010 New Revision: 47174 URL: http://svn.reactos.org/svn/reactos?rev=47174&view=rev Log: [NTOS]: User pages are not used until Phase 1, they should not be setup in Phase 0. Fixes premature initalization. Modified: trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Wed May 12 20:39:09 2010 @@ -400,13 +400,11 @@ /* Initialize the loaded module list */ MiInitializeLoadedModuleList(LoaderBlock); - - /* Initialize working sets */ - MiInitializeUserPfnBitmap(); - MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); } else if (Phase == 1) { + MiInitializeUserPfnBitmap(); + MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); MmInitializeRmapList(); MmInitializePageOp(); MmInitSectionImplementation();

14 years, 4 months

[sir_richard] 47173: [NTOS]: Compute MiHighestUserPte, MiHighestUserPde, MiSessionImagePteStart, MiSessionImagePteEnd, MiSessionBasePte, MiSessionLastPte since these internal variables did not exit yet. Useful for debugging and also future PFN support. Just computes some values, no behavior changes.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed May 12 20:36:15 2010 New Revision: 47173 URL: http://svn.reactos.org/svn/reactos?rev=47173&view=rev Log: [NTOS]: Compute MiHighestUserPte, MiHighestUserPde, MiSessionImagePteStart, MiSessionImagePteEnd, MiSessionBasePte, MiSessionLastPte since these internal variables did not exit yet. Useful for debugging and also future PFN support. Just computes some values, no behavior changes. Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Wed May 12 20:36:15 2010 @@ -136,6 +136,14 @@ ULONG MmSessionPoolSize; ULONG MmSessionImageSize; +/* + * These are the PTE addresses of the boundaries carved out above + */ +PMMPTE MiSessionImagePteStart; +PMMPTE MiSessionImagePteEnd; +PMMPTE MiSessionBasePte; +PMMPTE MiSessionLastPte; + // // The system view space, on the other hand, is where sections that are memory // mapped into "system space" end up. @@ -217,6 +225,11 @@ PVOID MmHighestUserAddress; PVOID MmSystemRangeStart; +/* And these store the respective highest PTE/PDE address */ +PMMPTE MiHighestUserPte; +PMMPDE MiHighestUserPde; + +/* These variables define the system cache address space */ PVOID MmSystemCacheStart; PVOID MmSystemCacheEnd; MMSUPPORT MmSystemCacheWs; @@ -1700,6 +1713,10 @@ MmUserProbeAddress = (ULONG_PTR)MmSystemRangeStart - 0x10000; MmHighestUserAddress = (PVOID)(MmUserProbeAddress - 1); + /* Highest PTE and PDE based on the addresses above */ + MiHighestUserPte = MiAddressToPte(MmHighestUserAddress); + MiHighestUserPde = MiAddressToPde(MmHighestUserAddress); + // // Get the size of the boot loader's image allocations and then round // that region up to a PDE size, so that any PDEs we might create for @@ -1772,7 +1789,12 @@ // MiSystemViewStart = (PVOID)((ULONG_PTR)MmSessionBase - MmSystemViewSize); - + + /* Compute the PTE addresses for all the addresses we carved out */ + MiSessionImagePteStart = MiAddressToPte(MiSessionImageStart); + MiSessionImagePteEnd = MiAddressToPte(MiSessionImageEnd); + MiSessionBasePte = MiAddressToPte(MmSessionBase); + MiSessionLastPte = MiAddressToPte(MiSessionSpaceEnd); /* Initialize the user mode image list */ InitializeListHead(&MmLoadedUserImageList);

14 years, 4 months

[sir_richard] 47172: [NTOS]: MmSystemPageDirectory is an array of page directories, not just a value. On x86 there's just one page directory, but that's not the case on other architectures/PAE, so fix this bug.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Wed May 12 20:33:18 2010 New Revision: 47172 URL: http://svn.reactos.org/svn/reactos?rev=47172&view=rev Log: [NTOS]: MmSystemPageDirectory is an array of page directories, not just a value. On x86 there's just one page directory, but that's not the case on other architectures/PAE, so fix this bug. Modified: trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c trunk/reactos/ntoskrnl/mm/ARM3/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/arm/init.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/arm/init.c [iso-8859-1] Wed May 12 20:33:18 2010 @@ -41,7 +41,7 @@ ULONG MmSessionImageSize; PVOID MiSystemViewStart; ULONG MmSystemViewSize; -PFN_NUMBER MmSystemPageDirectory; +PFN_NUMBER MmSystemPageDirectory[PD_COUNT]; PMMPTE MmSystemPagePtes; ULONG MmNumberOfSystemPtes; ULONG MxPfnAllocation; Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Wed May 12 20:33:18 2010 @@ -151,7 +151,7 @@ // map paged pool PDEs into external processes when they fault on a paged pool // address. // -PFN_NUMBER MmSystemPageDirectory; +PFN_NUMBER MmSystemPageDirectory[PD_COUNT]; PMMPTE MmSystemPagePtes; // @@ -1483,7 +1483,8 @@ // Get the page frame number for the system page directory // PointerPte = MiAddressToPte(PDE_BASE); - MmSystemPageDirectory = PFN_FROM_PTE(PointerPte); + ASSERT(PD_COUNT == 1); + MmSystemPageDirectory[0] = PFN_FROM_PTE(PointerPte); // // Allocate a system PTE which will hold a copy of the page directory @@ -1500,7 +1501,8 @@ // way). // TempPte = ValidKernelPte; - TempPte.u.Hard.PageFrameNumber = MmSystemPageDirectory; + ASSERT(PD_COUNT == 1); + TempPte.u.Hard.PageFrameNumber = MmSystemPageDirectory[0]; ASSERT(PointerPte->u.Hard.Valid == 0); ASSERT(TempPte.u.Hard.Valid == 1); *PointerPte = TempPte;

14 years, 4 months

[akhaldi] 47171: [KDCOM] - Include ntifs.h instead of ntddk.h (and don't include both at the same time).

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed May 12 20:19:05 2010 New Revision: 47171 URL: http://svn.reactos.org/svn/reactos?rev=47171&view=rev Log: [KDCOM] - Include ntifs.h instead of ntddk.h (and don't include both at the same time). Modified: branches/header-work/drivers/base/kdcom/arm/kdbg.c branches/header-work/drivers/base/kdcom/i386/kdbg.c Modified: branches/header-work/drivers/base/kdcom/arm/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/base/kdcom/… ============================================================================== --- branches/header-work/drivers/base/kdcom/arm/kdbg.c [iso-8859-1] (original) +++ branches/header-work/drivers/base/kdcom/arm/kdbg.c [iso-8859-1] Wed May 12 20:19:05 2010 @@ -9,7 +9,7 @@ /* INCLUDES *******************************************************************/ #define NOEXTAPI -#include <ntddk.h> +#include <ntifs.h> #define NDEBUG #include <halfuncs.h> #include <stdio.h> Modified: branches/header-work/drivers/base/kdcom/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/base/kdcom/… ============================================================================== --- branches/header-work/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] (original) +++ branches/header-work/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] Wed May 12 20:19:05 2010 @@ -10,7 +10,6 @@ /* INCLUDES *****************************************************************/ #define NOEXTAPI -#include <ntddk.h> #include <ntifs.h> #define NDEBUG #include <halfuncs.h>

14 years, 4 months

[akhaldi] 47170: [XDK] - Remove RESULT_NEGATIVE, RESULT_ZERO and RESULT_POSITIVE from amd64/ke.h - INTERLOCKED_RESULT isn't x86 only. [DDK] - Update wdm.h and ntddk.h to reflect the XDK changes.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed May 12 15:02:44 2010 New Revision: 47170 URL: http://svn.reactos.org/svn/reactos?rev=47170&view=rev Log: [XDK] - Remove RESULT_NEGATIVE, RESULT_ZERO and RESULT_POSITIVE from amd64/ke.h - INTERLOCKED_RESULT isn't x86 only. [DDK] - Update wdm.h and ntddk.h to reflect the XDK changes. Modified: branches/header-work/include/ddk/ntddk.h branches/header-work/include/ddk/wdm.h branches/header-work/include/reactos/arm/armddk.h branches/header-work/include/xdk/amd64/ke.h branches/header-work/include/xdk/exfuncs.h Modified: branches/header-work/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ntddk.h… ============================================================================== --- branches/header-work/include/ddk/ntddk.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ntddk.h [iso-8859-1] Wed May 12 15:02:44 2010 @@ -3283,14 +3283,14 @@ #define ExIsResourceAcquired ExIsResourceAcquiredSharedLite #define ExReleaseResourceForThread ExReleaseResourceForThreadLite -#ifdef _X86_ - typedef enum _INTERLOCKED_RESULT { ResultNegative = RESULT_NEGATIVE, ResultZero = RESULT_ZERO, ResultPositive = RESULT_POSITIVE } INTERLOCKED_RESULT; +#ifdef _X86_ + NTKERNELAPI INTERLOCKED_RESULT FASTCALL @@ -3309,6 +3309,7 @@ Exfi386InterlockedExchangeUlong( IN PULONG Target, IN ULONG Value); + #endif Modified: branches/header-work/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/wdm.h?r… ============================================================================== --- branches/header-work/include/ddk/wdm.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/wdm.h [iso-8859-1] Wed May 12 15:02:44 2010 @@ -7844,11 +7844,6 @@ #define EFLAG_ZERO 0x4000 #define EFLAG_SELECT (EFLAG_SIGN | EFLAG_ZERO) -#define RESULT_NEGATIVE ((EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT) -#define RESULT_ZERO ((~EFLAG_SIGN & EFLAG_ZERO) & EFLAG_SELECT) -#define RESULT_POSITIVE ((~EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT) - - typedef struct _KFLOATING_SAVE { ULONG Dummy; } KFLOATING_SAVE, *PKFLOATING_SAVE; Modified: branches/header-work/include/reactos/arm/armddk.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/reactos/arm… ============================================================================== --- branches/header-work/include/reactos/arm/armddk.h [iso-8859-1] (original) +++ branches/header-work/include/reactos/arm/armddk.h [iso-8859-1] Wed May 12 15:02:44 2010 @@ -185,7 +185,7 @@ } NTSYSAPI -PKTHREAD +struct _KTHREAD* NTAPI KeGetCurrentThread(VOID); Modified: branches/header-work/include/xdk/amd64/ke.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/amd64/k… ============================================================================== --- branches/header-work/include/xdk/amd64/ke.h [iso-8859-1] (original) +++ branches/header-work/include/xdk/amd64/ke.h [iso-8859-1] Wed May 12 15:02:44 2010 @@ -26,11 +26,6 @@ #define EFLAG_SIGN 0x8000 #define EFLAG_ZERO 0x4000 #define EFLAG_SELECT (EFLAG_SIGN | EFLAG_ZERO) - -#define RESULT_NEGATIVE ((EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT) -#define RESULT_ZERO ((~EFLAG_SIGN & EFLAG_ZERO) & EFLAG_SELECT) -#define RESULT_POSITIVE ((~EFLAG_SIGN & ~EFLAG_ZERO) & EFLAG_SELECT) - typedef struct _KFLOATING_SAVE { ULONG Dummy; Modified: branches/header-work/include/xdk/exfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/xdk/exfuncs… ============================================================================== --- branches/header-work/include/xdk/exfuncs.h [iso-8859-1] (original) +++ branches/header-work/include/xdk/exfuncs.h [iso-8859-1] Wed May 12 15:02:44 2010 @@ -299,13 +299,13 @@ #define ExIsResourceAcquired ExIsResourceAcquiredSharedLite #define ExReleaseResourceForThread ExReleaseResourceForThreadLite -#ifdef _X86_ - typedef enum _INTERLOCKED_RESULT { ResultNegative = RESULT_NEGATIVE, ResultZero = RESULT_ZERO, ResultPositive = RESULT_POSITIVE } INTERLOCKED_RESULT; + +#ifdef _X86_ NTKERNELAPI INTERLOCKED_RESULT

14 years, 4 months

[fireball] 47169: [HALX86] - Revert changes to HalpGetPCIData made in r47162. There is no need to introduce ReactOS-specific behavior of this function. It's much better to aim real NT compatibility, and develop your drivers against NT first and only then hack ReactOS. - Changes to buses scanning are left as they are.

by fireball＠svn.reactos.org

Author: fireball Date: Wed May 12 11:45:43 2010 New Revision: 47169 URL: http://svn.reactos.org/svn/reactos?rev=47169&view=rev Log: [HALX86] - Revert changes to HalpGetPCIData made in r47162. There is no need to introduce ReactOS-specific behavior of this function. It's much better to aim real NT compatibility, and develop your drivers against NT first and only then hack ReactOS. - Changes to buses scanning are left as they are. Modified: trunk/reactos/hal/halx86/generic/bus/pcibus.c Modified: trunk/reactos/hal/halx86/generic/bus/pcibus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bus/pci… ============================================================================== --- trunk/reactos/hal/halx86/generic/bus/pcibus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bus/pcibus.c [iso-8859-1] Wed May 12 11:45:43 2010 @@ -369,10 +369,6 @@ } #endif - /* Make sure the bus number is in our range of good bus numbers */ - if (BusHandler->BusNumber > HalpMaxPciBus || BusHandler->BusNumber < HalpMinPciBus) - return 0; - /* Normalize the length */ if (Length > sizeof(PCI_COMMON_CONFIG)) Length = sizeof(PCI_COMMON_CONFIG); @@ -394,15 +390,9 @@ /* Validate the vendor ID */ if (PciConfig->VendorID == PCI_INVALID_VENDORID) { - /* It's invalid, but we can copy PCI_INVALID_VENDORID */ - if (Offset == 0 && Length >= sizeof(USHORT)) - { - *(PUSHORT)Buffer = PCI_INVALID_VENDORID; - return sizeof(USHORT); - } - - /* We can't copy PCI_INVALID_VENDORID so just return 0 */ - return 0; + /* It's invalid, but we want to return this much */ + PciConfig->VendorID = PCI_INVALID_VENDORID; + Len = sizeof(USHORT); } /* Now check if there's space left */ @@ -464,10 +454,6 @@ return 0; } #endif - - /* Make sure this bus number is in our range of good bus numbers */ - if (BusHandler->BusNumber > HalpMaxPciBus || BusHandler->BusNumber < HalpMinPciBus) - return 0; /* Normalize the length */ if (Length > sizeof(PCI_COMMON_CONFIG)) Length = sizeof(PCI_COMMON_CONFIG);

14 years, 4 months

[fireball] 47168: [USBDRIVER] - Implement deregistering HCD in a device manager. Now, the HCI which failed to initialize will be properly freed without calling NULL pointer or crashing with freed memory access. See issue #4813 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Wed May 12 11:42:07 2010 New Revision: 47168 URL: http://svn.reactos.org/svn/reactos?rev=47168&view=rev Log: [USBDRIVER] - Implement deregistering HCD in a device manager. Now, the HCI which failed to initialize will be properly freed without calling NULL pointer or crashing with freed memory access. See issue #4813 for more details. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.c [iso-8859-1] Wed May 12 11:42:07 2010 @@ -1457,6 +1457,20 @@ return dev_mgr->hcd_count - 1; } +VOID +dev_mgr_deregister_hcd(PUSB_DEV_MANAGER dev_mgr, UCHAR hcd_id) +{ + UCHAR i; + + if (dev_mgr == NULL || hcd_id >= MAX_HCDS - 1) + return; + + for (i = hcd_id; i < dev_mgr->hcd_count - 1; i++) + dev_mgr->hcd_array[i] = dev_mgr->hcd_array[i + 1]; + + dev_mgr->hcd_count--; +} + BOOLEAN dev_mgr_register_irp(PUSB_DEV_MANAGER dev_mgr, PIRP pirp, PURB purb) { Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/devmgr.h [iso-8859-1] Wed May 12 11:42:07 2010 @@ -206,6 +206,12 @@ dev_mgr_register_hcd( PUSB_DEV_MANAGER dev_mgr, PHCD hcd +); + +VOID +dev_mgr_deregister_hcd( +PUSB_DEV_MANAGER dev_mgr, +UCHAR hcd_id ); NTSTATUS Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] Wed May 12 11:42:07 2010 @@ -271,7 +271,7 @@ BOOLEAN ehci_init_schedule(PEHCI_DEV ehci, PADAPTER_OBJECT padapter); -BOOLEAN ehci_release(PDEVICE_OBJECT pdev); +BOOLEAN ehci_release(PDEVICE_OBJECT pdev, PUSB_DEV_MANAGER dev_mgr); static VOID ehci_stop(PEHCI_DEV ehci); @@ -313,7 +313,7 @@ PDEVICE_OBJECT ehci_create_device(PDRIVER_OBJECT drvr_obj, PUSB_DEV_MANAGER dev_mgr); -BOOLEAN ehci_delete_device(PDEVICE_OBJECT pdev); +BOOLEAN ehci_delete_device(PDEVICE_OBJECT pdev, PUSB_DEV_MANAGER dev_mgr); VOID ehci_get_capabilities(PEHCI_DEV ehci, PBYTE base); @@ -3366,7 +3366,7 @@ ehci = ehci_from_hcd(hcd); pdev_ext = ehci->pdev_ext; - return ehci_release(pdev_ext->pdev_obj); + return ehci_release(pdev_ext->pdev_obj, hcd->dev_mgr); } NTSTATUS @@ -3565,7 +3565,7 @@ if (pdev_ext->padapter == NULL) { //fatal error - ehci_delete_device(pdev); + ehci_delete_device(pdev, dev_mgr); return NULL; } @@ -3584,7 +3584,7 @@ DbgPrint("ehci_alloc(): error assign slot res, 0x%x\n", status); release_adapter(pdev_ext->padapter); pdev_ext->padapter = NULL; - ehci_delete_device(pdev); + ehci_delete_device(pdev, dev_mgr); return NULL; } @@ -3619,7 +3619,7 @@ DbgPrint("ehci_alloc(): error, can not translate bus address\n"); release_adapter(pdev_ext->padapter); pdev_ext->padapter = NULL; - ehci_delete_device(pdev); + ehci_delete_device(pdev, dev_mgr); return NULL; } @@ -3638,7 +3638,7 @@ { release_adapter(pdev_ext->padapter); pdev_ext->padapter = NULL; - ehci_delete_device(pdev); + ehci_delete_device(pdev, dev_mgr); return NULL; } } @@ -3663,7 +3663,7 @@ { release_adapter(pdev_ext->padapter); pdev_ext->padapter = NULL; - ehci_delete_device(pdev); + ehci_delete_device(pdev, dev_mgr); return NULL; } @@ -3692,7 +3692,7 @@ affinity, FALSE) //No float save != STATUS_SUCCESS) { - ehci_release(pdev); + ehci_release(pdev, dev_mgr); return NULL; } @@ -4017,7 +4017,7 @@ } BOOLEAN -ehci_delete_device(PDEVICE_OBJECT pdev) +ehci_delete_device(PDEVICE_OBJECT pdev, PUSB_DEV_MANAGER dev_mgr) { STRING string; UNICODE_STRING symb_name; @@ -4036,6 +4036,8 @@ RtlAnsiStringToUnicodeString(&symb_name, &string, TRUE); IoDeleteSymbolicLink(&symb_name); RtlFreeUnicodeString(&symb_name); + + dev_mgr_deregister_hcd(dev_mgr, pdev_ext->ehci->hcd_interf.hcd_get_id(&pdev_ext->ehci->hcd_interf)); if (pdev_ext->res_list) ExFreePool(pdev_ext->res_list); // not allocated by usb_alloc_mem @@ -4062,7 +4064,7 @@ } BOOLEAN -ehci_release(PDEVICE_OBJECT pdev) +ehci_release(PDEVICE_OBJECT pdev, PUSB_DEV_MANAGER dev_mgr) { PEHCI_DEVICE_EXTENSION pdev_ext; PEHCI_DEV ehci; @@ -4095,7 +4097,7 @@ release_adapter(pdev_ext->padapter); pdev_ext->padapter = NULL; - ehci_delete_device(pdev); + ehci_delete_device(pdev, dev_mgr); return FALSE; Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] Wed May 12 11:42:07 2010 @@ -102,7 +102,7 @@ BOOLEAN uhci_init_schedule(PUHCI_DEV uhci, PADAPTER_OBJECT padapter); -BOOLEAN uhci_release(PDEVICE_OBJECT pdev); +BOOLEAN uhci_release(PDEVICE_OBJECT pdev, PUSB_DEV_MANAGER dev_mgr); static VOID uhci_stop(PUHCI_DEV uhci); @@ -465,7 +465,7 @@ } BOOLEAN -uhci_delete_device(PDEVICE_OBJECT pdev) +uhci_delete_device(PDEVICE_OBJECT pdev, PUSB_DEV_MANAGER dev_mgr) { STRING string; UNICODE_STRING symb_name; @@ -484,6 +484,8 @@ RtlAnsiStringToUnicodeString(&symb_name, &string, TRUE); IoDeleteSymbolicLink(&symb_name); RtlFreeUnicodeString(&symb_name); + + dev_mgr_deregister_hcd(dev_mgr, pdev_ext->uhci->hcd_interf.hcd_get_id(&pdev_ext->uhci->hcd_interf)); if (pdev_ext->res_list) ExFreePool(pdev_ext->res_list); // not allocated by usb_alloc_mem @@ -723,7 +725,7 @@ if (pdev_ext->padapter == NULL) { //fatal error - uhci_delete_device(pdev); + uhci_delete_device(pdev, dev_mgr); return NULL; } @@ -742,7 +744,7 @@ DbgPrint("uhci_alloc(): error assign slot res, 0x%x\n", status); release_adapter(pdev_ext->padapter); pdev_ext->padapter = NULL; - uhci_delete_device(pdev); + uhci_delete_device(pdev, dev_mgr); return NULL; } @@ -772,7 +774,7 @@ DbgPrint("uhci_alloc(): error, can not translate bus address\n"); release_adapter(pdev_ext->padapter); pdev_ext->padapter = NULL; - uhci_delete_device(pdev); + uhci_delete_device(pdev, dev_mgr); return NULL; } @@ -791,7 +793,7 @@ { release_adapter(pdev_ext->padapter); pdev_ext->padapter = NULL; - uhci_delete_device(pdev); + uhci_delete_device(pdev, dev_mgr); return NULL; } } @@ -810,7 +812,7 @@ { release_adapter(pdev_ext->padapter); pdev_ext->padapter = NULL; - uhci_delete_device(pdev); + uhci_delete_device(pdev, dev_mgr); return NULL; } @@ -848,7 +850,7 @@ FALSE) //No float save != STATUS_SUCCESS) { - uhci_release(pdev); + uhci_release(pdev, dev_mgr); return NULL; } @@ -856,7 +858,7 @@ } BOOLEAN -uhci_release(PDEVICE_OBJECT pdev) +uhci_release(PDEVICE_OBJECT pdev, PUSB_DEV_MANAGER dev_mgr) { PDEVICE_EXTENSION pdev_ext; PUHCI_DEV uhci; @@ -892,7 +894,7 @@ release_adapter(pdev_ext->padapter); pdev_ext->padapter = NULL; - uhci_delete_device(pdev); + uhci_delete_device(pdev, dev_mgr); return FALSE; @@ -3671,7 +3673,7 @@ uhci = uhci_from_hcd(hcd); pdev_ext = uhci->pdev_ext; - return uhci_release(pdev_ext->pdev_obj); + return uhci_release(pdev_ext->pdev_obj, hcd->dev_mgr); } NTSTATUS

14 years, 4 months

[fireball] 47167: - Revert 47139 by cgutman: Don't try to be smarter than usbdriver's author. He especially put registering HCD interface before so that any error handling function would work correctly and free up allocated resources. Fixes one crash in VMWare. A proper solution for the problem which 47139 tried to "fix" will be committed next.

by fireball＠svn.reactos.org

Author: fireball Date: Wed May 12 11:34:36 2010 New Revision: 47167 URL: http://svn.reactos.org/svn/reactos?rev=47167&view=rev Log: - Revert 47139 by cgutman: Don't try to be smarter than usbdriver's author. He especially put registering HCD interface before so that any error handling function would work correctly and free up allocated resources. Fixes one crash in VMWare. A proper solution for the problem which 47139 tried to "fix" will be committed next. Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/ehci.c [iso-8859-1] Wed May 12 11:34:36 2010 @@ -3530,7 +3530,6 @@ CM_PARTIAL_RESOURCE_DESCRIPTOR *pprd; PCI_SLOT_NUMBER slot_num; NTSTATUS status; - UCHAR hcd_id; pdev = ehci_create_device(drvr_obj, dev_mgr); @@ -3697,13 +3696,6 @@ return NULL; } - //register with dev_mgr - ehci_init_hcd_interface(pdev_ext->ehci); - hcd_id = dev_mgr_register_hcd(dev_mgr, &pdev_ext->ehci->hcd_interf); - - pdev_ext->ehci->hcd_interf.hcd_set_id(&pdev_ext->ehci->hcd_interf, hcd_id); - pdev_ext->ehci->hcd_interf.hcd_set_dev_mgr(&pdev_ext->ehci->hcd_interf, dev_mgr); - return pdev; } @@ -3719,6 +3711,7 @@ STRING string, another_string; CHAR str_dev_name[64], str_symb_name[64]; + UCHAR hcd_id; if (drvr_obj == NULL) return NULL; @@ -3767,6 +3760,13 @@ RtlFreeUnicodeString(&dev_name); RtlFreeUnicodeString(&symb_name); + + //register with dev_mgr though it is not initilized + ehci_init_hcd_interface(pdev_ext->ehci); + hcd_id = dev_mgr_register_hcd(dev_mgr, &pdev_ext->ehci->hcd_interf); + + pdev_ext->ehci->hcd_interf.hcd_set_id(&pdev_ext->ehci->hcd_interf, hcd_id); + pdev_ext->ehci->hcd_interf.hcd_set_dev_mgr(&pdev_ext->ehci->hcd_interf, dev_mgr); return pdev; Modified: trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/nt4compat/usbd… ============================================================================== --- trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/nt4compat/usbdriver/uhci.c [iso-8859-1] Wed May 12 11:34:36 2010 @@ -67,7 +67,6 @@ #define release_adapter( padapTER ) HalPutDmaAdapter(padapTER) - #define get_int_idx( _urb, _idx ) \ {\ UCHAR interVAL;\ @@ -406,6 +405,7 @@ STRING string, another_string; CHAR str_dev_name[64], str_symb_name[64]; + UCHAR hcd_id; if (drvr_obj == NULL) return NULL; @@ -455,6 +455,12 @@ RtlFreeUnicodeString(&dev_name); RtlFreeUnicodeString(&symb_name); + //register with dev_mgr though it is not initilized + uhci_init_hcd_interface(pdev_ext->uhci); + hcd_id = dev_mgr_register_hcd(dev_mgr, &pdev_ext->uhci->hcd_interf); + + pdev_ext->uhci->hcd_interf.hcd_set_id(&pdev_ext->uhci->hcd_interf, hcd_id); + pdev_ext->uhci->hcd_interf.hcd_set_dev_mgr(&pdev_ext->uhci->hcd_interf, dev_mgr); return pdev; } @@ -681,7 +687,6 @@ CM_PARTIAL_RESOURCE_DESCRIPTOR *pprd; PCI_SLOT_NUMBER slot_num; NTSTATUS status; - UCHAR hcd_id; pdev = uhci_create_device(drvr_obj, dev_mgr); @@ -846,13 +851,6 @@ uhci_release(pdev); return NULL; } - - //register with dev_mgr - uhci_init_hcd_interface(pdev_ext->uhci); - hcd_id = dev_mgr_register_hcd(dev_mgr, &pdev_ext->uhci->hcd_interf); - - pdev_ext->uhci->hcd_interf.hcd_set_id(&pdev_ext->uhci->hcd_interf, hcd_id); - pdev_ext->uhci->hcd_interf.hcd_set_dev_mgr(&pdev_ext->uhci->hcd_interf, dev_mgr); return pdev; }

14 years, 4 months

[jmorlan] 47166: commit file missing from r47165

by jmorlan＠svn.reactos.org

Author: jmorlan Date: Wed May 12 06:01:16 2010 New Revision: 47166 URL: http://svn.reactos.org/svn/reactos?rev=47166&view=rev Log: commit file missing from r47165 Modified: trunk/reactos/subsystems/win32/csrss/include/conio.h Modified: trunk/reactos/subsystems/win32/csrss/include/conio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/inc… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/conio.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/conio.h [iso-8859-1] Wed May 12 06:01:16 2010 @@ -61,6 +61,7 @@ BOOL (WINAPI *ChangeTitle)(PCSRSS_CONSOLE Console); VOID (WINAPI *CleanupConsole)(PCSRSS_CONSOLE Console); BOOL (WINAPI *ChangeIcon)(PCSRSS_CONSOLE Console, HICON hWindowIcon); + NTSTATUS (WINAPI *ResizeBuffer)(PCSRSS_CONSOLE Console, PCSRSS_SCREEN_BUFFER ScreenBuffer, COORD Size); } CSRSS_CONSOLE_VTBL, *PCSRSS_CONSOLE_VTBL; typedef struct tagCSRSS_CONSOLE @@ -137,6 +138,7 @@ CSR_API(CsrSetConsoleOutputCodePage); CSR_API(CsrGetProcessList); CSR_API(CsrGenerateCtrlEvent); +CSR_API(CsrSetScreenBufferSize); #define ConioInitScreenBuffer(Console, Buff) (Console)->Vtbl->InitScreenBuffer((Console), (Buff)) #define ConioDrawRegion(Console, Region) (Console)->Vtbl->DrawRegion((Console), (Region)) @@ -150,6 +152,8 @@ (Console)->Vtbl->UpdateScreenInfo(Console, Buff) #define ConioChangeTitle(Console) (Console)->Vtbl->ChangeTitle(Console) #define ConioCleanupConsole(Console) (Console)->Vtbl->CleanupConsole(Console) +#define ConioChangeIcon(Console, hWindowIcon) (Console)->Vtbl->ChangeIcon(Console, hWindowIcon) +#define ConioResizeBuffer(Console, Buff, Size) (Console)->Vtbl->ResizeBuffer(Console, Buff, Size) #define ConioRectHeight(Rect) \ (((Rect)->top) > ((Rect)->bottom) ? 0 : ((Rect)->bottom) - ((Rect)->top) + 1) @@ -164,7 +168,6 @@ Win32CsrLockObject((ProcessData), (Handle), (Object_t **)(Ptr), Access, CONIO_SCREEN_BUFFER_MAGIC) #define ConioUnlockScreenBuffer(Buff) \ Win32CsrUnlockObject((Object_t *) Buff) -#define ConioChangeIcon(Console, hWindowIcon) (Console)->Vtbl->ChangeIcon(Console, hWindowIcon) /* alias.c */ VOID IntDeleteAllAliases(struct tagALIAS_HEADER *RootHeader);

14 years, 4 months

← Newer
1
...
31
32
33
34
35
36
37
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2010