Ros-diffs July 2009

ros-diffs@reactos.org

27 participants
605 discussions

[gschneider] 42260: RosDbg: - Don't crash if there are no COM ports available (inspired by Talley's patch), remove serial tab in that case to avoid user confusion - Get rid of tab order dependencies See issue #4585 for more details.
by gschneider＠svn.reactos.org 27 Jul '09

27 Jul '09

Author: gschneider Date: Tue Jul 28 00:21:45 2009 New Revision: 42260 URL: http://svn.reactos.org/svn/reactos?rev=42260&view=rev Log: RosDbg: - Don't crash if there are no COM ports available (inspired by Talley's patch), remove serial tab in that case to avoid user confusion - Get rid of tab order dependencies See issue #4585 for more details. Modified: trunk/tools/reactosdbg/RosDBG/Connect.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/RosDBG/Connect.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Connect.cs… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Connect.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Connect.cs [iso-8859-1] Tue Jul 28 00:21:45 2009 @@ -112,12 +112,21 @@ int i = 0; /* Serial */ - foreach (string s in SerialPort.GetPortNames()) + string[] serialPorts = SerialPort.GetPortNames(); + if (serialPorts == null || serialPorts.Length == 0) { - cPort.Items.Add(s); + tabControl.TabPages.Remove(tabSerial); + Settings.SelectedConnType = ConnectionType.Pipe; } - SelectComboItem(cPort, Settings.ComPort); - SelectComboItem(cBaud, Settings.Baudrate); + else + { + foreach (string s in serialPorts) + { + cPort.Items.Add(s); + } + SelectComboItem(cPort, Settings.ComPort); + SelectComboItem(cBaud, Settings.Baudrate); + } /* Pipe */ DefaultRadioBtn.Text += " [" + defaultPipeName + "]"; @@ -128,7 +137,18 @@ } cType.SelectedIndex = i; - tabControl.SelectedIndex = (int) Settings.SelectedConnType; + switch (Settings.SelectedConnType) + { + case ConnectionType.Pipe: + tabControl.SelectedTab = tabPipe; + break; + case ConnectionType.Serial: + tabControl.SelectedTab = tabSerial; + break; + case ConnectionType.Socket: + tabControl.SelectedTab = tabSocket; + break; + } } private void CustomRadioBtn_CheckedChanged(object sender, EventArgs e) @@ -139,7 +159,18 @@ private void tabControl_SelectedIndexChanged(object sender, EventArgs e) { - Type = (ConnectionType) ((TabControl)sender).SelectedIndex; + if (tabControl.SelectedTab == tabPipe) + { + Type = ConnectionType.Pipe; + } + else if(tabControl.SelectedTab == tabSerial) + { + Type = ConnectionType.Serial; + } + else if (tabControl.SelectedTab == tabSocket) + { + Type = ConnectionType.Socket; + } } } } Modified: trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Properties… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs [iso-8859-1] Tue Jul 28 00:21:45 2009 @@ -39,5 +39,5 @@ // will be increased as well. MSI installers must not be generated with the same Build Number // otherwise they won't upgrade the old installation! -[assembly: AssemblyVersion("1.0.2.63")] -[assembly: AssemblyFileVersion("1.0.2.63")] +[assembly: AssemblyVersion("1.0.2.64")] +[assembly: AssemblyFileVersion("1.0.2.64")]

1 0

[dreimer] 42259: I wonder when these Scripts fully do what I want them to.... fix a missing ENV Declaration.
by dreimer＠svn.reactos.org 27 Jul '09

27 Jul '09

Author: dreimer Date: Mon Jul 27 23:03:56 2009 New Revision: 42259 URL: http://svn.reactos.org/svn/reactos?rev=42259&view=rev Log: I wonder when these Scripts fully do what I want them to.... fix a missing ENV Declaration. Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 Modified: trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Powershe… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] (original) +++ trunk/tools/RosBE/RosBE-Windows/Powershell/options.ps1 [iso-8859-1] Mon Jul 27 23:03:56 2009 @@ -10,7 +10,7 @@ $host.ui.RawUI.WindowTitle = "Options" -if ("$ROS_ARCH" -eq "amd64") { +if ("$ENV:ROS_ARCH" -eq "amd64") { $options="$_ROSBE_BASEDIR\Tools\options64.exe" $cfgfile="$ENV:APPDATA\RosBE\rosbe-options-amd64.ps1" } else {

