Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 52559: [IP] - Return the amount of data sent in XXXSendDatagram() functions - Fixes send() and sendto() return values for datagram sockets (bug exposed by the AFD send user-mode IRP rewrite)
by cgutman＠svn.reactos.org 07 Jul '11

07 Jul '11

Author: cgutman Date: Thu Jul 7 20:02:52 2011 New Revision: 52559 URL: http://svn.reactos.org/svn/reactos?rev=52559&view=rev Log: [IP] - Return the amount of data sent in XXXSendDatagram() functions - Fixes send() and sendto() return values for datagram sockets (bug exposed by the AFD send user-mode IRP rewrite) Modified: trunk/reactos/lib/drivers/ip/network/icmp.c trunk/reactos/lib/drivers/ip/transport/rawip/rawip.c trunk/reactos/lib/drivers/ip/transport/udp/udp.c 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] Thu Jul 7 20:02:52 2011 @@ -228,6 +228,8 @@ FreeNdisPacket(Packet.NdisPacket); return Status; } + + *DataUsed = DataSize; TI_DbgPrint(MID_TRACE,("Leaving\n")); 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] Thu Jul 7 20:02:52 2011 @@ -261,6 +261,8 @@ FreeNdisPacket(Packet.NdisPacket); return Status; } + + *DataUsed = DataSize; TI_DbgPrint(MID_TRACE,("Leaving\n")); 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] Thu Jul 7 20:02:52 2011 @@ -234,6 +234,8 @@ FreeNdisPacket(Packet.NdisPacket); return Status; } + + *DataUsed = DataSize; return STATUS_SUCCESS; }

1 0

[dgorbachev] 52558: Fix failed rel build.
by dgorbachev＠svn.reactos.org 07 Jul '11

07 Jul '11

Author: dgorbachev Date: Thu Jul 7 19:50:52 2011 New Revision: 52558 URL: http://svn.reactos.org/svn/reactos?rev=52558&view=rev Log: Fix failed rel build. Modified: trunk/reactos/ntoskrnl/kd/kdio.c trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/kd/kdio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdio.c?rev=525… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] Thu Jul 7 19:50:52 2011 @@ -39,7 +39,7 @@ volatile ULONG KdpDmesgFreeBytes = 0; volatile ULONG KdbDmesgTotalWritten = 0; KSPIN_LOCK KdpDmesgLogSpinLock; -extern volatile BOOLEAN KdbpIsInDmesgMode; +volatile BOOLEAN KdbpIsInDmesgMode = FALSE; /* FILE DEBUG LOG FUNCTIONS **************************************************/ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Thu Jul 7 19:50:52 2011 @@ -110,10 +110,8 @@ BOOLEAN KdbpBugCheckRequested = FALSE; /* Vars for dmesg */ -/* defined here, used in ../kd/kdio.c: */ -volatile BOOLEAN KdbpIsInDmesgMode = FALSE; - /* defined in ../kd/kdio.c, declare here: */ +extern volatile BOOLEAN KdbpIsInDmesgMode; extern const ULONG KdpDmesgBufferSize; extern PCHAR KdpDmesgBuffer; extern volatile ULONG KdpDmesgCurrentPosition;

1 0

[dgorbachev] 52557: [FREELDR] - Move read-only data into data section (allows to boot with GRUB again). - Discard .drectve sections. - Silence "set but not used" warnings.
by dgorbachev＠svn.reactos.org 07 Jul '11

07 Jul '11

Author: dgorbachev Date: Thu Jul 7 19:19:44 2011 New Revision: 52557 URL: http://svn.reactos.org/svn/reactos?rev=52557&view=rev Log: [FREELDR] - Move read-only data into data section (allows to boot with GRUB again). - Discard .drectve sections. - Silence "set but not used" warnings. Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lnk trunk/reactos/boot/freeldr/freeldr/fs/ext2.c trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c trunk/reactos/boot/freeldr/freeldr/inifile/parse.c trunk/reactos/boot/freeldr/freeldr/ui/ui.c trunk/reactos/boot/freeldr/freeldr/windows/i386/ntsetup.c trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c [iso-8859-1] Thu Jul 7 19:19:44 2011 @@ -34,7 +34,7 @@ { PCM_PARTIAL_RESOURCE_LIST PartialResourceList; PCM_DISK_GEOMETRY_DEVICE_DATA DiskGeometry; - EXTENDED_GEOMETRY ExtGeometry; + //EXTENDED_GEOMETRY ExtGeometry; GEOMETRY Geometry; ULONG Size; @@ -69,7 +69,7 @@ DiskGeometry = (PVOID)(((ULONG_PTR)PartialResourceList) + sizeof(CM_PARTIAL_RESOURCE_LIST)); /* Get the disk geometry */ - ExtGeometry.Size = sizeof(EXTENDED_GEOMETRY); + //ExtGeometry.Size = sizeof(EXTENDED_GEOMETRY); if(MachDiskGetDriveGeometry(DriveNumber, &Geometry)) { Modified: trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lnk URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/freel… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lnk [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/freeldr_i386.lnk [iso-8859-1] Thu Jul 7 19:19:44 2011 @@ -32,17 +32,18 @@ *(.data) *(.data2) *(SORT(.data$*)) + *(.rdata) + *(SORT(.rdata$*)) + *(.eh_frame) __data_end__ = . ; __bss_start__ = . ; *(.bss) *(COMMON) __bss_end__ = . ; } - .rdata BLOCK(__section_alignment__) : + /DISCARD/ : { - *(.rdata) - *(SORT(.rdata$*)) - *(.eh_frame) + *(.drectve) } .stab BLOCK(__section_alignment__) (NOLOAD) : { Modified: trunk/reactos/boot/freeldr/freeldr/fs/ext2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/ex… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ext2.c [iso-8859-1] Thu Jul 7 19:19:44 2011 @@ -1196,12 +1196,12 @@ LONG Ext2Open(CHAR* Path, OPENMODE OpenMode, ULONG* FileId) { PEXT2_FILE_INFO FileHandle; - ULONG DeviceId; + //ULONG DeviceId; if (OpenMode != OpenReadOnly) return EACCES; - DeviceId = FsGetDeviceId(*FileId); + //DeviceId = FsGetDeviceId(*FileId); DPRINTM(DPRINT_FILESYSTEM, "Ext2Open() FileName = %s\n", Path); Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/nt… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c [iso-8859-1] Thu Jul 7 19:19:44 2011 @@ -536,7 +536,7 @@ static BOOLEAN NtfsFindMftRecord(PNTFS_VOLUME_INFO Volume, ULONGLONG MFTIndex, PCHAR FileName, ULONGLONG *OutMFTIndex) { PNTFS_MFT_RECORD MftRecord; - ULONG Magic; + //ULONG Magic; PNTFS_ATTR_CONTEXT IndexRootCtx; PNTFS_ATTR_CONTEXT IndexBitmapCtx; PNTFS_ATTR_CONTEXT IndexAllocationCtx; @@ -557,7 +557,7 @@ if (NtfsReadMftRecord(Volume, MFTIndex, MftRecord)) { - Magic = MftRecord->Magic; + //Magic = MftRecord->Magic; IndexRootCtx = NtfsFindAttribute(Volume, MftRecord, NTFS_ATTR_TYPE_INDEX_ROOT, L"$I30"); if (IndexRootCtx == NULL) Modified: trunk/reactos/boot/freeldr/freeldr/inifile/parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inifile/parse.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/inifile/parse.c [iso-8859-1] Thu Jul 7 19:19:44 2011 @@ -180,12 +180,11 @@ ULONG IniGetNextLineSize(PCHAR IniFileData, ULONG IniFileSize, ULONG CurrentOffset) { - ULONG Idx; ULONG LineCharCount = 0; // Loop through counting chars until we hit the end of the // file or we encounter a new line char - for (Idx=0; (CurrentOffset < IniFileSize); CurrentOffset++) + for (; (CurrentOffset < IniFileSize); CurrentOffset++) { // Increment the line character count LineCharCount++; @@ -193,7 +192,6 @@ // Check for new line char if (IniFileData[CurrentOffset] == '\n') { - CurrentOffset++; break; } } Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/ui… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] Thu Jul 7 19:19:44 2011 @@ -225,14 +225,13 @@ BOOLEAN SetupUiInitialize(VOID) { - VIDEODISPLAYMODE UiDisplayMode; CHAR DisplayModeText[260]; ULONG Depth, Length; DisplayModeText[0] = '\0'; - UiDisplayMode = MachVideoSetDisplayMode(DisplayModeText, TRUE); + MachVideoSetDisplayMode(DisplayModeText, TRUE); MachVideoGetDisplaySize(&UiScreenWidth, &UiScreenHeight, &Depth); UiVtbl = TuiVtbl; Modified: trunk/reactos/boot/freeldr/freeldr/windows/i386/ntsetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/i386/ntsetup.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/i386/ntsetup.c [iso-8859-1] Thu Jul 7 19:19:44 2011 @@ -41,7 +41,7 @@ ULONG *TssBasePage) { ULONG TssSize; - ULONG TssPages; + //ULONG TssPages; ULONG_PTR Pcr = 0; ULONG_PTR Tss = 0; ULONG BlockSize, NumPages; @@ -61,7 +61,7 @@ /* Allocate TSS */ TssSize = (sizeof(KTSS) + MM_PAGE_SIZE) & ~(MM_PAGE_SIZE - 1); - TssPages = TssSize / MM_PAGE_SIZE; + //TssPages = TssSize / MM_PAGE_SIZE; Tss = (ULONG_PTR)MmAllocateMemoryWithType(TssSize, LoaderMemoryData); Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c [iso-8859-1] Thu Jul 7 19:19:44 2011 @@ -224,7 +224,7 @@ ULONG LastPageIndex, LastPageType, MemoryMapStartPage; PPAGE_LOOKUP_TABLE_ITEM MemoryMap; ULONG NoEntries; - PKTSS Tss; + //PKTSS Tss; BOOLEAN Status; // @@ -353,7 +353,7 @@ /* Map stuff like PCR, KI_USER_SHARED_DATA and Apic */ WinLdrMapSpecialPages(PcrBasePage); - Tss = (PKTSS)(KSEG0_BASE | (TssBasePage << MM_PAGE_SHIFT)); + //Tss = (PKTSS)(KSEG0_BASE | (TssBasePage << MM_PAGE_SHIFT)); // Unmap what is not needed from kernel page table MempDisablePages();

1 0

