Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 43251: - Get the length from each packet header instead of assuming that all packets will be the length of the first one
by cgutman＠svn.reactos.org 01 Oct '09

01 Oct '09

Author: cgutman Date: Thu Oct 1 23:00:41 2009 New Revision: 43251 URL: http://svn.reactos.org/svn/reactos?rev=43251&view=rev Log: - Get the length from each packet header instead of assuming that all packets will be the length of the first one Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c [iso-8859-1] Thu Oct 1 23:00:41 2009 @@ -517,8 +517,8 @@ error = ENOBUFS; goto done; } - m_copydata( m, 0, htons(ip->ip_len), new_m->m_data ); - new_m->m_len = htons(ip->ip_len); + m_copydata( m, 0, m->m_pkthdr.len, new_m->m_data ); + new_m->m_len = m->m_pkthdr.len; error = OtcpEvent.PacketSend( OtcpEvent.ClientData, (OSK_PCHAR)new_m->m_data, new_m->m_len ); m_free( new_m );

1 0

[fireball] 43250: [fastfat_new] - Implement simple read support. - Rewrite FatMapUserBuffer, no exception raising necessary at this stage. - Silence FatReadBlocks dbgprint.
by fireball＠svn.reactos.org 01 Oct '09

01 Oct '09

Author: fireball Date: Thu Oct 1 18:08:11 2009 New Revision: 43250 URL: http://svn.reactos.org/svn/reactos?rev=43250&view=rev Log: [fastfat_new] - Implement simple read support. - Rewrite FatMapUserBuffer, no exception raising necessary at this stage. - Silence FatReadBlocks dbgprint. Modified: trunk/reactos/drivers/filesystems/fastfat_new/blockdev.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h trunk/reactos/drivers/filesystems/fastfat_new/fullfat.c trunk/reactos/drivers/filesystems/fastfat_new/rw.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/blockdev.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/blockdev.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/blockdev.c [iso-8859-1] Thu Oct 1 18:08:11 2009 @@ -54,30 +54,6 @@ if (ARGUMENT_PRESENT(OutputBufferSize)) *OutputBufferSize = IoStatus.Information; return Status; -} - -PVOID -FatMapUserBuffer( - IN OUT PIRP Irp) -/* - * FUNCTION: - * - * - * ARGUMENTS: - * IrpContext = Pointer to FCB structure for the file. - * Irp = Pointer to the IRP structure - * RETURNS: Status Value. - * NOTES: - */ -{ - PVOID Address; - - if (Irp->MdlAddress == NULL) - return Irp->UserBuffer; - Address = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); - if (Address == NULL) - ExRaiseStatus( STATUS_INVALID_USER_BUFFER ); - return Address; } NTSTATUS Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.c [iso-8859-1] Thu Oct 1 18:08:11 2009 @@ -394,5 +394,14 @@ ExReleaseResourceLite(&Vcb->Resource); } +PVOID +FASTCALL +FatMapUserBuffer(PIRP Irp) +{ + if (!Irp->MdlAddress) + return Irp->UserBuffer; + else + return MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); +} /* EOF */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.h [iso-8859-1] Thu Oct 1 18:08:11 2009 @@ -65,10 +65,6 @@ IN PLARGE_INTEGER Offset, IN SIZE_T Length); -PVOID -FatMapUserBuffer( - IN OUT PIRP Irp); - /* ----------------------------------------------------------- dir.c */ NTSTATUS NTAPI @@ -158,6 +154,9 @@ TYPE_OF_OPEN TypeOfOpen, PVOID Fcb, PCCB Ccb); + +PVOID FASTCALL +FatMapUserBuffer(PIRP Irp); /* --------------------------------------------------------- fullfat.c */ Modified: trunk/reactos/drivers/filesystems/fastfat_new/fullfat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fullfat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fullfat.c [iso-8859-1] Thu Oct 1 18:08:11 2009 @@ -46,7 +46,7 @@ PBCB Bcb; ULONG SectorSize = 512; // FIXME: hardcoding 512 is bad - DPRINT1("FatReadBlocks %p %d %d %p\n", DestBuffer, SectorAddress, Count, pParam); + DPRINT("FatReadBlocks %p %d %d %p\n", DestBuffer, SectorAddress, Count, pParam); /* Calculate the offset */ Offset.QuadPart = Int32x32To64(SectorAddress, SectorSize); Modified: trunk/reactos/drivers/filesystems/fastfat_new/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] Thu Oct 1 18:08:11 2009 @@ -26,6 +26,8 @@ PFCB Fcb; PVCB Vcb; PCCB Ccb; + PVOID Buffer; + LONG BytesRead; FileObject = IrpSp->FileObject; NumberOfBytes = IrpSp->Parameters.Read.Length; @@ -40,7 +42,29 @@ DPRINT1("FatiRead() Fcb %p, Name %wZ, Offset %d, Length %d, Handle %p\n", Fcb, &FileObject->FileName, ByteOffset.LowPart, NumberOfBytes, Fcb->FatHandle); - return STATUS_NOT_IMPLEMENTED; + + /* Perform actual read */ + + if (IrpContext->MinorFunction & IRP_MN_MDL) + { + DPRINT1("MDL read\n"); + } + else + { + Buffer = FatMapUserBuffer(IrpContext->Irp); + DPRINT1("Normal cached read, buffer %p\n"); + + BytesRead = FF_Read(Fcb->FatHandle, NumberOfBytes, 1, Buffer); + DPRINT1("Read %d bytes\n", BytesRead); + + /* Indicate we read requested amount of bytes */ + IrpContext->Irp->IoStatus.Information = BytesRead; + IrpContext->Irp->IoStatus.Status = STATUS_SUCCESS; + } + + /* Complete the request */ + FatCompleteRequest(IrpContext, IrpContext->Irp, STATUS_SUCCESS); + return STATUS_SUCCESS; } NTSTATUS

1 0

[sginsberg] 43249: - Fix MSVC YieldProcessor macro
by sginsberg＠svn.reactos.org 01 Oct '09

01 Oct '09

Author: sginsberg Date: Thu Oct 1 16:18:54 2009 New Revision: 43249 URL: http://svn.reactos.org/svn/reactos?rev=43249&view=rev Log: - Fix MSVC YieldProcessor macro Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Thu Oct 1 16:18:54 2009 @@ -4965,20 +4965,16 @@ #error Unknown architecture #endif -VOID -_mm_pause ( - VOID - ); - - #if defined(_M_IX86) #ifdef _MSC_VER #pragma intrinsic(_mm_pause) +#define YieldProcessor _mm_pause #else #define YieldProcessor() __asm__ __volatile__("pause"); #endif #elif defined (_M_AMD64) #ifdef _MSC_VER +#pragma intrinsic(_mm_pause) #define YieldProcessor _mm_pause #else #define YieldProcessor() __asm__ __volatile__("pause");

1 0

[sginsberg] 43248: - Kill leftover __USE_W32API
by sginsberg＠svn.reactos.org 01 Oct '09

01 Oct '09

Author: sginsberg Date: Thu Oct 1 16:18:18 2009 New Revision: 43248 URL: http://svn.reactos.org/svn/reactos?rev=43248&view=rev Log: - Kill leftover __USE_W32API Modified: trunk/reactos/base/shell/explorer/Make-rosshell.mak Modified: trunk/reactos/base/shell/explorer/Make-rosshell.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/Make-r… ============================================================================== --- trunk/reactos/base/shell/explorer/Make-rosshell.mak [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/Make-rosshell.mak [iso-8859-1] Thu Oct 1 16:18:18 2009 @@ -21,7 +21,7 @@ TARGET_CPPFLAGS := $(TARGET_CFLAGS) -TARGET_RCFLAGS := -D__USE_W32API -DWIN32 -D_ROS_ -D__WINDRES__ +TARGET_RCFLAGS := -DWIN32 -D_ROS_ -D__WINDRES__ TARGET_SDKLIBS := \ gdi32.a user32.a comctl32.a ole32.a oleaut32.a shell32.a \

1 0

[fireball] 43247: [fastfat_new] - Open a file in FatiOpenExistingFile by means of FullFAT library. - Fix incorrect fullfat placement in fasfat.rbuild. - Hack StreamFileObject to be 5Gb in length instead of 512 bytes. It'll be set to the size of an underlying physical device later. - Add FF file handle to FCB structure.
by fireball＠svn.reactos.org 01 Oct '09

01 Oct '09

Author: fireball Date: Thu Oct 1 15:21:28 2009 New Revision: 43247 URL: http://svn.reactos.org/svn/reactos?rev=43247&view=rev Log: [fastfat_new] - Open a file in FatiOpenExistingFile by means of FullFAT library. - Fix incorrect fullfat placement in fasfat.rbuild. - Hack StreamFileObject to be 5Gb in length instead of 512 bytes. It'll be set to the size of an underlying physical device later. - Add FF file handle to FCB structure. Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild trunk/reactos/drivers/filesystems/fastfat_new/fat.c trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h trunk/reactos/drivers/filesystems/fastfat_new/fullfat.c trunk/reactos/drivers/filesystems/fastfat_new/rw.c Modified: trunk/reactos/drivers/filesystems/fastfat_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/create.c [iso-8859-1] Thu Oct 1 15:21:28 2009 @@ -59,7 +59,10 @@ IN BOOLEAN IsDosName) { IO_STATUS_BLOCK Iosb = {{0}}; + OEM_STRING AnsiName; + CHAR AnsiNameBuf[512]; PFCB Fcb; + NTSTATUS Status; /* Check for create file option and fail */ if (CreateDisposition == FILE_CREATE) @@ -72,6 +75,20 @@ /* Create a new FCB for this file */ Fcb = FatCreateFcb(IrpContext, Vcb, ParentDcb); + + /* Convert the name to ANSI */ + AnsiName.Buffer = AnsiNameBuf; + AnsiName.Length = 0; + AnsiName.MaximumLength = sizeof(AnsiNameBuf); + RtlZeroMemory(AnsiNameBuf, sizeof(AnsiNameBuf)); + Status = RtlUpcaseUnicodeStringToCountedOemString(&AnsiName, &FileObject->FileName, FALSE); + if (!NT_SUCCESS(Status)) + { + ASSERT(FALSE); + } + + /* Open the file with FullFAT */ + Fcb->FatHandle = FF_Open(Vcb->Ioman, AnsiName.Buffer, FF_MODE_READ, NULL); // TODO: Check if overwrite is needed Modified: trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fastfat.rbuild [iso-8859-1] Thu Oct 1 15:21:28 2009 @@ -4,10 +4,10 @@ <bootstrap installbase="$(CDOUTPUT)" /> <include base="fastfatn">.</include> <include base="ReactOS">include/reactos/libs/fullfat</include> + <library>fullfat</library> <library>ntoskrnl</library> <library>hal</library> <library>pseh</library> - <library>fullfat</library> <file>blockdev.c</file> <file>cleanup.c</file> <file>close.c</file> Modified: trunk/reactos/drivers/filesystems/fastfat_new/fat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fat.c [iso-8859-1] Thu Oct 1 15:21:28 2009 @@ -484,10 +484,13 @@ Vcb->StreamFileObject->SectionObjectPointer = &Vcb->SectionObjectPointers; /* At least full boot sector should be available */ - Vcb->Header.FileSize.QuadPart = sizeof(PACKED_BOOT_SECTOR); - Vcb->Header.AllocationSize.QuadPart = sizeof(PACKED_BOOT_SECTOR); + //Vcb->Header.FileSize.QuadPart = sizeof(PACKED_BOOT_SECTOR); + //Vcb->Header.AllocationSize.QuadPart = sizeof(PACKED_BOOT_SECTOR); Vcb->Header.ValidDataLength.HighPart = MAXLONG; Vcb->Header.ValidDataLength.LowPart = MAXULONG; + + Vcb->Header.AllocationSize.QuadPart = Int32x32To64(5*1024, 1024*1024); //HACK: 5 Gb + Vcb->Header.FileSize.QuadPart = Vcb->Header.AllocationSize.QuadPart; /* Set VCB to a good condition */ Vcb->Condition = VcbGood; Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] Thu Oct 1 15:21:28 2009 @@ -279,6 +279,8 @@ UCHAR DirentFatFlags; /* File basic info */ FILE_BASIC_INFORMATION BasicInfo; + /* FullFAT file handle */ + FF_FILE *FatHandle; union { struct Modified: trunk/reactos/drivers/filesystems/fastfat_new/fullfat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fullfat.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fullfat.c [iso-8859-1] Thu Oct 1 15:21:28 2009 @@ -58,6 +58,7 @@ &Bcb, &Buffer)) { + ASSERT(FALSE); /* Mapping failed */ return 0; } Modified: trunk/reactos/drivers/filesystems/fastfat_new/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] Thu Oct 1 15:21:28 2009 @@ -38,8 +38,8 @@ OpenType = FatDecodeFileObject(FileObject, &Vcb, &Fcb, &Ccb); - DPRINT1("FatiRead() Fcb %p, Name %wZ, Offset %d, Length %d\n", - Fcb, &FileObject->FileName, ByteOffset.LowPart, NumberOfBytes); + DPRINT1("FatiRead() Fcb %p, Name %wZ, Offset %d, Length %d, Handle %p\n", + Fcb, &FileObject->FileName, ByteOffset.LowPart, NumberOfBytes, Fcb->FatHandle); return STATUS_NOT_IMPLEMENTED; }

1 0

[janderwald] 43246: - Add usbdlib.h
by janderwald＠svn.reactos.org 30 Sep '09

30 Sep '09

Author: janderwald Date: Thu Oct 1 01:58:04 2009 New Revision: 43246 URL: http://svn.reactos.org/svn/reactos?rev=43246&view=rev Log: - Add usbdlib.h Added: trunk/reactos/include/ddk/usbdlib.h (with props) Added: trunk/reactos/include/ddk/usbdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbdlib.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/usbdlib.h (added) +++ trunk/reactos/include/ddk/usbdlib.h [iso-8859-1] Thu Oct 1 01:58:04 2009 @@ -1,0 +1,239 @@ +#ifndef USBDLIB_H__ +#define USBDLIB_H__ + + +typedef struct _USBD_INTERFACE_LIST_ENTRY +{ + PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; + PUSBD_INTERFACE_INFORMATION Interface; +}USBD_INTERFACE_LIST_ENTRY, *PUSBD_INTERFACE_LIST_ENTRY; + +#define UsbBuildInterruptOrBulkTransferRequest(urb,length, pipeHandle, transferBuffer, transferBufferMDL, transferBufferLength, transferFlags, link) \ +{ \ + (urb)->UrbHeader.Function = URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER; \ + (urb)->UrbHeader.Length = (length); \ + (urb)->UrbBulkOrInterruptTransfer.PipeHandle = (pipeHandle); \ + (urb)->UrbBulkOrInterruptTransfer.TransferBufferLength = (transferBufferLength); \ + (urb)->UrbBulkOrInterruptTransfer.TransferBufferMDL = (transferBufferMDL); \ + (urb)->UrbBulkOrInterruptTransfer.TransferBuffer = (transferBuffer); \ + (urb)->UrbBulkOrInterruptTransfer.TransferFlags = (transferFlags); \ + (urb)->UrbBulkOrInterruptTransfer.UrbLink = (link); \ +} + +#define UsbBuildGetDescriptorRequest(urb, length, descriptorType, descriptorIndex, languageId, transferBuffer, transferBufferMDL, transferBufferLength, link) \ +{ \ + (urb)->UrbHeader.Function = URB_FUNCTION_GET_DESCRIPTOR_FROM_DEVICE; \ + (urb)->UrbHeader.Length = (length); \ + (urb)->UrbControlDescriptorRequest.TransferBufferLength = (transferBufferLength); \ + (urb)->UrbControlDescriptorRequest.TransferBufferMDL = (transferBufferMDL); \ + (urb)->UrbControlDescriptorRequest.TransferBuffer = (transferBuffer); \ + (urb)->UrbControlDescriptorRequest.DescriptorType = (descriptorType); \ + (urb)->UrbControlDescriptorRequest.Index = (descriptorIndex); \ + (urb)->UrbControlDescriptorRequest.LanguageId = (languageId); \ + (urb)->UrbControlDescriptorRequest.UrbLink = (link); \ +} + +#define UsbBuildGetStatusRequest(urb, op, index, transferBuffer, transferBufferMDL, link) \ +{ \ + (urb)->UrbHeader.Function = (op); \ + (urb)->UrbHeader.Length = sizeof(struct _URB_CONTROL_GET_STATUS_REQUEST); \ + (urb)->UrbControlGetStatusRequest.TransferBufferLength = sizeof(USHORT); \ + (urb)->UrbControlGetStatusRequest.TransferBufferMDL = (transferBufferMDL); \ + (urb)->UrbControlGetStatusRequest.TransferBuffer = (transferBuffer); \ + (urb)->UrbControlGetStatusRequest.Index = (index); \ + (urb)->UrbControlGetStatusRequest.UrbLink = (link); \ +} + + +#define UsbBuildFeatureRequest(urb, op, featureSelector, index, link) \ +{ \ + (urb)->UrbHeader.Function = (op); \ + (urb)->UrbHeader.Length = sizeof(struct _URB_CONTROL_FEATURE_REQUEST); \ + (urb)->UrbControlFeatureRequest.FeatureSelector = (featureSelector); \ + (urb)->UrbControlFeatureRequest.Index = (index); \ + (urb)->UrbControlFeatureRequest.UrbLink = (link); \ +} + +#define UsbBuildSelectConfigurationRequest(urb, length, configurationDescriptor) \ +{ \ + (urb)->UrbHeader.Function = URB_FUNCTION_SELECT_CONFIGURATION; \ + (urb)->UrbHeader.Length = (length); \ + (urb)->UrbSelectConfiguration.ConfigurationDescriptor = (configurationDescriptor); \ +} + +#define UsbBuildSelectInterfaceRequest(urb, length, configurationHandle, interfaceNumber, alternateSetting) \ +{ \ + (urb)->UrbHeader.Function = URB_FUNCTION_SELECT_INTERFACE; \ + (urb)->UrbHeader.Length = (length); \ + (urb)->UrbSelectInterface.Interface.AlternateSetting = (alternateSetting); \ + (urb)->UrbSelectInterface.Interface.InterfaceNumber = (interfaceNumber); \ + (urb)->UrbSelectInterface.Interface.Length = (length - sizeof(struct _URB_HEADER) - sizeof(USBD_CONFIGURATION_HANDLE)); \ + (urb)->UrbSelectInterface.ConfigurationHandle = (configurationHandle); \ +} + +#define UsbBuildVendorRequest(urb, cmd, length, transferFlags, reservedbits, request, value, index, transferBuffer, transferBufferMDL, transferBufferLength, link) \ +{ \ + (urb)->UrbHeader.Function = cmd; \ + (urb)->UrbHeader.Length = (length); \ + (urb)->UrbControlVendorClassRequest.TransferBufferLength = (transferBufferLength); \ + (urb)->UrbControlVendorClassRequest.TransferBufferMDL = (transferBufferMDL); \ + (urb)->UrbControlVendorClassRequest.TransferBuffer = (transferBuffer); \ + (urb)->UrbControlVendorClassRequest.RequestTypeReservedBits = (reservedbits); \ + (urb)->UrbControlVendorClassRequest.Request = (request); \ + (urb)->UrbControlVendorClassRequest.Value = (value); \ + (urb)->UrbControlVendorClassRequest.Index = (index); \ + (urb)->UrbControlVendorClassRequest.TransferFlags = (transferFlags); \ + (urb)->UrbControlVendorClassRequest.UrbLink = (link); \ +} + +#if (NTDDI_VERSION >= NTDDI_WINXP) + +#define UsbBuildOsFeatureDescriptorRequest(urb, length, interface, index, transferBuffer, transferBufferMDL, transferBufferLength, link) \ +{ \ + (urb)->UrbHeader.Function = URB_FUNCTION_GET_MS_FEATURE_DESCRIPTOR; \ + (urb)->UrbHeader.Length = (length); \ + (urb)->UrbOSFeatureDescriptorRequest.TransferBufferLength = (transferBufferLength); \ + (urb)->UrbOSFeatureDescriptorRequest.TransferBufferMDL = (transferBufferMDL); \ + (urb)->UrbOSFeatureDescriptorRequest.TransferBuffer = (transferBuffer); \ + (urb)->UrbOSFeatureDescriptorRequest.InterfaceNumber = (interface); \ + (urb)->UrbOSFeatureDescriptorRequest.MS_FeatureDescriptorIndex = (index); \ + (urb)->UrbOSFeatureDescriptorRequest.UrbLink = (link); \ +} + +#endif + +#define URB_STATUS(urb) ((urb)->UrbHeader.Status) + +#define GET_SELECT_CONFIGURATION_REQUEST_SIZE(totalInterfaces, totalPipes) \ + (sizeof(struct _URB_SELECT_CONFIGURATION) + \ + ((totalInterfaces-1) * sizeof(USBD_INTERFACE_INFORMATION)) + \ + ((totalPipes-totalInterfaces)*sizeof(USBD_PIPE_INFORMATION))) + +#define GET_SELECT_INTERFACE_REQUEST_SIZE(totalPipes) \ + (sizeof(struct _URB_SELECT_INTERFACE) + \ + ((totalPipes-1)*sizeof(USBD_PIPE_INFORMATION))) + +#define GET_USBD_INTERFACE_SIZE(numEndpoints) (sizeof(USBD_INTERFACE_INFORMATION) + \ + (sizeof(USBD_PIPE_INFORMATION)*(numEndpoints)) \ + - sizeof(USBD_PIPE_INFORMATION)) + +#define GET_ISO_URB_SIZE(n) (sizeof(struct _URB_ISOCH_TRANSFER)+ \ + sizeof(USBD_ISO_PACKET_DESCRIPTOR)*n) + + +#ifndef _USBD_ + +DECLSPEC_IMPORT +VOID +USBD_GetUSBDIVersion( + OUT PUSBD_VERSION_INFORMATION VersionInformation +); + + +DECLSPEC_IMPORT +PUSB_INTERFACE_DESCRIPTOR +USBD_ParseConfigurationDescriptor( + IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, + IN UCHAR InterfaceNumber, + IN UCHAR AlternateSetting +); + +DECLSPEC_IMPORT +PURB +USBD_CreateConfigurationRequest( + IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, + OUT PUSHORT Siz +); + +DECLSPEC_IMPORT +PUSB_COMMON_DESCRIPTOR +USBD_ParseDescriptors( + IN PVOID DescriptorBuffer, + IN ULONG TotalLength, + IN PVOID StartPosition, + IN LONG DescriptorType +); + +DECLSPEC_IMPORT +PUSB_INTERFACE_DESCRIPTOR +USBD_ParseConfigurationDescriptorEx( + IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, + IN PVOID StartPosition, + IN LONG InterfaceNumber, + IN LONG AlternateSetting, + IN LONG InterfaceClass, + IN LONG InterfaceSubClass, + IN LONG InterfaceProtocol +); + +DECLSPEC_IMPORT +PURB +USBD_CreateConfigurationRequestEx( + IN PUSB_CONFIGURATION_DESCRIPTOR ConfigurationDescriptor, + IN PUSBD_INTERFACE_LIST_ENTRY InterfaceList +); + + +DECLSPEC_IMPORT +ULONG +USBD_GetInterfaceLength( + IN PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor, + IN PUCHAR BufferEnd +); + +DECLSPEC_IMPORT +VOID +USBD_RegisterHcFilter( + IN PDEVICE_OBJECT DeviceObject, + IN PDEVICE_OBJECT FilterDeviceObject +); + + + +DECLSPEC_IMPORT +NTSTATUS +USBD_GetPdoRegistryParameter( + IN PDEVICE_OBJECT PhysicalDeviceObject, + IN PVOID Parameter, + IN ULONG ParameterLength, + IN PWSTR KeyName, + IN ULONG KeyNameLength +); + +DECLSPEC_IMPORT +NTSTATUS +USBD_QueryBusTime( + IN PDEVICE_OBJECT RootHubPdo, + OUT PULONG CurrentFrame +); + +#if (NTDDI_VERSION >= NTDDI_WINXP) + +DECLSPEC_IMPORT +ULONG +USBD_CalculateUsbBandwidth( + IN ULONG MaxPacketSize, + IN UCHAR EndpointType, + IN BOOLEAN LowSpeed +); + +#endif + +#if (NTDDI_VERSION >= NTDDI_VISTA) + +DECLSPEC_IMPORT +USBD_STATUS +USBD_ValidateConfigurationDescriptor( + IN PUSB_CONFIGURATION_DESCRIPTOR ConfigDesc, + IN ULONG BufferLength, + IN USHORT Level, + OUT PUCHAR *Offset, + IN ULONG Tag +); + + +#endif + +#endif + +#endif Propchange: trunk/reactos/include/ddk/usbdlib.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[dgorbachev] 43245: Patch by Viliam Lejcik (lejcik =at= gmail com). Fixes bug #4858. With the blessing of Ged Murphy.
by dgorbachev＠svn.reactos.org 30 Sep '09