1 0

[fireball] 42258: - Remove the CSR show desktop notification. This is a leftover from 42231.
by fireball＠svn.reactos.org 27 Jul '09

27 Jul '09

Author: fireball Date: Mon Jul 27 22:22:10 2009 New Revision: 42258 URL: http://svn.reactos.org/svn/reactos?rev=42258&view=rev Log: - Remove the CSR show desktop notification. This is a leftover from 42231. Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/wine/winstation.c [iso-8859-1] Mon Jul 27 22:22:10 2009 @@ -553,8 +553,6 @@ if ((desktop = create_desktop( &name, req->attributes, req->flags, winstation ))) { reply->handle = alloc_handle( current, desktop, req->access, req->attributes ); - if (get_error() != STATUS_OBJECT_NAME_EXISTS) - CsrNotifyCreateDesktop((HDESK)reply->handle); release_object( desktop ); } release_object( winstation );

1 0

[gedmurphy] 42257: winsock2.h should come before windows.h
by gedmurphy＠svn.reactos.org 27 Jul '09

27 Jul '09

Author: gedmurphy Date: Mon Jul 27 21:42:05 2009 New Revision: 42257 URL: http://svn.reactos.org/svn/reactos?rev=42257&view=rev Log: winsock2.h should come before windows.h Modified: trunk/reactos/dll/win32/msafd/msafd.h Modified: trunk/reactos/dll/win32/msafd/msafd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/msafd.h?re… ============================================================================== --- trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/msafd.h [iso-8859-1] Mon Jul 27 21:42:05 2009 @@ -11,8 +11,8 @@ #include <stdlib.h> #define WIN32_NO_STATUS +#include <winsock2.h> #include <windows.h> -#include <winsock2.h> #include <ws2spi.h> #define NTOS_MODE_USER #include <ndk/ntndk.h>

1 0

[janderwald] 42256: - Implement KsReferenceBusObject, KsReferenceSoftwareBusObject, KsDereferenceSoftwareBusObject, KsDereferenceBusObject
by janderwald＠svn.reactos.org 27 Jul '09

27 Jul '09