[dgorbachev] 52556: [NTOSKRNL] Minas Abrahamyan (minas \dot/ subs \at/ gmail \dot/ com): - Allow to view already shown, logged debug messages on the screen (bug #6018).
by dgorbachev＠svn.reactos.org 07 Jul '11

07 Jul '11

Author: dgorbachev Date: Thu Jul 7 19:18:16 2011 New Revision: 52556 URL: http://svn.reactos.org/svn/reactos?rev=52556&view=rev Log: [NTOSKRNL] Minas Abrahamyan (minas \dot/ subs \at/ gmail \dot/ com): - Allow to view already shown, logged debug messages on the screen (bug #6018). Modified: trunk/reactos/ntoskrnl/kd/kdio.c trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/kd/kdio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdio.c?rev=525… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] Thu Jul 7 19:18:16 2011 @@ -33,7 +33,15 @@ CHAR KdpScreenLineBuffer[KdpScreenLineLenght + 1] = ""; ULONG KdpScreenLineBufferPos = 0, KdpScreenLineLength = 0; -/* DEBUG LOG FUNCTIONS *******************************************************/ +const ULONG KdpDmesgBufferSize = 128 * 1024; // 512*1024; // 5*1024*1024; +PCHAR KdpDmesgBuffer = NULL; +volatile ULONG KdpDmesgCurrentPosition = 0; +volatile ULONG KdpDmesgFreeBytes = 0; +volatile ULONG KdbDmesgTotalWritten = 0; +KSPIN_LOCK KdpDmesgLogSpinLock; +extern volatile BOOLEAN KdbpIsInDmesgMode; + +/* FILE DEBUG LOG FUNCTIONS **************************************************/ VOID NTAPI @@ -49,8 +57,14 @@ KeWaitForSingleObject(&KdpLoggerThreadEvent, 0, KernelMode, FALSE, NULL); /* Bug */ + /* Keep KdpCurrentPosition and KdpFreeBytes values in local + * variables to avoid their possible change from Producer part, + * KdpPrintToLogFile function + */ end = KdpCurrentPosition; num = KdpFreeBytes; + + /* Now securely calculate values, based on local variables */ beg = (end + num) % KdpBufferSize; num = KdpBufferSize - num; @@ -148,6 +162,7 @@ IO_STATUS_BLOCK Iosb; HANDLE ThreadHandle; KPRIORITY Priority; + SIZE_T MemSizeMBs; if (!KdpDebugMode.File) return; @@ -175,6 +190,8 @@ /* Display separator + ReactOS version at start of the debug log */ DPRINT1("---------------------------------------------------------------\n"); DPRINT1("ReactOS "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")\n"); + MemSizeMBs = MmNumberOfPhysicalPages * PAGE_SIZE / 1024 / 1024; + DPRINT1("%u System Processor [%u MB Memory]\n", KeNumberProcessors, MemSizeMBs); } else if (BootPhase == 2) { @@ -276,6 +293,7 @@ KdpSerialInit(PKD_DISPATCH_TABLE DispatchTable, ULONG BootPhase) { + SIZE_T MemSizeMBs; if (!KdpDebugMode.Serial) return; if (BootPhase == 0) @@ -301,6 +319,8 @@ /* Display separator + ReactOS version at start of the debug log */ DPRINT1("-----------------------------------------------------\n"); DPRINT1("ReactOS "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")\n"); + MemSizeMBs = MmNumberOfPhysicalPages * PAGE_SIZE / 1024 / 1024; + DPRINT1("%u System Processor [%u MB Memory]\n", KeNumberProcessors, MemSizeMBs); DPRINT1("Command Line: %s\n", KeLoaderBlock->LoadOptions); DPRINT1("ARC Paths: %s %s %s %s\n", KeLoaderBlock->ArcBootDeviceName, KeLoaderBlock->NtHalPathName, @@ -315,11 +335,19 @@ /* SCREEN FUNCTIONS **********************************************************/ +/* + * Screen debug logger function KdpScreenPrint() writes text messages into + * KdpDmesgBuffer, using it as a circular buffer. KdpDmesgBuffer contents could + * be later (re)viewed using dmesg command of kdbg. KdpScreenPrint() protects + * KdpDmesgBuffer from simultaneous writes by use of KdpDmesgLogSpinLock. + */ VOID NTAPI KdpScreenPrint(LPSTR Message, ULONG Length) { + ULONG beg, end, num; + KIRQL OldIrql; PCHAR pch = (PCHAR) Message; while (*pch) @@ -354,16 +382,74 @@ KdpScreenLineBuffer[0] = '\0'; KdpScreenLineLength = KdpScreenLineBufferPos = 0; } - + ++pch; } - + /* Print buffered characters */ if(KdpScreenLineBufferPos != KdpScreenLineLength) { HalDisplayString(KdpScreenLineBuffer + KdpScreenLineBufferPos); KdpScreenLineBufferPos = KdpScreenLineLength; } + + /* Dmesg: store Message in the buffer to show it later */ + if (KdbpIsInDmesgMode) + return; + + if (KdpDmesgBuffer == NULL) + return; + + /* Acquire the printing spinlock without waiting at raised IRQL */ + while (TRUE) + { + /* Wait when the spinlock becomes available */ + while (!KeTestSpinLock(&KdpDmesgLogSpinLock)); + + /* Spinlock was free, raise IRQL */ + KeRaiseIrql(HIGH_LEVEL, &OldIrql); + + /* Try to get the spinlock */ + if (KeTryToAcquireSpinLockAtDpcLevel(&KdpDmesgLogSpinLock)) + break; + + /* Someone else got the spinlock, lower IRQL back */ + KeLowerIrql(OldIrql); + } + + /* Invariant: always_true(KdpDmesgFreeBytes == KdpDmesgBufferSize); + * set num to min(KdpDmesgFreeBytes, Length). + */ + num = (Length < KdpDmesgFreeBytes) ? Length : KdpDmesgFreeBytes; + beg = KdpDmesgCurrentPosition; + if (num != 0) + { + end = (beg + num) % KdpDmesgBufferSize; + if (end > beg) + { + RtlCopyMemory(KdpDmesgBuffer + beg, Message, Length); + } + else + { + RtlCopyMemory(KdpDmesgBuffer + beg, Message, KdpDmesgBufferSize - beg); + RtlCopyMemory(KdpDmesgBuffer, Message + (KdpDmesgBufferSize - beg), end); + } + KdpDmesgCurrentPosition = end; + + /* Counting the total bytes written */ + KdbDmesgTotalWritten += num; + } + + /* Release spinlock */ + KiReleaseSpinLock(&KdpDmesgLogSpinLock); + + /* Lower IRQL */ + KeLowerIrql(OldIrql); + + /* Optional step(?): find out a way to notify about buffer exhaustion, + * and possibly fall into kbd to use dmesg command: user will read + * debug messages before they will be wiped over by next writes. + */ } VOID @@ -371,6 +457,7 @@ KdpScreenInit(PKD_DISPATCH_TABLE DispatchTable, ULONG BootPhase) { + SIZE_T MemSizeMBs; if (!KdpDebugMode.Screen) return; if (BootPhase == 0) @@ -381,6 +468,30 @@ /* Register as a Provider */ InsertTailList(&KdProviders, &DispatchTable->KdProvidersList); + } + else if (BootPhase == 1) + { + /* Allocate a buffer for dmesg log buffer. +1 for terminating null, + * see kdbp_cli.c:KdbpCmdDmesg()/2 + */ + KdpDmesgBuffer = ExAllocatePool(NonPagedPool, KdpDmesgBufferSize + 1); + RtlZeroMemory(KdpDmesgBuffer, KdpDmesgBufferSize + 1); + KdpDmesgFreeBytes = KdpDmesgBufferSize; + KdbDmesgTotalWritten = 0; + + /* Initialize spinlock */ + KeInitializeSpinLock(&KdpDmesgLogSpinLock); + + /* Display separator + ReactOS version at start of the debug log */ + DPRINT1("-----------------------------------------------------\n"); + DPRINT1("ReactOS "KERNEL_VERSION_STR" (Build "KERNEL_VERSION_BUILD_STR")\n"); + MemSizeMBs = MmNumberOfPhysicalPages * PAGE_SIZE / 1024 / 1024; + DPRINT1("%u System Processor [%u MB Memory]\n", KeNumberProcessors, MemSizeMBs); + DPRINT1("Command Line: %s\n", KeLoaderBlock->LoadOptions); + DPRINT1("ARC Paths: %s %s %s %s\n", KeLoaderBlock->ArcBootDeviceName, + KeLoaderBlock->NtHalPathName, + KeLoaderBlock->ArcHalDeviceName, + KeLoaderBlock->NtBootPathName); } else if (BootPhase == 2) { Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Thu Jul 7 19:18:16 2011 @@ -42,6 +42,13 @@ #define KEY_SCAN_UP 72 #define KEY_SCAN_DOWN 80 +/* Scan codes of keyboard keys: */ +#define KEYSC_END 0x004f +#define KEYSC_PAGEUP 0x0049 +#define KEYSC_PAGEDOWN 0x0051 +#define KEYSC_HOME 0x0047 +#define KEYSC_ARROWUP 0x0048 + #define KDB_ENTER_CONDITION_TO_STRING(cond) \ ((cond) == KdbDoNotEnter ? "never" : \ ((cond) == KdbEnterAlways ? "always" : \ @@ -81,6 +88,7 @@ static BOOLEAN KdbpCmdFilter(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdSet(ULONG Argc, PCHAR Argv[]); static BOOLEAN KdbpCmdHelp(ULONG Argc, PCHAR Argv[]); +static BOOLEAN KdbpCmdDmesg(ULONG Argc, PCHAR Argv[]); /* GLOBALS *******************************************************************/ @@ -100,6 +108,17 @@ PCHAR KdbInitFileBuffer = NULL; /* Buffer where KDBinit file is loaded into during initialization */ BOOLEAN KdbpBugCheckRequested = FALSE; + +/* Vars for dmesg */ +/* defined here, used in ../kd/kdio.c: */ +volatile BOOLEAN KdbpIsInDmesgMode = FALSE; + +/* defined in ../kd/kdio.c, declare here: */ +extern const ULONG KdpDmesgBufferSize; +extern PCHAR KdpDmesgBuffer; +extern volatile ULONG KdpDmesgCurrentPosition; +extern volatile ULONG KdpDmesgFreeBytes; +extern volatile ULONG KdbDmesgTotalWritten; static const struct { @@ -150,6 +169,8 @@ { "bugcheck", "bugcheck", "Bugchecks the system.", KdbpCmdBugCheck }, { "filter", "filter [error|warning|trace|info|level]+|-[componentname|default]", "Enable/disable debug channels", KdbpCmdFilter }, { "set", "set [var] [value]", "Sets var to value or displays value of var.", KdbpCmdSet }, + { "dmesg", "dmesg", "Display debug messages on screen, with navigation on pages.", KdbpCmdDmesg }, + { "kmsg", "kmsg", "Kernel dmesg. Alias for dmesg.", KdbpCmdDmesg }, { "help", "help", "Display help screen.", KdbpCmdHelp } }; @@ -1895,6 +1916,58 @@ return FALSE; } +VOID +KdbpPager( + IN PCHAR Buffer, + IN ULONG BufLength); + +/*!\brief Display debug messages on screen, with paging. + * + * Keys for per-page view: Home, End, PageUp, Arrow Up, PageDown, + * all others are as PageDown. + */ +static BOOLEAN +KdbpCmdDmesg( + ULONG Argc, + PCHAR Argv[]) +{ + ULONG beg, end; + + KdbpIsInDmesgMode = TRUE; /* Toggle logging flag */ + if (!KdpDmesgBuffer) + { + KdbpPrint("Dmesg: error, buffer is not allocated! /DEBUGPORT=SCREEN kernel param required for dmesg.\n"); + return TRUE; + } + + KdbpPrint("*** Dmesg *** TotalWritten=%lu, BufferSize=%lu, CurrentPosition=%lu\n", + KdbDmesgTotalWritten, KdpDmesgBufferSize, KdpDmesgCurrentPosition); + + // Pass data to the pager: + end = KdpDmesgCurrentPosition; + beg = (end + KdpDmesgFreeBytes) % KdpDmesgBufferSize; + + // no roll-overs, and overwritten=lost bytes + if (KdbDmesgTotalWritten <= KdpDmesgBufferSize) + { + // show buffer (KdpDmesgBuffer + beg, num) + KdbpPager(KdpDmesgBuffer, KdpDmesgCurrentPosition); + } + else + { + // show 2 buffers: (KdpDmesgBuffer + beg, KdpDmesgBufferSize - beg) + // and: (KdpDmesgBuffer, end) + KdbpPager(KdpDmesgBuffer + beg, KdpDmesgBufferSize - beg); + KdbpPrint("*** Dmesg: buffer rollup ***\n"); + KdbpPager(KdpDmesgBuffer, end); + } + KdbpPrint("*** Dmesg: end of output ***\n"); + + KdbpIsInDmesgMode = FALSE; /* Toggle logging flag */ + + return TRUE; +} + /*!\brief Sets or displays a config variables value. */ static BOOLEAN @@ -2110,6 +2183,7 @@ * * \note Doesn't correctly handle \\t and terminal escape sequences when calculating the * number of lines required to print a single line from the Buffer in the terminal. + * Prints maximum 4096 chars, because of its buffer size. */ VOID KdbpPrint( @@ -2215,12 +2289,12 @@ if (KdbNumberOfRowsTerminal <= 0) { /* Set number of rows to the default. */ - KdbNumberOfRowsTerminal = 24; + KdbNumberOfRowsTerminal = 23; //24; //Mna.: 23 for SCREEN debugport } else if (KdbNumberOfColsTerminal <= 0) { /* Set number of cols to the default. */ - KdbNumberOfColsTerminal = 80; + KdbNumberOfColsTerminal = 75; //80; //Mna.: 75 for SCREEN debugport } } @@ -2256,6 +2330,7 @@ DbgPrint("\n"); DbgPrint("--- Press q to abort, any other key to continue ---"); + RowsPrintedByTerminal++; /* added by Mna. */ if (KdbDebugState & KD_DEBUG_KDSERIAL) c = KdbpGetCharSerial(); @@ -2315,6 +2390,350 @@ DbgPrint("%s", p); + if (c != '\0') + p[i + 1] = c; + + /* Set p to the start of the next line and + * remember the number of rows/cols printed + */ + p += i; + if (p[0] == '\n') + { + p++; + KdbNumberOfColsPrinted = 0; + } + else + { + ASSERT(p[0] == '\0'); + KdbNumberOfColsPrinted += i; + } + + KdbNumberOfRowsPrinted += RowsPrintedByTerminal; + } +} + +/** memrchr(), explicitly defined, since was absent in MinGW of RosBE. */ +/* + * Reverse memchr() + * Find the last occurrence of 'c' in the buffer 's' of size 'n'. + */ +void * +memrchr(const void *s, int c, size_t n) +{ + const unsigned char *cp; + + if (n != 0) + { + cp = (unsigned char *)s + n; + do + { + if (*(--cp) == (unsigned char)c) + return (void *)cp; + } while (--n != 0); + } + return NULL; +} + +/*!\brief Calculate pointer position for N lines upper of current position. + * + * \param Buffer Characters buffer to operate on. + * \param BufLength Buffer size. + * + * \note Calculate pointer position for N lines upper of current displaying + * position within the given buffer. + * + * Used by KdbpPager(). + * Now N lines count is hardcoded to KdbNumberOfRowsTerminal. + */ +PCHAR +CountOnePageUp(PCHAR Buffer, ULONG BufLength, PCHAR pCurPos) +{ + PCHAR p; + // p0 is initial guess of Page Start + ULONG p0len = KdbNumberOfRowsTerminal * KdbNumberOfColsTerminal; + PCHAR p0 = pCurPos - p0len; + PCHAR prev_p = p0, p1; + ULONG j; + + if (pCurPos < Buffer) + pCurPos = Buffer; + ASSERT(pCurPos <= Buffer + BufLength); + + p = memrchr(p0, '\n', p0len); + if (NULL == p) + p = p0; + for (j = KdbNumberOfRowsTerminal; j--; ) + { + p1 = memrchr(p0, '\n', p-p0); + prev_p = p; + p = p1; + if (NULL == p) + { + p = prev_p; + if (NULL == p) + p = p0; + break; + } + int linesCnt = (KdbNumberOfColsTerminal+prev_p-p-2) / KdbNumberOfColsTerminal; + if (linesCnt > 1) + j -= linesCnt-1; + } + + ASSERT(p != 0); + ++p; + return p; +} + +/*!\brief Prints the given string with, page by page. + * + * \param Buffer Characters buffer to print. + * \param BufferLen Buffer size. + * + * \note Doesn't correctly handle \\t and terminal escape sequences when calculating the + * number of lines required to print a single line from the Buffer in the terminal. + * Maximum length of buffer is limited only by memory size. + * + * Note: BufLength should be greater then (KdbNumberOfRowsTerminal * KdbNumberOfColsTerminal). + * + */ +VOID +KdbpPager( + IN PCHAR Buffer, + IN ULONG BufLength) +{ + static CHAR InBuffer[4096]; + static BOOLEAN TerminalInitialized = FALSE; + static BOOLEAN TerminalConnected = FALSE; + static BOOLEAN TerminalReportsSize = TRUE; + CHAR c = '\0'; + PCHAR p, p2; + ULONG Length; + ULONG i, j; + LONG RowsPrintedByTerminal; + ULONG ScanCode; + + if( BufLength == 0) + return; + + /* Check if the user has aborted output of the current command */ + if (KdbOutputAborted) + return; + + /* Initialize the terminal */ + if (!TerminalInitialized) + { + DbgPrint("\x1b[7h"); /* Enable linewrap */ + + /* Query terminal type */ + /*DbgPrint("\x1b[Z");*/ + DbgPrint("\x05"); + + TerminalInitialized = TRUE; + Length = 0; + KeStallExecutionProcessor(100000); + + for (;;) + { + c = KdbpTryGetCharSerial(5000); + if (c == -1) + break; + + InBuffer[Length++] = c; + if (Length >= (sizeof (InBuffer) - 1)) + break; + } + + InBuffer[Length] = '\0'; + if (Length > 0) + TerminalConnected = TRUE; + } + + /* Get number of rows and columns in terminal */ + if ((KdbNumberOfRowsTerminal < 0) || (KdbNumberOfColsTerminal < 0) || + (KdbNumberOfRowsPrinted) == 0) /* Refresh terminal size each time when number of rows printed is 0 */ + { + if ((KdbDebugState & KD_DEBUG_KDSERIAL) && TerminalConnected && TerminalReportsSize) + { + /* Try to query number of rows from terminal. A reply looks like "\x1b[8;24;80t" */ + TerminalReportsSize = FALSE; + KeStallExecutionProcessor(100000); + DbgPrint("\x1b[18t"); + c = KdbpTryGetCharSerial(5000); + + if (c == KEY_ESC) + { + c = KdbpTryGetCharSerial(5000); + if (c == '[') + { + Length = 0; + + for (;;) + { + c = KdbpTryGetCharSerial(5000); + if (c == -1) + break; + + InBuffer[Length++] = c; + if (isalpha(c) || Length >= (sizeof (InBuffer) - 1)) + break; + } + + InBuffer[Length] = '\0'; + if (InBuffer[0] == '8' && InBuffer[1] == ';') + { + for (i = 2; (i < Length) && (InBuffer[i] != ';'); i++); + + if (Buffer[i] == ';') + { + Buffer[i++] = '\0'; + + /* Number of rows is now at Buffer + 2 and number of cols at Buffer + i */ + KdbNumberOfRowsTerminal = strtoul(InBuffer + 2, NULL, 0); + KdbNumberOfColsTerminal = strtoul(InBuffer + i, NULL, 0); + TerminalReportsSize = TRUE; + } + } + } + /* Clear further characters */ + while ((c = KdbpTryGetCharSerial(5000)) != -1); + } + } + + if (KdbNumberOfRowsTerminal <= 0) + { + /* Set number of rows to the default. */ + KdbNumberOfRowsTerminal = 24; + } + else if (KdbNumberOfColsTerminal <= 0) + { + /* Set number of cols to the default. */ + KdbNumberOfColsTerminal = 80; + } + } + + /* Get the string */ + p = Buffer; + + while (p[0] != '\0') + { + if ( p > Buffer+BufLength) + { + DbgPrint("Dmesg: error, p > Buffer+BufLength,d=%d", p - (Buffer+BufLength)); + return; + } + i = strcspn(p, "\n"); + + // Are we out of buffer? + if (p + i > Buffer + BufLength) + // Leaving pager function: + break; + + /* Calculate the number of lines which will be printed in the terminal + * when outputting the current line + */ + if (i > 0) + RowsPrintedByTerminal = (i + KdbNumberOfColsPrinted - 1) / KdbNumberOfColsTerminal; + else + RowsPrintedByTerminal = 0; + + if (p[i] == '\n') + RowsPrintedByTerminal++; + + /*DbgPrint("!%d!%d!%d!%d!", KdbNumberOfRowsPrinted, KdbNumberOfColsPrinted, i, RowsPrintedByTerminal);*/ + + /* Display a prompt if we printed one screen full of text */ + if (KdbNumberOfRowsTerminal > 0 && + (LONG)(KdbNumberOfRowsPrinted + RowsPrintedByTerminal) >= KdbNumberOfRowsTerminal) + { + if (KdbNumberOfColsPrinted > 0) + DbgPrint("\n"); + + DbgPrint("--- Press q to abort, e/End,h/Home,u/PgUp, other key/PgDn ---"); + RowsPrintedByTerminal++; + + if (KdbDebugState & KD_DEBUG_KDSERIAL) + c = KdbpGetCharSerial(); + else + c = KdbpGetCharKeyboard(&ScanCode); + + if (c == '\r') + { + /* Try to read '\n' which might follow '\r' - if \n is not received here + * it will be interpreted as "return" when the next command should be read. + */ + if (KdbDebugState & KD_DEBUG_KDSERIAL) + c = KdbpTryGetCharSerial(5); + else + c = KdbpTryGetCharKeyboard(&ScanCode, 5); + } + + //DbgPrint("\n"); //Consize version: don't show pressed key + DbgPrint(" '%c'/scan=%04x\n", c, ScanCode); // Shows pressed key + + if (c == 'q') + { + KdbOutputAborted = TRUE; + return; + } + if ( ScanCode == KEYSC_END || c=='e') + { + PCHAR pBufEnd = Buffer + BufLength; + p = CountOnePageUp(Buffer, BufLength, pBufEnd); + i = strcspn(p, "\n"); + } + else if (ScanCode == KEYSC_PAGEUP || c=='u') + { + p = CountOnePageUp(Buffer, BufLength, p); + i = strcspn(p, "\n"); + } + else if (ScanCode == KEYSC_HOME || c=='h') + { + p = Buffer; + i = strcspn(p, "\n"); + } + else if (ScanCode == KEYSC_ARROWUP) + { + p = CountOnePageUp(Buffer, BufLength, p); + i = strcspn(p, "\n"); + } + + KdbNumberOfRowsPrinted = 0; + KdbNumberOfColsPrinted = 0; + } + + /* Insert a NUL after the line and print only the current line. */ + if (p[i] == '\n' && p[i + 1] != '\0') + { + c = p[i + 1]; + p[i + 1] = '\0'; + } + else + { + c = '\0'; + } + + /* Remove escape sequences from the line if there's no terminal connected */ + if (!TerminalConnected) + { + while ((p2 = strrchr(p, '\x1b'))) /* Look for escape character */ + { + if (p2[1] == '[') + { + j = 2; + while (!isalpha(p2[j++])); + strcpy(p2, p2 + j); + } + else + { + strcpy(p2, p2 + 1); + } + } + } + + // The main printing of the current line: + DbgPrint(p); + + // restore not null char with saved: if (c != '\0') p[i + 1] = c;

1 0

[sir_richard] 52555: Patch by Anton Yarotsky: [SACDRV]: Implement the SAC Channel Input/Output Interface and Getters/Setters.
by sir_richard＠svn.reactos.org 07 Jul '11

07 Jul '11

Author: sir_richard Date: Thu Jul 7 12:03:56 2011 New Revision: 52555 URL: http://svn.reactos.org/svn/reactos?rev=52555&view=rev Log: Patch by Anton Yarotsky: [SACDRV]: Implement the SAC Channel Input/Output Interface and Getters/Setters. Modified: trunk/reactos/drivers/sac/driver/channel.c Modified: trunk/reactos/drivers/sac/driver/channel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/channel… ============================================================================== --- trunk/reactos/drivers/sac/driver/channel.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/channel.c [iso-8859-1] Thu Jul 7 12:03:56 2011 @@ -19,7 +19,7 @@ IN SAC_CHANNEL_TYPE ChannelType ) { - return FALSE; + return ((ChannelType >= VtUtf8) && (ChannelType <= Raw)); } BOOLEAN @@ -28,7 +28,9 @@ IN PSAC_CHANNEL_ID ChannelId ) { - return FALSE; + return IsEqualGUIDAligned( + &Channel->ChannelId.ChannelGuid, + &ChannelId->ChannelGuid); } NTSTATUS @@ -52,7 +54,9 @@ IN PSAC_CHANNEL Channel ) { - return STATUS_NOT_IMPLEMENTED; + CHECK_PARAMETER(Channel); + + return ChannelDereferenceHandles(Channel); } NTSTATUS @@ -62,7 +66,17 @@ IN ULONG BufferSize ) { - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + + CHECK_PARAMETER3(BufferSize < SAC_OBUFFER_SIZE); + + ChannelLockOBuffer(Channel); + + Status = Channel->OBufferWrite(Channel, Buffer, BufferSize); + + ChannelUnlockOBuffer(Channel); + + return Status; } NTSTATUS @@ -70,7 +84,15 @@ IN PSAC_CHANNEL Channel ) { - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + + ChannelLockOBuffer(Channel); + + Status = Channel->OBufferFlush(Channel); + + ChannelUnlockOBuffer(Channel); + + return Status; } NTSTATUS @@ -80,7 +102,15 @@ IN ULONG BufferSize ) { - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + + ChannelLockIBuffer(Channel); + + Status = Channel->IBufferWrite(Channel, Buffer, BufferSize); + + ChannelUnlockIBuffer(Channel); + + return Status; } ULONG @@ -91,7 +121,15 @@ OUT PULONG ResultBufferSize ) { - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + + ChannelLockIBuffer(Channel); + + Status = Channel->IBufferRead(Channel, Buffer, BufferSize, ResultBufferSize); + + ChannelUnlockIBuffer(Channel); + + return Status; } NTSTATUS @@ -99,7 +137,15 @@ IN PSAC_CHANNEL Channel ) { - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + + ChannelLockIBuffer(Channel); + + Status = Channel->IBufferReadLast(Channel); + + ChannelUnlockIBuffer(Channel); + + return Status; } ULONG @@ -107,7 +153,15 @@ IN PSAC_CHANNEL Channel ) { - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Length; + + ChannelLockOBuffer(Channel); + + Length = Channel->IBufferLength(Channel); + + ChannelUnlockOBuffer(Channel); + + return Length; } NTSTATUS @@ -179,7 +233,11 @@ IN PSAC_CHANNEL Channel ) { - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + + ChannelSetEvent(Channel, LockEvent); + + return Status; } NTSTATUS @@ -188,7 +246,11 @@ IN PSAC_CHANNEL Channel ) { - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + + ChannelSetEvent(Channel, RedrawEvent); + + return Status; } NTSTATUS @@ -196,7 +258,11 @@ IN PSAC_CHANNEL Channel ) { - return STATUS_NOT_IMPLEMENTED; + NTSTATUS Status; + + ChannelClearEvent(Channel, RedrawEvent); + + return Status; } NTSTATUS @@ -205,7 +271,12 @@ OUT PBOOLEAN Present ) { - return STATUS_NOT_IMPLEMENTED; + CHECK_PARAMETER1(Channel); + CHECK_PARAMETER2(Present); + + *Present = Channel->Flags & SAC_CHANNEL_FLAG_REDRAW_EVENT; + + return STATUS_SUCCESS; } BOOLEAN @@ -213,7 +284,11 @@ IN PSAC_CHANNEL Channel ) { - return FALSE; + SAC_CHANNEL_STATUS ChannelStatus; + + if (!NT_SUCCESS(ChannelGetStatus(Channel, &ChannelStatus))) return FALSE; + + return (ChannelStatus == Active); } BOOLEAN

1 0

[sir_richard] 52554: Patch by Anton Yarotsky: [SACDRV]: Add type definitions for channel VTABLE. [SACDRV]: Add channel event macros and flags. [SACDRV]: Add channal lock macros. [SACDRV]: Add macro...
by sir_richard＠svn.reactos.org 07 Jul '11

07 Jul '11

Author: sir_richard Date: Thu Jul 7 12:02:32 2011 New Revision: 52554 URL: http://svn.reactos.org/svn/reactos?rev=52554&view=rev Log: Patch by Anton Yarotsky: [SACDRV]: Add type definitions for channel VTABLE. [SACDRV]: Add channel event macros and flags. [SACDRV]: Add channal lock macros. [SACDRV]: Add macros for parameter validation. [SACDRV]: Add macro for pool allocation. [SACDRV]: Misc fixes. Modified: trunk/reactos/drivers/sac/driver/sacdrv.h Modified: trunk/reactos/drivers/sac/driver/sacdrv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/sacdrv.… ============================================================================== --- trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/sacdrv.h [iso-8859-1] Thu Jul 7 12:02:32 2011 @@ -20,6 +20,105 @@ DbgPrint("SAC %s: ", __FUNCTION__); \ DbgPrint(__VA_ARGS__); \ } + +#define CHECK_PARAMETER_WITH_STATUS(Parameter, Status) \ +{ \ + ASSERT((Parameter)); \ + if (!Parameter) \ + { \ + return Status; \ + } \ +} +#define CHECK_PARAMETER(x) \ + CHECK_PARAMETER_WITH_STATUS(x, STATUS_INVALID_PARAMETER) +#define CHECK_PARAMETER1(x) \ + CHECK_PARAMETER_WITH_STATUS(x, STATUS_INVALID_PARAMETER_1) +#define CHECK_PARAMETER2(x) \ + CHECK_PARAMETER_WITH_STATUS(x, STATUS_INVALID_PARAMETER_2) +#define CHECK_PARAMETER3(x) \ + CHECK_PARAMETER_WITH_STATUS(x, STATUS_INVALID_PARAMETER_3) +#define CHECK_ALLOCATION(x) \ + CHECK_PARAMETER_WITH_STATUS(x, STATUS_OUT_OF_MEMORY) + +#define SacAllocatePool(Length, Tag) \ + MyAllocatePool(Length, Tag, __FILE__, __LINE__) + +#define ChannelLock(Channel, x) \ +{ \ + KeWaitForSingleObject( \ + &(Channel)->x.Lock, \ + Executive, \ + KernelMode, \ + FALSE, \ + NULL); \ + ASSERT((Channel)->x.RefCount == 0); \ + InterlockedIncrement(&(Channel)->x.RefCount); \ +} + +#define ChannelUnlock(Channel, x) \ +{ \ + ASSERT((Channel)->x.RefCount == 1); \ + InterlockedDecrement(&(Channel)->x.RefCount); \ + KeReleaseSemaphore( \ + &(Channel)->x.Lock, \ + SEMAPHORE_INCREMENT, \ + 1, \ + FALSE); \ +} + +#define ChannelLockOBuffer(Channel) ChannelLock(Channel, ChannelOBufferLock); +#define ChannelUnlockOBuffer(Channel) ChannelUnlock(Channel, ChannelOBufferLock); +#define ChannelLockIBuffer(Channel) ChannelLock(Channel, ChannelIBufferLock); +#define ChannelUnlockIBuffer(Channel) ChannelUnlock(Channel, ChannelIBufferLock); +#define ChannelLockAttributes(Channel) ChannelLock(Channel, ChannelAttributesLock); +#define ChannelUnlockAttributes(Channel) ChannelUnlock(Channel, ChannelAttributesLock); + +#define ChannelInitializeEvent(Channel, Attributes, x) \ +{ \ + PVOID Object, WaitObject; \ + if (Attributes->x) \ + { \ + if (!VerifyEventWaitable(Attributes->x, &Object, &WaitObject)) \ + { \ + goto FailChannel; \ + } \ + Channel->x = Attributes->x; \ + Channel->x##ObjectBody = Object; \ + Channel->x##WaitObjectBody = WaitObject; \ + } \ +} + +#define ChannelSetEvent(Channel, x) \ +{ \ + ASSERT(Channel->x); \ + ASSERT(Channel->x##ObjectBody); \ + ASSERT(Channel->x##WaitObjectBody); \ + if (Channel->x) \ + { \ + KeSetEvent(Channel->x, EVENT_INCREMENT, FALSE); \ + Status = STATUS_SUCCESS; \ + } \ + else \ + { \ + Status = STATUS_UNSUCCESSFUL; \ + } \ +} + +#define ChannelClearEvent(Channel, x) \ +{ \ + ASSERT(Channel->x); \ + ASSERT(Channel->x##ObjectBody); \ + ASSERT(Channel->x##WaitObjectBody); \ + if (Channel->x) \ + { \ + KeClearEvent(Channel->x); \ + Status = STATUS_SUCCESS; \ + } \ + else \ + { \ + Status = STATUS_UNSUCCESSFUL; \ + } \ +} //Rcp? - sacdrv.sys - SAC Driver (Headless) //RcpA - sacdrv.sys - Internal memory mgr alloc block @@ -36,6 +135,13 @@ #define SAC_MEMORY_LIST_SIZE (1 * 1024 * 1024) +#define SAC_OBUFFER_SIZE (2 * 1024) + +#define SAC_CHANNEL_FLAG_CLOSE_EVENT 0x2 +#define SAC_CHANNEL_FLAG_HAS_NEW_DATA_EVENT 0x4 +#define SAC_CHANNEL_FLAG_LOCK_EVENT 0x8 +#define SAC_CHANNEL_FLAG_REDRAW_EVENT 0x10 + typedef struct _SAC_MEMORY_ENTRY { ULONG Signature; @@ -73,8 +179,89 @@ typedef struct _SAC_CHANNEL_LOCK { LONG RefCount; - KSEMAPHORE Semaphore; + KSEMAPHORE Lock; } SAC_CHANNEL_LOCK, *PSAC_CHANNEL_LOCK; + +struct _SAC_CHANNEL; + +typedef +NTSTATUS +(*PSAC_CHANNEL_CREATE)( + IN struct _SAC_CHANNEL* Channel + ); + +typedef +NTSTATUS +(*PSAC_CHANNEL_DESTROY)( + IN struct _SAC_CHANNEL* Channel + ); + +typedef +NTSTATUS +(*PSAC_CHANNEL_OREAD)( + IN struct _SAC_CHANNEL* Channel, + IN PCHAR Buffer, + IN ULONG BufferSize, + OUT PULONG ByteCount + ); + +typedef +NTSTATUS +(*PSAC_CHANNEL_OECHO)( + IN struct _SAC_CHANNEL* Channel, + IN PWCHAR String, + IN ULONG Length + ); + +typedef +NTSTATUS +(*PSAC_CHANNEL_OFLUSH)( + IN struct _SAC_CHANNEL* Channel + ); + +typedef +NTSTATUS +(*PSAC_CHANNEL_OWRITE)( + IN struct _SAC_CHANNEL* Channel, + IN PWCHAR String, + IN ULONG Length + ); + +typedef +NTSTATUS +(*PSAC_CHANNEL_IREAD)( + IN struct _SAC_CHANNEL* Channel, + IN PWCHAR Buffer, + IN ULONG BufferSize, + IN PULONG ReturnBufferSize + ); + +typedef +NTSTATUS +(*PSAC_CHANNEL_IBUFFER_FULL)( + IN struct _SAC_CHANNEL* Channel, + OUT PBOOLEAN BufferStatus + ); + +typedef +NTSTATUS +(*PSAC_CHANNEL_IBUFFER_LENGTH)( + IN struct _SAC_CHANNEL* Channel + ); + +typedef +CHAR +(*PSAC_CHANNEL_IREAD_LAST)( + IN struct _SAC_CHANNEL* Channel + ); + +typedef +NTSTATUS +(*PSAC_CHANNEL_IWRITE)( + IN struct _SAC_CHANNEL* Channel, + IN PCHAR Buffer, + IN ULONG BufferSize + ); typedef struct _SAC_CHANNEL { @@ -112,20 +299,20 @@ ULONG OBufferIndex; ULONG OBufferFirstGoodIndex; BOOLEAN ChannelHasNewOBufferData; - //PSAC_CHANNEL_CREATE ChannelCreate; - //PSAC_CHANNEL_DESTROY ChannelDestroy; - //PSAC_CHANNEL_OFLUSH ChannelOutputFlush; - //PSAC_CHANNEL_OECHO ChannelOutputEcho; - //PSAC_CHANNEL_OWRITE ChannelOutputWrite; - //PSAC_CHANNEL_OREAD ChannelOutputRead; - //PSAC_CHANNEL_OWRITE ChannelInputWrite; - //PSAC_CHANNEL_IREAD ChannelInputRead; - //PSAC_CHANNEL_IREAD_LAST ChannelInputReadLast; - //PSAC_CHANNEL_IBUFFER_FULL ChannelInputBufferIsFull; - //PSAC_CHANNEL_IBUFFER_LENGTH IBufferLength; + PSAC_CHANNEL_CREATE ChannelCreate; + PSAC_CHANNEL_DESTROY ChannelDestroy; + PSAC_CHANNEL_OFLUSH OBufferFlush; + PSAC_CHANNEL_OECHO OBufferEcho; + PSAC_CHANNEL_OWRITE OBufferWrite; + PSAC_CHANNEL_OREAD OBufferRead; + PSAC_CHANNEL_OWRITE IBufferWrite; + PSAC_CHANNEL_IREAD IBufferRead; + PSAC_CHANNEL_IREAD_LAST IBufferReadLast; + PSAC_CHANNEL_IBUFFER_FULL IBufferIsFull; + PSAC_CHANNEL_IBUFFER_LENGTH IBufferLength; SAC_CHANNEL_LOCK ChannelAttributeLock; SAC_CHANNEL_LOCK ChannelOBufferLock; - SAC_CHANNEL_LOCK ChannelBufferLock; + SAC_CHANNEL_LOCK ChannelIBufferLock; } SAC_CHANNEL, *PSAC_CHANNEL; typedef struct _SAC_DEVICE_EXTENSION

1 0

[cgutman] 52553: [MSAFD] - Let WSPRecv handle WSPRecvFrom on a non-datagram socket (mswsock_new does this) - Fixes recvfrom on connection-oriented sockets
by cgutman＠svn.reactos.org 07 Jul '11

07 Jul '11

Author: cgutman Date: Thu Jul 7 11:40:25 2011 New Revision: 52553 URL: http://svn.reactos.org/svn/reactos?rev=52553&view=rev Log: [MSAFD] - Let WSPRecv handle WSPRecvFrom on a non-datagram socket (mswsock_new does this) - Fixes recvfrom on connection-oriented sockets Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/sndrc… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] Thu Jul 7 11:40:25 2011 @@ -279,6 +279,20 @@ { *lpErrno = WSAENOTSOCK; return SOCKET_ERROR; + } + + if (!(Socket->SharedData.ServiceFlags1 & XP1_CONNECTIONLESS)) + { + /* Call WSPRecv for a non-datagram socket */ + return WSPRecv(Handle, + lpBuffers, + dwBufferCount, + lpNumberOfBytesRead, + ReceiveFlags, + lpOverlapped, + lpCompletionRoutine, + lpThreadId, + lpErrno); } Status = NtCreateEvent( &SockEvent, GENERIC_READ | GENERIC_WRITE,

1 0

[cgutman] 52552: [AFD] - Rewrite user-mode send IRP handling so send errors get returned to the user properly - Fixes OskitTCP: ESHUTDOWN/EPIPE debug log spam when a chargen telnet session is termi...
by cgutman＠svn.reactos.org 07 Jul '11

07 Jul '11

Author: cgutman Date: Thu Jul 7 00:29:30 2011 New Revision: 52552 URL: http://svn.reactos.org/svn/reactos?rev=52552&view=rev Log: [AFD] - Rewrite user-mode send IRP handling so send errors get returned to the user properly - Fixes OskitTCP: ESHUTDOWN/EPIPE debug log spam when a chargen telnet session is terminated by the remote side Modified: trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Thu Jul 7 00:29:30 2011 @@ -23,7 +23,7 @@ PIO_STACK_LOCATION NextIrpSp; PAFD_SEND_INFO SendReq = NULL; PAFD_MAPBUF Map; - UINT TotalBytesCopied = 0, SpaceAvail, i; + UINT TotalBytesCopied = 0, TotalBytesProcessed = 0, SpaceAvail, i; /* * The Irp parameter passed in is the IRP of the stream between AFD and @@ -99,7 +99,42 @@ RtlMoveMemory( FCB->Send.Window, FCB->Send.Window + FCB->Send.BytesUsed, FCB->Send.BytesUsed - Irp->IoStatus.Information ); - FCB->Send.BytesUsed -= Irp->IoStatus.Information; + + TotalBytesProcessed = 0; + while (!IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) && + TotalBytesProcessed != Irp->IoStatus.Information) { + NextIrpEntry = + RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); + NextIrp = + CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp ); + SendReq = GetLockedData(NextIrp, NextIrpSp); + Map = (PAFD_MAPBUF)(SendReq->BufferArray + SendReq->BufferCount); + + TotalBytesCopied = 0; + + for( i = 0; i < SendReq->BufferCount; i++ ) + TotalBytesCopied += SendReq->BufferArray[i].len; + + NextIrp->IoStatus.Status = Irp->IoStatus.Status; + NextIrp->IoStatus.Information = TotalBytesCopied; + + TotalBytesProcessed += TotalBytesCopied; + + (void)IoSetCancelRoutine(NextIrp, NULL); + + UnlockBuffers( SendReq->BufferArray, + SendReq->BufferCount, + FALSE ); + + if (NextIrp->MdlAddress) UnlockRequest(NextIrp, NextIrpSp); + + IoCompleteRequest(NextIrp, IO_NETWORK_INCREMENT); + } + + ASSERT(TotalBytesProcessed == Irp->IoStatus.Information); + + FCB->Send.BytesUsed -= TotalBytesProcessed; while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { NextIrpEntry = @@ -139,19 +174,6 @@ if (NextIrp != NULL) { FCB->Send.BytesUsed += TotalBytesCopied; - - NextIrp->IoStatus.Status = STATUS_SUCCESS; - NextIrp->IoStatus.Information = TotalBytesCopied; - - (void)IoSetCancelRoutine(NextIrp, NULL); - - UnlockBuffers( SendReq->BufferArray, - SendReq->BufferCount, - FALSE ); - - if (NextIrp->MdlAddress) UnlockRequest(NextIrp, NextIrpSp); - - IoCompleteRequest(NextIrp, IO_NETWORK_INCREMENT); } else break; @@ -198,6 +220,7 @@ PAFD_FCB FCB = (PAFD_FCB)Context; PLIST_ENTRY NextIrpEntry; PIRP NextIrp; + PAFD_SEND_INFO SendReq; AFD_DbgPrint(MID_TRACE,("Called, status %x, %d bytes used\n", Irp->IoStatus.Status, @@ -210,29 +233,47 @@ FCB->SendIrp.InFlightRequest = NULL; /* Request is not in flight any longer */ - if (Irp->IoStatus.Status == STATUS_SUCCESS) - { - FCB->PollState |= AFD_EVENT_SEND; - FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - } - if( FCB->State == SOCKET_STATE_CLOSED ) { /* Cleanup our IRP queue because the FCB is being destroyed */ while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { - NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); - NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); - NextIrp->IoStatus.Status = STATUS_FILE_CLOSED; - NextIrp->IoStatus.Information = 0; - if( NextIrp->MdlAddress ) UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); - (void)IoSetCancelRoutine(NextIrp, NULL); - IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); - } - SocketStateUnlock( FCB ); - return STATUS_FILE_CLOSED; - } - - SocketStateUnlock( FCB ); + NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); + NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + SendReq = GetLockedData(NextIrp, IoGetCurrentIrpStackLocation(NextIrp)); + NextIrp->IoStatus.Status = STATUS_FILE_CLOSED; + NextIrp->IoStatus.Information = 0; + (void)IoSetCancelRoutine(NextIrp, NULL); + UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); + UnlockRequest( NextIrp, IoGetCurrentIrpStackLocation( NextIrp ) ); + IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT ); + } + SocketStateUnlock( FCB ); + return STATUS_FILE_CLOSED; + } + + ASSERT(!IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND])); + + /* TDI spec guarantees FIFO ordering on IRPs */ + NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); + NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); + + SendReq = GetLockedData(NextIrp, IoGetCurrentIrpStackLocation(NextIrp)); + + NextIrp->IoStatus.Status = Irp->IoStatus.Status; + NextIrp->IoStatus.Information = Irp->IoStatus.Information; + + (void)IoSetCancelRoutine(NextIrp, NULL); + + UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); + + UnlockRequest(NextIrp, IoGetCurrentIrpStackLocation(NextIrp)); + + IoCompleteRequest(NextIrp, IO_NETWORK_INCREMENT); + + FCB->PollState |= AFD_EVENT_SEND; + FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; + PollReeval(FCB->DeviceExt, FCB->FileObject); + + SocketStateUnlock(FCB); return STATUS_SUCCESS; } @@ -244,7 +285,6 @@ PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; PAFD_SEND_INFO SendReq; - ULONG Information; UINT TotalBytesCopied = 0, i, SpaceAvail = 0; BOOLEAN NoSpace = FALSE; @@ -278,29 +318,33 @@ Status = TdiBuildConnectionInfo( &TargetAddress, FCB->RemoteAddress ); - if( NT_SUCCESS(Status) ) { - Status = TdiSendDatagram - ( &FCB->SendIrp.InFlightRequest, - FCB->AddressFile.Object, - SendReq->BufferArray[0].buf, - SendReq->BufferArray[0].len, - TargetAddress, - &FCB->SendIrp.Iosb, - PacketSocketSendComplete, - FCB ); - - ExFreePool( TargetAddress ); - } - - if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS; - - AFD_DbgPrint(MID_TRACE,("Dismissing request: %x\n", Status)); - - /* Even if we were pended, we're done with the user buffer at this - * point. */ - Information = SendReq->BufferArray[0].len; - UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); - return UnlockAndMaybeComplete( FCB, Status, Irp, Information ); + if( NT_SUCCESS(Status) ) { + FCB->PollState &= ~AFD_EVENT_SEND; + + Status = QueueUserModeIrp(FCB, Irp, FUNCTION_SEND); + if (Status == STATUS_PENDING) + { + TdiSendDatagram(&FCB->SendIrp.InFlightRequest, + FCB->AddressFile.Object, + SendReq->BufferArray[0].buf, + SendReq->BufferArray[0].len, + TargetAddress, + &FCB->SendIrp.Iosb, + PacketSocketSendComplete, + FCB); + } + + ExFreePool( TargetAddress ); + + SocketStateUnlock(FCB); + + return STATUS_PENDING; + } + else + { + UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); + return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); + } } if (FCB->DisconnectPending && (FCB->DisconnectFlags & TDI_DISCONNECT_RELEASE)) @@ -370,6 +414,7 @@ return UnlockAndMaybeComplete(FCB, STATUS_BUFFER_OVERFLOW, Irp, 0); } + SpaceAvail += TotalBytesCopied; NoSpace = TRUE; break; } @@ -394,12 +439,38 @@ return UnlockAndMaybeComplete ( FCB, STATUS_SUCCESS, Irp, TotalBytesCopied ); } - + + if (SpaceAvail) + { + FCB->PollState |= AFD_EVENT_SEND; + FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; + PollReeval( FCB->DeviceExt, FCB->FileObject ); + } + else + { + FCB->PollState &= ~AFD_EVENT_SEND; + } + if (!NoSpace) { - UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); FCB->Send.BytesUsed += TotalBytesCopied; - AFD_DbgPrint(MID_TRACE,("Completed %d bytes\n", TotalBytesCopied)); + AFD_DbgPrint(MID_TRACE,("Copied %d bytes\n", TotalBytesCopied)); + + Status = QueueUserModeIrp(FCB, Irp, FUNCTION_SEND); + if (Status == STATUS_PENDING && !FCB->SendIrp.InFlightRequest) + { + TdiSend(&FCB->SendIrp.InFlightRequest, + FCB->Connection.Object, + 0, + FCB->Send.Window, + FCB->Send.BytesUsed, + &FCB->SendIrp.Iosb, + SendComplete, + FCB); + } + SocketStateUnlock(FCB); + + return STATUS_PENDING; } else { @@ -414,38 +485,6 @@ return LeaveIrpUntilLater( FCB, Irp, FUNCTION_SEND ); } } - - if (!FCB->SendIrp.InFlightRequest) - { - Status = TdiSend( &FCB->SendIrp.InFlightRequest, - FCB->Connection.Object, - 0, - FCB->Send.Window, - FCB->Send.BytesUsed, - &FCB->SendIrp.Iosb, - SendComplete, - FCB ); - - if( Status == STATUS_PENDING ) - Status = STATUS_SUCCESS; - - AFD_DbgPrint(MID_TRACE,("Dismissing request: %x (%d)\n", - Status, TotalBytesCopied)); - } - - if (SpaceAvail) - { - FCB->PollState |= AFD_EVENT_SEND; - FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS; - PollReeval( FCB->DeviceExt, FCB->FileObject ); - } - else - { - FCB->PollState &= ~AFD_EVENT_SEND; - } - - return UnlockAndMaybeComplete - ( FCB, Status, Irp, TotalBytesCopied ); } NTSTATUS NTAPI @@ -456,7 +495,6 @@ PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; PAFD_SEND_INFO_UDP SendReq; - ULONG Information; AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); @@ -514,27 +552,29 @@ if( NT_SUCCESS(Status) ) { FCB->PollState &= ~AFD_EVENT_SEND; - Status = TdiSendDatagram - ( &FCB->SendIrp.InFlightRequest, - FCB->AddressFile.Object, - SendReq->BufferArray[0].buf, - SendReq->BufferArray[0].len, - TargetAddress, - &FCB->SendIrp.Iosb, - PacketSocketSendComplete, - FCB ); + Status = QueueUserModeIrp(FCB, Irp, FUNCTION_SEND); + if (Status == STATUS_PENDING) + { + TdiSendDatagram(&FCB->SendIrp.InFlightRequest, + FCB->AddressFile.Object, + SendReq->BufferArray[0].buf, + SendReq->BufferArray[0].len, + TargetAddress, + &FCB->SendIrp.Iosb, + PacketSocketSendComplete, + FCB); + } ExFreePool( TargetAddress ); - } - - if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS; - - AFD_DbgPrint(MID_TRACE,("Dismissing request: %x\n", Status)); - - /* Even if we were pended, we're done with the user buffer at this - * point. */ - Information = SendReq->BufferArray[0].len; - UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); - return UnlockAndMaybeComplete( FCB, Status, Irp, Information ); + + SocketStateUnlock(FCB); + + return STATUS_PENDING; + } + else + { + UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); + return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); + } }

1 0

[tkreuzer] 52551: [RPCRT4] Fix MSVC version of call_server_func
by tkreuzer＠svn.reactos.org 07 Jul '11

07 Jul '11

Author: tkreuzer Date: Thu Jul 7 00:21:41 2011 New Revision: 52551 URL: http://svn.reactos.org/svn/reactos?rev=52551&view=rev Log: [RPCRT4] Fix MSVC version of call_server_func Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c Modified: trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rpcrt4/ndr_stubl… ============================================================================== --- trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rpcrt4/ndr_stubless.c [iso-8859-1] Thu Jul 7 00:21:41 2011 @@ -841,11 +841,12 @@ __asm { push ebp + mov ebp, esp push edi ; Save registers push esi - mov ebp, esp mov eax, [ebp+16] ; Get stack size sub esp, eax ; Make room in stack for arguments + and esp, 0xFFFFFFF0 mov edi, esp mov ecx, eax mov esi, [ebp+12]

1 0

[tfaber] 52550: [KMTESTS] - add support for special-purpose standalone drivers - add standalone driver to Example test
by tfaber＠svn.reactos.org 06 Jul '11

06 Jul '11

Author: tfaber Date: Wed Jul 6 22:23:03 2011 New Revision: 52550 URL: http://svn.reactos.org/svn/reactos?rev=52550&view=rev Log: [KMTESTS] - add support for special-purpose standalone drivers - add standalone driver to Example test Added: branches/GSoC_2011/KMTestSuite/kmtests/example/CMakeLists.txt (with props) branches/GSoC_2011/KMTestSuite/kmtests/example/Example.h (with props) branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c (with props) branches/GSoC_2011/KMTestSuite/kmtests/example/example_drv.rbuild (with props) branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_standalone.c (with props) Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt branches/GSoC_2011/KMTestSuite/kmtests/directory.rbuild branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild Modified: branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/C… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/CMakeLists.txt [iso-8859-1] Wed Jul 6 22:23:03 2011 @@ -4,7 +4,7 @@ # # subdirectories containing special-purpose drivers # -#add_subdirectory(something) +add_subdirectory(Example) # # kmtest_drv.sys driver Modified: branches/GSoC_2011/KMTestSuite/kmtests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/d… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/directory.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/directory.rbuild [iso-8859-1] Wed Jul 6 22:23:03 2011 @@ -1,9 +1,9 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> <group xmlns:xi="http://www.w3.org/2001/XInclude"> -  + <directory name="example"> + <xi:include href="example/example_drv.rbuild" /> + </directory> <xi:include href="kmtest.rbuild" /> <xi:include href="kmtest_drv.rbuild" /> </group> Added: branches/GSoC_2011/KMTestSuite/kmtests/example/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/CMakeLists.txt (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/CMakeLists.txt [iso-8859-1] Wed Jul 6 22:23:03 2011 @@ -1,0 +1,15 @@ +include_directories( + ../include) + +list(APPEND EXAMPLE_DRV_SOURCE + ../kmtest_drv/kmtest_standalone.c + Example_drv.c) + +add_library(example_drv SHARED ${EXAMPLE_DRV_SOURCE}) + +set_module_type(example_drv kernelmodedriver) +target_link_libraries(example_drv kmtest_printf ${PSEH_LIB}) +add_importlibs(example_drv ntoskrnl hal) +set_property(TARGET example_drv PROPERTY COMPILE_DEFINITIONS KMT_STANDALONE_DRIVER) + +add_cd_file(TARGET example_drv DESTINATION reactos/system32/drivers FOR all) Propchange: branches/GSoC_2011/KMTestSuite/kmtests/example/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/KMTestSuite/kmtests/example/Example.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/Example.h (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/Example.h [iso-8859-1] Wed Jul 6 22:23:03 2011 @@ -1,0 +1,21 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Example Test declarations + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#ifndef _KMTEST_EXAMPLE_H_ +#define _KMTEST_EXAMPLE_H_ + +typedef struct +{ + int a; + char b[8]; +} MY_STRUCT, *PMY_STRUCT; + +#define IOCTL_NOTIFY 1 +#define IOCTL_SEND_STRING 2 +#define IOCTL_SEND_MYSTRUCT 3 + +#endif /* !defined _KMTEST_EXAMPLE_H_ */ Propchange: branches/GSoC_2011/KMTestSuite/kmtests/example/Example.h ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c [iso-8859-1] Wed Jul 6 22:23:03 2011 @@ -1,0 +1,246 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Example Test Driver + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include <ntddk.h> + +#include <kmt_test.h> + +//#define NDEBUG +#include <debug.h> + +#include "Example.h" + +/* prototypes */ +static KMT_MESSAGE_HANDLER TestMessageHandler; +static KMT_IRP_HANDLER TestIrpHandler; + +/* globals */ +static PDRIVER_OBJECT TestDriverObject; + +/** + * @name TestEntry + * + * Test entry point. + * This is called by DriverEntry as early as possible, but with ResultBuffer + * initialized, so that test macros work correctly + * + * @param DriverObject + * Driver Object. + * This is guaranteed not to have been touched by DriverEntry before + * the call to TestEntry + * @param RegistryPath + * Driver Registry Path + * This is guaranteed not to have been touched by DriverEntry before + * the call to TestEntry + * @param DeviceName + * Pointer to receive a test-specific name for the device to create + * @param Flags + * Pointer to a flags variable instructing DriverEntry how to proceed. + * See the KMT_TESTENTRY_FLAGS enumeration for possible values + * Initialized to zero on entry + * + * @return Status. + * DriverEntry will fail if this is a failure status + */ +NTSTATUS +TestEntry( + IN PDRIVER_OBJECT DriverObject, + IN PCUNICODE_STRING RegistryPath, + OUT PCWSTR *DeviceName, + OUT INT *Flags) +{ + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + UNREFERENCED_PARAMETER(RegistryPath); + + DPRINT("Entry!\n"); + + ok_irql(PASSIVE_LEVEL); + TestDriverObject = DriverObject; + + *DeviceName = L"Example"; + + trace("Hi, this is the example driver\n"); + + KmtRegisterIrpHandler(IRP_MJ_CREATE, NULL, TestIrpHandler); + KmtRegisterIrpHandler(IRP_MJ_CLOSE, NULL, TestIrpHandler); + KmtRegisterMessageHandler(0, NULL, TestMessageHandler); + + return Status; +} + +/** + * @name TestUnload + * + * Test unload routine. + * This is called by the driver's Unload routine as early as possible, with + * ResultBuffer and the test device object still valid, so that test macros + * work correctly + * + * @param DriverObject + * Driver Object. + * This is guaranteed not to have been touched by Unload before the call + * to TestEntry + * + * @return Status + */ +VOID +TestUnload( + IN PDRIVER_OBJECT DriverObject) +{ + PAGED_CODE(); + + DPRINT("Unload!\n"); + + ok_irql(PASSIVE_LEVEL); + ok_eq_pointer(DriverObject, TestDriverObject); + + trace("Unloading example driver\n"); +} + +/** + * @name TestMessageHandler + * + * Test message handler routine + * + * @param DeviceObject + * Device Object. + * This is guaranteed not to have been touched by the dispatch function + * before the call to the IRP handler + * @param Irp + * Device Object. + * This is guaranteed not to have been touched by the dispatch function + * before the call to the IRP handler, except for passing it to + * IoGetCurrentStackLocation + * @param IoStackLocation + * Device Object. + * This is guaranteed not to have been touched by the dispatch function + * before the call to the IRP handler + * + * @return Status + */ +static +NTSTATUS +TestMessageHandler( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG ControlCode, + IN PVOID Buffer OPTIONAL, + IN SIZE_T InLength, + IN OUT PSIZE_T OutLength) +{ + NTSTATUS Status = STATUS_SUCCESS; + + switch (ControlCode) + { + case IOCTL_NOTIFY: + { + static int TimesReceived = 0; + + ++TimesReceived; + ok(TimesReceived == 1, "Received control code 1 %d times\n", TimesReceived); + ok_eq_pointer(Buffer, NULL); + ok_eq_ulong((ULONG)InLength, 0LU); + ok_eq_ulong((ULONG)*OutLength, 0LU); + break; + } + case IOCTL_SEND_STRING: + { + static int TimesReceived = 0; + ANSI_STRING ExpectedString = RTL_CONSTANT_STRING("yay"); + ANSI_STRING ReceivedString; + + ++TimesReceived; + ok(TimesReceived == 1, "Received control code 2 %d times\n", TimesReceived); + ok(Buffer != NULL, "Buffer is NULL\n"); + ok_eq_ulong((ULONG)InLength, (ULONG)ExpectedString.Length); + ok_eq_ulong((ULONG)*OutLength, 0LU); + ReceivedString.MaximumLength = ReceivedString.Length = (USHORT)InLength; + ReceivedString.Buffer = Buffer; + ok(RtlCompareString(&ExpectedString, &ReceivedString, FALSE) == 0, "Received string: %Z\n", &ReceivedString); + break; + } + case IOCTL_SEND_MYSTRUCT: + { + static int TimesReceived = 0; + MY_STRUCT ExpectedStruct = { 123, ":D" }; + MY_STRUCT ResultStruct = { 456, "!!!" }; + + ++TimesReceived; + ok(TimesReceived == 1, "Received control code 3 %d times\n", TimesReceived); + ok(Buffer != NULL, "Buffer is NULL\n"); + ok_eq_ulong((ULONG)InLength, (ULONG)sizeof ExpectedStruct); + ok_eq_ulong((ULONG)*OutLength, 2LU * sizeof ExpectedStruct); + if (!skip(Buffer && InLength >= sizeof ExpectedStruct, "Cannot read from buffer!\n")) + ok(RtlCompareMemory(&ExpectedStruct, Buffer, sizeof ExpectedStruct) == sizeof ExpectedStruct, "Buffer does not contain expected values\n"); + + if (!skip(Buffer && *OutLength >= 2 * sizeof ExpectedStruct, "Cannot write to buffer!\n")) + { + RtlCopyMemory((PCHAR)Buffer + sizeof ExpectedStruct, &ResultStruct, sizeof ResultStruct); + *OutLength = 2 * sizeof ExpectedStruct; + } + break; + } + default: + ok(0, "Got an unknown message! DeviceObject=%p, ControlCode=%lu, Buffer=%p, In=%lu, Out=%lu bytes\n", + DeviceObject, ControlCode, Buffer, InLength, *OutLength); + break; + } + + return Status; +} + +/** + * @name TestIrpHandler + * + * Test IRP handler routine + * + * @param DeviceObject + * Device Object. + * This is guaranteed not to have been touched by the dispatch function + * before the call to the IRP handler + * @param Irp + * Device Object. + * This is guaranteed not to have been touched by the dispatch function + * before the call to the IRP handler, except for passing it to + * IoGetCurrentStackLocation + * @param IoStackLocation + * Device Object. + * This is guaranteed not to have been touched by the dispatch function + * before the call to the IRP handler + * + * @return Status + */ +static +NTSTATUS +TestIrpHandler( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status = STATUS_SUCCESS; + + DPRINT("IRP!\n"); + + ok_irql(PASSIVE_LEVEL); + ok_eq_pointer(DeviceObject->DriverObject, TestDriverObject); + + if (IoStackLocation->MajorFunction == IRP_MJ_CREATE) + trace("Got IRP_MJ_CREATE!\n"); + else if (IoStackLocation->MajorFunction == IRP_MJ_CLOSE) + trace("Got IRP_MJ_CLOSE!\n"); + else + trace("Got an IRP!\n"); + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/example/Example_drv.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/Example_user.c [iso-8859-1] Wed Jul 6 22:23:03 2011 @@ -10,10 +10,14 @@ #include <windows.h> #include <kmt_test.h> +#include "Example.h" + START_TEST(Example) { /* do some user-mode stuff */ SYSTEM_INFO SystemInfo; + MY_STRUCT MyStruct[2] = { { 123, ":D" }, { 0 } }; + DWORD Length = sizeof MyStruct; trace("Message from user-mode\n"); @@ -23,4 +27,21 @@ /* now run the kernel-mode part (see Example.c). * If no user-mode part exists, this is what's done automatically */ KmtRunKernelTest("Example"); + + /* now start the special-purpose driver */ + KmtLoadDriver(L"Example", FALSE); + trace("After Entry\n"); + KmtOpenDriver(); + trace("After Create\n"); + + ok(KmtSendToDriver(IOCTL_NOTIFY) == ERROR_SUCCESS, "\n"); + ok(KmtSendStringToDriver(IOCTL_SEND_STRING, "yay") == ERROR_SUCCESS, "\n"); + ok(KmtSendBufferToDriver(IOCTL_SEND_MYSTRUCT, MyStruct, sizeof MyStruct[0], &Length) == ERROR_SUCCESS, "\n"); + ok_eq_int(MyStruct[1].a, 456); + ok_eq_str(MyStruct[1].b, "!!!"); + + KmtCloseDriver(); + trace("After Close\n"); + KmtUnloadDriver(); + trace("After Unload\n"); } Added: branches/GSoC_2011/KMTestSuite/kmtests/example/example_drv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/e… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/example/example_drv.rbuild (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/example/example_drv.rbuild [iso-8859-1] Wed Jul 6 22:23:03 2011 @@ -1,0 +1,14 @@ +<module name="example_drv" type="kernelmodedriver" installbase="system32/drivers" installname="example_drv.sys"> + <include base="kmtest_drv">include</include> + <library>ntoskrnl</library> + <library>hal</library> + <library>pseh</library> + <library>kmtest_printf</library> + <define name="KMT_STANDALONE_DRIVER" /> + <file>Example_drv.c</file> + <directory name=".."> + <directory name="kmtest_drv"> + <file>kmtest_standalone.c</file> + </directory> + </directory> +</module> Propchange: branches/GSoC_2011/KMTestSuite/kmtests/example/example_drv.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] Wed Jul 6 22:23:03 2011 @@ -38,6 +38,40 @@ CHAR LogBuffer[ANYSIZE_ARRAY]; } KMT_RESULTBUFFER, *PKMT_RESULTBUFFER; +#ifdef KMT_STANDALONE_DRIVER +#define KMT_KERNEL_MODE + +typedef NTSTATUS (KMT_IRP_HANDLER)( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation); +typedef KMT_IRP_HANDLER *PKMT_IRP_HANDLER; + +NTSTATUS KmtRegisterIrpHandler(IN UCHAR MajorFunction, IN PDEVICE_OBJECT DeviceObject OPTIONAL, IN PKMT_IRP_HANDLER IrpHandler); +NTSTATUS KmtUnregisterIrpHandler(IN UCHAR MajorFunction, IN PDEVICE_OBJECT DeviceObject OPTIONAL, IN PKMT_IRP_HANDLER IrpHandler); + +typedef NTSTATUS (KMT_MESSAGE_HANDLER)( + IN PDEVICE_OBJECT DeviceObject, + IN ULONG ControlCode, + IN PVOID Buffer OPTIONAL, + IN SIZE_T InLength, + IN OUT PSIZE_T OutLength); +typedef KMT_MESSAGE_HANDLER *PKMT_MESSAGE_HANDLER; + +NTSTATUS KmtRegisterMessageHandler(IN ULONG ControlCode OPTIONAL, IN PDEVICE_OBJECT DeviceObject OPTIONAL, IN PKMT_MESSAGE_HANDLER MessageHandler); +NTSTATUS KmtUnregisterMessageHandler(IN ULONG ControlCode OPTIONAL, IN PDEVICE_OBJECT DeviceObject OPTIONAL, IN PKMT_MESSAGE_HANDLER MessageHandler); + +typedef enum +{ + TESTENTRY_NO_CREATE_DEVICE = 1, + TESTENTRY_NO_REGISTER_DISPATCH = 2, + TESTENTRY_NO_REGISTER_UNLOAD = 4, +} KMT_TESTENTRY_FLAGS; + +NTSTATUS TestEntry(IN PDRIVER_OBJECT DriverObject, IN PCUNICODE_STRING RegistryPath, OUT PCWSTR *DeviceName, OUT INT *Flags); +VOID TestUnload(IN PDRIVER_OBJECT DriverObject); +#endif /* defined KMT_STANDALONE_DRIVER */ + #ifdef KMT_KERNEL_MODE /* Device Extension layout */ typedef struct @@ -55,7 +89,7 @@ DWORD KmtSendToDriver(IN DWORD ControlCode); DWORD KmtSendStringToDriver(IN DWORD ControlCode, IN PCSTR String); -DWORD KmtSendBufferToDriver(IN DWORD ControlCode, IN OUT PVOID Buffer, IN OUT PDWORD Length); +DWORD KmtSendBufferToDriver(IN DWORD ControlCode, IN OUT PVOID Buffer OPTIONAL, IN DWORD InLength, IN OUT PDWORD OutLength); #endif /* defined KMT_USER_MODE */ extern PKMT_RESULTBUFFER ResultBuffer; @@ -105,7 +139,7 @@ #define ok_eq_wstr(value, expected) ok(!wcscmp(value, expected), #value " = \"%ls\", expected \"%ls\"\n", value, expected) #define KMT_MAKE_CODE(ControlCode) CTL_CODE(FILE_DEVICE_UNKNOWN, \ - 0xA00 + (ControlCode), \ + 0xC00 + (ControlCode), \ METHOD_BUFFERED, \ FILE_ANY_ACCESS) Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest/support.c [iso-8859-1] Wed Jul 6 22:23:03 2011 @@ -192,6 +192,8 @@ { DWORD BytesRead; + assert(ControlCode < 0x400); + if (!DeviceIoControl(TestDeviceHandle, KMT_MAKE_CODE(ControlCode), NULL, 0, NULL, 0, &BytesRead, NULL)) return GetLastError(); @@ -215,6 +217,8 @@ { DWORD BytesRead; + assert(ControlCode < 0x400); + if (!DeviceIoControl(TestDeviceHandle, KMT_MAKE_CODE(ControlCode), (PVOID)String, strlen(String), NULL, 0, &BytesRead, NULL)) return GetLastError(); @@ -226,19 +230,23 @@ * * @param ControlCode * @param Buffer - * @param Length + * @param InLength + * @param OutLength * * @return Win32 error code as returned by DeviceIoControl */ DWORD KmtSendBufferToDriver( IN DWORD ControlCode, - IN OUT PVOID Buffer, - IN OUT PDWORD Length) -{ - assert(Length); - - if (!DeviceIoControl(TestDeviceHandle, KMT_MAKE_CODE(ControlCode), Buffer, *Length, NULL, 0, Length, NULL)) + IN OUT PVOID Buffer OPTIONAL, + IN DWORD InLength, + IN OUT PDWORD OutLength) +{ + assert(OutLength); + assert(Buffer || (!InLength && !*OutLength)); + assert(ControlCode < 0x400); + + if (!DeviceIoControl(TestDeviceHandle, KMT_MAKE_CODE(ControlCode), Buffer, InLength, Buffer, *OutLength, OutLength, NULL)) return GetLastError(); return ERROR_SUCCESS; Modified: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv.rbuild [iso-8859-1] Wed Jul 6 22:23:03 2011 @@ -1,7 +1,6 @@ <module name="kmtest_drv" type="kernelmodedriver" installbase="system32/drivers" installname="kmtest_drv.sys"> <include base="kmtest_drv">include</include> <library>ntoskrnl</library> - <library>ntdll</library> <library>hal</library> <library>pseh</library> <library>kmtest_printf</library> Added: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_standalone.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/k… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_standalone.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_standalone.c [iso-8859-1] Wed Jul 6 22:23:03 2011 @@ -1,0 +1,513 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Example Test Driver + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include <ntddk.h> + +#define KMT_DEFINE_TEST_FUNCTIONS +#include <kmt_test.h> + +//#define NDEBUG +#include <debug.h> + +#include <kmt_public.h> + +/* types */ +typedef struct +{ + UCHAR MajorFunction; + PDEVICE_OBJECT DeviceObject; + PKMT_IRP_HANDLER IrpHandler; +} KMT_IRP_HANDLER_ENTRY, *PKMT_IRP_HANDLER_ENTRY; + +typedef struct +{ + ULONG ControlCode; + PDEVICE_OBJECT DeviceObject; + PKMT_MESSAGE_HANDLER MessageHandler; +} KMT_MESSAGE_HANDLER_ENTRY, *PKMT_MESSAGE_HANDLER_ENTRY; + +/* Prototypes */ +DRIVER_INITIALIZE DriverEntry; +static DRIVER_UNLOAD DriverUnload; +static DRIVER_DISPATCH DriverDispatch; +static KMT_IRP_HANDLER DeviceControlHandler; + +/* Globals */ +static PDEVICE_OBJECT TestDeviceObject; +static PDEVICE_OBJECT KmtestDeviceObject; + +#define KMT_MAX_IRP_HANDLERS 256 +static KMT_IRP_HANDLER_ENTRY IrpHandlers[KMT_MAX_IRP_HANDLERS] = { { 0 } }; +#define KMT_MAX_MESSAGE_HANDLERS 256 +static KMT_MESSAGE_HANDLER_ENTRY MessageHandlers[KMT_MAX_MESSAGE_HANDLERS] = { { 0 } }; + +static const char *IrpMajorFunctionNames[] = +{ + "Create", + "CreateNamedPipe", + "Close", + "Read", + "Write", + "QueryInformation", + "SetInformation", + "QueryEa", + "SetEa", + "FlushBuffers", + "QueryVolumeInformation", + "SetVolumeInformation", + "DirectoryControl", + "FileSystemControl", + "DeviceControl", + "InternalDeviceControl/Scsi", + "Shutdown", + "LockControl", + "Cleanup", + "CreateMailslot", + "QuerySecurity", + "SetSecurity", + "Power", + "SystemControl", + "DeviceChange", + "QueryQuota", + "SetQuota", + "Pnp/PnpPower" +}; + +/** + * @name DriverEntry + * + * Driver entry point. + * + * @param DriverObject + * Driver Object + * @param RegistryPath + * Driver Registry Path + * + * @return Status + */ +NTSTATUS +NTAPI +DriverEntry( + IN PDRIVER_OBJECT DriverObject, + IN PUNICODE_STRING RegistryPath) +{ + NTSTATUS Status = STATUS_SUCCESS; + WCHAR DeviceNameBuffer[128] = L"\\Device\\Kmtest-"; + UNICODE_STRING KmtestDeviceName; + PFILE_OBJECT KmtestFileObject; + PKMT_DEVICE_EXTENSION KmtestDeviceExtension; + UNICODE_STRING DeviceName; + PCWSTR DeviceNameSuffix; + INT Flags = 0; + int i; + + PAGED_CODE(); + + DPRINT("DriverEntry\n"); + + /* get the Kmtest device, so that we get a ResultBuffer pointer */ + RtlInitUnicodeString(&KmtestDeviceName, KMTEST_DEVICE_DRIVER_PATH); + Status = IoGetDeviceObjectPointer(&KmtestDeviceName, FILE_ALL_ACCESS, &KmtestFileObject, &KmtestDeviceObject); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to get Kmtest device object pointer\n"); + goto cleanup; + } + + Status = ObReferenceObjectByPointer(KmtestDeviceObject, FILE_ALL_ACCESS, NULL, KernelMode); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Failed to reference Kmtest device object\n"); + goto cleanup; + } + + ObDereferenceObject(KmtestFileObject); + KmtestFileObject = NULL; + KmtestDeviceExtension = KmtestDeviceObject->DeviceExtension; + ResultBuffer = KmtestDeviceExtension->ResultBuffer; + DPRINT("KmtestDeviceObject: %p\n", (PVOID)KmtestDeviceObject); + DPRINT("KmtestDeviceExtension: %p\n", (PVOID)KmtestDeviceExtension); + DPRINT("Setting ResultBuffer: %p\n", (PVOID)ResultBuffer); + + /* call TestEntry */ + RtlInitUnicodeString(&DeviceName, DeviceNameBuffer); + DeviceName.MaximumLength = sizeof DeviceNameBuffer; + TestEntry(DriverObject, RegistryPath, &DeviceNameSuffix, &Flags); + RtlAppendUnicodeToString(&DeviceName, DeviceNameSuffix); + + /* create test device */ + if (!(Flags & TESTENTRY_NO_CREATE_DEVICE)) + { + Status = IoCreateDevice(DriverObject, 0, &DeviceName, + FILE_DEVICE_UNKNOWN, + FILE_DEVICE_SECURE_OPEN | FILE_READ_ONLY_DEVICE, + TRUE, &TestDeviceObject); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("Could not create device object %wZ\n", &DeviceName); + goto cleanup; + } + + DPRINT("DriverEntry. Created DeviceObject %p\n", + TestDeviceObject); + } + + /* initialize dispatch functions */ + if (!(Flags & TESTENTRY_NO_REGISTER_UNLOAD)) + DriverObject->DriverUnload = DriverUnload; + if (!(Flags & TESTENTRY_NO_REGISTER_DISPATCH)) + for (i = 0; i <= IRP_MJ_MAXIMUM_FUNCTION; ++i) + DriverObject->MajorFunction[i] = DriverDispatch; + +cleanup: + if (TestDeviceObject && !NT_SUCCESS(Status)) + { + IoDeleteDevice(TestDeviceObject); + TestDeviceObject = NULL; + } + + if (KmtestDeviceObject && !NT_SUCCESS(Status)) + { + ObDereferenceObject(KmtestDeviceObject); + KmtestDeviceObject = NULL; + if (KmtestFileObject) + ObDereferenceObject(KmtestFileObject); + } + + return Status; +} + +/** + * @name DriverUnload + * + * Driver cleanup funtion. + * + * @param DriverObject + * Driver Object + */ +static +VOID +NTAPI +DriverUnload( + IN PDRIVER_OBJECT DriverObject) +{ + PAGED_CODE(); + + UNREFERENCED_PARAMETER(DriverObject); + + DPRINT("DriverUnload\n"); + + TestUnload(DriverObject); + + if (TestDeviceObject) + IoDeleteDevice(TestDeviceObject); + + if (KmtestDeviceObject) + ObDereferenceObject(KmtestDeviceObject); +} + +/** + * @name KmtRegisterIrpHandler + * + * Register a handler with the IRP Dispatcher. + * If multiple registered handlers match an IRP, it is unspecified which of + * them is called on IRP reception + * + * @param MajorFunction + * IRP major function code to be handled + * @param DeviceObject + * Device Object to handle IRPs for. + * Can be NULL to indicate any device object + * @param IrpHandler + * Handler function to register. + * + * @return Status + */ +NTSTATUS +KmtRegisterIrpHandler( + IN UCHAR MajorFunction, + IN PDEVICE_OBJECT DeviceObject OPTIONAL, + IN PKMT_IRP_HANDLER IrpHandler) +{ + NTSTATUS Status = STATUS_SUCCESS; + int i; + + if (MajorFunction > IRP_MJ_MAXIMUM_FUNCTION) + { + Status = STATUS_INVALID_PARAMETER_1; + goto cleanup; + } + + if (IrpHandler == NULL) + { + Status = STATUS_INVALID_PARAMETER_3; + goto cleanup; + } + + for (i = 0; i < sizeof IrpHandlers / sizeof IrpHandlers[0]; ++i) + if (IrpHandlers[i].IrpHandler == NULL) + { + IrpHandlers[i].MajorFunction = MajorFunction; + IrpHandlers[i].DeviceObject = DeviceObject; + IrpHandlers[i].IrpHandler = IrpHandler; + goto cleanup; + } + + Status = STATUS_ALLOTTED_SPACE_EXCEEDED; + +cleanup: + return Status; +} + +/** + * @name KmtUnregisterIrpHandler + * + * Unregister a handler with the IRP Dispatcher. + * Parameters must be specified exactly as in the call to + * KmtRegisterIrpHandler. Only the first matching entry will be removed + * if multiple exist + * + * @param MajorFunction + * IRP major function code of the handler to be removed + * @param DeviceObject + * Device Object to of the handler to be removed + * @param IrpHandler + * Handler function of the handler to be removed + * + * @return Status + */ +NTSTATUS +KmtUnregisterIrpHandler( + IN UCHAR MajorFunction, + IN PDEVICE_OBJECT DeviceObject OPTIONAL, + IN PKMT_IRP_HANDLER IrpHandler) +{ + NTSTATUS Status = STATUS_SUCCESS; + int i; + + for (i = 0; i < sizeof IrpHandlers / sizeof IrpHandlers[0]; ++i) + if (IrpHandlers[i].MajorFunction == MajorFunction && + IrpHandlers[i].DeviceObject == DeviceObject && + IrpHandlers[i].IrpHandler == IrpHandler) + { + IrpHandlers[i].IrpHandler = NULL; + goto cleanup; + } + + Status = STATUS_NOT_FOUND; + +cleanup: + return Status; +} + +/** + * @name DriverDispatch + * + * Driver Dispatch function + * + * @param DeviceObject + * Device Object + * @param Irp + * I/O request packet + * + * @return Status + */ +static +NTSTATUS +NTAPI +DriverDispatch( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status = STATUS_SUCCESS; + PIO_STACK_LOCATION IoStackLocation; + int i; + + PAGED_CODE(); + + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + + DPRINT("DriverDispatch: Function=%s, Device=%p\n", + IrpMajorFunctionNames[IoStackLocation->MajorFunction], + DeviceObject); + + for (i = 0; i < sizeof IrpHandlers / sizeof IrpHandlers[0]; ++i) + { + if (IrpHandlers[i].MajorFunction == IoStackLocation->MajorFunction && + (IrpHandlers[i].DeviceObject == NULL || IrpHandlers[i].DeviceObject == DeviceObject) && + IrpHandlers[i].IrpHandler != NULL) + return IrpHandlers[i].IrpHandler(DeviceObject, Irp, IoStackLocation); + } + + /* default handler for DeviceControl */ + if (IoStackLocation->MajorFunction == IRP_MJ_DEVICE_CONTROL || + IoStackLocation->MajorFunction == IRP_MJ_INTERNAL_DEVICE_CONTROL) + return DeviceControlHandler(DeviceObject, Irp, IoStackLocation); + + /* default handler */ + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} + +/** + * @name KmtRegisterMessageHandler + * + * Register a handler with the DeviceControl Dispatcher. + * If multiple registered handlers match a message, it is unspecified which of + * them is called on message reception. + * NOTE: message handlers registered with this function will not be called + * if a custom IRP handler matching the corresponding IRP is installed! + * + * @param ControlCode + * Control code to be handled, as passed by the application. + * Can be 0 to indicate any control code + * @param DeviceObject + * Device Object to handle IRPs for. + * Can be NULL to indicate any device object + * @param MessageHandler + * Handler function to register. + * + * @return Status + */ +NTSTATUS +KmtRegisterMessageHandler( + IN ULONG ControlCode OPTIONAL, + IN PDEVICE_OBJECT DeviceObject OPTIONAL, + IN PKMT_MESSAGE_HANDLER MessageHandler) +{ + NTSTATUS Status = STATUS_SUCCESS; + int i; + + if (ControlCode >= 0x400) + { + Status = STATUS_INVALID_PARAMETER_1; + goto cleanup; + } + + if (MessageHandler == NULL) + { + Status = STATUS_INVALID_PARAMETER_2; + goto cleanup; + } + + for (i = 0; i < sizeof MessageHandlers / sizeof MessageHandlers[0]; ++i) + if (MessageHandlers[i].MessageHandler == NULL) + { + MessageHandlers[i].ControlCode = ControlCode; + MessageHandlers[i].DeviceObject = DeviceObject; + MessageHandlers[i].MessageHandler = MessageHandler; + goto cleanup; + } + + Status = STATUS_ALLOTTED_SPACE_EXCEEDED; + +cleanup: + return Status; +} + +/** + * @name KmtUnregisterMessageHandler + * + * Unregister a handler with the DeviceControl Dispatcher. + * Parameters must be specified exactly as in the call to + * KmtRegisterMessageHandler. Only the first matching entry will be removed + * if multiple exist + * + * @param ControlCode + * Control code of the handler to be removed + * @param DeviceObject + * Device Object to of the handler to be removed + * @param MessageHandler + * Handler function of the handler to be removed + * + * @return Status + */ +NTSTATUS +KmtUnregisterMessageHandler( + IN ULONG ControlCode OPTIONAL, + IN PDEVICE_OBJECT DeviceObject OPTIONAL, + IN PKMT_MESSAGE_HANDLER MessageHandler) +{ + NTSTATUS Status = STATUS_SUCCESS; + int i; + + for (i = 0; i < sizeof MessageHandlers / sizeof MessageHandlers[0]; ++i) + if (MessageHandlers[i].ControlCode == ControlCode && + MessageHandlers[i].DeviceObject == DeviceObject && + MessageHandlers[i].MessageHandler == MessageHandler) + { + MessageHandlers[i].MessageHandler = NULL; + goto cleanup; + } + + Status = STATUS_NOT_FOUND; + +cleanup: + return Status; +} + +/** + * @name DeviceControlHandler + * + * Default IRP_MJ_DEVICE_CONTROL/IRP_MJ_INTERNAL_DEVICE_CONTROL handler + * + * @param DeviceObject + * Device Object. + * This is guaranteed not to have been touched by the dispatch function + * before the call to the IRP handler + * @param Irp + * Device Object. + * This is guaranteed not to have been touched by the dispatch function + * before the call to the IRP handler, except for passing it to + * IoGetCurrentStackLocation + * @param IoStackLocation + * Device Object. + * This is guaranteed not to have been touched by the dispatch function + * before the call to the IRP handler + * + * @return Status + */ +static +NTSTATUS +DeviceControlHandler( + IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp, + IN PIO_STACK_LOCATION IoStackLocation) +{ + NTSTATUS Status = STATUS_SUCCESS; + ULONG ControlCode = (IoStackLocation->Parameters.DeviceIoControl.IoControlCode & 0x00000FFC) >> 2; + ULONG OutLength = IoStackLocation->Parameters.DeviceIoControl.OutputBufferLength; + int i; + + for (i = 0; i < sizeof MessageHandlers / sizeof MessageHandlers[0]; ++i) + { + if ((MessageHandlers[i].ControlCode == 0 || + MessageHandlers[i].ControlCode == ControlCode) && + (MessageHandlers[i].DeviceObject == NULL || MessageHandlers[i].DeviceObject == DeviceObject) && + MessageHandlers[i].MessageHandler != NULL) + { + Status = MessageHandlers[i].MessageHandler(DeviceObject, ControlCode, Irp->AssociatedIrp.SystemBuffer, + IoStackLocation->Parameters.DeviceIoControl.InputBufferLength, + &OutLength); + break; + } + } + + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = OutLength; + + IoCompleteRequest(Irp, IO_NO_INCREMENT); + + return Status; +} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/kmtest_drv/kmtest_standalone.c ------------------------------------------------------------------------------ svn:eol-style = native

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