Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[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

[ros-arm-bringup] 44871: NMI Support Patch 10: [NTOS]: Write barebones NMI Trap handler which does a TSS context switch to the NMI TSS and then calls the HAL NMI handler. [NTOS]: Implement KiSaveProcessorState for doing a PRCB context save/restore. You should now be able to test the new NMI functionality by either building the circuit referenced in my e-mail and attaching it to your PCI bus, or by using "nmi 0" in the QEMU stdio console.
by ros-arm-bringup＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: ros-arm-bringup Date: Sat Jan 2 02:34:27 2010 New Revision: 44871 URL: http://svn.reactos.org/svn/reactos?rev=44871&view=rev Log: NMI Support Patch 10: [NTOS]: Write barebones NMI Trap handler which does a TSS context switch to the NMI TSS and then calls the HAL NMI handler. [NTOS]: Implement KiSaveProcessorState for doing a PRCB context save/restore. You should now be able to test the new NMI functionality by either building the circuit referenced in my e-mail and attaching it to your PCI bus, or by using "nmi 0" in the QEMU stdio console. Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/cpu.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/cpu.c [iso-8859-1] Sat Jan 2 02:34:27 2010 @@ -924,6 +924,26 @@ RtlZeroMemory(Address, Size); } +VOID +NTAPI +KiSaveProcessorState(IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + + // + // Save full context + // + Prcb->ProcessorState.ContextFrame.ContextFlags = CONTEXT_FULL | + CONTEXT_DEBUG_REGISTERS; + KeTrapFrameToContext(TrapFrame, NULL, &Prcb->ProcessorState.ContextFrame); + + // + // Save control registers + // + KiSaveProcessorControlState(&Prcb->ProcessorState); +} + /* PUBLIC FUNCTIONS **********************************************************/ /* 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 02:34:27 2010 @@ -10,6 +10,7 @@ #include <asm.h> #include <internal/i386/asmmacro.S> +#include <internal/i386/callconv.s> .intel_syntax noprefix #define Running 2 @@ -790,9 +791,138 @@ .globl _KiTrap2 .func KiTrap2 _KiTrap2: - - /* FIXME: This is an NMI, nothing like a normal exception */ - mov eax, 2 + // + // Don't allow any other NMIs to come in for now + // + cli // Disable interrupts + + // + // Save current state data in registers + // + mov eax, PCR[KPCR_TSS] // Save KTSS + mov ecx, PCR[KPCR_CURRENT_THREAD] // Save ETHREAD + mov edi, [ecx+KTHREAD_APCSTATE_PROCESS] // Save EPROCESS + + // + // Migrate state data to TSS + // + mov ecx, [edi+KPROCESS_DIRECTORY_TABLE_BASE] // Page Directory Table + mov [eax+KTSS_CR3], ecx // Saved in CR3 + mov cx, [edi+KPROCESS_IOPM_OFFSET] // IOPM Offset + mov [eax+KTSS_IOMAPBASE], cx // Saved in IOPM Base + mov ecx, [edi+KPROCESS_LDT_DESCRIPTOR0] // Get LDT descriptor + test ecx, ecx // Check if ne + jz 1f // Doesn't exist + mov cx, KGDT_LDT // Load LDT descriptor +1: + mov [eax+KTSS_LDT], cx // Saved in LDT + + // + // Migrate to NMI TSS + // + push PCR[KPCR_TSS] // Save current TSS + mov eax, PCR[KPCR_GDT] // Get GDT + mov ch, [eax+KGDT_NMI_TSS+KGDT_BASE_HI] // Get High KTSS Base + mov cl, [eax+KGDT_NMI_TSS+KGDT_BASE_MID] // Get Mid KTSS Base + shl ecx, 16 // Build Top KTSS Base + mov cx, [eax+KGDT_NMI_TSS+KGDT_BASE_LOW] // Add Low KTSS Base + mov PCR[KPCR_TSS], ecx + + // + // Clear nested flag and activate the NMI TSS + // + pushf // Get EFLAGS + and dword ptr [esp], ~EFLAGS_NESTED_TASK // Clear nested task + popf // Set EFLAGS + mov ecx, PCR[KPCR_GDT] // Get GDT + lea eax, [ecx+KGDT_NMI_TSS] // Get NMI TSS + mov byte ptr [eax+5], 0x89 // DPL 0, Present, NonBusy + + // + // Build the trap frame and save it into the KPRCB + // + mov eax, [esp] // KGDT_TSS from earlier + push 0 // V86 segments + push 0 // V86 segments + push 0 // V86 segments + push 0 // V86 segments + push [eax+KTSS_SS] // TSS fields -> Trap Frame + push [eax+KTSS_ESP] // TSS fields -> Trap Frame + push [eax+KTSS_EFLAGS] // TSS fields -> Trap Frame + push [eax+KTSS_CS] // TSS fields -> Trap Frame + push [eax+KTSS_EIP] // TSS fields -> Trap Frame + push 0 // Error Code + push [eax+KTSS_EBP] // TSS fields -> Trap Frame + push [eax+KTSS_EBX] // TSS fields -> Trap Frame + push [eax+KTSS_ESI] // TSS fields -> Trap Frame + push [eax+KTSS_EDI] // TSS fields -> Trap Frame + push [eax+KTSS_FS] // TSS fields -> Trap Frame + push PCR[KPCR_EXCEPTION_LIST] // SEH Handler from KPCR + push -1 // Bogus previous mode + push [eax+KTSS_EAX] // TSS fields -> Trap Frame + push [eax+KTSS_ECX] // TSS fields -> Trap Frame + push [eax+KTSS_EDX] // TSS fields -> Trap Frame + push [eax+KTSS_DS] // TSS fields -> Trap Frame + push [eax+KTSS_ES] // TSS fields -> Trap Frame + push [eax+KTSS_GS] // TSS fields -> Trap Frame + push 0 // Debug registers + push 0 // Debug registers + push 0 // Debug registers + push 0 // Debug registers + push 0 // Debug registers + push 0 // Debug registers + push 0 // Temp + push 0 // Temp + push 0 // Debug Pointer + push 0 // Debug Marker + push [eax+KTSS_EIP] // Debug EIP + push [eax+KTSS_EBP] // Debug EBP + mov ebp, esp // Set trap frame address + stdCall _KiSaveProcessorState, ebp, 0 // Save to KPRCB CONTEXT + + // + // BUGBUG: Call Registered NMI handlers + // + + // + // Call the platform driver for NMI handling (panic, etc) + // Do this with IRQL at HIGH + // + push PCR[KPCR_IRQL] // Save real IRQL + mov dword ptr PCR[KPCR_IRQL], HIGH_LEVEL // Force HIGH + stdCall _HalHandleNMI, 0 // Call the HAL + pop PCR[KPCR_IRQL] // Restore real IRQL + + // + // 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. + // + 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 + + // + // Otherwise, recover the original state + // + add esp, KTRAP_FRAME_LENGTH // Clear the trap frame + pop PCR[KPCR_TSS] // Restore original TSS + mov ecx, PCR[KPCR_GDT] // Get GDT + lea eax, [ecx+KGDT_TSS] // Get KTSS + mov byte ptr [eax+5], 0x8B // DPL 0, Present, Busy + pushf // Get EFLAGS + or dword ptr [esp], EFLAGS_NESTED_TASK // Set nested flags + popf // Set EFLAGS + + // + // Return from NMI + // + iretd // Interrupt return + jmp _KiTrap2 // Handle recursion +2: + // + // Crash the system + // + mov eax, EXCEPTION_NMI jmp _KiSystemFatalException .endfunc

1 0

[cgutman] 44870: [NTOSKRNL] - Fake success from the MmSecureVirtualMemory stub - See issue #4996 for details
by cgutman＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: cgutman Date: Sat Jan 2 02:32:43 2010 New Revision: 44870 URL: http://svn.reactos.org/svn/reactos?rev=44870&view=rev Log: [NTOSKRNL] - Fake success from the MmSecureVirtualMemory stub - See issue #4996 for details Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Sat Jan 2 02:32:43 2010 @@ -635,7 +635,7 @@ IN ULONG Mode) { UNIMPLEMENTED; - return NULL; + return Address; } /*

1 0

[ros-arm-bringup] 44869: NMI Support Patch 9: [NDK]: Add missing KTSS ASM offsets. [NDK]: Add missing EXCEPTION_ codes.
by ros-arm-bringup＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: ros-arm-bringup Date: Sat Jan 2 02:32:34 2010 New Revision: 44869 URL: http://svn.reactos.org/svn/reactos?rev=44869&view=rev Log: NMI Support Patch 9: [NDK]: Add missing KTSS ASM offsets. [NDK]: Add missing EXCEPTION_ codes. Modified: trunk/reactos/include/ndk/i386/asm.h Modified: trunk/reactos/include/ndk/i386/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/asm.h?rev… ============================================================================== --- trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/asm.h [iso-8859-1] Sat Jan 2 02:32:34 2010 @@ -95,7 +95,23 @@ // #define KTSS_ESP0 0x4 #define KTSS_CR3 0x1C +#define KTSS_EIP 0x20 #define KTSS_EFLAGS 0x24 +#define KTSS_EAX 0x28 +#define KTSS_ECX 0x2C +#define KTSS_EDX 0x30 +#define KTSS_EBX 0x34 +#define KTSS_ESP 0x38 +#define KTSS_EBP 0x3C +#define KTSS_ESI 0x40 +#define KTSS_EDI 0x44 +#define KTSS_ES 0x48 +#define KTSS_CS 0x4C +#define KTSS_SS 0x50 +#define KTSS_DS 0x54 +#define KTSS_FS 0x58 +#define KTSS_GS 0x5C +#define KTSS_LDT 0x60 #define KTSS_IOMAPBASE 0x66 #define KTSS_IO_MAPS 0x68 @@ -626,6 +642,26 @@ #define SERVICE_DESCRIPTOR_LENGTH 0x0010 // +// Exception codes +// +#define EXCEPTION_DIVIDED_BY_ZERO 0 +#define EXCEPTION_DEBUG 1 +#define EXCEPTION_NMI 2 +#define EXCEPTION_INT3 3 +#define EXCEPTION_BOUND_CHECK 5 +#define EXCEPTION_INVALID_OPCODE 6 +#define EXCEPTION_NPX_NOT_AVAILABLE 7 +#define EXCEPTION_DOUBLE_FAULT 8 +#define EXCEPTION_NPX_OVERRUN 9 +#define EXCEPTION_INVALID_TSS 0x0A +#define EXCEPTION_SEGMENT_NOT_PRESENT 0x0B +#define EXCEPTION_STACK_FAULT 0x0C +#define EXCEPTION_GP_FAULT 0x0D +#define EXCEPTION_RESERVED_TRAP 0x0F +#define EXCEPTION_NPX_ERROR 0x010 +#define EXCEPTION_ALIGNMENT_CHECK 0x011 + +// // VDM State Pointer // #define FIXED_NTVDMSTATE_LINEAR_PC_AT 0x714

1 0

[ros-arm-bringup] 44868: NMI Support Patch 8: [NTOS]: Implement a GNU Assembler version of the Windows SDK ASM calling convention macros. Only stdCall and its helpers have been written -- feel free to write the rest. Based on callconv.inc from Microsoft). SUGGESTION: Slowly start rewriting current code to use calling convention macros as it is much cleaner.
by ros-arm-bringup＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: ros-arm-bringup Date: Sat Jan 2 02:28:36 2010 New Revision: 44868 URL: http://svn.reactos.org/svn/reactos?rev=44868&view=rev Log: NMI Support Patch 8: [NTOS]: Implement a GNU Assembler version of the Windows SDK ASM calling convention macros. Only stdCall and its helpers have been written -- feel free to write the rest. Based on callconv.inc from Microsoft). SUGGESTION: Slowly start rewriting current code to use calling convention macros as it is much cleaner. Added: trunk/reactos/ntoskrnl/include/internal/i386/callconv.s (with props) Added: 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 (added) +++ trunk/reactos/ntoskrnl/include/internal/i386/callconv.s [iso-8859-1] Sat Jan 2 02:28:36 2010 @@ -1,0 +1,100 @@ +/* + * PROJECT: ReactOS Source Development Kit (SDK) + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: include/ddk/api/callconv.s + * PURPOSE: x86 Calling Convention Helpers + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +// +// @name CountArg +// +// This macro counts the number of arguments in the ArgList and returns +// the value in cCount. +// +// @param cCount - Count of arguments +// @param ArgList - Argument list +// +// @remark None. +// +.macro CountArg cCount:req,ArgList:vararg + + cCount = 0 + + .irp arg, \ArgList + cCount = cCount+1 + .endr + +.endm + +// +// @name RevPush +// +// This macro pushes the arguments in ArgList in the reverse order +// and returns the number of arguments in cCount +// +// @param cCount - Count of arguments +// @param ArgList - Argument list +// +// @remark None. +// +.macro RevPush cCount:req,ArgList:vararg + LOCAL index, x + + CountArg cCount, ArgList + + index = cCount + .rept cCount + x = 0 + .irp arg,ArgList + x=x+1 + .ifeq index-x + push arg + .exitm + .endif + .endr + + index = index-1 + .endr +.endm + +// +// @name stdCallCall +// +// This macro performs a function call using the STDCALL convention and applies +// the correct name decoration required based on the stack bytes +// +// @param Func - Function name +// @param N - Number of stack bytes for arguments +// +// @remark None. +// +.macro stdCallCall Func:req,N:req + .ifdef __imp_&Func&@&N + call dword ptr [__imp_&Func&@&N] + .else + call Func&@&N + .endif +.endm + +// +// @name stdCall +// +// This macro pushes the arguments required for a function call using the +// STDCALL convention and then issues the call +// +// @param Func - Function name +// @param ArgList - Argument list +// +// @remark None. +// +.macro stdCall Func:req,ArgList:vararg + LOCAL Bytes + + RevPush Bytes,ArgList + Bytes = Bytes*4 + + stdCallCall Func, %(Bytes) +.endm Propchange: trunk/reactos/ntoskrnl/include/internal/i386/callconv.s ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[janderwald] 44867: [KS] - Return correct error code
by janderwald＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: janderwald Date: Sat Jan 2 02:22:38 2010 New Revision: 44867 URL: http://svn.reactos.org/svn/reactos?rev=44867&view=rev Log: [KS] - Return correct error code Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Sat Jan 2 02:22:38 2010 @@ -511,19 +511,18 @@ break; } + Irp->IoStatus.Information = KeyInfo->DataLength + sizeof(WCHAR); - if (KeyInfo->DataLength + sizeof(WCHAR) > IoStack->Parameters.DeviceIoControl.OutputBufferLength) { - Status = STATUS_MORE_ENTRIES; + Status = STATUS_BUFFER_OVERFLOW; ExFreePool(KeyInfo); break; } RtlMoveMemory(Irp->UserBuffer, &KeyInfo->Data, KeyInfo->DataLength); ((LPWSTR)Irp->UserBuffer)[KeyInfo->DataLength / sizeof(WCHAR)] = L'\0'; - Irp->IoStatus.Information = KeyInfo->DataLength + sizeof(WCHAR); ExFreePool(KeyInfo); break; case KSPROPERTY_PIN_PROPOSEDATAFORMAT:

