Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sginsberg] 43291: - Add STATUS_ASSERTION_FAILURE status code required for NT_ASSERT. - Check KdReceivePacket return for KdPacketReceived instead of 0 for correctness. - Use KdpDprintf instead of setting CR2 for unhandled cases. - Add more variables to KdDebuggerDataBlock.
by sginsberg＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: sginsberg Date: Sun Oct 4 22:19:43 2009 New Revision: 43291 URL: http://svn.reactos.org/svn/reactos?rev=43291&view=rev Log: - Add STATUS_ASSERTION_FAILURE status code required for NT_ASSERT. - Check KdReceivePacket return for KdPacketReceived instead of 0 for correctness. - Use KdpDprintf instead of setting CR2 for unhandled cases. - Add more variables to KdDebuggerDataBlock. Modified: trunk/reactos/include/reactos/windbgkd.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/kd64/kdapi.c trunk/reactos/ntoskrnl/kd64/kddata.c trunk/reactos/ntoskrnl/kd64/kdlock.c trunk/reactos/ntoskrnl/kd64/kdprint.c trunk/reactos/ntoskrnl/kd64/kdtrap.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: trunk/reactos/include/reactos/windbgkd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/windbgkd.h… ============================================================================== --- trunk/reactos/include/reactos/windbgkd.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/windbgkd.h [iso-8859-1] Sun Oct 4 22:19:43 2009 @@ -178,7 +178,7 @@ // Fill Memory Flags // #define DBGKD_FILL_MEMORY_VIRTUAL 0x01 -#define DBGKD_FILL_MEMORY_PHYSICAL 0x002 +#define DBGKD_FILL_MEMORY_PHYSICAL 0x02 // // Physical Memory Caching Flags Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sun Oct 4 22:19:43 2009 @@ -14,13 +14,14 @@ extern ULONG MmTotalNonPagedPoolQuota; extern PHYSICAL_ADDRESS MmSharedDataPagePhysicalAddress; extern ULONG MmNumberOfPhysicalPages; +extern ULONG MmLowestPhysicalPage; +extern ULONG MmHighestPhysicalPage; extern PVOID MmPagedPoolBase; extern ULONG MmPagedPoolSize; extern PMEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptor; extern MEMORY_ALLOCATION_DESCRIPTOR MiFreeDescriptorOrg; -extern ULONG MmHighestPhysicalPage; struct _KTRAP_FRAME; struct _EPROCESS; Modified: trunk/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdapi.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Sun Oct 4 22:19:43 2009 @@ -282,7 +282,8 @@ #if 0 if (!MmIsAddressValid((PVOID)(ULONG_PTR)State->u.ReadMemory.TargetBaseAddress)) { - Ke386SetCr2(State->u.ReadMemory.TargetBaseAddress); + KdpDprintf("Tried to read invalid address %p\n", + (PVOID)(ULONG_PTR)State->u.ReadMemory.TargetBaseAddress); while (TRUE); } #endif @@ -484,6 +485,7 @@ else { /* SMP not yet handled */ + KdpDprintf("SMP UNHANDLED\n"); ControlStart = NULL; while (TRUE); } @@ -534,6 +536,7 @@ else { /* SMP not yet handled */ + KdpDprintf("SMP UNHANDLED\n"); ControlStart = NULL; while (TRUE); } @@ -620,7 +623,7 @@ case DbgKdWriteVirtualMemoryApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdWriteVirtualMemoryApi); + KdpDprintf("DbgKdWriteVirtualMemoryApi called\n"); while (TRUE); break; @@ -668,14 +671,14 @@ case DbgKdReadIoSpaceApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdReadIoSpaceApi); + KdpDprintf("DbgKdReadIoSpaceApi called\n"); while (TRUE); break; case DbgKdWriteIoSpaceApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdWriteIoSpaceApi); + KdpDprintf("DbgKdWriteIoSpaceApi called\n"); while (TRUE); break; @@ -704,64 +707,65 @@ case DbgKdReadPhysicalMemoryApi: /* FIXME: TODO */ - goto fail; - Ke386SetCr2(DbgKdReadPhysicalMemoryApi); + KdpDprintf("DbgKdReadPhysicalMemoryApi called for address %I64X\n", + ManipulateState.u.ReadMemory.TargetBaseAddress); + goto Hack; while (TRUE); break; case DbgKdWritePhysicalMemoryApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdWritePhysicalMemoryApi); + KdpDprintf("DbgKdWritePhysicalMemoryApi called\n"); while (TRUE); break; case DbgKdQuerySpecialCallsApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdQuerySpecialCallsApi); + KdpDprintf("DbgKdQuerySpecialCallsApi called\n"); while (TRUE); break; case DbgKdSetSpecialCallApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdSetSpecialCallApi); + KdpDprintf("DbgKdSetSpecialCallApi called\n"); while (TRUE); break; case DbgKdClearSpecialCallsApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdClearSpecialCallsApi); + KdpDprintf("DbgKdClearSpecialCallsApi called\n"); while (TRUE); break; case DbgKdSetInternalBreakPointApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdSetInternalBreakPointApi); + KdpDprintf("DbgKdSetInternalBreakPointApi called\n"); while (TRUE); break; case DbgKdGetInternalBreakPointApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdGetInternalBreakPointApi); + KdpDprintf("DbgKdGetInternalBreakPointApi called\n"); while (TRUE); break; case DbgKdReadIoSpaceExtendedApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdReadIoSpaceExtendedApi); + KdpDprintf("DbgKdReadIoSpaceExtendedApi called\n"); while (TRUE); break; case DbgKdWriteIoSpaceExtendedApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdWriteIoSpaceExtendedApi); + KdpDprintf("DbgKdWriteIoSpaceExtendedApi called\n"); while (TRUE); break; @@ -774,14 +778,14 @@ case DbgKdWriteBreakPointExApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdWriteBreakPointExApi); + KdpDprintf("DbgKdWriteBreakPointExApi called\n"); while (TRUE); break; case DbgKdRestoreBreakPointExApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdRestoreBreakPointExApi); + KdpDprintf("DbgKdRestoreBreakPointExApi called\n"); while (TRUE); break; @@ -794,70 +798,70 @@ case DbgKdSwitchProcessor: /* FIXME: TODO */ - Ke386SetCr2(DbgKdSwitchProcessor); + KdpDprintf("DbgKdSwitchProcessor called\n"); while (TRUE); break; case DbgKdPageInApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdPageInApi); + KdpDprintf("DbgKdPageInApi called\n"); while (TRUE); break; case DbgKdReadMachineSpecificRegister: /* FIXME: TODO */ - Ke386SetCr2(DbgKdReadMachineSpecificRegister); + KdpDprintf("DbgKdReadMachineSpecificRegister called\n"); while (TRUE); break; case DbgKdWriteMachineSpecificRegister: /* FIXME: TODO */ - Ke386SetCr2(DbgKdWriteMachineSpecificRegister); + KdpDprintf("DbgKdWriteMachineSpecificRegister called\n"); while (TRUE); break; case OldVlm1: /* FIXME: TODO */ - Ke386SetCr2(OldVlm1); + KdpDprintf("OldVlm1 called\n"); while (TRUE); break; case OldVlm2: /* FIXME: TODO */ - Ke386SetCr2(OldVlm2); + KdpDprintf("OldVlm2 called\n"); while (TRUE); break; case DbgKdSearchMemoryApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdSearchMemoryApi); + KdpDprintf("DbgKdSearchMemoryApi called\n"); while (TRUE); break; case DbgKdGetBusDataApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdGetBusDataApi); + KdpDprintf("DbgKdGetBusDataApi called\n"); while (TRUE); break; case DbgKdSetBusDataApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdSetBusDataApi); + KdpDprintf("DbgKdSetBusDataApi called\n"); while (TRUE); break; case DbgKdCheckLowMemoryApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdCheckLowMemoryApi); + KdpDprintf("DbgKdCheckLowMemoryApi called\n"); while (TRUE); break; @@ -870,7 +874,7 @@ case DbgKdFillMemoryApi: /* FIXME: TODO */ - Ke386SetCr2(DbgKdFillMemoryApi); + KdpDprintf("DbgKdFillMemoryApi called\n"); while (TRUE); break; @@ -883,7 +887,7 @@ case DbgKdSwitchPartition: /* FIXME: TODO */ - Ke386SetCr2(DbgKdSwitchPartition); + KdpDprintf("DbgKdSwitchPartition called\n"); while (TRUE); break; @@ -891,8 +895,9 @@ default: /* Setup an empty message, with failure */ - while (TRUE); -fail: + KdpDprintf("Received unknown API Number %lx\n", ManipulateState.ApiNumber); + while (TRUE); +Hack: Data.Length = 0; ManipulateState.ReturnStatus = STATUS_UNSUCCESSFUL; @@ -1247,6 +1252,7 @@ KdEnableDebugger(VOID) { /* Use the internal routine */ + KdpDprintf("KdEnableDebugger called\n"); while (TRUE); return KdEnableDebuggerWithLock(TRUE); } Modified: trunk/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kddata.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] Sun Oct 4 22:19:43 2009 @@ -9,6 +9,7 @@ /* INCLUDES ******************************************************************/ #include <ntoskrnl.h> +#include "../mm/arm3/miarm.h" #define NDEBUG #include <debug.h> @@ -51,7 +52,7 @@ #if defined(_M_IX86) || defined(_M_AMD64) ULONG KdpBreakpointInstruction = 0xCC; // INT3 #else -#error TODO +#error Define the breakpoint instruction for this architecture #endif BOOLEAN KdpOweBreakpoint; BOOLEAN BreakpointsSuspended; @@ -367,23 +368,23 @@ {0}, // MmSystemCacheStart {0}, // MmSystemCacheEnd {0}, // MmSystemCacheWs - {0}, // MmPfnDatabase - {0}, // MmSystemPtesStart - {0}, // MmSystemPtesEnd + {PtrToUlong(&MmPfnDatabase)}, + {PtrToUlong(MmSystemPtesStart)}, + {PtrToUlong(MmSystemPtesEnd)}, {0}, // MmSubsectionBase {0}, // MmNumberOfPagingFiles - {0}, // MmLowestPhysicalPage - {0}, // MmHighestPhysicalPage - {0}, // MmNumberOfPhysicalPages - {0}, // MmMaximumNonPagedPoolInBytes - {0}, // MmNonPagedSystemStart - {0}, // MmNonPagedPoolStart - {0}, // MmNonPagedPoolEnd - {0}, // MmPagedPoolStart - {0}, // MmPagedPoolEnd - {0}, // MmPagedPoolInfo + {PtrToUlong(&MmLowestPhysicalPage)}, + {PtrToUlong(&MmHighestPhysicalPage)}, + {PtrToUlong(&MmNumberOfPhysicalPages)}, + {PtrToUlong(&MmMaximumNonPagedPoolInBytes)}, + {PtrToUlong(&MmNonPagedSystemStart)}, + {PtrToUlong(&MmNonPagedPoolStart)}, + {PtrToUlong(&MmNonPagedPoolEnd)}, + {PtrToUlong(&MmPagedPoolStart)}, + {PtrToUlong(&MmPagedPoolEnd)}, + {PtrToUlong(&MmPagedPoolInfo)}, PAGE_SIZE, - {0}, // MmSizeOfPagedPoolInBytes + {PtrToUlong(&MmSizeOfPagedPoolInBytes)}, {0}, // MmTotalCommitLimit {0}, // MmTotalCommittedPages {0}, // MmSharedCommit @@ -399,7 +400,7 @@ {0}, // MmAvailablePages {0}, // MmResidentAvailablePages {0}, // PoolTrackTable - {0}, // NonPagedPoolDescriptor + {PtrToUlong(&NonPagedPoolDescriptor)}, {PtrToUlong(&MmHighestUserAddress)}, {PtrToUlong(&MmSystemRangeStart)}, {PtrToUlong(&MmUserProbeAddress)}, @@ -421,9 +422,9 @@ {0}, // MmPeakCommitment {0}, // MmtotalCommitLimitMaximum {PtrToUlong(&CmNtCSDVersion)}, - {0}, // MmPhysicalMemoryBlock - {0}, // MmSessionBase - {0}, // MmSessionSize + {PtrToUlong(&MmPhysicalMemoryBlock)}, + {PtrToUlong(&MmSessionBase)}, + {PtrToUlong(&MmSessionSize)}, {0}, {0}, FIELD_OFFSET(KTHREAD, NextProcessor), @@ -471,6 +472,6 @@ KGDT_TSS, 0, 0, - {0}, // IopNumTriagDumpDataBlocks + {0}, // IopNumTriageDumpDataBlocks {0}, // IopTriageDumpDataBlocks }; Modified: trunk/reactos/ntoskrnl/kd64/kdlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdlock.c [iso-8859-1] Sun Oct 4 22:19:43 2009 @@ -49,11 +49,11 @@ else { /* Now get a packet */ - if (!KdReceivePacket(PACKET_TYPE_KD_POLL_BREAKIN, + if (KdReceivePacket(PACKET_TYPE_KD_POLL_BREAKIN, NULL, NULL, NULL, - NULL)) + NULL) == KdPacketReceived) { /* Successful breakin */ DoBreak = TRUE; @@ -96,11 +96,11 @@ if (KeTryToAcquireSpinLockAtDpcLevel(&KdpDebuggerLock)) { /* Now get a packet */ - if (!KdReceivePacket(PACKET_TYPE_KD_POLL_BREAKIN, + if (KdReceivePacket(PACKET_TYPE_KD_POLL_BREAKIN, NULL, NULL, NULL, - NULL)) + NULL) == KdPacketReceived) { /* Successful breakin */ DoBreak = TRUE; Modified: trunk/reactos/ntoskrnl/kd64/kdprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdprint.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdprint.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdprint.c [iso-8859-1] Sun Oct 4 22:19:43 2009 @@ -61,6 +61,7 @@ IN PKEXCEPTION_FRAME ExceptionFrame) { /* FIXME */ + KdpDprintf("KdpCommandString called\n"); while (TRUE); } @@ -118,6 +119,7 @@ IN PKEXCEPTION_FRAME ExceptionFrame) { /* FIXME */ + KdpDprintf("KdpPrompt called\n"); while (TRUE); return FALSE; } Modified: trunk/reactos/ntoskrnl/kd64/kdtrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdtrap.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdtrap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdtrap.c [iso-8859-1] Sun Oct 4 22:19:43 2009 @@ -30,7 +30,7 @@ /* Check if this is INT1 or 3, or if we're forced to handle it */ if ((ExceptionCode == STATUS_BREAKPOINT) || (ExceptionCode == STATUS_SINGLE_STEP) || - //(ExceptionCode == STATUS_ASSERTION_FAILURE) || + (ExceptionCode == STATUS_ASSERTION_FAILURE) || (NtGlobalFlag & FLG_STOP_ON_EXCEPTION)) { /* Check if we can't really handle this */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Sun Oct 4 22:19:43 2009 @@ -83,6 +83,8 @@ C_ASSERT(sizeof(POOL_HEADER) == 8); C_ASSERT(sizeof(POOL_HEADER) == sizeof(LIST_ENTRY)); +extern POOL_DESCRIPTOR NonPagedPoolDescriptor; + // // END FIXFIX // @@ -119,9 +121,15 @@ extern ULONG MmSizeOfNonPagedPoolInBytes; extern ULONG MmMaximumNonPagedPoolInBytes; +extern PVOID MmNonPagedSystemStart; extern PVOID MmNonPagedPoolStart; extern PVOID MmNonPagedPoolExpansionStart; extern PVOID MmNonPagedPoolEnd; +extern ULONG MmSizeOfPagedPoolInBytes; +extern PVOID MmPagedPoolStart; +extern PVOID MmPagedPoolEnd; +extern PVOID MmSessionBase; +extern ULONG MmSessionSize; extern PMMPTE MmFirstReservedMappingPte, MmLastReservedMappingPte; extern PMMPTE MiFirstReservedZeroingPte; extern MI_PFN_CACHE_ATTRIBUTE MiPlatformCacheAttributes[2][MmMaximumCacheType];

1 0

[janderwald] 43290: - Return correct status code
by janderwald＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: janderwald Date: Sun Oct 4 22:14:09 2009 New Revision: 43290 URL: http://svn.reactos.org/svn/reactos?rev=43290&view=rev Log: - Return correct status code Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] Sun Oct 4 22:14:09 2009 @@ -1953,7 +1953,7 @@ Status = SetGetMuteControlDetails(DeviceObject, MixerLine->DeviceIndex, NodeId, DeviceInfo, FALSE); } - return SetIrpIoStatus(Irp, STATUS_NOT_IMPLEMENTED, 0); - -} - + return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); + +} +

1 0

[janderwald] 43289: - Implement Un-Muting of audio lines - TBD: SEH probing
by janderwald＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: janderwald Date: Sun Oct 4 21:45:16 2009 New Revision: 43289 URL: http://svn.reactos.org/svn/reactos?rev=43289&view=rev Log: - Implement Un-Muting of audio lines - TBD: SEH probing Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] Sun Oct 4 21:45:16 2009 @@ -22,6 +22,7 @@ const GUID KSNODETYPE_REVERB = {0xEF0328E0L, 0xC558, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; const GUID KSNODETYPE_SUPERMIX = {0xE573ADC0L, 0xC555, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; const GUID KSNODETYPE_SUM = {0xDA441A60L, 0xC556, 0x11D0, {0x8A, 0x2B, 0x00, 0xA0, 0xC9, 0x25, 0x5A, 0xC1}}; +const GUID KSPROPSETID_Audio = {0x45FFAAA0L, 0x6E1B, 0x11D0, {0xBC, 0xF2, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00}}; #define DESTINATION_LINE 0xFFFF0000 @@ -48,6 +49,43 @@ return NULL; } + +NTSTATUS +GetMixerControlById( + LPMIXER_INFO MixerInfo, + DWORD dwControlID, + LPMIXERLINE_EXT *MixerLine, + LPMIXERCONTROLW *MixerControl, + PULONG NodeId) +{ + PLIST_ENTRY Entry; + LPMIXERLINE_EXT MixerLineSrc; + ULONG Index; + + /* get first entry */ + Entry = MixerInfo->LineList.Flink; + + while(Entry != &MixerInfo->LineList) + { + MixerLineSrc = (LPMIXERLINE_EXT)CONTAINING_RECORD(Entry, MIXERLINE_EXT, Entry); + + for(Index = 0; Index < MixerLineSrc->Line.cConnections; Index++) + { + if (MixerLineSrc->LineControls[Index].dwControlID == dwControlID) + { + *MixerLine = MixerLineSrc; + *MixerControl = &MixerLineSrc->LineControls[Index]; + *NodeId = MixerLineSrc->NodeIds[Index]; + return STATUS_SUCCESS; + } + } + Entry = Entry->Flink; + } + + return STATUS_NOT_FOUND; +} + + LPMIXERLINE_EXT GetSourceMixerLineByLineId( @@ -1760,6 +1798,74 @@ } NTSTATUS +SetGetMuteControlDetails( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG DeviceId, + IN ULONG NodeId, + IN PWDMAUD_DEVICE_INFO DeviceInfo, + IN ULONG bSet) +{ + KSNODEPROPERTY_AUDIO_CHANNEL Property; + NTSTATUS Status; + HANDLE hDevice; + PFILE_OBJECT FileObject; + BOOL Value; + ULONG BytesReturned; + LPMIXERCONTROLDETAILS_BOOLEAN Input; + + if (DeviceInfo->u.MixDetails.cbDetails != sizeof(MIXERCONTROLDETAILS_BOOLEAN)) + return STATUS_INVALID_PARAMETER; + + /* get input */ + Input = (LPMIXERCONTROLDETAILS_BOOLEAN)DeviceInfo->u.MixDetails.paDetails; + + + // + // FIXME SEH!!! + // + if (bSet) + Value = Input->fValue; + + /* open virtual audio device */ + Status = OpenSysAudioDeviceByIndex(DeviceObject, DeviceId, &hDevice, &FileObject); + + if (!NT_SUCCESS(Status)) + { + /* failed */ + return Status; + } + + /* setup the request */ + RtlZeroMemory(&Property, sizeof(KSNODEPROPERTY_AUDIO_CHANNEL)); + + Property.NodeProperty.NodeId = NodeId; + Property.NodeProperty.Property.Id = KSPROPERTY_AUDIO_MUTE; + Property.NodeProperty.Property.Flags = KSPROPERTY_TYPE_TOPOLOGY; + Property.NodeProperty.Property.Set = KSPROPSETID_Audio; + Property.Channel = MAXULONG; + + if (bSet) + Property.NodeProperty.Property.Flags |= KSPROPERTY_TYPE_SET; + else + Property.NodeProperty.Property.Flags |= KSPROPERTY_TYPE_GET; + + /* send the request */ + Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSNODEPROPERTY_AUDIO_CHANNEL), (PVOID)&Value, sizeof(BOOL), &BytesReturned); + + ObDereferenceObject(FileObject); + ZwClose(hDevice); + + if (!bSet) + { + // FIXME SEH !!! + Input->fValue = Value; + } + + DPRINT("Status %x bSet %u NodeId %u Value %u\n", Status, bSet, NodeId, Value); + return Status; +} + +NTSTATUS NTAPI WdmAudSetControlDetails( IN PDEVICE_OBJECT DeviceObject, @@ -1767,9 +1873,41 @@ IN PWDMAUD_DEVICE_INFO DeviceInfo, IN PWDMAUD_CLIENT ClientInfo) { - UNIMPLEMENTED; - //DbgBreakPoint(); - return SetIrpIoStatus(Irp, STATUS_NOT_IMPLEMENTED, 0); + LPMIXERLINE_EXT MixerLine; + LPMIXERCONTROLW MixerControl; + ULONG NodeId; + PWDMAUD_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; + + DPRINT1("cbStruct %u Expected %u dwControlID %u cChannels %u cMultipleItems %u cbDetails %u paDetails %p Flags %x\n", + DeviceInfo->u.MixDetails.cbStruct, sizeof(MIXERCONTROLDETAILS), DeviceInfo->u.MixDetails.dwControlID, DeviceInfo->u.MixDetails.cChannels, DeviceInfo->u.MixDetails.cMultipleItems, DeviceInfo->u.MixDetails.cbDetails, DeviceInfo->u.MixDetails.paDetails, DeviceInfo->Flags); + + if (DeviceInfo->Flags & MIXER_GETCONTROLDETAILSF_LISTTEXT) + { + UNIMPLEMENTED; + return SetIrpIoStatus(Irp, STATUS_NOT_IMPLEMENTED, 0); + } + + /* get device extension */ + DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* get mixer control */ + Status = GetMixerControlById(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixDetails.dwControlID, &MixerLine, &MixerControl, &NodeId); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("MixerControl %x not found\n", DeviceInfo->u.MixDetails.dwControlID); + return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); + } + + Status = STATUS_NOT_IMPLEMENTED; + if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) + { + /* send the request */ + Status = SetGetMuteControlDetails(DeviceObject, MixerLine->DeviceIndex, NodeId, DeviceInfo, TRUE); + } + + return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); } @@ -1781,8 +1919,40 @@ IN PWDMAUD_DEVICE_INFO DeviceInfo, IN PWDMAUD_CLIENT ClientInfo) { - UNIMPLEMENTED; - //DbgBreakPoint(); + LPMIXERLINE_EXT MixerLine; + LPMIXERCONTROLW MixerControl; + ULONG NodeId; + PWDMAUD_DEVICE_EXTENSION DeviceExtension; + NTSTATUS Status; + + DPRINT1("cbStruct %u Expected %u dwControlID %u cChannels %u cMultipleItems %u cbDetails %u paDetails %p Flags %x\n", + DeviceInfo->u.MixDetails.cbStruct, sizeof(MIXERCONTROLDETAILS), DeviceInfo->u.MixDetails.dwControlID, DeviceInfo->u.MixDetails.cChannels, DeviceInfo->u.MixDetails.cMultipleItems, DeviceInfo->u.MixDetails.cbDetails, DeviceInfo->u.MixDetails.paDetails, DeviceInfo->Flags); + + if (DeviceInfo->Flags & MIXER_GETCONTROLDETAILSF_LISTTEXT) + { + UNIMPLEMENTED; + return SetIrpIoStatus(Irp, STATUS_NOT_IMPLEMENTED, 0); + } + + /* get device extension */ + DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + + /* get mixer control */ + Status = GetMixerControlById(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixDetails.dwControlID, &MixerLine, &MixerControl, &NodeId); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("MixerControl %x not found\n", DeviceInfo->u.MixDetails.dwControlID); + return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); + } + + Status = STATUS_NOT_IMPLEMENTED; + if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) + { + /* send the request */ + Status = SetGetMuteControlDetails(DeviceObject, MixerLine->DeviceIndex, NodeId, DeviceInfo, FALSE); + } + return SetIrpIoStatus(Irp, STATUS_NOT_IMPLEMENTED, 0); }

1 0

[mkupfer] 43288: - remove double entry in inf - load mouse settings - TODO: mouse settings doesn't work properly, but read and set works
by mkupfer＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: mkupfer Date: Sun Oct 4 21:28:52 2009 New Revision: 43288 URL: http://svn.reactos.org/svn/reactos?rev=43288&view=rev Log: - remove double entry in inf - load mouse settings - TODO: mouse settings doesn't work properly, but read and set works Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c Modified: trunk/reactos/boot/bootdata/hivedef_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef_i386.inf [iso-8859-1] Sun Oct 4 21:28:52 2009 @@ -23,7 +23,6 @@ HKCU,"Control Panel\Desktop","WaitToKillAppTimeout",0x00000002,"20000" HKCU,"Control Panel\Desktop","Wallpaper",0x00000000,"" HKCU,"Control Panel\Desktop","FontSmoothing",2,"0" -HKCU,"Control Panel\Desktop","DragFullWindows",2,"0" HKCU,"Control Panel\Desktop","SmoothScroll",3,00,00,00,00 HKCU,"Control Panel\Desktop","UserPreferenceMask",3,10,00,00,80 HKCU,"Control Panel\Desktop","LowPowerActive",,"0" Modified: trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/sysparams.c [iso-8859-1] Sun Oct 4 21:28:52 2009 @@ -216,30 +216,31 @@ /* Load desktop settings */ gspv.bDragFullWindows = SpiLoadInt(KEY_DESKTOP, VAL_DRAG, 0); + /* Load mouse settings */ + gspv.bMouseBtnSwap = SpiLoadInt(KEY_MOUSE, VAL_SWAP, 0); + gspv.iMouseSpeed = SpiLoadInt(KEY_MOUSE, VAL_MOUSE3, 1); + gspv.iDblClickTime = SpiLoadInt(KEY_MOUSE, VAL_DBLCLKTIME, 500); + gspv.iDblClickWidth = SpiLoadInt(KEY_MOUSE, VAL_DBLCLKWIDTH, 4); + gspv.iDblClickHeight = SpiLoadInt(KEY_MOUSE, VAL_DBLCLKHEIGHT, 4); + /* Some hardcoded values for now */ + gspv.iMouseHoverTime = 80; + gspv.iMouseHoverWidth = 4; + gspv.iMouseHoverHeight = 4; + gspv.iWheelScrollLines = 3; +#if (_WIN32_WINNT >= 0x0600) + gspv.uiWheelScrollChars = 1; +#endif + gspv.tmCaptionFont.tmAveCharWidth = 6; gspv.bBeep = TRUE; gspv.bFlatMenu = FALSE; - gspv.iDblClickTime = 500; gspv.uiFocusBorderWidth = 1; gspv.uiFocusBorderHeight = 1; gspv.bMenuDropAlign = 1; gspv.bDropShadow = 1; gspv.dwUserPrefMask = UPM_DEFAULT; gspv.dwMenuShowDelay = 100; - - gspv.bMouseBtnSwap = FALSE; - gspv.iMouseSpeed = 10; - gspv.iMouseHoverTime = 80; - gspv.iMouseHoverWidth = 4; - gspv.iMouseHoverHeight = 4; - gspv.iDblClickTime = 500; - gspv.iDblClickWidth = 4; - gspv.iDblClickHeight = 4; - gspv.iWheelScrollLines = 3; -#if (_WIN32_WINNT >= 0x0600) - gspv.uiWheelScrollChars = 1; -#endif gspv.iScrSaverTimeout = 10; gspv.bScrSaverActive = FALSE;

1 0

[cgutman] 43287: - Don't add the media-specific header until right before transmission - Previously we would store the largest media-specific header size and add that value when creating a packet - Makes loopback packets smaller because they have no need for a media-specific header - Would fix packet corruption if interfaces with different media-specific headers were installed (if we supported that) - Makes adding support for other media types easier
by cgutman＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: cgutman Date: Sun Oct 4 21:23:53 2009 New Revision: 43287 URL: http://svn.reactos.org/svn/reactos?rev=43287&view=rev Log: - Don't add the media-specific header until right before transmission - Previously we would store the largest media-specific header size and add that value when creating a packet - Makes loopback packets smaller because they have no need for a media-specific header - Would fix packet corruption if interfaces with different media-specific headers were installed (if we supported that) - Makes adding support for other media types easier Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c trunk/reactos/drivers/network/tcpip/include/ip.h trunk/reactos/lib/drivers/ip/network/arp.c trunk/reactos/lib/drivers/ip/network/icmp.c trunk/reactos/lib/drivers/ip/network/ip.c trunk/reactos/lib/drivers/ip/network/loopback.c trunk/reactos/lib/drivers/ip/network/neighbor.c trunk/reactos/lib/drivers/ip/network/routines.c trunk/reactos/lib/drivers/ip/network/transmit.c trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c trunk/reactos/lib/drivers/ip/transport/tcp/event.c trunk/reactos/lib/drivers/ip/transport/udp/udp.c Modified: trunk/reactos/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/data… ============================================================================== --- trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Sun Oct 4 21:23:53 2009 @@ -231,12 +231,7 @@ * Status = Status of the operation */ { - TI_DbgPrint(DEBUG_DATALINK, ("Calling completion routine\n")); - ASSERT_KM_POINTER(Packet); - ASSERT_KM_POINTER(PC(Packet)); - ASSERT_KM_POINTER(PC(Packet)->DLComplete); - (*PC(Packet)->DLComplete)( PC(Packet)->Context, Packet, Status); - TI_DbgPrint(DEBUG_DATALINK, ("Finished\n")); + FreeNdisPacket(Packet); } VOID LanReceiveWorker( PVOID Context ) { @@ -418,7 +413,7 @@ Adapter, Adapter->MTU)); NdisStatus = AllocatePacketWithBuffer( &NdisPacket, NULL, - PacketSize + HeaderBufferSize ); + PacketSize ); if( NdisStatus != NDIS_STATUS_SUCCESS ) { return NDIS_STATUS_NOT_ACCEPTED; } @@ -599,18 +594,18 @@ { NDIS_STATUS NdisStatus; PETH_HEADER EHeader; - PCHAR Data; - UINT Size; + PCHAR Data, OldData; + UINT Size, OldSize; PLAN_ADAPTER Adapter = (PLAN_ADAPTER)Context; KIRQL OldIrql; - UINT PacketLength; + PNDIS_PACKET XmitPacket; TI_DbgPrint(DEBUG_DATALINK, ("Called( NdisPacket %x, Offset %d, Adapter %x )\n", NdisPacket, Offset, Adapter)); if (Adapter->State != LAN_STATE_STARTED) { - ProtocolSendComplete(Context, NdisPacket, NDIS_STATUS_NOT_ACCEPTED); + (*PC(NdisPacket)->DLComplete)(PC(NdisPacket)->Context, NdisPacket, NDIS_STATUS_NOT_ACCEPTED); return; } @@ -623,9 +618,19 @@ Adapter->HWAddress[4] & 0xff, Adapter->HWAddress[5] & 0xff)); - /* XXX arty -- Handled adjustment in a saner way than before ... - * not needed immediately */ - GetDataPtr( NdisPacket, 0, &Data, &Size ); + GetDataPtr( NdisPacket, 0, &OldData, &OldSize ); + + NdisStatus = AllocatePacketWithBuffer(&XmitPacket, NULL, OldSize + Adapter->HeaderSize); + if (NdisStatus != NDIS_STATUS_SUCCESS) { + (*PC(NdisPacket)->DLComplete)(PC(NdisPacket)->Context, NdisPacket, NDIS_STATUS_RESOURCES); + return; + } + + GetDataPtr(XmitPacket, 0, &Data, &Size); + + RtlCopyMemory(Data + Adapter->HeaderSize, OldData, OldSize); + + (*PC(NdisPacket)->DLComplete)(PC(NdisPacket)->Context, NdisPacket, NDIS_STATUS_SUCCESS); switch (Adapter->Media) { case NdisMedium802_3: @@ -652,14 +657,7 @@ EHeader->EType = ETYPE_IPv6; break; default: -#if DBG - /* Should not happen */ - TI_DbgPrint(MIN_TRACE, ("Unknown LAN protocol.\n")); - - ProtocolSendComplete((NDIS_HANDLE)Context, - NdisPacket, - NDIS_STATUS_FAILURE); -#endif + ASSERT(FALSE); return; } break; @@ -682,9 +680,7 @@ ((PCHAR)LinkAddress)[5] & 0xff)); } - NdisQueryPacketLength(NdisPacket, &PacketLength); - - if (Adapter->MTU < PacketLength) { + if (Adapter->MTU < Size) { /* This is NOT a pointer. MSDN explicitly says so. */ NDIS_PER_PACKET_INFO_FROM_PACKET(NdisPacket, TcpLargeSendPacketInfo) = (PVOID)((ULONG)Adapter->MTU); @@ -692,7 +688,7 @@ TcpipAcquireSpinLock( &Adapter->Lock, &OldIrql ); TI_DbgPrint(MID_TRACE, ("NdisSend\n")); - NdisSend(&NdisStatus, Adapter->NdisHandle, NdisPacket); + NdisSend(&NdisStatus, Adapter->NdisHandle, XmitPacket); TI_DbgPrint(MID_TRACE, ("NdisSend %s\n", NdisStatus == NDIS_STATUS_PENDING ? "Pending" : "Complete")); @@ -703,7 +699,7 @@ * status_pending is returned. Note that this is different from * the situation with IRPs. */ if (NdisStatus != NDIS_STATUS_PENDING) - ProtocolSendComplete((NDIS_HANDLE)Context, NdisPacket, NdisStatus); + ProtocolSendComplete((NDIS_HANDLE)Context, XmitPacket, NdisStatus); } static NTSTATUS Modified: trunk/reactos/drivers/network/tcpip/include/ip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/ip.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/ip.h [iso-8859-1] Sun Oct 4 21:23:53 2009 @@ -208,8 +208,6 @@ extern KSPIN_LOCK InterfaceListLock; extern LIST_ENTRY NetTableListHead; extern KSPIN_LOCK NetTableListLock; -extern UINT MaxLLHeaderSize; -extern UINT MinLLFrameSize; extern BOOLEAN IpWorkItemQueued; PIP_PACKET IPCreatePacket( Modified: trunk/reactos/lib/drivers/ip/network/arp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/arp… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/arp.c [iso-8859-1] Sun Oct 4 21:23:53 2009 @@ -11,6 +11,7 @@ #include "precomp.h" PNDIS_PACKET PrepareARPPacket( + PIP_INTERFACE IF, USHORT HardwareType, USHORT ProtocolType, UCHAR LinkAddressLength, @@ -45,11 +46,10 @@ TI_DbgPrint(DEBUG_ARP, ("Called.\n")); /* Prepare ARP packet */ - Size = MaxLLHeaderSize + - sizeof(ARP_HEADER) + + Size = sizeof(ARP_HEADER) + 2 * LinkAddressLength + /* Hardware address length */ 2 * ProtoAddressLength; /* Protocol address length */ - Size = MAX(Size, MinLLFrameSize); + Size = MAX(Size, IF->MinFrameSize - IF->HeaderSize); NdisStatus = AllocatePacketWithBuffer( &NdisPacket, NULL, Size ); if( !NT_SUCCESS(NdisStatus) ) return NULL; @@ -58,7 +58,7 @@ ASSERT(DataBuffer); RtlZeroMemory(DataBuffer, Size); - Header = (PARP_HEADER)((ULONG_PTR)DataBuffer + MaxLLHeaderSize); + Header = (PARP_HEADER)((ULONG_PTR)DataBuffer); Header->HWType = HardwareType; Header->ProtoType = ProtocolType; Header->HWAddrLen = LinkAddressLength; @@ -145,6 +145,7 @@ } NdisPacket = PrepareARPPacket( + Interface, WN2H(0x0001), /* FIXME: Ethernet only */ ProtoType, /* Protocol type */ (UCHAR)Interface->AddressLength, /* Hardware address length */ @@ -164,7 +165,7 @@ TI_DbgPrint(DEBUG_ARP,("Sending ARP Packet\n")); (*Interface->Transmit)(Interface->Context, NdisPacket, - MaxLLHeaderSize, NULL, LAN_PROTO_ARP); + 0, NULL, LAN_PROTO_ARP); return TRUE; } @@ -230,6 +231,7 @@ /* This is a request for our address. Swap the addresses and send an ARP reply back to the sender */ NdisPacket = PrepareARPPacket( + Interface, Header->HWType, /* Hardware type */ Header->ProtoType, /* Protocol type */ (UCHAR)Interface->AddressLength, /* Hardware address length */ @@ -243,7 +245,7 @@ PC(NdisPacket)->DLComplete = ARPTransmitComplete; (*Interface->Transmit)(Interface->Context, NdisPacket, - MaxLLHeaderSize, + 0, SenderHWAddress, LAN_PROTO_ARP); } Modified: trunk/reactos/lib/drivers/ip/network/icmp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/icm… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/icmp.c [iso-8859-1] Sun Oct 4 21:23:53 2009 @@ -75,7 +75,7 @@ /* No special flags */ IPPacket->Flags = 0; - Size = MaxLLHeaderSize + sizeof(IPv4_HEADER) + DataSize; + Size = sizeof(IPv4_HEADER) + DataSize; /* Allocate NDIS packet */ NdisStatus = AllocatePacketWithBuffer( &NdisPacket, NULL, Size ); @@ -84,14 +84,14 @@ IPPacket->NdisPacket = NdisPacket; - GetDataPtr( IPPacket->NdisPacket, MaxLLHeaderSize, + GetDataPtr( IPPacket->NdisPacket, 0, (PCHAR *)&IPPacket->Header, &IPPacket->ContigSize ); TI_DbgPrint(DEBUG_ICMP, ("Size (%d). Data at (0x%X).\n", Size, Data)); TI_DbgPrint(DEBUG_ICMP, ("NdisPacket at (0x%X).\n", NdisPacket)); IPPacket->HeaderSize = sizeof(IPv4_HEADER); - IPPacket->TotalSize = Size - MaxLLHeaderSize; + IPPacket->TotalSize = Size; IPPacket->Data = ((PCHAR)IPPacket->Header) + IPPacket->HeaderSize; TI_DbgPrint(DEBUG_ICMP, ("Copying Address: %x -> %x\n", Modified: trunk/reactos/lib/drivers/ip/network/ip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/ip.… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/ip.c [iso-8859-1] Sun Oct 4 21:23:53 2009 @@ -15,8 +15,6 @@ KSPIN_LOCK InterfaceListLock; LIST_ENTRY NetTableListHead; KSPIN_LOCK NetTableListLock; -UINT MaxLLHeaderSize; /* Largest maximum header size */ -UINT MinLLFrameSize; /* Largest minimum frame size */ BOOLEAN IPInitialized = FALSE; BOOLEAN IpWorkItemQueued = FALSE; /* Work around calling timer at Dpc level */ @@ -153,13 +151,7 @@ IF->Free = FreeIF; IF->Context = BindInfo->Context; IF->HeaderSize = BindInfo->HeaderSize; - if (IF->HeaderSize > MaxLLHeaderSize) - MaxLLHeaderSize = IF->HeaderSize; - IF->MinFrameSize = BindInfo->MinFrameSize; - if (IF->MinFrameSize > MinLLFrameSize) - MinLLFrameSize = IF->MinFrameSize; - IF->MTU = BindInfo->MTU; IF->Address = BindInfo->Address; IF->AddressLength = BindInfo->AddressLength; @@ -361,9 +353,6 @@ TI_DbgPrint(MAX_TRACE, ("Called.\n")); - MaxLLHeaderSize = 0; - MinLLFrameSize = 0; - /* Initialize lookaside lists */ ExInitializeNPagedLookasideList( &IPDRList, /* Lookaside list */ Modified: trunk/reactos/lib/drivers/ip/network/loopback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/loo… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/loopback.c [iso-8859-1] Sun Oct 4 21:23:53 2009 @@ -41,7 +41,7 @@ TI_DbgPrint(MAX_TRACE, ("Called (NdisPacket = %x)\n", NdisPacket)); - GetDataPtr( NdisPacket, MaxLLHeaderSize, &PacketBuffer, &PacketLength ); + GetDataPtr( NdisPacket, 0, &PacketBuffer, &PacketLength ); NdisStatus = AllocatePacketWithBuffer ( &XmitPacket, PacketBuffer, PacketLength ); Modified: trunk/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/nei… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Sun Oct 4 21:23:53 2009 @@ -55,7 +55,7 @@ NCE->Interface->Transmit ( NCE->Interface->Context, Packet->Packet, - MaxLLHeaderSize, + 0, NCE->LinkAddress, LAN_PROTO_IPv4 ); } Modified: trunk/reactos/lib/drivers/ip/network/routines.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/rou… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/routines.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/routines.c [iso-8859-1] Sun Oct 4 21:23:53 2009 @@ -115,10 +115,9 @@ if (IPPacket->NdisPacket) { NdisQueryPacket(IPPacket->NdisPacket, NULL, NULL, NULL, &Length); - Length -= MaxLLHeaderSize; Buffer = exAllocatePool(NonPagedPool, Length); if (Buffer) { - Length = CopyPacketToBuffer(Buffer, IPPacket->NdisPacket, MaxLLHeaderSize, Length); + Length = CopyPacketToBuffer(Buffer, IPPacket->NdisPacket, 0, Length); DisplayTCPHeader(Buffer, Length); exFreePool(Buffer); } Modified: trunk/reactos/lib/drivers/ip/network/transmit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/tra… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/transmit.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/transmit.c [iso-8859-1] Sun Oct 4 21:23:53 2009 @@ -166,7 +166,7 @@ PIPFRAGMENT_CONTEXT IFC; NDIS_STATUS NdisStatus; PVOID Data; - UINT BufferSize = MaxLLHeaderSize + PathMTU, InSize; + UINT BufferSize = PathMTU, InSize; PCHAR InData; TI_DbgPrint(MAX_TRACE, ("Called. IPPacket (0x%X) NCE (0x%X) PathMTU (%d).\n", @@ -193,7 +193,7 @@ GetDataPtr( IFC->NdisPacket, 0, (PCHAR *)&Data, &InSize ); - IFC->Header = ((PCHAR)Data) + MaxLLHeaderSize; + IFC->Header = ((PCHAR)Data); IFC->Datagram = IPPacket->NdisPacket; IFC->DatagramData = ((PCHAR)IPPacket->Header) + IPPacket->HeaderSize; IFC->HeaderSize = IPPacket->HeaderSize; Modified: trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/r… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] Sun Oct 4 21:23:53 2009 @@ -37,10 +37,10 @@ TI_DbgPrint(MID_TRACE, ("Packet: %x NdisPacket %x\n", IPPacket, IPPacket->NdisPacket)); - BufferSize = MaxLLHeaderSize + sizeof(IPv4_HEADER) + ExtraLength; + BufferSize = sizeof(IPv4_HEADER) + ExtraLength; GetDataPtr( IPPacket->NdisPacket, - MaxLLHeaderSize, + 0, (PCHAR *)&IPPacket->Header, &IPPacket->ContigSize ); @@ -113,7 +113,7 @@ /* Prepare packet */ Status = AllocatePacketWithBuffer( &Packet->NdisPacket, NULL, - Packet->TotalSize + MaxLLHeaderSize ); + Packet->TotalSize ); if( !NT_SUCCESS(Status) ) return Status; Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Sun Oct 4 21:23:53 2009 @@ -86,15 +86,14 @@ return OSK_EADDRNOTAVAIL; } - NdisStatus = AllocatePacketWithBuffer( &Packet.NdisPacket, NULL, - MaxLLHeaderSize + len ); + NdisStatus = AllocatePacketWithBuffer( &Packet.NdisPacket, NULL, len ); if (NdisStatus != NDIS_STATUS_SUCCESS) { TI_DbgPrint(DEBUG_TCP, ("Error from NDIS: %08x\n", NdisStatus)); return OSK_ENOBUFS; } - GetDataPtr( Packet.NdisPacket, MaxLLHeaderSize, + GetDataPtr( Packet.NdisPacket, 0, (PCHAR *)&Packet.Header, &Packet.ContigSize ); RtlCopyMemory( Packet.Header, data, len ); Modified: trunk/reactos/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/u… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Sun Oct 4 21:23:53 2009 @@ -94,7 +94,7 @@ /* Prepare packet */ Status = AllocatePacketWithBuffer( &Packet->NdisPacket, NULL, - Packet->TotalSize + MaxLLHeaderSize ); + Packet->TotalSize ); if( !NT_SUCCESS(Status) ) return Status;

1 0

[dgorbachev] 43286: Update Spanish translations. Javier Remacha, bug #4872.
by dgorbachev＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: dgorbachev Date: Sun Oct 4 20:12:14 2009 New Revision: 43286 URL: http://svn.reactos.org/svn/reactos?rev=43286&view=rev Log: Update Spanish translations. Javier Remacha, bug #4872. Modified: trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc trunk/reactos/base/applications/rapps/lang/es-ES.rc trunk/reactos/boot/bootdata/bootcd.ini trunk/reactos/dll/cpl/desk/lang/en-US.rc trunk/reactos/dll/cpl/desk/lang/es-ES.rc trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc trunk/reactos/dll/win32/kernel32/nls/esp.nls trunk/reactos/dll/win32/netid/lang/en-US.rc trunk/reactos/dll/win32/netid/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/media/inf/audio.inf Modified: trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc [iso-8859-1] Sun Oct 4 20:12:14 2009 @@ -147,6 +147,19 @@ DEFPUSHBUTTON "No", IDCANCEL, 102, 129, 54, 13 END +IDD_DLG_DEPEND_STOP DIALOGEX 6,6,240,148 +CAPTION "Stop Other Services" +FONT 8, "MS Shell Dlg",0,0 +STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | DS_MODALFRAME +BEGIN + ICON IDI_WARNING, IDC_STATIC, 10, 8, 24, 22 + LTEXT "", IDC_STOP_DEPENDS, 40, 8, 170, 25 + LISTBOX IDC_STOP_DEPENDS_LB, 15, 40, 210, 70, WS_CHILD | WS_VISIBLE | WS_EX_STATICEDGE | LBS_NOSEL + LTEXT "Do you want to stop these services?",IDC_STATIC, 15, 110, 150, 10 + DEFPUSHBUTTON "Yes", IDOK, 60, 129, 54, 14 + PUSHBUTTON "No", IDCANCEL, 120, 129, 54, 14 +END + IDD_DLG_HELP_OPTIONS DIALOGEX 6,6,200,150 CAPTION "Opciones" FONT 8, "MS Shell Dlg",0,0 @@ -191,8 +204,8 @@ STRINGTABLE DISCARDABLE BEGIN IDS_NUM_SERVICES "Núm Servicios: %d" - IDS_STOP_DEPENDS "When %s stops, these other services will also stop" - IDS_NO_DEPENDS "<No Dependencies>" + IDS_STOP_DEPENDS "Cuando %s se detenga, estos otros servicios también se detendrán" + IDS_NO_DEPENDS "<Sin dependencias>" IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END Modified: trunk/reactos/base/applications/rapps/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] Sun Oct 4 20:12:14 2009 @@ -14,7 +14,7 @@ MENUITEM "&Desinstalar",ID_UNINSTALL MENUITEM "&Modificar", ID_MODIFY MENUITEM SEPARATOR - MENUITEM "&Remove from Registry", ID_REGREMOVE + MENUITEM "&Eliminar del registro", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "&Refrescar", ID_REFRESH END @@ -42,7 +42,7 @@ MENUITEM "&Desinstalar", ID_UNINSTALL MENUITEM "&Modificar", ID_MODIFY MENUITEM SEPARATOR - MENUITEM "&Remove from Registry", ID_REGREMOVE + MENUITEM "&Eliminar del registro", ID_REGREMOVE MENUITEM SEPARATOR MENUITEM "&Refrescar", ID_REFRESH END @@ -50,37 +50,37 @@ IDD_SETTINGS_DIALOG DIALOGEX DISCARDABLE 0, 0, 250, 144 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Settings" +CAPTION "Ajustes" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "General", -1, 4, 2, 240, 61 - AUTOCHECKBOX "&Save window position", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 - AUTOCHECKBOX "&Update the list of accessible programs at start", IDC_UPDATE_AVLIST, 15, 29, 219, 12 - AUTOCHECKBOX "&Log of installation and removal of programs", IDC_LOG_ENABLED, 15, 46, 219, 12 + GROUPBOX "General ", -1, 4, 2, 240, 61 + AUTOCHECKBOX "&Guardar posición de la ventana", IDC_SAVE_WINDOW_POS, 15, 12, 219, 12 + AUTOCHECKBOX "&Actualizar la lista de programas accesibles al comenzar", IDC_UPDATE_AVLIST, 15, 29, 219, 12 + AUTOCHECKBOX "&Registro de programas instalados y desinstalados", IDC_LOG_ENABLED, 15, 46, 219, 12 - GROUPBOX "Downloading", -1, 4, 65, 240, 51 - LTEXT "Folder for downloadings:", -1, 16, 75, 100, 9 + GROUPBOX "Descargando ", -1, 4, 65, 240, 51 + LTEXT "Carpeta de descargas:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP - PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14 - AUTOCHECKBOX "&Delete installers of programs after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 + PUSHBUTTON "&Seleccionar", IDC_CHOOSE, 187, 85, 50, 14 + AUTOCHECKBOX "&Borrar el instalador del programa tras su instalación", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 181, 124, 60, 14 + PUSHBUTTON "Por defecto", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 + PUSHBUTTON "Aceptar", IDOK, 116, 124, 60, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 181, 124, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX DISCARDABLE 0, 0, 216, 97 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU -CAPTION "Program installation" +CAPTION "Instalar programas" FONT 8, "MS Shell Dlg" BEGIN LTEXT "...", IDC_INSTALL_TEXT, 4, 5, 209, 35 - AUTORADIOBUTTON "&Install from a disk (CD or DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP - AUTORADIOBUTTON "&Download and install", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP + AUTORADIOBUTTON "&Instalar desde un disco (CD o DVD)", IDC_CD_INSTALL, 10, 46, 197, 11, WS_GROUP + AUTORADIOBUTTON "&Descargar e instalar", IDC_DOWNLOAD_INSTALL, 10, 59, 197, 11, NOT WS_TABSTOP - PUSHBUTTON "OK", IDOK, 86, 78, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 150, 78, 60, 14 + PUSHBUTTON "Aceptar", IDOK, 86, 78, 60, 14 + PUSHBUTTON "Cancelas", IDCANCEL, 150, 78, 60, 14 END IDD_DOWNLOAD_DIALOG DIALOGEX LOADONCALL MOVEABLE DISCARDABLE 0, 0, 220, 76 @@ -184,10 +184,10 @@ IDS_AVAILABLEFORINST "Disponible para instalación" IDS_UPDATES "Actualizaciones" IDS_APPLICATIONS "Aplicaciones" - IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will be used for downloading of programs:" - IDS_CHOOSE_FOLDER_ERROR "You have specified a nonexistent folder!" - IDS_USER_NOT_ADMIN "You should be administrator for start ""ReactOS Applications Manager""!" - IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?" - IDS_INFORMATION "Information" - IDS_UNABLE_TO_REMOVE "Unable to remove data on the program from the registry!" + IDS_CHOOSE_FOLDER_TEXT "Seleccione una carpeta donde se descargarán los programas:" + IDS_CHOOSE_FOLDER_ERROR "¡La carpeta especificada no existe!" + IDS_USER_NOT_ADMIN "¡Debe tener privilegios de administrador para ejecutar ""ReactOS Applications Manager""!" + IDS_APP_REG_REMOVE "¿Esta seguro que quiere borrar los datos del programa instalado del registro?" + IDS_INFORMATION "Información" + IDS_UNABLE_TO_REMOVE "!Imposible eliminar los datos del programa del registro!" END Modified: trunk/reactos/boot/bootdata/bootcd.ini URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd.ini?r… ============================================================================== --- trunk/reactos/boot/bootdata/bootcd.ini [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/bootcd.ini [iso-8859-1] Sun Oct 4 20:12:14 2009 @@ -27,4 +27,4 @@ BootType=ReactOSSetup2 [Setup_old] -BootType=ReactOSSetup +BootType=ReactOSSetup Modified: trunk/reactos/dll/cpl/desk/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-US.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/en-US.rc [iso-8859-1] Sun Oct 4 20:12:14 2009 @@ -19,7 +19,6 @@ CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END - IDD_SCREENSAVER DIALOGEX 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Screensaver" @@ -27,13 +26,13 @@ BEGIN CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE - GROUPBOX "&Screensaver",IDC_SCREENS_DUMMY, 8, 92, 230, 52 + GROUPBOX "&Screensaver", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "Se&ttings",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP - PUSHBUTTON "Pre&view",IDC_SCREENS_TESTSC, 175, 103, 50, 13 - LTEXT "&Wait",IDC_WAITTEXT, 14, 125, 16, 9 + PUSHBUTTON "Se&ttings", IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP + PUSHBUTTON "Pre&view", IDC_SCREENS_TESTSC, 175, 103, 50, 13 + LTEXT "&Wait", IDC_WAITTEXT, 14, 125, 16, 9 EDITTEXT IDC_SCREENS_TIMEDELAY, 34, 123, 32, 13, ES_RIGHT | WS_GROUP - CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | + CONTROL "", IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 54, 123, 12, 13 LTEXT "minutes", IDC_MINTEXT, 70, 125, 26, 9 @@ -45,7 +44,6 @@ PUSHBUTTON "P&ower...", IDC_SCREENS_POWER_BUTTON, 176, 171, 50, 13 END - IDD_APPEARANCE DIALOGEX DISCARDABLE 0, 0, 246, 204 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Appearance" @@ -54,7 +52,7 @@ CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 - COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90 , CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 150, 134, 90, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 PUSHBUTTON "Ad&vanced...", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 END Modified: trunk/reactos/dll/cpl/desk/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/es-ES.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/es-ES.rc [iso-8859-1] Sun Oct 4 20:12:14 2009 @@ -1,8 +1,8 @@ /* - * desk (Spanish resources) + * ReactOS Display Panel (Spanish resources) * * Translated by Patricio Martínez Ros - * Actualizado por Javier Remacha 2008 + * Actualizado por Javier Remacha 2009 * */ @@ -13,16 +13,16 @@ CAPTION "Escritorio" FONT 8, "MS Shell Dlg" BEGIN - CONTROL "",IDC_BACKGROUND_PREVIEW,"Static",SS_OWNERDRAW, + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70,WS_EX_STATICEDGE CONTROL "",IDC_BACKGROUND_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 7, 99, 173, 71 LTEXT "&Fondo:", IDC_STATIC, 8, 87, 180, 8 - PUSHBUTTON "E&xaminar...",IDC_BROWSE_BUTTON, 187, 135, 50, 14 - PUSHBUTTON "C&olor...",IDC_COLOR_BUTTON, 187, 155, 50, 14 - LTEXT "Po&sición",IDC_STATIC, 187, 98, 36, 8 + PUSHBUTTON "E&xaminar...", IDC_BROWSE_BUTTON, 187, 135, 50, 14 + PUSHBUTTON "C&olor...", IDC_COLOR_BUTTON, 187, 155, 50, 14 + LTEXT "Po&sición", IDC_STATIC, 187, 98, 36, 8 COMBOBOX IDC_PLACEMENT_COMBO, 187, 108, 50, 90, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP END @@ -34,13 +34,13 @@ BEGIN CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE - GROUPBOX "&Protector de pantalla ",IDC_SCREENS_DUMMY, 8, 92, 230, 52 + GROUPBOX "&Protector de pantalla ", IDC_SCREENS_DUMMY, 8, 92, 230, 52 COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "C&onfiguración",IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP - PUSHBUTTON "&Vista previa",IDC_SCREENS_TESTSC, 175, 103, 50, 13 - LTEXT "&Esperar",IDC_WAITTEXT, 14, 125, 25, 9 //16 + PUSHBUTTON "C&onfiguración", IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP + PUSHBUTTON "&Vista previa", IDC_SCREENS_TESTSC, 175, 103, 50, 13 + LTEXT "&Esperar", IDC_WAITTEXT, 14, 125, 25, 9 //16 EDITTEXT IDC_SCREENS_TIMEDELAY, 41, 123, 29, 13, ES_RIGHT | WS_GROUP - CONTROL "",IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | + CONTROL "", IDC_SCREENS_TIME ,UPDOWN_CLASS,UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 61, 123, 12, 13 LTEXT "minutos", IDC_MINTEXT, 72, 125, 26, 9 @@ -60,7 +60,7 @@ CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 LTEXT "Com&binación de colores:", IDC_STATIC, 7, 160, 90, 7 //84 - COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 169, 120, 54, CBS_DROPDOWNLIST | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "&Efectos...", IDC_APPEARANCE_EFFECTS, 162, 185, 76, 15 PUSHBUTTON "Opciones &avanzadas", IDC_APPEARANCE_ADVANCED, 162, 205, 76, 15 END @@ -120,7 +120,7 @@ CONTROL "Mostrar som&bras bajo los menús",IDC_EFFAPPEARANCE_SETDROPSHADOW,"button", BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 95, 285, 19 CONTROL "&Mostrar el contenido de la ventana mientras se arrastra",IDC_EFFAPPEARANCE_DRAGFULLWINDOWS,"button", - BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 110, 285, 19 + BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 285, 19 CONTROL "&Ocultar las letrar subrayadas de acceso rápido hasta que presione la tecla Alt",IDC_EFFAPPEARANCE_KEYBOARDCUES,"button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 290, 19 PUSHBUTTON "Cancelar", IDCANCEL, 241, 165, 50, 14 @@ -131,7 +131,7 @@ STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Configuración" FONT 8, "MS Shell Dlg" -BEGIN +BEGIN LTEXT "Arrastre los iconos para ajustar el orden físico de sus monitores.",-1,3,3,240,10 CONTROL "",IDC_SETTINGS_MONSEL,"MONITORSELWNDCLASS",WS_CHILD|WS_VISIBLE|WS_TABSTOP,3,16,240,82,WS_EX_CLIENTEDGE LTEXT "Mostrar",1820,3,100,30,8 Modified: trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/sysdm/lang/es-ES.r… ============================================================================== --- trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/sysdm/lang/es-ES.rc [iso-8859-1] Sun Oct 4 20:12:14 2009 @@ -144,7 +144,7 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Inicio del sistema ", IDC_STATIC, 7, 12, 238, 95 - LTEXT "&Sistema operativo predeterminado:", IDC_STATIC, 14, 26, 100, 8 + LTEXT "&Sistema operativo predeterminado:", IDC_STATIC, 14, 26, 180, 8 COMBOBOX IDC_STRECOSCOMBO, 14, 37, 224, 46, CBS_DROPDOWNLIST AUTOCHECKBOX "&Mostrar la lista de sistemas operativos durante:", IDC_STRECLIST, 14, 56, 165, 8 EDITTEXT IDC_STRRECLISTEDIT, 180, 54, 29, 12, ES_NUMBER @@ -154,7 +154,7 @@ EDITTEXT IDC_STRRECRECEDIT, 180, 68, 29, 12, ES_NUMBER CONTROL "", IDC_STRRECRECUPDWN, "msctls_updown32", UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | WS_CHILD | WS_VISIBLE, 0, 0, 8, 13 LTEXT "segundos", IDC_STATIC, 210, 70, 30, 8 - LTEXT "Para editar manualmente el archivo de opciones de inicio, haga clic en Editar.", IDC_STATIC, 14, 84, 187, 17 + LTEXT "Para editar manualmente el archivo de opciones de inicio, haga clic en Editar.", IDC_STATIC, 14, 84, 170, 17 PUSHBUTTON "&Editar", IDC_STRRECEDIT, 188, 87, 50, 14 GROUPBOX "Error del sistema ", IDC_STATIC, 7, 111, 238, 140 Modified: trunk/reactos/dll/win32/kernel32/nls/esp.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/esp… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/esp.nls [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/nls/esp.nls [iso-8859-1] Sun Oct 4 20:12:14 2009 @@ -136,21 +136,21 @@ LOCALE_STIMEFORMAT "H:mm:ss" LOCALE_SYEARMONTH "MMMM' de 'yyyy" - LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" - LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" - LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" - LGRPID_GREEK+LGRPID_RES_BASE "Greek" - LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" - LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" - LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" - LGRPID_KOREAN+LGRPID_RES_BASE "Korean" - LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" - LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" - LGRPID_THAI+LGRPID_RES_BASE "Thai" - LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" - LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" - LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" - LGRPID_INDIC+LGRPID_RES_BASE "Indic" - LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" - LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Europa Occidental y Estados Unidos" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Europa Central" + LGRPID_BALTIC+LGRPID_RES_BASE "Báltico" + LGRPID_GREEK+LGRPID_RES_BASE "Griego" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cirílico" + LGRPID_TURKISH+LGRPID_RES_BASE "Túrquico" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japonés" + LGRPID_KOREAN+LGRPID_RES_BASE "Coreano" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Chino tradicional" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Chino simplificado" + LGRPID_THAI+LGRPID_RES_BASE "Tailandés" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebreo" + LGRPID_ARABIC+LGRPID_RES_BASE "Árabe" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamita" + LGRPID_INDIC+LGRPID_RES_BASE "Índico" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgiano" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenio" } Modified: trunk/reactos/dll/win32/netid/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/en-US… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/en-US.rc [iso-8859-1] Sun Oct 4 20:12:14 2009 @@ -67,12 +67,12 @@ 22 "Welcome to the %1 workgroup." 23 "Welcome to the %1 domain." 24 "You must restart this computer for the changes to take effect." - 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." + 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." 1021 "Note: Only Administrators can change the identification of this computer." 1022 "Note: The identification of the computer cannot be changed because:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" + 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" 3210 "&Details >>" 3220 "<< &Details" - 4000 "Information" - 4001 "Can't set new a computer name!" + 4000 "Information" + 4001 "Can't set new a computer name!" END Modified: trunk/reactos/dll/win32/netid/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netid/lang/es-ES… ============================================================================== --- trunk/reactos/dll/win32/netid/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netid/lang/es-ES.rc [iso-8859-1] Sun Oct 4 20:12:14 2009 @@ -1,5 +1,5 @@ /* - *Spanish Language resource file + * Spanish Language resource file * Traducido por: Javier Remacha 2007-12-24 */ @@ -8,7 +8,7 @@ IDD_PROPPAGECOMPUTER DIALOGEX 0, 0, 256, 218 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Nombre de equipo" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 +FONT 8, "MS Shell Dlg" BEGIN ICON IDI_COMPNAME, IDC_STATIC, 4, 3, 26, 24, SS_ICON LTEXT "ReactOS usa la siguiente información para identificar su equipo en la red.", IDC_STATIC, 40, 5, 204, 20 @@ -72,12 +72,12 @@ 22 "Bienvenido al grupo de trabajo %1." 23 "Bienvenido al dominio %1." 24 "Debe reiniciar el equipo para que los cambios tengan efecto." - 25 "You can change the name and the membership of this computer. Changes may affect access to network resources." + 25 "Puede cambiar el nombre y la pertenencia de este grupo. Los cambios pueden afectar el acceso a los recursos de red." 1021 "Nota: Sólo los Administradores pueden cambiar la identificación de este equipo." 1022 "Nota: La identificación de este equipo no puede ser cambiada porque:" - 1030 "The new computer name ""%s"" contains characters which are not allowed. Characters which are not allowed include ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / and ?" + 1030 "El nuevo nombre de equipo ""%s"" contiene caracteres no permitidos. Estos caracteres no permitidos incluyen ` ~ ! @ # $ %% ^ & * ( ) = + _ [ ] { } \\ | ; : ' \" , . < > / y ?" 3210 "&Detalles >>" 3220 "<< &Detalles" - 4000 "Information" - 4001 "Can't set new a computer name!" + 4000 "Información" + 4001 "¡No puede poner un nuevo nombre de equipo!" END Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Sun Oct 4 20:12:14 2009 @@ -1,8 +1,8 @@ /* * Copyright 1998 Juergen Schmied * Copyright 2003,2004 José Manuel Ferrer Ortiz - * Actualizado Javier Remacha 2008 - * ACtualizado Victor Martinez 2008 + * Actualizado Victor Martinez 2008 + * Actualizado Javier Remacha 2009 * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -674,15 +674,15 @@ IDS_PERSONAL "Mis documentos" IDS_FAVORITES "Favoritos" IDS_STARTUP "Menú Inicio\\Programas\\Inicio" - IDS_RECENT "Recent" + IDS_RECENT "Reciente" IDS_SENDTO "SendTo" IDS_STARTMENU "Menú Inicio" IDS_MYMUSIC "Mis documentos\\Mi música" IDS_MYVIDEO "Mis documentos\\Mis vídeos" IDS_DESKTOPDIRECTORY "Escritorio" IDS_NETHOOD "Entorno de red" - IDS_TEMPLATES "Templates" - IDS_APPDATA "Application Data" + IDS_TEMPLATES "Plantillas" + IDS_APPDATA "Datos de Programa" IDS_PRINTHOOD "Impresoras" IDS_LOCAL_APPDATA "Configuración local\\Datos de programa" IDS_INTERNET_CACHE "Configuración local\\Archivos temporales de Internet" @@ -751,5 +751,5 @@ IDS_INSTALLNEWFONT "Instalar Nueva Fuente..." IDS_DEFAULT_CLUSTER_SIZE "Tamaño asignado por defecto" - IDS_COPY_OF "Copy of" -END + IDS_COPY_OF "Copia de" +END Modified: trunk/reactos/media/inf/audio.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/audio.inf?rev=43… ============================================================================== --- trunk/reactos/media/inf/audio.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/audio.inf [iso-8859-1] Sun Oct 4 20:12:14 2009 @@ -73,6 +73,9 @@ [Strings.0407] AUDIOClassName = "Audio-, Video- und Gamecontroller" +[Strings.040a] +AUDIOClassName = "Dispositivos de sonido, vídeo y juegos" + [Strings.0416] AUDIOClassName = "Controladores de som, vídeo e jogo"

