Ros-diffs November 2005

ros-diffs@reactos.org

27 participants
875 discussions

[cwittich] 19212: did some work on msconfig

by cwittich＠svn.reactos.com

did some work on msconfig Modified: trunk/reactos/subsys/system/msconfig/De.rc Modified: trunk/reactos/subsys/system/msconfig/En.rc Added: trunk/reactos/subsys/system/msconfig/freeldrpage.c Added: trunk/reactos/subsys/system/msconfig/freeldrpage.h Added: trunk/reactos/subsys/system/msconfig/generalpage.c Added: trunk/reactos/subsys/system/msconfig/generalpage.h Modified: trunk/reactos/subsys/system/msconfig/msconfig.c Modified: trunk/reactos/subsys/system/msconfig/msconfig.xml Modified: trunk/reactos/subsys/system/msconfig/precomp.h Modified: trunk/reactos/subsys/system/msconfig/resource.h Modified: trunk/reactos/subsys/system/msconfig/srvpage.c Added: trunk/reactos/subsys/system/msconfig/systempage.c Added: trunk/reactos/subsys/system/msconfig/systempage.h _____ Modified: trunk/reactos/subsys/system/msconfig/De.rc --- trunk/reactos/subsys/system/msconfig/De.rc 2005-11-13 19:05:01 UTC (rev 19211) +++ trunk/reactos/subsys/system/msconfig/De.rc 2005-11-13 20:58:29 UTC (rev 19212) @@ -27,18 +27,23 @@ STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "Tahoma" BEGIN - CONTROL "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 168 + CONTROL "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148 + PUSHBUTTON "Alle &aktivieren",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14 + PUSHBUTTON "Alle &deaktivieren",IDC_BTN_STARTUP_DEACTIVATE,295,155,66,14 END IDD_SERVICES_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "Tahoma" BEGIN - CONTROL "List1",IDC_SERVICES_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 2, 1, 360, 168 + CONTROL "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148 + PUSHBUTTON "Alle &aktivieren",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14 + PUSHBUTTON "Alle &deaktivieren",IDC_BTN_SERVICES_DEACTIVATE,295,155,66,14 END STRINGTABLE DISCARDABLE BEGIN + IDS_MSCONFIG "Systemkonfigurationsprogramm" IDS_TAB_GENERAL "Allgemein" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" @@ -87,7 +92,7 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "Gestartet" IDS_SERVICES_STATUS_STOPPED "Beendet" - IDS_YES "Ja" - IDS_NO "Nein" + IDS_SERVICES_YES "Ja" + IDS_SERVICES_UNKNOWN "Unbekannt" END _____ Modified: trunk/reactos/subsys/system/msconfig/En.rc --- trunk/reactos/subsys/system/msconfig/En.rc 2005-11-13 19:05:01 UTC (rev 19211) +++ trunk/reactos/subsys/system/msconfig/En.rc 2005-11-13 20:58:29 UTC (rev 19212) @@ -18,7 +18,9 @@ STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "Tahoma" BEGIN - CONTROL "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 168 + CONTROL "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148 + PUSHBUTTON "&Activate all",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14 + PUSHBUTTON "&Deactivate all",IDC_BTN_STARTUP_DEACTIVATE,295,155,66,14 END IDD_TOOLS_PAGE DIALOG DISCARDABLE 0, 0, 362, 175 @@ -34,11 +36,14 @@ STYLE DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "Tahoma" BEGIN - CONTROL "List1",IDC_SERVICES_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP, 2, 1, 360, 168 + CONTROL "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148 + PUSHBUTTON "&Activate all",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14 + PUSHBUTTON "&Deactivate all",IDC_BTN_SERVICES_DEACTIVATE,295,155,66,14 END STRINGTABLE DISCARDABLE BEGIN + IDS_MSCONFIG "Systemkonfigurationsprogramm" IDS_TAB_GENERAL "General" IDS_TAB_SYSTEM "SYSTEM.INI" IDS_TAB_FREELDR "FREELDR.INI" @@ -86,6 +91,6 @@ BEGIN IDS_SERVICES_STATUS_RUNNING "Running" IDS_SERVICES_STATUS_STOPPED "Stopped" - IDS_YES "Yes" - IDS_NO "No" + IDS_SERVICES_YES "Yes" + IDS_SERVICES_UNKNOWN "Unknown" END _____ Added: trunk/reactos/subsys/system/msconfig/freeldrpage.c --- trunk/reactos/subsys/system/msconfig/freeldrpage.c 2005-11-13 19:05:01 UTC (rev 19211) +++ trunk/reactos/subsys/system/msconfig/freeldrpage.c 2005-11-13 20:58:29 UTC (rev 19212) @@ -0,0 +1,17 @@ +#include <precomp.h> + +HWND hFreeLdrPage; +HWND hFreeLdrDialog; + +INT_PTR CALLBACK +FreeLdrPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) { + case WM_INITDIALOG: + hFreeLdrDialog = hDlg; + SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); + return TRUE; + } + + return 0; +} Property changes on: trunk/reactos/subsys/system/msconfig/freeldrpage.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/msconfig/freeldrpage.h --- trunk/reactos/subsys/system/msconfig/freeldrpage.h 2005-11-13 19:05:01 UTC (rev 19211) +++ trunk/reactos/subsys/system/msconfig/freeldrpage.h 2005-11-13 20:58:29 UTC (rev 19212) @@ -0,0 +1,3 @@ +extern HWND hFreeLdrPage; + +INT_PTR CALLBACK FreeLdrPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); Property changes on: trunk/reactos/subsys/system/msconfig/freeldrpage.h ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/msconfig/generalpage.c --- trunk/reactos/subsys/system/msconfig/generalpage.c 2005-11-13 19:05:01 UTC (rev 19211) +++ trunk/reactos/subsys/system/msconfig/generalpage.c 2005-11-13 20:58:29 UTC (rev 19212) @@ -0,0 +1,17 @@ +#include <precomp.h> + +HWND hGeneralPage; +HWND hGeneralDialog; + +INT_PTR CALLBACK +GeneralPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) { + case WM_INITDIALOG: + hGeneralDialog = hDlg; + SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); + return TRUE; + } + + return 0; +} Property changes on: trunk/reactos/subsys/system/msconfig/generalpage.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/msconfig/generalpage.h --- trunk/reactos/subsys/system/msconfig/generalpage.h 2005-11-13 19:05:01 UTC (rev 19211) +++ trunk/reactos/subsys/system/msconfig/generalpage.h 2005-11-13 20:58:29 UTC (rev 19212) @@ -0,0 +1,3 @@ +extern HWND hGeneralPage; + +INT_PTR CALLBACK GeneralPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); Property changes on: trunk/reactos/subsys/system/msconfig/generalpage.h ___________________________________________________________________ Name: svn:eol-style + native _____ Modified: trunk/reactos/subsys/system/msconfig/msconfig.c --- trunk/reactos/subsys/system/msconfig/msconfig.c 2005-11-13 19:05:01 UTC (rev 19211) +++ trunk/reactos/subsys/system/msconfig/msconfig.c 2005-11-13 20:58:29 UTC (rev 19212) @@ -12,10 +12,16 @@ TCITEM item; hTabWnd = GetDlgItem(hWnd, IDC_TAB); - hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, ToolsPageWndProc); + hGeneralPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_GENERAL_PAGE), hWnd, GeneralPageWndProc); + hSystemPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SYSTEM_PAGE), hWnd, SystemPageWndProc); + hFreeLdrPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_FREELDR_PAGE), hWnd, FreeLdrPageWndProc); hServicesPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_SERVICES_PAGE), hWnd, ServicesPageWndProc); hStartupPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_STARTUP_PAGE), hWnd, StartupPageWndProc); + hToolsPage = CreateDialog(hInst, MAKEINTRESOURCE(IDD_TOOLS_PAGE), hWnd, ToolsPageWndProc); + LoadString(hInst, IDS_MSCONFIG, szTemp, 256); + SetWindowText(hWnd, szTemp); + // Insert Tab Pages LoadString(hInst, IDS_TAB_GENERAL, szTemp, 256); memset(&item, 0, sizeof(TCITEM)); @@ -61,45 +67,57 @@ { switch (TabCtrl_GetCurSel(hTabWnd)) { case 0: //General + ShowWindow(hGeneralPage, SW_SHOW); + ShowWindow(hSystemPage, SW_HIDE); + ShowWindow(hFreeLdrPage, SW_HIDE); + ShowWindow(hServicesPage, SW_HIDE); + ShowWindow(hStartupPage, SW_HIDE); ShowWindow(hToolsPage, SW_HIDE); - ShowWindow(hStartupPage, SW_HIDE); - //ShowWindow(hFreeLdrPage, SW_HIDE); - ShowWindow(hServicesPage, SW_HIDE); - //BringWindowToTop(hFreeLdrPage); + BringWindowToTop(hGeneralPage); break; case 1: //SYSTEM.INI + ShowWindow(hGeneralPage, SW_HIDE); + ShowWindow(hSystemPage, SW_SHOW); ShowWindow(hToolsPage, SW_HIDE); ShowWindow(hStartupPage, SW_HIDE); - //ShowWindow(hFreeLdrPage, SW_SHOW); + ShowWindow(hFreeLdrPage, SW_HIDE); ShowWindow(hServicesPage, SW_HIDE); - //BringWindowToTop(hFreeLdrPage); + BringWindowToTop(hSystemPage); break; case 2: //Freeldr + ShowWindow(hGeneralPage, SW_HIDE); + ShowWindow(hSystemPage, SW_HIDE); + ShowWindow(hFreeLdrPage, SW_SHOW); + ShowWindow(hServicesPage, SW_HIDE); + ShowWindow(hStartupPage, SW_HIDE); ShowWindow(hToolsPage, SW_HIDE); - ShowWindow(hStartupPage, SW_HIDE); - //ShowWindow(hFreeLdrPage, SW_SHOW); - ShowWindow(hServicesPage, SW_HIDE); - //BringWindowToTop(hFreeLdrPage); + BringWindowToTop(hFreeLdrPage); break; case 3: //Services + ShowWindow(hGeneralPage, SW_HIDE); + ShowWindow(hSystemPage, SW_HIDE); + ShowWindow(hFreeLdrPage, SW_HIDE); + ShowWindow(hServicesPage, SW_SHOW); + ShowWindow(hStartupPage, SW_HIDE); ShowWindow(hToolsPage, SW_HIDE); - ShowWindow(hStartupPage, SW_HIDE); - //ShowWindow(hFreeLdrPage, SW_HIDE); - ShowWindow(hServicesPage, SW_SHOW); BringWindowToTop(hServicesPage); break; case 4: //startup + ShowWindow(hGeneralPage, SW_HIDE); + ShowWindow(hSystemPage, SW_HIDE); + ShowWindow(hFreeLdrPage, SW_HIDE); + ShowWindow(hServicesPage, SW_HIDE); + ShowWindow(hStartupPage, SW_SHOW); ShowWindow(hToolsPage, SW_HIDE); - ShowWindow(hStartupPage, SW_SHOW); - //ShowWindow(hFreeLdrPage, SW_HIDE); - ShowWindow(hServicesPage, SW_HIDE); BringWindowToTop(hStartupPage); break; case 5: //Tools + ShowWindow(hGeneralPage, SW_HIDE); + ShowWindow(hSystemPage, SW_HIDE); + ShowWindow(hFreeLdrPage, SW_HIDE); + ShowWindow(hServicesPage, SW_HIDE); + ShowWindow(hStartupPage, SW_HIDE); ShowWindow(hToolsPage, SW_SHOW); - ShowWindow(hStartupPage, SW_HIDE); - //ShowWindow(hFreeLdrPage, SW_HIDE); - ShowWindow(hServicesPage, SW_HIDE); BringWindowToTop(hToolsPage); break; } @@ -145,6 +163,8 @@ DestroyWindow(hToolsPage); DestroyWindow(hServicesPage); DestroyWindow(hStartupPage); + DestroyWindow(hFreeLdrPage); + DestroyWindow(hSystemPage); return DefWindowProc(hDlg, message, wParam, lParam); } _____ Modified: trunk/reactos/subsys/system/msconfig/msconfig.xml --- trunk/reactos/subsys/system/msconfig/msconfig.xml 2005-11-13 19:05:01 UTC (rev 19211) +++ trunk/reactos/subsys/system/msconfig/msconfig.xml 2005-11-13 20:58:29 UTC (rev 19212) @@ -13,7 +13,10 @@ <library>shell32</library> <file>toolspage.c</file> <file>srvpage.c</file> + <file>systempage.c</file> <file>startuppage.c</file> + <file>freeldrpage.c</file> + <file>generalpage.c</file> <file>msconfig.c</file> <file>msconfig.rc</file> </module> _____ Modified: trunk/reactos/subsys/system/msconfig/precomp.h --- trunk/reactos/subsys/system/msconfig/precomp.h 2005-11-13 19:05:01 UTC (rev 19211) +++ trunk/reactos/subsys/system/msconfig/precomp.h 2005-11-13 20:58:29 UTC (rev 19212) @@ -9,6 +9,9 @@ #include "toolspage.h" #include "srvpage.h" #include "startuppage.h" +#include "freeldrpage.h" +#include "systempage.h" +#include "generalpage.h" #define MAX_KEY_LENGTH 255 #define MAX_VALUE_NAME 16383 _____ Modified: trunk/reactos/subsys/system/msconfig/resource.h --- trunk/reactos/subsys/system/msconfig/resource.h 2005-11-13 19:05:01 UTC (rev 19211) +++ trunk/reactos/subsys/system/msconfig/resource.h 2005-11-13 20:58:29 UTC (rev 19212) @@ -3,6 +3,8 @@ #define IDD_SERVICES_PAGE 103 #define IDD_GENERAL_PAGE 104 #define IDD_STARTUP_PAGE 105 +#define IDD_FREELDR_PAGE 106 +#define IDD_SYSTEM_PAGE 107 #define IDC_TAB 1001 #define IDC_BTN_APPLY 1002 @@ -12,6 +14,10 @@ #define IDC_SERVICES_LIST 1006 #define IDC_TOOLS_LIST 1007 #define IDC_STARTUP_LIST 1008 +#define IDC_BTN_SERVICES_ACTIVATE 1009 +#define IDC_BTN_SERVICES_DEACTIVATE 1010 +#define IDC_BTN_STARTUP_ACTIVATE 1011 +#define IDC_BTN_STARTUP_DEACTIVATE 1012 #define IDS_TAB_TOOLS 2001 #define IDS_TAB_SYSTEM 2002 @@ -52,6 +58,9 @@ #define IDS_SERVICES_STATUS_STOPPED 2200 #define IDS_SERVICES_STATUS_RUNNING 2201 -#define IDS_YES 2202 -#define IDS_NO 2203 +#define IDS_SERVICES_YES 2202 +#define IDS_SERVICES_UNKNOWN 2203 + +#define IDS_MSCONFIG 3000 + /* EOF */ _____ Modified: trunk/reactos/subsys/system/msconfig/srvpage.c --- trunk/reactos/subsys/system/msconfig/srvpage.c 2005-11-13 19:05:01 UTC (rev 19211) +++ trunk/reactos/subsys/system/msconfig/srvpage.c 2005-11-13 20:58:29 UTC (rev 19212) @@ -149,7 +149,7 @@ { if (pServiceFailureActions->lpsaActions[0].Type == SC_ACTION_REBOOT) { - LoadString(hInst, IDS_YES, szStatus, 128); + LoadString(hInst, IDS_SERVICES_YES, szStatus, 128); item.pszText = szStatus; item.iSubItem = 1; SendMessage(hServicesListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); @@ -211,8 +211,15 @@ item.pszText = lpBuffer; item.iSubItem = 2; SendMessage(hServicesListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); - } + } } + else + { + LoadString(hInst, IDS_SERVICES_UNKNOWN, szStatus, 128); + item.pszText = szStatus; + item.iSubItem = 2; + SendMessage(hServicesListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item); + } CloseServiceHandle(hService); } _____ Added: trunk/reactos/subsys/system/msconfig/systempage.c --- trunk/reactos/subsys/system/msconfig/systempage.c 2005-11-13 19:05:01 UTC (rev 19211) +++ trunk/reactos/subsys/system/msconfig/systempage.c 2005-11-13 20:58:29 UTC (rev 19212) @@ -0,0 +1,17 @@ +#include <precomp.h> + +HWND hSystemPage; +HWND hSystemDialog; + +INT_PTR CALLBACK +SystemPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam) +{ + switch (message) { + case WM_INITDIALOG: + hSystemDialog = hDlg; + SetWindowPos(hDlg, NULL, 10, 32, 0, 0, SWP_NOACTIVATE | SWP_NOOWNERZORDER | SWP_NOSIZE | SWP_NOZORDER); + return TRUE; + } + + return 0; +} Property changes on: trunk/reactos/subsys/system/msconfig/systempage.c ___________________________________________________________________ Name: svn:eol-style + native _____ Added: trunk/reactos/subsys/system/msconfig/systempage.h --- trunk/reactos/subsys/system/msconfig/systempage.h 2005-11-13 19:05:01 UTC (rev 19211) +++ trunk/reactos/subsys/system/msconfig/systempage.h 2005-11-13 20:58:29 UTC (rev 19212) @@ -0,0 +1,3 @@ +extern HWND hSystemPage; + +INT_PTR CALLBACK SystemPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); Property changes on: trunk/reactos/subsys/system/msconfig/systempage.h ___________________________________________________________________ Name: svn:eol-style + native

