Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[tkreuzer] 43449: prefix DEBUG_CONTROL constants with AMD64 as they are architecture specific
by tkreuzer＠svn.reactos.org 14 Oct '09

14 Oct '09

Author: tkreuzer Date: Wed Oct 14 13:53:30 2009 New Revision: 43449 URL: http://svn.reactos.org/svn/reactos?rev=43449&view=rev Log: prefix DEBUG_CONTROL constants with AMD64 as they are architecture specific Modified: branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c Modified: branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h [iso-8859-1] Wed Oct 14 13:53:30 2009 @@ -195,13 +195,12 @@ #define DBGKD_PARTITION_ALTERNATE 0x01 // -// Control Space types -// -#define DEBUG_CONTROL_SPACE_KPCR 0 -#define DEBUG_CONTROL_SPACE_KPRCB 1 -#define DEBUG_CONTROL_SPACE_KSPECIAL 2 -#define DEBUG_CONTROL_SPACE_KTHREAD 3 -#define X86_DEBUG_CONTROL_SPACE_KSPECIAL 716 +// AMD64 Control Space types +// +#define AMD64_DEBUG_CONTROL_SPACE_KPCR 0 +#define AMD64_DEBUG_CONTROL_SPACE_KPRCB 1 +#define AMD64_DEBUG_CONTROL_SPACE_KSPECIAL 2 +#define AMD64_DEBUG_CONTROL_SPACE_KTHREAD 3 // Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c [iso-8859-1] Wed Oct 14 13:53:30 2009 @@ -185,25 +185,25 @@ switch ((ULONG_PTR)BaseAddress) { - case DEBUG_CONTROL_SPACE_KPCR: + case AMD64_DEBUG_CONTROL_SPACE_KPCR: /* Copy a pointer to the Pcr */ ControlStart = &Pcr; RealLength = sizeof(PVOID); break; - case DEBUG_CONTROL_SPACE_KPRCB: + case AMD64_DEBUG_CONTROL_SPACE_KPRCB: /* Copy a pointer to the Prcb */ ControlStart = &Prcb; RealLength = sizeof(PVOID); break; - case DEBUG_CONTROL_SPACE_KSPECIAL: + case AMD64_DEBUG_CONTROL_SPACE_KSPECIAL: /* Copy SpecialRegisters */ ControlStart = &Prcb->ProcessorState.SpecialRegisters; RealLength = sizeof(KSPECIAL_REGISTERS); break; - case DEBUG_CONTROL_SPACE_KTHREAD: + case AMD64_DEBUG_CONTROL_SPACE_KTHREAD: /* Copy a pointer to the current Thread */ ControlStart = &Prcb->CurrentThread; RealLength = sizeof(PVOID);

1 0

[tkreuzer] 43448: [KD64] - use SEH in KdpSysReadMsr - use constants for KdpSysReadControlSpace cases (DEBUG_CONTROL_SPACE_KSPECIAL taken from singularity) - implement case DEBUG_CONTROL_SPACE_KTHREAD returning a pointer to the current thread - Implement KdpSysReadIoSpace, KdpSysWriteIoSpace for amd64, can be used for x86, too
by tkreuzer＠svn.reactos.org 14 Oct '09

14 Oct '09

Author: tkreuzer Date: Wed Oct 14 13:39:59 2009 New Revision: 43448 URL: http://svn.reactos.org/svn/reactos?rev=43448&view=rev Log: [KD64] - use SEH in KdpSysReadMsr - use constants for KdpSysReadControlSpace cases (DEBUG_CONTROL_SPACE_KSPECIAL taken from singularity) - implement case DEBUG_CONTROL_SPACE_KTHREAD returning a pointer to the current thread - Implement KdpSysReadIoSpace, KdpSysWriteIoSpace for amd64, can be used for x86, too Modified: branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/kd64.h branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c Modified: branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/reactos/windbgkd.h [iso-8859-1] Wed Oct 14 13:39:59 2009 @@ -195,6 +195,16 @@ #define DBGKD_PARTITION_ALTERNATE 0x01 // +// Control Space types +// +#define DEBUG_CONTROL_SPACE_KPCR 0 +#define DEBUG_CONTROL_SPACE_KPRCB 1 +#define DEBUG_CONTROL_SPACE_KSPECIAL 2 +#define DEBUG_CONTROL_SPACE_KTHREAD 3 +#define X86_DEBUG_CONTROL_SPACE_KSPECIAL 716 + + +// // KD Packet Structure // typedef struct _KD_PACKET Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/kd64.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] Wed Oct 14 13:39:59 2009 @@ -374,7 +374,7 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + IN PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize ); @@ -386,7 +386,7 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + IN PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize ); Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c [iso-8859-1] Wed Oct 14 13:39:59 2009 @@ -104,7 +104,17 @@ KdpSysReadMsr(IN ULONG Msr, OUT PLARGE_INTEGER MsrValue) { - MsrValue->QuadPart = __readmsr(Msr); + /* Use SEH to protect from invalid MSRs */ + _SEH2_TRY + { + MsrValue->QuadPart = __readmsr(Msr); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return STATUS_NO_SUCH_DEVICE); + } + _SEH2_END + return STATUS_SUCCESS; } @@ -113,7 +123,17 @@ KdpSysWriteMsr(IN ULONG Msr, IN PLARGE_INTEGER MsrValue) { - __writemsr(Msr, MsrValue->QuadPart); + /* Use SEH to protect from invalid MSRs */ + _SEH2_TRY + { + __writemsr(Msr, MsrValue->QuadPart); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + _SEH2_YIELD(return STATUS_NO_SUCH_DEVICE); + } + _SEH2_END + return STATUS_SUCCESS; } @@ -165,28 +185,35 @@ switch ((ULONG_PTR)BaseAddress) { - case 0: + case DEBUG_CONTROL_SPACE_KPCR: /* Copy a pointer to the Pcr */ ControlStart = &Pcr; RealLength = sizeof(PVOID); break; - case 1: + case DEBUG_CONTROL_SPACE_KPRCB: /* Copy a pointer to the Prcb */ ControlStart = &Prcb; RealLength = sizeof(PVOID); break; - case 2: + case DEBUG_CONTROL_SPACE_KSPECIAL: /* Copy SpecialRegisters */ ControlStart = &Prcb->ProcessorState.SpecialRegisters; RealLength = sizeof(KSPECIAL_REGISTERS); break; + case DEBUG_CONTROL_SPACE_KTHREAD: + /* Copy a pointer to the current Thread */ + ControlStart = &Prcb->CurrentThread; + RealLength = sizeof(PVOID); + break; + default: RealLength = 0; ControlStart = NULL; ASSERT(FALSE); + return STATUS_UNSUCCESSFUL; } if (RealLength < Length) Length = RealLength; @@ -225,14 +252,48 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + OUT PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_UNSUCCESSFUL; -} + /* Verify parameters */ + if (InterfaceType != Isa || BusNumber != 0 || AddressSpace != 1) + { + /* No data was read */ + *ActualDataSize = 0; + return STATUS_INVALID_PARAMETER; + } + + switch (DataSize) + { + case sizeof(UCHAR): + /* read one UCHAR */ + *(PUCHAR)DataValue = READ_PORT_UCHAR((PUCHAR)IoAddress); + break; + + case sizeof(USHORT): + /* Read one USHORT */ + *(PUSHORT)DataValue = READ_PORT_USHORT((PUSHORT)IoAddress); + break; + + case sizeof(ULONG): + /* Read one ULONG */ + *(PULONG)DataValue = READ_PORT_ULONG((PULONG)IoAddress); + break; + + default: + /* Invalid data size */ + *ActualDataSize = 0; + return STATUS_UNSUCCESSFUL; + } + + /* Return the size of the data */ + *ActualDataSize = DataSize; + + /* Success! */ + return STATUS_SUCCESS; +} + NTSTATUS NTAPI @@ -240,20 +301,53 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + IN PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize) +{ + /* Verify parameters */ + if (InterfaceType != Isa || BusNumber != 0 || AddressSpace != 1) + { + /* No data was written */ + *ActualDataSize = 0; + return STATUS_INVALID_PARAMETER; + } + + switch (DataSize) + { + case sizeof(UCHAR): + /* read one UCHAR */ + WRITE_PORT_UCHAR((PUCHAR)IoAddress, *(PUCHAR)DataValue); + break; + + case sizeof(USHORT): + /* Read one USHORT */ + WRITE_PORT_USHORT((PUSHORT)IoAddress, *(PUSHORT)DataValue); + break; + + case sizeof(ULONG): + /* Read one ULONG */ + WRITE_PORT_ULONG((PULONG)IoAddress, *(PULONG)DataValue); + break; + + default: + /* Invalid data size */ + *ActualDataSize = 0; + return STATUS_UNSUCCESSFUL; + } + + /* Return the size of the data */ + *ActualDataSize = DataSize; + + /* Success! */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +KdpSysCheckLowMemory(IN ULONG Flags) { UNIMPLEMENTED; while (TRUE); return STATUS_UNSUCCESSFUL; } - -NTSTATUS -NTAPI -KdpSysCheckLowMemory(IN ULONG Flags) -{ - UNIMPLEMENTED; - while (TRUE); - return STATUS_UNSUCCESSFUL; -}

1 0

[tkreuzer] 43447: [DDK] Fix MmSizeOfMdl prototype
by tkreuzer＠svn.reactos.org 14 Oct '09

14 Oct '09

Author: tkreuzer Date: Wed Oct 14 13:23:57 2009 New Revision: 43447 URL: http://svn.reactos.org/svn/reactos?rev=43447&view=rev Log: [DDK] Fix MmSizeOfMdl prototype Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h Modified: branches/ros-amd64-bringup/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ddk/winddk.h [iso-8859-1] Wed Oct 14 13:23:57 2009 @@ -9277,7 +9277,7 @@ IN ULONG ProbeMode); NTKERNELAPI -ULONG +SIZE_T NTAPI MmSizeOfMdl( IN PVOID Base,

1 0

[janderwald] 43446: - Implement KSPROPERTY_CONNECTION_ALLOCATORFRAMING for CPortPinWaveCyclic + CPortPinWavePci
by janderwald＠svn.reactos.org 14 Oct '09

14 Oct '09

Author: janderwald Date: Wed Oct 14 12:24:19 2009 New Revision: 43446 URL: http://svn.reactos.org/svn/reactos?rev=43446&view=rev Log: - Implement KSPROPERTY_CONNECTION_ALLOCATORFRAMING for CPortPinWaveCyclic + CPortPinWavePci Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.cpp [iso-8859-1] Wed Oct 14 12:24:19 2009 @@ -51,6 +51,7 @@ friend NTSTATUS NTAPI PinWaveCyclicState(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); friend NTSTATUS NTAPI PinWaveCyclicDataFormat(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); friend NTSTATUS NTAPI PinWaveCyclicAudioPosition(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); + friend NTSTATUS NTAPI PinWaveCyclicAllocatorFraming(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); IPortWaveCyclic * m_Port; IPortFilterWaveCyclic * m_Filter; @@ -75,6 +76,7 @@ ULONG m_TotalPackets; ULONG m_StopCount; KSAUDIO_POSITION m_Position; + KSALLOCATOR_FRAMING m_AllocatorFraming; SUBDEVICE_DESCRIPTOR m_Descriptor; ULONG m_Delay; @@ -93,9 +95,9 @@ NTSTATUS NTAPI PinWaveCyclicState(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); NTSTATUS NTAPI PinWaveCyclicDataFormat(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); NTSTATUS NTAPI PinWaveCyclicAudioPosition(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); - - -DEFINE_KSPROPERTY_CONNECTIONSET(PinWaveCyclicConnectionSet, PinWaveCyclicState, PinWaveCyclicDataFormat); +NTSTATUS NTAPI PinWaveCyclicAllocatorFraming(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); + +DEFINE_KSPROPERTY_CONNECTIONSET(PinWaveCyclicConnectionSet, PinWaveCyclicState, PinWaveCyclicDataFormat, PinWaveCyclicAllocatorFraming); DEFINE_KSPROPERTY_AUDIOSET(PinWaveCyclicAudioSet, PinWaveCyclicAudioPosition); KSPROPERTY_SET PinWaveCyclicPropertySet[] = @@ -144,7 +146,40 @@ return STATUS_UNSUCCESSFUL; } - +NTSTATUS +NTAPI +PinWaveCyclicAllocatorFraming( + IN PIRP Irp, + IN PKSIDENTIFIER Request, + IN OUT PVOID Data) +{ + CPortPinWaveCyclic *Pin; + PSUBDEVICE_DESCRIPTOR Descriptor; + + // get sub device descriptor + Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); + + // sanity check + PC_ASSERT(Descriptor); + PC_ASSERT(Descriptor->PortPin); + PC_ASSERT_IRQL(DISPATCH_LEVEL); + + // cast to pin impl + Pin = (CPortPinWaveCyclic*)Descriptor->PortPin; + + + if (Request->Flags & KSPROPERTY_TYPE_GET) + { + // copy pin framing + RtlMoveMemory(Data, &Pin->m_AllocatorFraming, sizeof(KSALLOCATOR_FRAMING)); + + Irp->IoStatus.Information = sizeof(KSALLOCATOR_FRAMING); + return STATUS_SUCCESS; + } + + // not supported + return STATUS_NOT_SUPPORTED; +} NTSTATUS NTAPI @@ -960,6 +995,7 @@ PDEVICE_OBJECT DeviceObject; BOOLEAN Capture; PVOID SilenceBuffer; + PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor = NULL; //IDrmAudioStream * DrmAudio = NULL; m_KsPinDescriptor = KsPinDescriptor; @@ -1015,6 +1051,8 @@ } #endif + DPRINT("CPortPinWaveCyclic::Init Status %x\n", Status); + if (!NT_SUCCESS(Status)) return Status; @@ -1024,8 +1062,6 @@ if (!NT_SUCCESS(Status)) return Status; - - PSUBDEVICE_DESCRIPTOR SubDeviceDescriptor = NULL; Status = Subdevice->GetDescriptor(&SubDeviceDescriptor); if (!NT_SUCCESS(Status)) @@ -1044,11 +1080,10 @@ m_Descriptor.UnknownMiniport = SubDeviceDescriptor->UnknownMiniport; m_Descriptor.PortPin = (PVOID)this; - DPRINT("CPortPinWaveCyclic::Init Status %x\n", Status); - // release subdevice descriptor Subdevice->Release(); + // add ourselves to service group Status = m_ServiceGroup->AddMember(PSERVICESINK(this)); if (!NT_SUCCESS(Status)) { @@ -1072,6 +1107,15 @@ if (!SilenceBuffer) return STATUS_INSUFFICIENT_RESOURCES; + + /* set up allocator framing */ + m_AllocatorFraming.RequirementsFlags = KSALLOCATOR_REQUIREMENTF_SYSTEM_MEMORY | KSALLOCATOR_REQUIREMENTF_PREFERENCES_ONLY; + m_AllocatorFraming.PoolType = NonPagedPool; + m_AllocatorFraming.Frames = 8; + m_AllocatorFraming.FileAlignment = FILE_64_BYTE_ALIGNMENT; + m_AllocatorFraming.Reserved = 0; + m_AllocatorFraming.FrameSize = m_FrameSize; + m_Stream->Silence(SilenceBuffer, m_FrameSize); Status = m_IrpQueue->Init(ConnectDetails, DataFormat, DeviceObject, m_FrameSize, 0, SilenceBuffer); Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.cpp [iso-8859-1] Wed Oct 14 12:24:19 2009 @@ -94,7 +94,7 @@ NTSTATUS NTAPI PinWavePciAudioPosition(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); NTSTATUS NTAPI PinWavePciAllocatorFraming(IN PIRP Irp, IN PKSIDENTIFIER Request, IN OUT PVOID Data); -DEFINE_KSPROPERTY_ALLOCATORFRAMING(PinWavePciConnectionSet, PinWavePciState, PinWavePciDataFormat, PinWavePciAllocatorFraming); +DEFINE_KSPROPERTY_CONNECTIONSET(PinWavePciConnectionSet, PinWavePciState, PinWavePciDataFormat, PinWavePciAllocatorFraming); DEFINE_KSPROPERTY_AUDIOSET(PinWavePciAudioSet, PinWavePciAudioPosition); KSPROPERTY_SET PinWavePciPropertySet[] = @@ -123,8 +123,32 @@ IN PKSIDENTIFIER Request, IN OUT PVOID Data) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + CPortPinWavePci *Pin; + PSUBDEVICE_DESCRIPTOR Descriptor; + + // get sub device descriptor + Descriptor = (PSUBDEVICE_DESCRIPTOR)KSPROPERTY_ITEM_IRP_STORAGE(Irp); + + // sanity check + PC_ASSERT(Descriptor); + PC_ASSERT(Descriptor->PortPin); + PC_ASSERT_IRQL(DISPATCH_LEVEL); + + // cast to pin impl + Pin = (CPortPinWavePci*)Descriptor->PortPin; + + + if (Request->Flags & KSPROPERTY_TYPE_GET) + { + // copy pin framing + RtlMoveMemory(Data, &Pin->m_AllocatorFraming, sizeof(KSALLOCATOR_FRAMING)); + + Irp->IoStatus.Information = sizeof(KSALLOCATOR_FRAMING); + return STATUS_SUCCESS; + } + + // not supported + return STATUS_NOT_SUPPORTED; } NTSTATUS Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/private.hpp [iso-8859-1] Wed Oct 14 12:24:19 2009 @@ -317,13 +317,6 @@ IN PSUBDEVICE_DESCRIPTOR Descriptor); #define DEFINE_KSPROPERTY_CONNECTIONSET(PinSet,\ - PropStateHandler, PropDataFormatHandler)\ -DEFINE_KSPROPERTY_TABLE(PinSet) {\ - DEFINE_KSPROPERTY_ITEM_CONNECTION_STATE(PropStateHandler, PropStateHandler),\ - DEFINE_KSPROPERTY_ITEM_CONNECTION_DATAFORMAT(PropDataFormatHandler, PropDataFormatHandler)\ -} - -#define DEFINE_KSPROPERTY_ALLOCATORFRAMING(PinSet,\ PropStateHandler, PropDataFormatHandler, PropAllocatorFraming)\ DEFINE_KSPROPERTY_TABLE(PinSet) {\ DEFINE_KSPROPERTY_ITEM_CONNECTION_STATE(PropStateHandler, PropStateHandler),\

1 0

[mjmartin] 43445: - CmpPrepareKey: If cell signature is CM_KEY_NODE_SIGNATURE, the KeyCell is index leaf, handle it properly by calling CmpPrepareKey vice CmpPrepareIndexOfKeys. Fixes ASSERT in cminit.c that occurs on reboot after installing some applications.
by mjmartin＠svn.reactos.org 14 Oct '09

14 Oct '09

Author: mjmartin Date: Wed Oct 14 11:50:31 2009 New Revision: 43445 URL: http://svn.reactos.org/svn/reactos?rev=43445&view=rev Log: - CmpPrepareKey: If cell signature is CM_KEY_NODE_SIGNATURE, the KeyCell is index leaf, handle it properly by calling CmpPrepareKey vice CmpPrepareIndexOfKeys. Fixes ASSERT in cminit.c that occurs on reboot after installing some applications. Modified: trunk/reactos/lib/cmlib/cminit.c Modified: trunk/reactos/lib/cmlib/cminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cminit.c?rev=434… ============================================================================== --- trunk/reactos/lib/cmlib/cminit.c [iso-8859-1] (original) +++ trunk/reactos/lib/cmlib/cminit.c [iso-8859-1] Wed Oct 14 11:50:31 2009 @@ -82,7 +82,10 @@ for (i = 0; i < IndexCell->Count; i++) { PCM_KEY_INDEX SubIndexCell = HvGetCell(RegistryHive, IndexCell->List[i]); - CmpPrepareIndexOfKeys(RegistryHive, SubIndexCell); + if (SubIndexCell->Signature == CM_KEY_NODE_SIGNATURE) + CmpPrepareKey(RegistryHive, (PCM_KEY_NODE)SubIndexCell); + else + CmpPrepareIndexOfKeys(RegistryHive, SubIndexCell); } } else if (IndexCell->Signature == CM_KEY_FAST_LEAF ||

1 0

[cwittich] 43444: -revert accidental change
by cwittich＠svn.reactos.org 13 Oct '09

13 Oct '09

Author: cwittich Date: Tue Oct 13 23:51:16 2009 New Revision: 43444 URL: http://svn.reactos.org/svn/reactos?rev=43444&view=rev Log: -revert accidental change Modified: trunk/reactos/drivers/storage/floppy/SOURCES Modified: trunk/reactos/drivers/storage/floppy/SOURCES URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/SOU… ============================================================================== --- trunk/reactos/drivers/storage/floppy/SOURCES [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/SOURCES [iso-8859-1] Tue Oct 13 23:51:16 2009 @@ -1,28 +1,30 @@ +# ReactOS Floppy Driver +# Copyright (C) 2004, Vizzini (vizzini(a)plasmic.com) +# +# 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. +# +# This 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. +# +# You 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. +# +# PROJECT: ReactOS Floppy Driver +# FILE: SOURCES +# PURPOSE: SOURCES file for Microsoft DDK build system +# PROGRAMMER: Vizzini (vizzini(a)plasmic.com) +# REVISIONS: +# 15-Feb-2004 vizzini - Created/ + TARGETNAME=floppy TARGETTYPE=DRIVER - +TARGETPATH=obj +TARGETLIBS= $(DDK_LIB_PATH)\csq.lib +SOURCES= floppy.c csqrtns.c hardware.c readwrite.c ioctl.c MSC_WARNING_LEVEL=/W3 /WX - -C_DEFINES=$(C_DEFINES) /DSTDCALL=__stdcall /DDDKAPI=__stdcall /wd4996 -INCLUDES=.; \ - ../../../.; \ - ../../../include; \ - ../../../include; \ - ../../../include/dxsdk; \ - ../../../include/dxsdk; \ - ../../../include/GL; \ - ../../../include/ndk; \ - ../../../include/reactos; \ - ../../../include/reactos; \ - ../../../include/reactos/mc; \ - ../../../include/reactos/libs - -TARGETLIBS= $(DDK_LIB_PATH)\ntstrsafe.lib - -SOURCES=csqrtns.c \ - floppy.c \ - hardware.c \ - ioctl.c \ - readwrite.c \ - floppy.rc -TARGET_DESTINATION=retail

1 0

[cwittich] 43443: [BDASUP] -fix some function declarations
by cwittich＠svn.reactos.org 13 Oct '09

13 Oct '09

Author: cwittich Date: Tue Oct 13 23:49:36 2009 New Revision: 43443 URL: http://svn.reactos.org/svn/reactos?rev=43443&view=rev Log: [BDASUP] -fix some function declarations Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.c trunk/reactos/drivers/storage/floppy/SOURCES trunk/reactos/include/ddk/bdasup.h Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/bdasup/… ============================================================================== --- trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] Tue Oct 13 23:49:36 2009 @@ -691,7 +691,7 @@ BdaPropertyNodeDescriptors( IN PIRP Irp, IN KSPROPERTY *pKSProperty, - OUT GUID *pguidProperty) + OUT BDANODE_DESCRIPTOR *pNodeDescriptorProperty) { UNIMPLEMENTED return STATUS_NOT_IMPLEMENTED; @@ -704,7 +704,7 @@ NTAPI BdaPropertyNodeEvents( IN PIRP Irp, - IN KSPROPERTY *pKSProperty, + IN KSP_NODE *pKSProperty, OUT GUID *pguidProperty) { UNIMPLEMENTED @@ -718,7 +718,7 @@ NTAPI BdaPropertyNodeMethods( IN PIRP Irp, - IN KSPROPERTY *pKSProperty, + IN KSP_NODE *pKSProperty, OUT GUID *pguidProperty) { UNIMPLEMENTED @@ -732,7 +732,7 @@ NTAPI BdaPropertyNodeProperties( IN PIRP Irp, - IN KSPROPERTY *pKSProperty, + IN KSP_NODE *pKSProperty, OUT GUID *pguidProperty) { UNIMPLEMENTED Modified: trunk/reactos/drivers/storage/floppy/SOURCES URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/SOU… ============================================================================== --- trunk/reactos/drivers/storage/floppy/SOURCES [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/SOURCES [iso-8859-1] Tue Oct 13 23:49:36 2009 @@ -1,30 +1,28 @@ -# ReactOS Floppy Driver -# Copyright (C) 2004, Vizzini (vizzini(a)plasmic.com) -# -# 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. -# -# This 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. -# -# You 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. -# -# PROJECT: ReactOS Floppy Driver -# FILE: SOURCES -# PURPOSE: SOURCES file for Microsoft DDK build system -# PROGRAMMER: Vizzini (vizzini(a)plasmic.com) -# REVISIONS: -# 15-Feb-2004 vizzini - Created/ - TARGETNAME=floppy TARGETTYPE=DRIVER -TARGETPATH=obj -TARGETLIBS= $(DDK_LIB_PATH)\csq.lib -SOURCES= floppy.c csqrtns.c hardware.c readwrite.c ioctl.c + MSC_WARNING_LEVEL=/W3 /WX + +C_DEFINES=$(C_DEFINES) /DSTDCALL=__stdcall /DDDKAPI=__stdcall /wd4996 +INCLUDES=.; \ + ../../../.; \ + ../../../include; \ + ../../../include; \ + ../../../include/dxsdk; \ + ../../../include/dxsdk; \ + ../../../include/GL; \ + ../../../include/ndk; \ + ../../../include/reactos; \ + ../../../include/reactos; \ + ../../../include/reactos/mc; \ + ../../../include/reactos/libs + +TARGETLIBS= $(DDK_LIB_PATH)\ntstrsafe.lib + +SOURCES=csqrtns.c \ + floppy.c \ + hardware.c \ + ioctl.c \ + readwrite.c \ + floppy.rc +TARGET_DESTINATION=retail Modified: trunk/reactos/include/ddk/bdasup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/bdasup.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/bdasup.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/bdasup.h [iso-8859-1] Tue Oct 13 23:49:36 2009 @@ -96,21 +96,21 @@ STDMETHODIMP_(NTSTATUS) BdaPropertyNodeDescriptors( IN PIRP Irp, IN KSPROPERTY *pKSProperty, - OUT GUID *pguidProperty); + OUT BDANODE_DESCRIPTOR *pNodeDescriptorProperty); STDMETHODIMP_(NTSTATUS) BdaPropertyNodeEvents( IN PIRP Irp, - IN KSPROPERTY *pKSProperty, + IN KSP_NODE *pKSProperty, OUT GUID *pguidProperty); STDMETHODIMP_(NTSTATUS) BdaPropertyNodeMethods( IN PIRP Irp, - IN KSPROPERTY *pKSProperty, + IN KSP_NODE *pKSProperty, OUT GUID *pguidProperty); STDMETHODIMP_(NTSTATUS) BdaPropertyNodeProperties( IN PIRP Irp, - IN KSPROPERTY *pKSProperty, + IN KSP_NODE *pKSProperty, OUT GUID *pguidProperty); STDMETHODIMP_(NTSTATUS) BdaPropertyNodeTypes(