30 Sep '09

Author: dgorbachev Date: Wed Sep 30 22:59:21 2009 New Revision: 43245 URL: http://svn.reactos.org/svn/reactos?rev=43245&view=rev Log: Patch by Viliam Lejcik (lejcik =at= gmail com). Fixes bug #4858. With the blessing of Ged Murphy. Modified: trunk/reactos/base/applications/mscutils/servman/dependencies.c trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc trunk/reactos/base/applications/mscutils/servman/lang/el-GR.rc trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc trunk/reactos/base/applications/mscutils/servman/lang/ko-KR.rc trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc trunk/reactos/base/applications/mscutils/servman/mainwnd.c Modified: trunk/reactos/base/applications/mscutils/servman/dependencies.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/dependencies.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/dependencies.c [iso-8859-1] Wed Sep 30 22:59:21 2009 @@ -88,7 +88,7 @@ DWORD dwCount; if (EnumDependentServices(hService, - SERVICE_ACTIVE, + SERVICE_STATE_ALL, NULL, 0, &dwBytesNeeded, @@ -108,7 +108,7 @@ if (lpDependencies) { if (EnumDependentServices(hService, - SERVICE_ACTIVE, + SERVICE_STATE_ALL, lpDependencies, dwBytesNeeded, &dwBytesNeeded, @@ -141,7 +141,7 @@ if (hService) { if (!EnumDependentServices(hService, - SERVICE_ACTIVE, + SERVICE_STATE_ALL, NULL, 0, &dwBytesNeeded, Modified: trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/bg-BG.rc [iso-8859-1] Wed Sep 30 22:59:21 2009 @@ -194,6 +194,8 @@ BEGIN /* IDS_NUM_SERVICES "Num Services: %d" */ IDS_NUM_SERVICES "Áðîé óñëóãè: %d" + IDS_STOP_DEPENDS "When %s stops, these other services will also stop" + IDS_NO_DEPENDS "<No Dependencies>" IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END Modified: trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/de-DE.rc [iso-8859-1] Wed Sep 30 22:59:21 2009 @@ -191,6 +191,8 @@ STRINGTABLE DISCARDABLE BEGIN IDS_NUM_SERVICES "Anzahl der Dienste: %d" + IDS_STOP_DEPENDS "When %s stops, these other services will also stop" + IDS_NO_DEPENDS "<No Dependencies>" IDS_LICENSE "Dieses Programm ist kostenlos; Sie können es frei verteilen mit od. ohne Änderungen unter der GNU Lesser General Public License wie es von der Free Software Foundation veröffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine spätere Version (ihrer Wahl).\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END Modified: trunk/reactos/base/applications/mscutils/servman/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/el-GR.rc [iso-8859-1] Wed Sep 30 22:59:21 2009 @@ -191,6 +191,8 @@ STRINGTABLE DISCARDABLE BEGIN IDS_NUM_SERVICES "Num Services: %d" + IDS_STOP_DEPENDS "When %s stops, these other services will also stop" + IDS_NO_DEPENDS "<No Dependencies>" IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END Modified: trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/es-ES.rc [iso-8859-1] Wed Sep 30 22:59:21 2009 @@ -191,6 +191,8 @@ STRINGTABLE DISCARDABLE BEGIN IDS_NUM_SERVICES "Núm Servicios: %d" + IDS_STOP_DEPENDS "When %s stops, these other services will also stop" + IDS_NO_DEPENDS "<No Dependencies>" IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END Modified: trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/fr-FR.rc [iso-8859-1] Wed Sep 30 22:59:21 2009 @@ -195,6 +195,8 @@ STRINGTABLE DISCARDABLE BEGIN IDS_NUM_SERVICES "Services: %d" + IDS_STOP_DEPENDS "When %s stops, these other services will also stop" + IDS_NO_DEPENDS "<No Dependencies>" IDS_LICENSE "Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou le modifier tout en respectant les termes de la ""GNU General Public License"" publiée par la Free Software Foundation; dans sa version 2 (ou selon votre préférence) toute version ultérieure.\r\n\r\nCe programme est distribué dans l'espoir qu'il sera utile, cependant SANS GARANTIE D'AUCUNE SORTE; sans même une garantie implicite de COMMERCIABILITÉ ou DE CONFORMITÉ A UNE UTILISATION PARTICULIÈRE. \r\n\r\nVoir la Licence Publique Générale GNU pour plus de détails. Vous devriez avoir reçu un exemplaire de la Licence Publique Générale GNU avec ce programme ; si ce n'est pas le cas, écrivez à la Free Software Foundation Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA." END Modified: trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/id-ID.rc [iso-8859-1] Wed Sep 30 22:59:21 2009 @@ -191,6 +191,8 @@ STRINGTABLE DISCARDABLE BEGIN IDS_NUM_SERVICES "Jumlah Layanan: %d" + IDS_STOP_DEPENDS "When %s stops, these other services will also stop" + IDS_NO_DEPENDS "<No Dependencies>" IDS_LICENSE "Program ini adalah software bebas; anda dapat mendistribusikan dan/atau mengubahnya di bawah term GNU General Public License seperti dipublikasikan oleh Free Software Foundation; baik Lisensi versi 2, atau (menurut opini anda) setiap versi berikutnya.\r\n\r\nProgram ini didistribusikan dengan harapan ia akan berguna, tetapi TANPA JAMINAN APAPUN; bahkan tanpa jaminan berarti dari MERCANTABILITAS atau KECUKUPAN UNTUK KEPERLUAN TERTENTU. Lihat GNU General Public License untuk lebih jelasnya.\r\n\r\nAnda seharusnya menerima duplikat GNU General Public License bersamaan dengan program ini; jika tidak, tulis ke Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END Modified: trunk/reactos/base/applications/mscutils/servman/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ko-KR.rc [iso-8859-1] Wed Sep 30 22:59:21 2009 @@ -194,6 +194,8 @@ STRINGTABLE DISCARDABLE BEGIN IDS_NUM_SERVICES "¸ðµç ¼ºñ½º: %d" + IDS_STOP_DEPENDS "When %s stops, these other services will also stop" + IDS_NO_DEPENDS "<No Dependencies>" IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END Modified: trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/no-NO.rc [iso-8859-1] Wed Sep 30 22:59:21 2009 @@ -191,6 +191,8 @@ STRINGTABLE DISCARDABLE BEGIN IDS_NUM_SERVICES "Num tjeneste: %d" + IDS_STOP_DEPENDS "When %s stops, these other services will also stop" + IDS_NO_DEPENDS "<No Dependencies>" IDS_LICENSE "Dette programmet er gratis programvare; du kan distribuere det og/eller endre det under betingelsene av GNU General Public License som er utgitt av Free Software Foundation; version 2 av lisensen, eller (etter din mening) alle senere versjoner.\r\n\r\nDette programmet er utgitt i håp for at det skal kunne brukes, men DET ER INGEN GARANTIER; uten heller forutsatt garantier av SALGBARHET eller SIKKETHET FOR EN ENKELTHET FORMÅL. Se på GNU General Public Lisensen for mere detaljer.\r\n\r\nDu skal ha motatt en kopi av GNU General Public Lisensen sammen med denne programmet; hvis du ikke har motatt det, skriv til Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END Modified: trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/pl-PL.rc [iso-8859-1] Wed Sep 30 22:59:21 2009 @@ -198,6 +198,8 @@ STRINGTABLE DISCARDABLE BEGIN IDS_NUM_SERVICES "Numer us³ugi: %d" + IDS_STOP_DEPENDS "When %s stops, these other services will also stop" + IDS_NO_DEPENDS "<No Dependencies>" IDS_LICENSE "Niniejszy program jest wolnym oprogramowaniem; mo¿esz go rozprowadzaæ dalej i/lub modyfikowaæ na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez Fundacjê Wolnego Oprogramowania - wed³ug wersji 2 tej Licencji lub (wed³ug Twojego wyboru) której z póniejszych wersji.\r\n\r\nNiniejszy program rozpowszechniany jest z nadziej¹, i¿ bêdzie on u¿yteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domylnej gwarancji PRZYDATNOCI HANDLOWEJ albo PRZYDATNOCI DO OKRELONYCH ZASTOSOWAÑ. W celu uzyskania bli¿szych informacji siêgnij do Powszechnej Licencji Publicznej GNU.\r\n\r\nZ pewnoci¹ wraz z niniejszym programem otrzyma³e te¿ egzemplarz Powszechnej Licencji Publicznej GNU (GNU General Public License); jeli nie - napisz do Free Software Foundation, Inc., 59 Temple Place, Fifth Floor, Boston, MA 02110-1301 USA." END Modified: trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/ru-RU.rc [iso-8859-1] Wed Sep 30 22:59:21 2009 @@ -190,6 +190,8 @@ STRINGTABLE DISCARDABLE BEGIN IDS_NUM_SERVICES "Íîìåð ñëóæáû: %d" + IDS_STOP_DEPENDS "When %s stops, these other services will also stop" + IDS_NO_DEPENDS "<No Dependencies>" IDS_LICENSE "Ýòà ïðîãðàììà ÿâëÿåòñÿ ñâîáîäíûì ïðîãðàììíûì îáåñïå÷åíèåì; Âû ìîæåòå ðàñïðîñòðàíÿòü è/èëè èçìåíÿòü åå â ñîîòâåòñòâèè ñ ëèöåíçèåé GNU General Public License âåðñèè 2 èëè áîëåå ïîçäíåé, îïóáëèêîâàííîé Free Software Foundation.\r\n\r\nÝòà ïðîãðàììà ðàñïðîñòðàíÿåòñÿ ñ íàäåæäîé, ÷òî îíà ìîæåò áûòü ïîëåçíà, íî ÁÅÇ ÂÑßÊÎÉ ÃÀÐÀÍÒÈÈ; íå ïîäðàçóìåâàåòñÿ äàæå ÐÀÁÎÒÎÑÏÎÑÎÁÍÎÑÒÜ èëè ÏÐÈÃÎÄÍÎÑÒÜ ÄËß ÂÛÏÎËÍÅÍÈß ÍÅÎÁÕÎÄÈÌÛÕ ÇÀÄÀ×. Ñì. GNU General Public License äëÿ ïîëó÷åíèÿ äîïîëíèòåëüíûõ ñâåäåíèé.\r\n\r\nÂû äîëæíû ïîëó÷èòü êîïèþ ëèöåíçèè GNU âìåñòå ñ ýòîé ïðîãðàììîé, â ïðîòèâíîì ñëó÷àå îáðàùàéòåñü â Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END Modified: trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/sk-SK.rc [iso-8859-1] Wed Sep 30 22:59:21 2009 @@ -210,6 +210,7 @@ BEGIN IDS_NUM_SERVICES "Poèet sluieb: %d" IDS_STOP_DEPENDS "When %s stops, these other services will also stop" + IDS_NO_DEPENDS "<iadne závislosti>" IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END Modified: trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/th-TH.rc [iso-8859-1] Wed Sep 30 22:59:21 2009 @@ -200,6 +200,8 @@ STRINGTABLE DISCARDABLE BEGIN IDS_NUM_SERVICES "Num Services: %d" + IDS_STOP_DEPENDS "When %s stops, these other services will also stop" + IDS_NO_DEPENDS "<No Dependencies>" IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END Modified: trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/lang/uk-UA.rc [iso-8859-1] Wed Sep 30 22:59:21 2009 @@ -199,6 +199,8 @@ STRINGTABLE DISCARDABLE BEGIN IDS_NUM_SERVICES "Íîìåð ñëóæáè: %d" + IDS_STOP_DEPENDS "When %s stops, these other services will also stop" + IDS_NO_DEPENDS "<No Dependencies>" IDS_LICENSE "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\r\n\r\nThis program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END Modified: trunk/reactos/base/applications/mscutils/servman/mainwnd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… ============================================================================== --- trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mscutils/servman/mainwnd.c [iso-8859-1] Wed Sep 30 22:59:21 2009 @@ -643,11 +643,14 @@ if (!InitMainWnd(Info)) return -1; + /* Fill the list-view before showing the main window */ + RefreshServiceList(Info); + /* Show the window */ ShowWindow(hwnd, Info->nCmdShow); - RefreshServiceList(Info); + SetFocus(Info->hListView); } break; @@ -683,6 +686,16 @@ } //OpenPropSheet(Info); + } + break; + + case NM_RETURN: + { + SendMessage(hwnd, + WM_COMMAND, + //ID_PROP, + MAKEWPARAM((WORD)ID_PROP, (WORD)0), + 0); } break;

