Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 43433: Implement KdpSysGetVersion, KdpGetStateChange, KdpSetContextState, KdpSysReadMsr, KdpSysWriteMsr, KdpSysReadControlSpace for amd64
by tkreuzer＠svn.reactos.org 13 Oct '09

13 Oct '09

Author: tkreuzer Date: Tue Oct 13 02:52:45 2009 New Revision: 43433 URL: http://svn.reactos.org/svn/reactos?rev=43433&view=rev Log: Implement KdpSysGetVersion, KdpGetStateChange, KdpSetContextState, KdpSysReadMsr, KdpSysWriteMsr, KdpSysReadControlSpace for amd64 Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kdsup.c 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] Tue Oct 13 02:52:45 2009 @@ -19,11 +19,66 @@ VOID NTAPI +KdpSysGetVersion(IN PDBGKD_GET_VERSION64 Version) +{ + Version->MajorVersion = 0; + Version->MinorVersion = 0; + Version->ProtocolVersion = DBGKD_64BIT_PROTOCOL_VERSION2; + Version->KdSecondaryVersion = KD_SECONDARY_VERSION_AMD64_CONTEXT; + Version->Flags = DBGKD_VERS_FLAG_PTR64 | DBGKD_VERS_FLAG_DATA; + Version->MachineType = IMAGE_FILE_MACHINE_AMD64; + Version->MaxPacketType = PACKET_TYPE_MAX; + Version->MaxStateChange = 0; + Version->MaxManipulate = 0; + Version->Simulation = DBGKD_SIMULATION_NONE; + Version->Unused[0] = 0; + Version->KernBase = 0xfffff80000800000ULL; + Version->PsLoadedModuleList = (ULONG_PTR)&KeLoaderBlock->LoadOrderListHead; + Version->DebuggerDataList = 0; +} + +VOID +NTAPI KdpGetStateChange(IN PDBGKD_MANIPULATE_STATE64 State, IN PCONTEXT Context) { - UNIMPLEMENTED; - while (TRUE); + PKPRCB Prcb; + ULONG i; + + /* Check for success */ + if (NT_SUCCESS(State->u.Continue2.ContinueStatus)) + { + /* Check if we're tracing */ + if (State->u.Continue2.ControlSet.TraceFlag) + { + /* Enable TF */ + Context->EFlags |= EFLAGS_TF; + } + else + { + /* Remove it */ + Context->EFlags &= ~EFLAGS_TF; + } + + /* Loop all processors */ + for (i = 0; i < KeNumberProcessors; i++) + { + /* Get the PRCB and update DR7 and DR6 */ + Prcb = KiProcessorBlock[i]; + Prcb->ProcessorState.SpecialRegisters.KernelDr7 = + State->u.Continue2.ControlSet.Dr7; + Prcb->ProcessorState.SpecialRegisters.KernelDr6 = 0; + } + + /* Check if we have new symbol information */ + if (State->u.Continue2.ControlSet.CurrentSymbolStart != 1) + { + /* Update it */ + KdpCurrentSymbolStart = + State->u.Continue2.ControlSet.CurrentSymbolStart; + KdpCurrentSymbolEnd= State->u.Continue2.ControlSet.CurrentSymbolEnd; + } + } } VOID @@ -31,16 +86,29 @@ KdpSetContextState(IN PDBGKD_WAIT_STATE_CHANGE64 WaitStateChange, IN PCONTEXT Context) { - UNIMPLEMENTED; - while (TRUE); -} - -VOID -NTAPI -KdpSysGetVersion(IN PDBGKD_GET_VERSION64 Version) -{ - UNIMPLEMENTED; - while (TRUE); + PKPRCB Prcb = KeGetCurrentPrcb(); + + /* Copy i386 specific debug registers */ + WaitStateChange->ControlReport.Dr6 = Prcb->ProcessorState.SpecialRegisters. + KernelDr6; + WaitStateChange->ControlReport.Dr7 = Prcb->ProcessorState.SpecialRegisters. + KernelDr7; + + /* Copy i386 specific segments */ + WaitStateChange->ControlReport.SegCs = (USHORT)Context->SegCs; + WaitStateChange->ControlReport.SegDs = (USHORT)Context->SegDs; + WaitStateChange->ControlReport.SegEs = (USHORT)Context->SegEs; + WaitStateChange->ControlReport.SegFs = (USHORT)Context->SegFs; + + /* Copy EFlags */ + WaitStateChange->ControlReport.EFlags = Context->EFlags; + + /* Set Report Flags */ + WaitStateChange->ControlReport.ReportFlags = REPORT_INCLUDES_SEGS; + if (WaitStateChange->ControlReport.SegCs == KGDT_64_R0_CODE) + { + WaitStateChange->ControlReport.ReportFlags = REPORT_STANDARD_CS; + } } NTSTATUS @@ -48,9 +116,8 @@ KdpSysReadMsr(IN ULONG Msr, OUT PLARGE_INTEGER MsrValue) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_UNSUCCESSFUL; + MsrValue->QuadPart = __readmsr(Msr); + return STATUS_SUCCESS; } NTSTATUS @@ -58,9 +125,8 @@ KdpSysWriteMsr(IN ULONG Msr, IN PLARGE_INTEGER MsrValue) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_UNSUCCESSFUL; + __writemsr(Msr, MsrValue->QuadPart); + return STATUS_SUCCESS; } NTSTATUS @@ -101,9 +167,55 @@ IN ULONG Length, OUT PULONG ActualLength) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_UNSUCCESSFUL; + PVOID ControlStart; + ULONG RealLength; + + if ((ULONG)BaseAddress <= 2) + { + PKPRCB Prcb = KiProcessorBlock[Processor]; + PKIPCR Pcr = CONTAINING_RECORD(Prcb, KIPCR, Prcb); + + switch ((ULONG_PTR)BaseAddress) + { + case 0: + /* Copy a pointer to the Pcr */ + ControlStart = &Pcr; + RealLength = sizeof(PVOID); + break; + + case 1: + /* Copy a pointer to the Prcb */ + ControlStart = &Prcb; + RealLength = sizeof(PVOID); + break; + + case 2: + /* Copy SpecialRegisters */ + ControlStart = &Prcb->ProcessorState.SpecialRegisters; + RealLength = sizeof(KSPECIAL_REGISTERS); + break; + + default: + RealLength = 0; + ControlStart = NULL; + ASSERT(FALSE); + } + + if (RealLength < Length) Length = RealLength; + + /* Copy the memory */ + RtlCopyMemory(Buffer, ControlStart, Length); + *ActualLength = Length; + + /* Finish up */ + return STATUS_SUCCESS; + } + else + { + /* Invalid request */ + *ActualLength = 0; + return STATUS_UNSUCCESSFUL; + } } NTSTATUS

