Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[ros-arm-bringup] 44884: Implement paged pool expansion. We are now ready to switch to ARM pool 100%.
by ros-arm-bringup＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: ros-arm-bringup Date: Sat Jan 2 17:10:11 2010 New Revision: 44884 URL: http://svn.reactos.org/svn/reactos?rev=44884&view=rev Log: Implement paged pool expansion. We are now ready to switch to ARM pool 100%. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Sat Jan 2 17:10:11 2010 @@ -141,7 +141,7 @@ PMMPTE PointerPte, StartPte; MMPTE TempPte; PMMPFN Pfn1; - PVOID BaseVa; + PVOID BaseVa, BaseVaStart; PMMFREE_POOL_ENTRY FreeEntry; PKSPIN_LOCK_QUEUE LockQueue; @@ -169,11 +169,133 @@ if (i == 0xFFFFFFFF) { // - // Out of memory! - // - DPRINT1("OUT OF PAGED POOL!!!\n"); - KeReleaseGuardedMutex(&MmPagedPoolMutex); - return NULL; + // Get the page bit count + // + i = ((SizeInPages - 1) / 1024) + 1; + + // + // Check if there is enougn paged pool expansion space left + // + if (MmPagedPoolInfo.NextPdeForPagedPoolExpansion > + MiAddressToPte(MmPagedPoolInfo.LastPteForPagedPool)) + { + // + // Out of memory! + // + DPRINT1("OUT OF PAGED POOL!!!\n"); + KeReleaseGuardedMutex(&MmPagedPoolMutex); + return NULL; + } + + // + // Check if we'll have to expand past the last PTE we have available + // + if (((i - 1) + MmPagedPoolInfo.NextPdeForPagedPoolExpansion) > + MiAddressToPte(MmPagedPoolInfo.LastPteForPagedPool)) + { + // + // We can only support this much then + // + SizeInPages = MiAddressToPte(MmPagedPoolInfo.LastPteForPagedPool) - + MmPagedPoolInfo.NextPdeForPagedPoolExpansion + + 1; + ASSERT(SizeInPages < i); + i = SizeInPages; + } + else + { + // + // Otherwise, there is plenty of space left for this expansion + // + SizeInPages = i; + } + + // + // Get the template PTE we'll use to expand + // + TempPte = HyperTemplatePte; + + // + // Get the first PTE in expansion space + // + PointerPte = MmPagedPoolInfo.NextPdeForPagedPoolExpansion; + BaseVa = MiPteToAddress(PointerPte); + BaseVaStart = BaseVa; + + // + // Lock the PFN database and loop pages + // + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + do + { + // + // It should not already be valid + // + ASSERT(PointerPte->u.Hard.Valid == 0); + + // + // Request a paged pool page and write the PFN for it + // + PageFrameNumber = MmAllocPage(MC_PPOOL, 0); + TempPte.u.Hard.PageFrameNumber = PageFrameNumber; + + // + // Save it into our double-buffered system page directory + // + MmSystemPagePtes[(ULONG_PTR)PointerPte & (PAGE_SIZE - 1) / + sizeof(MMPTE)] = TempPte; + + // + // Write the actual PTE now + // + *PointerPte++ = TempPte; + + // + // Move on to the next expansion address + // + BaseVa = (PVOID)((ULONG_PTR)BaseVa + PAGE_SIZE); + } while (--i > 0); + + // + // Release the PFN database lock + // + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + // + // These pages are now available, clear their availablity bits + // + RtlClearBits(MmPagedPoolInfo.PagedPoolAllocationMap, + (MmPagedPoolInfo.NextPdeForPagedPoolExpansion - + MiAddressToPte(MmPagedPoolInfo.FirstPteForPagedPool)) * + 1024, + SizeInPages * 1024); + + // + // Update the next expansion location + // + MmPagedPoolInfo.NextPdeForPagedPoolExpansion += SizeInPages; + + // + // Zero out the newly available memory + // + RtlZeroMemory(BaseVaStart, SizeInPages * PAGE_SIZE); + + // + // Now try consuming the pages again + // + SizeInPages = BYTES_TO_PAGES(SizeInBytes); + i = RtlFindClearBitsAndSet(MmPagedPoolInfo.PagedPoolAllocationMap, + SizeInPages, + 0); + if (i == 0xFFFFFFFF) + { + // + // Out of memory! + // + DPRINT1("OUT OF PAGED POOL!!!\n"); + KeReleaseGuardedMutex(&MmPagedPoolMutex); + return NULL; + } } //

1 0

[ekohl] 44883: Add missing device node flags.
by ekohl＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: ekohl Date: Sat Jan 2 16:55:03 2010 New Revision: 44883 URL: http://svn.reactos.org/svn/reactos?rev=44883&view=rev Log: Add missing device node flags. Modified: trunk/reactos/include/ddk/cfg.h Modified: trunk/reactos/include/ddk/cfg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/cfg.h?rev=4488… ============================================================================== --- trunk/reactos/include/ddk/cfg.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/cfg.h [iso-8859-1] Sat Jan 2 16:55:03 2010 @@ -101,19 +101,38 @@ #define DN_STARTED 0x00000008 /* Is currently configured */ #define DN_MANUAL 0x00000010 /* Manually installed */ #define DN_NEED_TO_ENUM 0x00000020 /* May need reenumeration */ -#define DN_NOT_FIRST_TIME 0x00000040 /* Has received a config */ +#define DN_NOT_FIRST_TIME 0x00000040 /* Has received a config (Win9x only) */ #define DN_HARDWARE_ENUM 0x00000080 /* Enum generates hardware ID */ -#define DN_LIAR 0x00000100 /* Lied about can reconfig once */ -#define DN_HAS_MARK 0x00000200 /* Not CM_Create_DevNode lately */ +#define DN_LIAR 0x00000100 /* Lied about can reconfig once (Win9x only) */ +#define DN_HAS_MARK 0x00000200 /* Not CM_Create_DevNode lately (Win9x only) */ #define DN_HAS_PROBLEM 0x00000400 /* Need device installer */ #define DN_FILTERED 0x00000800 /* Is filtered */ -#define DN_MOVED 0x00001000 /* Has been moved */ +#define DN_MOVED 0x00001000 /* Has been moved (Win9x only) */ #define DN_DISABLEABLE 0x00002000 /* Can be rebalanced */ #define DN_REMOVABLE 0x00004000 /* Can be removed */ #define DN_PRIVATE_PROBLEM 0x00008000 /* Has a private problem */ #define DN_MF_PARENT 0x00010000 /* Multi function parent */ #define DN_MF_CHILD 0x00020000 /* Multi function child */ -#define DN_WILL_BE_REMOVED 0x00040000 /* Devnode is being removed */ +#define DN_WILL_BE_REMOVED 0x00040000 +#define DN_NOT_FIRST_TIMEE 0x00080000 +#define DN_STOP_FREE_RES 0x00100000 +#define DN_REBAL_CANDIDATE 0x00200000 +#define DN_BAD_PARTIAL 0x00400000 +#define DN_NT_ENUMERATOR 0x00800000 +#define DN_NT_DRIVER 0x01000000 +#define DN_NEEDS_LOCKING 0x02000000 +#define DN_ARM_WAKEUP 0x04000000 +#define DN_APM_ENUMERATOR 0x08000000 +#define DN_APM_DRIVER 0x10000000 +#define DN_SILENT_INSTALL 0x20000000 +#define DN_NO_SHOW_IN_DM 0x40000000 +#define DN_BOOT_LOG_PROB 0x80000000 + +#define DN_NEED_RESTART DN_LIAR +#define DN_DRIVER_BLOCKED DN_NOT_FIRST_TIME +#define DN_LEGACY_DRIVER DN_MOVED +#define DN_CHILD_WITH_INVALID_ID DN_HAS_MARK + typedef enum _PNP_VETO_TYPE { PNP_VetoTypeUnknown,

1 0

[spetreolle] 44882: Polish devmgr translation udates by Olaf Siejka
by spetreolle＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: spetreolle Date: Sat Jan 2 14:29:19 2010 New Revision: 44882 URL: http://svn.reactos.org/svn/reactos?rev=44882&view=rev Log: Polish devmgr translation udates by Olaf Siejka Modified: trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc Modified: trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/lang/pl-P… ============================================================================== --- trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/lang/pl-PL.rc [iso-8859-1] Sat Jan 2 14:29:19 2010 @@ -4,7 +4,7 @@ * xxrogers(a)users.sourceforge.net * https://sourceforge.net/projects/reactospl * -* updates by Caemyr - Olaf Siejka (Jan, 2008) +* updates by Caemyr - Olaf Siejka (Jan 2008, Jan 2010) */ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT @@ -100,30 +100,30 @@ STRINGTABLE BEGIN - IDS_PROP_DEVICEID "Device Instance ID" - IDS_PROP_HARDWAREIDS "Hardware IDs" - IDS_PROP_COMPATIBLEIDS "Compatible IDs" - IDS_PROP_MATCHINGDEVICEID "Matching Device ID" - IDS_PROP_SERVICE "Service" - IDS_PROP_ENUMERATOR "Enumerator" - IDS_PROP_CAPABILITIES "Capabilities" - IDS_PROP_DEVNODEFLAGS "Devnode Flags" - IDS_PROP_CONFIGFLAGS "Config Flags" - IDS_PROP_CSCONFIGFLAGS "CSConfig Flags" - IDS_PROP_EJECTIONRELATIONS "Ejection Relations" - IDS_PROP_REMOVALRELATIONS "Removal Relations" - IDS_PROP_BUSRELATIONS "Bus Relations" - IDS_PROP_DEVUPPERFILTERS "Device Upper Filters" - IDS_PROP_DEVLOWERFILTERS "Device Lower Filters" - IDS_PROP_CLASSUPPERFILTERS "Class Upper Filters" - IDS_PROP_CLASSLOWERFILTERS "Class Lower Filters" - IDS_PROP_CLASSINSTALLER "Class Installers" - IDS_PROP_CLASSCOINSTALLER "Class Coinstallers" - IDS_PROP_DEVICECOINSTALLER "Device Coinstallers" - IDS_PROP_FIRMWAREREVISION "Firmware Revision" - IDS_PROP_CURRENTPOWERSTATE "Current Power State" - IDS_PROP_POWERCAPABILITIES "Power Capabilities" - IDS_PROP_POWERSTATEMAPPINGS "Power State Mappings" + IDS_PROP_DEVICEID "cie¿ka urz¹dzenia" + IDS_PROP_HARDWAREIDS "Identyfikator urz¹dzenia" + IDS_PROP_COMPATIBLEIDS "Zgodne identyfikatory" + IDS_PROP_MATCHINGDEVICEID "U¿yty identyfikator" + IDS_PROP_SERVICE "Us³uga" + IDS_PROP_ENUMERATOR "Modu³ lokalizuj¹cy" + IDS_PROP_CAPABILITIES "Mo¿liwoci" + IDS_PROP_DEVNODEFLAGS "Konfiguracja wêz³a Devnode" + IDS_PROP_CONFIGFLAGS "Stan wêz³a Config" + IDS_PROP_CSCONFIGFLAGS "Stan wêz³a CSCONFIG" + IDS_PROP_EJECTIONRELATIONS "Relacje wysuwania" + IDS_PROP_REMOVALRELATIONS "Relacje usuwania" + IDS_PROP_BUSRELATIONS "Relacje magistrali" + IDS_PROP_DEVUPPERFILTERS "Wy¿sze filtry urz¹dzenia" + IDS_PROP_DEVLOWERFILTERS "Ni¿sze filtry urz¹dzenia" + IDS_PROP_CLASSUPPERFILTERS "Wy¿sze filtry klasy" + IDS_PROP_CLASSLOWERFILTERS "Ni¿sze filtry klasy" + IDS_PROP_CLASSINSTALLER "Instalator klasy" + IDS_PROP_CLASSCOINSTALLER "Dodatkowy instalator klasy" + IDS_PROP_DEVICECOINSTALLER "Dodatkowy instalator urz¹dzenia" + IDS_PROP_FIRMWAREREVISION "Wersja Firmware" + IDS_PROP_CURRENTPOWERSTATE "Bie¿¹cy stan zasilania" + IDS_PROP_POWERCAPABILITIES "Zdolnoci trybu zasilania" + IDS_PROP_POWERSTATEMAPPINGS "Mapowania stanu zasilania" END IDD_HARDWARE DIALOGEX DISCARDABLE 0, 0, 300, 400 @@ -184,7 +184,7 @@ IDD_DEVICEDETAILS DIALOGEX DISCARDABLE 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Details" +CAPTION "Szczegó³y" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 @@ -197,7 +197,7 @@ IDD_DEVICERESOURCES DIALOGEX DISCARDABLE 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Resources" +CAPTION "Zasoby" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20 @@ -206,7 +206,7 @@ IDD_DEVICEPOWER DIALOGEX DISCARDABLE 0, 0, 252, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Power" +CAPTION "Zasilanie" FONT 8, "MS Shell Dlg" BEGIN ICON "", IDC_DEVICON, 7, 7, 20, 20

