Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[pschweitzer] 50087: [NTOSKRNL] Fix CID 3454
by pschweitzer＠svn.reactos.org 21 Dec '10

21 Dec '10

Author: pschweitzer Date: Tue Dec 21 22:24:50 2010 New Revision: 50087 URL: http://svn.reactos.org/svn/reactos?rev=50087&view=rev Log: [NTOSKRNL] Fix CID 3454 Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iorsrce.… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] Tue Dec 21 22:24:50 2010 @@ -980,14 +980,13 @@ OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING RootRegKey; HANDLE RootRegHandle; - WCHAR RootRegString[] = L"\\REGISTRY\\MACHINE\\HARDWARE\\DESCRIPTION\\SYSTEM"; IO_QUERY Query; /* Set up the String */ RootRegKey.Length = 0; RootRegKey.MaximumLength = 2048; RootRegKey.Buffer = ExAllocatePoolWithTag(PagedPool, RootRegKey.MaximumLength, TAG_IO_RESOURCE); - RtlAppendUnicodeToString(&RootRegKey, RootRegString); + RtlAppendUnicodeToString(&RootRegKey, L"\\REGISTRY\\MACHINE\\HARDWARE\\DESCRIPTION\\SYSTEM"); /* Open a handle to the Root Registry Key */ InitializeObjectAttributes(

1 0

[jgardou] 50086: [SPEC2DEF] - handle int64 parameter type
by jgardou＠svn.reactos.org 21 Dec '10

21 Dec '10

Author: jgardou Date: Tue Dec 21 22:19:16 2010 New Revision: 50086 URL: http://svn.reactos.org/svn/reactos?rev=50086&view=rev Log: [SPEC2DEF] - handle int64 parameter type Modified: branches/cmake-bringup/tools/spec2def/spec2def.c Modified: branches/cmake-bringup/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp… ============================================================================== --- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Tue Dec 21 22:19:16 2010 @@ -46,7 +46,8 @@ ARG_PTR, ARG_STR, ARG_WSTR, - ARG_DBL + ARG_DBL, + ARG_INT64 }; char* astrCallingConventions[] = @@ -161,7 +162,7 @@ case ARG_PTR: fprintf(file, "void*"); break; case ARG_STR: fprintf(file, "char*"); break; case ARG_WSTR: fprintf(file, "wchar_t*"); break; - case ARG_DBL: fprintf(file, "__int64"); break; + case ARG_DBL: case ARG_INT64 : fprintf(file, "__int64"); break; } fprintf(file, " a%d", i); } @@ -178,6 +179,7 @@ case ARG_STR: fprintf(file, "'%%s'"); break; case ARG_WSTR: fprintf(file, "'%%ws'"); break; case ARG_DBL: fprintf(file, "%%\"PRix64\""); break; + case ARG_INT64: fprintf(file, "0x%%ll"); break; } } fprintf(file, ")\\n\""); @@ -192,6 +194,7 @@ case ARG_STR: fprintf(file, "(char*)a%d", i); break; case ARG_WSTR: fprintf(file, "(wchar_t*)a%d", i); break; case ARG_DBL: fprintf(file, "(__int64)a%d", i); break; + case ARG_INT64: fprintf(file, "(__int64)a%d", i); break; } } fprintf(file, ");\n"); @@ -527,6 +530,11 @@ { exp.nStackBytes += sizeof(void*); exp.anArgs[exp.nArgCount] = ARG_PTR; // FIXME: handle strings + } + else if (CompareToken(pc, "int64")) + { + exp.nStackBytes += 8; + exp.anArgs[exp.nArgCount] = ARG_INT64; // FIXME: handle strings } else fprintf(stderr, "error: line %d, expected type, got: %.10s\n", nLine, pc);

1 0

[jgardou] 50085: [VGA_NEW] - avoid buffer overrun, CID 11049 Brought to light by vicmarcal
by jgardou＠svn.reactos.org 21 Dec '10

21 Dec '10

Author: jgardou Date: Tue Dec 21 21:55:29 2010 New Revision: 50085 URL: http://svn.reactos.org/svn/reactos?rev=50085&view=rev Log: [VGA_NEW] - avoid buffer overrun, CID 11049 Brought to light by vicmarcal Modified: trunk/reactos/drivers/video/miniport/vga_new/vbe.c trunk/reactos/drivers/video/miniport/vga_new/vbe.h trunk/reactos/drivers/video/miniport/vga_new/vbemodes.c trunk/reactos/drivers/video/miniport/vga_new/vga.h Modified: trunk/reactos/drivers/video/miniport/vga_new/vbe.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga… ============================================================================== --- trunk/reactos/drivers/video/miniport/vga_new/vbe.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vga_new/vbe.c [iso-8859-1] Tue Dec 21 21:55:29 2010 @@ -42,7 +42,7 @@ { ULONG i; CHAR Version[21]; - + /* If the broken VESA bios found, turn VESA off */ VideoPortDebugPrint(0, "Vendor: %s Product: %s Revision: %s (%lx)\n", Vendor, Product, Revision, OemRevision); for (i = 0; i < (sizeof(BrokenVesaBiosList) / sizeof(PCHAR)); i++) @@ -52,7 +52,7 @@ /* For Brookdale-G (Intel), special hack used */ g_bIntelBrookdaleBIOS = !strncmp(Product, IntelBrookdale, sizeof(IntelBrookdale)); - + /* For NVIDIA make sure */ if (!(strncmp(Vendor, Nv11Vendor, sizeof(Nv11Vendor))) && !(strncmp(Product, Nv11Board, sizeof(Nv11Board))) && @@ -64,10 +64,10 @@ 0xC000, 345, Version, - sizeof(Version))) return FALSE; + sizeof(Version))) return FALSE; if (!strncmp(Version, "Version 3.11.01.24N16", sizeof(Version))) return FALSE; } - + /* VESA ok */ //VideoPortDebugPrint(0, "Vesa ok\n"); return TRUE; @@ -85,13 +85,13 @@ CHAR ProductName[80]; CHAR VendorName[80]; VP_STATUS Status; - + /* Set default */ VesaBiosOk = FALSE; Context = VgaExtension->Int10Interface.Context; - + /* Check magic and version */ - if (strncmp(VbeInfo->Info.Signature, "VESA", 4)) return VesaBiosOk; + if (VbeInfo->Info.Signature == VESA_MAGIC) return VesaBiosOk; if (VbeInfo->Info.Version < 0x102) return VesaBiosOk; /* Read strings */ @@ -125,13 +125,13 @@ ProductName[sizeof(OemString) - 1] = ANSI_NULL; ProductRevision[sizeof(OemString) - 1] = ANSI_NULL; OemString[sizeof(OemString) - 1] = ANSI_NULL; - + /* Check for known bad BIOS */ VesaBiosOk = IsVesaBiosOk(&VgaExtension->Int10Interface, VbeInfo->Info.OemSoftwareRevision, VendorName, ProductName, - ProductRevision); + ProductRevision); VgaExtension->VesaBiosOk = VesaBiosOk; return VesaBiosOk; } @@ -151,7 +151,7 @@ USHORT i; Entries = ClutBuffer->NumEntries; - + /* Allocate INT10 context/buffer */ VesaClut = VideoPortAllocatePool(VgaExtension, 1, sizeof(ULONG) * Entries, 0x20616756u); if (!VesaClut) return ERROR_INVALID_PARAMETER; @@ -178,7 +178,7 @@ Entries * sizeof(ULONG)); if (Status != NO_ERROR) return ERROR_INVALID_PARAMETER; - /* Write new palette */ + /* Write new palette */ BiosArguments.Ebx = 0; BiosArguments.Ecx = Entries; BiosArguments.Edx = ClutBuffer->FirstEntry; Modified: trunk/reactos/drivers/video/miniport/vga_new/vbe.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga… ============================================================================== --- trunk/reactos/drivers/video/miniport/vga_new/vbe.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vga_new/vbe.h [iso-8859-1] Tue Dec 21 21:55:29 2010 @@ -94,7 +94,7 @@ typedef struct _VBE_CONTROLLER_INFO { - CHAR Signature[4]; + ULONG Signature; USHORT Version; ULONG OemStringPtr; LONG Capabilities; @@ -214,4 +214,7 @@ extern BOOLEAN g_bIntelBrookdaleBIOS; +/* VBE2 magic number */ +#define VBE2_MAGIC ('V' + ('B' << 8) + ('E' << 16) + ('2' << 24)) + /* EOF */ Modified: trunk/reactos/drivers/video/miniport/vga_new/vbemodes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga… ============================================================================== --- trunk/reactos/drivers/video/miniport/vga_new/vbemodes.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vga_new/vbemodes.c [iso-8859-1] Tue Dec 21 21:55:29 2010 @@ -26,7 +26,7 @@ RaiseToPower2(IN USHORT Value) { ULONG SquaredResult = Value; - if ((Value - 1) & Value) for (SquaredResult = 1; (SquaredResult < Value) && (SquaredResult); SquaredResult *= 2); + if ((Value - 1) & Value) for (SquaredResult = 1; (SquaredResult < Value) && (SquaredResult); SquaredResult *= 2); return SquaredResult; } @@ -34,7 +34,7 @@ NTAPI VbeGetVideoMemoryBaseAddress(IN PHW_DEVICE_EXTENSION VgaExtension, IN PVIDEOMODE VgaMode) -{ +{ ULONG Length = 4 * 1024; USHORT TrampolineMemorySegment, TrampolineMemoryOffset; PVOID Context; @@ -46,7 +46,7 @@ /* Need linear and INT10 interface */ if (!(VgaMode->fbType & VIDEO_MODE_BANKED)) return 0; if (VgaExtension->Int10Interface.Size) return 0; - + /* Allocate scratch area and context */ VbeModeInfo = VideoPortAllocatePool(VgaExtension, 1, sizeof(VBE_MODE_INFO), ' agV'); if (!VbeModeInfo) return 0; @@ -71,7 +71,7 @@ VbeModeInfo, sizeof(VBE_MODE_INFO)); if (Status != NO_ERROR) return 0; - + /* Return phys address and cleanup */ BaseAddress = VbeModeInfo->PhysBasePtr; VgaExtension->Int10Interface.Int10FreeBuffer(Context, @@ -91,8 +91,8 @@ VIDEO_X86_BIOS_ARGUMENTS BiosArguments; ULONG ModeIndex; ULONG BaseAddress; - - VideoPortZeroMemory(&BiosArguments, sizeof(BiosArguments)); + + VideoPortZeroMemory(&BiosArguments, sizeof(BiosArguments)); ModeIndex = VgaMode->Mode; BiosArguments.Eax = ModeIndex & 0x0000FFFF; BiosArguments.Ebx = ModeIndex >> 16; @@ -100,12 +100,12 @@ Status = VideoPortInt10(VgaDeviceExtension, &BiosArguments); if (Status != NO_ERROR) return Status; - /* Check for VESA mode */ + /* Check for VESA mode */ if (ModeIndex >> 16) { /* Mode set fail */ if (BiosArguments.Eax != VBE_SUCCESS) return ERROR_INVALID_PARAMETER; - + /* Check current mode is desired mode */ BiosArguments.Eax = VBE_GET_CURRENT_VBE_MODE; Status = VideoPortInt10(VgaDeviceExtension, &BiosArguments); @@ -132,7 +132,7 @@ } } } - + /* Get VRAM address to update changes */ BaseAddress = VbeGetVideoMemoryBaseAddress(VgaDeviceExtension, VgaMode); if ((BaseAddress) && (VgaMode->PhysBase != BaseAddress)) @@ -140,8 +140,8 @@ *PhysPtrChange = TRUE; VgaMode->PhysBase = BaseAddress; } - - return NO_ERROR; + + return NO_ERROR; } VOID @@ -179,7 +179,7 @@ VgaExtension->Int10Interface.Version = 0; return; } - + /* Query INT10 interface */ VgaExtension->Int10Interface.Version = VIDEO_PORT_INT10_INTERFACE_VERSION_1; VgaExtension->Int10Interface.Size = sizeof(VIDEO_PORT_INT10_INTERFACE); @@ -190,12 +190,12 @@ VgaExtension->Int10Interface.Size = 0; VgaExtension->Int10Interface.Version = 0; } - + /* Add ref */ //VideoPortDebugPrint(0, "have int10 iface\n"); VgaExtension->Int10Interface.InterfaceReference(VgaExtension->Int10Interface.Context); Context = VgaExtension->Int10Interface.Context; - + /* Allocate scratch area and context */ Status = VgaExtension->Int10Interface.Int10AllocateBuffer(Context, &TrampolineMemorySegment, @@ -209,7 +209,7 @@ /* Init VBE data and write to card buffer */ //VideoPortDebugPrint(0, "have int10 data\n"); VbeInfo->ModeArray[128] = 0xFFFF; - strcpy(VbeInfo->Info.Signature, "VBE2"); + VbeInfo->Info.Signature = VBE2_MAGIC; Status = VgaExtension->Int10Interface.Int10WriteMemory(Context, TrampolineMemorySegment, TrampolineMemoryOffset, @@ -237,7 +237,7 @@ VbeVersion = VbeInfo->Info.Version; VideoPortDebugPrint(0, "vbe version %lx memory %lx\n", VbeVersion, TotalMemory); if (!ValidateVbeInfo(VgaExtension, VbeInfo)) return; - + /* Read modes */ //VideoPortDebugPrint(0, "read modes from %p\n", VbeInfo->Info.VideoModePtr); Status = VgaExtension->Int10Interface.Int10ReadMemory(Context, @@ -259,11 +259,11 @@ ModeResult = *++ThisMode; NewModes++; } - + /* Remove the built-in mode if not supported by card and check max modes */ if (!FourBppModeFound) --NumVideoModes; if ((NewModes >= 128) && (NumVideoModes > 8)) goto Cleanup; - + /* Switch to new SVGA mode list, copy VGA modes */ VgaModeList = VideoPortAllocatePool(VgaExtension, 1, (NewModes + NumVideoModes) * sizeof(VIDEOMODE), ' agV'); if (!VgaModeList) goto Cleanup; @@ -275,7 +275,7 @@ VideoPortDebugPrint(0, "Intel Brookdale-G Video BIOS Not Support!\n"); while (TRUE); } - + /* Scan SVGA modes */ // VideoPortDebugPrint(0, "Static modes: %d\n", NumVideoModes); VgaMode = &VgaModeList[NumVideoModes]; @@ -328,7 +328,7 @@ if (VbeModeInfo->ModeAttributes & VBE_MODEATTR_COLOR) VgaMode->fbType |= VIDEO_MODE_COLOR; if (VbeModeInfo->ModeAttributes & VBE_MODEATTR_GRAPHICS) VgaMode->fbType |= VIDEO_MODE_GRAPHICS; if (VbeModeInfo->ModeAttributes & VBE_MODEATTR_NON_VGA) VgaMode->NonVgaMode = TRUE; - + /* If no char data, say 80x25 */ VgaMode->col = VbeModeInfo->XCharSize ? VbeModeInfo->XResolution / VbeModeInfo->XCharSize : 80; VgaMode->row = VbeModeInfo->YCharSize ? VbeModeInfo->YResolution / VbeModeInfo->YCharSize : 25; @@ -338,8 +338,8 @@ VgaMode->bitsPerPlane = VbeModeInfo->BitsPerPixel / VbeModeInfo->NumberOfPlanes; if ((VgaMode->bitsPerPlane == 16) && (VbeModeInfo->GreenMaskSize == 5)) VgaMode->bitsPerPlane = 15; //VideoPortDebugPrint(0, "BPP: %d\n", VgaMode->BitsPerPlane); - - /* Do linear or banked frame buffers */ + + /* Do linear or banked frame buffers */ VgaMode->FrameBufferBase = 0; if (!LinearAddressing) { @@ -347,7 +347,7 @@ ScreenStride = RaiseToPower2(VbeModeInfo->BytesPerScanLine); VgaMode->wbytes = ScreenStride; //VideoPortDebugPrint(0, "ScanLines: %lx Stride: %lx\n", VbeModeInfo->BytesPerScanLine, VgaMode->Stride); - + /* Size of frame buffer is Height X ScanLine, align to bank/page size */ ScreenSize = VgaMode->hres * ScreenStride; //VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); @@ -355,7 +355,7 @@ //VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); if (Size > TotalMemory) Size = (Size + ((4 * 1024) - 1)) & ((4 * 1024) - 1); //VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); - + /* Banked VGA at 0xA0000 (64K) */ //VideoPortDebugPrint(0, "Final size: %lx\n", Size); VgaMode->fbType |= VIDEO_MODE_BANKED; @@ -374,7 +374,7 @@ if (!ScreenStride) ScreenStride = VbeModeInfo->BytesPerScanLine; VgaMode->wbytes = ScreenStride; //VideoPortDebugPrint(0, "ScanLines: %lx Stride: %lx\n", VbeModeInfo->BytesPerScanLine, VgaMode->Stride); - + /* Size of frame buffer is Height X ScanLine, align to page size */ ScreenSize = VgaMode->hres * LOWORD(VgaMode->wbytes); //VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); @@ -382,7 +382,7 @@ //VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); if (Size > TotalMemory) Size = (Size + ((4 * 1024) - 1)) & ((4 * 1024) - 1); //VideoPortDebugPrint(0, "Size: %lx\n", ScreenSize); - + /* Linear VGA must read settings from VBE */ VgaMode->fbType |= VIDEO_MODE_LINEAR; VgaMode->sbytes = Size; @@ -391,14 +391,14 @@ VgaMode->NoBankSwitch = FALSE; VgaMode->PhysBase = VbeModeInfo->PhysBasePtr; VgaMode->LogicalWidth = VgaMode->hres; - + /* Make VBE_SET_VBE_MODE command use Linear Framebuffer Select */ VgaMode->Mode |= (VBE_MODE_LINEAR_FRAMEBUFFER << 16); } - + /* Override bank switch if not support by card */ if (VbeModeInfo->ModeAttributes & VBE_MODEATTR_NO_BANK_SWITCH) VgaMode->NoBankSwitch = TRUE; - + /* Next */ if (ScreenSize <= TotalMemory) { Modified: trunk/reactos/drivers/video/miniport/vga_new/vga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vga… ============================================================================== --- trunk/reactos/drivers/video/miniport/vga_new/vga.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vga_new/vga.h [iso-8859-1] Tue Dec 21 21:55:29 2010 @@ -266,7 +266,7 @@ // eVb: 3.3 [VBE] PUSHORT CmdStream; // pointer to array of register-setting commands to // set up mode -// eVb: 3.4 [VBE] - Add fields to track linear addresses/sizes and flags +// eVb: 3.4 [VBE] - Add fields to track linear addresses/sizes and flags ULONG PhysBase; ULONG FrameBufferBase; ULONG FrameBufferSize; @@ -407,7 +407,7 @@ UCHAR CursorEnable; // whether cursor is enabled or not UCHAR CursorTopScanLine; // Cursor Start register setting (top scan) UCHAR CursorBottomScanLine; // Cursor End register setting (bottom scan) -// eVb: 3.5 [VBE] - Add fields for VBE support and XP+ INT10 interface +// eVb: 3.5 [VBE] - Add fields for VBE support and XP+ INT10 interface VIDEO_PORT_INT10_INTERFACE Int10Interface; BOOLEAN VesaBiosOk; // eVb: 3.5 [END] @@ -438,9 +438,12 @@ extern VIDEOMODE ModesVGA[]; extern PVIDEOMODE VgaModeList; -// eVb: 3.5 [VGA] - Add ATI/Mach64 Access Range +// eVb: 3.5 [VGA] - Add ATI/Mach64 Access Range #define NUM_VGA_ACCESS_RANGES 5 // eVb: 3.5 [END] extern VIDEO_ACCESS_RANGE VgaAccessRange[]; +/* VESA Bios Magic number */ +#define VESA_MAGIC ('V' + ('E' << 8) + ('S' << 16) + ('A' << 24)) + #include "vbe.h"

1 0

[tkreuzer] 50084: [NTSOKRNL] add a comment so that noone will stumble upon this atrocity a second time.
by tkreuzer＠svn.reactos.org 21 Dec '10

21 Dec '10

Author: tkreuzer Date: Tue Dec 21 21:48:29 2010 New Revision: 50084 URL: http://svn.reactos.org/svn/reactos?rev=50084&view=rev Log: [NTSOKRNL] add a comment so that noone will stumble upon this atrocity a second time. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Tue Dec 21 21:48:29 2010 @@ -191,7 +191,7 @@ * Display 'Loading XXX...' message. */ -VOID +VOID FASTCALL INIT_FUNCTION IopDisplayLoadingMessage(PUNICODE_STRING ServiceName) @@ -993,7 +993,7 @@ &BootEntry->RegistryPath, KEY_READ); if ((NT_SUCCESS(Status)) || /* ReactOS HACK for SETUPLDR */ - ((KeLoaderBlock->SetupLdrBlock) && ((KeyHandle = (PVOID)1)))) + ((KeLoaderBlock->SetupLdrBlock) && ((KeyHandle = (PVOID)1)))) // yes, it's an assignment! { /* Save the handle */ DriverInfo->ServiceHandle = KeyHandle; @@ -1068,24 +1068,24 @@ IopInitializeSystemDrivers(VOID) { PUNICODE_STRING *DriverList, *SavedList; - + /* No system drivers on the boot cd */ if (KeLoaderBlock->SetupLdrBlock) return; - + /* Get the driver list */ SavedList = DriverList = CmGetSystemDriverList(); ASSERT(DriverList); - + /* Loop it */ while (*DriverList) { /* Load the driver */ ZwLoadDriver(*DriverList); - + /* Free the entry */ RtlFreeUnicodeString(*DriverList); ExFreePool(*DriverList); - + /* Next entry */ InbvIndicateProgress(); DriverList++;

1 0

[pschweitzer] 50083: [NTOSKRNL] Actually, code was correct, but ugly (who said "normal, that's a hack). So, when that code is called from SetupLDR, KeyHandle is required to be to 1. This what code ...
by pschweitzer＠svn.reactos.org 21 Dec '10

21 Dec '10

Author: pschweitzer Date: Tue Dec 21 21:35:04 2010 New Revision: 50083 URL: http://svn.reactos.org/svn/reactos?rev=50083&view=rev Log: [NTOSKRNL] Actually, code was correct, but ugly (who said "normal, that's a hack). So, when that code is called from SetupLDR, KeyHandle is required to be to 1. This what code does. Thing we do in the if condition when it appears we are called from SetupLDR. To avoid any further question, or warning, adding more parenthesis to show that we know what we do. So, to sum up, there's no comparaison for KeyHandle Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Tue Dec 21 21:35:04 2010 @@ -932,16 +932,16 @@ /* Get highest group order index */ IopGroupIndex = PpInitGetGroupOrderIndex(NULL); if (IopGroupIndex == 0xFFFF) ASSERT(FALSE); - + /* Allocate the group table */ IopGroupTable = ExAllocatePoolWithTag(PagedPool, IopGroupIndex * sizeof(LIST_ENTRY), TAG_IO); if (IopGroupTable == NULL) ASSERT(FALSE); - + /* Initialize the group table lists */ for (i = 0; i < IopGroupIndex; i++) InitializeListHead(&IopGroupTable[i]); - + /* Loop the boot modules */ ListHead = &KeLoaderBlock->LoadOrderListHead; NextEntry = ListHead->Flink; @@ -951,18 +951,18 @@ LdrEntry = CONTAINING_RECORD(NextEntry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); - + /* Check if the DLL needs to be initialized */ if (LdrEntry->Flags & LDRP_DRIVER_DEPENDENT_DLL) { /* Call its entrypoint */ MmCallDllInitialize(LdrEntry, NULL); } - + /* Go to the next driver */ NextEntry = NextEntry->Flink; } - + /* Loop the boot drivers */ ListHead = &KeLoaderBlock->BootDriverListHead; NextEntry = ListHead->Flink; @@ -972,10 +972,10 @@ BootEntry = CONTAINING_RECORD(NextEntry, BOOT_DRIVER_LIST_ENTRY, Link); - + /* Get the driver loader entry */ LdrEntry = BootEntry->LdrEntry; - + /* Allocate our internal accounting structure */ DriverInfo = ExAllocatePoolWithTag(PagedPool, sizeof(DRIVER_INFORMATION), @@ -986,24 +986,24 @@ RtlZeroMemory(DriverInfo, sizeof(DRIVER_INFORMATION)); InitializeListHead(&DriverInfo->Link); DriverInfo->DataTableEntry = BootEntry; - + /* Open the registry key */ Status = IopOpenRegistryKeyEx(&KeyHandle, NULL, &BootEntry->RegistryPath, KEY_READ); if ((NT_SUCCESS(Status)) || /* ReactOS HACK for SETUPLDR */ - ((KeLoaderBlock->SetupLdrBlock) && (KeyHandle == (PVOID)1))) + ((KeLoaderBlock->SetupLdrBlock) && ((KeyHandle = (PVOID)1)))) { /* Save the handle */ DriverInfo->ServiceHandle = KeyHandle; - + /* Get the group oder index */ Index = PpInitGetGroupOrderIndex(KeyHandle); - + /* Get the tag position */ DriverInfo->TagPosition = PipGetDriverTagPriority(KeyHandle); - + /* Insert it into the list, at the right place */ ASSERT(Index < IopGroupIndex); NextEntry2 = IopGroupTable[Index].Flink; @@ -1013,18 +1013,18 @@ DriverInfoTag = CONTAINING_RECORD(NextEntry2, DRIVER_INFORMATION, Link); - + /* Check if we found the right tag position */ if (DriverInfoTag->TagPosition > DriverInfo->TagPosition) { /* We're done */ break; } - + /* Next entry */ NextEntry2 = NextEntry2->Flink; } - + /* Insert us right before the next entry */ NextEntry2 = NextEntry2->Blink; InsertHeadList(NextEntry2, &DriverInfo->Link); @@ -1046,18 +1046,18 @@ DriverInfo = CONTAINING_RECORD(NextEntry, DRIVER_INFORMATION, Link); - + /* Get the driver loader entry */ LdrEntry = DriverInfo->DataTableEntry->LdrEntry; - + /* Initialize it */ IopInitializeBuiltinDriver(LdrEntry); - + /* Next entry */ NextEntry = NextEntry->Flink; } } - + /* In old ROS, the loader list became empty after this point. Simulate. */ InitializeListHead(&KeLoaderBlock->LoadOrderListHead); }

1 0

[akhaldi] 50082: [NTOSKRNL] - Fix an assign where a comparison was intended. CID 2626.
by akhaldi＠svn.reactos.org 21 Dec '10

21 Dec '10

Author: akhaldi Date: Tue Dec 21 20:28:21 2010 New Revision: 50082 URL: http://svn.reactos.org/svn/reactos?rev=50082&view=rev Log: [NTOSKRNL] - Fix an assign where a comparison was intended. CID 2626. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Tue Dec 21 20:28:21 2010 @@ -993,7 +993,7 @@ &BootEntry->RegistryPath, KEY_READ); if ((NT_SUCCESS(Status)) || /* ReactOS HACK for SETUPLDR */ - ((KeLoaderBlock->SetupLdrBlock) && (KeyHandle = (PVOID)1))) + ((KeLoaderBlock->SetupLdrBlock) && (KeyHandle == (PVOID)1))) { /* Save the handle */ DriverInfo->ServiceHandle = KeyHandle;

1 0

[mjmartin] 50081: [NTOS]: Check that MaximumSize is valid value if the section is being backed by paging file.
by mjmartin＠svn.reactos.org 21 Dec '10

21 Dec '10

Author: mjmartin Date: Tue Dec 21 15:19:58 2010 New Revision: 50081 URL: http://svn.reactos.org/svn/reactos?rev=50081&view=rev Log: [NTOS]: Check that MaximumSize is valid value if the section is being backed by paging file. Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/section.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/section.c [iso-8859-1] Tue Dec 21 15:19:58 2010 @@ -1440,6 +1440,10 @@ } else if (!MaximumSize) MaximumSize = &SafeMaximumSize; + /* Check that MaximumSize is valid if backed by paging file */ + if ((!FileHandle) && (!MaximumSize->QuadPart)) + return STATUS_INVALID_PARAMETER_4; + /* Create the section */ Status = MmCreateSection(&SectionObject, DesiredAccess,

1 0

[rmessiant] 50080: [DEVMGR] - DisplayDevicePropertyText: Use full DWORD value, not just one byte of it (CID 1803). [WINMM] - MCI_Close: Use UINT instead of UINT16 for the device id (CID 1804).
by rmessiant＠svn.reactos.org 21 Dec '10

21 Dec '10

Author: rmessiant Date: Tue Dec 21 14:58:13 2010 New Revision: 50080 URL: http://svn.reactos.org/svn/reactos?rev=50080&view=rev Log: [DEVMGR] - DisplayDevicePropertyText: Use full DWORD value, not just one byte of it (CID 1803). [WINMM] - MCI_Close: Use UINT instead of UINT16 for the device id (CID 1804). Modified: trunk/reactos/dll/win32/devmgr/advprop.c trunk/reactos/dll/win32/winmm/mci.c Modified: trunk/reactos/dll/win32/devmgr/advprop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/devmgr/advprop.c… ============================================================================== --- trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/devmgr/advprop.c [iso-8859-1] Tue Dec 21 14:58:13 2010 @@ -720,6 +720,7 @@ PSP_DEVINFO_DATA DeviceInfoData; DWORD dwType; DWORD dwSize; + DWORD dwValue; LPBYTE lpBuffer; LPWSTR lpStr; INT len; @@ -791,58 +792,60 @@ } else if (dwType == REG_DWORD) { + dwValue = *(DWORD *) lpBuffer; + switch (dwProperty) { case SPDRP_CAPABILITIES: index = 0; - if (*lpBuffer & CM_DEVCAP_LOCKSUPPORTED) + if (dwValue & CM_DEVCAP_LOCKSUPPORTED) SetListViewText(hwndListView, index++, L"CM_DEVCAP_LOCKSUPPORTED"); - if (*lpBuffer & CM_DEVCAP_EJECTSUPPORTED) + if (dwValue & CM_DEVCAP_EJECTSUPPORTED) SetListViewText(hwndListView, index++, L"CM_DEVCAP_EJECTSUPPORTED"); - if (*lpBuffer & CM_DEVCAP_REMOVABLE) + if (dwValue & CM_DEVCAP_REMOVABLE) SetListViewText(hwndListView, index++, L"CM_DEVCAP_REMOVABLE"); - if (*lpBuffer & CM_DEVCAP_DOCKDEVICE) + if (dwValue & CM_DEVCAP_DOCKDEVICE) SetListViewText(hwndListView, index++, L"CM_DEVCAP_DOCKDEVICE"); - if (*lpBuffer & CM_DEVCAP_UNIQUEID) + if (dwValue & CM_DEVCAP_UNIQUEID) SetListViewText(hwndListView, index++, L"CM_DEVCAP_UNIQUEID"); - if (*lpBuffer & CM_DEVCAP_SILENTINSTALL) + if (dwValue & CM_DEVCAP_SILENTINSTALL) SetListViewText(hwndListView, index++, L"CM_DEVCAP_SILENTINSTALL"); - if (*lpBuffer & CM_DEVCAP_RAWDEVICEOK) + if (dwValue & CM_DEVCAP_RAWDEVICEOK) SetListViewText(hwndListView, index++, L"CM_DEVCAP_RAWDEVICEOK"); - if (*lpBuffer & CM_DEVCAP_SURPRISEREMOVALOK) + if (dwValue & CM_DEVCAP_SURPRISEREMOVALOK) SetListViewText(hwndListView, index++, L"CM_DEVCAP_SURPRISEREMOVALOK"); - if (*lpBuffer & CM_DEVCAP_HARDWAREDISABLED) + if (dwValue & CM_DEVCAP_HARDWAREDISABLED) SetListViewText(hwndListView, index++, L"CM_DEVCAP_HARDWAREDISABLED"); - if (*lpBuffer & CM_DEVCAP_NONDYNAMIC) + if (dwValue & CM_DEVCAP_NONDYNAMIC) SetListViewText(hwndListView, index++, L"CM_DEVCAP_NONDYNAMIC"); break; case SPDRP_CONFIGFLAGS: index = 0; - if (*lpBuffer & CONFIGFLAG_DISABLED) + if (dwValue & CONFIGFLAG_DISABLED) SetListViewText(hwndListView, index++, L"CONFIGFLAG_DISABLED"); - if (*lpBuffer & CONFIGFLAG_REMOVED) + if (dwValue & CONFIGFLAG_REMOVED) SetListViewText(hwndListView, index++, L"CONFIGFLAG_REMOVED"); - if (*lpBuffer & CONFIGFLAG_MANUAL_INSTALL) + if (dwValue & CONFIGFLAG_MANUAL_INSTALL) SetListViewText(hwndListView, index++, L"CONFIGFLAG_MANUAL_INSTALL"); - if (*lpBuffer & CONFIGFLAG_IGNORE_BOOT_LC) + if (dwValue & CONFIGFLAG_IGNORE_BOOT_LC) SetListViewText(hwndListView, index++, L"CONFIGFLAG_IGNORE_BOOT_LC"); - if (*lpBuffer & CONFIGFLAG_NET_BOOT) + if (dwValue & CONFIGFLAG_NET_BOOT) SetListViewText(hwndListView, index++, L"CONFIGFLAG_NET_BOOT"); - if (*lpBuffer & CONFIGFLAG_REINSTALL) + if (dwValue & CONFIGFLAG_REINSTALL) SetListViewText(hwndListView, index++, L"CONFIGFLAG_REINSTALL"); - if (*lpBuffer & CONFIGFLAG_FAILEDINSTALL) + if (dwValue & CONFIGFLAG_FAILEDINSTALL) SetListViewText(hwndListView, index++, L"CONFIGFLAG_FAILEDINSTALL"); - if (*lpBuffer & CONFIGFLAG_CANTSTOPACHILD) + if (dwValue & CONFIGFLAG_CANTSTOPACHILD) SetListViewText(hwndListView, index++, L"CONFIGFLAG_CANTSTOPACHILD"); - if (*lpBuffer & CONFIGFLAG_OKREMOVEROM) + if (dwValue & CONFIGFLAG_OKREMOVEROM) SetListViewText(hwndListView, index++, L"CONFIGFLAG_OKREMOVEROM"); - if (*lpBuffer & CONFIGFLAG_NOREMOVEEXIT) + if (dwValue & CONFIGFLAG_NOREMOVEEXIT) SetListViewText(hwndListView, index++, L"CONFIGFLAG_NOREMOVEEXIT"); break; default: - swprintf(dap->szTemp, L"0x%08x", *lpBuffer); + swprintf(dap->szTemp, L"0x%08lx", dwValue); SetListViewText(hwndListView, 0, dap->szTemp); break; } Modified: trunk/reactos/dll/win32/winmm/mci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/winmm/mci.c?rev=… ============================================================================== --- trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/winmm/mci.c [iso-8859-1] Tue Dec 21 14:58:13 2010 @@ -1669,7 +1669,7 @@ /************************************************************************** * MCI_Close [internal] */ -static DWORD MCI_Close(UINT16 wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms) +static DWORD MCI_Close(UINT wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms) { DWORD dwRet; LPWINE_MCIDRIVER wmd;

1 0

[janderwald] 50079: [AUDIO-BRINGUP] - Move irp completion to CompleteRequest function for debugging of multiple irp completion bugs - Remove bugs asserts in IKsDevice_PnpStartDevice - Set device to...
by janderwald＠svn.reactos.org 21 Dec '10

21 Dec '10

Author: janderwald Date: Tue Dec 21 13:06:47 2010 New Revision: 50079 URL: http://svn.reactos.org/svn/reactos?rev=50079&view=rev Log: [AUDIO-BRINGUP] - Move irp completion to CompleteRequest function for debugging of multiple irp completion bugs - Remove bugs asserts in IKsDevice_PnpStartDevice - Set device to started when the device does not need pnp notification - Don't complete the irp in IKsDevice_Create, the driver has already done this - Comment out UNIMPLEMENTED macro in KsFilterAttemptProcessing - Fix check in FindMatchingCreateItem - Don't set DO_DIRECT_IO flags on PDO devices - Set DO_DEVICE_INITIALIZING flag on PDO device - Construct device name with swprintf - Add check if the device entry has already been constructed - Zero device capabilities - Implement bus watchdog routine. The routine checks if pdo has successfully been started, otherwise the pdo is marked invalid and the deleted and then constructed again. If the pdo has been started, all pending irp requests are completed with STATUS_REPARSE. (This is probably not supported by Ros kernel yet) - Acquire device entry list lock when working with device entries - Always store status code in irp for all Ks bus api routines - Handle IRP_MN_REMOVE_DEVICE - Start watchdog timer when IRP_MN_START_DEVICE is received - Ros KS nos successfully initializes and all audio devices appear in VBOX+WinXP+SP3. Playback not yet working (Needs KsAttemptFilterProcessing for splitter and friends) - TODO: enhance time out to make audio system initialize faster Modified: branches/audio-bringup/drivers/ksfilter/ks/allocators.c branches/audio-bringup/drivers/ksfilter/ks/api.c branches/audio-bringup/drivers/ksfilter/ks/clocks.c branches/audio-bringup/drivers/ksfilter/ks/device.c branches/audio-bringup/drivers/ksfilter/ks/filter.c branches/audio-bringup/drivers/ksfilter/ks/filterfactory.c branches/audio-bringup/drivers/ksfilter/ks/irp.c branches/audio-bringup/drivers/ksfilter/ks/ksfunc.h branches/audio-bringup/drivers/ksfilter/ks/kstypes.h branches/audio-bringup/drivers/ksfilter/ks/misc.c branches/audio-bringup/drivers/ksfilter/ks/pin.c branches/audio-bringup/drivers/ksfilter/ks/swenum.c Modified: branches/audio-bringup/drivers/ksfilter/ks/allocators.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/allocators.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/allocators.c [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -163,7 +163,7 @@ /* complete and forget irps */ Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; } @@ -172,7 +172,7 @@ { /* invalid request */ Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_INVALID_DEVICE_REQUEST; } @@ -190,7 +190,7 @@ Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; Irp->IoStatus.Information = sizeof(KSSTREAMALLOCATOR_FUNCTIONTABLE); /* complete and forget irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_BUFFER_TOO_SMALL; } if (!(Property->Flags & KSPROPERTY_TYPE_GET)) @@ -198,7 +198,7 @@ /* only support retrieving the property */ Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; /* complete and forget irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_UNSUCCESSFUL; } @@ -212,7 +212,7 @@ Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = sizeof(KSSTREAMALLOCATOR_FUNCTIONTABLE); /* complete request */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } else if (Property->Id == KSPROPERTY_STREAMALLOCATOR_STATUS) @@ -223,7 +223,7 @@ Irp->IoStatus.Status = STATUS_BUFFER_TOO_SMALL; Irp->IoStatus.Information = sizeof(KSPROPERTY_STREAMALLOCATOR_STATUS); /* complete and forget irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_BUFFER_TOO_SMALL; } if (!(Property->Flags & KSPROPERTY_TYPE_GET)) @@ -231,7 +231,7 @@ /* only support retrieving the property */ Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; /* complete and forget irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_UNSUCCESSFUL; } @@ -246,14 +246,14 @@ Irp->IoStatus.Information = sizeof(KSSTREAMALLOCATOR_STATUS); /* complete request */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } } /* unhandled request */ Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_SUPPORTED; } @@ -501,7 +501,7 @@ /* complete request */ Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -523,7 +523,7 @@ /* complete request */ Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } Modified: branches/audio-bringup/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/api.c [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -1332,7 +1332,7 @@ /* complete request */ Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } @@ -1416,7 +1416,7 @@ IoStack->FileObject->FsContext2 = (PVOID)Header; Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; @@ -1429,7 +1429,7 @@ FreeItem(Header); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -1703,7 +1703,7 @@ if (IoStack->MajorFunction != IRP_MJ_CLOSE) { /* can be completed immediately */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return; } @@ -1711,7 +1711,7 @@ if (!NT_SUCCESS(Irp->IoStatus.Status)) { /* closing failed, complete irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return; } Modified: branches/audio-bringup/drivers/ksfilter/ks/clocks.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/clocks.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/clocks.c [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -339,7 +339,7 @@ Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } @@ -353,7 +353,7 @@ UNIMPLEMENTED Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } Modified: branches/audio-bringup/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/device.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/device.c [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -302,7 +302,7 @@ { DPRINT1("NextDevice object failed to start with %x\n", Status); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -335,9 +335,6 @@ } ASSERT(DeviceHeader->KsDevice.Descriptor); - ASSERT(DeviceHeader->KsDevice.Descriptor->Dispatch); - ASSERT(DeviceHeader->KsDevice.Descriptor->Dispatch->Start); - /* do we have a device descriptor */ if (DeviceHeader->KsDevice.Descriptor) @@ -361,7 +358,7 @@ { DPRINT1("Driver: failed to start %x\n", Status); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -406,12 +403,17 @@ Status = KspSetFilterFactoriesState(DeviceHeader, TRUE); } } + else + { + /* set state to run */ + DeviceHeader->KsDevice.Started = TRUE; + } } /* store result */ Irp->IoStatus.Status = Status; /* complete request */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); if (Ctx) { @@ -420,7 +422,7 @@ } /* return result */ - DPRINT1("IKsDevice_PnpStartDevice Status %x PostStartRoutine %p\n", Status, Ctx); + DPRINT("IKsDevice_PnpStartDevice Status %x PostStartRoutine %p\n", Status, Ctx); return Status; } @@ -477,7 +479,7 @@ { DPRINT1("Driver: query stop failed %x\n", Status); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -487,7 +489,7 @@ DPRINT("Next Device: Status %x\n", Status); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -513,7 +515,7 @@ Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } case IRP_MN_QUERY_INTERFACE: @@ -536,7 +538,7 @@ /* driver supports a private interface */ DPRINT1("IRP_MN_QUERY_INTERFACE Device supports interface\n"); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -545,7 +547,7 @@ DPRINT1("IRP_MN_QUERY_INTERFACE Next Device: Status %x\n", Status); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } case IRP_MN_QUERY_DEVICE_RELATIONS: @@ -556,7 +558,7 @@ DPRINT("IRP_MN_QUERY_DEVICE_RELATIONS Next Device: Status %x\n", Status); //Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } case IRP_MN_FILTER_RESOURCE_REQUIREMENTS: @@ -567,7 +569,7 @@ DPRINT("IRP_MN_FILTER_RESOURCE_REQUIREMENTS Next Device: Status %x\n", Status); //Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } case IRP_MN_QUERY_RESOURCE_REQUIREMENTS: @@ -578,7 +580,7 @@ DPRINT("IRP_MN_QUERY_RESOURCE_REQUIREMENTS Next Device: Status %x\n", Status); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } default: @@ -587,7 +589,7 @@ Status = KspForwardIrpSynchronous(DeviceObject, Irp); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } } @@ -604,7 +606,7 @@ Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } @@ -669,17 +671,10 @@ } } - /* acquire list lock */ + /* release list lock */ IKsDevice_fnReleaseDevice((IKsDevice*)&DeviceHeader->BasicHeader.OuterUnknown); - if (Status != STATUS_PENDING) - { - Irp->IoStatus.Information = 0; - /* set return status */ - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } - + /* done */ return Status; @@ -703,7 +698,7 @@ PKSIOBJECT_BAG Bag; NTSTATUS Status = STATUS_SUCCESS; - DPRINT("KsInitializeDevice Descriptor %p\n", Descriptor); + DPRINT1("KsInitializeDevice Descriptor %p\n", Descriptor); /* get device extension */ DeviceExtension = (PDEVICE_EXTENSION)FunctionalDeviceObject->DeviceExtension; @@ -714,7 +709,7 @@ /* point to allocated header */ Header = DeviceExtension->DeviceHeader; - DPRINT("DeviceHeader %p\n", DeviceExtension->DeviceHeader); + DPRINT1("DeviceHeader %p\n", DeviceExtension->DeviceHeader); if (Descriptor && Descriptor->Dispatch) { @@ -896,7 +891,7 @@ IKsDevice * Device; PKSIDEVICE_HEADER DeviceHeader = (PKSIDEVICE_HEADER)Header; - DPRINT1("KsDereferenceSoftwareBusObject DeviceHeader %p\n", Header); + DPRINT("KsDereferenceSoftwareBusObject DeviceHeader %p\n", Header); /* get device interface */ Device = (IKsDevice*)DeviceHeader->BasicHeader.OuterUnknown; Modified: branches/audio-bringup/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/filter.c [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -485,7 +485,7 @@ Irp->IoStatus.Status = Status; /* complete and forget irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } return Status; @@ -522,7 +522,7 @@ /* save the result */ Irp->IoStatus.Status = Status; /* complete irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); /* remove our instance from the filter factory */ IKsFilter_RemoveFilterFromFilterFactory(This, This->Factory); @@ -535,7 +535,7 @@ /* complete and forget */ Irp->IoStatus.Status = Status; /* complete irp */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); } /* done */ @@ -881,7 +881,7 @@ if (Status != STATUS_PENDING) { Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); } /* done */ @@ -1227,7 +1227,7 @@ { /* complete request */ Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); } /* done */ @@ -1243,7 +1243,7 @@ { UNIMPLEMENTED Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_UNSUCCESSFUL; } @@ -1608,7 +1608,7 @@ IN PKSFILTER Filter, IN BOOLEAN Asynchronous) { - UNIMPLEMENTED + //UNIMPLEMENTED } /* Modified: branches/audio-bringup/drivers/ksfilter/ks/filterfactory.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/filterfactory.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/filterfactory.c [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -69,7 +69,7 @@ { Irp->IoStatus.Information = 0; Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); } return Status; Modified: branches/audio-bringup/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/irp.c [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -34,7 +34,7 @@ { /* no create item */ Irp->IoStatus.Status = STATUS_NO_SECURITY_ON_OBJECT; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NO_SECURITY_ON_OBJECT; } @@ -50,7 +50,7 @@ Irp->IoStatus.Status = Status; Irp->IoStatus.Information = Length; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -80,7 +80,7 @@ { /* no create item */ Irp->IoStatus.Status = STATUS_NO_SECURITY_ON_OBJECT; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NO_SECURITY_ON_OBJECT; } @@ -109,7 +109,7 @@ /* store result */ Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -1154,7 +1154,7 @@ IN PIRP Irp) { Irp->IoStatus.Status = STATUS_INVALID_DEVICE_REQUEST; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_INVALID_DEVICE_REQUEST; } @@ -1198,7 +1198,7 @@ /* complete request */ Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; @@ -1643,14 +1643,15 @@ /* get current irp stack */ IoStack = IoGetCurrentIrpStackLocation(Irp); - DPRINT("KsAddIrpToCancelableQueue QueueHead %p SpinLock %p Irp %p ListLocation %x DriverCancel %p\n", QueueHead, SpinLock, Irp, ListLocation, DriverCancel); + DPRINT1("KsAddIrpToCancelableQueue QueueHead %p SpinLock %p Irp %p ListLocation %x DriverCancel %p\n", QueueHead, SpinLock, Irp, ListLocation, DriverCancel); // HACK for ms portcls if (IoStack->MajorFunction == IRP_MJ_CREATE) { // complete the request +DPRINT1("MS HACK\n"); Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return; } @@ -1736,7 +1737,7 @@ { /* let's complete it */ Irp->IoStatus.Status = STATUS_CANCELLED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); } } @@ -1795,14 +1796,12 @@ continue; } - ASSERT(CreateItemEntry->CreateItem->ObjectClass.Buffer); - DPRINT("CreateItem %S Length %u Request %wZ %u\n", CreateItemEntry->CreateItem->ObjectClass.Buffer, CreateItemEntry->CreateItem->ObjectClass.Length, &RefString, - BufferSize); - - if (CreateItemEntry->CreateItem->ObjectClass.Length > BufferSize) + RefString.Length); + + if (CreateItemEntry->CreateItem->ObjectClass.Length > RefString.Length) { /* create item doesnt match in length */ Entry = Entry->Flink; @@ -1853,7 +1852,7 @@ Irp->IoStatus.Information = 0; /* set return status */ Irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } @@ -1893,7 +1892,7 @@ Irp->IoStatus.Information = 0; /* set return status */ Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_UNSUCCESSFUL; } @@ -1929,7 +1928,7 @@ Irp->IoStatus.Status = STATUS_SUCCESS; Irp->IoStatus.Information = 0; /* complete and forget */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_SUCCESS; } @@ -2036,6 +2035,7 @@ /* get device extension */ DeviceExtension = (PDEVICE_EXTENSION)DeviceObject->DeviceExtension; + /* get device header */ DeviceHeader = DeviceExtension->DeviceHeader; Modified: branches/audio-bringup/drivers/ksfilter/ks/ksfunc.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/ksfunc.h [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -5,6 +5,13 @@ #define TAG_KSDEVICE 'DESK' #define TAG_KSOBJECT_TAG 'HOSK' + +VOID +CompleteRequest( + PIRP Irp, + CCHAR PriorityBoost); + + NTSTATUS NTAPI Modified: branches/audio-bringup/drivers/ksfilter/ks/kstypes.h URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/kstypes.h [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/kstypes.h [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -145,7 +145,7 @@ typedef BOOLEAN (NTAPI *PKSEVENT_SYNCHRONIZED_ROUTINE)(PKSEVENT_CTX Context); struct __BUS_ENUM_DEVICE_EXTENSION__; -struct BUS_DEVICE_ENTRY; +struct __BUS_DEVICE_ENTRY__; typedef struct { @@ -158,7 +158,7 @@ }; union { - PVOID DeviceEntry; + struct __BUS_DEVICE_ENTRY__* DeviceEntry; ULONG Dummy1; }; struct __BUS_ENUM_DEVICE_EXTENSION__ *BusDeviceExtension; @@ -191,7 +191,7 @@ }DEVICE_STATE; -typedef struct +typedef struct __BUS_DEVICE_ENTRY__ { LIST_ENTRY Entry; LIST_ENTRY DeviceInterfaceList; Modified: branches/audio-bringup/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/misc.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/misc.c [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -8,6 +8,19 @@ #include "priv.h" + +VOID +CompleteRequest( + PIRP Irp, + CCHAR PriorityBoost) +{ + DPRINT("Completing IRP %p Status %x\n", Irp, Irp->IoStatus.Status); + + ASSERT(Irp->IoStatus.Status != STATUS_PENDING); + + + IoCompleteRequest(Irp, PriorityBoost); +} PVOID AllocateItem( Modified: branches/audio-bringup/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/pin.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/pin.c [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -1875,7 +1875,7 @@ DPRINT1("KsProbeStreamIrp failed with %x\n", Status); Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -1888,7 +1888,7 @@ { DPRINT("NoHeader Canceling Irp %p\n", Irp); Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -1911,7 +1911,7 @@ { DPRINT("NoHeader->Data Canceling Irp %p\n", Irp); Irp->IoStatus.Status = STATUS_INSUFFICIENT_RESOURCES; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -1960,7 +1960,7 @@ /* invalid device request */ DPRINT("Filter Centric Processing No Process Routine\n"); Irp->IoStatus.Status = STATUS_UNSUCCESSFUL; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_UNSUCCESSFUL; } @@ -2095,7 +2095,7 @@ if (Status != STATUS_PENDING) { Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); } /* done */ @@ -2135,7 +2135,7 @@ { /* abort closing */ Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -2145,7 +2145,7 @@ if (Status != STATUS_PENDING) { Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } } @@ -2162,7 +2162,7 @@ UNIMPLEMENTED; Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; } @@ -2244,7 +2244,7 @@ /* done */ Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return Status; } @@ -2257,7 +2257,7 @@ UNIMPLEMENTED; Irp->IoStatus.Status = STATUS_NOT_IMPLEMENTED; - IoCompleteRequest(Irp, IO_NO_INCREMENT); + CompleteRequest(Irp, IO_NO_INCREMENT); return STATUS_NOT_IMPLEMENTED; } Modified: branches/audio-bringup/drivers/ksfilter/ks/swenum.c URL: http://svn.reactos.org/svn/reactos/branches/audio-bringup/drivers/ksfilter/… ============================================================================== --- branches/audio-bringup/drivers/ksfilter/ks/swenum.c [iso-8859-1] (original) +++ branches/audio-bringup/drivers/ksfilter/ks/swenum.c [iso-8859-1] Tue Dec 21 13:06:47 2010 @@ -35,7 +35,7 @@ CurDeviceId = InterlockedIncrement(&KsDeviceCount); /* generate new device id */ - swprintf(Buffer, L"\\Device\\KSENUM%08x\n", CurDeviceId); + swprintf(Buffer, L"\\Device\\KSENUM%08x", CurDeviceId); /* initialize new device name */ RtlInitUnicodeString(&DeviceName, Buffer); @@ -71,8 +71,8 @@ /* TODO: update last creation time in bus device extension */ /* setup flags */ - DeviceObject->Flags |= DO_DIRECT_IO | DO_POWER_PAGABLE; - + DeviceObject->Flags |= DO_POWER_PAGABLE; + DeviceObject->Flags &= ~ DO_DEVICE_INITIALIZING; /* TODO: fire time when expired */ *OutDeviceObject = DeviceObject; @@ -330,6 +330,7 @@ BOOLEAN ItemExists = FALSE; UNICODE_STRING String; NTSTATUS Status; + KIRQL OldLevel; /* first construct device name & reference guid */ Length = wcslen(DeviceCategory) + wcslen(ReferenceString); @@ -347,9 +348,7 @@ } /* construct device name */ - wcscpy(DeviceName, DeviceCategory); - wcscat(DeviceName, L"&"); - wcscat(DeviceName, ReferenceString); + swprintf(DeviceName, L"%s&%s", DeviceCategory, ReferenceString); /* scan list and check if it is already present */ Entry = BusDeviceExtension->Common.Entry.Flink; @@ -437,8 +436,17 @@ return Status; } - /* successfully initialized entry */ - InsertTailList(&BusDeviceExtension->Common.Entry, &DeviceEntry->Entry); + if (!ItemExists) + { + /* acquire lock */ + KeAcquireSpinLock(&BusDeviceExtension->Lock, &OldLevel); + + /* successfully initialized entry */ + InsertTailList(&BusDeviceExtension->Common.Entry, &DeviceEntry->Entry); + + /* release lock */ + KeReleaseSpinLock(&BusDeviceExtension->Lock, OldLevel); + } /* done */ return Status; @@ -585,8 +593,8 @@ NTSTATUS KspQueryBusDeviceInterface( - IN PIRP Irp, - IN PCOMMON_DEVICE_EXTENSION ChildDeviceExtension) + IN PCOMMON_DEVICE_EXTENSION ChildDeviceExtension, + IN PIRP Irp) { PBUS_INTERFACE_SWENUM Interface; PIO_STACK_LOCATION IoStack; @@ -628,6 +636,7 @@ { /* get bus instance entry */ InstanceEntry = (PBUS_INSTANCE_ENTRY)CONTAINING_RECORD(Entry, BUS_INSTANCE_ENTRY, Entry); + DPRINT1("Enabling %u %wZ Irql %u\n", bEnable, &InstanceEntry->SymbolicLink, KeGetCurrentIrql()); /* set interface state */ Status = IoSetDeviceInterfaceState(&InstanceEntry->SymbolicLink, bEnable); @@ -672,7 +681,7 @@ Length += 2; /* allocate buffer */ - Buffer = AllocateItem(PagedPool, Length * sizeof(WCHAR)); + Buffer = AllocateItem(NonPagedPool, Length * sizeof(WCHAR)); if (!Buffer) { /* no resources */ @@ -680,11 +689,8 @@ } /* construct buffer */ - wcscpy(Buffer, DeviceEntry->PDODeviceName); - wcscat(Buffer, L"\\"); - wcscat(Buffer, DeviceEntry->Instance); - - /* free old file name */ + swprintf(Buffer, L"%s\\%s", DeviceEntry->PDODeviceName, DeviceEntry->Instance); + ExFreePool(IoStack->FileObject->FileName.Buffer); /* store new file name */ @@ -704,7 +710,6 @@ NTSTATUS Status; /* go through list */ - while(!IsListEmpty(&DeviceEntry->IrpPendingList)) { /* get first entry */ @@ -727,11 +732,12 @@ /* store result code */ Irp->IoStatus.Status = Status; - DPRINT1("Completing IRP %p\n", Irp); + DPRINT1("Completing IRP %p Status %x\n", Irp, Status); /* complete the request */ - IoCompleteRequest(Irp, IO_NO_INCREMENT); - } + CompleteRequest(Irp, IO_NO_INCREMENT); + } + } @@ -760,7 +766,7 @@ } /* allocate device name buffer */ - Name = AllocateItem(PagedPool, ResultLength); + Name = AllocateItem(NonPagedPool, (ResultLength + 1) * sizeof(WCHAR)); if (!Name) { /* no memory */ @@ -784,10 +790,13 @@ /* mark device as started */ DeviceEntry->DeviceState = Started; - DPRINT1("KspStartBusDevice Name %S Started\n", Name); - - /* now complete pending i/o */ - KspCompletePendingIrps(DeviceEntry, STATUS_REPARSE); + /* reference start time */ + KeQuerySystemTime(&DeviceEntry->TimeCreated); + + DPRINT1("KspStartBusDevice Name %S DeviceName %S Instance %S Started\n", Name, DeviceEntry->DeviceName, DeviceEntry->Instance); + + /* enable device classes */ + //KspEnableBusDeviceInterface(DeviceEntry, TRUE); /* done */ return STATUS_SUCCESS; @@ -806,6 +815,8 @@ /* get capabilities */ Capabilities = IoStack->Parameters.DeviceCapabilities.Capabilities; + + RtlZeroMemory(Capabilities, sizeof(DEVICE_CAPABILITIES)); /* setup capabilities */ Capabilities->UniqueID = TRUE; @@ -935,9 +946,7 @@ } /* construct id */ - wcscpy(Name, BusDeviceExtension->BusIdentifier); - wcscat(Name, L"\\"); - wcscat(Name, DeviceEntry->BusId); + swprintf(Name, L"%s\\%s", BusDeviceExtension->BusIdentifier, DeviceEntry->BusId); /* store result */ Irp->IoStatus.Information = (ULONG_PTR)Name; @@ -948,8 +957,8 @@ else { /* other ids are not supported */ - DPRINT1("Not Supported ID Type %x\n", IoStack->Parameters.QueryId.IdType); - return STATUS_NOT_SUPPORTED; + //DPRINT1("Not Supported ID Type %x\n", IoStack->Parameters.QueryId.IdType); + return Irp->IoStatus.Status; } } @@ -1123,8 +1132,83 @@ KspBusWorkerRoutine( IN PVOID Parameter) { - /* TODO: implement sweeping */ - UNIMPLEMENTED + PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; + PBUS_DEVICE_ENTRY DeviceEntry; + PLIST_ENTRY Entry; + LARGE_INTEGER Time, Diff; + BOOLEAN DoInvalidate = FALSE; + KIRQL OldLevel; + + /* acquire lock */ + KeAcquireSpinLock(&BusDeviceExtension->Lock, &OldLevel); + + /* get device extension */ + BusDeviceExtension = (PBUS_ENUM_DEVICE_EXTENSION)Parameter; + + /* get current time */ + KeQuerySystemTime(&Time); + + /* enumerate all device entries */ + Entry = BusDeviceExtension->Common.Entry.Flink; + while(Entry != &BusDeviceExtension->Common.Entry) + { + /* get offset to device entry */ + DeviceEntry = (PBUS_DEVICE_ENTRY)CONTAINING_RECORD(Entry, BUS_DEVICE_ENTRY, Entry); + + /* sanity check */ + ASSERT(DeviceEntry); + + //DPRINT1("DeviceEntry %p PDO %p State %x\n", DeviceEntry, DeviceEntry->PDO, DeviceEntry->DeviceState); + + if (DeviceEntry->PDO) + { + if (DeviceEntry->DeviceState == NotStarted) + { + Diff.QuadPart = Time.QuadPart - DeviceEntry->TimeCreated.QuadPart; + + if (Diff.QuadPart > Int32x32To64(15000, 10000)) + { + DPRINT1("DeviceID %S Instance %S TimeCreated %I64u Now %I64u Diff %I64u hung\n", DeviceEntry->DeviceName, DeviceEntry->Instance, DeviceEntry->TimeCreated.QuadPart, Time.QuadPart, Diff.QuadPart); + + /* release spin lock */ + KeReleaseSpinLock(&BusDeviceExtension->Lock, OldLevel); + + /* deactivate interfaces */ + //KspEnableBusDeviceInterface(DeviceEntry, FALSE); + + /* re-acquire lock */ + KeAcquireSpinLock(&BusDeviceExtension->Lock, &OldLevel); + + /* pending remove device object */ + DeviceEntry->DeviceState = StopPending; + + /* perform invalidation */ + DoInvalidate = TRUE; + } + } + else if (DeviceEntry->DeviceState == Started) + { + /* found pending irps */ + KspCompletePendingIrps(DeviceEntry, STATUS_REPARSE); + } + } + + + /* move to next */ + Entry = Entry->Flink; + } + + /* release lock */ + KeReleaseSpinLock(&BusDeviceExtension->Lock, OldLevel); + + if (DoInvalidate) + { + /* invalidate device relations */ + IoInvalidateDeviceRelations(BusDeviceExtension->PhysicalDeviceObject, BusRelations); + } + + Time.QuadPart = Int32x32To64(5000, -10000); + KeSetTimer(&BusDeviceExtension->Timer, Time, &BusDeviceExtension->Dpc); } VOID @@ -1173,9 +1257,10 @@ PLIST_ENTRY Entry; PBUS_DEVICE_ENTRY DeviceEntry; ULONG Count = 0, Length; - - - /* FIXME locks */ + KIRQL OldLevel; + + /* acquire lock */ + KeAcquireSpinLock(&BusDeviceExtension->Lock, &OldLevel); /* first scan all device entries */ Entry = BusDeviceExtension->Common.Entry.Flink; @@ -1186,7 +1271,7 @@ DeviceEntry = (PBUS_DEVICE_ENTRY)CONTAINING_RECORD(Entry, BUS_DEVICE_ENTRY, Entry); /* is there a pdo yet */ - if (DeviceEntry->PDO) + if (DeviceEntry->PDO && (DeviceEntry->DeviceState == NotStarted || DeviceEntry->DeviceState == Started)) { /* increment count */ Count++; @@ -1205,6 +1290,7 @@ if (!DeviceRelations) { /* not enough memory */ + KeReleaseSpinLock(&BusDeviceExtension->Lock, OldLevel); return STATUS_INSUFFICIENT_RESOURCES; } @@ -1217,7 +1303,7 @@ DeviceEntry = (PBUS_DEVICE_ENTRY)CONTAINING_RECORD(Entry, BUS_DEVICE_ENTRY, Entry); /* is there a pdo yet */ - if (DeviceEntry->PDO) + if (DeviceEntry->PDO && (DeviceEntry->DeviceState == NotStarted || DeviceEntry->DeviceState == Started)) { /* store pdo */ DeviceRelations->Objects[DeviceRelations->Count] = DeviceEntry->PDO; @@ -1232,6 +1318,9 @@ /* move to next entry */ Entry = Entry->Flink; } + + /* release lock */ + KeReleaseSpinLock(&BusDeviceExtension->Lock, OldLevel); /* FIXME handle existing device relations */ ASSERT(Irp->IoStatus.Information == 0); @@ -1328,6 +1417,7 @@ } /* done */ + Irp->IoStatus.Status = Status; return Status; } @@ -1550,7 +1640,7 @@ FreeItem(BusDeviceExtension); } - DPRINT1("KsCreateBusEnumObject cp %x\n", Status); + DPRINT("KsCreateBusEnumObject Status %x\n", Status); /* done */ return Status; } @@ -1569,7 +1659,7 @@ PCOMMON_DEVICE_EXTENSION CommonDeviceExtension; PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; - DPRINT1("KsGetBusEnumPnpDeviceObject\n"); + DPRINT("KsGetBusEnumPnpDeviceObject\n"); if (!DeviceObject->DeviceExtension) { @@ -1712,13 +1802,12 @@ PLIST_ENTRY Entry; PBUS_DEVICE_ENTRY DeviceEntry = NULL; /* fix gcc */ PIO_STACK_LOCATION IoStack; - BOOLEAN ItemExists; + BOOLEAN ItemExists = FALSE; PDEV_EXTENSION DeviceExtension; PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; //PCOMMON_DEVICE_EXTENSION ChildDeviceExtension; NTSTATUS Status; - - DPRINT1("KsServiceBusEnumCreateRequest\n"); + LARGE_INTEGER Time; /* FIXME: locks */ @@ -1735,6 +1824,8 @@ ASSERT(IoStack->FileObject); ASSERT(IoStack->FileObject->FileName.Buffer); + DPRINT1("KsServiceBusEnumCreateRequest IRP %p Name %wZ\n", Irp, &IoStack->FileObject->FileName); + /* scan list and check if it is already present */ Entry = BusDeviceExtension->Common.Entry.Flink; @@ -1768,7 +1859,11 @@ if (DeviceEntry->DeviceState == Started) { /* issue reparse */ - return KspDoReparseForIrp(Irp, DeviceEntry); + Status = KspDoReparseForIrp(Irp, DeviceEntry); + DPRINT("REPARSE Irp %p '%wZ'\n", Irp, &IoStack->FileObject->FileName); + + Irp->IoStatus.Status = Status; + return Status; } /* delay processing until pnp is finished with enumeration */ @@ -1777,9 +1872,14 @@ /* insert into irp pending list */ InsertTailList(&DeviceEntry->IrpPendingList, &Irp->Tail.Overlay.ListEntry); - /* HACK */ - IoInvalidateDeviceRelations(BusDeviceExtension->PhysicalDeviceObject, BusRelations); - + Time.QuadPart = Int32x32To64(1500, -10000); + DbgPrint("PENDING Irp %p %wZ\n", Irp, &IoStack->FileObject->FileName); + + /* query current time */ + KeQuerySystemTime(&DeviceEntry->TimeCreated); + + /* set timer */ + KeSetTimer(&BusDeviceExtension->Timer, Time, &BusDeviceExtension->Dpc); /* done for now */ return STATUS_PENDING; @@ -1796,6 +1896,7 @@ DPRINT1("KsServiceBusEnumCreateRequest failed to create PDO with %x\n", Status); return Status; } + DPRINT1("PENDING CREATE Irp %p %wZ\n", Irp, &IoStack->FileObject->FileName); /* delay processing until pnp is finished with enumeration */ IoMarkIrpPending(Irp); @@ -1826,9 +1927,12 @@ { PDEV_EXTENSION DeviceExtension; PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; + PCOMMON_DEVICE_EXTENSION ChildDeviceExtension; PIO_STACK_LOCATION IoStack; - - DPRINT1("KsServiceBusEnumPnpRequest %p\n", DeviceObject); + NTSTATUS Status; + LARGE_INTEGER Time; + PDEVICE_RELATIONS DeviceRelation; + PBUS_DEVICE_ENTRY DeviceEntry; /* get device extension */ DeviceExtension = (PDEV_EXTENSION)DeviceObject->DeviceExtension; @@ -1844,64 +1948,154 @@ if (IoStack->MinorFunction == IRP_MN_START_DEVICE) { /* no op for bus driver */ - return STATUS_SUCCESS; + Status = STATUS_SUCCESS; } else if (IoStack->MinorFunction == IRP_MN_QUERY_DEVICE_RELATIONS) { /* handle bus device relations */ ASSERT(IoStack->Parameters.QueryDeviceRelations.Type == BusRelations); - return KspQueryBusRelations(BusDeviceExtension, Irp); - } - DPRINT1("KsServiceBusEnumPnpRequest BusObject MinorFunction %x\n", IoStack->MinorFunction); - return STATUS_NOT_SUPPORTED; + Status = KspQueryBusRelations(BusDeviceExtension, Irp); + } + else + { + /* get default status */ + Status = Irp->IoStatus.Status; + } } else { + /* get child device extension */ + ChildDeviceExtension = DeviceExtension->Ext; + + /* get bus device extension */ + BusDeviceExtension = ChildDeviceExtension->BusDeviceExtension; + if (IoStack->MinorFunction == IRP_MN_QUERY_ID) { /* query id */ - return KspQueryId(&BusDeviceExtension->Common, Irp); + Status = KspQueryId(ChildDeviceExtension, Irp); + } + else if (IoStack->MinorFunction == IRP_MN_REMOVE_DEVICE) + { + ASSERT(ChildDeviceExtension->DeviceEntry->DeviceState != Started || ChildDeviceExtension->DeviceEntry->DeviceState == NotStarted); + ASSERT(ChildDeviceExtension->DeviceEntry->PDO == DeviceObject); + + /* backup device entry */ + DeviceEntry = ChildDeviceExtension->DeviceEntry; + + /* free device extension */ + FreeItem(ChildDeviceExtension); + + /* clear PDO reference */ + DeviceEntry->PDO = NULL; + + /* delete the device */ + IoDeleteDevice(DeviceObject); + + if (DeviceEntry->PDODeviceName) + { + /* delete pdo device name */ + FreeItem(DeviceEntry->PDODeviceName); + + /* set to null */ + DeviceEntry->PDODeviceName = NULL; + } + + /* set state no notstarted */ + DeviceEntry->DeviceState = NotStarted; + + /* time to create PDO */ + KspCreatePDO(BusDeviceExtension, DeviceEntry, &DeviceEntry->PDO); + + /* invalidate device relations */ + IoInvalidateDeviceRelations(BusDeviceExtension->PhysicalDeviceObject, BusRelations); + + /* done */ + Status = STATUS_SUCCESS; } else if (IoStack->MinorFunction == IRP_MN_QUERY_BUS_INFORMATION) { /* query bus information */ - return KspQueryBusInformation(&BusDeviceExtension->Common, Irp); + Status = KspQueryBusInformation(ChildDeviceExtension, Irp); } else if (IoStack->MinorFunction == IRP_MN_QUERY_RESOURCES) { /* no op */ - return STATUS_SUCCESS; + Status = STATUS_SUCCESS; } else if (IoStack->MinorFunction == IRP_MN_QUERY_RESOURCE_REQUIREMENTS) { /* no op */ - return STATUS_SUCCESS; + Status = STATUS_SUCCESS; } else if (IoStack->MinorFunction == IRP_MN_START_DEVICE) { /* start bus */ - return KspStartBusDevice(DeviceObject, &BusDeviceExtension->Common, Irp); + Status = KspStartBusDevice(DeviceObject, ChildDeviceExtension, Irp); + + /* set time out */ + Time.QuadPart = Int32x32To64(1500, -10000); + + /* sanity check */ + ASSERT(BusDeviceExtension); + + /* set timer */ + KeSetTimer(&BusDeviceExtension->Timer, Time, &BusDeviceExtension->Dpc); } else if (IoStack->MinorFunction == IRP_MN_QUERY_CAPABILITIES) { /* query capabilities */ - return KspQueryBusDeviceCapabilities(&BusDeviceExtension->Common, Irp); + Status = KspQueryBusDeviceCapabilities(ChildDeviceExtension, Irp); } else if (IoStack->MinorFunction == IRP_MN_QUERY_PNP_DEVICE_STATE) { /* query pnp state */ - return KspQueryBusDevicePnpState(&BusDeviceExtension->Common, Irp); + Status = KspQueryBusDevicePnpState(ChildDeviceExtension, Irp); } else if (IoStack->MinorFunction == IRP_MN_QUERY_INTERFACE) { /* query interface */ - return KspQueryBusDeviceInterface(Irp, &BusDeviceExtension->Common); - } - - DPRINT1("KsServiceBusEnumPnpRequest BusObject MinorFunction %x\n", IoStack->MinorFunction); - return STATUS_NOT_SUPPORTED; - } + Status = KspQueryBusDeviceInterface(ChildDeviceExtension, Irp); + } + else if (IoStack->MinorFunction == IRP_MN_QUERY_DEVICE_RELATIONS && IoStack->Parameters.QueryDeviceRelations.Type == TargetDeviceRelation) + { + /* handle target device relations */ + ASSERT(IoStack->Parameters.QueryDeviceRelations.Type == TargetDeviceRelation); + ASSERT(Irp->IoStatus.Information == 0); + + /* allocate device relation */ + DeviceRelation = AllocateItem(PagedPool, sizeof(DEVICE_RELATIONS)); + if (DeviceRelation) + { + DeviceRelation->Count = 1; + DeviceRelation->Objects[0] = DeviceObject; + + /* reference self */ + ObReferenceObject(DeviceObject); + + /* store result */ + Irp->IoStatus.Information = (ULONG_PTR)DeviceRelation; + + /* done */ + Status = STATUS_SUCCESS; + } + else + { + /* no memory */ + Status = STATUS_INSUFFICIENT_RESOURCES; + } + } + else + { + /* get default status */ + Status = Irp->IoStatus.Status; + } + } + + DPRINT("KsServiceBusEnumPnpRequest %p Bus %u Function %x Status %x\n", DeviceObject, BusDeviceExtension->Common.IsBus, IoStack->MinorFunction, Status); + Irp->IoStatus.Status = Status; + return Status; } /*

1 0

[cgutman] 50078: [EXPLORER-NEW] - Fix another "sizeof" usage mistake - CID 1631
by cgutman＠svn.reactos.org 21 Dec '10

21 Dec '10

Author: cgutman Date: Tue Dec 21 04:48:36 2010 New Revision: 50078 URL: http://svn.reactos.org/svn/reactos?rev=50078&view=rev Log: [EXPLORER-NEW] - Fix another "sizeof" usage mistake - CID 1631 Modified: trunk/reactos/base/shell/explorer-new/dragdrop.c Modified: trunk/reactos/base/shell/explorer-new/dragdrop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/dr… ============================================================================== --- trunk/reactos/base/shell/explorer-new/dragdrop.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer-new/dragdrop.c [iso-8859-1] Tue Dec 21 04:48:36 2010 @@ -152,7 +152,7 @@ { CopyMemory(&This->Callbacks, Callbacks, - sizeof(Callbacks)); + sizeof(*Callbacks)); } hr = CoCreateInstance(&CLSID_DragDropHelper,

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
37
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2010