1 0

[cwittich] 43442: partial sync to wine 1.1.31
by cwittich＠svn.reactos.org 13 Oct '09

13 Oct '09

Author: cwittich Date: Tue Oct 13 23:09:08 2009 New Revision: 43442 URL: http://svn.reactos.org/svn/reactos?rev=43442&view=rev Log: partial sync to wine 1.1.31 Modified: trunk/reactos/dll/win32/advapi32/sec/cred.c Modified: trunk/reactos/dll/win32/advapi32/sec/cred.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/cre… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/cred.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/cred.c [iso-8859-1] Tue Oct 13 23:09:08 2009 @@ -911,55 +911,63 @@ } #endif -static void convert_PCREDENTIALW_to_PCREDENTIALA(const CREDENTIALW *CredentialW, PCREDENTIALA CredentialA, DWORD *len) -{ - char *buffer = (char *)CredentialA + sizeof(CREDENTIALA); +static INT convert_PCREDENTIALW_to_PCREDENTIALA(const CREDENTIALW *CredentialW, PCREDENTIALA CredentialA, INT len) +{ + char *buffer; INT string_len; - - *len += sizeof(CREDENTIALA); + INT needed = sizeof(CREDENTIALA); + if (!CredentialA) { - if (CredentialW->TargetName) *len += WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetName, -1, NULL, 0, NULL, NULL); - if (CredentialW->Comment) *len += WideCharToMultiByte(CP_ACP, 0, CredentialW->Comment, -1, NULL, 0, NULL, NULL); - *len += CredentialW->CredentialBlobSize; - if (CredentialW->TargetAlias) *len += WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetAlias, -1, NULL, 0, NULL, NULL); - if (CredentialW->UserName) *len += WideCharToMultiByte(CP_ACP, 0, CredentialW->UserName, -1, NULL, 0, NULL, NULL); - - return; - } - + if (CredentialW->TargetName) + needed += WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetName, -1, NULL, 0, NULL, NULL); + if (CredentialW->Comment) + needed += WideCharToMultiByte(CP_ACP, 0, CredentialW->Comment, -1, NULL, 0, NULL, NULL); + needed += CredentialW->CredentialBlobSize; + if (CredentialW->TargetAlias) + needed += WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetAlias, -1, NULL, 0, NULL, NULL); + if (CredentialW->UserName) + needed += WideCharToMultiByte(CP_ACP, 0, CredentialW->UserName, -1, NULL, 0, NULL, NULL); + + return needed; + } + + + buffer = (char *)CredentialA + sizeof(CREDENTIALA); + len -= sizeof(CREDENTIALA); CredentialA->Flags = CredentialW->Flags; CredentialA->Type = CredentialW->Type; + if (CredentialW->TargetName) { CredentialA->TargetName = buffer; - - /* Buffer is guaranteed to be large enough */ - string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetName, -1, CredentialA->TargetName, 0x7FFFFFFF, NULL, NULL); - + string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetName, -1, buffer, len, NULL, NULL); buffer += string_len; - *len += string_len; + needed += string_len; + len -= string_len; } else CredentialA->TargetName = NULL; if (CredentialW->Comment) { CredentialA->Comment = buffer; - string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->Comment, -1, CredentialA->Comment, 0x7FFFFFFF, NULL, NULL); + string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->Comment, -1, buffer, len, NULL, NULL); buffer += string_len; - *len += string_len; + needed += string_len; + len -= string_len; } else CredentialA->Comment = NULL; CredentialA->LastWritten = CredentialW->LastWritten; CredentialA->CredentialBlobSize = CredentialW->CredentialBlobSize; - if (CredentialW->CredentialBlobSize) + if (CredentialW->CredentialBlobSize && (CredentialW->CredentialBlobSize <= len)) { CredentialA->CredentialBlob =(LPBYTE)buffer; memcpy(CredentialA->CredentialBlob, CredentialW->CredentialBlob, CredentialW->CredentialBlobSize); buffer += CredentialW->CredentialBlobSize; - *len += CredentialW->CredentialBlobSize; + needed += CredentialW->CredentialBlobSize; + len -= CredentialW->CredentialBlobSize; } else CredentialA->CredentialBlob = NULL; @@ -969,57 +977,67 @@ if (CredentialW->TargetAlias) { CredentialA->TargetAlias = buffer; - string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetAlias, -1, CredentialA->TargetAlias, 0x7FFFFFFF, NULL, NULL); + string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->TargetAlias, -1, buffer, len, NULL, NULL); buffer += string_len; - *len += string_len; + needed += string_len; + len -= string_len; } else CredentialA->TargetAlias = NULL; if (CredentialW->UserName) { CredentialA->UserName = buffer; - string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->UserName, -1, CredentialA->UserName, 0x7FFFFFFF, NULL, NULL); - buffer += string_len; - *len += string_len; + string_len = WideCharToMultiByte(CP_ACP, 0, CredentialW->UserName, -1, buffer, len, NULL, NULL); + needed += string_len; } else CredentialA->UserName = NULL; -} - -static void convert_PCREDENTIALA_to_PCREDENTIALW(const CREDENTIALA *CredentialA, PCREDENTIALW CredentialW, DWORD *len) -{ - char *buffer = (char *)CredentialW + sizeof(CREDENTIALW); + + return needed; +} + +static INT convert_PCREDENTIALA_to_PCREDENTIALW(const CREDENTIALA *CredentialA, PCREDENTIALW CredentialW, INT len) +{ + char *buffer; INT string_len; - - *len += sizeof(CREDENTIALW); + INT needed = sizeof(CREDENTIALW); + if (!CredentialW) { - if (CredentialA->TargetName) *len += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetName, -1, NULL, 0); - if (CredentialA->Comment) *len += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->Comment, -1, NULL, 0); - *len += CredentialA->CredentialBlobSize; - if (CredentialA->TargetAlias) *len += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetAlias, -1, NULL, 0); - if (CredentialA->UserName) *len += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->UserName, -1, NULL, 0); - - return; - } - + if (CredentialA->TargetName) + needed += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetName, -1, NULL, 0); + if (CredentialA->Comment) + needed += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->Comment, -1, NULL, 0); + needed += CredentialA->CredentialBlobSize; + if (CredentialA->TargetAlias) + needed += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetAlias, -1, NULL, 0); + if (CredentialA->UserName) + needed += sizeof(WCHAR) * MultiByteToWideChar(CP_ACP, 0, CredentialA->UserName, -1, NULL, 0); + + return needed; + } + + buffer = (char *)CredentialW + sizeof(CREDENTIALW); + len -= sizeof(CREDENTIALW); CredentialW->Flags = CredentialA->Flags; CredentialW->Type = CredentialA->Type; if (CredentialA->TargetName) { CredentialW->TargetName = (LPWSTR)buffer; - string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetName, -1, CredentialW->TargetName, 0x7FFFFFFF); + string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetName, -1, CredentialW->TargetName, len / sizeof(WCHAR)); buffer += sizeof(WCHAR) * string_len; - *len += sizeof(WCHAR) * string_len; + needed += sizeof(WCHAR) * string_len; + len -= sizeof(WCHAR) * string_len; } else CredentialW->TargetName = NULL; if (CredentialA->Comment) { CredentialW->Comment = (LPWSTR)buffer; - string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->Comment, -1, CredentialW->Comment, 0x7FFFFFFF); + string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->Comment, -1, CredentialW->Comment, len / sizeof(WCHAR)); buffer += sizeof(WCHAR) * string_len; - *len += sizeof(WCHAR) * string_len; + needed += sizeof(WCHAR) * string_len; + len -= sizeof(WCHAR) * string_len; } else CredentialW->Comment = NULL; @@ -1031,7 +1049,8 @@ memcpy(CredentialW->CredentialBlob, CredentialA->CredentialBlob, CredentialA->CredentialBlobSize); buffer += CredentialA->CredentialBlobSize; - *len += CredentialA->CredentialBlobSize; + needed += CredentialA->CredentialBlobSize; + len -= CredentialA->CredentialBlobSize; } else CredentialW->CredentialBlob = NULL; @@ -1041,21 +1060,23 @@ if (CredentialA->TargetAlias) { CredentialW->TargetAlias = (LPWSTR)buffer; - string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetAlias, -1, CredentialW->TargetAlias, 0x7FFFFFFF); + string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->TargetAlias, -1, CredentialW->TargetAlias, len / sizeof(WCHAR)); buffer += sizeof(WCHAR) * string_len; - *len += sizeof(WCHAR) * string_len; + needed += sizeof(WCHAR) * string_len; + len -= sizeof(WCHAR) * string_len; } else CredentialW->TargetAlias = NULL; if (CredentialA->UserName) { CredentialW->UserName = (LPWSTR)buffer; - string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->UserName, -1, CredentialW->UserName, 0x7FFFFFFF); - buffer += sizeof(WCHAR) * string_len; - *len += sizeof(WCHAR) * string_len; + string_len = MultiByteToWideChar(CP_ACP, 0, CredentialA->UserName, -1, CredentialW->UserName, len / sizeof(WCHAR)); + needed += sizeof(WCHAR) * string_len; } else CredentialW->UserName = NULL; + + return needed; } /****************************************************************************** @@ -1161,7 +1182,8 @@ LPWSTR FilterW; PCREDENTIALW *CredentialsW; DWORD i; - DWORD len; + INT len; + INT needed; char *buffer; TRACE("(%s, 0x%x, %p, %p)\n", debugstr_a(Filter), Flags, Count, Credentials); @@ -1189,7 +1211,7 @@ len = *Count * sizeof(PCREDENTIALA); for (i = 0; i < *Count; i++) - convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], NULL, &len); + len += convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], NULL, 0); *Credentials = HeapAlloc(GetProcessHeap(), 0, len); if (!*Credentials) @@ -1200,12 +1222,13 @@ } buffer = (char *)&(*Credentials)[*Count]; + len -= *Count * sizeof(PCREDENTIALA); for (i = 0; i < *Count; i++) { - len = 0; (*Credentials)[i] = (PCREDENTIALA)buffer; - convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], (*Credentials)[i], &len); - buffer += len; + needed = convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], (*Credentials)[i], len); + buffer += needed; + len -= needed; } CredFree(CredentialsW); @@ -1334,7 +1357,7 @@ { LPWSTR TargetNameW; PCREDENTIALW CredentialW; - DWORD len; + INT len; TRACE("(%s, %d, 0x%x, %p)\n", debugstr_a(TargetName), Type, Flags, Credential); @@ -1360,16 +1383,14 @@ } HeapFree(GetProcessHeap(), 0, TargetNameW); - len = 0; - convert_PCREDENTIALW_to_PCREDENTIALA(CredentialW, NULL, &len); + len = convert_PCREDENTIALW_to_PCREDENTIALA(CredentialW, NULL, 0); *Credential = HeapAlloc(GetProcessHeap(), 0, len); if (!*Credential) { SetLastError(ERROR_OUTOFMEMORY); return FALSE; } - len = 0; - convert_PCREDENTIALW_to_PCREDENTIALA(CredentialW, *Credential, &len); + convert_PCREDENTIALW_to_PCREDENTIALA(CredentialW, *Credential, len); CredFree(CredentialW); @@ -1540,7 +1561,7 @@ BOOL WINAPI CredWriteA(PCREDENTIALA Credential, DWORD Flags) { BOOL ret; - DWORD len; + INT len; PCREDENTIALW CredentialW; TRACE("(%p, 0x%x)\n", Credential, Flags); @@ -1551,16 +1572,15 @@ return FALSE; } - len = 0; - convert_PCREDENTIALA_to_PCREDENTIALW(Credential, NULL, &len); + len = convert_PCREDENTIALA_to_PCREDENTIALW(Credential, NULL, 0); CredentialW = HeapAlloc(GetProcessHeap(), 0, len); if (!CredentialW) { SetLastError(ERROR_OUTOFMEMORY); return FALSE; } - len = 0; - convert_PCREDENTIALA_to_PCREDENTIALW(Credential, CredentialW, &len); + + convert_PCREDENTIALA_to_PCREDENTIALW(Credential, CredentialW, len); ret = CredWriteW(CredentialW, Flags); @@ -1722,7 +1742,7 @@ DWORD Flags, DWORD *Size, PCREDENTIALA **Credentials) { PCREDENTIAL_TARGET_INFORMATIONW TargetInformationW; - DWORD len, i; + INT len, i; WCHAR *buffer, *end; BOOL ret; PCREDENTIALW* CredentialsW; @@ -1831,10 +1851,11 @@ if (ret) { char *buf; + INT needed; len = *Size * sizeof(PCREDENTIALA); for (i = 0; i < *Size; i++) - convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], NULL, &len); + len += convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], NULL, 0); *Credentials = HeapAlloc(GetProcessHeap(), 0, len); if (!*Credentials) @@ -1845,12 +1866,13 @@ } buf = (char *)&(*Credentials)[*Size]; + len -= *Size * sizeof(PCREDENTIALA); for (i = 0; i < *Size; i++) { - len = 0; (*Credentials)[i] = (PCREDENTIALA)buf; - convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], (*Credentials)[i], &len); - buf += len; + needed = convert_PCREDENTIALW_to_PCREDENTIALA(CredentialsW[i], (*Credentials)[i], len); + buf += needed; + len -= needed; } CredFree(CredentialsW);