1 0

[janderwald] 43285: - Don't call ExFreePool for null pointers
by janderwald＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: janderwald Date: Sun Oct 4 19:39:26 2009 New Revision: 43285 URL: http://svn.reactos.org/svn/reactos?rev=43285&view=rev Log: - Don't call ExFreePool for null pointers Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Sun Oct 4 19:39:26 2009 @@ -498,7 +498,8 @@ goto cleanup; } RtlCopyMemory(NewBuffer, ReturnBuffer.Buffer, ReturnBuffer.Length); - ExFreePool(ReturnBuffer.Buffer); + if (ReturnBuffer.Buffer) + ExFreePool(ReturnBuffer.Buffer); ReturnBuffer.Buffer = NewBuffer; } DPRINT("Adding symbolic link %wZ\n", &KeyName); @@ -563,7 +564,7 @@ Status = STATUS_SUCCESS; cleanup: - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status) && ReturnBuffer.Buffer) ExFreePool(ReturnBuffer.Buffer); if (InterfaceKey != INVALID_HANDLE_VALUE) ZwClose(InterfaceKey); @@ -573,9 +574,12 @@ ZwClose(ReferenceKey); if (ControlKey != INVALID_HANDLE_VALUE) ZwClose(ControlKey); - ExFreePool(DeviceBi); - ExFreePool(ReferenceBi); - ExFreePool(bip); + if (DeviceBi) + ExFreePool(DeviceBi); + if (ReferenceBi) + ExFreePool(ReferenceBi); + if (bip) + ExFreePool(bip); return Status; } @@ -888,7 +892,7 @@ Status = IoCreateSymbolicLink(SymbolicLinkName, &PdoNameInfo->Name); if (!NT_SUCCESS(Status) && ReferenceString == NULL) { - DPRINT("IoCreateSymbolicLink() failed with status 0x%08lx\n", Status); + DPRINT1("IoCreateSymbolicLink() failed with status 0x%08lx\n", Status); ZwClose(SubKey); ZwClose(InterfaceKey); ZwClose(ClassKey); @@ -917,7 +921,7 @@ SymbolicLinkName->Length); if (!NT_SUCCESS(Status)) { - DPRINT("ZwSetValueKey() failed with status 0x%08lx\n", Status); + DPRINT1("ZwSetValueKey() failed with status 0x%08lx\n", Status); ExFreePool(SymbolicLinkName->Buffer); } else @@ -973,7 +977,7 @@ if (SymbolicLinkName == NULL) return STATUS_INVALID_PARAMETER_1; - DPRINT("IoSetDeviceInterfaceState('%wZ', %d)\n", SymbolicLinkName, Enable); + DPRINT1("IoSetDeviceInterfaceState('%wZ', %d)\n", SymbolicLinkName, Enable); /* Symbolic link name is \??\ACPI#PNP0501#1#{GUID}\ReferenceString */ /* Get GUID from SymbolicLinkName */ @@ -981,7 +985,7 @@ EndPosition = wcschr(SymbolicLinkName->Buffer, L'}'); if (!StartPosition ||!EndPosition || StartPosition > EndPosition) { - DPRINT("IoSetDeviceInterfaceState() returning STATUS_INVALID_PARAMETER_1\n"); + DPRINT1("IoSetDeviceInterfaceState() returning STATUS_INVALID_PARAMETER_1\n"); return STATUS_INVALID_PARAMETER_1; } GuidString.Buffer = StartPosition; @@ -989,8 +993,7 @@ SymLink.Buffer = SymbolicLinkName->Buffer; SymLink.MaximumLength = SymLink.Length = (USHORT)((ULONG_PTR)(EndPosition + 1) - (ULONG_PTR)SymLink.Buffer); - - + DPRINT1("IoSetDeviceInterfaceState('%wZ', %d)\n", SymbolicLinkName, Enable); /* Get pointer to the PDO */ Status = IoGetDeviceObjectPointer( &SymLink, @@ -999,7 +1002,7 @@ &PhysicalDeviceObject); if (!NT_SUCCESS(Status)) { - DPRINT("IoGetDeviceObjectPointer() failed with status 0x%08lx\n", Status); + DPRINT1("IoGetDeviceObjectPointer() failed with status 0x%08lx\n", Status); return Status; } @@ -1012,7 +1015,7 @@ (PVOID)SymbolicLinkName); ObDereferenceObject(FileObject); - +DPRINT1("Status %x\n", Status); return STATUS_SUCCESS; }

1 0

[bfreisen] 43284: corrected magnifying glass cursor
by bfreisen＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: bfreisen Date: Sun Oct 4 19:25:55 2009 New Revision: 43284 URL: http://svn.reactos.org/svn/reactos?rev=43284&view=rev Log: corrected magnifying glass cursor Modified: trunk/reactos/base/applications/paint/icons/zoom_cur.ico Modified: trunk/reactos/base/applications/paint/icons/zoom_cur.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/ic… ============================================================================== Binary files - no diff available.

1 0