18 years, 10 months

[gedmurphy] 19211: use neater tray arrows from Dominik (dominik@newmatic.de)

by gedmurphy＠svn.reactos.com

use neater tray arrows from Dominik (dominik(a)newmatic.de) Modified: trunk/reactos/subsys/system/explorer/res/notify_l.ico Modified: trunk/reactos/subsys/system/explorer/res/notify_r.ico _____ Modified: trunk/reactos/subsys/system/explorer/res/notify_l.ico (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/notify_r.ico (Binary files differ)

18 years, 10 months

[hbirr] 19210: Set the boot processor as active processor in KeInit1.

by hbirr＠svn.reactos.com

Set the boot processor as active processor in KeInit1. Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/kernel.c --- trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-11-13 17:32:01 UTC (rev 19209) +++ trunk/reactos/ntoskrnl/ke/i386/kernel.c 2005-11-13 17:33:54 UTC (rev 19210) @@ -298,6 +298,7 @@ KPCR->TSS = &KiBootTss; KPCR->Number = 0; KPCR->SetMember = 1 << 0; + KeActiveProcessors = 1 << 0; KPCR->PrcbData.SetMember = 1 << 0; KiPcrInitDone = 1; PcrsAllocated++;

18 years, 10 months

[hbirr] 19209: Shutdown the process manager before shutdown the registry.

by hbirr＠svn.reactos.com

Shutdown the process manager before shutdown the registry. Running processes may have opened a registry handle. Modified: trunk/reactos/ntoskrnl/ex/power.c _____ Modified: trunk/reactos/ntoskrnl/ex/power.c --- trunk/reactos/ntoskrnl/ex/power.c 2005-11-13 17:28:24 UTC (rev 19208) +++ trunk/reactos/ntoskrnl/ex/power.c 2005-11-13 17:32:01 UTC (rev 19209) @@ -148,15 +148,16 @@ sizeof(PCH))]); } + PiShutdownProcessManager(); + Waittime.QuadPart = (LONGLONG)-10000000; /* 1sec */ + KeDelayExecutionThread(KernelMode, FALSE, &Waittime); + CmShutdownRegistry(); IoShutdownRegisteredFileSystems(); IoShutdownRegisteredDevices(); - PiShutdownProcessManager(); MiShutdownMemoryManager(); - Waittime.QuadPart = (LONGLONG)-10000000; /* 1sec */ - KeDelayExecutionThread(KernelMode, FALSE, &Waittime); if (Action == ShutdownNoReboot) {

18 years, 10 months

[hbirr] 19208: - Removed the process from the parameter list of MmCreateMemoryArea.

by hbirr＠svn.reactos.com

- Removed the process from the parameter list of MmCreateMemoryArea. - Changed the 9th parameter of MmCreateMemoryArea to allocation flags. - Implemented SEC_NO_CHANGE. Modified: trunk/reactos/ntoskrnl/cc/view.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/ke/usercall.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/cont.c Modified: trunk/reactos/ntoskrnl/mm/i386/page.c Modified: trunk/reactos/ntoskrnl/mm/iospace.c Modified: trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/mdl.c Modified: trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ncache.c Modified: trunk/reactos/ntoskrnl/mm/process.c Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/virtual.c Modified: trunk/reactos/ntoskrnl/ps/win32.c _____ Modified: trunk/reactos/ntoskrnl/cc/view.c --- trunk/reactos/ntoskrnl/cc/view.c 2005-11-13 14:15:08 UTC (rev 19207) +++ trunk/reactos/ntoskrnl/cc/view.c 2005-11-13 17:28:24 UTC (rev 19208) @@ -657,15 +657,14 @@ #else MmLockAddressSpace(MmGetKernelAddressSpace()); current->BaseAddress = NULL; - Status = MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_CACHE_SEGMENT, &current->BaseAddress, Bcb->CacheSegmentSize, PAGE_READWRITE, (PMEMORY_AREA*)&current->MemoryArea, FALSE, - FALSE, + 0, BoundaryAddressMultiple); MmUnlockAddressSpace(MmGetKernelAddressSpace()); if (!NT_SUCCESS(Status)) @@ -1366,15 +1365,14 @@ MmLockAddressSpace(MmGetKernelAddressSpace()); - Status = MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_CACHE_SEGMENT, &CiCacheSegMappingRegionBase, CI_CACHESEG_MAPPING_REGION_SIZE, - 0, + PAGE_READWRITE, &marea, FALSE, - FALSE, + 0, BoundaryAddressMultiple); MmUnlockAddressSpace(MmGetKernelAddressSpace()); if (!NT_SUCCESS(Status)) _____ Modified: trunk/reactos/ntoskrnl/include/internal/mm.h --- trunk/reactos/ntoskrnl/include/internal/mm.h 2005-11-13 14:15:08 UTC (rev 19207) +++ trunk/reactos/ntoskrnl/include/internal/mm.h 2005-11-13 17:28:24 UTC (rev 19208) @@ -215,7 +215,8 @@ struct _MEMORY_AREA *LeftChild; struct _MEMORY_AREA *RightChild; ULONG Type; - ULONG Attributes; + ULONG Protect; + ULONG Flags; ULONG LockCount; BOOLEAN DeleteInProgress; ULONG PageOpCount; @@ -377,15 +378,14 @@ NTSTATUS STDCALL MmCreateMemoryArea( - struct _EPROCESS* Process, PMADDRESS_SPACE AddressSpace, ULONG Type, PVOID *BaseAddress, ULONG_PTR Length, - ULONG Attributes, + ULONG Protection, PMEMORY_AREA *Result, BOOLEAN FixedAddress, - BOOLEAN TopDown, + ULONG AllocationFlags, PHYSICAL_ADDRESS BoundaryAddressMultiple OPTIONAL ); _____ Modified: trunk/reactos/ntoskrnl/ke/usercall.c --- trunk/reactos/ntoskrnl/ke/usercall.c 2005-11-13 14:15:08 UTC (rev 19207) +++ trunk/reactos/ntoskrnl/ke/usercall.c 2005-11-13 17:28:24 UTC (rev 19208) @@ -108,15 +108,14 @@ BoundaryAddressMultiple.QuadPart = 0; StackSize = PAGE_ROUND_UP(StackSize); MmLockAddressSpace(MmGetKernelAddressSpace()); - Status = MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_KERNEL_STACK, &KernelStack, StackSize, - 0, + PAGE_READWRITE, &StackArea, FALSE, - FALSE, + 0, BoundaryAddressMultiple); MmUnlockAddressSpace(MmGetKernelAddressSpace()); if (!NT_SUCCESS(Status)) _____ Modified: trunk/reactos/ntoskrnl/mm/anonmem.c --- trunk/reactos/ntoskrnl/mm/anonmem.c 2005-11-13 14:15:08 UTC (rev 19207) +++ trunk/reactos/ntoskrnl/mm/anonmem.c 2005-11-13 17:28:24 UTC (rev 19208) @@ -727,15 +727,14 @@ } } - Status = MmCreateMemoryArea(Process, - AddressSpace, + Status = MmCreateMemoryArea(AddressSpace, MEMORY_AREA_VIRTUAL_MEMORY, &BaseAddress, RegionSize, Protect, &MemoryArea, PBaseAddress != 0, - (AllocationType & MEM_TOP_DOWN) == MEM_TOP_DOWN, + AllocationType & MEM_TOP_DOWN, BoundaryAddressMultiple); if (!NT_SUCCESS(Status)) { @@ -1000,7 +999,7 @@ Address, &RegionBase); Info->BaseAddress = RegionBase; Info->AllocationBase = MemoryArea->StartingAddress; - Info->AllocationProtect = MemoryArea->Attributes; + Info->AllocationProtect = MemoryArea->Protect; Info->RegionSize = Region->Length; Info->State = Region->Type; Info->Protect = Region->Protect; _____ Modified: trunk/reactos/ntoskrnl/mm/cont.c --- trunk/reactos/ntoskrnl/mm/cont.c 2005-11-13 14:15:08 UTC (rev 19207) +++ trunk/reactos/ntoskrnl/mm/cont.c 2005-11-13 17:28:24 UTC (rev 19208) @@ -71,29 +71,28 @@ NTSTATUS Status; PVOID BaseAddress = NULL; PFN_TYPE PBase; - ULONG Attributes; + ULONG Protect; ULONG i; - Attributes = PAGE_EXECUTE_READWRITE | PAGE_SYSTEM; + Protect = PAGE_EXECUTE_READWRITE | PAGE_SYSTEM; if (CacheType == MmNonCached || CacheType == MmWriteCombined) { - Attributes |= PAGE_NOCACHE; + Protect |= PAGE_NOCACHE; } if (CacheType == MmWriteCombined) { - Attributes |= PAGE_WRITECOMBINE; + Protect |= PAGE_WRITECOMBINE; } MmLockAddressSpace(MmGetKernelAddressSpace()); - Status = MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_CONTINUOUS_MEMORY, &BaseAddress, NumberOfBytes, - 0, + PAGE_READWRITE, &MArea, FALSE, - FALSE, + 0, (PHYSICAL_ADDRESS)0LL); MmUnlockAddressSpace(MmGetKernelAddressSpace()); @@ -120,7 +119,7 @@ { MmCreateVirtualMapping(NULL, (char*)BaseAddress + (i * PAGE_SIZE), - Attributes, + Protect, &PBase, 1); } _____ Modified: trunk/reactos/ntoskrnl/mm/i386/page.c --- trunk/reactos/ntoskrnl/mm/i386/page.c 2005-11-13 14:15:08 UTC (rev 19207) +++ trunk/reactos/ntoskrnl/mm/i386/page.c 2005-11-13 17:28:24 UTC (rev 19208) @@ -2419,30 +2419,28 @@ BoundaryAddressMultiple.QuadPart = 0; BaseAddress = (PVOID)PAGETABLE_MAP; - Status = MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_SYSTEM, &BaseAddress, Ke386Pae ? 0x800000 : 0x400000, - 0, + PAGE_READWRITE, &kernel_map_desc, TRUE, - FALSE, + 0, BoundaryAddressMultiple); if (!NT_SUCCESS(Status)) { KEBUGCHECK(0); } BaseAddress = (PVOID)HYPERSPACE; - Status = MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_SYSTEM, &BaseAddress, 0x400000, - 0, + PAGE_READWRITE, &hyperspace_desc, TRUE, - FALSE, + 0, BoundaryAddressMultiple); if (!NT_SUCCESS(Status)) { _____ Modified: trunk/reactos/ntoskrnl/mm/iospace.c --- trunk/reactos/ntoskrnl/mm/iospace.c 2005-11-13 14:15:08 UTC (rev 19207) +++ trunk/reactos/ntoskrnl/mm/iospace.c 2005-11-13 17:28:24 UTC (rev 19208) @@ -54,7 +54,7 @@ MEMORY_AREA* marea; NTSTATUS Status; ULONG i; - ULONG Attributes; + ULONG Protect; PHYSICAL_ADDRESS BoundaryAddressMultiple; PFN_TYPE Pfn; @@ -72,17 +72,21 @@ Offset = PhysicalAddress.u.LowPart % PAGE_SIZE; NumberOfBytes += Offset; PhysicalAddress.QuadPart -= Offset; + Protect = PAGE_EXECUTE_READWRITE | PAGE_SYSTEM; + if (CacheEnable != MmCached) + { + Protect |= (PAGE_NOCACHE | PAGE_WRITETHROUGH); + } MmLockAddressSpace(MmGetKernelAddressSpace()); - Status = MmCreateMemoryArea (NULL, - MmGetKernelAddressSpace(), + Status = MmCreateMemoryArea (MmGetKernelAddressSpace(), MEMORY_AREA_IO_MAPPING, &Result, NumberOfBytes, - 0, + Protect, &marea, + 0, FALSE, - FALSE, BoundaryAddressMultiple); MmUnlockAddressSpace(MmGetKernelAddressSpace()); @@ -91,16 +95,11 @@ DPRINT("MmMapIoSpace failed (%lx)\n", Status); return (NULL); } - Attributes = PAGE_EXECUTE_READWRITE | PAGE_SYSTEM; - if (CacheEnable != MmCached) - { - Attributes |= (PAGE_NOCACHE | PAGE_WRITETHROUGH); - } Pfn = PhysicalAddress.QuadPart >> PAGE_SHIFT; for (i = 0; i < PAGE_ROUND_UP(NumberOfBytes); i += PAGE_SIZE, Pfn++) { Status = MmCreateVirtualMappingForKernel((char*)Result + i, - Attributes, + Protect, &Pfn, 1); if (!NT_SUCCESS(Status)) _____ Modified: trunk/reactos/ntoskrnl/mm/marea.c --- trunk/reactos/ntoskrnl/mm/marea.c 2005-11-13 14:15:08 UTC (rev 19207) +++ trunk/reactos/ntoskrnl/mm/marea.c 2005-11-13 17:28:24 UTC (rev 19208) @@ -105,7 +105,7 @@ } /** - * @name MmIterateFirstNode + * @name MmIterateLastNode * * @param Node * Head node of the MEMORY_AREA tree. @@ -123,7 +123,7 @@ } /** - * @name MmIterateNextNode + * @name MmIteratePreviousNode * * @param Node * Current node in the tree. @@ -200,9 +200,9 @@ Node != NULL; Node = MmIterateNextNode(Node)) { - DbgPrint("Start %p End %p Attributes %x\n", + DbgPrint("Start %p End %p Protect %x Flags %x\n", Node->StartingAddress, Node->EndingAddress, - Node->Attributes); + Node->Protect, Node->Flags); } DbgPrint("Finished MmDumpMemoryAreas()\n"); @@ -928,15 +928,14 @@ */ NTSTATUS STDCALL -MmCreateMemoryArea(PEPROCESS Process, - PMADDRESS_SPACE AddressSpace, +MmCreateMemoryArea(PMADDRESS_SPACE AddressSpace, ULONG Type, PVOID *BaseAddress, ULONG_PTR Length, - ULONG Attributes, + ULONG Protect, PMEMORY_AREA *Result, BOOLEAN FixedAddress, - BOOLEAN TopDown, + ULONG AllocationFlags, PHYSICAL_ADDRESS BoundaryAddressMultiple) { PVOID EndAddress; @@ -959,7 +958,7 @@ *BaseAddress = MmFindGap(AddressSpace, tmpLength, Granularity, - TopDown != 0); + (AllocationFlags & MEM_TOP_DOWN) == MEM_TOP_DOWN); if ((*BaseAddress) == 0) { DPRINT("No suitable gap\n"); @@ -1007,7 +1006,8 @@ MemoryArea->Type = Type; MemoryArea->StartingAddress = *BaseAddress; MemoryArea->EndingAddress = (PVOID)((ULONG_PTR)*BaseAddress + tmpLength); - MemoryArea->Attributes = Attributes; + MemoryArea->Protect = Protect; + MemoryArea->Flags = AllocationFlags; MemoryArea->LockCount = 0; MemoryArea->PageOpCount = 0; MemoryArea->DeleteInProgress = FALSE; _____ Modified: trunk/reactos/ntoskrnl/mm/mdl.c --- trunk/reactos/ntoskrnl/mm/mdl.c 2005-11-13 14:15:08 UTC (rev 19207) +++ trunk/reactos/ntoskrnl/mm/mdl.c 2005-11-13 17:28:24 UTC (rev 19208) @@ -70,15 +70,14 @@ MiMdlMappingRegionBase = NULL; MmLockAddressSpace(MmGetKernelAddressSpace()); - Status = MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_MDL_MAPPING, &MiMdlMappingRegionBase, MI_MDL_MAPPING_REGION_SIZE, - 0, + PAGE_READWRITE, &Result, FALSE, - FALSE, + 0, BoundaryAddressMultiple); if (!NT_SUCCESS(Status)) { @@ -779,6 +778,12 @@ /* FIXME: Implement Priority */ (void) Priority; + Protect = PAGE_READWRITE; + if (CacheType == MmNonCached) + Protect |= PAGE_NOCACHE; + else if (CacheType == MmWriteCombined) + DPRINT("CacheType MmWriteCombined not supported!\n"); + /* Calculate the number of pages required. */ PageCount = PAGE_ROUND_UP(Mdl->ByteCount + Mdl->ByteOffset) / PAGE_SIZE; @@ -797,15 +802,14 @@ CurrentProcess = PsGetCurrentProcess(); MmLockAddressSpace(&CurrentProcess->AddressSpace); - Status = MmCreateMemoryArea(CurrentProcess, - &CurrentProcess->AddressSpace, + Status = MmCreateMemoryArea(&CurrentProcess->AddressSpace, MEMORY_AREA_MDL_MAPPING, &Base, PageCount * PAGE_SIZE, - 0, /* PAGE_READWRITE? */ + Protect, &Result, (Base != NULL), - FALSE, + 0, BoundaryAddressMultiple); MmUnlockAddressSpace(&CurrentProcess->AddressSpace); if (!NT_SUCCESS(Status)) @@ -865,11 +869,6 @@ /* Set the virtual mappings for the MDL pages. */ MdlPages = (PULONG)(Mdl + 1); - Protect = PAGE_READWRITE; - if (CacheType == MmNonCached) - Protect |= PAGE_NOCACHE; - else if (CacheType == MmWriteCombined) - DPRINT("CacheType MmWriteCombined not supported!\n"); if (Mdl->MdlFlags & MDL_IO_SPACE) Status = MmCreateVirtualMappingUnsafe(CurrentProcess, Base, _____ Modified: trunk/reactos/ntoskrnl/mm/mminit.c --- trunk/reactos/ntoskrnl/mm/mminit.c 2005-11-13 14:15:08 UTC (rev 19207) +++ trunk/reactos/ntoskrnl/mm/mminit.c 2005-11-13 17:28:24 UTC (rev 19208) @@ -107,53 +107,49 @@ MiInitPageDirectoryMap(); BaseAddress = (PVOID)KPCR_BASE; - MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), + MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_SYSTEM, &BaseAddress, PAGE_SIZE * MAXIMUM_PROCESSORS, - 0, + PAGE_READWRITE, &MArea, TRUE, - FALSE, + 0, BoundaryAddressMultiple); /* Local APIC base */ BaseAddress = (PVOID)0xFEE00000; - MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), + MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_SYSTEM, &BaseAddress, PAGE_SIZE, - 0, + PAGE_READWRITE, &MArea, TRUE, - FALSE, + 0, BoundaryAddressMultiple); /* i/o APIC base */ BaseAddress = (PVOID)0xFEC00000; - MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), + MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_SYSTEM, &BaseAddress, PAGE_SIZE, - 0, + PAGE_READWRITE, &MArea, TRUE, - FALSE, + 0, BoundaryAddressMultiple); BaseAddress = (PVOID)0xFF3A0000; - MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), + MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_SYSTEM, &BaseAddress, 0x20000, - 0, + PAGE_READWRITE, &MArea, TRUE, - FALSE, + 0, BoundaryAddressMultiple); BaseAddress = (PVOID)KERNEL_BASE; @@ -164,15 +160,14 @@ * No need to lock the address space at this point since no * other threads are running. */ - MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), + MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_SYSTEM, &BaseAddress, Length, - 0, + PAGE_EXECUTE_READ, &MArea, TRUE, - FALSE, + 0, BoundaryAddressMultiple); BaseAddress = (PVOID)PAGE_ROUND_UP(((ULONG_PTR)&_text_end__)); @@ -181,15 +176,14 @@ PAGE_ROUND_UP(((ULONG_PTR)&_text_end__)); ParamLength = ParamLength - Length; - MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), + MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_SYSTEM, &BaseAddress, Length, - 0, + PAGE_EXECUTE_READ, &MArea, TRUE, - FALSE, + 0, BoundaryAddressMultiple); Length = PAGE_ROUND_UP(((ULONG_PTR)&_bss_end__)) - @@ -203,52 +197,48 @@ * No need to lock the address space at this point since we are * the only thread running. */ - MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), + MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_SYSTEM, &BaseAddress, Length, - 0, + PAGE_READWRITE, &MArea, TRUE, - FALSE, + 0, BoundaryAddressMultiple); BaseAddress = (PVOID)PAGE_ROUND_UP(((ULONG_PTR)&_bss_end__)); Length = LastKernelAddress - (ULONG_PTR)BaseAddress; - MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), + MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_SYSTEM, &BaseAddress, Length, - 0, + PAGE_READWRITE, &MArea, TRUE, - FALSE, + 0, BoundaryAddressMultiple); BaseAddress = MiNonPagedPoolStart; - MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), + MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_SYSTEM, &BaseAddress, MiNonPagedPoolLength, - 0, + PAGE_READWRITE, &MArea, TRUE, - FALSE, + 0, BoundaryAddressMultiple); BaseAddress = MmPagedPoolBase; - Status = MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_PAGED_POOL, &BaseAddress, MmPagedPoolSize, - 0, + PAGE_READWRITE, &MArea, TRUE, - FALSE, + 0, BoundaryAddressMultiple); MmInitializePagedPool(); @@ -258,15 +248,14 @@ */ BaseAddress = (PVOID)KI_USER_SHARED_DATA; Length = PAGE_SIZE; - MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), + MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_SYSTEM, &BaseAddress, Length, - 0, + PAGE_READWRITE, &MArea, TRUE, - FALSE, + 0, BoundaryAddressMultiple); Status = MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &Pfn); MmSharedDataPagePhysicalAddress.QuadPart = Pfn << PAGE_SHIFT; _____ Modified: trunk/reactos/ntoskrnl/mm/ncache.c --- trunk/reactos/ntoskrnl/mm/ncache.c 2005-11-13 14:15:08 UTC (rev 19207) +++ trunk/reactos/ntoskrnl/mm/ncache.c 2005-11-13 17:28:24 UTC (rev 19208) @@ -48,21 +48,20 @@ MEMORY_AREA* marea; NTSTATUS Status; ULONG i; - ULONG Attributes; + ULONG Protect = PAGE_READWRITE|PAGE_SYSTEM|PAGE_NOCACHE|PAGE_WRITETHROUGH; PHYSICAL_ADDRESS BoundaryAddressMultiple; BoundaryAddressMultiple.QuadPart = 0; MmLockAddressSpace(MmGetKernelAddressSpace()); Result = NULL; - Status = MmCreateMemoryArea (NULL, - MmGetKernelAddressSpace(), + Status = MmCreateMemoryArea (MmGetKernelAddressSpace(), MEMORY_AREA_NO_CACHE, &Result, NumberOfBytes, - 0, + Protect, &marea, FALSE, - FALSE, + 0, BoundaryAddressMultiple); MmUnlockAddressSpace(MmGetKernelAddressSpace()); @@ -70,8 +69,7 @@ { return (NULL); } - Attributes = PAGE_READWRITE | PAGE_SYSTEM | PAGE_NOCACHE | - PAGE_WRITETHROUGH; + for (i = 0; i < (PAGE_ROUND_UP(NumberOfBytes) / PAGE_SIZE); i++) { PFN_TYPE NPage; @@ -79,7 +77,7 @@ Status = MmRequestPageMemoryConsumer(MC_NPPOOL, TRUE, &NPage); MmCreateVirtualMapping (NULL, (char*)Result + (i * PAGE_SIZE), - Attributes, + Protect, &NPage, 1); } _____ Modified: trunk/reactos/ntoskrnl/mm/process.c --- trunk/reactos/ntoskrnl/mm/process.c 2005-11-13 14:15:08 UTC (rev 19207) +++ trunk/reactos/ntoskrnl/mm/process.c 2005-11-13 17:28:24 UTC (rev 19208) @@ -45,15 +45,14 @@ */ do { DPRINT("Trying to allocate: %x\n", AllocatedBase); - Status = MmCreateMemoryArea(Process, - ProcessAddressSpace, + Status = MmCreateMemoryArea(ProcessAddressSpace, MEMORY_AREA_PEB_OR_TEB, &AllocatedBase, PAGE_SIZE, PAGE_READWRITE, &MemoryArea, TRUE, - FALSE, + 0, BoundaryAddressMultiple); AllocatedBase = RVA(AllocatedBase, -PAGE_SIZE); } while (Status != STATUS_SUCCESS); @@ -143,15 +142,14 @@ MmLockAddressSpace(MmGetKernelAddressSpace()); /* Create a MAREA for the Kernel Stack */ - Status = MmCreateMemoryArea(NULL, - MmGetKernelAddressSpace(), + Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), MEMORY_AREA_KERNEL_STACK, &KernelStack, MM_STACK_SIZE, - 0, + PAGE_READWRITE, &StackArea, FALSE, - FALSE, + 0, BoundaryAddressMultiple); /* Unlock the Address Space */ @@ -399,15 +397,14 @@ /* Protect the highest 64KB of the process address space */ BaseAddress = (PVOID)MmUserProbeAddress; - Status = MmCreateMemoryArea(Process, - ProcessAddressSpace, + Status = MmCreateMemoryArea(ProcessAddressSpace, MEMORY_AREA_NO_ACCESS, &BaseAddress, 0x10000, PAGE_NOACCESS, &MemoryArea, FALSE, - FALSE, + 0, BoundaryAddressMultiple); if (!NT_SUCCESS(Status)) { @@ -417,15 +414,14 @@ /* Protect the 60KB above the shared user page */ BaseAddress = (char*)USER_SHARED_DATA + PAGE_SIZE; - Status = MmCreateMemoryArea(Process, - ProcessAddressSpace, + Status = MmCreateMemoryArea(ProcessAddressSpace, MEMORY_AREA_NO_ACCESS, &BaseAddress, 0x10000 - PAGE_SIZE, PAGE_NOACCESS, &MemoryArea, FALSE, - FALSE, + 0, BoundaryAddressMultiple); if (!NT_SUCCESS(Status)) { @@ -435,15 +431,14 @@ /* Create the shared data page */ BaseAddress = (PVOID)USER_SHARED_DATA; - Status = MmCreateMemoryArea(Process, - ProcessAddressSpace, + Status = MmCreateMemoryArea(ProcessAddressSpace, MEMORY_AREA_SHARED_DATA, &BaseAddress, PAGE_SIZE, - PAGE_READONLY, + PAGE_EXECUTE_READ, &MemoryArea, FALSE, - FALSE, + 0, BoundaryAddressMultiple); if (!NT_SUCCESS(Status)) { @@ -478,7 +473,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to map process Image\n"); - goto exit; + return Status; } /* Save the pointer */ _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-11-13 14:15:08 UTC (rev 19207) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-11-13 17:28:24 UTC (rev 19208) @@ -1605,7 +1605,7 @@ { Status = MmCreateVirtualMapping(AddressSpace->Process, Address, - MemoryArea->Attributes, + MemoryArea->Protect, &Page, 1); MmSetDirtyPage(AddressSpace->Process, Address); @@ -1622,7 +1622,7 @@ */ Status = MmCreateVirtualMapping(AddressSpace->Process, Address, - MemoryArea->Attributes, + MemoryArea->Protect, &Page, 1); MmSetDirtyPage(AddressSpace->Process, Address); @@ -1656,7 +1656,7 @@ { Status = MmCreateVirtualMapping(AddressSpace->Process, Address, - MemoryArea->Attributes, + MemoryArea->Protect, &Page, 1); MmSetDirtyPage(AddressSpace->Process, Address); @@ -1668,7 +1668,7 @@ { Status = MmCreateVirtualMapping(AddressSpace->Process, Address, - MemoryArea->Attributes, + MemoryArea->Protect, &Page, 1); MmSetDirtyPage(AddressSpace->Process, Address); @@ -1952,6 +1952,13 @@ Region = MmFindRegion(MemoryArea->StartingAddress, &MemoryArea->Data.SectionData.RegionListHead, BaseAddress, NULL); + if ((MemoryArea->Flags & SEC_NO_CHANGE) && + Region->Protect != Protect) + { + CHECKPOINT1; + return STATUS_INVALID_PAGE_PROTECTION; + } + *OldProtect = Region->Protect; Status = MmAlterRegion(AddressSpace, MemoryArea->StartingAddress, &MemoryArea->Data.SectionData.RegionListHead, @@ -1993,7 +2000,7 @@ Info->Type = MEM_MAPPED; } Info->BaseAddress = RegionBaseAddress; - Info->AllocationProtect = MemoryArea->Attributes; + Info->AllocationProtect = MemoryArea->Protect; Info->RegionSize = Region->Length; Info->State = MEM_COMMIT; Info->Protect = Region->Protect; @@ -3377,15 +3384,6 @@ } } - /* - * Check the protection - */ - if ((SectionPageProtection & PAGE_FLAGS_VALID_FROM_USER_MODE) != - SectionPageProtection) - { - return(STATUS_INVALID_PAGE_PROTECTION); - } - Status = MmCreateSection(&SectionObject, DesiredAccess, ObjectAttributes, @@ -3481,15 +3479,14 @@ } NTSTATUS STATIC -MmMapViewOfSegment(PEPROCESS Process, - PMADDRESS_SPACE AddressSpace, +MmMapViewOfSegment(PMADDRESS_SPACE AddressSpace, PSECTION_OBJECT Section, PMM_SECTION_SEGMENT Segment, PVOID* BaseAddress, ULONG ViewSize, ULONG Protect, ULONG ViewOffset, - BOOL TopDown) + ULONG AllocationType) { PMEMORY_AREA MArea; NTSTATUS Status; @@ -3497,15 +3494,14 @@ BoundaryAddressMultiple.QuadPart = 0; - Status = MmCreateMemoryArea(Process, - AddressSpace, + Status = MmCreateMemoryArea(AddressSpace, MEMORY_AREA_SECTION_VIEW, BaseAddress, ViewSize, Protect, &MArea, FALSE, - TopDown, + AllocationType, BoundaryAddressMultiple); if (!NT_SUCCESS(Status)) { @@ -3514,11 +3510,8 @@ return(Status); } + ObReferenceObject((PVOID)Section); - ObReferenceObjectByPointer((PVOID)Section, - SECTION_MAP_READ, - NULL, - ExGetPreviousMode()); MArea->Data.SectionData.Segment = Segment; MArea->Data.SectionData.Section = Section; MArea->Data.SectionData.ViewOffset = ViewOffset; @@ -3599,7 +3592,31 @@ KPROCESSOR_MODE PreviousMode; PMADDRESS_SPACE AddressSpace; NTSTATUS Status = STATUS_SUCCESS; + ULONG tmpProtect; + /* + * Check the protection + */ + if (Protect & ~PAGE_FLAGS_VALID_FROM_USER_MODE) + { + CHECKPOINT1; + return STATUS_INVALID_PARAMETER_10; + } + + tmpProtect = Protect & ~(PAGE_GUARD|PAGE_NOCACHE); + if (tmpProtect != PAGE_NOACCESS && + tmpProtect != PAGE_READONLY && + tmpProtect != PAGE_READWRITE && + tmpProtect != PAGE_WRITECOPY && + tmpProtect != PAGE_EXECUTE && + tmpProtect != PAGE_EXECUTE_READ && + tmpProtect != PAGE_EXECUTE_READWRITE && + tmpProtect != PAGE_EXECUTE_WRITECOPY) + { + CHECKPOINT1; + return STATUS_INVALID_PAGE_PROTECTION; + } + PreviousMode = ExGetPreviousMode(); if(PreviousMode != KernelMode) @@ -4285,15 +4302,14 @@ AddressSpace = MmGetKernelAddressSpace(); Result = BaseAddress; MmLockAddressSpace(AddressSpace); - Status = MmCreateMemoryArea (NULL, - AddressSpace, + Status = MmCreateMemoryArea (AddressSpace, MEMORY_AREA_SYSTEM, &Result, Length, 0, &marea, FALSE, - FALSE, + 0, BoundaryAddressMultiple); MmUnlockAddressSpace(AddressSpace); @@ -4395,9 +4411,24 @@ ASSERT(Process); + if (Protect != PAGE_READONLY && + Protect != PAGE_READWRITE && + Protect != PAGE_WRITECOPY && + Protect != PAGE_EXECUTE && + Protect != PAGE_EXECUTE_READ && + Protect != PAGE_EXECUTE_READWRITE && + Protect != PAGE_EXECUTE_WRITECOPY) + { + CHECKPOINT1; + return STATUS_INVALID_PAGE_PROTECTION; + } + + Section = (PSECTION_OBJECT)SectionObject; AddressSpace = &Process->AddressSpace; + AllocationType |= (Section->AllocationAttributes & SEC_NO_CHANGE); + MmLockAddressSpace(AddressSpace); if (Section->AllocationAttributes & SEC_IMAGE) @@ -4458,15 +4489,14 @@ PVOID SBaseAddress = (PVOID) ((char*)ImageBase + (ULONG_PTR)SectionSegments[i].VirtualAddress); MmLockSectionSegment(&SectionSegments[i]); - Status = MmMapViewOfSegment(Process, - AddressSpace, + Status = MmMapViewOfSegment(AddressSpace, Section, &SectionSegments[i], &SBaseAddress, SectionSegments[i].Length, SectionSegments[i].Protection, 0, - FALSE); + 0); MmUnlockSectionSegment(&SectionSegments[i]); if (!NT_SUCCESS(Status)) { @@ -4480,6 +4510,28 @@ } else { + /* check for write access */ + if ((Protect & (PAGE_READWRITE|PAGE_EXECUTE_READWRITE)) && + !(Section->SectionPageProtection & (PAGE_READWRITE|PAGE_EXECUTE_READWRITE))) + { + CHECKPOINT1; + return STATUS_SECTION_PROTECTION; + } + /* check for read access */ + if ((Protect & (PAGE_READONLY|PAGE_WRITECOPY|PAGE_EXECUTE_READ|PAGE_EXECUTE_WRITECOPY)) && + !(Section->SectionPageProtection & (PAGE_READONLY|PAGE_READWRITE|PAGE_WRITECOPY|PAGE_EXECUTE_READ|PAGE_EXEC UTE_READWRITE|PAGE_EXECUTE_WRITECOPY))) + { + CHECKPOINT1; + return STATUS_SECTION_PROTECTION; + } + /* check for execute access */ [truncated at 1000 lines; 154 more skipped]

18 years, 10 months

[ekohl] 19207: ScmrControlService: Check access rights.

by ekohl＠svn.reactos.com

ScmrControlService: Check access rights. Modified: trunk/reactos/subsys/system/services/rpcserver.c _____ Modified: trunk/reactos/subsys/system/services/rpcserver.c --- trunk/reactos/subsys/system/services/rpcserver.c 2005-11-13 11:29:17 UTC (rev 19206) +++ trunk/reactos/subsys/system/services/rpcserver.c 2005-11-13 14:15:08 UTC (rev 19207) @@ -280,12 +280,14 @@ { PSERVICE_HANDLE hSvc; PSERVICE lpService; + ACCESS_MASK DesiredAccess; DPRINT("ScmrControlService() called\n"); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; + /* Check the service handle */ hSvc = (PSERVICE_HANDLE)hService; if (hSvc->Handle.Tag != SERVICE_TAG) { @@ -293,10 +295,39 @@ return ERROR_INVALID_HANDLE; } + /* Check access rights */ + switch (dwControl) + { + case SERVICE_CONTROL_STOP: + DesiredAccess = SERVICE_STOP; + break; - /* FIXME: Check access rights */ + case SERVICE_CONTROL_PAUSE: + case SERVICE_CONTROL_CONTINUE: + DesiredAccess = SERVICE_PAUSE_CONTINUE; + break; + case SERVICE_INTERROGATE: + DesiredAccess = SERVICE_INTERROGATE; + break; + default: + if (dwControl >= 128 && dwControl <= 255) + DesiredAccess = SERVICE_USER_DEFINED_CONTROL; + else + DesiredAccess = SERVICE_QUERY_CONFIG | + SERVICE_CHANGE_CONFIG | + SERVICE_QUERY_STATUS | + SERVICE_START | + SERVICE_PAUSE_CONTINUE; + break; + } + + if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, + DesiredAccess)) + return ERROR_ACCESS_DENIED; + + /* Check the service entry point */ lpService = hSvc->ServiceEntry; if (lpService == NULL) {

18 years, 10 months

[weiden] 19206: fixed unrecognized escape character sequence warning

by weiden＠svn.reactos.com

fixed unrecognized escape character sequence warning Modified: trunk/reactos/subsys/system/cmd/Es.rc _____ Modified: trunk/reactos/subsys/system/cmd/Es.rc --- trunk/reactos/subsys/system/cmd/Es.rc 2005-11-13 09:39:51 UTC (rev 19205) +++ trunk/reactos/subsys/system/cmd/Es.rc 2005-11-13 11:29:17 UTC (rev 19206) @@ -330,7 +330,8 @@ STRING_PATH_HELP1, "Muestra o cambia la ruta de b·squeda de archivos ejecutables.\n\n\ PATH [[unidad:]ruta[;...]]\nRuta ;\n\n\ -Escribe PATH ; para limpiar todas las configuraciones de b·squeda y usar solo el\n\ directorio actual del interprete de comandos.\n\ +Escribe PATH ; para limpiar todas las configuraciones de b·squeda y usar solo el\n\ +directorio actual del interprete de comandos.\n\ Escribe PATH sin parßmetros para mostrar la ruta actual.\n" STRING_PROMPT_HELP1, "Cambia el sÝmbolo de comandos.\n\n\

18 years, 10 months

[hpoussin] 19205: Fix typo: Install pci.sys for PCI buses, and isapnp.sys for ISA bus

by hpoussin＠svn.reactos.com

Fix typo: Install pci.sys for PCI buses, and isapnp.sys for ISA bus Modified: trunk/reactos/media/inf/machine.inf _____ Modified: trunk/reactos/media/inf/machine.inf --- trunk/reactos/media/inf/machine.inf 2005-11-13 09:05:28 UTC (rev 19204) +++ trunk/reactos/media/inf/machine.inf 2005-11-13 09:39:51 UTC (rev 19205) @@ -38,8 +38,8 @@ %*PNP0C0F.DeviceDesc% = NO_DRV,*PNP0C0F %ACPI\FixedButton.DeviceDesc% = NO_DRV,ACPI\FixedButton %PCI\CC_0600.DeviceDesc% = NO_DRV,PCI\CC_0600 -%PCI\CC_0601.DeviceDesc% = PCI_Inst,PCI\CC_0601 -%PCI\CC_0604.DeviceDesc% = PCI_ISA_Inst,PCI\CC_0604 +%PCI\CC_0601.DeviceDesc% = PCI_ISA_Inst,PCI\CC_0601 +%PCI\CC_0604.DeviceDesc% = PCI_Inst,PCI\CC_0604 [IntelMfg] %PCI\VEN_8086&DEV_7110.DeviceDesc% = PCI_ISA_Inst,PCI\VEN_8086&DEV_7110

18 years, 10 months

[mf] 19204: some little german translation fixes

by mf＠svn.reactos.com

some little german translation fixes Modified: trunk/reactos/subsys/system/explorer/explorer-de.rc _____ Modified: trunk/reactos/subsys/system/explorer/explorer-de.rc --- trunk/reactos/subsys/system/explorer/explorer-de.rc 2005-11-13 08:34:24 UTC (rev 19203) +++ trunk/reactos/subsys/system/explorer/explorer-de.rc 2005-11-13 09:05:28 UTC (rev 19204) @@ -96,7 +96,7 @@ BEGIN MENUITEM "Explorer &FAQ...", ID_EXPLORER_FAQ MENUITEM "&?ber Explorer...", ID_ABOUT_EXPLORER - MENUITEM "About &OS...", ID_ABOUT_WINDOWS + MENUITEM "?ber &OS...", ID_ABOUT_WINDOWS END END @@ -207,7 +207,7 @@ IDD_DESKBAR_STARTMENU DIALOG DISCARDABLE 0, 0, 210, 204 STYLE WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Startmenu-Einstellungen" +CAPTION "Startmen³-Einstellungen" FONT 8, "MS Sans Serif" BEGIN END @@ -284,7 +284,7 @@ STYLE WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME EXSTYLE WS_EX_APPWINDOW -CAPTION "Programmsuche im Startmenu" +CAPTION "Programmsuche im Startmen³" FONT 8, "MS Sans Serif", 0, 0, 0x1 BEGIN LTEXT "&Filter:",IDC_STATIC,7,9,18,8

18 years, 10 months

[ion] 19203: - Unconditionally support XBOX in Freeldr.

by ion＠svn.reactos.com

- Unconditionally support XBOX in Freeldr. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml _____ Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c --- trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-11-13 08:24:15 UTC (rev 19202) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/archmach.c 2005-11-13 08:34:24 UTC (rev 19203) @@ -32,9 +32,7 @@ PciId = READ_PORT_ULONG((ULONG*) 0xcfc); if (0x02a510de == PciId) { -#ifdef XBOX XboxMachInit(CmdLine); -#endif } else { _____ Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml --- trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml 2005-11-13 08:24:15 UTC (rev 19202) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_base.xml 2005-11-13 08:34:24 UTC (rev 19203) @@ -28,16 +28,14 @@ <file>pcrtc.c</file> <file>pcvideo.c</file> <file>portio.c</file> - <if property="SARCH" value="xbox"> - <file>machxbox.c</file> - <file>xboxcons.c</file> - <file>xboxdisk.c</file> - <file>xboxfont.c</file> - <file>xboxhw.c</file> - <file>xboxmem.c</file> - <file>xboxrtc.c</file> - <file>xboxvideo.c</file> - </if> + <file>machxbox.c</file> + <file>xboxcons.c</file> + <file>xboxdisk.c</file> + <file>xboxfont.c</file> + <file>xboxhw.c</file> + <file>xboxmem.c</file> + <file>xboxrtc.c</file> + <file>xboxvideo.c</file> </directory> </if> </directory>

18 years, 10 months

← Newer
1
...
56
57
58
59
60
61
62
...
88
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 November 2005