1 0

[gedmurphy] 44881: [SERVMAN] Quick fix for bug 5076, this should stop if from crashing. Stopping services is disabled at the moment
by gedmurphy＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: gedmurphy Date: Sat Jan 2 13:10:14 2010 New Revision: 44881 URL: http://svn.reactos.org/svn/reactos?rev=44881&view=rev Log: [SERVMAN] Quick fix for bug 5076, this should stop if from crashing. Stopping services is disabled at the moment Modified: trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c trunk/reactos/base/applications/mscutils/servman/precomp.h trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c trunk/reactos/base/applications/mscutils/servman/stop.c Modified: trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c [iso-8859-1] Sat Jan 2 13:10:14 2010 @@ -10,8 +10,8 @@ #include "precomp.h" -static BOOL -HasDependantServices(LPWSTR lpServiceName) +BOOL +TV2_HasDependantServices(LPWSTR lpServiceName) { HANDLE hSCManager; HANDLE hService; @@ -136,7 +136,7 @@ for (i = 0; i < count; i++) { /* Does this item need a +/- box? */ - bHasChildren = HasDependantServices(lpServiceStatus[i].lpServiceName); + bHasChildren = TV2_HasDependantServices(lpServiceStatus[i].lpServiceName); /* Add it */ AddItemToTreeView(pDlgInfo->hDependsTreeView2, Modified: trunk/reactos/base/applications/mscutils/servman/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/precomp.h [iso-8859-1] Sat Jan 2 13:10:14 2010 @@ -22,6 +22,10 @@ #define LVSTATUS 2 #define LVSTARTUP 3 #define LVLOGONAS 4 + +#define IMAGE_UNKNOWN 0 +#define IMAGE_SERVICE 1 +#define IMAGE_DRIVER 2 typedef struct _MAIN_WND_INFO { @@ -130,6 +134,7 @@ /* tv2_dependencies */ BOOL TV2_Initialize(PSERVICEPROPSHEET pDlgInfo, LPTSTR lpServiceName); VOID TV2_AddDependantsToTree(PSERVICEPROPSHEET pDlgInfo, HTREEITEM hParent, LPTSTR lpServiceName); +BOOL TV2_HasDependantServices(LPWSTR lpServiceName); LONG APIENTRY OpenPropSheet(PMAIN_WND_INFO Info); Modified: trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/propsheet_depends.c [iso-8859-1] Sat Jan 2 13:10:14 2010 @@ -34,19 +34,19 @@ { case SERVICE_WIN32_OWN_PROCESS: case SERVICE_WIN32_SHARE_PROCESS: - tvi.iImage = 1; - tvi.iSelectedImage = 1; + tvi.iImage = IMAGE_SERVICE; + tvi.iSelectedImage = IMAGE_SERVICE; break; case SERVICE_KERNEL_DRIVER: case SERVICE_FILE_SYSTEM_DRIVER: - tvi.iImage = 2; - tvi.iSelectedImage = 2; + tvi.iImage = IMAGE_DRIVER; + tvi.iSelectedImage = IMAGE_DRIVER; break; default: - tvi.iImage = 0; - tvi.iSelectedImage = 0; + tvi.iImage = IMAGE_UNKNOWN; + tvi.iSelectedImage = IMAGE_UNKNOWN; break; } Modified: trunk/reactos/base/applications/mscutils/servman/stop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/stop.c [iso-8859-1] Sat Jan 2 13:10:14 2010 @@ -11,16 +11,16 @@ static BOOL -StopService(PSTOP_INFO pStopInfo, - SC_HANDLE hService) +StopService(PMAIN_WND_INFO pInfo, + LPWSTR lpServiceName) { - SERVICE_STATUS_PROCESS ServiceStatus; - DWORD dwBytesNeeded; - DWORD dwStartTime; - DWORD dwTimeout; - HWND hProgDlg; + //SERVICE_STATUS_PROCESS ServiceStatus; + //DWORD dwBytesNeeded; + //DWORD dwStartTime; + // DWORD dwTimeout; + //HWND hProgDlg; BOOL bRet = FALSE; - +/* dwStartTime = GetTickCount(); dwTimeout = 30000; // 30 secs @@ -47,7 +47,7 @@ { if (GetTickCount() - dwStartTime > dwTimeout) { - /* We exceeded our max wait time, give up */ + We exceeded our max wait time, give up break; } } @@ -63,13 +63,13 @@ Sleep(500); DestroyWindow(hProgDlg); } - +*/ return bRet; } static BOOL -StopDependentServices(PSTOP_INFO pStopInfo, - SC_HANDLE hService) +StopDependantServices(PMAIN_WND_INFO pInfo, + LPWSTR lpServiceName) { //LPENUM_SERVICE_STATUS lpDependencies; //SC_HANDLE hDepService; @@ -118,53 +118,33 @@ BOOL DoStop(PMAIN_WND_INFO pInfo) { - STOP_INFO stopInfo; - //SC_HANDLE hSCManager; - SC_HANDLE hService = NULL; BOOL bRet = FALSE; if (pInfo) { - //stopInfo.pInfo = pInfo; - - if (TRUE /*HasDependentServices(pInfo->pCurrentService->lpServiceName)*/) + /* Does this service have anything which depends on it? */ + if (TV2_HasDependantServices(pInfo->pCurrentService->lpServiceName)) { - INT ret = DialogBoxParam(hInstance, - MAKEINTRESOURCE(IDD_DLG_DEPEND_STOP), - pInfo->hMainWnd, - StopDependsDialogProc, - (LPARAM)&stopInfo); - if (ret == IDOK) + /* It does, list them and ask the user if they want to stop them as well */ + if (DialogBoxParam(hInstance, + MAKEINTRESOURCE(IDD_DLG_DEPEND_STOP), + pInfo->hMainWnd, + StopDependsDialogProc, + (LPARAM)&pInfo) == IDOK) { - if (StopDependentServices(&stopInfo, hService)) + /* Stop all the dependany services */ + if (StopDependantServices(pInfo, pInfo->pCurrentService->lpServiceName)) { - bRet = StopService(&stopInfo, hService); + /* Finally stop the requested service */ + bRet = StopService(pInfo, pInfo->pCurrentService->lpServiceName); } } } else { - bRet = StopService(&stopInfo, hService); + /* No dependants, just stop the service */ + bRet = StopService(pInfo, pInfo->pCurrentService->lpServiceName); } -/* - hSCManager = OpenSCManager(NULL, - NULL, - SC_MANAGER_ALL_ACCESS); - if (hSCManager) - { - hService = OpenService(hSCManager, - pInfo->pCurrentService->lpServiceName, - SERVICE_STOP | SERVICE_QUERY_STATUS | SERVICE_ENUMERATE_DEPENDENTS); - if (hService) - { - stopInfo.hSCManager = hSCManager; - stopInfo.hMainService = hService; - - CloseServiceHandle(hService); - } - - CloseServiceHandle(hSCManager); - }*/ } return bRet;

