Ros-diffs February 2012

ros-diffs@reactos.org

22 participants
577 discussions

[cgutman] 55747: [NTOSKRNL] - Create the DeviceClasses key necessary for device interfaces to be registered successfully in 1st stage - This may not be the correct place to do this so anyone is fre...

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Feb 20 11:30:51 2012 New Revision: 55747 URL: http://svn.reactos.org/svn/reactos?rev=55747&view=rev Log: [NTOSKRNL] - Create the DeviceClasses key necessary for device interfaces to be registered successfully in 1st stage - This may not be the correct place to do this so anyone is free to move it Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpinit.c [iso-8859-1] Mon Feb 20 11:30:51 2012 @@ -362,7 +362,7 @@ { NTSTATUS Status; ULONG Disposition; - HANDLE KeyHandle, EnumHandle, ParentHandle, TreeHandle; + HANDLE KeyHandle, EnumHandle, ParentHandle, TreeHandle, ControlHandle; UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\CURRENTCONTROLSET"); PDEVICE_OBJECT Pdo; @@ -386,7 +386,37 @@ &KeyName, KEY_ALL_ACCESS); if (!NT_SUCCESS(Status)) return Status; - + + /* Create the control key */ + RtlInitUnicodeString(&KeyName, L"Control"); + Status = IopCreateRegistryKeyEx(&ControlHandle, + KeyHandle, + &KeyName, + KEY_ALL_ACCESS, + REG_OPTION_NON_VOLATILE, + &Disposition); + if (!NT_SUCCESS(Status)) return Status; + + /* Check if it's a new key */ + if (Disposition == REG_CREATED_NEW_KEY) + { + HANDLE DeviceClassesHandle; + + /* Create the device classes key */ + RtlInitUnicodeString(&KeyName, L"DeviceClasses"); + Status = IopCreateRegistryKeyEx(&DeviceClassesHandle, + ControlHandle, + &KeyName, + KEY_ALL_ACCESS, + REG_OPTION_NON_VOLATILE, + &Disposition); + if (!NT_SUCCESS(Status)) return Status; + + ZwClose(DeviceClassesHandle); + } + + ZwClose(ControlHandle); + /* Create the enum key */ RtlInitUnicodeString(&KeyName, REGSTR_KEY_ENUM); Status = IopCreateRegistryKeyEx(&EnumHandle, @@ -436,7 +466,26 @@ NtClose(EnumHandle); if (NT_SUCCESS(Status)) NtClose(TreeHandle); } - + + /* Open the root key now */ + RtlInitUnicodeString(&KeyName, L"\\REGISTRY\\MACHINE\\SYSTEM\\CURRENTCONTROLSET\\ENUM"); + Status = IopOpenRegistryKeyEx(&EnumHandle, + NULL, + &KeyName, + KEY_ALL_ACCESS); + if (NT_SUCCESS(Status)) + { + /* Create the root dev node */ + RtlInitUnicodeString(&KeyName, REGSTR_VAL_ROOT_DEVNODE); + Status = IopCreateRegistryKeyEx(&TreeHandle, + EnumHandle, + &KeyName, + KEY_ALL_ACCESS, + REG_OPTION_NON_VOLATILE, + NULL); + NtClose(EnumHandle); + if (NT_SUCCESS(Status)) NtClose(TreeHandle); + } /* Create the root driver */ Status = IoCreateDriver(NULL, PnpRootDriverEntry); if (!NT_SUCCESS(Status))

12 years, 7 months

[gadamopoulos] 55746: [win32k] - Create defaultDCstate when the first dc is created not when the first dce is created - Fix build

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Feb 20 10:58:55 2012 New Revision: 55746 URL: http://svn.reactos.org/svn/reactos?rev=55746&view=rev Log: [win32k] - Create defaultDCstate when the first dc is created not when the first dce is created - Fix build Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h trunk/reactos/subsystems/win32/win32k/ntuser/windc.c trunk/reactos/subsystems/win32/win32k/objects/dclife.c Modified: trunk/reactos/subsystems/win32/win32k/include/dce.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dce.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/dce.h [iso-8859-1] Mon Feb 20 10:58:55 2012 @@ -41,6 +41,7 @@ #define DCX_NORECOMPUTE 0x00100000 #define DCX_INDESTROY 0x00400000 +INIT_FUNCTION NTSTATUS NTAPI InitDCEImpl(VOID); PDCE FASTCALL DceAllocDCE(PWND Window, DCE_TYPE Type); HWND FASTCALL IntWindowFromDC(HDC hDc); PDCE FASTCALL DceFreeDCE(PDCE dce, BOOLEAN Force); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/windc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/windc.c [iso-8859-1] Mon Feb 20 10:58:55 2012 @@ -24,34 +24,26 @@ /* FUNCTIONS *****************************************************************/ +INIT_FUNCTION +NTSTATUS +NTAPI +InitDCEImpl(VOID) +{ + InitializeListHead(&LEDce); + return STATUS_SUCCESS; +} + // // This should be moved to dc.c or dcutil.c. // HDC FASTCALL DceCreateDisplayDC(VOID) { - HDC hDC; - UNICODE_STRING DriverName; - RtlInitUnicodeString(&DriverName, L"DISPLAY"); - hDC = IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); + UNICODE_STRING DriverName = RTL_CONSTANT_STRING(L"DISPLAY"); co_IntGraphicsCheck(TRUE); -// -// If NULL, first time through! Build the default window dc! -// - if (hDC && !defaultDCstate) // Ultra HAX! Dedicated to GvG! - { // This is a cheesy way to do this. - PDC dc = DC_LockDc ( hDC ); - ASSERT(dc); - defaultDCstate = ExAllocatePoolWithTag(PagedPool, sizeof(DC), TAG_DC); - RtlZeroMemory(defaultDCstate, sizeof(DC)); - defaultDCstate->pdcattr = &defaultDCstate->dcattr; - DC_vCopyState(dc, defaultDCstate, TRUE); - DC_UnlockDc( dc ); - InitializeListHead(&LEDce); - } - return hDC; + return IntGdiCreateDC(&DriverName, NULL, NULL, NULL, FALSE); } static Modified: trunk/reactos/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Mon Feb 20 10:58:55 2012 @@ -347,6 +347,13 @@ pdc->dcattr.iCS_CP = 0; pdc->pSurfInfo = NULL; + if (defaultDCstate == NULL) + { + defaultDCstate = ExAllocatePoolWithTag(PagedPool, sizeof(DC), TAG_DC); + RtlZeroMemory(defaultDCstate, sizeof(DC)); + defaultDCstate->pdcattr = &defaultDCstate->dcattr; + DC_vCopyState(pdc, defaultDCstate, TRUE); + } } BOOL

12 years, 7 months

[gadamopoulos] 55745: [win32k] - Peb->ProcessParameters->DesktopInfo must be probed and captured with SEH before used in win32k

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Feb 20 10:51:07 2012 New Revision: 55745 URL: http://svn.reactos.org/svn/reactos?rev=55745&view=rev Log: [win32k] - Peb->ProcessParameters->DesktopInfo must be probed and captured with SEH before used in win32k Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c Modified: trunk/reactos/subsystems/win32/win32k/main/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ma… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/main/dllmain.c [iso-8859-1] Mon Feb 20 10:51:07 2012 @@ -238,7 +238,7 @@ HWINSTA hWinSta = NULL; PCLIENTINFO pci; HDESK hDesk = NULL; - PUNICODE_STRING DesktopPath; + UNICODE_STRING DesktopPath; PDESKTOP pdesk; PRTL_USER_PROCESS_PARAMETERS ProcessParams = Process->Peb->ProcessParameters; @@ -297,11 +297,24 @@ * inherit the thread desktop and process window station (if not yet inherited) from the process startup * info structure. See documentation of CreateProcess() */ - DesktopPath = (ProcessParams ? ((ProcessParams->DesktopInfo.Length > 0) ? &ProcessParams->DesktopInfo : NULL) : NULL); + Status = STATUS_UNSUCCESSFUL; + if(ProcessParams && ProcessParams->DesktopInfo.Length > 0) + { + Status = IntSafeCopyUnicodeStringTerminateNULL(&DesktopPath, &ProcessParams->DesktopInfo); + } + if(!NT_SUCCESS(Status)) + { + RtlInitUnicodeString(&DesktopPath, NULL); + } + Status = IntParseDesktopPath(Process, - DesktopPath, + &DesktopPath, &hWinSta, &hDesk); + + if (DesktopPath.Buffer) + ExFreePoolWithTag(DesktopPath.Buffer, TAG_STRING); + if(!NT_SUCCESS(Status)) { ERR_CH(UserThread, "Failed to assign default dekstop and winsta to process\n"); @@ -545,6 +558,7 @@ NT_ROF(InitKeyboardImpl()); NT_ROF(MsqInitializeImpl()); NT_ROF(InitTimerImpl()); + NT_ROF(InitDCEImpl()); /* Initialize FreeType library */ if (!InitFontSupport())

12 years, 7 months

