Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[janderwald] 44874: [MMIXER_TEST] - Implement AllocEventData, FreeEventData for mmixer library
by janderwald＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: janderwald Date: Sat Jan 2 02:54:09 2010 New Revision: 44874 URL: http://svn.reactos.org/svn/reactos?rev=44874&view=rev Log: [MMIXER_TEST] - Implement AllocEventData, FreeEventData for mmixer library Modified: trunk/rostests/tests/mmixer_test/test.c Modified: trunk/rostests/tests/mmixer_test/test.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/tests/mmixer_test/test.c?… ============================================================================== --- trunk/rostests/tests/mmixer_test/test.c [iso-8859-1] (original) +++ trunk/rostests/tests/mmixer_test/test.c [iso-8859-1] Sat Jan 2 02:54:09 2010 @@ -2,6 +2,7 @@ #include <stdio.h> #include <stdlib.h> #include <setupapi.h> +#include <ks.h> #include <ksmedia.h> #include <mmsystem.h> #include <mmreg.h> @@ -104,7 +105,7 @@ { CloseHandle(Overlapped.hEvent); - //printf("Control: Failed with %lu Transferred %lu\n", GetLastError(), Transferred); + printf("Control: Failed with %lu Transferred %lu\n", GetLastError(), Transferred); if (GetLastError() == ERROR_MORE_DATA || GetLastError() == ERROR_INSUFFICIENT_BUFFER) { @@ -272,6 +273,33 @@ return MM_STATUS_SUCCESS; } +PVOID +AllocEventData( + IN ULONG ExtraSize) +{ + PKSEVENTDATA Data = (PKSEVENTDATA)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(KSEVENTDATA) + ExtraSize); + if (!Data) + return NULL; + + Data->EventHandle.Event = CreateEventW(NULL, FALSE, FALSE, NULL); + if (!Data->EventHandle.Event) + { + HeapFree(GetProcessHeap(), 0, Data); + return NULL; + } + + Data->NotificationType = KSEVENTF_EVENT_HANDLE; + return Data; +} + +VOID +FreeEventData(IN PVOID EventData) +{ + PKSEVENTDATA Data = (PKSEVENTDATA)EventData; + + CloseHandle(Data->EventHandle.Event); + HeapFree(GetProcessHeap(), 0, Data); +} int main(int argc, char**argv) { @@ -308,6 +336,8 @@ MixerContext.OpenKey = OpenKey; MixerContext.CloseKey = CloseKey; MixerContext.QueryKeyValue = QueryKeyValue; + MixerContext.AllocEventData = AllocEventData; + MixerContext.FreeEventData = FreeEventData; Status = MMixerInitialize(&MixerContext, Enum, (PVOID)DeviceHandle); @@ -382,5 +412,9 @@ wprintf(L"=======================\n"); } + + wprintf(L"//////////////////////\n"); + wprintf(L"NumWaveOut %lu NumWaveIn %lu\n", MMixerGetWaveOutCount(&MixerContext), MMixerGetWaveInCount(&MixerContext)); + wprintf(L"waveOut %lu waveIn %lu\n", waveOutGetNumDevs(), waveInGetNumDevs()); return 0; }

1 0

[janderwald] 44873: [WDMAUD.DRV] - Implement AllocEventData, FreeEventData for mmixer library
by janderwald＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: janderwald Date: Sat Jan 2 02:53:22 2010 New Revision: 44873 URL: http://svn.reactos.org/svn/reactos?rev=44873&view=rev Log: [WDMAUD.DRV] - Implement AllocEventData, FreeEventData for mmixer library Modified: trunk/reactos/dll/win32/wdmaud.drv/mmixer.c trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild Modified: trunk/reactos/dll/win32/wdmaud.drv/mmixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/mmixe… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/mmixer.c [iso-8859-1] Sat Jan 2 02:53:22 2010 @@ -20,6 +20,8 @@ MIXER_STATUS OpenKey(IN HANDLE hKey, IN LPWSTR SubKey, IN ULONG DesiredAccess, OUT PHANDLE OutKey); MIXER_STATUS CloseKey(IN HANDLE hKey); MIXER_STATUS QueryKeyValue(IN HANDLE hKey, IN LPWSTR KeyName, OUT PVOID * ResultBuffer, OUT PULONG ResultLength, OUT PULONG KeyType); +PVOID AllocEventData(IN ULONG ExtraSize); +VOID FreeEventData(IN PVOID EventData); MIXER_CONTEXT MixerContext = { @@ -33,7 +35,9 @@ Copy, OpenKey, QueryKeyValue, - CloseKey + CloseKey, + AllocEventData, + FreeEventData }; GUID CategoryGuid = {STATIC_KSCATEGORY_AUDIO}; @@ -284,6 +288,35 @@ return Status; } + +PVOID +AllocEventData( + IN ULONG ExtraSize) +{ + PKSEVENTDATA Data = (PKSEVENTDATA)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(KSEVENTDATA) + ExtraSize); + if (!Data) + return NULL; + + Data->EventHandle.Event = CreateEventW(NULL, FALSE, FALSE, NULL); + if (!Data->EventHandle.Event) + { + HeapFree(GetProcessHeap(), 0, Data); + return NULL; + } + + Data->NotificationType = KSEVENTF_EVENT_HANDLE; + return Data; +} + +VOID +FreeEventData(IN PVOID EventData) +{ + PKSEVENTDATA Data = (PKSEVENTDATA)EventData; + + CloseHandle(Data->EventHandle.Event); + HeapFree(GetProcessHeap(), 0, Data); +} + BOOL WdmAudInitUserModeMixer() Modified: trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wdmaud.drv/wdmau… ============================================================================== --- trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/wdmaud.drv/wdmaud.rbuild [iso-8859-1] Sat Jan 2 02:53:22 2010 @@ -5,7 +5,7 @@ <include base="wdmaud_kernel">.</include> <include base="mmixer">.</include> <include base="libsamplerate">.</include> -  + <define name="USE_MMIXER_LIB">1</define>  <library>mmebuddy</library> <library>ntdll</library>

