Ros-diffs June 2009

ros-diffs@reactos.org

21 participants
496 discussions

[dreimer] 41516: Bug 4626: slovak update by Mario Kacmar
by dreimer＠svn.reactos.org 21 Jun '09

21 Jun '09

Author: dreimer Date: Mon Jun 22 00:00:00 2009 New Revision: 41516 URL: http://svn.reactos.org/svn/reactos?rev=41516&view=rev Log: Bug 4626: slovak update by Mario Kacmar Modified: trunk/reactos/dll/cpl/input/lang/sk-SK.rc trunk/reactos/dll/cpl/main/lang/sk-SK.rc Modified: trunk/reactos/dll/cpl/input/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/input/lang/sk-SK.r… ============================================================================== --- trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/input/lang/sk-SK.rc [iso-8859-1] Mon Jun 22 00:00:00 2009 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 01-03-2008 - * LAST CHANGE: 17-02-2009 + * LAST CHANGE: 14-06-2009 */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -90,14 +90,14 @@ IDS_KEYBOARD "Klávesnica" IDS_NONE "(Nie je)" IDS_UNKNOWN "(Neznáme)" - IDS_RESTART "Do you want to restart your computer now?" + IDS_RESTART "Chcete teraz retartova Vá poèítaè?" IDS_WHATS_THIS "Èo je toto?" IDS_LANGUAGE "Jazyk" IDS_LAYOUT "Rozloenie klávesnice" - IDS_REM_QUESTION "Do you want to remove selected keyboard layout?" + IDS_REM_QUESTION "Chcete odstráni vybrané rozloenie klávesnice?" IDS_CONFIRMATION "Potvrdenie" //Confirmation - IDS_LAYOUT_EXISTS "This layout already exists." - IDS_LAYOUT_EXISTS2 "This layout already exists and can not be added." + IDS_LAYOUT_EXISTS "Toto rozloenie u existuje." + IDS_LAYOUT_EXISTS2 "Toto rozloenie u existuje a nemôe by pridané." IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "¼avý Alt+Shift" IDS_SWITCH_BET_INLANG "Switch between input languages" Modified: trunk/reactos/dll/cpl/main/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/main/lang/sk-SK.rc… ============================================================================== --- trunk/reactos/dll/cpl/main/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/main/lang/sk-SK.rc [iso-8859-1] Mon Jun 22 00:00:00 2009 @@ -1,6 +1,6 @@ /* TRANSLATOR : Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk) * DATE OF TR.: 02-02-2008 - * LAST CHANGE: 17-06-2008 + * LAST CHANGE: 14-06-2009 * ______________________________________________ * NOTE: this file is not fully translated */ @@ -12,23 +12,23 @@ CAPTION "Rýchlos" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Character repeat", -1, 5, 5, 230, 130 + GROUPBOX "Opakovanie znakov", -1, 5, 5, 230, 130 ICON IDI_REPEAT_DELAY, IDC_ICON_REPEAT_DELAY, 15, 15, 15, 15 - LTEXT "Repeat &delay", -1, 40, 15, 50, 10 - LTEXT "Long", -1, 40, 30, 20, 10 - LTEXT "Short", -1, 200, 30, 20, 10 + LTEXT "Oneskorenie pre&d opakovaním:", -1, 40, 15, 50, 10 + LTEXT "dlhé", -1, 40, 30, 20, 10 + LTEXT "krátke", -1, 200, 30, 20, 10 CONTROL "",IDC_SLIDER_REPEAT_DELAY, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 30, 130, 17 ICON IDI_REPEAT_RATE, IDC_ICON_REPEAT_RATE, 15, 70, 15, 15 - LTEXT "&Repeat rate", -1, 40, 70, 50, 10 - LTEXT "Slow", -1, 40, 85, 20, 10 - LTEXT "Fast", -1, 200, 85, 20, 10 + LTEXT "&Rýchlos opakovania:", -1, 40, 70, 50, 10 + LTEXT "malá", -1, 40, 85, 20, 10 //pomaly + LTEXT "ve¾ká", -1, 200, 85, 20, 10 //rýchlo CONTROL "",IDC_SLIDER_REPEAT_RATE, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 85, 130, 17 - LTEXT "Click here and hold down a key to &test repeat rate:", -1, 15, 105, 150, 10 + LTEXT "Kliknite sem a podrte kláves k o&testovaniu rýchlosti opakovania:", -1, 15, 105, 150, 10 EDITTEXT IDC_EDIT_REPEAT_RATE, 15, 115, 200, 15, WS_CHILD | WS_VISIBLE | WS_GROUP - GROUPBOX "Cursor &blink rate:", -1, 5, 145, 230, 50 + GROUPBOX "&Blikanie kurzora:", -1, 5, 145, 230, 50 LTEXT "", IDC_TEXT_CURSOR_BLINK, 20, 165, 1, 8 - LTEXT "None", -1, 40, 165, 30, 10 - LTEXT "Fast", -1, 200, 165, 30, 10 + LTEXT "iadne", -1, 40, 165, 30, 10 + LTEXT "rýchle", -1, 200, 165, 30, 10 CONTROL "",IDC_SLIDER_CURSOR_BLINK, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 65, 165, 130, 17 END

1 0

[fireball] 41515: - Implement two helper functions to correctly set permissions for a window station and desktops. Those are unused now, but they are going to solve two problems in current winlogon. First of them being a "big HACK" in CreateWindowStationAndDesktops(), which has to do CloseDesktop / OpenDesktopW to get a non-inheritable handle with GENERIC_ALL righs. Second problem is that security attributes structure passed to CreateWindowStationW and CreateDesktopW are invalid because now lpSe
by fireball＠svn.reactos.org 21 Jun '09

21 Jun '09

Author: fireball Date: Sun Jun 21 23:23:06 2009 New Revision: 41515 URL: http://svn.reactos.org/svn/reactos?rev=41515&view=rev Log: - Implement two helper functions to correctly set permissions for a window station and desktops. Those are unused now, but they are going to solve two problems in current winlogon. First of them being a "big HACK" in CreateWindowStationAndDesktops(), which has to do CloseDesktop / OpenDesktopW to get a non-inheritable handle with GENERIC_ALL righs. Second problem is that security attributes structure passed to CreateWindowStationW and CreateDesktopW are invalid because now lpSecurityDescriptor points to an ACL but it's supposed to point to an actual SECURITY_DESCRIPTOR structure. Information from: http://msdn.microsoft.com/en-us/library/aa379608.aspx. Modified: trunk/reactos/base/system/winlogon/wlx.c Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c… ============================================================================== --- trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/wlx.c [iso-8859-1] Sun Jun 21 23:23:06 2009 @@ -15,6 +15,20 @@ #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(winlogon); + +#define DESKTOP_ALL (DESKTOP_READOBJECTS | DESKTOP_CREATEWINDOW | \ + DESKTOP_CREATEMENU | DESKTOP_HOOKCONTROL | DESKTOP_JOURNALRECORD | \ + DESKTOP_JOURNALPLAYBACK | DESKTOP_ENUMERATE | DESKTOP_WRITEOBJECTS | \ + DESKTOP_SWITCHDESKTOP | STANDARD_RIGHTS_REQUIRED) + +#define WINSTA_ALL (WINSTA_ENUMDESKTOPS | WINSTA_READATTRIBUTES | \ + WINSTA_ACCESSCLIPBOARD | WINSTA_CREATEDESKTOP | \ + WINSTA_WRITEATTRIBUTES | WINSTA_ACCESSGLOBALATOMS | \ + WINSTA_EXITWINDOWS | WINSTA_ENUMERATE | WINSTA_READSCREEN | \ + STANDARD_RIGHTS_REQUIRED) + +#define GENERIC_ACCESS (GENERIC_READ | GENERIC_WRITE | \ + GENERIC_EXECUTE | GENERIC_ALL) /* GLOBALS ******************************************************************/ @@ -758,6 +772,185 @@ } BOOL +AddAceToWindowStation( + IN HWINSTA WinSta, + IN PSID Sid) +{ + DWORD AclSize; + SECURITY_INFORMATION SecurityInformation; + PACL pDefaultAcl = NULL; + PSECURITY_DESCRIPTOR WinstaSd = NULL; + PACCESS_ALLOWED_ACE Ace = NULL; + BOOL Ret = FALSE; + + /* Allocate space for an ACL */ + AclSize = sizeof(ACL) + + 2 * (FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + GetLengthSid(Sid)); + pDefaultAcl = HeapAlloc(GetProcessHeap(), 0, AclSize); + if (!pDefaultAcl) + { + ERR("WL: HeapAlloc() failed\n"); + goto cleanup; + } + + /* Initialize it */ + if (!InitializeAcl(pDefaultAcl, AclSize, ACL_REVISION)) + { + ERR("WL: InitializeAcl() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Initialize new security descriptor */ + WinstaSd = HeapAlloc(GetProcessHeap(), 0, SECURITY_DESCRIPTOR_MIN_LENGTH); + if (!InitializeSecurityDescriptor(WinstaSd, SECURITY_DESCRIPTOR_REVISION)) + { + ERR("WL: InitializeSecurityDescriptor() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Allocate memory for access allowed ACE */ + Ace = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(ACCESS_ALLOWED_ACE)+ + GetLengthSid(Sid) - sizeof(DWORD)); + + /* Create the first ACE for the window station */ + Ace->Header.AceType = ACCESS_ALLOWED_ACE_TYPE; + Ace->Header.AceFlags = CONTAINER_INHERIT_ACE | INHERIT_ONLY_ACE | OBJECT_INHERIT_ACE; + Ace->Header.AceSize = sizeof(ACCESS_ALLOWED_ACE) + GetLengthSid(Sid) - sizeof(DWORD); + Ace->Mask = GENERIC_ACCESS; + + /* Copy the sid */ + if (!CopySid(GetLengthSid(Sid), &Ace->SidStart, Sid)) + { + ERR("WL: CopySid() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Add the first ACE */ + if (!AddAce(pDefaultAcl, ACL_REVISION, MAXDWORD, (LPVOID)Ace, Ace->Header.AceSize)) + { + ERR("WL: AddAce() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Add the second ACE to the end of ACL */ + Ace->Header.AceFlags = NO_PROPAGATE_INHERIT_ACE; + Ace->Mask = WINSTA_ALL; + if (!AddAce(pDefaultAcl, ACL_REVISION, MAXDWORD, (LPVOID)Ace, Ace->Header.AceSize)) + { + ERR("WL: AddAce() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Add ACL to winsta's security descriptor */ + if (!SetSecurityDescriptorDacl(WinstaSd, TRUE, pDefaultAcl, FALSE)) + { + ERR("WL: SetSecurityDescriptorDacl() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Apply security to the window station */ + SecurityInformation = DACL_SECURITY_INFORMATION; + if (!SetUserObjectSecurity(WinSta, &SecurityInformation, WinstaSd)) + { + ERR("WL: SetUserObjectSecurity() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Indicate success */ + Ret = TRUE; + +cleanup: + /* Free allocated stuff */ + if (pDefaultAcl) HeapFree(GetProcessHeap(), 0, pDefaultAcl); + if (WinstaSd) HeapFree(GetProcessHeap(), 0, WinstaSd); + if (Ace) HeapFree(GetProcessHeap(), 0, Ace); + + return Ret; +} + +BOOL +AddAceToDesktop( + IN HDESK Desktop, + IN PSID WinlogonSid, + IN PSID UserSid) +{ + DWORD AclSize; + SECURITY_INFORMATION SecurityInformation; + PACL Acl = NULL; + PSECURITY_DESCRIPTOR DesktopSd = NULL; + BOOL Ret = FALSE; + + /* Allocate ACL */ + AclSize = sizeof(ACL) + + FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + GetLengthSid(WinlogonSid); + + /* Take user's sid into account */ + if (UserSid) + AclSize += FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + GetLengthSid(UserSid); + + Acl = HeapAlloc(GetProcessHeap(), 0, AclSize); + if (!Acl) + { + ERR("WL: HeapAlloc() failed\n"); + goto cleanup; + } + + /* Initialize ACL */ + if (!InitializeAcl(Acl, AclSize, ACL_REVISION)) + { + ERR("WL: InitializeAcl() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Add full desktop access ACE for winlogon */ + if (!AddAccessAllowedAce(Acl, ACL_REVISION, DESKTOP_ALL, WinlogonSid)) + { + ERR("WL: AddAccessAllowedAce() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Add full desktop access ACE for a user (if provided) */ + if (UserSid && !AddAccessAllowedAce(Acl, ACL_REVISION, DESKTOP_ALL, UserSid)) + { + ERR("WL: AddAccessAllowedAce() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Initialize new security descriptor */ + DesktopSd = HeapAlloc(GetProcessHeap(), 0, SECURITY_DESCRIPTOR_MIN_LENGTH); + if (!InitializeSecurityDescriptor(DesktopSd, SECURITY_DESCRIPTOR_REVISION)) + { + ERR("WL: InitializeSecurityDescriptor() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Add ACL to the security descriptor */ + if (!SetSecurityDescriptorDacl(DesktopSd, TRUE, Acl, FALSE)) + { + ERR("WL: SetSecurityDescriptorDacl() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Apply security to the window station */ + SecurityInformation = DACL_SECURITY_INFORMATION; + if (!SetUserObjectSecurity(Desktop, &SecurityInformation, DesktopSd)) + { + ERR("WL: SetUserObjectSecurity() failed (error %lu)\n", GetLastError()); + goto cleanup; + } + + /* Indicate success */ + Ret = TRUE; + +cleanup: + /* Free allocated stuff */ + if (Acl) HeapFree(GetProcessHeap(), 0, Acl); + if (DesktopSd) HeapFree(GetProcessHeap(), 0, DesktopSd); + + return Ret; +} + +BOOL CreateWindowStationAndDesktops( IN OUT PWLSESSION Session) {