Author: janderwald Date: Mon Jul 27 20:40:50 2009 New Revision: 42256 URL: http://svn.reactos.org/svn/reactos?rev=42256&view=rev Log: - Implement KsReferenceBusObject, KsReferenceSoftwareBusObject, KsDereferenceSoftwareBusObject, KsDereferenceBusObject Modified: trunk/reactos/drivers/ksfilter/ks/device.c trunk/reactos/drivers/ksfilter/ks/irp.c Modified: trunk/reactos/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/device… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/device.c [iso-8859-1] Mon Jul 27 20:40:50 2009 @@ -624,12 +624,19 @@ IN PDEVICE_OBJECT NextDeviceObject, IN const KSDEVICE_DESCRIPTOR* Descriptor OPTIONAL) { + PDEVICE_EXTENSION DeviceExtension; PKSIDEVICE_HEADER Header; ULONG Index; NTSTATUS Status = STATUS_SUCCESS; + /* get device extension */ + DeviceExtension = (PDEVICE_EXTENSION)FunctionalDeviceObject->DeviceExtension; + /* first allocate device header */ - Status = KsAllocateDeviceHeader((KSDEVICE_HEADER*)&Header, 0, NULL); + Status = KsAllocateDeviceHeader((KSDEVICE_HEADER*)&DeviceExtension->DeviceHeader, 0, NULL); + + /* point to allocated header */ + Header = DeviceExtension->DeviceHeader; /* check for success */ if (!NT_SUCCESS(Status)) @@ -689,6 +696,85 @@ KsReferenceSoftwareBusObject( IN KSDEVICE_HEADER Header) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; -} + IKsDevice * Device; + PKSIDEVICE_HEADER DeviceHeader = (PKSIDEVICE_HEADER)Header; + + /* get device interface */ + Device = (IKsDevice*)&DeviceHeader->lpVtblIKsDevice; + + if (Device) + { + /* reference device interface */ + Device->lpVtbl->AddRef(Device); + } + + return STATUS_SUCCESS; +} + +/* + @unimplemented +*/ +KSDDKAPI +NTSTATUS +NTAPI +KsReferenceBusObject( + IN KSDEVICE_HEADER Header) +{ + IKsDevice * Device; + PKSIDEVICE_HEADER DeviceHeader = (PKSIDEVICE_HEADER)Header; + + /* get device interface */ + Device = (IKsDevice*)&DeviceHeader->lpVtblIKsDevice; + + if (Device) + { + /* reference device interface */ + Device->lpVtbl->AddRef(Device); + } + + return STATUS_SUCCESS; + +} + +/* + @unimplemented +*/ +KSDDKAPI +VOID +NTAPI +KsDereferenceBusObject( + IN KSDEVICE_HEADER Header) +{ + IKsDevice * Device; + PKSIDEVICE_HEADER DeviceHeader = (PKSIDEVICE_HEADER)Header; + + /* get device interface */ + Device = (IKsDevice*)&DeviceHeader->lpVtblIKsDevice; + + if (Device) + { + /* release device interface */ + Device->lpVtbl->Release(Device); + } +} + +/* + @unimplemented +*/ +KSDDKAPI +VOID +NTAPI +KsDereferenceSoftwareBusObject( + IN KSDEVICE_HEADER Header) +{ IKsDevice * Device; + PKSIDEVICE_HEADER DeviceHeader = (PKSIDEVICE_HEADER)Header; + + /* get device interface */ + Device = (IKsDevice*)&DeviceHeader->lpVtblIKsDevice; + + if (Device) + { + /* release device interface */ + Device->lpVtbl->Release(Device); + } +} Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Mon Jul 27 20:40:50 2009 @@ -8,43 +8,6 @@ #include "priv.h" - -/* - @unimplemented -*/ -KSDDKAPI -NTSTATUS -NTAPI -KsReferenceBusObject( - IN KSDEVICE_HEADER Header) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - @unimplemented -*/ -KSDDKAPI -VOID -NTAPI -KsDereferenceBusObject( - IN KSDEVICE_HEADER Header) -{ - UNIMPLEMENTED; -} - -/* - @unimplemented -*/ -KSDDKAPI -VOID -NTAPI -KsDereferenceSoftwareBusObject( - IN KSDEVICE_HEADER Header) -{ - UNIMPLEMENTED; -} /* @implemented

1 0

[janderwald] 42255: + portcls + ks - ws2help_new
by janderwald＠svn.reactos.org 27 Jul '09

27 Jul '09

Author: janderwald Date: Mon Jul 27 20:18:20 2009 New Revision: 42255 URL: http://svn.reactos.org/svn/reactos?rev=42255&view=rev Log: + portcls + ks - ws2help_new Modified: trunk/reactos/tools/rgenstat/module_list.txt Modified: trunk/reactos/tools/rgenstat/module_list.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rgenstat/module_list… ============================================================================== --- trunk/reactos/tools/rgenstat/module_list.txt [iso-8859-1] (original) +++ trunk/reactos/tools/rgenstat/module_list.txt [iso-8859-1] Mon Jul 27 20:18:20 2009 @@ -68,6 +68,7 @@ imm32 dll\win32\imm32 iphlpapi dll\win32\iphlpapi kernel32 dll\win32\kernel32 +ks drivers\ksfilter\ks lsasrv dll\win32\lsasrv lz32 dll\win32\lz32 mapi32 dll\win32\mapi32 @@ -95,6 +96,7 @@ opengl32 dll\win32\opengl32 powrprof dll\win32\powrprof psapi dll\win32\psapi +portcls drivers\wdm\audio\backpln\portcls riched20 dll\win32\riched20 riched32 dll\win32\riched32 rpcrt4 dll\win32\rpcrt4 @@ -127,7 +129,6 @@ ws2_32 dll\win32\ws2_32 ws2_32_new dll\win32\ws2_32_new ws2help dll\win32\ws2help -ws2help_new dll\win32\ws2help_new wshirda dll\win32\wshirda wsock32 dll\win32\wsock32 wshtcpip dll\win32\wshtcpip

1 0

[janderwald] 42254: - Remove DriverEntry as ks is kernel mode dll - Implement KsGetImageNameAndResourceId, KsMapModuleName
by janderwald＠svn.reactos.org 27 Jul '09

27 Jul '09

Author: janderwald Date: Mon Jul 27 18:17:24 2009 New Revision: 42254 URL: http://svn.reactos.org/svn/reactos?rev=42254&view=rev Log: - Remove DriverEntry as ks is kernel mode dll - Implement KsGetImageNameAndResourceId, KsMapModuleName Modified: trunk/reactos/drivers/ksfilter/ks/driver.c trunk/reactos/drivers/ksfilter/ks/image.c trunk/reactos/drivers/ksfilter/ks/ks.rbuild Modified: trunk/reactos/drivers/ksfilter/ks/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/driver… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/driver.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/driver.c [iso-8859-1] Mon Jul 27 18:17:24 2009 @@ -10,17 +10,6 @@ #include "ksfunc.h" - -NTSTATUS -NTAPI -DriverEntry( - IN PDRIVER_OBJECT Driver, - IN PUNICODE_STRING Registry_path -) -{ - DPRINT1("ks.sys loaded\n"); - return STATUS_SUCCESS; -} /* @implemented Modified: trunk/reactos/drivers/ksfilter/ks/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/image.… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/image.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/image.c [iso-8859-1] Mon Jul 27 18:17:24 2009 @@ -82,8 +82,21 @@ return Status; } -/* - @unimplemented + +NTSTATUS +KspQueryRegValue( + IN HANDLE KeyHandle, + IN LPWSTR KeyName, + IN PVOID Buffer, + IN OUT PULONG BufferLength, + OUT PULONG Type) +{ + UNIMPLEMENTED + return STATUS_NOT_IMPLEMENTED; +} + +/* + @implemented */ KSDDKAPI NTSTATUS @@ -94,12 +107,78 @@ OUT PULONG_PTR ResourceId, OUT PULONG ValueType) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - -/* - @unimplemented + NTSTATUS Status; + ULONG ImageLength; + WCHAR ImagePath[] = {L"\\SystemRoot\\system32\\drivers\\"}; + + /* first clear the provided ImageName */ + ImageName->Buffer = NULL; + ImageName->Length = ImageName->MaximumLength = 0; + + ImageLength = 0; + /* retrieve length of image name */ + Status = KspQueryRegValue(RegKey, L"Image", NULL, &ImageLength, NULL); + + if (Status != STATUS_BUFFER_OVERFLOW) + { + /* key value doesnt exist */ + return Status; + } + + /* allocate image name buffer */ + ImageName->MaximumLength = sizeof(ImagePath) + ImageLength; + ImageName->Buffer = ExAllocatePool(PagedPool, ImageName->MaximumLength); + + /* check for success */ + if (!ImageName->Buffer) + { + /* insufficient memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* copy image name */ + RtlCopyMemory(ImageName->Buffer, ImagePath, sizeof(ImagePath)); + + /* retrieve image name */ + Status = KspQueryRegValue(RegKey, L"Image", &ImageName->Buffer[sizeof(ImagePath) / sizeof(WCHAR)], &ImageLength, NULL); + + if (!NT_SUCCESS(Status)) + { + /* unexpected error */ + ExFreePool(ImageName->Buffer); + return Status; + } + + /* now query for resource id length*/ + ImageLength = 0; + Status = KspQueryRegValue(RegKey, L"ResourceId", NULL, &ImageLength, ValueType); + + /* allocate resource id buffer*/ + *ResourceId = (ULONG_PTR)ExAllocatePool(PagedPool, ImageLength); + + /* check for success */ + if (!*ResourceId) + { + /* insufficient memory */ + ExFreePool(ImageName->Buffer); + return STATUS_INSUFFICIENT_RESOURCES; + } + /* now query for resource id */ + Status = KspQueryRegValue(RegKey, L"ResourceId", (PVOID)*ResourceId, &ImageLength, ValueType); + + if (!NT_SUCCESS(Status)) + { + /* unexpected error */ + ExFreePool(ImageName->Buffer); + ExFreePool((PVOID)*ResourceId); + } + + /* return result */ + return Status; +} + +/* + @implemented */ KSDDKAPI NTSTATUS @@ -111,6 +190,64 @@ OUT PULONG_PTR ResourceId, OUT PULONG ValueType) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} + NTSTATUS Status; + UNICODE_STRING SubKeyName; + UNICODE_STRING Modules = RTL_CONSTANT_STRING(L"Modules\\"); + HANDLE hKey, hSubKey; + OBJECT_ATTRIBUTES ObjectAttributes; + + /* first open device key */ + Status = IoOpenDeviceRegistryKey(PhysicalDeviceObject, PLUGPLAY_REGKEY_DEVICE, GENERIC_READ, &hKey); + + /* check for success */ + if (!NT_SUCCESS(Status)) + { + /* invalid parameter */ + return STATUS_INVALID_PARAMETER; + } + + /* initialize subkey buffer */ + SubKeyName.Length = 0; + SubKeyName.MaximumLength = Modules.MaximumLength + ModuleName->MaximumLength; + SubKeyName.Buffer = ExAllocatePool(PagedPool, SubKeyName.MaximumLength); + + /* check for success */ + if (!SubKeyName.Buffer) + { + /* not enough memory */ + ZwClose(hKey); + return STATUS_NO_MEMORY; + } + + /* build subkey string */ + RtlAppendUnicodeStringToString(&SubKeyName, &Modules); + RtlAppendUnicodeStringToString(&SubKeyName, ModuleName); + + /* initialize subkey attributes */ + InitializeObjectAttributes(&ObjectAttributes, &SubKeyName, OBJ_CASE_INSENSITIVE, hKey, NULL); + + /* now open the subkey */ + Status = ZwOpenKey(&hSubKey, GENERIC_READ, &ObjectAttributes); + + /* check for success */ + if (NT_SUCCESS(Status)) + { + /* defer work */ + Status = KsGetImageNameAndResourceId(hSubKey, ImageName, ResourceId, ValueType); + + /* close subkey */ + ZwClose(hSubKey); + } + + /* free subkey string */ + ExFreePool(SubKeyName.Buffer); + + /* close device key */ + ZwClose(hKey); + + /* return status */ + return Status; +} + + + Modified: trunk/reactos/drivers/ksfilter/ks/ks.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/ks.rbu… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/ks.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/ks.rbuild [iso-8859-1] Mon Jul 27 18:17:24 2009 @@ -1,6 +1,6 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> -<module name="ks" type="kernelmodedriver" installbase="system32/drivers" installname="ks.sys"> +<module name="ks" type="kernelmodedriver" installbase="system32/drivers" installname="ks.sys" entrypoint="0"> <include base="ks">.</include> <include base="ks">..</include> <include base="ks">../include</include>

1 0

[ros-arm-bringup] 42253: - Remove dead (uncalled) function.
by ros-arm-bringup＠svn.reactos.org 27 Jul '09

27 Jul '09

Author: ros-arm-bringup Date: Mon Jul 27 04:23:25 2009 New Revision: 42253 URL: http://svn.reactos.org/svn/reactos?rev=42253&view=rev Log: - Remove dead (uncalled) function. Modified: trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Mon Jul 27 04:23:25 2009 @@ -657,87 +657,6 @@ NTSTATUS NTAPI -MmCreateVirtualMappingForKernel(PVOID Address, - ULONG flProtect, - PPFN_TYPE Pages, - ULONG PageCount) -{ - ULONG Attributes; - ULONG i; - PVOID Addr; - ULONG PdeOffset, oldPdeOffset; - PULONG Pt; - ULONG Pte; - BOOLEAN NoExecute = FALSE; - - DPRINT("MmCreateVirtualMappingForKernel(%x, %x, %x, %d)\n", - Address, flProtect, Pages, PageCount); - - if (Address < MmSystemRangeStart) - { - DPRINT1("MmCreateVirtualMappingForKernel is called for user space\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - - Attributes = ProtectToPTE(flProtect); - if (Attributes & 0x80000000) - { - NoExecute = TRUE; - } - Attributes &= 0xfff; - if (Ke386GlobalPagesEnabled) - { - Attributes |= PA_GLOBAL; - } - - Addr = Address; - - oldPdeOffset = ADDR_TO_PDE_OFFSET(Addr); - Pt = MmGetPageTableForProcess(NULL, Addr, TRUE); - if (Pt == NULL) - { - KeBugCheck(MEMORY_MANAGEMENT); - } - Pt--; - - for (i = 0; i < PageCount; i++, Addr = (PVOID)((ULONG_PTR)Addr + PAGE_SIZE)) - { - if (!(Attributes & PA_PRESENT) && Pages[i] != 0) - { - DPRINT1("Setting physical address but not allowing access at address " - "0x%.8X with attributes %x/%x.\n", - Addr, Attributes, flProtect); - KeBugCheck(MEMORY_MANAGEMENT); - } - - PdeOffset = ADDR_TO_PDE_OFFSET(Addr); - if (oldPdeOffset != PdeOffset) - { - Pt = MmGetPageTableForProcess(NULL, Addr, TRUE); - if (Pt == NULL) - { - KeBugCheck(MEMORY_MANAGEMENT); - } - } - else - { - Pt++; - } - oldPdeOffset = PdeOffset; - - Pte = *Pt; - if (Pte != 0) - { - KeBugCheck(MEMORY_MANAGEMENT); - } - InterlockedExchangePte(Pt, PFN_TO_PTE(Pages[i]) | Attributes); - } - - return(STATUS_SUCCESS); -} - -NTSTATUS -NTAPI MmCreatePageFileMapping(PEPROCESS Process, PVOID Address, SWAPENTRY SwapEntry)