1 0

[ros-arm-bringup] 44880: [NTOS]: Build fixer.
by ros-arm-bringup＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: ros-arm-bringup Date: Sat Jan 2 06:12:29 2010 New Revision: 44880 URL: http://svn.reactos.org/svn/reactos?rev=44880&view=rev Log: [NTOS]: Build fixer. Modified: trunk/reactos/ntoskrnl/include/internal/ke.h 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] Sat Jan 2 06:12:29 2010 @@ -79,6 +79,8 @@ IN ULONG Length ); +extern PKNMI_HANDLER_CALLBACK KiNmiCallbackListHead; +extern KSPIN_LOCK KiNmiCallbackListLock; extern PVOID KeUserApcDispatcher; extern PVOID KeUserCallbackDispatcher; extern PVOID KeUserExceptionDispatcher;

1 0

[ros-arm-bringup] 44879: NMI Support Patch 14: [BOOTDATA]: Add NMIDEBUG.SYS to the BOM and registry hive. This is the last patch for NMI support. It is up to you to leverage this feature as needed through the NMIDEBUG.SYS driver.
by ros-arm-bringup＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: ros-arm-bringup Date: Sat Jan 2 05:51:23 2010 New Revision: 44879 URL: http://svn.reactos.org/svn/reactos?rev=44879&view=rev Log: NMI Support Patch 14: [BOOTDATA]: Add NMIDEBUG.SYS to the BOM and registry hive. This is the last patch for NMI support. It is up to you to leverage this feature as needed through the NMIDEBUG.SYS driver. Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sat Jan 2 05:51:23 2010 @@ -1149,6 +1149,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Null","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Null","Type",0x00010001,0x00000001 +; NMI device driver +HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","Group",0x00000000,"Base" +HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","ImagePath",0x00020000,"system32\drivers\nmidebug.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\NMIDebug","Type",0x00010001,0x00000001 + ; Packet driver HKLM,"SYSTEM\CurrentControlSet\Services\Packet","ErrorControl",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Packet","Group",0x00000000,"PNP_TDI" Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Sat Jan 2 05:51:23 2010 @@ -480,6 +480,7 @@ drivers\base\bootvid\bootvid.dll 1 drivers\base\beep\beep.sys 2 drivers\base\null\null.sys 2 +drivers\base\nmidebug\nmidebug.sys 2 drivers\bus\isapnp\isapnp.sys 2