[sginsberg] 43283: Mega KD64 revival patch: KD64 - Fix some 64-bit issues and some x86 specificness. - Sub out some KdpTrap cases more properly. - Implement support for .crash and .reboot. Does not seem to work currently because of weird issues. - Implement KdpDprintf to send strings directly to the debugger from inside of KD64. Use it in KdEnterDebugger instead of DbgPrint so we won't try to enter the debugger recursively. - Implement KdUpdateDataBlock to set the KeUserCallbackDispatcher pointe
by sginsberg＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: sginsberg Date: Sun Oct 4 18:53:15 2009 New Revision: 43283 URL: http://svn.reactos.org/svn/reactos?rev=43283&view=rev Log: Mega KD64 revival patch: KD64 - Fix some 64-bit issues and some x86 specificness. - Sub out some KdpTrap cases more properly. - Implement support for .crash and .reboot. Does not seem to work currently because of weird issues. - Implement KdpDprintf to send strings directly to the debugger from inside of KD64. Use it in KdEnterDebugger instead of DbgPrint so we won't try to enter the debugger recursively. - Implement KdUpdateDataBlock to set the KeUserCallbackDispatcher pointer in the debugger block after its address is retrieved from ntdll. - Don't assume breakpoints are 1 byte long in portable code -- use KD_BREAKPOINT_SIZE and define it per architecture. - KdpStub: KdEnableDebugger returns NTSTATUS, not TRUE/FALSE. Other - wdbgexts.h: Properly define CURRENT_KD_SECONDARY_VERSION for AMD64. - Make PsNtosImageBase pointer-sized as it should be. - Change the definition of KDSTATUS so it is guaranteed to be 32-bit. - Fix a critical bug in KiRestoreProcessorControlState: it didn't clear the busy flag in the TSS before reloading the task register, resulting in a GPF if we tried to reload the same register. - Add macros for getting and setting special purpose registers (the Program Counter and the "return register") in portable code instead of using #ifdef every time. Do likewise for setting IMAGE_FILE_MACHINE_XXX, using a new IMAGE_FILE_MACHINE_ARCHITECTURE macro. - Don't refer to the Program Counter as "Eip" in portable code. - Define DBG_STATUS_CONTROL_C for assembly code and use it in KeUpdateSystemTime. Modified: trunk/reactos/include/ndk/asm.h trunk/reactos/include/psdk/wdbgexts.h trunk/reactos/include/reactos/kddll.h trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/arm/ke.h trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/include/internal/kd64.h trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h trunk/reactos/ntoskrnl/include/internal/ps.h trunk/reactos/ntoskrnl/kd/kdmain.c trunk/reactos/ntoskrnl/kd64/kdapi.c trunk/reactos/ntoskrnl/kd64/kddata.c trunk/reactos/ntoskrnl/kd64/kdinit.c trunk/reactos/ntoskrnl/kd64/kdprint.c trunk/reactos/ntoskrnl/kd64/kdtrap.c trunk/reactos/ntoskrnl/ke/bug.c trunk/reactos/ntoskrnl/ke/i386/cpu.c trunk/reactos/ntoskrnl/ke/i386/systimer.S trunk/reactos/ntoskrnl/ke/profobj.c trunk/reactos/ntoskrnl/mm/sysldr.c trunk/reactos/ntoskrnl/ps/psmgr.c trunk/reactos/ntoskrnl/ps/thread.c trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=4328… ============================================================================== --- trunk/reactos/include/ndk/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/asm.h [iso-8859-1] Sun Oct 4 18:53:15 2009 @@ -523,7 +523,7 @@ #define CBSTACK_RESULT_LENGTH 0x24 // -// NTSTATUS and Bugcheck Codes +// NTSTATUS, Bugcheck Codes and Debug Codes // #ifdef __ASM__ #define STATUS_ACCESS_VIOLATION 0xC0000005 @@ -560,6 +560,7 @@ #define UNEXPECTED_KERNEL_MODE_TRAP 0x7F #define ATTEMPTED_SWITCH_FROM_DPC 0xB8 #define HARDWARE_INTERRUPT_STORM 0xF2 +#define DBG_STATUS_CONTROL_C 0x01 // // IRQL Levels Modified: trunk/reactos/include/psdk/wdbgexts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wdbgexts.h?re… ============================================================================== --- trunk/reactos/include/psdk/wdbgexts.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wdbgexts.h [iso-8859-1] Sun Oct 4 18:53:15 2009 @@ -11,7 +11,12 @@ #define KD_SECONDARY_VERSION_AMD64_OBSOLETE_CONTEXT_1 0 #define KD_SECONDARY_VERSION_AMD64_OBSOLETE_CONTEXT_2 1 #define KD_SECONDARY_VERSION_AMD64_CONTEXT 2 + +#if defined(_AMD64_) +#define CURRENT_KD_SECONDARY_VERSION KD_SECONDARY_VERSION_AMD64_CONTEXT +#else #define CURRENT_KD_SECONDARY_VERSION KD_SECONDARY_VERSION_DEFAULT +#endif #define DBGKD_VERS_FLAG_MP 0x0001 #define DBGKD_VERS_FLAG_DATA 0x0002 @@ -159,7 +164,7 @@ USHORT FramePointer; USHORT PaeEnabled:1; GCC_ULONG64 KiCallUserMode; - GCC_ULONG64 KeUserCallbackDispatcher; + ULONG64 KeUserCallbackDispatcher; GCC_ULONG64 PsLoadedModuleList; GCC_ULONG64 PsActiveProcessHead; GCC_ULONG64 PspCidTable; Modified: trunk/reactos/include/reactos/kddll.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/kddll.h?re… ============================================================================== --- trunk/reactos/include/reactos/kddll.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/kddll.h [iso-8859-1] Sun Oct 4 18:53:15 2009 @@ -1,12 +1,10 @@ #ifndef _KDDLL_ #define _KDDLL_ -typedef enum _KDSTATUS -{ - KdPacketReceived = 0, - KdPacketTimedOut, - KdPacketNeedsResend -} KDSTATUS; +typedef ULONG KDSTATUS; +#define KdPacketReceived 0 +#define KdPacketTimedOut 1 +#define KdPacketNeedsResend 2 NTSTATUS NTAPI Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=432… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sun Oct 4 18:53:15 2009 @@ -1226,21 +1226,8 @@ SharedUserData->NtMinorVersion = NtMinorVersion; /* Set the machine type */ -#if defined(_X86_) - SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_I386; - SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_I386; -#elif defined(_PPC_) // <3 Arty - SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_POWERPC; - SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_POWERPC; -#elif defined(_MIPS_) - SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_R4000; - SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_R4000; -#elif defined(_ARM_) - SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_ARM; - SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_ARM; -#else -#error "Unsupported ReactOS Target" -#endif + SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_ARCHITECTURE; + SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_ARCHITECTURE; } VOID Modified: trunk/reactos/ntoskrnl/include/internal/arm/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/arm/ke.h [iso-8859-1] Sun Oct 4 18:53:15 2009 @@ -6,6 +6,31 @@ // #define PCR_ENTRY 0 #define PDR_ENTRY 2 + +#define IMAGE_FILE_MACHINE_ARCHITECTURE IMAGE_FILE_MACHINE_ARM + +// +// BKPT is 4 bytes long +// +#define KD_BREAKPOINT_SIZE 4 + +// +// Macros for getting and setting special purpose registers in portable code +// +#define KeGetContextPc(Context) \ + ((Context)->Pc) + +#define KeSetContextPc(Context, ProgramCounter) \ + ((Context)->Pc = (ProgramCounter)) + +#define KeGetTrapFramePc(TrapFrame) \ + ((TrapFrame)->Pc) + +#define KeGetContextReturnRegister(Context) \ + ((Context)->R0) + +#define KeSetContextReturnRegister(Context, ReturnValue) \ + ((Context)->R0 = (ReturnValue)) VOID KiPassiveRelease( Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Sun Oct 4 18:53:15 2009 @@ -7,6 +7,31 @@ #include "v86m.h" extern ULONG Ke386CacheAlignment; + +#define IMAGE_FILE_MACHINE_ARCHITECTURE IMAGE_FILE_MACHINE_I386 + +// +// INT3 is 1 byte long +// +#define KD_BREAKPOINT_SIZE 1 + +// +// Macros for getting and setting special purpose registers in portable code +// +#define KeGetContextPc(Context) \ + ((Context)->Eip) + +#define KeSetContextPc(Context, ProgramCounter) \ + ((Context)->Eip = (ProgramCounter)) + +#define KeGetTrapFramePc(TrapFrame) \ + ((TrapFrame)->Eip) + +#define KeGetContextReturnRegister(Context) \ + ((Context)->Eax) + +#define KeSetContextReturnRegister(Context, ReturnValue) \ + ((Context)->Eax = (ReturnValue)) VOID FASTCALL Modified: trunk/reactos/ntoskrnl/include/internal/kd64.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] Sun Oct 4 18:53:15 2009 @@ -60,20 +60,15 @@ PLOADER_PARAMETER_BLOCK LoaderBlock ); -// -// Debug and Multi-Processor Switch Routines -// -BOOLEAN -NTAPI -KdpEnterDebuggerException( - IN PKTRAP_FRAME TrapFrame, - IN PKEXCEPTION_FRAME ExceptionFrame, - IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context, - IN KPROCESSOR_MODE PreviousMode, - IN BOOLEAN SecondChance -); - +VOID +NTAPI +KdUpdateDataBlock( + VOID +); + +// +// Multi-Processor Switch Support +// BOOLEAN NTAPI KdpSwitchProcessor( @@ -171,25 +166,48 @@ // // Debug Event Handlers // -ULONG +NTSTATUS NTAPI KdpPrint( IN ULONG ComponentId, IN ULONG ComponentMask, IN LPSTR String, - IN ULONG Length, + IN USHORT Length, IN KPROCESSOR_MODE PreviousMode, IN PKTRAP_FRAME TrapFrame, IN PKEXCEPTION_FRAME ExceptionFrame, OUT PBOOLEAN Status ); -ULONG +BOOLEAN +NTAPI +KdpPrompt( + IN LPSTR InString, + IN USHORT InStringLength, + OUT LPSTR OutString, + IN USHORT OutStringLength, + IN KPROCESSOR_MODE PreviousMode, + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame +); + +VOID NTAPI KdpSymbol( IN PSTRING DllPath, IN PKD_SYMBOLS_INFO DllBase, IN BOOLEAN Unload, + IN KPROCESSOR_MODE PreviousMode, + IN PCONTEXT ContextRecord, + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame +); + +VOID +NTAPI +KdpCommandString( + IN ULONG Length, + IN LPSTR String, IN KPROCESSOR_MODE PreviousMode, IN PCONTEXT ContextRecord, IN PKTRAP_FRAME TrapFrame, @@ -242,6 +260,16 @@ NTAPI KdpAddBreakpoint( IN PVOID Address +); + +// +// Internal routine for sending strings directly to the debugger +// +VOID +__cdecl +KdpDprintf( + IN PCHAR Format, + ... ); // Modified: trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/powerpc/ke.h [iso-8859-1] Sun Oct 4 18:53:15 2009 @@ -35,6 +35,26 @@ extern ULONG KePPCCacheAlignment; +#define IMAGE_FILE_MACHINE_ARCHITECTURE IMAGE_FILE_MACHINE_POWERPC + +// +// Macros for getting and setting special purpose registers in portable code +// +#define KeGetContextPc(Context) \ + ((Context)->Dr0) + +#define KeSetContextPc(Context, ProgramCounter) \ + ((Context)->Dr0 = (ProgramCounter)) + +#define KeGetTrapFramePc(TrapFrame) \ + ((TrapFrame)->Dr0) + +#define KeGetContextReturnRegister(Context) \ + ((Context)->Gpr3) + +#define KeSetContextReturnRegister(Context, ReturnValue) \ + ((Context)->Gpr3 = (ReturnValue)) + #define KePPCRdmsr(msr,val1,val2) __asm__ __volatile__("mfmsr 3") #define KePPCWrmsr(msr,val1,val2) __asm__ __volatile__("mtmsr 3") Modified: trunk/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ps.h [iso-8859-1] Sun Oct 4 18:53:15 2009 @@ -423,7 +423,7 @@ extern LARGE_INTEGER ShortPsLockDelay; extern UNICODE_STRING PsNtDllPathName; extern LIST_ENTRY PsLoadedModuleList; -extern ULONG PsNtosImageBase; +extern ULONG_PTR PsNtosImageBase; // // Inlined Functions Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Sun Oct 4 18:53:15 2009 @@ -106,9 +106,6 @@ { KD_CONTINUE_TYPE Return = kdHandleException; ULONG ExceptionCommand = ExceptionRecord->ExceptionInformation[0]; -#ifdef _M_IX86 - ULONG EipOld; -#endif /* Check if this was a breakpoint due to DbgPrint or Load/UnloadSymbols */ if ((ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) && @@ -125,13 +122,9 @@ KdpServiceDispatcher(BREAKPOINT_PRINT, (PVOID)ExceptionRecord->ExceptionInformation[1], ExceptionRecord->ExceptionInformation[2]); -#ifdef _M_IX86 - Context->Eax = STATUS_SUCCESS; -#elif _M_ARM - Context->R0 = STATUS_SUCCESS; -#else -#error Please be portable when modifying code -#endif + + /* Return success */ + KeSetContextReturnRegister(Context, STATUS_SUCCESS); } else if (ExceptionCommand == BREAKPOINT_LOAD_SYMBOLS) { @@ -144,22 +137,13 @@ #endif } - /* This we can handle: simply bump EIP */ -#ifdef _M_IX86 - Context->Eip++; -#elif _M_ARM - Context->Pc += sizeof(ULONG); -#endif + /* This we can handle: simply bump the Program Counter */ + KeSetContextPc(Context, KeGetContextPc(Context) + KD_BREAKPOINT_SIZE); return TRUE; } /* Get out of here if the Debugger isn't connected */ if (KdDebuggerNotPresent) return FALSE; - - /* Save old EIP value */ -#ifdef _M_IX86 - EipOld = Context->Eip; -#endif #ifdef KDBG /* Call KDBG if available */ @@ -177,12 +161,6 @@ TrapFrame); } #endif /* not KDBG */ - - /* Bump EIP over int 3 if debugger did not already change it */ - if (ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) - { - //DPRINT1("Address: %p. Return: %d\n", EipOld, Return); - } /* Debugger didn't handle it, please handle! */ if (Return == kdHandleException) return FALSE; Modified: trunk/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdapi.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Sun Oct 4 18:53:15 2009 @@ -172,8 +172,8 @@ WaitStateChange->ProcessorLevel = KeProcessorLevel; WaitStateChange->Processor = (USHORT)KeGetCurrentPrcb()->Number; WaitStateChange->NumberProcessors = (ULONG)KeNumberProcessors; - WaitStateChange->Thread = (ULONG)(LONG_PTR)KeGetCurrentThread(); - WaitStateChange->ProgramCounter = (ULONG)(LONG_PTR)Context->Eip; + WaitStateChange->Thread = (ULONG64)(LONG_PTR)KeGetCurrentThread(); + WaitStateChange->ProgramCounter = (ULONG64)(LONG_PTR)KeGetContextPc(Context); /* Zero out the Control Report */ RtlZeroMemory(&WaitStateChange->ControlReport, @@ -189,7 +189,7 @@ /* Clear all the breakpoints in this region */ HadBreakpoints = KdpDeleteBreakpointRange((PVOID)(LONG_PTR)WaitStateChange->ProgramCounter, - (PVOID)((ULONG)WaitStateChange->ProgramCounter + + (PVOID)((ULONG_PTR)WaitStateChange->ProgramCounter + WaitStateChange->ControlReport.InstructionCount - 1)); if (HadBreakpoints) { @@ -555,6 +555,14 @@ &Header, Data, &KdpContext); +} + +VOID +NTAPI +KdpCauseBugCheck(IN PDBGKD_MANIPULATE_STATE64 State) +{ + /* Crash with the special code */ + KeBugCheck(MANUALLY_INITIATED_CRASH); } KCONTINUE_STATUS @@ -636,7 +644,7 @@ case DbgKdRestoreBreakPointApi: - /* FIXME: TODO */ + /* Restore the breakpoint */ KdpRestoreBreakpoint(&ManipulateState, &Data, Context); break; @@ -653,7 +661,7 @@ case DbgKdWriteControlSpaceApi: - /* FIXME: TODO */ + /* Write control space */ KdpWriteControlSpace(&ManipulateState, &Data, Context); break; @@ -673,9 +681,8 @@ case DbgKdRebootApi: - /* FIXME: TODO */ - Ke386SetCr2(DbgKdRebootApi); - while (TRUE); + /* Reboot the system */ + HalReturnToFirmware(HalRebootRoutine); break; case DbgKdContinueApi2: @@ -780,9 +787,8 @@ case DbgKdCauseBugCheckApi: - /* FIXME: TODO */ - Ke386SetCr2(DbgKdCauseBugCheckApi); - while (TRUE); + /* Crash the system */ + KdpCauseBugCheck(&ManipulateState); break; case DbgKdSwitchProcessor: @@ -956,7 +962,7 @@ &Header, ExtraData, Context); - } while(Status == ContinueProcessorReselected); + } while (Status == ContinueProcessorReselected); /* Return status */ return Status; @@ -998,7 +1004,7 @@ &Header, &Data, Context); - } while (Status == KdPacketNeedsResend); + } while (Status == ContinueProcessorReselected); /* Return */ return Status; @@ -1126,18 +1132,18 @@ if (KiFreezeFlag & 1) { /* Print out errror */ - DbgPrint("FreezeLock was jammed! Backup SpinLock was used!\n"); + KdpDprintf("FreezeLock was jammed! Backup SpinLock was used!\n"); } /* Check processor state */ if (KiFreezeFlag & 2) { /* Print out errror */ - DbgPrint("Some processors not frozen in debugger!\n"); + KdpDprintf("Some processors not frozen in debugger!\n"); } /* Make sure we acquired the port */ - if (!KdpPortLocked) DbgPrint("Port lock was not acquired!\n"); + if (!KdpPortLocked) KdpDprintf("Port lock was not acquired!\n"); /* Return enter state */ return Entered; Modified: trunk/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kddata.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] Sun Oct 4 18:53:15 2009 @@ -48,7 +48,11 @@ // Breakpoint Data // BREAKPOINT_ENTRY KdpBreakpointTable[20]; -ULONG KdpBreakpointInstruction = 0xCC; +#if defined(_M_IX86) || defined(_M_AMD64) +ULONG KdpBreakpointInstruction = 0xCC; // INT3 +#else +#error TODO +#endif BOOLEAN KdpOweBreakpoint; BOOLEAN BreakpointsSuspended; ULONG KdpNumInternalBreakpoints; @@ -326,15 +330,7 @@ DBGKD_64BIT_PROTOCOL_VERSION2, KD_SECONDARY_VERSION_DEFAULT, DBGKD_VERS_FLAG_DATA, -#if defined(_M_IX86) - IMAGE_FILE_MACHINE_I386, -#elif defined(_M_PPC) - IMAGE_FILE_MACHINE_POWERPC, -#elif defined(_M_MIPS) - IMAGE_FILE_MACHINE_R4000, -#else -#error Unknown platform -#endif + IMAGE_FILE_MACHINE_ARCHITECTURE, PACKET_TYPE_MAX, 0, 0, @@ -353,9 +349,9 @@ FIELD_OFFSET(KTHREAD, CallbackStack), CBSTACK_CALLBACK_STACK, CBSTACK_EBP, - 0, + FALSE, {PtrToUlong(KiCallUserMode)}, - {0}, + 0, {PtrToUlong(&PsLoadedModuleList)}, {PtrToUlong(&PsActiveProcessHead)}, {PtrToUlong(&PspCidTable)}, Modified: trunk/reactos/ntoskrnl/kd64/kdinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdinit.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] Sun Oct 4 18:53:15 2009 @@ -13,6 +13,15 @@ #include <debug.h> /* FUNCTIONS *****************************************************************/ + +VOID +NTAPI +KdUpdateDataBlock(VOID) +{ + /* Update the KeUserCallbackDispatcher pointer */ + KdDebuggerDataBlock.KeUserCallbackDispatcher = + (ULONG64)(LONG_PTR)KeUserCallbackDispatcher; +} BOOLEAN NTAPI @@ -133,7 +142,7 @@ InLoadOrderLinks); /* Save the Kernel Base */ - PsNtosImageBase = (ULONG)LdrEntry->DllBase; + PsNtosImageBase = (ULONG_PTR)LdrEntry->DllBase; KdVersionBlock.KernBase = (ULONGLONG)(LONG_PTR)LdrEntry->DllBase; /* Check if we have a command line */ Modified: trunk/reactos/ntoskrnl/kd64/kdprint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdprint.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdprint.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdprint.c [iso-8859-1] Sun Oct 4 18:53:15 2009 @@ -20,7 +20,7 @@ { STRING Data, Header; DBGKD_DEBUG_IO DebugIo; - ULONG Length = Output->Length; + USHORT Length = Output->Length; /* Copy the string */ RtlMoveMemory(KdpMessageBuffer, Output->Buffer, Length); @@ -51,7 +51,7 @@ return KdpPollBreakInWithPortLock(); } -ULONG +VOID NTAPI KdpCommandString(IN ULONG Length, IN LPSTR String, @@ -61,10 +61,10 @@ IN PKEXCEPTION_FRAME ExceptionFrame) { /* FIXME */ - return FALSE; -} - -ULONG + while (TRUE); +} + +VOID NTAPI KdpSymbol(IN PSTRING DllPath, IN PKD_SYMBOLS_INFO DllBase, @@ -79,7 +79,7 @@ ULONG Status; /* Check if we need to do anything */ - if ((PreviousMode != KernelMode) || (KdDebuggerNotPresent)) return 0; + if ((PreviousMode != KernelMode) || (KdDebuggerNotPresent)) return; /* Enter the debugger */ Entered = KdEnterDebugger(TrapFrame, ExceptionFrame); @@ -101,39 +101,39 @@ RtlCopyMemory(ContextRecord, &Prcb->ProcessorState.ContextFrame, sizeof(CONTEXT)); - //KiRestoreProcessorControlState(&Prcb->ProcessorState); + KiRestoreProcessorControlState(&Prcb->ProcessorState); /* Exit the debugger and clear the CTRL-C state */ KdExitDebugger(Entered); - return 0; -} - -ULONG +} + +BOOLEAN NTAPI KdpPrompt(IN LPSTR InString, - IN ULONG InStringLength, + IN USHORT InStringLength, OUT LPSTR OutString, - IN ULONG OutStringLength, + IN USHORT OutStringLength, IN KPROCESSOR_MODE PreviousMode, IN PKTRAP_FRAME TrapFrame, IN PKEXCEPTION_FRAME ExceptionFrame) { /* FIXME */ + while (TRUE); return FALSE; } -ULONG +NTSTATUS NTAPI KdpPrint(IN ULONG ComponentId, IN ULONG ComponentMask, IN LPSTR String, - IN ULONG Length, + IN USHORT Length, IN KPROCESSOR_MODE PreviousMode, IN PKTRAP_FRAME TrapFrame, IN PKEXCEPTION_FRAME ExceptionFrame, OUT PBOOLEAN Status) { - NTSTATUS ReturnValue; + NTSTATUS ReturnStatus; BOOLEAN Entered; ANSI_STRING AnsiString; @@ -141,7 +141,7 @@ *Status = FALSE; /* Validate the mask */ - if (ComponentMask <= 0x1F) ComponentMask = 1 << ComponentMask; + if (ComponentMask < 0x20) ComponentMask = 1 << ComponentMask; if (!(Kd_WIN2000_Mask & ComponentMask) || ((ComponentId < KdComponentTableSize) && !(*KdComponentTable[ComponentId] & ComponentMask))) @@ -162,7 +162,7 @@ /* Setup the ANSI string */ AnsiString.Buffer = String; - AnsiString.Length = (USHORT)Length; + AnsiString.Length = Length; /* Log the print */ //KdLogDbgPrint(&AnsiString); @@ -172,7 +172,7 @@ { /* Fail */ *Status = TRUE; - return (ULONG)STATUS_DEVICE_NOT_CONNECTED; + return STATUS_DEVICE_NOT_CONNECTED; } /* Enter the debugger */ @@ -182,17 +182,42 @@ if (KdpPrintString(&AnsiString)) { /* User pressed CTRL-C, breakpoint on return */ - ReturnValue = STATUS_BREAKPOINT; + ReturnStatus = STATUS_BREAKPOINT; } else { /* String was printed */ - ReturnValue = STATUS_SUCCESS; + ReturnStatus = STATUS_SUCCESS; } /* Exit the debugger and return */ KdExitDebugger(Entered); *Status = TRUE; - return ReturnValue; -} - + return ReturnStatus; +} + +VOID +__cdecl +KdpDprintf(IN PCHAR Format, + ...) +{ + STRING String; + CHAR Buffer[100]; + USHORT Length; + va_list ap; + + /* Format the string */ + va_start(ap, Format); + Length = (USHORT)_vsnprintf(Buffer, + sizeof(Buffer), + Format, + ap); + + /* Set it up */ + String.Buffer = Buffer; + String.Length = Length + 1; + + /* Send it to the debugger directly */ + KdpPrintString(&String); + va_end(ap); +} Modified: trunk/reactos/ntoskrnl/kd64/kdtrap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/kdtrap.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/kdtrap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/kdtrap.c [iso-8859-1] Sun Oct 4 18:53:15 2009 @@ -44,7 +44,7 @@ } else if (SecondChanceException) { - /* We won't bother unless this is second chance */ + /* We won't bother unless this is first chance */ return FALSE; } @@ -71,7 +71,7 @@ RtlCopyMemory(ContextRecord, &Prcb->ProcessorState.ContextFrame, sizeof(CONTEXT)); - //KiRestoreProcessorControlState(&Prcb->ProcessorState); + KiRestoreProcessorControlState(&Prcb->ProcessorState); /* Exit the debugger and clear the CTRL-C state */ KdExitDebugger(Entered); @@ -89,7 +89,7 @@ IN BOOLEAN SecondChanceException) { BOOLEAN Unload = FALSE; - ULONG Eip, Eax; + ULONG_PTR ProgramCounter, ReturnValue; BOOLEAN Status = FALSE; /* @@ -99,8 +99,8 @@ if ((ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) && (ExceptionRecord->ExceptionInformation[0] != BREAKPOINT_BREAK)) { - /* Save EIP */ - Eip = ContextRecord->Eip; + /* Save Program Counter */ + ProgramCounter = KeGetContextPc(ContextRecord); /* Check what kind of operation was requested from us */ switch (ExceptionRecord->ExceptionInformation[0]) @@ -109,43 +109,54 @@ case BREAKPOINT_PRINT: /* Call the worker routine */ - Eax = KdpPrint(ContextRecord->Ebx, - ContextRecord->Edi, - (LPSTR)ExceptionRecord->ExceptionInformation[1], - (ULONG)ExceptionRecord->ExceptionInformation[2], - PreviousMode, - TrapFrame, - ExceptionFrame, - &Status); + ReturnValue = KdpPrint((ULONG)ContextRecord->Ebx, + (ULONG)ContextRecord->Edi, + (LPSTR)ExceptionRecord-> + ExceptionInformation[1], + (USHORT)ExceptionRecord-> + ExceptionInformation[2], + PreviousMode, + TrapFrame, + ExceptionFrame, + &Status); /* Update the return value for the caller */ - ContextRecord->Eax = Eax; + KeSetContextReturnRegister(ContextRecord, ReturnValue); break; /* DbgPrompt */ case BREAKPOINT_PROMPT: /* Call the worker routine */ - while (TRUE); - Eax = 0; + ReturnValue = KdpPrompt((LPSTR)ExceptionRecord-> + ExceptionInformation[1], + (USHORT)ExceptionRecord-> + ExceptionInformation[2], + (LPSTR)ContextRecord->Ebx, + (USHORT)ContextRecord->Edi, + PreviousMode, + TrapFrame, + ExceptionFrame); Status = TRUE; /* Update the return value for the caller */ - ContextRecord->Eax = Eax; - break; - - /* DbgUnloadSymbols */ + KeSetContextReturnRegister(ContextRecord, ReturnValue); + break; + + /* DbgUnloadImageSymbols */ case BREAKPOINT_UNLOAD_SYMBOLS: /* Drop into the load case below, with the unload parameter */ Unload = TRUE; - /* DbgLoadSymbols */ + /* DbgLoadImageSymbols */ case BREAKPOINT_LOAD_SYMBOLS: /* Call the worker routine */ - KdpSymbol((PVOID)ExceptionRecord->ExceptionInformation[1], - (PVOID)ExceptionRecord->ExceptionInformation[2], + KdpSymbol((PSTRING)ExceptionRecord-> + ExceptionInformation[1], + (PKD_SYMBOLS_INFO)ExceptionRecord-> + ExceptionInformation[2], Unload, PreviousMode, ContextRecord, @@ -154,11 +165,18 @@ Status = TRUE; break; - /* DbgCommandString*/ + /* DbgCommandString */ case BREAKPOINT_COMMAND_STRING: /* Call the worker routine */ - while (TRUE); + KdpCommandString((ULONG)ExceptionRecord-> + ExceptionInformation[1], + (LPSTR)ExceptionRecord-> + ExceptionInformation[2], + PreviousMode, + ContextRecord, + TrapFrame, + ExceptionFrame); Status = TRUE; /* Anything else, do nothing */ @@ -169,10 +187,15 @@ } /* - * If EIP was not updated, we'll increment it ourselves so execution + * If the PC was not updated, we'll increment it ourselves so execution * continues past the breakpoint. */ - if (ContextRecord->Eip == Eip) ContextRecord->Eip++; + if (ProgramCounter == KeGetContextPc(ContextRecord)) + { + /* Update it */ + KeSetContextPc(ContextRecord, + ProgramCounter + KD_BREAKPOINT_SIZE); + } } else { @@ -208,8 +231,9 @@ (ExceptionCommand == BREAKPOINT_COMMAND_STRING) || (ExceptionCommand == BREAKPOINT_PRINT))) { - /* This we can handle: simply bump EIP */ - ContextRecord->Eip++; + /* This we can handle: simply bump the Program Counter */ + KeSetContextPc(ContextRecord, + KeGetContextPc(ContextRecord) + KD_BREAKPOINT_SIZE); return TRUE; } else if (KdPitchDebugger) @@ -220,7 +244,7 @@ else if ((KdAutoEnableOnEvent) && (KdPreviouslyEnabled) && !(KdDebuggerEnabled) && - (KdEnableDebugger()) && + (NT_SUCCESS(KdEnableDebugger())) && (KdDebuggerEnabled)) { /* Debugging was Auto-Enabled. We can now send this to KD. */ Modified: trunk/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/bug.c?rev=4328… ============================================================================== --- trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/bug.c [iso-8859-1] Sun Oct 4 18:53:15 2009 @@ -37,13 +37,13 @@ PVOID NTAPI -KiPcToFileHeader(IN PVOID Eip, +KiPcToFileHeader(IN PVOID Pc, OUT PLDR_DATA_TABLE_ENTRY *LdrEntry, IN BOOLEAN DriversOnly, OUT PBOOLEAN InKernel) { ULONG i = 0; - PVOID ImageBase, EipBase = NULL; + PVOID ImageBase, PcBase = NULL; PLDR_DATA_TABLE_ENTRY Entry; PLIST_ENTRY ListHead, NextEntry; @@ -82,12 +82,12 @@ ImageBase = Entry->DllBase; /* Check if this is the right one */ - if (((ULONG_PTR)Eip >= (ULONG_PTR)Entry->DllBase) && - ((ULONG_PTR)Eip < ((ULONG_PTR)Entry->DllBase + Entry->SizeOfImage))) + if (((ULONG_PTR)Pc >= (ULONG_PTR)Entry->DllBase) && + ((ULONG_PTR)Pc < ((ULONG_PTR)Entry->DllBase + Entry->SizeOfImage))) { /* Return this entry */ *LdrEntry = Entry; - EipBase = ImageBase; + PcBase = ImageBase; /* Check if this was a kernel or HAL entry */ if (i <= 2) *InKernel = TRUE; @@ -97,7 +97,7 @@ } /* Return the base address */ - return EipBase; + return PcBase; } BOOLEAN @@ -138,10 +138,10 @@ PVOID NTAPI -KiRosPcToUserFileHeader(IN PVOID Eip, +KiRosPcToUserFileHeader(IN PVOID Pc, OUT PLDR_DATA_TABLE_ENTRY *LdrEntry) { - PVOID ImageBase, EipBase = NULL; + PVOID ImageBase, PcBase = NULL; PLDR_DATA_TABLE_ENTRY Entry; PLIST_ENTRY ListHead, NextEntry; @@ -170,19 +170,19 @@ ImageBase = Entry->DllBase; /* Check if this is the right one */ - if (((ULONG_PTR)Eip >= (ULONG_PTR)Entry->DllBase) && - ((ULONG_PTR)Eip < ((ULONG_PTR)Entry->DllBase + Entry->SizeOfImage))) + if (((ULONG_PTR)Pc >= (ULONG_PTR)Entry->DllBase) && + ((ULONG_PTR)Pc < ((ULONG_PTR)Entry->DllBase + Entry->SizeOfImage))) { /* Return this entry */ *LdrEntry = Entry; - EipBase = ImageBase; + PcBase = ImageBase; break; } } } /* Return the base address */ - return EipBase; + return PcBase; } USHORT @@ -770,7 +770,7 @@ CHAR AnsiName[128]; BOOLEAN IsSystem, IsHardError = FALSE, Reboot = FALSE; PCHAR HardErrCaption = NULL, HardErrMessage = NULL; - PVOID Eip = NULL, Memory; + PVOID Pc = NULL, Memory; PVOID DriverBase; PLDR_DATA_TABLE_ENTRY LdrEntry; PULONG_PTR HardErrorParameters; @@ -880,16 +880,12 @@ if (BugCheckParameter3) TrapFrame = (PVOID)BugCheckParameter3; } - /* Check if we got one now and if we need to get EIP */ + /* Check if we got one now and if we need to get the Program Counter */ if ((TrapFrame) && (BugCheckCode != KERNEL_MODE_EXCEPTION_NOT_HANDLED)) { -#ifdef _M_IX86 - /* Get EIP */ - Eip = (PVOID)TrapFrame->Eip; -#elif defined(_M_PPC) - Eip = (PVOID)TrapFrame->Dr0; /* srr0 */ -#endif + /* Get the Program Counter */ + Pc = (PVOID)KeGetTrapFramePc(TrapFrame); } break; @@ -903,11 +899,14 @@ * and provide a more detailed analysis. For now, we don't. */ - /* Eip is in parameter 4 */ - Eip = (PVOID)BugCheckParameter4; + /* Program Counter is in parameter 4 */ + Pc = (PVOID)BugCheckParameter4; /* Get the driver base */ - DriverBase = KiPcToFileHeader(Eip, &LdrEntry, FALSE, &IsSystem); + DriverBase = KiPcToFileHeader(Pc, + &LdrEntry, + FALSE, + &IsSystem); if (IsSystem) { /* @@ -947,8 +946,8 @@ KiBugCheckData[0] = DRIVER_IRQL_NOT_LESS_OR_EQUAL; } - /* Clear EIP so we don't look it up later */ - Eip = NULL; + /* Clear Pc so we don't look it up later */ + Pc = NULL; break; /* Hard error */ @@ -984,17 +983,12 @@ /* Check if we have a frame now */ if (TrapFrame) { -#ifdef _M_IX86 - /* Get EIP */ - Eip = (PVOID)TrapFrame->Eip; - KiBugCheckData[3] = (ULONG)Eip; -#elif defined(_M_PPC) - Eip = (PVOID)TrapFrame->Dr0; /* srr0 */ - KiBugCheckData[3] = (ULONG)Eip; -#endif + /* Get the Program Counter */ + Pc = (PVOID)KeGetTrapFramePc(TrapFrame); + KiBugCheckData[3] = (ULONG_PTR)Pc; /* Find out if was in the kernel or drivers */ - DriverBase = KiPcToFileHeader(Eip, + DriverBase = KiPcToFileHeader(Pc, &LdrEntry, FALSE, &IsSystem); @@ -1024,8 +1018,8 @@ /* Check if the driver forgot to unlock pages */ case DRIVER_LEFT_LOCKED_PAGES_IN_PROCESS: - /* EIP is in parameter 1 */ - Eip = (PVOID)BugCheckParameter1; + /* Program Counter is in parameter 1 */ + Pc = (PVOID)BugCheckParameter1; break; /* Check if the driver consumed too many PTEs */ @@ -1056,12 +1050,12 @@ } else { - /* Do we have an EIP? */ - if (Eip) + /* Do we have a Program Counter? */ + if (Pc) { /* Dump image name */ KiDumpParameterImages(AnsiName, - (PULONG_PTR)&Eip, + (PULONG_PTR)&Pc, 1, KeBugCheckUnicodeToAnsi); } 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] Sun Oct 4 18:53:15 2009 @@ -279,7 +279,7 @@ /* Intel CPUs */ case CPU_INTEL: - /* Check if it's a P6 or higher */ + /* Check if it's a P6 */ if (Prcb->CpuType == 6) { /* Perform the special sequence to get the MicroCode Signature */ @@ -737,7 +737,11 @@ NTAPI KiRestoreProcessorControlState(PKPROCESSOR_STATE ProcessorState) { - /* Restore the CR registers */ + PKGDTENTRY TssEntry; + + // + // Restore the CR registers + // __writecr0(ProcessorState->SpecialRegisters.Cr0); Ke386SetCr2(ProcessorState->SpecialRegisters.Cr2); __writecr3(ProcessorState->SpecialRegisters.Cr3); @@ -754,10 +758,21 @@ __writedr(7, ProcessorState->SpecialRegisters.KernelDr7); // - // Restore GDT, IDT, LDT and TSS + // Restore GDT and IDT // Ke386SetGlobalDescriptorTable(&ProcessorState->SpecialRegisters.Gdtr.Limit); __lidt(&ProcessorState->SpecialRegisters.Idtr.Limit); + + // + // Clear the busy flag so we don't crash if we reload the same selector + // + TssEntry = (PKGDTENTRY)(ProcessorState->SpecialRegisters.Gdtr.Base + + ProcessorState->SpecialRegisters.Tr); + TssEntry->HighWord.Bytes.Flags1 &= ~0x2; + + // + // Restore TSS and LDT + // Ke386SetTr(ProcessorState->SpecialRegisters.Tr); Ke386SetLocalDescriptorTable(ProcessorState->SpecialRegisters.Ldtr); } Modified: trunk/reactos/ntoskrnl/ke/i386/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/systimer.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/systimer.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/systimer.S [iso-8859-1] Sun Oct 4 18:53:15 2009 @@ -276,7 +276,7 @@ /* Put tick count back in EBX */ mov ebx, eax - /* Copyit in ECX and get hich count */ + /* Copy it in ECX and get high count */ mov ecx, eax mov edx, _KeTickCount + 4 @@ -372,7 +372,7 @@ jz NoDebug /* Break-in requested! */ - push 1 + push DBG_STATUS_CONTROL_C call _DbgBreakPointWithStatus@4 jmp NoDebug Modified: trunk/reactos/ntoskrnl/ke/profobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/profobj.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/profobj.c [iso-8859-1] Sun Oct 4 18:53:15 2009 @@ -256,6 +256,10 @@ PULONG BucketValue; PKPROFILE Profile; PLIST_ENTRY NextEntry; + ULONG_PTR ProgramCounter; + + /* Get the Program Counter */ + ProgramCounter = KeGetTrapFramePc(TrapFrame); /* Loop the List */ for (NextEntry = ListHead->Flink; @@ -266,21 +270,17 @@ Profile = CONTAINING_RECORD(NextEntry, KPROFILE, ProfileListEntry); /* Check if the source is good, and if it's within the range */ -#ifdef _M_IX86 if ((Profile->Source != Source) || - (TrapFrame->Eip < (ULONG_PTR)Profile->RangeBase) || - (TrapFrame->Eip > (ULONG_PTR)Profile->RangeLimit)) + (ProgramCounter < (ULONG_PTR)Profile->RangeBase) || + (ProgramCounter > (ULONG_PTR)Profile->RangeLimit)) { continue; } - /* Get the Pointer to the Bucket Value representing this EIP */ + /* Get the Pointer to the Bucket Value representing this Program Counter */ BucketValue = (PULONG)((((ULONG_PTR)Profile->Buffer + - (TrapFrame->Eip - (ULONG_PTR)Profile->RangeBase)) + (ProgramCounter - (ULONG_PTR)Profile->RangeBase)) >> Profile->BucketShift) &~ 0x3); -#elif defined(_M_PPC) - // XXX arty -#endif /* Increment the value */ ++BucketValue; Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] Sun Oct 4 18:53:15 2009 @@ -29,7 +29,7 @@ LIST_ENTRY PsLoadedModuleList; KSPIN_LOCK PsLoadedModuleSpinLock; -ULONG PsNtosImageBase; +ULONG_PTR PsNtosImageBase; KMUTANT MmSystemLoadLock; extern ULONG NtGlobalFlag; @@ -1334,7 +1334,7 @@ LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - PsNtosImageBase = (ULONG)LdrEntry->DllBase; + PsNtosImageBase = (ULONG_PTR)LdrEntry->DllBase; /* Loop the loader block */ while (NextEntry != ListHead) Modified: trunk/reactos/ntoskrnl/ps/psmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/psmgr.c?rev=43… ============================================================================== --- trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/psmgr.c [iso-8859-1] Sun Oct 4 18:53:15 2009 @@ -357,6 +357,11 @@ KeBugCheckEx(PROCESS1_INITIALIZATION_FAILED, Status, 8, 0, 0); } +#ifdef _WINKD_ + /* Let KD know we are done */ + KdUpdateDataBlock(); +#endif + /* Return status */ return Status; } Modified: trunk/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/thread.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/thread.c [iso-8859-1] Sun Oct 4 18:53:15 2009 @@ -320,24 +320,8 @@ } /* Set the Start Addresses */ -#if defined(_M_IX86) - Thread->StartAddress = (PVOID)ThreadContext->Eip; - Thread->Win32StartAddress = (PVOID)ThreadContext->Eax; -#elif defined(_M_PPC) - Thread->StartAddress = (PVOID)ThreadContext->Dr0; - Thread->Win32StartAddress = (PVOID)ThreadContext->Gpr3; -#elif defined(_M_MIPS) - Thread->StartAddress = (PVOID)ThreadContext->Psr; - Thread->Win32StartAddress = (PVOID)ThreadContext->IntA0; -#elif defined(_M_ARM) - Thread->StartAddress = (PVOID)ThreadContext->Pc; - Thread->Win32StartAddress = (PVOID)ThreadContext->R0; -#elif defined(_M_AMD64) - Thread->StartAddress = (PVOID)ThreadContext->Rip; - Thread->Win32StartAddress = (PVOID)ThreadContext->Rax; -#else -#error Unknown architecture -#endif + Thread->StartAddress = (PVOID)KeGetContextPc(ThreadContext); + Thread->Win32StartAddress = (PVOID)KeGetContextReturnRegister(ThreadContext); /* Let the kernel intialize the Thread */ Status = KeInitThread(&Thread->Tcb, Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Sun Oct 4 18:53:15 2009 @@ -341,6 +341,8 @@ Stack = TrapFrame->Ebp; #elif defined(_M_PPC) Stack = TrapFrame->Gpr1; +#else +#error Unknown architecture #endif /* Validate them */