1 0

[gedmurphy] 41514: Add a built in command '.cls' command for clearing the output. Built in commands will be prepended with a period.
by gedmurphy＠svn.reactos.org 21 Jun '09

21 Jun '09

Author: gedmurphy Date: Sun Jun 21 22:25:18 2009 New Revision: 41514 URL: http://svn.reactos.org/svn/reactos?rev=41514&view=rev Log: Add a built in command '.cls' command for clearing the output. Built in commands will be prepended with a period. Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs trunk/tools/reactosdbg/RosDBG/Properties/AssemblyInfo.cs Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] Sun Jun 21 22:25:18 2009 @@ -28,6 +28,7 @@ List<string> textToAdd = new List<string>(); string kdbPrompt = "\r\nkdb:> "; + private string[] builtinCommands = { ".cls", ".reload" }; public RawTraffic() @@ -48,6 +49,36 @@ mConnection = conn; conn.DebugRawTrafficEvent += DebugRawTrafficEvent; } + + private void ParseBuiltinCommand(string command) + { + if (command == ".cls") + { + AddCommandToList(command); + RawTrafficText.Text = string.Empty; + } + } + + private void ParseGdbCommand(string command) + { + AddCommandToList(command); + RawTrafficTextBox.Text += '\r'; //FIXME: remove this + SendCommandToDebugger(); + RawTrafficTextBox.Text = string.Empty; + } + + private void ParseCommand(string command) + { + if (command.StartsWith(".")) + { + ParseBuiltinCommand(command); + } + else + { + ParseGdbCommand(command); + } + } + void UpdateText() { @@ -81,6 +112,12 @@ private void AddCommandToList(string cmd) { + if (prevCommand.Count > 0 && + prevCommand[prevCommand.Count - 1] == cmd) + { + return; + } + if (prevCommand.Count == maxCommands) { for (int i = 0; i < prevCommand.Count; i++) @@ -175,10 +212,10 @@ switch (e.KeyCode) { case Keys.Enter: - AddCommandToList(RawTrafficTextBox.Text); - RawTrafficTextBox.Text += '\r'; //FIXME: remove this - SendCommandToDebugger(); - RawTrafficTextBox.Text = string.Empty; + if (RawTrafficTextBox.Text.Length > 0) + { + ParseCommand(RawTrafficTextBox.Text); + } break; case Keys.Up: 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] Sun Jun 21 22:25:18 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.62")] -[assembly: AssemblyFileVersion("1.0.2.62")] +[assembly: AssemblyVersion("1.0.2.63")] +[assembly: AssemblyFileVersion("1.0.2.63")]

1 0

[sginsberg] 41513: - Define noreturn attribute for KeBugCheckWithTf and KiBugCheckDebugBreak in a msvc compatible way
by sginsberg＠svn.reactos.org 21 Jun '09

21 Jun '09

Author: sginsberg Date: Sun Jun 21 21:06:34 2009 New Revision: 41513 URL: http://svn.reactos.org/svn/reactos?rev=41513&view=rev Log: - Define noreturn attribute for KeBugCheckWithTf and KiBugCheckDebugBreak in a msvc compatible way Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/ke/bug.c Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Sun Jun 21 21:06:34 2009 @@ -790,6 +790,7 @@ IN OUT PCONTEXT Context ); +DECLSPEC_NORETURN VOID NTAPI KeBugCheckWithTf( Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=4151… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Sun Jun 21 21:06:34 2009 @@ -546,9 +546,9 @@ } } +DECLSPEC_NORETURN VOID NTAPI -__declspec(noreturn) KiBugCheckDebugBreak(IN ULONG StatusCode) { /* If KDBG isn't connected, freeze the CPU, otherwise, break */ @@ -751,7 +751,6 @@ VOID NTAPI -__declspec(noreturn) KeBugCheckWithTf(IN ULONG BugCheckCode, IN ULONG_PTR BugCheckParameter1, IN ULONG_PTR BugCheckParameter2,

1 0

[janderwald] 41512: - Don't release object which drivers should release - Fixes a few crashes when starting another audio stream
by janderwald＠svn.reactos.org 21 Jun '09

21 Jun '09

Author: janderwald Date: Sun Jun 21 14:48:09 2009 New Revision: 41512 URL: http://svn.reactos.org/svn/reactos?rev=41512&view=rev Log: - Don't release object which drivers should release - Fixes a few crashes when starting another audio stream Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c [iso-8859-1] Sun Jun 21 14:48:09 2009 @@ -692,8 +692,6 @@ } This->ServiceGroup->lpVtbl->RemoveMember(This->ServiceGroup, (PSERVICESINK)&This->lpVtblServiceSink); - This->ServiceGroup->lpVtbl->Release(This->ServiceGroup); - This->DmaChannel->lpVtbl->Release(This->DmaChannel); Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&ISubDevice); if (NT_SUCCESS(Status)) @@ -735,7 +733,6 @@ This->Filter->lpVtbl->FreePin(This->Filter, (IPortPinWaveCyclic*)This); DPRINT1("Closing stream at Irql %u\n", KeGetCurrentIrql()); Stream->lpVtbl->Release(Stream); - /* this line is never reached */ } } @@ -1064,8 +1061,8 @@ Status = This->Stream->lpVtbl->SetNotificationFreq(This->Stream, 10, &This->FrameSize); //This->Stream->lpVtbl->SetFormat(This->Stream, (PKSDATAFORMAT)This->Format); - DPRINT1("Setting state to acquire %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_ACQUIRE)); - DPRINT1("Setting state to pause %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_PAUSE)); + DPRINT1("Setting state to acquire %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_ACQUIRE)); + DPRINT1("Setting state to pause %x\n", This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_PAUSE)); This->State = KSSTATE_PAUSE; Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c [iso-8859-1] Sun Jun 21 14:48:09 2009 @@ -391,14 +391,12 @@ if (This->State != KSSTATE_STOP) { This->Stream->lpVtbl->SetState(This->Stream, KSSTATE_STOP); - KeStallExecutionProcessor(10); } } if (This->ServiceGroup) { This->ServiceGroup->lpVtbl->RemoveMember(This->ServiceGroup, (PSERVICESINK)&This->lpVtblServiceSink); - This->ServiceGroup->lpVtbl->Release(This->ServiceGroup); } Status = This->Port->lpVtbl->QueryInterface(This->Port, &IID_ISubdevice, (PVOID*)&ISubDevice); @@ -407,20 +405,15 @@ Status = ISubDevice->lpVtbl->GetDescriptor(ISubDevice, &Descriptor); if (NT_SUCCESS(Status)) { - ISubDevice->lpVtbl->Release(ISubDevice); Descriptor->Factory.Instances[This->ConnectDetails->PinId].CurrentPinInstanceCount--; } + ISubDevice->lpVtbl->Release(ISubDevice); } if (This->Format) { ExFreePool(This->Format); This->Format = NULL; - } - - if (This->WaveStream) - { - This->WaveStream->lpVtbl->Release(This->WaveStream); } /* complete the irp */ @@ -440,7 +433,6 @@ This->Stream = NULL; DPRINT1("Closing stream at Irql %u\n", KeGetCurrentIrql()); Stream->lpVtbl->Release(Stream); - /* this line is never reached */ } } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c [iso-8859-1] Sun Jun 21 14:48:09 2009 @@ -702,9 +702,9 @@ Status = ISubDevice->lpVtbl->GetDescriptor(ISubDevice, &Descriptor); if (NT_SUCCESS(Status)) { - ISubDevice->lpVtbl->Release(ISubDevice); Descriptor->Factory.Instances[This->ConnectDetails->PinId].CurrentPinInstanceCount--; } + ISubDevice->lpVtbl->Release(ISubDevice); } if (This->Format) @@ -735,7 +735,6 @@ This->Stream = NULL; DPRINT1("Closing stream at Irql %u\n", KeGetCurrentIrql()); Stream->lpVtbl->Release(Stream); - /* this line is never reached */ } }

1 0

[ros-arm-bringup] 41511: - MC_NPPOOL is special-cased in the memory balancer core to always force the allocation of a page, even in low-memory conditions (which in ReactOS, occur early-on because, in a stroke of typical ReactOS genius, the balancer core is called before the balancer initailizes its values and thresholds). Make MC_SYSTEM special-cased as well, so we never fail to allocate page tables early-on. - This fixes booting on systems which required enough page tables such that the balance
by ros-arm-bringup＠svn.reactos.org 21 Jun '09

21 Jun '09

Author: ros-arm-bringup Date: Sun Jun 21 13:08:05 2009 New Revision: 41511 URL: http://svn.reactos.org/svn/reactos?rev=41511&view=rev Log: - MC_NPPOOL is special-cased in the memory balancer core to always force the allocation of a page, even in low-memory conditions (which in ReactOS, occur early-on because, in a stroke of typical ReactOS genius, the balancer core is called before the balancer initailizes its values and thresholds). Make MC_SYSTEM special-cased as well, so we never fail to allocate page tables early-on. - This fixes booting on systems which required enough page tables such that the balancer refused the allocation of new pages (around 64+16 pages for page tables of 4KB each, ie. 320MB). Modified: trunk/reactos/ntoskrnl/mm/balance.c Modified: trunk/reactos/ntoskrnl/mm/balance.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/balance.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/balance.c [iso-8859-1] Sun Jun 21 13:08:05 2009 @@ -85,6 +85,8 @@ MiMemoryConsumers[MC_PPOOL].PagesTarget = NrAvailablePages / 2; MiMemoryConsumers[MC_NPPOOL].PagesTarget = 0xFFFFFFFF; MiMemoryConsumers[MC_NPPOOL].PagesUsed = NrSystemPages; + MiMemoryConsumers[MC_SYSTEM].PagesTarget = 0xFFFFFFFF; + MiMemoryConsumers[MC_SYSTEM].PagesUsed = 0; } VOID @@ -221,7 +223,7 @@ /* * Allocate always memory for the non paged pool and for the pager thread. */ - if (Consumer == MC_NPPOOL || MiIsBalancerThread()) + if ((Consumer == MC_NPPOOL) || (Consumer == MC_SYSTEM) || MiIsBalancerThread()) { Page = MmAllocPage(Consumer, 0); if (Page == 0)

1 0

[ros-arm-bringup] 41510: - Nonpaged pool MEMORY_AREA is now initialized during nonpaged pool initialization (and it is now a static MEMORY_AREA). - Paged pool MEMORY_AREA is now initialized during paged pool initialization. - Remaining MEMORY_AREAs (KPCR and KUSER_SHARED_DATA) are now created in MiInitSystemMemoryAreas (and they are also static) instead of MmInitVirtualMemory, since this is really what the function was doing. - The page table and hyperspace MEMORY_AREAs are still initialized the
by ros-arm-bringup＠svn.reactos.org 21 Jun '09

21 Jun '09