1 0

[tkreuzer] 43432: Add back some stuff that got lost in syncing
by tkreuzer＠svn.reactos.org 13 Oct '09

13 Oct '09

Author: tkreuzer Date: Tue Oct 13 02:33:04 2009 New Revision: 43432 URL: http://svn.reactos.org/svn/reactos?rev=43432&view=rev Log: Add back some stuff that got lost in syncing Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Tue Oct 13 02:33:04 2009 @@ -179,7 +179,7 @@ VOID NTAPI -DumpTraceData(IN PSTRING TraceData) +DumpTraceData(OUT PSTRING TraceData) { /* Update the buffer */ TraceDataBuffer[0] = TraceDataBufferPosition; @@ -196,7 +196,7 @@ NTAPI KdpSetCommonState(IN ULONG NewState, IN PCONTEXT Context, - IN PDBGKD_WAIT_STATE_CHANGE64 WaitStateChange) + OUT PDBGKD_WAIT_STATE_CHANGE64 WaitStateChange) { USHORT InstructionCount; BOOLEAN HadBreakpoints; @@ -267,6 +267,7 @@ STRING Header; ULONG Length = State->u.ReadMemory.TransferCount; NTSTATUS Status = STATUS_SUCCESS; + ULONG64 TargetBaseAddress = State->u.ReadMemory.TargetBaseAddress; /* Validate length */ if (Length > (PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64))) @@ -284,7 +285,15 @@ } #endif - if (!State->u.ReadMemory.TargetBaseAddress) + // HACK for x64, until KD stops sending bogus addresses to WinDbg + if (TargetBaseAddress < (ULONG_PTR)MM_LOWEST_SYSTEM_ADDRESS) + { + FrLdrDbgPrint("Trying to read memory at 0x%p\n", TargetBaseAddress); +// DPRINT1("Trying to read memory at 0x%p\n", TargetBaseAddress); + TargetBaseAddress = 0; + } + + if (!TargetBaseAddress) { Length = 0; Status = STATUS_UNSUCCESSFUL; @@ -1245,7 +1254,7 @@ KdpSetContextState(&WaitStateChange, Context); /* Setup the actual header to send to KD */ - Header.Length = sizeof(DBGKD_WAIT_STATE_CHANGE64); + Header.Length = sizeof(DBGKD_WAIT_STATE_CHANGE64) - sizeof(CONTEXT); Header.Buffer = (PCHAR)&WaitStateChange; /* Setup the trace data */

1 0

[dgorbachev] 43431: Check for error.
by dgorbachev＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: dgorbachev Date: Tue Oct 13 01:52:56 2009 New Revision: 43431 URL: http://svn.reactos.org/svn/reactos?rev=43431&view=rev Log: Check for error. Modified: trunk/reactos/dll/win32/gdi32/objects/font.c Modified: trunk/reactos/dll/win32/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/fo… ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/gdi32/objects/font.c [iso-8859-1] Tue Oct 13 01:52:56 2009 @@ -916,6 +916,10 @@ INT countW; lpstrW = FONT_mbtowc(hdc, lpstr, count, &countW, NULL); + + if (lpstrW == NULL) + return GDI_ERROR; + Ret = NtGdiGetGlyphIndicesW(hdc, lpstrW, countW, pgi, flags); HeapFree(GetProcessHeap(), 0, lpstrW); return Ret;

1 0

[dgorbachev] 43430: Fix "array subscript is above array bounds" bug.
by dgorbachev＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: dgorbachev Date: Tue Oct 13 01:52:33 2009 New Revision: 43430 URL: http://svn.reactos.org/svn/reactos?rev=43430&view=rev Log: Fix "array subscript is above array bounds" bug. Modified: trunk/reactos/base/shell/explorer/i386-stub-win32.c Modified: trunk/reactos/base/shell/explorer/i386-stub-win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/i386-s… ============================================================================== --- trunk/reactos/base/shell/explorer/i386-stub-win32.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/i386-stub-win32.c [iso-8859-1] Tue Oct 13 01:52:33 2009 @@ -547,7 +547,7 @@ count = 0; /* now, read until a # or end of buffer is found */ - while (count < BUFMAX) + while (count < BUFMAX - 1) { ch = getDebugChar (); if (ch == '$')

1 0

[tkreuzer] 43429: On 64 bit sizeof(POOL_HEADER) != sizeof(LIST_ENTRY)! I have not checked how this stuff works, but this way it's not portable. Comment out the C_ASSERT to make it at least compile on 64 bit.
by tkreuzer＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: tkreuzer Date: Tue Oct 13 01:32:44 2009 New Revision: 43429 URL: http://svn.reactos.org/svn/reactos?rev=43429&view=rev Log: On 64 bit sizeof(POOL_HEADER) != sizeof(LIST_ENTRY)! I have not checked how this stuff works, but this way it's not portable. Comment out the C_ASSERT to make it at least compile on 64 bit. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Tue Oct 13 01:32:44 2009 @@ -81,7 +81,7 @@ // Everything depends on this // C_ASSERT(sizeof(POOL_HEADER) == 8); -C_ASSERT(sizeof(POOL_HEADER) == sizeof(LIST_ENTRY)); +//C_ASSERT(sizeof(POOL_HEADER) == sizeof(LIST_ENTRY)); extern POOL_DESCRIPTOR NonPagedPoolDescriptor;

1 0

[tkreuzer] 43428: ARM3 64bit portability fixes.
by tkreuzer＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: tkreuzer Date: Tue Oct 13 01:29:14 2009 New Revision: 43428 URL: http://svn.reactos.org/svn/reactos?rev=43428&view=rev Log: ARM3 64bit portability fixes. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/contmem.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/iosup.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mdlsup.c branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/ncache.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/contmem.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/contmem.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/contmem.c [iso-8859-1] Tue Oct 13 01:29:14 2009 @@ -428,7 +428,7 @@ VOID NTAPI MmFreeContiguousMemorySpecifyCache(IN PVOID BaseAddress, - IN ULONG NumberOfBytes, + IN SIZE_T NumberOfBytes, IN MEMORY_CACHING_TYPE CacheType) { // Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/iosup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/iosup.c [iso-8859-1] Tue Oct 13 01:29:14 2009 @@ -180,7 +180,7 @@ VOID NTAPI MmUnmapIoSpace(IN PVOID BaseAddress, - IN ULONG NumberOfBytes) + IN SIZE_T NumberOfBytes) { PFN_NUMBER PageCount, Pfn; PMMPTE PointerPte; @@ -229,7 +229,7 @@ PVOID NTAPI MmMapVideoDisplay(IN PHYSICAL_ADDRESS PhysicalAddress, - IN ULONG NumberOfBytes, + IN SIZE_T NumberOfBytes, IN MEMORY_CACHING_TYPE CacheType) { PAGED_CODE(); @@ -246,7 +246,7 @@ VOID NTAPI MmUnmapVideoDisplay(IN PVOID BaseAddress, - IN ULONG NumberOfBytes) + IN SIZE_T NumberOfBytes) { // // Call the real function Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mdlsup.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/mdlsup.c [iso-8859-1] Tue Oct 13 01:29:14 2009 @@ -25,9 +25,9 @@ NTAPI MmCreateMdl(IN PMDL Mdl, IN PVOID Base, - IN ULONG Length) -{ - ULONG Size; + IN SIZE_T Length) +{ + SIZE_T Size; // // Check if we don't have an MDL built @@ -52,10 +52,10 @@ /* * @implemented */ -ULONG +SIZE_T NTAPI MmSizeOfMdl(IN PVOID Base, - IN ULONG Length) + IN SIZE_T Length) { // // Return the MDL size @@ -566,7 +566,7 @@ IN KPROCESSOR_MODE AccessMode, IN LOCK_OPERATION Operation) { - PPFN_TYPE MdlPages; + PPFN_NUMBER MdlPages; PVOID Base, Address, LastAddress, StartAddress; ULONG LockPages, TotalPages; NTSTATUS Status = STATUS_SUCCESS; Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/ncache.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/ncache.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/ARM3/ncache.c [iso-8859-1] Tue Oct 13 01:29:14 2009 @@ -172,7 +172,7 @@ VOID NTAPI MmFreeNonCachedMemory(IN PVOID BaseAddress, - IN ULONG NumberOfBytes) + IN SIZE_T NumberOfBytes) { PMDL Mdl; PMMPTE PointerPte;

1 0