1 0

[dgorbachev] 44866: Lift a protection (forgotten in 44842).
by dgorbachev＠svn.reactos.org 02 Jan '10

02 Jan '10

Author: dgorbachev Date: Sat Jan 2 01:17:37 2010 New Revision: 44866 URL: http://svn.reactos.org/svn/reactos?rev=44866&view=rev Log: Lift a protection (forgotten in 44842). Modified: trunk/reactos/hal/halx86/generic/bios.c Modified: trunk/reactos/hal/halx86/generic/bios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/bios.c?… ============================================================================== --- trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/bios.c [iso-8859-1] Sat Jan 2 01:17:37 2010 @@ -415,6 +415,7 @@ // IdtPte = HalAddressToPte(((PKIPCR)KeGetPcr())->IDT); RestoreWriteProtection = IdtPte->Write; + IdtPte->Write = 1; // // Use special invalid opcode and GPF trap handlers

1 0

[janderwald] 44865: [SETUPAPI] - Implement SetupInitializeFileLogA, SetupInitializeFileLogW, SetupTerminateFileLog
by janderwald＠svn.reactos.org 01 Jan '10

01 Jan '10

Author: janderwald Date: Sat Jan 2 00:44:41 2010 New Revision: 44865 URL: http://svn.reactos.org/svn/reactos?rev=44865&view=rev Log: [SETUPAPI] - Implement SetupInitializeFileLogA, SetupInitializeFileLogW, SetupTerminateFileLog Modified: trunk/reactos/dll/win32/setupapi/misc.c trunk/reactos/dll/win32/setupapi/setupapi_private.h trunk/reactos/dll/win32/setupapi/stubs.c Modified: trunk/reactos/dll/win32/setupapi/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/misc.c?… ============================================================================== --- trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/misc.c [iso-8859-1] Sat Jan 2 00:44:41 2010 @@ -1758,3 +1758,177 @@ return bResult; } + +/*********************************************************************** + * SetupInitializeFileLogW(SETUPAPI.@) + */ +HSPFILELOG WINAPI SetupInitializeFileLogW(LPCWSTR LogFileName, DWORD Flags) +{ + struct FileLog * Log; + HANDLE hLog; + WCHAR Windir[MAX_PATH]; + DWORD ret; + + TRACE("%s, 0x%x\n",debugstr_w(LogFileName),Flags); + + if (Flags & SPFILELOG_SYSTEMLOG) + { + if (!IsUserAdmin() && !(Flags & SPFILELOG_QUERYONLY)) + { + /* insufficient privileges */ + SetLastError(ERROR_ACCESS_DENIED); + return INVALID_HANDLE_VALUE; + } + + if (LogFileName || (Flags & SPFILELOG_FORCENEW)) + { + /* invalid parameter */ + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + + ret = GetSystemWindowsDirectoryW(Windir, MAX_PATH); + if (!ret || ret >= MAX_PATH) + { + /* generic failure */ + return INVALID_HANDLE_VALUE; + } + + /* append path */ + wcscat(Windir, L"repair\\setup.log"); + } + else + { + if (!LogFileName) + { + /* invalid parameter */ + SetLastError(ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + /* copy filename */ + wcsncpy(Windir, LogFileName, MAX_PATH); + } + + if (FileExists(Windir, NULL)) + { + /* take ownership */ + ret = TakeOwnershipOfFile(Windir); + + if (ret != ERROR_SUCCESS) + { + /* failed */ + SetLastError(ret); + return INVALID_HANDLE_VALUE; + } + + if (!SetFileAttributesW(Windir, FILE_ATTRIBUTE_NORMAL)) + { + /* failed */ + return INVALID_HANDLE_VALUE; + } + + if ((Flags & SPFILELOG_FORCENEW)) + { + if (!DeleteFileW(Windir)) + { + /* failed */ + return INVALID_HANDLE_VALUE; + } + } + } + + /* open log file */ + hLog = CreateFileW(Windir, + (Flags & SPFILELOG_QUERYONLY) ? GENERIC_READ : GENERIC_WRITE, + FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, + OPEN_ALWAYS, + FILE_ATTRIBUTE_NORMAL, + NULL); + + if (hLog == INVALID_HANDLE_VALUE) + { + /* failed */ + return INVALID_HANDLE_VALUE; + } + + /* close log handle */ + CloseHandle(hLog); + + /* allocate file log struct */ + Log = HeapAlloc(GetProcessHeap(), 0, sizeof(struct FileLog)); + if (!Log) + { + /* not enough memory */ + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return INVALID_HANDLE_VALUE; + } + + /* initialize log */ + Log->LogName = HeapAlloc(GetProcessHeap(), 0, (wcslen(Windir)+1) * sizeof(WCHAR)); + if (!Log->LogName) + { + /* not enough memory */ + HeapFree(GetProcessHeap(), 0, Log); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return INVALID_HANDLE_VALUE; + } + + wcscpy(Log->LogName, Windir); + Log->ReadOnly = (Flags & SPFILELOG_QUERYONLY); + Log->SystemLog = (Flags & SPFILELOG_SYSTEMLOG); + + return (HSPFILELOG)Log; +} + +/*********************************************************************** + * SetupInitializeFileLogA(SETUPAPI.@) + */ +HSPFILELOG WINAPI SetupInitializeFileLogA(LPCSTR LogFileName, DWORD Flags) +{ + HSPFILELOG hLog; + LPWSTR LogFileNameW = NULL; + + TRACE("%s, 0x%x\n",debugstr_a(LogFileName),Flags); + + if (LogFileName) + { + LogFileNameW = strdupAtoW(LogFileName); + + if (!LogFileNameW) + { + /* not enough memory */ + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return INVALID_HANDLE_VALUE; + } + + hLog = SetupInitializeFileLogW(LogFileNameW, Flags); + HeapFree(GetProcessHeap(), 0, LogFileNameW); + } + else + { + hLog = SetupInitializeFileLogW(NULL, Flags); + } + + return hLog; +} + +/*********************************************************************** + * SetupTerminateFileLog(SETUPAPI.@) + */ +BOOL WINAPI SetupTerminateFileLog(HANDLE FileLogHandle) +{ + struct FileLog * Log; + + TRACE ("%p\n",FileLogHandle); + + Log = (struct FileLog *)FileLogHandle; + + /* free file log handle */ + HeapFree(GetProcessHeap(), 0, Log->LogName); + HeapFree(GetProcessHeap(), 0, Log); + + SetLastError(ERROR_SUCCESS); + + return TRUE; +} Modified: trunk/reactos/dll/win32/setupapi/setupapi_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/setupap… ============================================================================== --- trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/setupapi_private.h [iso-8859-1] Sat Jan 2 00:44:41 2010 @@ -226,6 +226,13 @@ INT* IconIndexes; }; +struct FileLog /* HSPFILELOG */ +{ + DWORD ReadOnly; + DWORD SystemLog; + LPWSTR LogName; +}; + extern HINSTANCE hInstance; #define RC_STRING_MAX_SIZE 256 Modified: trunk/reactos/dll/win32/setupapi/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/stubs.c… ============================================================================== --- trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/stubs.c [iso-8859-1] Sat Jan 2 00:44:41 2010 @@ -39,33 +39,6 @@ { FIXME( "%x %x: stub\n", w1, w2 ); return 0; -} - -/*********************************************************************** - * SetupInitializeFileLogW(SETUPAPI.@) - */ -HSPFILELOG WINAPI SetupInitializeFileLogW(LPCWSTR LogFileName, DWORD Flags) -{ - FIXME("Stub %s, 0x%x\n",debugstr_w(LogFileName),Flags); - return INVALID_HANDLE_VALUE; -} - -/*********************************************************************** - * SetupInitializeFileLogA(SETUPAPI.@) - */ -HSPFILELOG WINAPI SetupInitializeFileLogA(LPCSTR LogFileName, DWORD Flags) -{ - FIXME("Stub %s, 0x%x\n",debugstr_a(LogFileName),Flags); - return INVALID_HANDLE_VALUE; -} - -/*********************************************************************** - * SetupTerminateFileLog(SETUPAPI.@) - */ -BOOL WINAPI SetupTerminateFileLog(HANDLE FileLogHandle) -{ - FIXME ("Stub %p\n",FileLogHandle); - return TRUE; } /***********************************************************************

1 0

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