Author: ros-arm-bringup Date: Sun Jun 21 10:36:45 2009 New Revision: 41510 URL: http://svn.reactos.org/svn/reactos?rev=41510&view=rev Log: - Nonpaged pool MEMORY_AREA is now initialized during nonpaged pool initialization (and it is now a static MEMORY_AREA). - Paged pool MEMORY_AREA is now initialized during paged pool initialization. - Remaining MEMORY_AREAs (KPCR and KUSER_SHARED_DATA) are now created in MiInitSystemMemoryAreas (and they are also static) instead of MmInitVirtualMemory, since this is really what the function was doing. - The page table and hyperspace MEMORY_AREAs are still initialized the same, but are also now static. - The creation of these core/system memory areas is now done much earlier. For example, hyperspace memory area is now created before hyperspace is mapped. - Nonpaged pool, paged pool, and working set initialization is now done outside MiInitSystemMemoryAreas and roughly at the same time as before. - Removed MmInitVirtualMemory as it had become a kitchen sink of random Memory Manager initialization code. - I/O and Local APIC MEMORY_AREAs are not created anymore, since that should be done by the HAL, not the kernel. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/mm.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/mm/npool.c trunk/reactos/ntoskrnl/mm/ppool.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] Sun Jun 21 10:36:45 2009 @@ -29,7 +29,7 @@ typedef ULONG SWAPENTRY; typedef ULONG PFN_TYPE, *PPFN_TYPE; -#define MI_STATIC_MEMORY_AREAS (1) +#define MI_STATIC_MEMORY_AREAS (6) #define MEMORY_AREA_INVALID (0) #define MEMORY_AREA_SECTION_VIEW (1) 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] Sun Jun 21 10:36:45 2009 @@ -1161,7 +1161,7 @@ BoundaryAddressMultiple.QuadPart = 0; BaseAddress = (PVOID)PAGETABLE_MAP; Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, + MEMORY_AREA_SYSTEM | MEMORY_AREA_STATIC, &BaseAddress, 0x400000, PAGE_READWRITE, @@ -1175,7 +1175,7 @@ } BaseAddress = (PVOID)HYPERSPACE; Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, + MEMORY_AREA_SYSTEM | MEMORY_AREA_STATIC, &BaseAddress, 0x400000, PAGE_READWRITE, Modified: trunk/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev=41510… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] Sun Jun 21 10:36:45 2009 @@ -293,7 +293,8 @@ break; case MEMORY_AREA_SHARED_DATA: - Pfn = MmSharedDataPagePhysicalAddress.LowPart >> PAGE_SHIFT; + Pfn = MmGetPhysicalAddress((PVOID)PCR).LowPart >> PAGE_SHIFT; + Pfn++; Status = MmCreateVirtualMapping(PsGetCurrentProcess(), (PVOID)PAGE_ROUND_DOWN(Address), 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] Sun Jun 21 10:36:45 2009 @@ -47,7 +47,6 @@ BOOLEAN IsThisAnNtAsSystem = FALSE; MM_SYSTEMSIZE MmSystemSize = MmSmallSystem; -PHYSICAL_ADDRESS MmSharedDataPagePhysicalAddress; PVOID MiNonPagedPoolStart; ULONG MiNonPagedPoolLength; ULONG MmBootImageSize; @@ -107,110 +106,45 @@ VOID INIT_FUNCTION NTAPI -MmInitVirtualMemory() -{ - PVOID BaseAddress; - ULONG Length; - NTSTATUS Status; - PHYSICAL_ADDRESS BoundaryAddressMultiple; - PMEMORY_AREA MArea; - - BoundaryAddressMultiple.QuadPart = 0; - - DPRINT("NonPagedPool %x - %x, PagedPool %x - %x\n", MiNonPagedPoolStart, (ULONG_PTR)MiNonPagedPoolStart + MiNonPagedPoolLength - 1, - MmPagedPoolBase, (ULONG_PTR)MmPagedPoolBase + MmPagedPoolSize - 1); - - MiInitializeNonPagedPool(); - - /* - * Setup the system area descriptor list - */ - MiInitPageDirectoryMap(); - - BaseAddress = (PVOID)PCR; - MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, - &BaseAddress, - PAGE_SIZE * KeNumberProcessors, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - -#if defined(_M_IX86) - /* Local APIC base */ - BaseAddress = (PVOID)0xFEE00000; - MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, - &BaseAddress, - PAGE_SIZE, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - - /* i/o APIC base */ - BaseAddress = (PVOID)0xFEC00000; - MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, - &BaseAddress, - PAGE_SIZE, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); -#endif - - BaseAddress = MiNonPagedPoolStart; - MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, - &BaseAddress, - MiNonPagedPoolLength, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - - BaseAddress = MmPagedPoolBase; - Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_PAGED_POOL, - &BaseAddress, - MmPagedPoolSize, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - - MmInitializePagedPool(); - - /* - * Create the kernel mapping of the user/kernel shared memory. - */ - BaseAddress = (PVOID)KI_USER_SHARED_DATA; - Length = PAGE_SIZE; - MmCreateMemoryArea(MmGetKernelAddressSpace(), - MEMORY_AREA_SYSTEM, - &BaseAddress, - Length, - PAGE_READWRITE, - &MArea, - TRUE, - 0, - BoundaryAddressMultiple); - - /* Shared data are always located the next page after PCR */ - MmSharedDataPagePhysicalAddress = MmGetPhysicalAddress((PVOID)PCR); - MmSharedDataPagePhysicalAddress.QuadPart += PAGE_SIZE; - - /* - * - */ - MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); +MiInitSystemMemoryAreas() +{ + PVOID BaseAddress; + PHYSICAL_ADDRESS BoundaryAddressMultiple; + PMEMORY_AREA MArea; + BoundaryAddressMultiple.QuadPart = 0; + + // + // First initialize the page table and hyperspace memory areas + // + MiInitPageDirectoryMap(); + + // + // Next, the KPCR + // + BaseAddress = (PVOID)PCR; + MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_SYSTEM | MEMORY_AREA_STATIC, + &BaseAddress, + PAGE_SIZE * KeNumberProcessors, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + + // + // Now the KUSER_SHARED_DATA + // + BaseAddress = (PVOID)KI_USER_SHARED_DATA; + MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_SYSTEM | MEMORY_AREA_STATIC, + &BaseAddress, + PAGE_SIZE, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); } VOID @@ -432,6 +366,9 @@ /* Dump kernel memory layout */ MiDbgKernelLayout(); + + /* Intialize system memory areas */ + MiInitSystemMemoryAreas(); /* Initialize hyperspace */ MiInitHyperSpace(); @@ -441,12 +378,18 @@ /* Unmap low memory */ MmDeletePageTable(NULL, 0); - - /* Intialize memory areas */ - MmInitVirtualMemory(); + + /* Initialize nonpaged pool */ + MiInitializeNonPagedPool(); + + /* Initialize paged pool */ + MmInitializePagedPool(); /* Initialize MDLs */ MmInitializeMdlImplementation(); + + /* Initialize working sets */ + MmInitializeMemoryConsumer(MC_USER, MmTrimUserMemory); } BOOLEAN Modified: trunk/reactos/ntoskrnl/mm/npool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/npool.c?rev=41… ============================================================================== --- trunk/reactos/ntoskrnl/mm/npool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/npool.c [iso-8859-1] Sun Jun 21 10:36:45 2009 @@ -1699,6 +1699,22 @@ PVOID Address; HDR_USED* used; HDR_FREE* free; + PVOID BaseAddress; + PHYSICAL_ADDRESS BoundaryAddressMultiple; + PMEMORY_AREA MArea; + BoundaryAddressMultiple.QuadPart = 0; + + BaseAddress = MiNonPagedPoolStart; + MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_SYSTEM | MEMORY_AREA_STATIC, + &BaseAddress, + MiNonPagedPoolLength, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + #ifdef TAG_STATISTICS_TRACKING for (i = 0; i < TAG_HASH_TABLE_SIZE; i++) Modified: trunk/reactos/ntoskrnl/mm/ppool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ppool.c?rev=41… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] Sun Jun 21 10:36:45 2009 @@ -52,6 +52,22 @@ NTAPI MmInitializePagedPool(VOID) { + PVOID BaseAddress; + PHYSICAL_ADDRESS BoundaryAddressMultiple; + PMEMORY_AREA MArea; + BoundaryAddressMultiple.QuadPart = 0; + + BaseAddress = MmPagedPoolBase; + MmCreateMemoryArea(MmGetKernelAddressSpace(), + MEMORY_AREA_PAGED_POOL, + &BaseAddress, + MmPagedPoolSize, + PAGE_READWRITE, + &MArea, + TRUE, + 0, + BoundaryAddressMultiple); + /* * We are still at a high IRQL level at this point so explicitly commit * the first page of the paged pool before writing the first block header.