[gadamopoulos] 55744: [win32k] - Remove an unused function

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Mon Feb 20 10:47:13 2012 New Revision: 55744 URL: http://svn.reactos.org/svn/reactos?rev=55744&view=rev Log: [win32k] - Remove an unused function Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c [iso-8859-1] Mon Feb 20 10:47:13 2012 @@ -329,17 +329,6 @@ } KeInitializeTimer(MasterTimer); - return STATUS_SUCCESS; -} - -/* - * CleanupInputImp - * - * Cleans input implementation - */ -NTSTATUS FASTCALL -CleanupInputImp(VOID) -{ return STATUS_SUCCESS; }

12 years, 7 months

[cgutman] 55743: [NTOSKRNL] - First check if a driver object exists before trying to load the service module to properly handle boot drivers

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Feb 20 10:24:14 2012 New Revision: 55743 URL: http://svn.reactos.org/svn/reactos?rev=55743&view=rev Log: [NTOSKRNL] - First check if a driver object exists before trying to load the service module to properly handle boot drivers Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Mon Feb 20 10:24:14 2012 @@ -560,35 +560,25 @@ ServiceName.MaximumLength = ServiceName.Length = (USHORT)wcslen(Filters) * sizeof(WCHAR); - /* Load and initialize the filter driver */ - Status = IopLoadServiceModule(&ServiceName, &ModuleObject); - if (Status != STATUS_IMAGE_ALREADY_LOADED) - { - if (!NT_SUCCESS(Status)) - continue; - - Status = IopInitializeDriverModule(DeviceNode, ModuleObject, &ServiceName, - FALSE, &DriverObject); - if (!NT_SUCCESS(Status)) - continue; - } - else - { - /* get existing DriverObject pointer */ - Status = IopGetDriverObject( - &DriverObject, - &ServiceName, - FALSE); - if (!NT_SUCCESS(Status)) - { - DPRINT1("IopGetDriverObject() returned status 0x%08x!\n", Status); - continue; - } - } - - Status = IopInitializeDevice(DeviceNode, DriverObject); - if (!NT_SUCCESS(Status)) - continue; + Status = IopGetDriverObject(&DriverObject, + &ServiceName, + FALSE); + if (!NT_SUCCESS(Status)) + { + /* Load and initialize the filter driver */ + Status = IopLoadServiceModule(&ServiceName, &ModuleObject); + if (!NT_SUCCESS(Status)) + continue; + + Status = IopInitializeDriverModule(DeviceNode, ModuleObject, &ServiceName, + FALSE, &DriverObject); + if (!NT_SUCCESS(Status)) + continue; + } + + Status = IopInitializeDevice(DeviceNode, DriverObject); + if (!NT_SUCCESS(Status)) + continue; } return STATUS_SUCCESS;

12 years, 7 months

[cgutman] 55742: [USBEHCI] - When releasing a low or full speed device, set the EHCI_PRT_RELEASEOWNERSHIP bit with the current port status so that any change bits are acknowledged - Fixes detecting...

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Feb 20 09:23:33 2012 New Revision: 55742 URL: http://svn.reactos.org/svn/reactos?rev=55742&view=rev Log: [USBEHCI] - When releasing a low or full speed device, set the EHCI_PRT_RELEASEOWNERSHIP bit with the current port status so that any change bits are acknowledged - Fixes detecting new devices after a companion controller handoff Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbehci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbehci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbehci/hardware.cpp [iso-8859-1] Mon Feb 20 09:23:33 2012 @@ -963,7 +963,7 @@ if (PortStatus & EHCI_PRT_SLOWSPEEDLINE) { DPRINT1("Non HighSpeed device. Releasing Ownership\n"); - EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex), EHCI_PRT_RELEASEOWNERSHIP); + EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortIndex), PortStatus | EHCI_PRT_RELEASEOWNERSHIP); return STATUS_DEVICE_NOT_CONNECTED; } @@ -1132,7 +1132,7 @@ if (Value & EHCI_PRT_SLOWSPEEDLINE) { DPRINT1("Non HighSpeed device. Releasing Ownership\n"); - EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId), EHCI_PRT_RELEASEOWNERSHIP); + EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * PortId), Value | EHCI_PRT_RELEASEOWNERSHIP); return STATUS_DEVICE_NOT_CONNECTED; } @@ -1478,9 +1478,6 @@ { DPRINT1("Device connected on port %d\n", i); - // - //FIXME: Determine device speed - // if (This->m_Capabilities.HCSParams.CHCCount) { if (PortStatus & EHCI_PRT_ENABLED) @@ -1491,7 +1488,7 @@ if (PortStatus & EHCI_PRT_SLOWSPEEDLINE) { DPRINT1("Non HighSpeed device connected. Release ownership\n"); - This->EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * i), EHCI_PRT_RELEASEOWNERSHIP); + This->EHCI_WRITE_REGISTER_ULONG(EHCI_PORTSC + (4 * i), PortStatus | EHCI_PRT_RELEASEOWNERSHIP); continue; } }

12 years, 7 months

[cgutman] 55741: [USBOHCI] - Finally fix the OHCI reset bug for real and remove hacks

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Feb 20 09:00:09 2012 New Revision: 55741 URL: http://svn.reactos.org/svn/reactos?rev=55741&view=rev Log: [USBOHCI] - Finally fix the OHCI reset bug for real and remove hacks Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Mon Feb 20 09:00:09 2012 @@ -1353,35 +1353,9 @@ // WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_PRS); - do - { - // - // read port status - // - Value = READ_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId))); - - if ((Value & OHCI_RH_PORTSTATUS_PRS) == 0 && - (Value & OHCI_RH_PORTSTATUS_PRSC) != 0) - { - // - // reset is complete - // - break; - } - - // - // wait a bit - // - KeStallExecutionProcessor(100); - } while(TRUE); - - if (m_SCECallBack != NULL) - { - // - // issue callback - // - m_SCECallBack(m_SCEContext); - } + // + // an interrupt signals the reset completion + // return STATUS_SUCCESS; } return STATUS_SUCCESS;

12 years, 7 months

[cgutman] 55740: [USBOHCI] - Set the power switching configuration into a known state when initializing the controller

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Feb 20 08:41:19 2012 New Revision: 55740 URL: http://svn.reactos.org/svn/reactos?rev=55740&view=rev Log: [USBOHCI] - Set the power switching configuration into a known state when initializing the controller Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Mon Feb 20 08:41:19 2012 @@ -595,7 +595,26 @@ // // no over current protection // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET), Descriptor | OHCI_RH_NO_OVER_CURRENT_PROTECTION); + Descriptor |= OHCI_RH_NO_OVER_CURRENT_PROTECTION; + + // + // power switching on + // + Descriptor &= ~OHCI_RH_NO_POWER_SWITCHING; + + // + // control each port power independently (disabled until it's supported correctly) + // +#if 0 + Descriptor |= OHCI_RH_POWER_SWITCHING_MODE; +#else + Descriptor &= ~OHCI_RH_POWER_SWITCHING_MODE; +#endif + + // + // write the configuration back + // + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_DESCRIPTOR_A_OFFSET), Descriptor); // // enable power on all ports

12 years, 7 months

[cgutman] 55739: [USBOHCI] - Queue a work item to handle an enable status change condition

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Feb 20 08:25:38 2012 New Revision: 55739 URL: http://svn.reactos.org/svn/reactos?rev=55739&view=rev Log: [USBOHCI] - Queue a work item to handle an enable status change condition Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Mon Feb 20 08:25:38 2012 @@ -1634,6 +1634,18 @@ // QueueSCEWorkItem = TRUE; } + else if (PortStatus & OHCI_RH_PORTSTATUS_PESC) + { + // + // device disconnected or some error condition + // + ASSERT(!(PortStatus & OHCI_RH_PORTSTATUS_PES)); + + // + // work to do + // + QueueSCEWorkItem = TRUE; + } else if (PortStatus & OHCI_RH_PORTSTATUS_PRSC) { //

12 years, 7 months

[cgutman] 55738: [USBOHCI] - Don't clear extra change bits

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Feb 20 08:09:31 2012 New Revision: 55738 URL: http://svn.reactos.org/svn/reactos?rev=55738&view=rev Log: [USBOHCI] - Don't clear extra change bits Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp Modified: trunk/reactos/drivers/usb/usbohci/hardware.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbohci/hardwa… ============================================================================== --- trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbohci/hardware.cpp [iso-8859-1] Mon Feb 20 08:09:31 2012 @@ -1217,7 +1217,7 @@ // // clear change bits // - WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), OHCI_RH_PORTSTATUS_CSC | OHCI_RH_PORTSTATUS_PESC); + WRITE_REGISTER_ULONG((PULONG)((PUCHAR)m_Base + OHCI_RH_PORT_STATUS(PortId)), Value & (OHCI_RH_PORTSTATUS_CSC | OHCI_RH_PORTSTATUS_PESC)); // // wait for port to stabilize

12 years, 7 months

← Newer
1
...
17
18
19
20
21
22
23
...
58
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 February 2012