1 0

[sginsberg] 43282: - Convert remaining KEBUGCHECK to KeBugCheck. - Add HAL_MEMORY_ALLOCATION bug code and use it.
by sginsberg＠svn.reactos.org 04 Oct '09

04 Oct '09

Author: sginsberg Date: Sun Oct 4 16:48:18 2009 New Revision: 43282 URL: http://svn.reactos.org/svn/reactos?rev=43282&view=rev Log: - Convert remaining KEBUGCHECK to KeBugCheck. - Add HAL_MEMORY_ALLOCATION bug code and use it. Modified: trunk/reactos/hal/halamd64/generic/hal.c trunk/reactos/hal/halppc/generic/bus.c trunk/reactos/hal/halppc/generic/dma.c trunk/reactos/hal/halppc/generic/irql.c trunk/reactos/hal/halppc/generic/pci.c trunk/reactos/hal/halppc/generic/profil.c trunk/reactos/hal/halx86/generic/dma.c trunk/reactos/include/reactos/mc/bugcodes.mc Modified: trunk/reactos/hal/halamd64/generic/hal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halamd64/generic/hal.c… ============================================================================== --- trunk/reactos/hal/halamd64/generic/hal.c [iso-8859-1] (original) +++ trunk/reactos/hal/halamd64/generic/hal.c [iso-8859-1] Sun Oct 4 16:48:18 2009 @@ -120,7 +120,7 @@ NTAPI HalStopProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) { - KEBUGCHECK(0); + KeBugCheck(0); return; } @@ -131,7 +131,7 @@ NTAPI HalStartProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) { - KEBUGCHECK(0); + KeBugCheck(0); return; } @@ -142,7 +142,7 @@ NTAPI HalSetProfileInterval(IN ULONG_PTR Interval) { - KEBUGCHECK(0); + KeBugCheck(0); return Interval; } Modified: trunk/reactos/hal/halppc/generic/bus.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/bus.c?r… ============================================================================== --- trunk/reactos/hal/halppc/generic/bus.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/bus.c [iso-8859-1] Sun Oct 4 16:48:18 2009 @@ -222,7 +222,7 @@ else if (BusDataType == EisaConfiguration) { /* FIXME: TODO */ - KEBUGCHECK(0); + KeBugCheck(0); } else if ((BusDataType == PCIConfiguration) && (HalpPCIConfigInitialized) && Modified: trunk/reactos/hal/halppc/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halppc/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/dma.c [iso-8859-1] Sun Oct 4 16:48:18 2009 @@ -1485,9 +1485,7 @@ * NOTE: On real NT a mechanism with reserved pages is implemented * to handle this case in a slow, but graceful non-fatal way. */ - /* FIXME: The correct bug check code isn't defined. */ - /* KEBUGCHECKEX(HAL_MEMORY_ALLOCATION, PAGE_SIZE, 0, (ULONG_PTR)__FILE__, 0); */ - KEBUGCHECK(0); + KeBugCheckEx(HAL_MEMORY_ALLOCATION, PAGE_SIZE, 0, (ULONG_PTR)__FILE__, 0); } CurrentAddress = (ULONG_PTR)VirtualAddress + Modified: trunk/reactos/hal/halppc/generic/irql.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/irql.c?… ============================================================================== --- trunk/reactos/hal/halppc/generic/irql.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/irql.c [iso-8859-1] Sun Oct 4 16:48:18 2009 @@ -216,7 +216,7 @@ { DbgPrint ("(%s:%d) NewIrql %x CurrentIrql %x\n", __FILE__, __LINE__, NewIrql, KeGetPcr()->Irql); - KEBUGCHECK(0); + KeBugCheck(0); for(;;); } @@ -251,7 +251,7 @@ { DbgPrint ("%s:%d CurrentIrql %x NewIrql %x\n", __FILE__,__LINE__,KeGetPcr()->Irql,NewIrql); - KEBUGCHECK (0); + KeBugCheck (0); for(;;); } @@ -424,7 +424,7 @@ break; default: - KEBUGCHECK(0); + KeBugCheck(0); } } @@ -443,7 +443,7 @@ break; default: - KEBUGCHECK(0); + KeBugCheck(0); } } Modified: trunk/reactos/hal/halppc/generic/pci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/pci.c?r… ============================================================================== --- trunk/reactos/hal/halppc/generic/pci.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/pci.c [iso-8859-1] Sun Oct 4 16:48:18 2009 @@ -496,7 +496,7 @@ IN ULONG Slot, IN OUT PCM_RESOURCE_LIST *pAllocatedResources) { - KEBUGCHECK(0); + KeBugCheck(0); return STATUS_SUCCESS; } Modified: trunk/reactos/hal/halppc/generic/profil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halppc/generic/profil.… ============================================================================== --- trunk/reactos/hal/halppc/generic/profil.c [iso-8859-1] (original) +++ trunk/reactos/hal/halppc/generic/profil.c [iso-8859-1] Sun Oct 4 16:48:18 2009 @@ -21,7 +21,7 @@ NTAPI HalStopProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) { - KEBUGCHECK(0); + KeBugCheck(0); return; } @@ -32,7 +32,7 @@ NTAPI HalStartProfileInterrupt(IN KPROFILE_SOURCE ProfileSource) { - KEBUGCHECK(0); + KeBugCheck(0); return; } @@ -43,7 +43,7 @@ NTAPI HalSetProfileInterval(IN ULONG_PTR Interval) { - KEBUGCHECK(0); + KeBugCheck(0); return Interval; } Modified: trunk/reactos/hal/halx86/generic/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/dma.c?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/dma.c [iso-8859-1] Sun Oct 4 16:48:18 2009 @@ -1487,9 +1487,7 @@ * NOTE: On real NT a mechanism with reserved pages is implemented * to handle this case in a slow, but graceful non-fatal way. */ - /* FIXME: The correct bug check code isn't defined. */ - /* KEBUGCHECKEX(HAL_MEMORY_ALLOCATION, PAGE_SIZE, 0, (ULONG_PTR)__FILE__, 0); */ - ASSERT(FALSE); + KeBugCheckEx(HAL_MEMORY_ALLOCATION, PAGE_SIZE, 0, (ULONG_PTR)__FILE__, 0); } CurrentAddress = (ULONG_PTR)VirtualAddress + Modified: trunk/reactos/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… ============================================================================== --- trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] Sun Oct 4 16:48:18 2009 @@ -1168,6 +1168,14 @@ The system is booting in safemode - Directory Services Repair . +MessageId=0xAC +Severity=Success +Facility=System +SymbolicName=HAL_MEMORY_ALLOCATION +Language=English +HAL_MEMORY_ALLOCATION +. + MessageId=0xB4 Severity=Success Facility=System

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