1 0

[sginsberg] 43244: ReactOS SMP Bringup Lite: - Add simple and hacky spinlock implementation to HAL and kernel. It treats queued spinlocks as normal spinlocks and does not support debug timeout, but works well enough to expose bugs in spinlock usage. - Implement KiProcessDeferredReadyList, a simple wrapper around KiDeferredReadyThread. - Add missing PRCB locking in KiDeferredReadyThread. - Implement SMP handling in KiRetireDpcList. - Acquire the spinlock in KeSynchronizeExecution for SMP. - Stub
by sginsberg＠svn.reactos.org 30 Sep '09

30 Sep '09

Author: sginsberg Date: Wed Sep 30 22:30:57 2009 New Revision: 43244 URL: http://svn.reactos.org/svn/reactos?rev=43244&view=rev Log: ReactOS SMP Bringup Lite: - Add simple and hacky spinlock implementation to HAL and kernel. It treats queued spinlocks as normal spinlocks and does not support debug timeout, but works well enough to expose bugs in spinlock usage. - Implement KiProcessDeferredReadyList, a simple wrapper around KiDeferredReadyThread. - Add missing PRCB locking in KiDeferredReadyThread. - Implement SMP handling in KiRetireDpcList. - Acquire the spinlock in KeSynchronizeExecution for SMP. - Stub and export Kii386SpinOnSpinLock -- not used yet. - Fix locking in KiAcquire/ReleaseDispatcherLockAtDpcLevel -- KeAcquireQueuedSpinLockAtDpcLevel takes the lock queue pointer, not the index. - "Implement" KiRundownThread for SMP. - Fix some sanity checks in the SMP context switch code and implement a stubbed SMP case. - Define SYNCH_LEVEL in asm.h and use it in HAL's KeRaiseIrqlToSynchLevel. To try the MP kernel on UP (it does not work on multiple processors yet) compile ntkrnlmp, rename it to ntoskrnl and add it to your installation. This requires a HAL with CONFIG_SMP enabled in HAL's spinlock.c and irq.S. Booting with the MP kernel does not work because of a weird regression introduced sometime in the last few months -- it appears MmProbeAndLockPages fails for a user mode stack pointer (no, I have no idea why). Modified: trunk/reactos/hal/halx86/generic/irq.S trunk/reactos/hal/halx86/generic/spinlock.c trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/include/internal/ke.h trunk/reactos/ntoskrnl/include/internal/ke_x.h trunk/reactos/ntoskrnl/ke/dpc.c trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/spinlock.c trunk/reactos/ntoskrnl/ke/thrdschd.c trunk/reactos/ntoskrnl/ntoskrnl.pspec Modified: trunk/reactos/hal/halx86/generic/irq.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/irq.S?r… ============================================================================== --- trunk/reactos/hal/halx86/generic/irq.S [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/irq.S [iso-8859-1] Wed Sep 30 22:30:57 2009 @@ -6,6 +6,9 @@ */ /* INCLUDES ******************************************************************/ + +/* Enable this (and the define in spinlock.c) to make UP HAL work for MP Kernel */ +/* #define CONFIG_SMP */ #include <asm.h> #include <internal/i386/asmmacro.S> @@ -600,20 +603,20 @@ cli /* Mask out interrupts */ - mov eax, KiI8259MaskTable[DISPATCH_LEVEL*4] + mov eax, KiI8259MaskTable[SYNCH_LEVEL*4] or eax, PCR[KPCR_IDR] out 0x21, al shr eax, 8 out 0xA1, al - /* Return the old IRQL, enable interrupts and set to DISPATCH */ + /* Return the old IRQL, enable interrupts and set to SYNCH */ mov eax, PCR[KPCR_IRQL] - mov dword ptr PCR[KPCR_IRQL], DISPATCH_LEVEL + mov dword ptr PCR[KPCR_IRQL], SYNCH_LEVEL popf #if DBG /* Validate raise */ - cmp eax, DISPATCH_LEVEL + cmp eax, SYNCH_LEVEL ja InvalidSyRaise #endif @@ -625,7 +628,7 @@ /* Bugcheck the system */ push 2 push 0 - push DISPATCH_LEVEL + push SYNCH_LEVEL push eax push IRQL_NOT_GREATER_OR_EQUAL call _KeBugCheckEx@20 Modified: trunk/reactos/hal/halx86/generic/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/spinloc… ============================================================================== --- trunk/reactos/hal/halx86/generic/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic/spinlock.c [iso-8859-1] Wed Sep 30 22:30:57 2009 @@ -8,28 +8,322 @@ /* INCLUDES ******************************************************************/ +/* Enable this (and the define in irq.S) to make UP HAL work for MP Kernel */ +/* #define CONFIG_SMP */ + #include <hal.h> #define NDEBUG #include <debug.h> #undef KeAcquireSpinLock #undef KeReleaseSpinLock -#undef KeLowerIrql + +// +// This is duplicated from ke_x.h +// +#ifdef CONFIG_SMP +// +// Spinlock Acquisition at IRQL >= DISPATCH_LEVEL +// +FORCEINLINE +VOID +KxAcquireSpinLock(IN PKSPIN_LOCK SpinLock) +{ + /* Make sure that we don't own the lock already */ + if (((KSPIN_LOCK)KeGetCurrentThread() | 1) == *SpinLock) + { + /* We do, bugcheck! */ + KeBugCheckEx(SPIN_LOCK_ALREADY_OWNED, (ULONG_PTR)SpinLock, 0, 0, 0); + } + + for (;;) + { + /* Try to acquire it */ + if (InterlockedBitTestAndSet((PLONG)SpinLock, 0)) + { + /* Value changed... wait until it's locked */ + while (*(volatile KSPIN_LOCK *)SpinLock == 1) + { +#ifdef DBG + /* On debug builds, we use a much slower but useful routine */ + //Kii386SpinOnSpinLock(SpinLock, 5); + + /* FIXME: Do normal yield for now */ + YieldProcessor(); +#else + /* Otherwise, just yield and keep looping */ + YieldProcessor(); +#endif + } + } + else + { +#ifdef DBG + /* On debug builds, we OR in the KTHREAD */ + *SpinLock = (KSPIN_LOCK)KeGetCurrentThread() | 1; +#endif + /* All is well, break out */ + break; + } + } +} + +// +// Spinlock Release at IRQL >= DISPATCH_LEVEL +// +FORCEINLINE +VOID +KxReleaseSpinLock(IN PKSPIN_LOCK SpinLock) +{ +#ifdef DBG + /* Make sure that the threads match */ + if (((KSPIN_LOCK)KeGetCurrentThread() | 1) != *SpinLock) + { + /* They don't, bugcheck */ + KeBugCheckEx(SPIN_LOCK_NOT_OWNED, (ULONG_PTR)SpinLock, 0, 0, 0); + } +#endif + /* Clear the lock */ + InterlockedAnd((PLONG)SpinLock, 0); +} + +#else + +// +// Spinlock Acquire at IRQL >= DISPATCH_LEVEL +// +FORCEINLINE +VOID +KxAcquireSpinLock(IN PKSPIN_LOCK SpinLock) +{ + /* On UP builds, spinlocks don't exist at IRQL >= DISPATCH */ + UNREFERENCED_PARAMETER(SpinLock); +} + +// +// Spinlock Release at IRQL >= DISPATCH_LEVEL +// +FORCEINLINE +VOID +KxReleaseSpinLock(IN PKSPIN_LOCK SpinLock) +{ + /* On UP builds, spinlocks don't exist at IRQL >= DISPATCH */ + UNREFERENCED_PARAMETER(SpinLock); +} + +#endif + +/* FUNCTIONS *****************************************************************/ + +/* + * @implemented + */ +VOID +NTAPI +KeAcquireSpinLock(PKSPIN_LOCK SpinLock, + PKIRQL OldIrql) +{ + /* Call the fastcall function */ + *OldIrql = KfAcquireSpinLock(SpinLock); +} + +/* + * @implemented + */ +KIRQL +FASTCALL +KeAcquireSpinLockRaiseToSynch(PKSPIN_LOCK SpinLock) +{ + KIRQL OldIrql; + + /* Raise to sync */ + KeRaiseIrql(SYNCH_LEVEL, &OldIrql); + + /* Acquire the lock and return */ + KxAcquireSpinLock(SpinLock); + return OldIrql; +} + +/* + * @implemented + */ +VOID +NTAPI +KeReleaseSpinLock(PKSPIN_LOCK SpinLock, + KIRQL NewIrql) +{ + /* Call the fastcall function */ + KfReleaseSpinLock(SpinLock, NewIrql); +} + +/* + * @implemented + */ +KIRQL +FASTCALL +KfAcquireSpinLock(PKSPIN_LOCK SpinLock) +{ + KIRQL OldIrql; + + /* Raise to dispatch and acquire the lock */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + KxAcquireSpinLock(SpinLock); + return OldIrql; +} + +/* + * @implemented + */ +VOID +FASTCALL +KfReleaseSpinLock(PKSPIN_LOCK SpinLock, + KIRQL OldIrql) +{ + /* Release the lock and lower IRQL back */ + KxReleaseSpinLock(SpinLock); + KeLowerIrql(OldIrql); +} + +/* + * @implemented + */ +KIRQL +FASTCALL +KeAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber) +{ + KIRQL OldIrql; + + /* Raise to dispatch */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + + /* Acquire the lock */ + KxAcquireSpinLock(KeGetCurrentPrcb()->LockQueue[LockNumber].Lock); // HACK + return OldIrql; +} + +/* + * @implemented + */ +KIRQL +FASTCALL +KeAcquireQueuedSpinLockRaiseToSynch(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber) +{ + KIRQL OldIrql; + + /* Raise to synch */ + KeRaiseIrql(SYNCH_LEVEL, &OldIrql); + + /* Acquire the lock */ + KxAcquireSpinLock(KeGetCurrentPrcb()->LockQueue[LockNumber].Lock); // HACK + return OldIrql; +} + +/* + * @implemented + */ +VOID +FASTCALL +KeAcquireInStackQueuedSpinLock(IN PKSPIN_LOCK SpinLock, + IN PKLOCK_QUEUE_HANDLE LockHandle) +{ + /* Set up the lock */ + LockHandle->LockQueue.Next = NULL; + LockHandle->LockQueue.Lock = SpinLock; + + /* Raise to dispatch */ + KeRaiseIrql(DISPATCH_LEVEL, &LockHandle->OldIrql); + + /* Acquire the lock */ + KxAcquireSpinLock(LockHandle->LockQueue.Lock); // HACK +} + +/* + * @implemented + */ +VOID +FASTCALL +KeAcquireInStackQueuedSpinLockRaiseToSynch(IN PKSPIN_LOCK SpinLock, + IN PKLOCK_QUEUE_HANDLE LockHandle) +{ + /* Set up the lock */ + LockHandle->LockQueue.Next = NULL; + LockHandle->LockQueue.Lock = SpinLock; + + /* Raise to synch */ + KeRaiseIrql(SYNCH_LEVEL, &LockHandle->OldIrql); + + /* Acquire the lock */ + KxAcquireSpinLock(LockHandle->LockQueue.Lock); // HACK +} + +/* + * @implemented + */ +VOID +FASTCALL +KeReleaseQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, + IN KIRQL OldIrql) +{ + /* Release the lock */ + KxReleaseSpinLock(KeGetCurrentPrcb()->LockQueue[LockNumber].Lock); // HACK + + /* Lower IRQL back */ + KeLowerIrql(OldIrql); +} + +/* + * @implemented + */ +VOID +FASTCALL +KeReleaseInStackQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle) +{ + /* Simply lower IRQL back */ + KxReleaseSpinLock(LockHandle->LockQueue.Lock); // HACK + KeLowerIrql(LockHandle->OldIrql); +} + +/* + * @implemented + */ +BOOLEAN +FASTCALL +KeTryToAcquireQueuedSpinLockRaiseToSynch(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, + IN PKIRQL OldIrql) +{ +#ifdef CONFIG_SMP + ASSERT(FALSE); // FIXME: Unused + while (TRUE); +#endif + + /* Simply raise to synch */ + KeRaiseIrql(SYNCH_LEVEL, OldIrql); + + /* Always return true on UP Machines */ + return TRUE; +} + +/* + * @implemented + */ +LOGICAL +FASTCALL +KeTryToAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, + OUT PKIRQL OldIrql) +{ +#ifdef CONFIG_SMP + ASSERT(FALSE); // FIXME: Unused + while (TRUE); +#endif + + /* Simply raise to dispatch */ + KeRaiseIrql(DISPATCH_LEVEL, OldIrql); + + /* Always return true on UP Machines */ + return TRUE; +} + #undef KeRaiseIrql - -/* FUNCTIONS *****************************************************************/ - -/* - * @implemented - */ -VOID -NTAPI -KeLowerIrql(KIRQL NewIrql) -{ - /* Call the fastcall function */ - KfLowerIrql(NewIrql); -} - /* * @implemented */ @@ -42,161 +336,14 @@ *OldIrql = KfRaiseIrql(NewIrql); } +#undef KeLowerIrql /* * @implemented */ VOID NTAPI -KeAcquireSpinLock(PKSPIN_LOCK SpinLock, - PKIRQL OldIrql) +KeLowerIrql(KIRQL NewIrql) { /* Call the fastcall function */ - *OldIrql = KfAcquireSpinLock(SpinLock); -} - -/* - * @implemented - */ -KIRQL -FASTCALL -KeAcquireSpinLockRaiseToSynch(PKSPIN_LOCK SpinLock) -{ - /* Simply raise to dispatch */ - return KfRaiseIrql(DISPATCH_LEVEL); -} - -/* - * @implemented - */ -VOID -NTAPI -KeReleaseSpinLock(PKSPIN_LOCK SpinLock, - KIRQL NewIrql) -{ - /* Call the fastcall function */ - KfReleaseSpinLock(SpinLock, NewIrql); -} - -/* - * @implemented - */ -KIRQL -FASTCALL -KfAcquireSpinLock(PKSPIN_LOCK SpinLock) -{ - /* Simply raise to dispatch */ - return KfRaiseIrql(DISPATCH_LEVEL); -} - -/* - * @implemented - */ -VOID -FASTCALL -KfReleaseSpinLock(PKSPIN_LOCK SpinLock, - KIRQL OldIrql) -{ - /* Simply lower IRQL back */ - KfLowerIrql(OldIrql); -} - -/* - * @implemented - */ -KIRQL -FASTCALL -KeAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber) -{ - /* Simply raise to dispatch */ - return KfRaiseIrql(DISPATCH_LEVEL); -} - -/* - * @implemented - */ -KIRQL -FASTCALL -KeAcquireQueuedSpinLockRaiseToSynch(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber) -{ - /* Simply raise to dispatch */ - return KfRaiseIrql(DISPATCH_LEVEL); -} - -/* - * @implemented - */ -VOID -FASTCALL -KeAcquireInStackQueuedSpinLock(IN PKSPIN_LOCK SpinLock, - IN PKLOCK_QUEUE_HANDLE LockHandle) -{ - /* Simply raise to dispatch */ - LockHandle->OldIrql = KfRaiseIrql(DISPATCH_LEVEL); -} - -/* - * @implemented - */ -VOID -FASTCALL -KeAcquireInStackQueuedSpinLockRaiseToSynch(IN PKSPIN_LOCK SpinLock, - IN PKLOCK_QUEUE_HANDLE LockHandle) -{ - /* Simply raise to synch */ - LockHandle->OldIrql = KfRaiseIrql(SYNCH_LEVEL); -} - -/* - * @implemented - */ -VOID -FASTCALL -KeReleaseQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, - IN KIRQL OldIrql) -{ - /* Simply lower IRQL back */ - KfLowerIrql(OldIrql); -} - -/* - * @implemented - */ -VOID -FASTCALL -KeReleaseInStackQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle) -{ - /* Simply lower IRQL back */ - KfLowerIrql(LockHandle->OldIrql); -} - -/* - * @implemented - */ -BOOLEAN -FASTCALL -KeTryToAcquireQueuedSpinLockRaiseToSynch(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, - IN PKIRQL OldIrql) -{ - /* Simply raise to dispatch */ - *OldIrql = KfRaiseIrql(DISPATCH_LEVEL); - - /* Always return true on UP Machines */ - return TRUE; -} - -/* - * @implemented - */ -LOGICAL -FASTCALL -KeTryToAcquireQueuedSpinLock(IN KSPIN_LOCK_QUEUE_NUMBER LockNumber, - OUT PKIRQL OldIrql) -{ - /* Simply raise to dispatch */ - *OldIrql = KfRaiseIrql(DISPATCH_LEVEL); - - /* Always return true on UP Machines */ - return TRUE; -} - -/* EOF */ + KfLowerIrql(NewIrql); +} Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=4324… ============================================================================== --- trunk/reactos/include/ndk/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/asm.h [iso-8859-1] Wed Sep 30 22:30:57 2009 @@ -568,7 +568,21 @@ #define APC_LEVEL 0x1 #define DISPATCH_LEVEL 0x2 #define CLOCK2_LEVEL 0x1C +#define IPI_LEVEL 0x1D #define HIGH_LEVEL 0x1F + +// +// Synchronization-level IRQL +// +#ifndef CONFIG_SMP +#define SYNCH_LEVEL DISPATCH_LEVEL +#else +#if (NTDDI_VERSION < NTDDI_WS03) +#define SYNCH_LEVEL (IPI_LEVEL - 0x1) +#else +#define SYNCH_LEVEL (IPI_LEVEL - 0x2) +#endif +#endif // // Quantum Decrements Modified: trunk/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke.h [iso-8859-1] Wed Sep 30 22:30:57 2009 @@ -245,7 +245,7 @@ KiExitDispatcher(KIRQL OldIrql); VOID -NTAPI +FASTCALL KiDeferredReadyThread(IN PKTHREAD Thread); PKTHREAD Modified: trunk/reactos/ntoskrnl/include/internal/ke_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ke_x.h [iso-8859-1] Wed Sep 30 22:30:57 2009 @@ -437,12 +437,20 @@ VOID KxAcquireSpinLock(IN PKSPIN_LOCK SpinLock) { + /* Make sure that we don't own the lock already */ + if (((KSPIN_LOCK)KeGetCurrentThread() | 1) == *SpinLock) + { + /* We do, bugcheck! */ + KeBugCheckEx(SPIN_LOCK_ALREADY_OWNED, (ULONG_PTR)SpinLock, 0, 0, 0); + } + + /* Start acquire loop */ for (;;) { /* Try to acquire it */ if (InterlockedBitTestAndSet((PLONG)SpinLock, 0)) { - /* Value changed... wait until it's locked */ + /* Value changed... wait until it's unlocked */ while (*(volatile KSPIN_LOCK *)SpinLock == 1) { #if DBG @@ -553,7 +561,8 @@ KiAcquireDispatcherLockAtDpcLevel(VOID) { /* Acquire the dispatcher lock */ - KeAcquireQueuedSpinLockAtDpcLevel(LockQueueDispatcherLock); + KeAcquireQueuedSpinLockAtDpcLevel(&KeGetCurrentPrcb()-> + LockQueue[LockQueueDispatcherLock]); } FORCEINLINE @@ -561,11 +570,12 @@ KiReleaseDispatcherLockFromDpcLevel(VOID) { /* Release the dispatcher lock */ - KeReleaseQueuedSpinLockFromDpcLevel(LockQueueDispatcherLock); -} - -// -// This routine inserts a thread into the deferred ready list of the given CPU + KeReleaseQueuedSpinLockFromDpcLevel(&KeGetCurrentPrcb()-> + LockQueue[LockQueueDispatcherLock]); +} + +// +// This routine inserts a thread into the deferred ready list of the current CPU // FORCEINLINE VOID @@ -613,7 +623,7 @@ // This routine acquires the PRCB lock so that only one caller can touch // volatile PRCB data. // -// Since this is a simple optimized spin-lock, it must be be only acquired +// Since this is a simple optimized spin-lock, it must only be acquired // at dispatcher level or higher! // FORCEINLINE @@ -649,7 +659,8 @@ VOID KiReleasePrcbLock(IN PKPRCB Prcb) { - /* Make sure it's acquired! */ + /* Make sure we are above dispatch and the lock is acquired! */ + ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); ASSERT(Prcb->PrcbLock != 0); /* Release it */ @@ -696,6 +707,9 @@ VOID KiReleaseThreadLock(IN PKTHREAD Thread) { + /* Make sure we are still above dispatch */ + ASSERT(KeGetCurrentIrql() >= DISPATCH_LEVEL); + /* Release it */ InterlockedAnd((PLONG)&Thread->ThreadLock, 0); } @@ -729,10 +743,8 @@ VOID KiRundownThread(IN PKTHREAD Thread) { -#if defined(_M_IX86) || defined(_M_AMD64) - /* FIXME: TODO */ - ASSERTMSG("Not yet implemented\n", FALSE); -#endif + /* Nothing to do */ + return; } FORCEINLINE Modified: trunk/reactos/ntoskrnl/ke/dpc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/dpc.c?rev=4324… ============================================================================== --- trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/dpc.c [iso-8859-1] Wed Sep 30 22:30:57 2009 @@ -550,6 +550,9 @@ PKDEFERRED_ROUTINE DeferredRoutine; PVOID DeferredContext, SystemArgument1, SystemArgument2; ULONG_PTR TimerHand; +#ifdef CONFIG_SMP + KIRQL OldIrql; +#endif /* Get data and list variables before starting anything else */ DpcData = &Prcb->DpcData[DPC_NORMAL]; @@ -631,12 +634,23 @@ Prcb->DpcRoutineActive = FALSE; Prcb->DpcInterruptRequested = FALSE; +#ifdef CONFIG_SMP /* Check if we have deferred threads */ if (Prcb->DeferredReadyListHead.Next) { - /* FIXME: 2K3-style scheduling not implemeted */ - ASSERT(FALSE); - } + + /* Re-enable interrupts and raise to synch */ + _enable(); + OldIrql = KeRaiseIrqlToSynchLevel(); + + /* Process deferred threads */ + KiProcessDeferredReadyList(Prcb); + + /* Lower IRQL back and disable interrupts */ + KeLowerIrql(OldIrql); + _disable(); + } +#endif } while (DpcData->DpcQueueDepth != 0); } Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S [iso-8859-1] Wed Sep 30 22:30:57 2009 @@ -351,8 +351,8 @@ jz NotBusy pause jmp GetSwapLock -#endif NotBusy: +#endif /* Increase context switches (use ES for lazy load) */ inc dword ptr es:[ebx+KPCR_CONTEXT_SWITCHES] @@ -381,9 +381,9 @@ /* Check NPX State */ cmp byte ptr [edi+KTHREAD_NPX_STATE], NPX_STATE_LOADED jz NpxLoaded -#endif - SetStack: +#endif + /* Set new stack */ mov [edi+KTHREAD_KERNEL_STACK], esp @@ -423,7 +423,7 @@ test [ebp+KPROCESS_ACTIVE_PROCESSORS], ecx jz WrongActiveCpu test [eax+KPROCESS_ACTIVE_PROCESSORS], ecx - jz WrongActiveCpu + jnz WrongActiveCpu #endif #endif @@ -563,8 +563,29 @@ #ifdef CONFIG_SMP NpxLoaded: - /* FIXME: TODO */ - int 3 + /* Mask out FPU flags */ + and edx, ~(CR0_MP + CR0_EM + CR0_TS) + + /* Get the NPX Frame */ + mov ecx, [edi+KTHREAD_INITIAL_STACK] + sub ecx, NPX_FRAME_LENGTH + + /* Check if we have a new CR0 */ + cmp ebp, edx + jz Cr0Equal + + /* We do, update it */ + mov cr0, edx + mov ebp, edx + +Cr0Equal: + + /* Save the NPX State */ + fxsave [ecx] + mov byte ptr [edi+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED + + /* Clear the NPX Thread */ + mov dword ptr [ebx+KPCR_NPX_THREAD], 0 /* Jump back */ jmp SetStack @@ -762,7 +783,7 @@ #ifdef CONFIG_SMP SameThread: - /* Clear the next thread, and put the thready as ready after lock release */ + /* Clear the next thread, and put the thread as ready after lock release */ and dword ptr [ebx+KPCR_PRCB_NEXT_THREAD], 0 and dword ptr [ebx+KPCR_PRCB_PRCB_LOCK], 0 and byte ptr [edi+KTHREAD_STATE_], Ready @@ -837,9 +858,9 @@ /* Sanity check */ #if DBG - test dword ptr [edx+KPROCESS_ACTIVE_PROCESSORS], 0 + test [edx+KPROCESS_ACTIVE_PROCESSORS], ecx jz WrongCpu1 - test dword ptr [eax+KPROCESS_ACTIVE_PROCESSORS], 0 + test [eax+KPROCESS_ACTIVE_PROCESSORS], ecx jnz WrongCpu2 #endif #endif Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Wed Sep 30 22:30:57 2009 @@ -2736,11 +2736,25 @@ /* Go to DIRQL */ mov cl, [ebx+KINTERRUPT_SYNCHRONIZE_IRQL] call @KfRaiseIrql@4 + push eax + +#ifdef CONFIG_SMP + /* Acquire the interrupt spinlock FIXME: Write this in assembly */ + mov ecx, [ebx+KINTERRUPT_ACTUAL_LOCK] + call @KefAcquireSpinLockAtDpcLevel@4 +#endif /* Call the routine */ - push eax push [esp+20] call [esp+20] + +#ifdef CONFIG_SMP + /* Release the interrupt spinlock FIXME: Write this in assembly */ + push eax + mov ecx, [ebx+KINTERRUPT_ACTUAL_LOCK] + call @KefReleaseSpinLockFromDpcLevel@4 + pop eax +#endif /* Lower IRQL */ mov ebx, eax @@ -2752,3 +2766,32 @@ pop ebx ret 12 .endfunc + +/*++ + * Kii386SpinOnSpinLock + * + * FILLMEIN + * + * Params: + * SpinLock - FILLMEIN + * + * Flags - FILLMEIN + * + * Returns: + * None. + * + * Remarks: + * FILLMEIN + * + *--*/ +.globl _Kii386SpinOnSpinLock@8 +.func Kii386SpinOnSpinLock@8 +_Kii386SpinOnSpinLock@8: + +#ifdef CONFIG_SMP + /* FIXME: TODO */ + int 3 +#endif + + ret 8 +.endfunc Modified: trunk/reactos/ntoskrnl/ke/spinlock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/spinlock.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/spinlock.c [iso-8859-1] Wed Sep 30 22:30:57 2009 @@ -17,6 +17,11 @@ /* PRIVATE FUNCTIONS *********************************************************/ +#if 0 +// +// FIXME: The queued spinlock routines are broken. +// + VOID FASTCALL KeAcquireQueuedSpinLockAtDpcLevel(IN PKSPIN_LOCK_QUEUE LockHandle) @@ -84,6 +89,55 @@ #endif } +#else +// +// HACK: Hacked to work like normal spinlocks +// + +VOID +FASTCALL +KeAcquireQueuedSpinLockAtDpcLevel(IN PKSPIN_LOCK_QUEUE LockHandle) +{ +#ifdef CONFIG_SMP + /* Make sure we are at DPC or above! */ + if (KeGetCurrentIrql() < DISPATCH_LEVEL) + { + /* We aren't -- bugcheck */ + KeBugCheckEx(IRQL_NOT_GREATER_OR_EQUAL, + (ULONG_PTR)LockHandle->Lock, + KeGetCurrentIrql(), + 0, + 0); + } + + /* Do the inlined function */ + KxAcquireSpinLock(LockHandle->Lock); +#endif +} + +VOID +FASTCALL +KeReleaseQueuedSpinLockFromDpcLevel(IN PKSPIN_LOCK_QUEUE LockHandle) +{ +#ifdef CONFIG_SMP + /* Make sure we are at DPC or above! */ + if (KeGetCurrentIrql() < DISPATCH_LEVEL) + { + /* We aren't -- bugcheck */ + KeBugCheckEx(IRQL_NOT_GREATER_OR_EQUAL, + (ULONG_PTR)LockHandle->Lock, + KeGetCurrentIrql(), + 0, + 0); + } + + /* Do the inlined function */ + KxReleaseSpinLock(LockHandle->Lock); +#endif +} + +#endif + /* PUBLIC FUNCTIONS **********************************************************/ /* @@ -137,6 +191,17 @@ NTAPI KeAcquireSpinLockAtDpcLevel(IN PKSPIN_LOCK SpinLock) { + /* Make sure we are at DPC or above! */ + if (KeGetCurrentIrql() < DISPATCH_LEVEL) + { + /* We aren't -- bugcheck */ + KeBugCheckEx(IRQL_NOT_GREATER_OR_EQUAL, + (ULONG_PTR)SpinLock, + KeGetCurrentIrql(), + 0, + 0); + } + /* Do the inlined function */ KxAcquireSpinLock(SpinLock); } @@ -149,7 +214,18 @@ NTAPI KeReleaseSpinLockFromDpcLevel(IN PKSPIN_LOCK SpinLock) { - /* Do the lined function */ + /* Make sure we are at DPC or above! */ + if (KeGetCurrentIrql() < DISPATCH_LEVEL) + { + /* We aren't -- bugcheck */ + KeBugCheckEx(IRQL_NOT_GREATER_OR_EQUAL, + (ULONG_PTR)SpinLock, + KeGetCurrentIrql(), + 0, + 0); + } + + /* Do the inlined function */ KxReleaseSpinLock(SpinLock); } @@ -160,6 +236,17 @@ FASTCALL KefAcquireSpinLockAtDpcLevel(IN PKSPIN_LOCK SpinLock) { + /* Make sure we are at DPC or above! */ + if (KeGetCurrentIrql() < DISPATCH_LEVEL) + { + /* We aren't -- bugcheck */ + KeBugCheckEx(IRQL_NOT_GREATER_OR_EQUAL, + (ULONG_PTR)SpinLock, + KeGetCurrentIrql(), + 0, + 0); + } + /* Do the inlined function */ KxAcquireSpinLock(SpinLock); } @@ -171,7 +258,18 @@ FASTCALL KefReleaseSpinLockFromDpcLevel(IN PKSPIN_LOCK SpinLock) { - /* Do the lined function */ + /* Make sure we are at DPC or above! */ + if (KeGetCurrentIrql() < DISPATCH_LEVEL) + { + /* We aren't -- bugcheck */ + KeBugCheckEx(IRQL_NOT_GREATER_OR_EQUAL, + (ULONG_PTR)SpinLock, + KeGetCurrentIrql(), + 0, + 0); + } + + /* Do the inlined function */ KxReleaseSpinLock(SpinLock); } @@ -243,7 +341,23 @@ /* Set it up properly */ LockHandle->LockQueue.Next = NULL; LockHandle->LockQueue.Lock = SpinLock; +#if 0 KeAcquireQueuedSpinLockAtDpcLevel(LockHandle->LockQueue.Next); +#else + /* Make sure we are at DPC or above! */ + if (KeGetCurrentIrql() < DISPATCH_LEVEL) + { + /* We aren't -- bugcheck */ + KeBugCheckEx(IRQL_NOT_GREATER_OR_EQUAL, + (ULONG_PTR)LockHandle->LockQueue.Lock, + KeGetCurrentIrql(), + 0, + 0); + } + + /* Acquire the lock */ + KxAcquireSpinLock(LockHandle->LockQueue.Lock); // HACK +#endif #endif } @@ -255,8 +369,24 @@ KeReleaseInStackQueuedSpinLockFromDpcLevel(IN PKLOCK_QUEUE_HANDLE LockHandle) { #ifdef CONFIG_SMP +#if 0 /* Call the internal function */ KeReleaseQueuedSpinLockFromDpcLevel(LockHandle->LockQueue.Next); +#else + /* Make sure we are at DPC or above! */ + if (KeGetCurrentIrql() < DISPATCH_LEVEL) + { + /* We aren't -- bugcheck */ + KeBugCheckEx(IRQL_NOT_GREATER_OR_EQUAL, + (ULONG_PTR)LockHandle->LockQueue.Lock, + KeGetCurrentIrql(), + 0, + 0); + } + + /* Release the lock */ + KxReleaseSpinLock(LockHandle->LockQueue.Lock); // HACK +#endif #endif } @@ -324,5 +454,3 @@ /* Spinlock appears to be free */ return TRUE; } - -/* EOF */ Modified: trunk/reactos/ntoskrnl/ke/thrdschd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/thrdschd.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/thrdschd.c [iso-8859-1] Wed Sep 30 22:30:57 2009 @@ -24,7 +24,7 @@ KiIdleSchedule(IN PKPRCB Prcb) { /* FIXME: TODO */ - ASSERTMSG("Not yet implemented\n", FALSE); + ASSERTMSG("SMP: Not yet implemented\n", FALSE); return NULL; } @@ -32,8 +32,29 @@ FASTCALL KiProcessDeferredReadyList(IN PKPRCB Prcb) { - /* FIXME: TODO */ - ASSERTMSG("Not yet implemented\n", FALSE); + PSINGLE_LIST_ENTRY ListEntry; + PKTHREAD Thread; + + /* Make sure there is something on the ready list */ + ASSERT(Prcb->DeferredReadyListHead.Next != NULL); + + /* Get the first entry and clear the list */ + ListEntry = Prcb->DeferredReadyListHead.Next; + Prcb->DeferredReadyListHead.Next = NULL; + + /* Start processing loop */ + do + { + /* Get the thread and advance to the next entry */ + Thread = CONTAINING_RECORD(ListEntry, KTHREAD, SwapListEntry); + ListEntry = ListEntry->Next; + + /* Make the thread ready */ + KiDeferredReadyThread(Thread); + } while (ListEntry != NULL); + + /* Make sure the ready list is still empty */ + ASSERT(Prcb->DeferredReadyListHead.Next == NULL); } VOID @@ -46,7 +67,7 @@ } VOID -NTAPI +FASTCALL KiDeferredReadyThread(IN PKTHREAD Thread) { PKPRCB Prcb; @@ -191,9 +212,10 @@ OldPriority = Thread->Priority; Thread->Preempted = FALSE; - /* Queue the thread on CPU 0 and get the PRCB */ + /* Queue the thread on CPU 0 and get the PRCB and lock it */ Thread->NextProcessor = 0; Prcb = KiProcessorBlock[0]; + KiAcquirePrcbLock(Prcb); /* Check if we have an idle summary */ if (KiIdleSummary) @@ -202,6 +224,9 @@ KiIdleSummary = 0; Thread->State = Standby; Prcb->NextThread = Thread; + + /* Unlock the PRCB and return */ + KiReleasePrcbLock(Prcb); return; } @@ -300,6 +325,7 @@ Prcb->IdleSchedule = TRUE; /* FIXME: SMT support */ + ASSERTMSG("SMP: Not yet implemented\n", FALSE); } /* Sanity checks and return the thread */ Modified: trunk/reactos/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.pspec?re… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] Wed Sep 30 22:30:57 2009 @@ -718,7 +718,7 @@ @ fastcall KiReleaseSpinLock(ptr) @ cdecl KiUnexpectedInterrupt() #ifdef _M_IX86 -;Kii386SpinOnSpinLock +@ stdcall Kii386SpinOnSpinLock(ptr long) #endif @ stdcall LdrAccessResource(ptr ptr ptr ptr) @ stdcall LdrEnumResources(ptr ptr long ptr ptr)

1 0

[sginsberg] 43243: - ASSERT on NULL-frees
by sginsberg＠svn.reactos.org 30 Sep '09

30 Sep '09

Author: sginsberg Date: Wed Sep 30 21:29:08 2009 New Revision: 43243 URL: http://svn.reactos.org/svn/reactos?rev=43243&view=rev Log: - ASSERT on NULL-frees Modified: trunk/reactos/ntoskrnl/mm/pool.c Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=432… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Wed Sep 30 21:29:08 2009 @@ -294,10 +294,11 @@ else if (Block) ExFreeArmPoolWithTag(Block, Tag); else { - /* Warn only for NULL pointers */ + /* Only warn and break for NULL pointers */ if (Block == NULL) { DPRINT1("Warning: Trying to free a NULL pointer!\n"); + ASSERT(FALSE); return; }

1 0

[janderwald] 43242: - Several bugfixes for mixer source / destination line detection code - Fix a memory leak
by janderwald＠svn.reactos.org 30 Sep '09

30 Sep '09

Author: janderwald Date: Wed Sep 30 20:58:52 2009 New Revision: 43242 URL: http://svn.reactos.org/svn/reactos?rev=43242&view=rev Log: - Several bugfixes for mixer source / destination line detection code - Fix a memory leak Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c [iso-8859-1] Wed Sep 30 20:58:52 2009 @@ -166,6 +166,41 @@ return Status; } +ULONG +GetDeviceIndexFromPnpName( + IN PDEVICE_OBJECT DeviceObject, + LPWSTR Device) +{ + ULONG Count, Index; + LPWSTR DeviceName; + NTSTATUS Status; + + /* get device count */ + Count = GetSysAudioDeviceCount(DeviceObject); + + if (!Count) + return MAXULONG; + + for(Index = 0; Index < Count; Index++) + { + /* get device name */ + Status = GetSysAudioDevicePnpName(DeviceObject, Index, &DeviceName); + if (NT_SUCCESS(Status)) + { + if (!wcsicmp(Device, DeviceName)) + { + /* found device index */ + ExFreePool(DeviceName); + return Index; + } + ExFreePool(DeviceName); + } + } + + return MAXULONG; +} + + NTSTATUS OpenDevice( IN LPWSTR Device, @@ -453,7 +488,7 @@ /* first count all referenced nodes */ for(Index = 0; Index < MultipleItem->Count; Index++) { - //DPRINT1("FromPin %u FromNode %u ToPin %u ToNode %u\n", Connection->FromNodePin, Connection->FromNode, Connection->ToNodePin, Connection->ToNode); + //DbgPrint("FromPin %u FromNode %u ToPin %u ToNode %u\n", Connection->FromNodePin, Connection->FromNode, Connection->ToNodePin, Connection->ToNode); if (bNode) { if (bFrom) @@ -477,7 +512,7 @@ { if (bFrom) { - if (Connection->FromNodePin == NodeIndex) + if (Connection->FromNodePin == NodeIndex && Connection->FromNode == KSFILTER_NODE) { /* node id has a connection */ Count++; @@ -485,7 +520,7 @@ } else { - if (Connection->ToNodePin == NodeIndex) + if (Connection->ToNodePin == NodeIndex && Connection->ToNode == KSFILTER_NODE) { /* node id has a connection */ Count++; @@ -507,6 +542,9 @@ /* not enough memory */ return STATUS_INSUFFICIENT_RESOURCES; } + + /* clear node index array */ + RtlZeroMemory(Refs, Count * sizeof(ULONG)); Count = 0; Connection = (PKSTOPOLOGY_CONNECTION)(MultipleItem + 1); @@ -537,7 +575,7 @@ { if (bFrom) { - if (Connection->FromNodePin == NodeIndex) + if (Connection->FromNodePin == NodeIndex && Connection->FromNode == KSFILTER_NODE) { /* node id has a connection */ Refs[Count] = Index; @@ -546,7 +584,7 @@ } else { - if (Connection->ToNodePin == NodeIndex) + if (Connection->ToNodePin == NodeIndex && Connection->ToNode == KSFILTER_NODE) { /* node id has a connection */ Refs[Count] = Index; @@ -685,6 +723,7 @@ AddMixerSourceLine( IN OUT LPMIXER_INFO MixerInfo, IN PFILE_OBJECT FileObject, + IN ULONG DeviceIndex, IN ULONG PinId) { LPMIXERLINE_EXT SrcLine, DstLine; @@ -703,7 +742,7 @@ RtlZeroMemory(SrcLine, sizeof(MIXERLINE_EXT)); /* initialize mixer src line */ - SrcLine->FileObject = FileObject; + SrcLine->DeviceIndex = DeviceIndex; SrcLine->PinId = PinId; SrcLine->Line.cbStruct = sizeof(MIXERLINEW); @@ -812,6 +851,7 @@ AddMixerSourceLines( IN OUT LPMIXER_INFO MixerInfo, IN PFILE_OBJECT FileObject, + IN ULONG DeviceIndex, IN ULONG PinsCount, IN PULONG Pins) { @@ -822,7 +862,7 @@ { if (Pins[Index-1]) { - AddMixerSourceLine(MixerInfo, FileObject, Index-1); + AddMixerSourceLine(MixerInfo, FileObject, DeviceIndex, Index-1); } } return Status; @@ -833,11 +873,12 @@ NTSTATUS HandlePhysicalConnection( IN OUT LPMIXER_INFO MixerInfo, + IN PDEVICE_OBJECT DeviceObject, IN ULONG bInput, IN PKSPIN_PHYSICALCONNECTION OutConnection) { PULONG PinsRef = NULL, PinConnectionIndex = NULL, PinsSrcRef; - ULONG PinsRefCount, Index, PinConnectionIndexCount; + ULONG PinsRefCount, Index, PinConnectionIndexCount, DeviceIndex; NTSTATUS Status; HANDLE hDevice = NULL; PFILE_OBJECT FileObject = NULL; @@ -855,6 +896,9 @@ return Status; } + /* get device index */ + DeviceIndex = GetDeviceIndexFromPnpName(DeviceObject, OutConnection->SymbolicLinkName); + /* get connected filter pin count */ PinsRefCount = GetPinCount(FileObject); ASSERT(PinsRefCount); @@ -943,7 +987,7 @@ PinsSrcRef[OutConnection->Pin] = TRUE; } - Status = AddMixerSourceLines(MixerInfo, FileObject, PinsRefCount, PinsSrcRef); + Status = AddMixerSourceLines(MixerInfo, FileObject, DeviceIndex, PinsRefCount, PinsSrcRef); ExFreePool(MixerControls); ExFreePool(PinsSrcRef); @@ -1075,7 +1119,8 @@ Status = GetPhysicalConnection(FileObject, Index, &OutConnection); if (NT_SUCCESS(Status)) { - Status = HandlePhysicalConnection(MixerInfo, bInput, OutConnection); + Status = HandlePhysicalConnection(MixerInfo, DeviceObject, bInput, OutConnection); + ExFreePool(OutConnection); } } } @@ -1093,7 +1138,6 @@ HANDLE hDevice; PFILE_OBJECT FileObject; PKSMULTIPLE_ITEM NodeTypes, NodeConnections; - BOOL bCloseHandle; PWDMAUD_DEVICE_EXTENSION DeviceExtension; /* get device extension */ @@ -1151,7 +1195,6 @@ /* get num of pins */ PinCount = GetPinCount(FileObject); - bCloseHandle = TRUE; /* get the first available dac node index */ NodeIndex = GetNodeTypeIndex(NodeTypes, (LPGUID)&KSNODETYPE_DAC); if (NodeIndex != (ULONG)-1) @@ -1161,7 +1204,6 @@ { /* increment mixer offset */ Count++; - bCloseHandle = FALSE; } } @@ -1174,7 +1216,6 @@ { /* increment mixer offset */ Count++; - bCloseHandle = FALSE; } } @@ -1182,12 +1223,10 @@ ExFreePool(NodeTypes); ExFreePool(NodeConnections); - if (bCloseHandle) - { - /* close virtual audio device */ - ObDereferenceObject(FileObject); - ZwClose(hDevice); - } + /* close virtual audio device */ + ObDereferenceObject(FileObject); + ZwClose(hDevice); + } /* increment virtual audio device index */ Index++; Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h [iso-8859-1] Wed Sep 30 20:58:52 2009 @@ -37,7 +37,7 @@ { LIST_ENTRY Entry; ULONG PinId; - PFILE_OBJECT FileObject; + ULONG DeviceIndex; MIXERLINEW Line; LPMIXERCONTROLW LineControls; }MIXERLINE_EXT, *LPMIXERLINE_EXT;

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