1 0

[ros-arm-bringup] 44878: NMI Support Patch 13: [NMIDEBUG]: Add new NMI Debug driver. It registers an NMI callback on startup. The callback does nothing useful at the moment, but you can enhance it to add all sorts of debugging information that would otherwise be unavailable in situations such as an interrupt storm, IRQL hang, etc. When you send an NMI, such as by using QEMU, you should see the driver print a string.
by ros-arm-bringup＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: ros-arm-bringup Date: Sat Jan 2 05:50:08 2010 New Revision: 44878 URL: http://svn.reactos.org/svn/reactos?rev=44878&view=rev Log: NMI Support Patch 13: [NMIDEBUG]: Add new NMI Debug driver. It registers an NMI callback on startup. The callback does nothing useful at the moment, but you can enhance it to add all sorts of debugging information that would otherwise be unavailable in situations such as an interrupt storm, IRQL hang, etc. When you send an NMI, such as by using QEMU, you should see the driver print a string. Added: trunk/reactos/drivers/base/nmidebug/ trunk/reactos/drivers/base/nmidebug/nmidebug.c (with props) trunk/reactos/drivers/base/nmidebug/nmidebug.rbuild (with props) trunk/reactos/drivers/base/nmidebug/nmidebug.rc (with props) Modified: trunk/reactos/drivers/base/directory.rbuild Modified: trunk/reactos/drivers/base/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/directory.rbu… ============================================================================== --- trunk/reactos/drivers/base/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/base/directory.rbuild [iso-8859-1] Sat Jan 2 05:50:08 2010 @@ -20,4 +20,7 @@ <directory name="null"> <xi:include href="null/null.rbuild" /> </directory> +<directory name="nmidebug"> + <xi:include href="nmidebug/nmidebug.rbuild" /> +</directory> </group> Added: trunk/reactos/drivers/base/nmidebug/nmidebug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/nmidebug/nmid… ============================================================================== --- trunk/reactos/drivers/base/nmidebug/nmidebug.c (added) +++ trunk/reactos/drivers/base/nmidebug/nmidebug.c [iso-8859-1] Sat Jan 2 05:50:08 2010 @@ -1,0 +1,49 @@ +/* + * PROJECT: ReactOS NMI Debug Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: drivers/base/nmidebug/nmidebug.c + * PURPOSE: Driver Code + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntddk.h> + +/* FUNCTIONS ******************************************************************/ + +BOOLEAN +NTAPI +NmiDbgCallback(IN PVOID Context, + IN BOOLEAN Handled) +{ + // + // Let the user know we are alive + // + DbgPrint("NMI Callback entered! Letting the system crash...\n"); + + // + // Do not handle the NMI + // + return FALSE; +} + +NTSTATUS +NTAPI +DriverEntry(IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) +{ + PAGED_CODE(); + + // + // Register NMI callback + // + KeRegisterNmiCallback(&NmiDbgCallback, NULL); + + // + // Return success + // + return STATUS_SUCCESS; +} + +/* EOF */ Propchange: trunk/reactos/drivers/base/nmidebug/nmidebug.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/base/nmidebug/nmidebug.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/nmidebug/nmid… ============================================================================== --- trunk/reactos/drivers/base/nmidebug/nmidebug.rbuild (added) +++ trunk/reactos/drivers/base/nmidebug/nmidebug.rbuild [iso-8859-1] Sat Jan 2 05:50:08 2010 @@ -1,0 +1,9 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd"> +<module name="nmidebug" type="kernelmodedriver" installbase="system32/drivers" installname="nmidebug.sys"> + <include base="null">.</include> + <library>ntoskrnl</library> + <library>hal</library> + <file>nmidebug.c</file> + <file>nmidebug.rc</file> +</module> Propchange: trunk/reactos/drivers/base/nmidebug/nmidebug.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/drivers/base/nmidebug/nmidebug.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/nmidebug/nmid… ============================================================================== --- trunk/reactos/drivers/base/nmidebug/nmidebug.rc (added) +++ trunk/reactos/drivers/base/nmidebug/nmidebug.rc [iso-8859-1] Sat Jan 2 05:50:08 2010 @@ -1,0 +1,11 @@ +#include <winver.h> +#include <ntverp.h> + +#define VER_FILETYPE VFT_DRV +#define VER_FILESUBTYPE VFT2_DRV_SYSTEM +#define VER_FILEDESCRIPTION_STR "NMI debug driver" +#define VER_INTERNALNAME_STR "NMIDEBUG.SYS" +#define VER_ORIGINALFILENAME_STR "NMIDEBUG.SYS" +#define VER_LANGNEUTRAL + +#include "common.ver" Propchange: trunk/reactos/drivers/base/nmidebug/nmidebug.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ros-arm-bringup] 44877: NMI Support Patch 12: [NTOS]: Implement KeRegisterNMICallback. [NTOS]: Call and implement KiHandleNMI to call all registered NMI callbacks and potentially resume from the NMI if handled.
by ros-arm-bringup＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: ros-arm-bringup Date: Sat Jan 2 05:48:22 2010 New Revision: 44877 URL: http://svn.reactos.org/svn/reactos?rev=44877&view=rev Log: NMI Support Patch 12: [NTOS]: Implement KeRegisterNMICallback. [NTOS]: Call and implement KiHandleNMI to call all registered NMI callbacks and potentially resume from the NMI if handled. Modified: trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ke/i386/trap.s 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] Sat Jan 2 05:48:22 2010 @@ -63,6 +63,14 @@ PKDEFERRED_ROUTINE Routine; PVOID Context; } DPC_QUEUE_ENTRY, *PDPC_QUEUE_ENTRY; + +typedef struct _KNMI_HANDLER_CALLBACK +{ + struct _KNMI_HANDLER_CALLBACK* Next; + PNMI_CALLBACK Callback; + PVOID Context; + PVOID Handle; +} KNMI_HANDLER_CALLBACK, *PKNMI_HANDLER_CALLBACK; typedef PCHAR (NTAPI *PKE_BUGCHECK_UNICODE_TO_ANSI)( Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] Sat Jan 2 05:48:22 2010 @@ -1758,3 +1758,18 @@ GuardedMutex->SpecialApcDisable = Thread->SpecialApcDisable; return TRUE; } + + +FORCEINLINE +VOID +KiAcquireNmiListLock(OUT PKIRQL OldIrql) +{ + KeAcquireSpinLock(&KiNmiCallbackListLock, OldIrql); +} + +FORCEINLINE +VOID +KiReleaseNmiListLock(IN KIRQL OldIrql) +{ + KeReleaseSpinLock(&KiNmiCallbackListLock, OldIrql); +} Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=4487… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Sat Jan 2 05:48:22 2010 @@ -28,6 +28,8 @@ ULONG KiHardwareTrigger; PUNICODE_STRING KiBugCheckDriver; ULONG_PTR KiBugCheckData[5]; +PKNMI_HANDLER_CALLBACK KiNmiCallbackListHead; +KSPIN_LOCK KiNmiCallbackListLock; /* Bugzilla Reporting */ UNICODE_STRING KeRosProcessorName, KeRosBiosDate, KeRosBiosVersion; @@ -1208,6 +1210,32 @@ while (TRUE); } +BOOLEAN +NTAPI +KiHandleNmi(VOID) +{ + BOOLEAN Handled = FALSE; + PKNMI_HANDLER_CALLBACK NmiData; + + // + // Parse the list of callbacks + // + NmiData = KiNmiCallbackListHead; + while (NmiData) + { + // + // Save if this callback has handled it -- all it takes is one + // + Handled |= NmiData->Callback(NmiData->Context, Handled); + NmiData = NmiData->Next; + } + + // + // Has anyone handled this? + // + return Handled; +} + /* PUBLIC FUNCTIONS **********************************************************/ /* @@ -1278,17 +1306,6 @@ /* Lower IRQL and return */ KeLowerIrql(OldIrql); return Status; -} - -/* - * @unimplemented - */ -NTSTATUS -NTAPI -KeDeregisterNmiCallback(PVOID Handle) -{ - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; } /* @@ -1362,15 +1379,58 @@ } /* - * @unimplemented + * @implemented */ PVOID NTAPI KeRegisterNmiCallback(IN PNMI_CALLBACK CallbackRoutine, IN PVOID Context) { + KIRQL OldIrql; + PKNMI_HANDLER_CALLBACK NmiData, Next; + ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); + + // + // Allocate NMI callback data + // + NmiData = ExAllocatePoolWithTag(NonPagedPool, + sizeof(KNMI_HANDLER_CALLBACK), + 'IMNK'); + if (!NmiData) return NULL; + + // + // Fill in the information + // + NmiData->Callback = CallbackRoutine; + NmiData->Context = Context; + NmiData->Handle = NmiData; + + // + // Insert it into NMI callback list + // + KiAcquireNmiListLock(&OldIrql); + NmiData->Next = KiNmiCallbackListHead; + Next = InterlockedCompareExchangePointer(&KiNmiCallbackListHead, + NmiData, + NmiData->Next); + ASSERT(Next == NmiData->Next); + KiReleaseNmiListLock(OldIrql); + + // + // Return the opaque "handle" + // + return NmiData->Handle; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +KeDeregisterNmiCallback(PVOID Handle) +{ UNIMPLEMENTED; - return NULL; + return STATUS_UNSUCCESSFUL; } /* Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Sat Jan 2 05:48:22 2010 @@ -881,8 +881,11 @@ stdCall _KiSaveProcessorState, ebp, 0 // Save to KPRCB CONTEXT // - // BUGBUG: Call Registered NMI handlers + // Call Registered NMI handlers // + stdCall _KiHandleNmi // Call NMI handlers + or al, al // Check if any handled it + jne 1f // Resume from NMI // // Call the platform driver for NMI handling (panic, etc) @@ -897,6 +900,7 @@ // In certain situations, nested NMIs can corrupt the TSS, making us lose // the original context. If this happens, we have no choice but to panic. // +1: mov eax, PCR[KPCR_TSS] // Get current TSS cmp word ptr [eax], KGDT_NMI_TSS // Check who its points to je 2f // Back to the NMI TSS crash