[tkreuzer] 43427: Implement/fix some amd64 Mm macros
by tkreuzer＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: tkreuzer Date: Tue Oct 13 01:26:12 2009 New Revision: 43427 URL: http://svn.reactos.org/svn/reactos?rev=43427&view=rev Log: Implement/fix some amd64 Mm macros Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Tue Oct 13 01:26:12 2009 @@ -18,14 +18,21 @@ #define PAE_PAGE_MASK(x) ((x)&(~0xfffLL)) /* Base addresses of PTE and PDE */ -#define PAGETABLE_MAP (0xc0000000) -#define PAGEDIRECTORY_MAP (0xc0000000 + (PAGETABLE_MAP / (1024))) +//#define PAGETABLE_MAP PTE_BASE +//#define PAGEDIRECTORY_MAP (0xc0000000 + (PAGETABLE_MAP / (1024))) /* Converting address to a corresponding PDE or PTE entry */ +#define MiAddressToPxe(x) \ + ((PMMPTE)(((((ULONG64)(x)) >> PXI_SHIFT) << 3) + PXE_BASE)) +#define MiAddressToPpe(x) \ + ((PMMPTE)(((((ULONG64)(x)) >> PPI_SHIFT) << 3) + PPE_BASE)) #define MiAddressToPde(x) \ - ((PMMPTE)(((((ULONG64)(x)) >> 22) << 2) + PAGEDIRECTORY_MAP)) + ((PMMPTE)(((((ULONG64)(x)) >> PDI_SHIFT) << 3) + PDE_BASE)) #define MiAddressToPte(x) \ - ((PMMPTE)(((((ULONG64)(x)) >> 12) << 2) + PAGETABLE_MAP)) + ((PMMPTE)(((((ULONG64)(x)) >> PTI_SHIFT) << 3) + PTE_BASE)) + +/* Convert a PTE into a corresponding address */ +#define MiPteToAddress(PTE) ((PVOID)((ULONG64)(PTE) << 9)) //#define ADDR_TO_PAGE_TABLE(v) (((ULONG)(v)) / (1024 * PAGE_SIZE)) //#define ADDR_TO_PDE_OFFSET(v) ((((ULONG)(v)) / (1024 * PAGE_SIZE)))

1 0

[tkreuzer] 43426: [NDK] add CBSTACK_FRAME_POINTER for amd64
by tkreuzer＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: tkreuzer Date: Tue Oct 13 01:10:43 2009 New Revision: 43426 URL: http://svn.reactos.org/svn/reactos?rev=43426&view=rev Log: [NDK] add CBSTACK_FRAME_POINTER for amd64 Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h [iso-8859-1] Tue Oct 13 01:10:43 2009 @@ -246,6 +246,7 @@ #define CBSTACK_RBP 0x18 #define CBSTACK_RESULT 0x20 #define CBSTACK_RESULT_LENGTH 0x28 +#define CBSTACK_FRAME_POINTER CBSTACK_RBP /* Following ones are ASM only! ***********************************************/

1 0

[janderwald] 43425: - Add more types
by janderwald＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: janderwald Date: Tue Oct 13 00:44:17 2009 New Revision: 43425 URL: http://svn.reactos.org/svn/reactos?rev=43425&view=rev Log: - Add more types Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4342… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Tue Oct 13 00:44:17 2009 @@ -390,6 +390,15 @@ (SetHandler),\ NULL, 0, NULL, NULL, 0) +#define DEFINE_KSPROPERTY_ITEM_CONNECTION_PRIORITY(GetHandler, SetHandler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_CONNECTION_PRIORITY,\ + (GetHandler),\ + sizeof(KSPROPERTY),\ + sizeof(KSPRIORITY),\ + (SetHandler),\ + NULL, 0, NULL, NULL, 0) + #define DEFINE_KSPROPERTY_ITEM_CONNECTION_DATAFORMAT(GetHandler, SetHandler)\ DEFINE_KSPROPERTY_ITEM(\ KSPROPERTY_CONNECTION_DATAFORMAT,\ @@ -397,6 +406,48 @@ sizeof(KSPROPERTY),\ 0,\ (SetHandler),\ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_CONNECTION_ALLOCATORFRAMING(Handler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_CONNECTION_ALLOCATORFRAMING,\ + (Handler),\ + sizeof(KSPROPERTY),\ + sizeof(KSALLOCATOR_FRAMING),\ + NULL, NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_CONNECTION_ALLOCATORFRAMING_EX(Handler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_CONNECTION_ALLOCATORFRAMING_EX,\ + (Handler),\ + sizeof(KSPROPERTY),\ + 0,\ + NULL, NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_CONNECTION_PROPOSEDATAFORMAT(Handler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_CONNECTION_PROPOSEDATAFORMAT,\ + NULL,\ + sizeof(KSPROPERTY),\ + sizeof(KSDATAFORMAT),\ + (Handler),\ + NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_CONNECTION_ACQUIREORDERING(Handler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_CONNECTION_ACQUIREORDERING,\ + (Handler),\ + sizeof(KSPROPERTY),\ + sizeof(int),\ + NULL, NULL, 0, NULL, NULL, 0) + +#define DEFINE_KSPROPERTY_ITEM_CONNECTION_STARTAT(Handler)\ + DEFINE_KSPROPERTY_ITEM(\ + KSPROPERTY_CONNECTION_STARTAT,\ + NULL,\ + sizeof(KSPROPERTY),\ + sizeof(KSRELATIVEEVENT),\ + (Handler),\ NULL, 0, NULL, NULL, 0)