1 0

[gschneider] 43441: [spider] - Check for completed stack after dealing cards by installing one function to do this in call three cases, bug #4886 - Fix and simplify drop rules (only by number) and validation rules (by number and type) for two and four color games - Fix typo in Polish Translation
by gschneider＠svn.reactos.org 13 Oct '09

13 Oct '09

Author: gschneider Date: Tue Oct 13 22:34:05 2009 New Revision: 43441 URL: http://svn.reactos.org/svn/reactos?rev=43441&view=rev Log: [spider] - Check for completed stack after dealing cards by installing one function to do this in call three cases, bug #4886 - Fix and simplify drop rules (only by number) and validation rules (by number and type) for two and four color games - Fix typo in Polish Translation Modified: trunk/reactos/base/applications/games/spider/lang/pl-PL.rc trunk/reactos/base/applications/games/spider/spigame.cpp Modified: trunk/reactos/base/applications/games/spider/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/lang/pl-PL.rc [iso-8859-1] Tue Oct 13 22:34:05 2009 @@ -1,7 +1,7 @@ /* * PROJECT: Spider Solitaire * LICENSE: See COPYING in top level directory - * FILE: base/applications/games/spider/lang/en-US.rc + * FILE: base/applications/games/spider/lang/pl-PL.rc * PURPOSE: Polish Language File for Spider Solitaire * TRANSLATOR: Maciej Bialas */ Modified: trunk/reactos/base/applications/games/spider/spigame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… ============================================================================== --- trunk/reactos/base/applications/games/spider/spigame.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/spider/spigame.cpp [iso-8859-1] Tue Oct 13 22:34:05 2009 @@ -98,13 +98,44 @@ fGameStarted = false; } +bool stackLookingGood(const CardStack &mystack, int numChecks) +{ + int i; + for (i = 0; i < numChecks; i++) + { + if (mystack[i].LoVal() != mystack[i + 1].LoVal() - 1) + { + return false; + } + if (mystack[i].Suit() != mystack[i + 1].Suit()) + { + return false; + } + } + return true; +} + +/* Card to be turned from a stack */ +void TurnStackCard(CardRegion &stackobj) +{ + int numfacedown; + + stackobj.GetFaceDirection(&numfacedown); + if (stackobj.NumCards() <= numfacedown) + { + if (numfacedown > 0) numfacedown--; + stackobj.SetFaceDirection(CS_FACE_DOWNUP, numfacedown); + stackobj.Redraw(); + } +} + /* Click on the deck */ void CARDLIBPROC DeckClickProc(CardRegion &stackobj, int NumDragCards) { CardStack temp, fakeDeck = pDeck->GetCardStack(); fGameStarted = true; - int i; - + int i, j, facedown, faceup; + if (fakeDeck.NumCards() != 0 && deck.NumCards() != 0) { /* Add one card to every stack */ @@ -112,6 +143,25 @@ { temp = pStack[i]->GetCardStack(); temp.Push(deck.Pop()); + + /* Check if we accidentally finished a row */ + pStack[i]->GetFaceDirection(&facedown); + faceup = temp.NumCards() - facedown; + if (faceup >= NUM_ONECOLOR_CARDS) + { + /* Check stack finished, remove cards if so */ + if (stackLookingGood(temp, NUM_ONECOLOR_CARDS - 1)) + { + for (j = 0; j < NUM_ONECOLOR_CARDS; j++) + { + temp.RemoveCard(0); + } + cardsFinished += NUM_ONECOLOR_CARDS; + pStack[i]->SetCardStack(temp); + /* Turn now topmost card */ + TurnStackCard(*pStack[i]); + } + } pStack[i]->SetCardStack(temp); } /* Remove one card from the fake ones */ @@ -124,7 +174,7 @@ /* Cards dragged from a stack */ bool CARDLIBPROC StackDragProc(CardRegion &stackobj, int numDragCards) { - int numfacedown, numcards, i; + int numfacedown, numcards; stackobj.GetFaceDirection(&numfacedown); numcards = stackobj.NumCards(); @@ -134,30 +184,9 @@ { const CardStack &mystack = stackobj.GetCardStack(); /* Don't allow to drag unsuited cards */ - for (i = 0; i < numDragCards - 1; i++) - { - if (mystack[i].LoVal() != mystack[i + 1].LoVal() - 1) - { - return false; - } - switch (dwDifficulty) - { - case IDC_DIF_ONECOLOR: - break; - case IDC_DIF_TWOCOLORS: - if ((mystack[i].IsBlack() && mystack[i + 1].IsBlack()) || - (mystack[i].IsRed() && mystack[i + 1].IsRed())) - { - return false; - } - break; - case IDC_DIF_FOURCOLORS: - if (mystack[i].Suit() != mystack[i + 1].Suit()) - { - return false; - } - break; - } + if (!stackLookingGood(mystack, numDragCards - 1)) + { + return false; } /* Remember where the cards come from */ from = &stackobj; @@ -193,20 +222,6 @@ } } -/* Card to be turned from a stack */ -void TurnStackCard(CardRegion &stackobj) -{ - int numfacedown; - - stackobj.GetFaceDirection(&numfacedown); - if (stackobj.NumCards() <= numfacedown) - { - if (numfacedown > 0) numfacedown--; - stackobj.SetFaceDirection(CS_FACE_DOWNUP, numfacedown); - stackobj.Redraw(); - } -} - /* Cards dropped to a stack */ bool CARDLIBPROC StackDropProc(CardRegion &stackobj, CardStack &dragcards) { @@ -230,49 +245,20 @@ return false; } - /* Can only drop if card matches colour rule */ - switch (dwDifficulty) - { - case IDC_DIF_ONECOLOR: - break; - case IDC_DIF_TWOCOLORS: - if ((mystack[0].IsBlack() && dragcard.IsRed()) || - (mystack[0].IsRed() && dragcard.IsBlack())) - { - return false; - } - break; - case IDC_DIF_FOURCOLORS: - if (mystack[0].Suit() != dragcard.Suit()) - { - return false; - } - break; - } /* Check if stack complete */ stackobj.GetFaceDirection(&facedown); faceup = stackobj.NumCards() - facedown; - + if (faceup + dragcards.NumCards() >= NUM_ONECOLOR_CARDS) { int i, max = NUM_ONECOLOR_CARDS - dragcards.NumCards() - 1; - BOOL remove = true; - - /* Dragged cards have been checked to be in order, start with the first stack card */ - for (i = 0; i < max; i++) - { - if (mystack[i].Suit() != mystack[i + 1].Suit() || - mystack[i].LoVal() != mystack[i + 1].LoVal() - 1) - { - remove = false; - break; - } - } - if (remove) + + /* Dragged cards have been checked to be in order, check stack cards */ + if (stackLookingGood(mystack, max)) { CardStack s = stackobj.GetCardStack(); CardStack f; - + /* Remove from card stack */ for (i = 0; i < max + 1; i++) {