1 0

[ros-arm-bringup] 42252: - Create a double-mapping PTE for the shared user data region and fault it in whenever a process touches that address. - Remove the old hack which used the PCR's page frame number to create a fake PTE each time to reference it, basing on the fact that the shared user data region was on the same page as the PCR on certain architectures.
by ros-arm-bringup＠svn.reactos.org 27 Jul '09

27 Jul '09

Author: ros-arm-bringup Date: Mon Jul 27 04:13:19 2009 New Revision: 42252 URL: http://svn.reactos.org/svn/reactos?rev=42252&view=rev Log: - Create a double-mapping PTE for the shared user data region and fault it in whenever a process touches that address. - Remove the old hack which used the PCR's page frame number to create a fake PTE each time to reference it, basing on the fact that the shared user data region was on the same page as the PCR on certain architectures. Modified: trunk/reactos/ntoskrnl/mm/mmfault.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmfault.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] Mon Jul 27 04:13:19 2009 @@ -150,7 +150,7 @@ MEMORY_AREA* MemoryArea; NTSTATUS Status; BOOLEAN Locked = FromMdl; - PFN_TYPE Pfn; + extern PMMPTE MmSharedUserDataPte; DPRINT("MmNotPresentFault(Mode %d, Address %x)\n", Mode, Address); @@ -228,14 +228,8 @@ break; case MEMORY_AREA_SHARED_DATA: - Pfn = MmGetPhysicalAddress((PVOID)PCR).LowPart >> PAGE_SHIFT; - Pfn++; - Status = - MmCreateVirtualMapping(PsGetCurrentProcess(), - (PVOID)PAGE_ROUND_DOWN(Address), - PAGE_READONLY, - &Pfn, - 1); + *MiAddressToPte(USER_SHARED_DATA) = *MmSharedUserDataPte; + Status = STATUS_SUCCESS; break; default: 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] Mon Jul 27 04:13:19 2009 @@ -48,6 +48,7 @@ PBOOLEAN Mm64BitPhysicalAddress = FALSE; ULONG MmReadClusterSize; MM_STATS MmStats; +PMMPTE MmSharedUserDataPte; PMMSUPPORT MmKernelAddressSpace; extern KMUTANT MmSystemLoadLock; extern ULONG MmBootImageSize; @@ -181,6 +182,11 @@ MmInitSystem(IN ULONG Phase, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { + extern MMPTE HyperTemplatePte; + PMMPTE PointerPte; + MMPTE TempPte = HyperTemplatePte; + PFN_NUMBER PageFrameNumber; + if (Phase == 0) { /* Initialize Mm bootstrap */ @@ -210,6 +216,31 @@ MmInitSectionImplementation(); MmInitPagingFile(); + // + // Create a PTE to double-map the shared data section. We allocate it + // from paged pool so that we can't fault when trying to touch the PTE + // itself (to map it), since paged pool addresses will already be mapped + // by the fault handler. + // + MmSharedUserDataPte = ExAllocatePoolWithTag(PagedPool, + sizeof(MMPTE), + ' mM'); + if (!MmSharedUserDataPte) return FALSE; + + // + // Now get the PTE for shared data, and read the PFN that holds it + // + PointerPte = MiAddressToPte(KI_USER_SHARED_DATA); + ASSERT(PointerPte->u.Hard.Valid == 1); + PageFrameNumber = PFN_FROM_PTE(PointerPte); + + // + // Now write a copy of it + // + TempPte.u.Hard.Owner = 1; + TempPte.u.Hard.PageFrameNumber = PageFrameNumber; + *MmSharedUserDataPte = TempPte; + /* * Unmap low memory */