1 0

[janderwald] 43424: - Pointer / handle values should be printed with %p. Found by Christoph - Add the sum / mixer node to the destination pin - Only create MIXERVOLUME_DATA when there is an actual range - Use unsigned members to calculate the range
by janderwald＠svn.reactos.org 12 Oct '09

12 Oct '09

Author: janderwald Date: Tue Oct 13 00:36:10 2009 New Revision: 43424 URL: http://svn.reactos.org/svn/reactos?rev=43424&view=rev Log: - Pointer / handle values should be printed with %p. Found by Christoph - Add the sum / mixer node to the destination pin - Only create MIXERVOLUME_DATA when there is an actual range - Use unsigned members to calculate the range Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Tue Oct 13 00:36:10 2009 @@ -48,7 +48,7 @@ IN PWDMAUD_CLIENT ClientInfo) { ULONG Result = 0; - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; PWDMAUD_DEVICE_EXTENSION DeviceExtension; DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; @@ -179,7 +179,7 @@ Status = ObReferenceObjectByHandle(DeviceInfo->hDevice, GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Invalid buffer handle %x\n", DeviceInfo->hDevice); + DPRINT1("Invalid buffer handle %p\n", DeviceInfo->hDevice); return SetIrpIoStatus(Irp, Status, 0); } @@ -343,7 +343,7 @@ Status = ObReferenceObjectByHandle(DeviceInfo->hDevice, GENERIC_WRITE, IoFileObjectType, KernelMode, (PVOID*)&FileObject, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Invalid pin handle %x\n", DeviceInfo->hDevice); + DPRINT1("Invalid pin handle %p\n", DeviceInfo->hDevice); return SetIrpIoStatus(Irp, Status, 0); } 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] Tue Oct 13 00:36:10 2009 @@ -863,7 +863,7 @@ if (bUpDirection) { /* add the sum / mux node to destination line */ - //Nodes[NodeIndex] = TRUE; + Nodes[NodeIndex] = TRUE; } return STATUS_SUCCESS; @@ -1005,7 +1005,27 @@ } MixerInfo->ControlId++; - +#if 0 + if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_MUX) + { + KSNODEPROPERTY Property; + ULONG PinId = 2; + + /* setup the request */ + RtlZeroMemory(&Property, sizeof(KSNODEPROPERTY)); + + Property.NodeId = NodeIndex; + Property.Property.Id = KSPROPERTY_AUDIO_MUX_SOURCE; + Property.Property.Flags = KSPROPERTY_TYPE_SET; + Property.Property.Set = KSPROPSETID_Audio; + + /* get node volume level info */ + Status = KsSynchronousIoControlDevice(FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)&Property, sizeof(KSNODEPROPERTY), (PVOID)&PinId, sizeof(ULONG), &BytesReturned); + + DPRINT1("Status %x NodeIndex %u PinId %u\n", Status, NodeIndex, PinId); + //DbgBreakPoint(); + }else +#endif if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_VOLUME) { KSNODEPROPERTY_AUDIO_CHANNEL Property; @@ -1041,37 +1061,42 @@ DPRINT("NodeIndex %u Range Min %d Max %d Steps %x UMin %x UMax %x\n", NodeIndex, Range->Bounds.SignedMinimum, Range->Bounds.SignedMaximum, Range->SteppingDelta, Range->Bounds.UnsignedMinimum, Range->Bounds.UnsignedMaximum); - VolumeData = ExAllocatePool(NonPagedPool, sizeof(MIXERVOLUME_DATA)); - if (!VolumeData) - return STATUS_INSUFFICIENT_RESOURCES; - - MaxRange = (abs(Range->Bounds.SignedMinimum) + abs(Range->Bounds.SignedMaximum)); - Steps = MaxRange / Range->SteppingDelta + 1; - - /* store mixer control info there */ - VolumeData->Header.dwControlID = MixerControl->dwControlID; - VolumeData->SignedMaximum = Range->Bounds.SignedMaximum; - VolumeData->SignedMinimum = Range->Bounds.SignedMinimum; - VolumeData->SteppingDelta = Range->SteppingDelta; - VolumeData->ValuesCount = Steps; - VolumeData->InputSteppingDelta = 0x10000 / Steps; - - VolumeData->Values = ExAllocatePool(NonPagedPool, sizeof(LONG) * Steps); - if (!VolumeData->Values) - { - ExFreePool(Desc); - ExFreePool(VolumeData); - - return STATUS_INSUFFICIENT_RESOURCES; - } - - Value = Range->Bounds.SignedMinimum; - for(Index = 0; Index < Steps; Index++) - { - VolumeData->Values[Index] = Value; - Value += Range->SteppingDelta; - } - InsertTailList(&MixerLine->LineControlsExtraData, &VolumeData->Header.Entry); + MaxRange = Range->Bounds.UnsignedMaximum - Range->Bounds.UnsignedMinimum; + + if (MaxRange) + { + ASSERT(MaxRange); + VolumeData = ExAllocatePool(NonPagedPool, sizeof(MIXERVOLUME_DATA)); + if (!VolumeData) + return STATUS_INSUFFICIENT_RESOURCES; + + Steps = MaxRange / Range->SteppingDelta + 1; + + /* store mixer control info there */ + VolumeData->Header.dwControlID = MixerControl->dwControlID; + VolumeData->SignedMaximum = Range->Bounds.SignedMaximum; + VolumeData->SignedMinimum = Range->Bounds.SignedMinimum; + VolumeData->SteppingDelta = Range->SteppingDelta; + VolumeData->ValuesCount = Steps; + VolumeData->InputSteppingDelta = 0x10000 / Steps; + + VolumeData->Values = ExAllocatePool(NonPagedPool, sizeof(LONG) * Steps); + if (!VolumeData->Values) + { + ExFreePool(Desc); + ExFreePool(VolumeData); + + return STATUS_INSUFFICIENT_RESOURCES; + } + + Value = Range->Bounds.SignedMinimum; + for(Index = 0; Index < Steps; Index++) + { + VolumeData->Values[Index] = Value; + Value += Range->SteppingDelta; + } + InsertTailList(&MixerLine->LineControlsExtraData, &VolumeData->Header.Entry); + } } ExFreePool(Desc); } @@ -1445,6 +1470,7 @@ PinsSrcRef[Index] = TRUE; PinsSrcRef[OutConnection->Pin] = TRUE; } + PinsSrcRef[OutConnection->Pin] = TRUE; Status = AddMixerSourceLines(MixerInfo, FileObject, NodeConnections, NodeTypes, DeviceIndex, PinsRefCount, OutConnection->Pin, Index, PinsSrcRef); @@ -2208,6 +2234,7 @@ } Status = STATUS_NOT_IMPLEMENTED; + DPRINT("dwLineId %x dwControlID %x dwControlType %x\n", MixerLine->Line.dwLineID, MixerControl->dwControlID, MixerControl->dwControlType); if (MixerControl->dwControlType == MIXERCONTROL_CONTROLTYPE_MUTE) { /* send the request */ Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] Tue Oct 13 00:36:10 2009 @@ -5,7 +5,7 @@ #include <ntddk.h> #include <portcls.h> #include <ks.h> -#define NDEBUG +#define YDEBUG #include <debug.h> #include <ksmedia.h> #include <mmreg.h>

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