1 0

[sginsberg] 43440: - Add the MMDBG_COPY_* flags and MmDbgCopyMemory's prototype. - Add KdpCopyMemoryChunks and use it to handle virtual memory read/write (physical memory support still stubbed). The actual copy is still a hack and its only safeguard against invalid memory is still a simple check for NULL. - Properly implement KdpReadVirtualMemory, KdpWriteVirtualMemory, KdpReadPhysicalmemory and KdpWritePhysicalmemory using KdpCopyMemoryChunks. - Merge Timo's ReportFlags fix from the AMD64 branc
by sginsberg＠svn.reactos.org 13 Oct '09

13 Oct '09

Author: sginsberg Date: Tue Oct 13 21:45:40 2009 New Revision: 43440 URL: http://svn.reactos.org/svn/reactos?rev=43440&view=rev Log: - Add the MMDBG_COPY_* flags and MmDbgCopyMemory's prototype. - Add KdpCopyMemoryChunks and use it to handle virtual memory read/write (physical memory support still stubbed). The actual copy is still a hack and its only safeguard against invalid memory is still a simple check for NULL. - Properly implement KdpReadVirtualMemory, KdpWriteVirtualMemory, KdpReadPhysicalmemory and KdpWritePhysicalmemory using KdpCopyMemoryChunks. - Merge Timo's ReportFlags fix from the AMD64 branch. - Implement KdpSysWriteMsr and KdpSysReadMsr for x86. SEH is commented as our GPF handler seems to swallow exceptions caused by accessing invalid MSRs. - Change DataValue parameter of KdpSysReadIoSpace and KdpSysWriteIoSpace to PVOID to better match how it is used. Modified: trunk/reactos/ntoskrnl/include/internal/kd64.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/kd64/amd64/kdsup.c trunk/reactos/ntoskrnl/kd64/arm/kdsup.c trunk/reactos/ntoskrnl/kd64/i386/kdsup.c trunk/reactos/ntoskrnl/kd64/kdapi.c 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] Tue Oct 13 21:45:40 2009 @@ -374,7 +374,7 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + IN PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize ); @@ -386,7 +386,7 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + IN PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize ); Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Tue Oct 13 21:45:40 2009 @@ -192,87 +192,6 @@ /* INTERNAL KERNEL FUNCTIONS ************************************************/ -/* Finds a new thread to run */ -NTSTATUS -FASTCALL -KiSwapThread( - IN PKTHREAD Thread, - IN PKPRCB Prcb -); - -VOID -NTAPI -KeReadyThread( - IN PKTHREAD Thread -); - -BOOLEAN -NTAPI -KeSetDisableBoostThread( - IN OUT PKTHREAD Thread, - IN BOOLEAN Disable -); - -VOID -NTAPI -KeBalanceSetManager(IN PVOID Context); - -VOID -NTAPI -KiReadyThread(IN PKTHREAD Thread); - -ULONG -NTAPI -KeSuspendThread(PKTHREAD Thread); - -BOOLEAN -NTAPI -KeReadStateThread(IN PKTHREAD Thread); - -BOOLEAN -FASTCALL -KiSwapContext( - IN PKTHREAD CurrentThread, - IN PKTHREAD NewThread -); - -VOID -NTAPI -KiAdjustQuantumThread(IN PKTHREAD Thread); - -VOID -FASTCALL -KiExitDispatcher(KIRQL OldIrql); - -VOID -FASTCALL -KiDeferredReadyThread(IN PKTHREAD Thread); - -PKTHREAD -FASTCALL -KiIdleSchedule( - IN PKPRCB Prcb -); - -VOID -FASTCALL -KiProcessDeferredReadyList( - IN PKPRCB Prcb -); - -KAFFINITY -FASTCALL -KiSetAffinityThread( - IN PKTHREAD Thread, - IN KAFFINITY Affinity -); - -PKTHREAD -FASTCALL -KiSelectNextThread( - IN PKPRCB Prcb -); - VOID NTAPI CPUID( @@ -281,6 +200,100 @@ OUT PULONG CpuInfoEbx, OUT PULONG CpuInfoEcx, OUT PULONG CpuInfoEdx +); + +LONGLONG +FASTCALL +RDMSR( + IN ULONG Register +); + +VOID +NTAPI +WRMSR( + IN ULONG Register, + IN LONGLONG Value +); + +/* Finds a new thread to run */ +NTSTATUS +FASTCALL +KiSwapThread( + IN PKTHREAD Thread, + IN PKPRCB Prcb +); + +VOID +NTAPI +KeReadyThread( + IN PKTHREAD Thread +); + +BOOLEAN +NTAPI +KeSetDisableBoostThread( + IN OUT PKTHREAD Thread, + IN BOOLEAN Disable +); + +VOID +NTAPI +KeBalanceSetManager(IN PVOID Context); + +VOID +NTAPI +KiReadyThread(IN PKTHREAD Thread); + +ULONG +NTAPI +KeSuspendThread(PKTHREAD Thread); + +BOOLEAN +NTAPI +KeReadStateThread(IN PKTHREAD Thread); + +BOOLEAN +FASTCALL +KiSwapContext( + IN PKTHREAD CurrentThread, + IN PKTHREAD NewThread +); + +VOID +NTAPI +KiAdjustQuantumThread(IN PKTHREAD Thread); + +VOID +FASTCALL +KiExitDispatcher(KIRQL OldIrql); + +VOID +FASTCALL +KiDeferredReadyThread(IN PKTHREAD Thread); + +PKTHREAD +FASTCALL +KiIdleSchedule( + IN PKPRCB Prcb +); + +VOID +FASTCALL +KiProcessDeferredReadyList( + IN PKPRCB Prcb +); + +KAFFINITY +FASTCALL +KiSetAffinityThread( + IN PKTHREAD Thread, + IN KAFFINITY Affinity +); + +PKTHREAD +FASTCALL +KiSelectNextThread( + IN PKPRCB Prcb ); BOOLEAN @@ -1006,13 +1019,6 @@ NTAPI KiI386PentiumLockErrataFixup(VOID); -VOID -NTAPI -WRMSR( - IN ULONG Register, - IN LONGLONG Value -); - BOOLEAN NTAPI KeFreezeExecution(IN PKTRAP_FRAME TrapFrame, 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] Tue Oct 13 21:45:40 2009 @@ -29,6 +29,22 @@ struct _MM_PAGEOP; typedef ULONG SWAPENTRY; typedef ULONG PFN_TYPE, *PPFN_TYPE; + +// +//MmDbgCopyMemory Flags +// +#define MMDBG_COPY_WRITE 0x00000001 +#define MMDBG_COPY_PHYSICAL 0x00000002 +#define MMDBG_COPY_UNSAFE 0x00000004 +#define MMDBG_COPY_CACHED 0x00000008 +#define MMDBG_COPY_UNCACHED 0x00000010 +#define MMDBG_COPY_WRITE_COMBINED 0x00000020 + +// +// Maximum chunk size per copy +// +#define MMDBG_COPY_MAX_SIZE 0x8 + #define MI_STATIC_MEMORY_AREAS (8) @@ -455,6 +471,18 @@ BOOLEAN Dirty ); +// +// Mm copy support for Kd +// +NTSTATUS +NTAPI +MmDbgCopyMemory( + IN ULONG64 Address, + IN PVOID Buffer, + IN ULONG Size, + IN ULONG Flags +); + /* marea.c *******************************************************************/ NTSTATUS Modified: trunk/reactos/ntoskrnl/kd64/amd64/kdsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/amd64/kdsup.… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/amd64/kdsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/amd64/kdsup.c [iso-8859-1] Tue Oct 13 21:45:40 2009 @@ -125,7 +125,7 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + IN PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize) { @@ -140,7 +140,7 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + IN PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize) { Modified: trunk/reactos/ntoskrnl/kd64/arm/kdsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/arm/kdsup.c?… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/arm/kdsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/arm/kdsup.c [iso-8859-1] Tue Oct 13 21:45:40 2009 @@ -125,7 +125,7 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + IN PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize) { @@ -140,7 +140,7 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + IN PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize) { Modified: trunk/reactos/ntoskrnl/kd64/i386/kdsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd64/i386/kdsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/kd64/i386/kdsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd64/i386/kdsup.c [iso-8859-1] Tue Oct 13 21:45:40 2009 @@ -95,7 +95,7 @@ WaitStateChange->ControlReport.ReportFlags = REPORT_INCLUDES_SEGS; if (WaitStateChange->ControlReport.SegCs == KGDT_R0_CODE) { - WaitStateChange->ControlReport.ReportFlags = REPORT_STANDARD_CS; + WaitStateChange->ControlReport.ReportFlags |= REPORT_STANDARD_CS; } } @@ -104,9 +104,21 @@ KdpSysReadMsr(IN ULONG Msr, OUT PLARGE_INTEGER MsrValue) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_UNSUCCESSFUL; + /* Wrap this in SEH in case the MSR doesn't exist */ + //_SEH2_TRY + { + /* Read from the MSR */ + MsrValue->QuadPart = RDMSR(Msr); + } + //_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Invalid MSR */ + //_SEH2_YIELD(return STATUS_NO_SUCH_DEVICE); + } + //_SEH2_END; + + /* Success */ + return STATUS_SUCCESS; } NTSTATUS @@ -114,9 +126,21 @@ KdpSysWriteMsr(IN ULONG Msr, IN PLARGE_INTEGER MsrValue) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_UNSUCCESSFUL; + /* Wrap this in SEH in case the MSR doesn't exist */ + //_SEH2_TRY + { + /* Write to the MSR */ + WRMSR(Msr, MsrValue->QuadPart); + } + //_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Invalid MSR */ + //_SEH2_YIELD(return STATUS_NO_SUCH_DEVICE); + } + //_SEH2_END; + + /* Success */ + return STATUS_SUCCESS; } NTSTATUS @@ -228,7 +252,7 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + IN PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize) { @@ -243,7 +267,7 @@ IN ULONG BusNumber, IN ULONG AddressSpace, IN ULONG64 IoAddress, - IN PULONG DataValue, + IN PVOID DataValue, IN ULONG DataSize, OUT PULONG ActualDataSize) { 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] Tue Oct 13 21:45:40 2009 @@ -13,6 +13,76 @@ #include <debug.h> /* PRIVATE FUNCTIONS *********************************************************/ + +NTSTATUS +NTAPI +KdpCopyMemoryChunks(IN ULONG64 Address, + IN PVOID Buffer, + IN ULONG TotalSize, + IN ULONG ChunkSize, + IN ULONG Flags, + OUT PULONG ActualSize OPTIONAL) +{ + ULONG Length; + NTSTATUS Status; + + /* Check if this is physical or virtual copy */ + if (Flags & MMDBG_COPY_PHYSICAL) + { + /* Fail physical memory read/write for now */ + if (Flags & MMDBG_COPY_WRITE) + { + KdpDprintf("KdpCopyMemoryChunks: Failing write for Physical Address 0x%I64x Length: %x\n", + Address, + TotalSize); + } + else + { + KdpDprintf("KdpCopyMemoryChunks: Failing read for Physical Address 0x%I64x Length: %x\n", + Address, + TotalSize); + } + + /* Return an error */ + Length = 0; + Status = STATUS_UNSUCCESSFUL; + } + else + { + /* Protect against NULL */ + if (!Address) + { + if (ActualSize) *ActualSize = 0; + return STATUS_UNSUCCESSFUL; + } + + /* Check if this is read or write */ + if (Flags & MMDBG_COPY_WRITE) + { + /* Do the write */ + RtlCopyMemory((PVOID)(ULONG_PTR)Address, + Buffer, + TotalSize); + } + else + { + /* Do the read */ + RtlCopyMemory(Buffer, + (PVOID)(ULONG_PTR)Address, + TotalSize); + } + + /* Set size and status */ + Length = TotalSize; + Status = STATUS_SUCCESS; + } + + /* Return the actual length if requested */ + if (ActualSize) *ActualSize = Length; + + /* Return status */ + return Status; +} VOID NTAPI @@ -264,9 +334,14 @@ IN PSTRING Data, IN PCONTEXT Context) { - STRING Header; - ULONG Length = State->u.ReadMemory.TransferCount; - NTSTATUS Status = STATUS_SUCCESS; + PDBGKD_READ_MEMORY64 ReadMemory = &State->u.ReadMemory; + STRING Header; + ULONG Length = ReadMemory->TransferCount; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + ASSERT(Data->Length == 0); /* Validate length */ if (Length > (PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64))) @@ -275,35 +350,16 @@ Length = PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64); } -#if 0 - if (!MmIsAddressValid((PVOID)(ULONG_PTR)State->u.ReadMemory.TargetBaseAddress)) - { - KdpDprintf("Tried to read invalid address %p\n", - (PVOID)(ULONG_PTR)State->u.ReadMemory.TargetBaseAddress); - while (TRUE); - } -#endif - - if (!State->u.ReadMemory.TargetBaseAddress) - { - Length = 0; - Status = STATUS_UNSUCCESSFUL; - } - else - { - RtlCopyMemory(Data->Buffer, - (PVOID)(ULONG_PTR)State->u.ReadMemory.TargetBaseAddress, - Length); - } - - /* Fill out the header */ - Data->Length = Length; - Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); - Header.Buffer = (PCHAR)State; - - /* Fill out the state */ - State->ReturnStatus = Status; - State->u.ReadMemory.ActualBytesRead = Length; + /* Do the read */ + State->ReturnStatus = KdpCopyMemoryChunks(ReadMemory->TargetBaseAddress, + Data->Buffer, + Length, + 0, + MMDBG_COPY_UNSAFE, + &Length); + + /* Return the actual length read */ + Data->Length = ReadMemory->ActualBytesRead = Length; /* Send the packet */ KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, @@ -318,11 +374,27 @@ IN PSTRING Data, IN PCONTEXT Context) { - /* FIXME: STUB */ - KdpDprintf("KdpWriteVirtualMemory called for Address: %p Length %x\n", - (PVOID)(ULONG_PTR)State->u.ReadMemory.TargetBaseAddress, - State->u.ReadMemory.TransferCount); - while (TRUE); + PDBGKD_WRITE_MEMORY64 WriteMemory = &State->u.WriteMemory; + STRING Header; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + + /* Do the write */ + State->ReturnStatus = KdpCopyMemoryChunks(WriteMemory->TargetBaseAddress, + Data->Buffer, + Data->Length, + 0, + MMDBG_COPY_UNSAFE | + MMDBG_COPY_WRITE, + &WriteMemory->ActualBytesWritten); + + /* Send the packet */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + NULL, + &KdpContext); } VOID @@ -331,20 +403,56 @@ IN PSTRING Data, IN PCONTEXT Context) { - STRING Header; - - /* FIXME: STUB */ - KdpDprintf("KdpWritePhysicalMemory called for Address %I64x Length: %x\n", - State->u.ReadMemory.TargetBaseAddress, - State->u.ReadMemory.TransferCount); - - /* Setup an empty message, with failure */ - Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); - Header.Buffer = (PCHAR)State; - Data->Length = 0; - State->ReturnStatus = STATUS_UNSUCCESSFUL; - - /* Send it */ + PDBGKD_READ_MEMORY64 ReadMemory = &State->u.ReadMemory; + STRING Header; + ULONG Length = ReadMemory->TransferCount; + ULONG Flags, CacheFlags; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + ASSERT(Data->Length == 0); + + /* Validate length */ + if (Length > (PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64))) + { + /* Overflow, set it to maximum possible */ + Length = PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64); + } + + /* Start with the default flags */ + Flags = MMDBG_COPY_UNSAFE | MMDBG_COPY_PHYSICAL; + + /* Get the caching flags and check if a type is specified */ + CacheFlags = ReadMemory->ActualBytesRead; + if (CacheFlags == DBGKD_CACHING_CACHED) + { + /* Cached */ + Flags |= MMDBG_COPY_CACHED; + } + else if (CacheFlags == DBGKD_CACHING_UNCACHED) + { + /* Uncached */ + Flags |= MMDBG_COPY_UNCACHED; + } + else if (CacheFlags == DBGKD_CACHING_UNCACHED) + { + /* Write Combined */ + Flags |= DBGKD_CACHING_WRITE_COMBINED; + } + + /* Do the read */ + State->ReturnStatus = KdpCopyMemoryChunks(ReadMemory->TargetBaseAddress, + Data->Buffer, + Length, + 0, + Flags, + &Length); + + /* Return the actual length read */ + Data->Length = ReadMemory->ActualBytesRead = Length; + + /* Send the packet */ KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, &Header, Data, @@ -357,23 +465,47 @@ IN PSTRING Data, IN PCONTEXT Context) { - STRING Header; - - /* FIXME: STUB */ - KdpDprintf("KdpWritePhysicalMemory called for Address %I64x Length: %x\n", - State->u.ReadMemory.TargetBaseAddress, - State->u.ReadMemory.TransferCount); - - /* Setup an empty message, with failure */ - Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); - Header.Buffer = (PCHAR)State; - Data->Length = 0; - State->ReturnStatus = STATUS_UNSUCCESSFUL; - - /* Send it */ - KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, - &Header, - Data, + PDBGKD_WRITE_MEMORY64 WriteMemory = &State->u.WriteMemory; + STRING Header; + ULONG Flags, CacheFlags; + + /* Setup the header */ + Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); + Header.Buffer = (PCHAR)State; + + /* Start with the default flags */ + Flags = MMDBG_COPY_UNSAFE | MMDBG_COPY_WRITE | MMDBG_COPY_PHYSICAL; + + /* Get the caching flags and check if a type is specified */ + CacheFlags = WriteMemory->ActualBytesWritten; + if (CacheFlags == DBGKD_CACHING_CACHED) + { + /* Cached */ + Flags |= MMDBG_COPY_CACHED; + } + else if (CacheFlags == DBGKD_CACHING_UNCACHED) + { + /* Uncached */ + Flags |= MMDBG_COPY_UNCACHED; + } + else if (CacheFlags == DBGKD_CACHING_UNCACHED) + { + /* Write Combined */ + Flags |= DBGKD_CACHING_WRITE_COMBINED; + } + + /* Do the write */ + State->ReturnStatus = KdpCopyMemoryChunks(WriteMemory->TargetBaseAddress, + Data->Buffer, + Data->Length, + 0, + Flags, + &WriteMemory->ActualBytesWritten); + + /* Send the packet */ + KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, + &Header, + NULL, &KdpContext); } @@ -425,7 +557,6 @@ { PDBGKD_WRITE_MEMORY64 WriteMemory = &State->u.WriteMemory; STRING Header; - ULONG Length; /* Setup the header */ Header.Length = sizeof(DBGKD_MANIPULATE_STATE64); @@ -436,10 +567,7 @@ WriteMemory->TargetBaseAddress, Data->Buffer, Data->Length, - &Length); - - /* Return the length written */ - WriteMemory->ActualBytesWritten = Length; + &WriteMemory->ActualBytesWritten); /* Send the reply */ KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE, @@ -835,7 +963,7 @@ Header.Buffer = (PCHAR)State; /* Call the internal routine */ - State->ReturnStatus = KdpSysCheckLowMemory(0x4); + State->ReturnStatus = KdpSysCheckLowMemory(MMDBG_COPY_UNSAFE); /* Send the reply */ KdSendPacket(PACKET_TYPE_KD_STATE_MANIPULATE,

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
65
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs October 2009