1 0

[ros-arm-bringup] 41509: - Introduce a new MEMORY_AREA flag, MEMORY_AREA_STATIC: - MEMORY_AREA structures are typically allocated from nonpaged pool, under the assumption it exists. - However, nonpaged pool itself is described by a MEMORY_AREA. Right now, this MEMORY_AREA is created after nonpaged pool has been initialized (it is a miracle this works). - This new flag allows MEMORY_AREA structures to be allocated statically, allowing the description of certain system address space components, th
by ros-arm-bringup＠svn.reactos.org 21 Jun '09

21 Jun '09

Author: ros-arm-bringup Date: Sun Jun 21 09:46:50 2009 New Revision: 41509 URL: http://svn.reactos.org/svn/reactos?rev=41509&view=rev Log: - Introduce a new MEMORY_AREA flag, MEMORY_AREA_STATIC: - MEMORY_AREA structures are typically allocated from nonpaged pool, under the assumption it exists. - However, nonpaged pool itself is described by a MEMORY_AREA. Right now, this MEMORY_AREA is created after nonpaged pool has been initialized (it is a miracle this works). - This new flag allows MEMORY_AREA structures to be allocated statically, allowing the description of certain system address space components, themselves prerequisites to nonpaged pool creation, as well as the nonpaged pool component itself, before nonpaged pool has been initialized. - This is not yet used. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/marea.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] Sun Jun 21 09:46:50 2009 @@ -28,6 +28,8 @@ struct _MM_PAGEOP; typedef ULONG SWAPENTRY; typedef ULONG PFN_TYPE, *PPFN_TYPE; + +#define MI_STATIC_MEMORY_AREAS (1) #define MEMORY_AREA_INVALID (0) #define MEMORY_AREA_SECTION_VIEW (1) @@ -43,6 +45,7 @@ #define MEMORY_AREA_PAGED_POOL (12) #define MEMORY_AREA_NO_ACCESS (13) #define MEMORY_AREA_PEB_OR_TEB (14) +#define MEMORY_AREA_STATIC (0x80000000) #define MM_PHYSICAL_PAGE_MPW_PENDING (0x8) Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=41… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sun Jun 21 09:46:50 2009 @@ -49,6 +49,9 @@ #pragma alloc_text(INIT, MmInitMemoryAreas) #endif +MEMORY_AREA MiStaticMemoryAreas[MI_STATIC_MEMORY_AREAS]; +ULONG MiStaticMemoryAreaCount; + /* #define VALIDATE_MEMORY_AREAS */ /* FUNCTIONS *****************************************************************/ @@ -986,9 +989,28 @@ return STATUS_CONFLICTING_ADDRESSES; } } - - MemoryArea = ExAllocatePoolWithTag(NonPagedPool, sizeof(MEMORY_AREA), - TAG_MAREA); + + // + // Is this a static memory area? + // + if (Type & MEMORY_AREA_STATIC) + { + // + // Use the static array instead of the pool + // + ASSERT(MiStaticMemoryAreaCount < MI_STATIC_MEMORY_AREAS); + MemoryArea = &MiStaticMemoryAreas[MiStaticMemoryAreaCount++]; + } + else + { + // + // Allocate the memory area from nonpaged pool + // + MemoryArea = ExAllocatePoolWithTag(NonPagedPool, + sizeof(MEMORY_AREA), + TAG_MAREA); + } + RtlZeroMemory(MemoryArea, sizeof(MEMORY_AREA)); MemoryArea->Type = Type; MemoryArea->StartingAddress = *BaseAddress;

1 0