1 0

[ros-arm-bringup] 44876: [NTOS]: Fix stdCall macro to work with functions of zero parameters.
by ros-arm-bringup＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: ros-arm-bringup Date: Sat Jan 2 05:46:23 2010 New Revision: 44876 URL: http://svn.reactos.org/svn/reactos?rev=44876&view=rev Log: [NTOS]: Fix stdCall macro to work with functions of zero parameters. Modified: trunk/reactos/ntoskrnl/include/internal/i386/callconv.s Modified: trunk/reactos/ntoskrnl/include/internal/i386/callconv.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/callconv.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/callconv.s [iso-8859-1] Sat Jan 2 05:46:23 2010 @@ -23,10 +23,11 @@ cCount = 0 - .irp arg, \ArgList - cCount = cCount+1 - .endr - + .ifnb \ArgList + .irp arg, \ArgList + cCount = cCount+1 + .endr + .endif .endm //

1 0

[ros-arm-bringup] 44875: NMI Support Patch 11: [PSDK]: Add definitions for public NMI callback registration functions.
by ros-arm-bringup＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: ros-arm-bringup Date: Sat Jan 2 05:44:58 2010 New Revision: 44875 URL: http://svn.reactos.org/svn/reactos?rev=44875&view=rev Log: NMI Support Patch 11: [PSDK]: Add definitions for public NMI callback registration functions. Modified: trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Sat Jan 2 05:44:58 2010 @@ -8579,6 +8579,21 @@ IN PUCHAR Component); NTKERNELAPI +PVOID +NTAPI +KeRegisterNmiCallback( + IN PNMI_CALLBACK CallbackRoutine, + IN PVOID Context +); + +NTKERNELAPI +NTSTATUS +NTAPI +KeDeregisterNmiCallback( + IN PVOID Handle +); + +NTKERNELAPI VOID FASTCALL KeReleaseInStackQueuedSpinLockFromDpcLevel(

1 0

← Newer
1
...
46
47
48
49
50
51
52
53
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 January 2010