1 0

[ros-arm-bringup] 42251: - Create \dev\physmem section during section initialization, not later. - Setup SharedUserData settings during Phase 0, not Phase 1. Fixes an old bug where the Inbv driver assumed ReactOS was in "server mode" simply because the default SharedUserData->NtProductType was "0" (which is an invalid product type, but it's != NtProductTypeNt). - Also fixed it such that this reports NtProductServer, which is what ReactOS reports to be (Windows 2003 Server SP 1). - Initialize the
by ros-arm-bringup＠svn.reactos.org 27 Jul '09

27 Jul '09

Author: ros-arm-bringup Date: Mon Jul 27 02:52:44 2009 New Revision: 42251 URL: http://svn.reactos.org/svn/reactos?rev=42251&view=rev Log: - Create \dev\physmem section during section initialization, not later. - Setup SharedUserData settings during Phase 0, not Phase 1. Fixes an old bug where the Inbv driver assumed ReactOS was in "server mode" simply because the default SharedUserData->NtProductType was "0" (which is an invalid product type, but it's != NtProductTypeNt). - Also fixed it such that this reports NtProductServer, which is what ReactOS reports to be (Windows 2003 Server SP 1). - Initialize the modified page writer and balancer thread in phase 1, not phase 2. - Phase 2 should make the executive pageable, but I don't think this is supported yet... Modified: trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/section.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] Mon Jul 27 02:52:44 2009 @@ -195,8 +195,13 @@ /* Initialize the loaded module list */ MiInitializeLoadedModuleList(LoaderBlock); - /* We're done, for now */ - DPRINT("Mm0: COMPLETE\n"); + /* Setup shared user data settings that NT does as well */ + ASSERT(SharedUserData->NumberOfPhysicalPages == 0); + SharedUserData->NumberOfPhysicalPages = MmStats.NrTotalPages; + SharedUserData->LargePageMinimum = 0; + + /* For now, we assume that we're always Server */ + SharedUserData->NtProductType = NtProductServer; } else if (Phase == 1) { @@ -204,32 +209,23 @@ MmInitializePageOp(); MmInitSectionImplementation(); MmInitPagingFile(); - MmCreatePhysicalMemorySection(); - - /* Setup shared user data settings that NT does as well */ - ASSERT(SharedUserData->NumberOfPhysicalPages == 0); - SharedUserData->NumberOfPhysicalPages = MmStats.NrTotalPages; - SharedUserData->LargePageMinimum = 0; - - /* For now, we assume that we're always Workstation */ - SharedUserData->NtProductType = NtProductWinNt; - } - else if (Phase == 2) - { + /* - * Unmap low memory - */ + * Unmap low memory + */ MiInitBalancerThread(); - + /* - * Initialise the modified page writer. - */ + * Initialise the modified page writer. + */ MmInitMpwThread(); - + /* Initialize the balance set manager */ MmInitBsmThread(); - - /* FIXME: Read parameters from memory */ + } + else if (Phase == 2) + { + } return TRUE; Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Mon Jul 27 02:52:44 2009 @@ -2328,6 +2328,8 @@ ObjectTypeInitializer.CloseProcedure = MmpCloseSection; ObjectTypeInitializer.ValidAccessMask = SECTION_ALL_ACCESS; ObCreateObjectType(&Name, &ObjectTypeInitializer, NULL, &MmSectionObjectType); + + MmCreatePhysicalMemorySection(); return(STATUS_SUCCESS); }

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
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