[ros-arm-bringup] 41508: - Define a new consumer: MC_SYSTEM: - Right now, it is only used for allocating new page tables for kernel-mode mappings. - This consumer's pages are never zeroed automatically (this is a more endemic ReactOS problem -- kernel pages are zeroed when they shouldn't be). - New page tables, however, should indeed be zeroed, so now they are zeroed manually with RtlZeroMemory. - The page zero function is not called anymore, and a useless zero-space hyperspace mapping is thus s
by ros-arm-bringup＠svn.reactos.org 21 Jun '09

21 Jun '09

Author: ros-arm-bringup Date: Sun Jun 21 09:33:48 2009 New Revision: 41508 URL: http://svn.reactos.org/svn/reactos?rev=41508&view=rev Log: - Define a new consumer: MC_SYSTEM: - Right now, it is only used for allocating new page tables for kernel-mode mappings. - This consumer's pages are never zeroed automatically (this is a more endemic ReactOS problem -- kernel pages are zeroed when they shouldn't be). - New page tables, however, should indeed be zeroed, so now they are zeroed manually with RtlZeroMemory. - The page zero function is not called anymore, and a useless zero-space hyperspace mapping is thus saved each time this happens. - Because of this, zero-space hyperspace mappings are required much later in the Memory Manager's initialization steps than before. Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/mm/freelist.c trunk/reactos/ntoskrnl/mm/i386/page.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] Sun Jun 21 09:33:48 2009 @@ -102,7 +102,8 @@ #define MC_USER (1) #define MC_PPOOL (2) #define MC_NPPOOL (3) -#define MC_MAXIMUM (4) +#define MC_SYSTEM (4) +#define MC_MAXIMUM (5) #define PAGED_POOL_MASK 1 #define MUST_SUCCEED_POOL_MASK 2 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] Sun Jun 21 09:33:48 2009 @@ -777,7 +777,7 @@ KeReleaseQueuedSpinLock(LockQueuePfnLock, oldIrql); PfnOffset = PageDescriptor - MmPfnDatabase; - if (NeedClear) + if ((NeedClear) && (Consumer != MC_SYSTEM)) { MiZeroPage(PfnOffset); } 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] Sun Jun 21 09:33:48 2009 @@ -310,7 +310,7 @@ { return NULL; } - Status = MmRequestPageMemoryConsumer(MC_NPPOOL, FALSE, &Pfn); + Status = MmRequestPageMemoryConsumer(MC_SYSTEM, FALSE, &Pfn); if (!NT_SUCCESS(Status) || Pfn == 0) { KeBugCheck(MEMORY_MANAGEMENT); @@ -322,8 +322,11 @@ } if(0 != InterlockedCompareExchangePte(&MmGlobalKernelPageDirectory[PdeOffset], Entry, 0)) { - MmReleasePageMemoryConsumer(MC_NPPOOL, Pfn); + MmReleasePageMemoryConsumer(MC_SYSTEM, Pfn); } + InterlockedExchangePte(PageDir, MmGlobalKernelPageDirectory[PdeOffset]); + RtlZeroMemory(MiPteToAddress(PageDir), PAGE_SIZE); + return (PULONG)MiAddressToPte(Address); } InterlockedExchangePte(PageDir, MmGlobalKernelPageDirectory[PdeOffset]); }

1 0

[ros-arm-bringup] 41507: - Add another helper: MiGetPfnEntryIndex. This returns the page frame number (PFN) for a given MMPFN entry. - Also add MiPteToAddress to complement MiAddressToPte. This returns the VA for a given PTE. Bonus points if you can figure out the bit magic.
by ros-arm-bringup＠svn.reactos.org 21 Jun '09

21 Jun '09

Author: ros-arm-bringup Date: Sun Jun 21 08:28:31 2009 New Revision: 41507 URL: http://svn.reactos.org/svn/reactos?rev=41507&view=rev Log: - Add another helper: MiGetPfnEntryIndex. This returns the page frame number (PFN) for a given MMPFN entry. - Also add MiPteToAddress to complement MiAddressToPte. This returns the VA for a given PTE. Bonus points if you can figure out the bit magic. Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/mm.h [iso-8859-1] Sun Jun 21 08:28:31 2009 @@ -23,6 +23,11 @@ #define MiAddressToPteOffset(x) \ ((((ULONG)(x)) << 10) >> 22) +// +// Convert a PTE into a corresponding address +// +#define MiPteToAddress(PTE) ((PVOID)((ULONG)(PTE) << 10)) + #define ADDR_TO_PAGE_TABLE(v) (((ULONG)(v)) / (1024 * PAGE_SIZE)) #define ADDR_TO_PDE_OFFSET(v) ((((ULONG)(v)) / (1024 * PAGE_SIZE))) #define ADDR_TO_PTE_OFFSET(v) ((((ULONG)(v)) % (1024 * PAGE_SIZE)) / PAGE_SIZE) 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] Sun Jun 21 08:28:31 2009 @@ -1050,6 +1050,16 @@ return Page; }; +FORCEINLINE +PFN_NUMBER +MiGetPfnEntryIndex(IN PMMPFN Pfn1) +{ + // + // This will return the Page Frame Number (PFN) from the MMPFN + // + return Pfn1 - MmPfnDatabase; +} + PFN_TYPE NTAPI MmGetLRUNextUserPage(PFN_TYPE PreviousPage);

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
50
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 June 2009