1 0

[janderwald] 44872: [MMIXER] - Implement registering hardware events (volume / mute control changes) - Fix a bug when querying a source mixer line. The wrong line id was passed which caused the call to fail.
by janderwald＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: janderwald Date: Sat Jan 2 02:52:12 2010 New Revision: 44872 URL: http://svn.reactos.org/svn/reactos?rev=44872&view=rev Log: [MMIXER] - Implement registering hardware events (volume / mute control changes) - Fix a bug when querying a source mixer line. The wrong line id was passed which caused the call to fail. Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c trunk/reactos/lib/drivers/sound/mmixer/mixer.c trunk/reactos/lib/drivers/sound/mmixer/mmixer.h trunk/reactos/lib/drivers/sound/mmixer/priv.h trunk/reactos/lib/drivers/sound/mmixer/sup.c Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Sat Jan 2 02:52:12 2010 @@ -853,6 +853,7 @@ // initialize line list InitializeListHead(&MixerInfo->LineList); + InitializeListHead(&MixerInfo->EventList); // now allocate an array which will receive the indices of the pin // which has a ADC / DAC nodetype in its path @@ -1075,3 +1076,79 @@ // done return Status; } + + +MIXER_STATUS +MMixerAddEvent( + IN PMIXER_CONTEXT MixerContext, + IN OUT LPMIXER_INFO MixerInfo, + IN ULONG NodeId) +{ + KSE_NODE Property; + LPEVENT_ITEM EventData; + ULONG BytesReturned; + MIXER_STATUS Status; + + EventData = (LPEVENT_ITEM)MixerContext->AllocEventData(sizeof(LIST_ENTRY)); + if (!EventData) + { + // not enough memory + return MM_STATUS_NO_MEMORY; + } + + /* setup request */ + Property.Event.Set = KSEVENTSETID_AudioControlChange; + Property.Event.Flags = KSEVENT_TYPE_TOPOLOGY|KSEVENT_TYPE_ENABLE; + Property.Event.Id = KSEVENT_CONTROL_CHANGE; + + Property.NodeId = NodeId; + Property.Reserved = 0; + + Status = MixerContext->Control(MixerInfo->hMixer, IOCTL_KS_ENABLE_EVENT, (PVOID)&Property, sizeof(KSP_NODE), (PVOID)EventData, sizeof(KSEVENTDATA), &BytesReturned); + if (Status != MM_STATUS_SUCCESS) + { + // failed to add event + MixerContext->FreeEventData(EventData); + return Status; + } + + //store event + InsertTailList(&MixerInfo->EventList, &EventData->Entry); + return Status; +} + +MIXER_STATUS +MMixerAddEvents( + IN PMIXER_CONTEXT MixerContext, + IN OUT LPMIXER_INFO MixerInfo) +{ + PKSMULTIPLE_ITEM NodeTypes; + ULONG Index; + MIXER_STATUS Status; + LPGUID Guid; + + // get filter node types + Status = MMixerGetFilterTopologyProperty(MixerContext, MixerInfo->hMixer, KSPROPERTY_TOPOLOGY_NODES, &NodeTypes); + + if (Status != MM_STATUS_SUCCESS) + { + // failed + return Status; + } + + for(Index = 0; Index < NodeTypes->Count; Index++) + { + Guid = MMixerGetNodeType(NodeTypes, Index); + if (IsEqualGUID(&KSNODETYPE_VOLUME, Guid) || IsEqualGUID(&KSNODETYPE_MUTE, Guid)) + { + //add an event for volume / mute controls + //TODO: extra control types + MMixerAddEvent(MixerContext, MixerInfo, Index); + } + } + + // free node types + MixerContext->Free(NodeTypes); + + return MM_STATUS_SUCCESS; +} Modified: trunk/reactos/lib/drivers/sound/mmixer/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] Sat Jan 2 02:52:12 2010 @@ -100,6 +100,9 @@ // FIXME // handle event notification + Status = MMixerAddEvents(MixerContext, MixerInfo); + + // store result *MixerHandle = (HANDLE)MixerInfo; @@ -163,7 +166,7 @@ return MM_STATUS_INVALID_PARAMETER; } - MixerLineSrc = MMixerGetSourceMixerLineByLineId(MixerInfo, MixerLine->dwSource); + MixerLineSrc = MMixerGetSourceMixerLineByLineId(MixerInfo, MixerLine->dwSource * 0x10000); if (MixerLineSrc) { DPRINT("Line %u Name %S\n", MixerLineSrc->Line.dwSource, MixerLineSrc->Line.szName); @@ -422,7 +425,8 @@ return MM_STATUS_INVALID_PARAMETER; } - if (!MixerContext->Alloc || !MixerContext->Control || !MixerContext->Free || !MixerContext->Open || + if (!MixerContext->Alloc || !MixerContext->Control || !MixerContext->Free || !MixerContext->Open || + !MixerContext->AllocEventData || !MixerContext->FreeEventData || !MixerContext->Close || !MixerContext->OpenKey || !MixerContext->QueryKeyValue || !MixerContext->CloseKey) { // invalid parameter Modified: trunk/reactos/lib/drivers/sound/mmixer/mmixer.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/mmixer.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/mmixer.h [iso-8859-1] Sat Jan 2 02:52:12 2010 @@ -69,6 +69,12 @@ IN ULONG DesiredAccess, OUT PHANDLE OutKey); +typedef PVOID (*PMIXER_ALLOC_EVENT_DATA)( + IN ULONG ExtraBytes); + +typedef VOID (*PMIXER_FREE_EVENT_DATA)( + IN PVOID EventData); + typedef struct { ULONG SizeOfStruct; @@ -83,6 +89,8 @@ PMIXER_OPEN_KEY OpenKey; PMIXER_QUERY_KEY_VALUE QueryKeyValue; PMIXER_CLOSEKEY CloseKey; + PMIXER_ALLOC_EVENT_DATA AllocEventData; + PMIXER_FREE_EVENT_DATA FreeEventData; }MIXER_CONTEXT, *PMIXER_CONTEXT; MIXER_STATUS Modified: trunk/reactos/lib/drivers/sound/mmixer/priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/p… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/priv.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/priv.h [iso-8859-1] Sat Jan 2 02:52:12 2010 @@ -15,8 +15,14 @@ #include "mmixer.h" #include <stdio.h> - +#define YDEBUG #include <debug.h> + +typedef struct +{ + KSEVENTDATA EventData; + LIST_ENTRY Entry; +}EVENT_ITEM, *LPEVENT_ITEM; typedef struct { @@ -25,6 +31,7 @@ HANDLE hMixer; LIST_ENTRY LineList; ULONG ControlId; + LIST_ENTRY EventList; }MIXER_INFO, *LPMIXER_INFO; typedef struct @@ -268,4 +275,9 @@ IN ULONG bWaveIn, IN ULONG PinId); +MIXER_STATUS +MMixerAddEvents( + IN PMIXER_CONTEXT MixerContext, + IN OUT LPMIXER_INFO MixerInfo); + #endif Modified: trunk/reactos/lib/drivers/sound/mmixer/sup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/s… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/sup.c [iso-8859-1] Sat Jan 2 02:52:12 2010 @@ -29,6 +29,7 @@ const GUID KSPROPSETID_Pin = {0x8C134960L, 0x51AD, 0x11CF, {0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00}}; const GUID KSPROPSETID_General = {0x1464EDA5L, 0x6A8F, 0x11D1, {0x9A, 0xA7, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96}}; const GUID KSPROPSETID_Topology = {0x720D4AC0L, 0x7533, 0x11D0, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; +const GUID KSEVENTSETID_AudioControlChange = {0xE85E9698L, 0xFA2F, 0x11D1, {0x95, 0xBD, 0x00, 0xC0, 0x4F, 0xB9, 0x25, 0xD3}}; MIXER_STATUS MMixerVerifyContext( @@ -37,7 +38,8 @@ if (MixerContext->SizeOfStruct != sizeof(MIXER_CONTEXT)) return MM_STATUS_INVALID_PARAMETER; - if (!MixerContext->Alloc || !MixerContext->Control || !MixerContext->Free || !MixerContext->Open || + if (!MixerContext->Alloc || !MixerContext->Control || !MixerContext->Free || !MixerContext->Open || + !MixerContext->AllocEventData || !MixerContext->FreeEventData || !MixerContext->Close || !MixerContext->OpenKey || !MixerContext->QueryKeyValue || !MixerContext->CloseKey) return MM_STATUS_INVALID_PARAMETER; @@ -129,7 +131,7 @@ while(Entry != &MixerInfo->LineList) { MixerLineSrc = (LPMIXERLINE_EXT)CONTAINING_RECORD(Entry, MIXERLINE_EXT, Entry); - DPRINT("dwLineID %x dwLineID %x\n", MixerLineSrc->Line.dwLineID, dwLineID); + DPRINT("dwLineID %x dwLineID %x MixerLineSrc %p\n", MixerLineSrc->Line.dwLineID, dwLineID, MixerLineSrc); if (MixerLineSrc->Line.dwLineID == dwLineID) return MixerLineSrc;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs