Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dchapyshev] 41839: - Add user mode buffer probing for NtCreateKey, NtEnumerateKey, NtEnumerateValueKey, NtQueryKey, NtQueryValueKey
by dchapyshev＠svn.reactos.org 10 Jul '09

10 Jul '09

Author: dchapyshev Date: Fri Jul 10 14:02:37 2009 New Revision: 41839 URL: http://svn.reactos.org/svn/reactos?rev=41839&view=rev Log: - Add user mode buffer probing for NtCreateKey, NtEnumerateKey, NtEnumerateValueKey, NtQueryKey, NtQueryValueKey Modified: trunk/reactos/ntoskrnl/config/ntapi.c Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Fri Jul 10 14:02:37 2009 @@ -23,9 +23,9 @@ IN ACCESS_MASK DesiredAccess, IN POBJECT_ATTRIBUTES ObjectAttributes, IN ULONG TitleIndex, - IN PUNICODE_STRING Class, + IN PUNICODE_STRING Class OPTIONAL, IN ULONG CreateOptions, - OUT PULONG Disposition) + OUT PULONG Disposition OPTIONAL) { NTSTATUS Status = STATUS_SUCCESS; KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); @@ -58,6 +58,8 @@ ProbeForRead(ObjectAttributes, sizeof(OBJECT_ATTRIBUTES), sizeof(ULONG)); + + if (Disposition) ProbeForWriteUlong(Disposition); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -228,6 +230,7 @@ IN ULONG Length, OUT PULONG ResultLength) { + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status; PCM_KEY_BODY KeyObject; REG_ENUMERATE_KEY_INFORMATION EnumerateKeyInfo; @@ -254,6 +257,29 @@ NULL); if (!NT_SUCCESS(Status)) return Status; + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + ProbeForWriteUlong(ResultLength); + ProbeForWrite(KeyInformation, + Length, + sizeof(ULONG)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + /* Dereference and return status */ + ObDereferenceObject(KeyObject); + return Status; + } + } + /* Setup the callback */ PostOperationInfo.Object = (PVOID)KeyObject; EnumerateKeyInfo.Object = (PVOID)KeyObject; @@ -293,6 +319,7 @@ IN ULONG Length, OUT PULONG ResultLength) { + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status; PCM_KEY_BODY KeyObject; REG_ENUMERATE_VALUE_KEY_INFORMATION EnumerateValueKeyInfo; @@ -319,6 +346,29 @@ NULL); if (!NT_SUCCESS(Status)) return Status; + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + ProbeForWriteUlong(ResultLength); + ProbeForWrite(KeyValueInformation, + Length, + sizeof(ULONG)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + /* Dereference and return status */ + ObDereferenceObject(KeyObject); + return Status; + } + } + /* Setup the callback */ PostOperationInfo.Object = (PVOID)KeyObject; EnumerateValueKeyInfo.Object = (PVOID)KeyObject; @@ -358,6 +408,7 @@ IN ULONG Length, OUT PULONG ResultLength) { + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status; PCM_KEY_BODY KeyObject; REG_QUERY_KEY_INFORMATION QueryKeyInfo; @@ -414,6 +465,29 @@ /* Quit on failure */ if (!NT_SUCCESS(Status)) return Status; + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + ProbeForWriteUlong(ResultLength); + ProbeForWrite(KeyInformation, + Length, + sizeof(ULONG)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + /* Dereference and return status */ + ObDereferenceObject(KeyObject); + return Status; + } + } + /* Setup the callback */ PostOperationInfo.Object = (PVOID)KeyObject; QueryKeyInfo.Object = (PVOID)KeyObject; @@ -452,6 +526,7 @@ IN ULONG Length, OUT PULONG ResultLength) { + KPROCESSOR_MODE PreviousMode = ExGetPreviousMode(); NTSTATUS Status; PCM_KEY_BODY KeyObject; REG_QUERY_VALUE_KEY_INFORMATION QueryValueKeyInfo; @@ -469,6 +544,29 @@ (PVOID*)&KeyObject, NULL); if (!NT_SUCCESS(Status)) return Status; + + if (PreviousMode != KernelMode) + { + _SEH2_TRY + { + ProbeForWriteUlong(ResultLength); + ProbeForWrite(KeyValueInformation, + Length, + sizeof(ULONG)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + if (!NT_SUCCESS(Status)) + { + /* Dereference and return status */ + ObDereferenceObject(KeyObject); + return Status; + } + } /* Make sure the name is aligned properly */ if ((ValueNameCopy.Length & (sizeof(WCHAR) - 1)))

1 0

[cgutman] 41838: - Use the target hardware address to find the correct DHCP_ADAPTER for the received packet
by cgutman＠svn.reactos.org 10 Jul '09

10 Jul '09

Author: cgutman Date: Fri Jul 10 05:15:51 2009 New Revision: 41838 URL: http://svn.reactos.org/svn/reactos?rev=41838&view=rev Log: - Use the target hardware address to find the correct DHCP_ADAPTER for the received packet Modified: trunk/reactos/base/services/dhcp/adapter.c trunk/reactos/base/services/dhcp/dispatch.c trunk/reactos/base/services/dhcp/include/rosdhcp.h Modified: trunk/reactos/base/services/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/adapter… ============================================================================== --- trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] Fri Jul 10 05:15:51 2009 @@ -355,6 +355,23 @@ return NULL; } +PDHCP_ADAPTER AdapterFindByHardwareAddress( u_int8_t haddr[16], u_int8_t hlen ) { + PDHCP_ADAPTER Adapter; + PLIST_ENTRY ListEntry; + + for(ListEntry = AdapterList.Flink; + ListEntry != &AdapterList; + ListEntry = ListEntry->Flink) { + Adapter = CONTAINING_RECORD( ListEntry, DHCP_ADAPTER, ListEntry ); + if (Adapter->DhclientInfo.hw_address.hlen == hlen && + !memcmp(Adapter->DhclientInfo.hw_address.haddr, + haddr, + hlen)) return Adapter; + } + + return NULL; +} + PDHCP_ADAPTER AdapterGetFirst() { if( IsListEmpty( &AdapterList ) ) return NULL; else { return CONTAINING_RECORD Modified: trunk/reactos/base/services/dhcp/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/dispatc… ============================================================================== --- trunk/reactos/base/services/dhcp/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/dispatch.c [iso-8859-1] Fri Jul 10 05:15:51 2009 @@ -231,6 +231,7 @@ struct dhcp_packet packet; } u; struct interface_info *ip = l->local; + PDHCP_ADAPTER adapter; if ((result = receive_packet(ip, u.packbuf, sizeof(u), &from, &hfrom)) == -1) { @@ -257,7 +258,16 @@ ifrom.len = 4; memcpy(ifrom.iabuf, &from.sin_addr, ifrom.len); - (*bootp_packet_handler)(ip, &u.packet, result, + + adapter = AdapterFindByHardwareAddress(u.packet.chaddr, + u.packet.hlen); + + if (!adapter) { + warning("Discarding packet with a non-matching target physical address\n"); + return; + } + + (*bootp_packet_handler)(&adapter->DhclientInfo, &u.packet, result, from.sin_port, ifrom, &hfrom); } } Modified: trunk/reactos/base/services/dhcp/include/rosdhcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/include… ============================================================================== --- trunk/reactos/base/services/dhcp/include/rosdhcp.h [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/include/rosdhcp.h [iso-8859-1] Fri Jul 10 05:15:51 2009 @@ -76,6 +76,7 @@ extern PDHCP_ADAPTER AdapterGetNext(PDHCP_ADAPTER); extern PDHCP_ADAPTER AdapterFindIndex( unsigned int AdapterIndex ); extern PDHCP_ADAPTER AdapterFindInfo( struct interface_info *info ); +extern PDHCP_ADAPTER AdapterFindByHardwareAddress( u_int8_t haddr[16], u_int8_t hlen ); extern VOID ApiInit(); extern VOID ApiLock(); extern VOID ApiUnlock();

1 0

[sginsberg] 41837: - Fix a serious bug in KiDispatchException; DbgkForwardException got called with the SecondChance parameter set to FALSE when forwarding second chance exceptions to user mode debuggers! This bug, introduced in revision 23802, made second chance exceptions appear as first chance to user mode debuggers (meaning unhandled exceptions wouldn't get caught). Bug exposed by the ntdll winetest.
by sginsberg＠svn.reactos.org 10 Jul '09

10 Jul '09

Author: sginsberg Date: Fri Jul 10 05:06:09 2009 New Revision: 41837 URL: http://svn.reactos.org/svn/reactos?rev=41837&view=rev Log: - Fix a serious bug in KiDispatchException; DbgkForwardException got called with the SecondChance parameter set to FALSE when forwarding second chance exceptions to user mode debuggers! This bug, introduced in revision 23802, made second chance exceptions appear as first chance to user mode debuggers (meaning unhandled exceptions wouldn't get caught). Bug exposed by the ntdll winetest. Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/exp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c [iso-8859-1] Fri Jul 10 05:06:09 2009 @@ -1029,7 +1029,7 @@ } /* Try second chance */ - if (DbgkForwardException(ExceptionRecord, TRUE, FALSE)) + if (DbgkForwardException(ExceptionRecord, TRUE, TRUE)) { /* Handled, get out */ goto Exit;

1 0

[janderwald] 41836: - Remove obsolete DbgBreakPoint
by janderwald＠svn.reactos.org 09 Jul '09

09 Jul '09

Author: janderwald Date: Fri Jul 10 02:04:31 2009 New Revision: 41836 URL: http://svn.reactos.org/svn/reactos?rev=41836&view=rev Log: - Remove obsolete DbgBreakPoint Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] Fri Jul 10 02:04:31 2009 @@ -986,7 +986,6 @@ RtlStringFromGUID(&Property->Set, &GuidString); DPRINT1("Unhandeled property Set |%S| Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); - DbgBreakPoint(); RtlFreeUnicodeString(&GuidString); return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); }

1 0

[janderwald] 41835: - Fix a bug which was responsible for most audio-related crashes - Found by DosX (Gregor Schneider) - Fix memory leak See issue #4674 for more details.
by janderwald＠svn.reactos.org 09 Jul '09

09 Jul '09

Author: janderwald Date: Fri Jul 10 01:49:04 2009 New Revision: 41835 URL: http://svn.reactos.org/svn/reactos?rev=41835&view=rev Log: - Fix a bug which was responsible for most audio-related crashes - Found by DosX (Gregor Schneider) - Fix memory leak See issue #4674 for more details. Modified: trunk/reactos/drivers/ksfilter/ks/topology.c trunk/reactos/drivers/wdm/audio/sysaudio/control.c Modified: trunk/reactos/drivers/ksfilter/ks/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/topolo… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] Fri Jul 10 01:49:04 2009 @@ -19,7 +19,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING Name; - Name.Length = (wcslen(ObjectType) + 1) * sizeof(WCHAR) + CreateParametersSize; + Name.Length = Name.MaximumLength = (wcslen(ObjectType) + 1) * sizeof(WCHAR) + CreateParametersSize; Name.MaximumLength += sizeof(WCHAR); Name.Buffer = ExAllocatePool(NonPagedPool, Name.MaximumLength); @@ -52,8 +52,7 @@ NULL, IO_NO_PARAMETER_CHECKING | IO_FORCE_ACCESS_CHECK); - // HACK HACK HACK HACK - //ExFreePool(Name.Buffer); + ExFreePool(Name.Buffer); return Status; } Modified: trunk/reactos/drivers/wdm/audio/sysaudio/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/sysaudio… ============================================================================== --- trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/sysaudio/control.c [iso-8859-1] Fri Jul 10 01:49:04 2009 @@ -42,7 +42,7 @@ OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING Name; - Name.Length = (wcslen(ObjectType) + 1) * sizeof(WCHAR) + CreateParametersSize; + Name.Length = Name.MaximumLength = (wcslen(ObjectType) + 1) * sizeof(WCHAR) + CreateParametersSize; Name.MaximumLength += sizeof(WCHAR); Name.Buffer = ExAllocatePool(NonPagedPool, Name.MaximumLength); @@ -75,6 +75,8 @@ NULL, IO_NO_PARAMETER_CHECKING | IO_FORCE_ACCESS_CHECK); + ExFreePool(Name.Buffer); + return Status; } @@ -984,6 +986,7 @@ RtlStringFromGUID(&Property->Set, &GuidString); DPRINT1("Unhandeled property Set |%S| Id %u Flags %x\n", GuidString.Buffer, Property->Id, Property->Flags); + DbgBreakPoint(); RtlFreeUnicodeString(&GuidString); return SetIrpIoStatus(Irp, STATUS_UNSUCCESSFUL, 0); }

1 0

[tkreuzer] 41834: freeldr: Remove duplicated / unused files for amd64 architecture See issue #4672 for more details.
by tkreuzer＠svn.reactos.org 09 Jul '09

09 Jul '09

Author: tkreuzer Date: Fri Jul 10 01:41:58 2009 New Revision: 41834 URL: http://svn.reactos.org/svn/reactos?rev=41834&view=rev Log: freeldr: Remove duplicated / unused files for amd64 architecture See issue #4672 for more details. Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/amd64/hwacpi.c trunk/reactos/boot/freeldr/freeldr/arch/amd64/hwapm.c trunk/reactos/boot/freeldr/freeldr/arch/amd64/hwpci.c trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386disk.c trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386rtl.c trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386vid.c trunk/reactos/boot/freeldr/freeldr/arch/amd64/mach.c trunk/reactos/boot/freeldr/freeldr/arch/amd64/pccons.c trunk/reactos/boot/freeldr/freeldr/arch/amd64/pcdisk.c trunk/reactos/boot/freeldr/freeldr/arch/amd64/pcmem.c trunk/reactos/boot/freeldr/freeldr/arch/amd64/pcrtc.c trunk/reactos/boot/freeldr/freeldr/arch/amd64/pcvideo.c [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/hwacpi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/hwapm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/hwpci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386vid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/mach.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/pccons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/pcdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/pcmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/pcrtc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Removed: trunk/reactos/boot/freeldr/freeldr/arch/amd64/pcvideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/…

1 0

[cgutman] 41833: - Implement IOCTL_AFD_SET_INFO - We currently disregard the value of BlockingMode so this causes no behavior change
by cgutman＠svn.reactos.org 09 Jul '09

09 Jul '09

Author: cgutman Date: Thu Jul 9 20:47:11 2009 New Revision: 41833 URL: http://svn.reactos.org/svn/reactos?rev=41833&view=rev Log: - Implement IOCTL_AFD_SET_INFO - We currently disregard the value of BlockingMode so this causes no behavior change Modified: trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/include/afd.h Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Thu Jul 9 20:47:11 2009 @@ -67,6 +67,35 @@ AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); +} + +NTSTATUS NTAPI +AfdSetInfo( PDEVICE_OBJECT DeviceObject, PIRP Irp, + PIO_STACK_LOCATION IrpSp ) { + NTSTATUS Status = STATUS_SUCCESS; + PAFD_INFO InfoReq = IrpSp->Parameters.DeviceIoControl.Type3InputBuffer; + PFILE_OBJECT FileObject = IrpSp->FileObject; + PAFD_FCB FCB = FileObject->FsContext; + + if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); + + _SEH2_TRY { + switch (InfoReq->InformationClass) { + case AFD_INFO_BLOCKING_MODE: + AFD_DbgPrint(MID_TRACE,("Blocking mode set to %d\n", InfoReq->Information.Ulong)); + FCB->BlockingMode = InfoReq->Information.Ulong; + break; + default: + AFD_DbgPrint(MIN_TRACE,("Unknown request %d\n", InfoReq->InformationClass)); + break; + } + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + Status = STATUS_INVALID_PARAMETER; + } _SEH2_END; + + AFD_DbgPrint(MID_TRACE,("Returning %x\n", Status)); + + return UnlockAndMaybeComplete(FCB, Status, Irp, 0); } NTSTATUS NTAPI Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Thu Jul 9 20:47:11 2009 @@ -422,6 +422,9 @@ case IOCTL_AFD_GET_INFO: return AfdGetInfo( DeviceObject, Irp, IrpSp ); + case IOCTL_AFD_SET_INFO: + return AfdSetInfo( DeviceObject, Irp, IrpSp ); + case IOCTL_AFD_GET_CONTEXT: return AfdGetContext( DeviceObject, Irp, IrpSp ); @@ -445,10 +448,6 @@ case IOCTL_AFD_GET_TDI_HANDLES: AFD_DbgPrint(MIN_TRACE, ("IOCTL_AFD_GET_TDI_HANDLES\n")); - break; - - case IOCTL_AFD_SET_INFO: - AFD_DbgPrint(MIN_TRACE, ("IOCTL_AFD_SET_INFO\n")); break; case IOCTL_AFD_SET_CONNECT_DATA: Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Thu Jul 9 20:47:11 2009 @@ -178,7 +178,7 @@ typedef struct _AFD_FCB { BOOLEAN Locked, Critical, Overread; - UINT State, Flags; + UINT State, Flags, BlockingMode; KIRQL OldIrql; UINT LockCount; PVOID CurrentThread; @@ -237,6 +237,10 @@ PIO_STACK_LOCATION IrpSp ); NTSTATUS NTAPI +AfdSetInfo( PDEVICE_OBJECT DeviceObject, PIRP Irp, + PIO_STACK_LOCATION IrpSp ); + +NTSTATUS NTAPI AfdGetSockName( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp );

1 0

[cgutman] 41832: - Don't overwrite previously set flags
by cgutman＠svn.reactos.org 09 Jul '09

09 Jul '09

Author: cgutman Date: Thu Jul 9 19:55:29 2009 New Revision: 41832 URL: http://svn.reactos.org/svn/reactos?rev=41832&view=rev Log: - Don't overwrite previously set flags Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c Modified: trunk/reactos/dll/win32/msafd/misc/sndrcv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/sndrc… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/sndrcv.c [iso-8859-1] Thu Jul 9 19:55:29 2009 @@ -166,7 +166,7 @@ /* Using Overlapped Structure and a Completition Routine, so use an APC */ APCFunction = NULL; // should be a private io completition function inside us APCContext = lpCompletionRoutine; - RecvInfo.AfdFlags = AFD_SKIP_FIO; + RecvInfo.AfdFlags |= AFD_SKIP_FIO; } IOSB = (PIO_STATUS_BLOCK)&lpOverlapped->Internal; @@ -318,7 +318,7 @@ /* Using Overlapped Structure and a Completition Routine, so use an APC */ APCFunction = NULL; // should be a private io completition function inside us APCContext = lpCompletionRoutine; - RecvInfo.AfdFlags = AFD_SKIP_FIO; + RecvInfo.AfdFlags |= AFD_SKIP_FIO; } IOSB = (PIO_STATUS_BLOCK)&lpOverlapped->Internal; @@ -445,7 +445,7 @@ /* Using Overlapped Structure and a Completition Routine, so use an APC */ APCFunction = NULL; // should be a private io completition function inside us APCContext = lpCompletionRoutine; - SendInfo.AfdFlags = AFD_SKIP_FIO; + SendInfo.AfdFlags |= AFD_SKIP_FIO; } IOSB = (PIO_STATUS_BLOCK)&lpOverlapped->Internal; @@ -577,7 +577,7 @@ /* Using Overlapped Structure and a Completition Routine, so use an APC */ APCFunction = NULL; // should be a private io completition function inside us APCContext = lpCompletionRoutine; - SendInfo.AfdFlags = AFD_SKIP_FIO; + SendInfo.AfdFlags |= AFD_SKIP_FIO; } IOSB = (PIO_STATUS_BLOCK)&lpOverlapped->Internal;

1 0

[dgorbachev] 41831: Add an assertion. Bug #4670.
by dgorbachev＠svn.reactos.org 09 Jul '09

09 Jul '09

Author: dgorbachev Date: Thu Jul 9 18:56:59 2009 New Revision: 41831 URL: http://svn.reactos.org/svn/reactos?rev=41831&view=rev Log: Add an assertion. Bug #4670. Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Thu Jul 9 18:56:59 2009 @@ -733,6 +733,8 @@ { PWINDOW_OBJECT Child; + ASSERT(Window != Window->FirstChild); + Window->Wnd->WindowRect.left += MoveX; Window->Wnd->WindowRect.right += MoveX; Window->Wnd->WindowRect.top += MoveY;

1 0

[janderwald] 41830: - Fix a few bugs in the sample rate conversion code - Might fix playback for audio samples out of audio adapter supported range
by janderwald＠svn.reactos.org 09 Jul '09

09 Jul '09

Author: janderwald Date: Thu Jul 9 18:09:27 2009 New Revision: 41830 URL: http://svn.reactos.org/svn/reactos?rev=41830&view=rev Log: - Fix a few bugs in the sample rate conversion code - Might fix playback for audio samples out of audio adapter supported range Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c Modified: trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/filters/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/filters/kmixer/pin.c [iso-8859-1] Thu Jul 9 18:09:27 2009 @@ -34,6 +34,8 @@ DPRINT("PerformSampleRateConversion OldRate %u NewRate %u BytesPerSample %u NumChannels %u Irql %u\n", OldRate, NewRate, BytesPerSample, NumChannels, KeGetCurrentIrql()); + ASSERT(BytesPerSample == 1 || BytesPerSample == 2 || BytesPerSample == 4); + /* first acquire float save context */ Status = KeSaveFloatingPointState(&FloatSave); @@ -43,9 +45,9 @@ return Status; } - NumSamples = BufferLength / BytesPerSample; - - FloatIn = ExAllocatePool(NonPagedPool, NumSamples * sizeof(FLOAT)); + NumSamples = BufferLength / (BytesPerSample * NumChannels); + + FloatIn = ExAllocatePool(NonPagedPool, NumSamples * NumChannels * sizeof(FLOAT)); if (!FloatIn) { KeRestoreFloatingPointState(&FloatSave); @@ -54,7 +56,7 @@ NewSamples = lrintf(((FLOAT)NumSamples * ((FLOAT)NewRate / (FLOAT)OldRate))) + 2; - FloatOut = ExAllocatePool(NonPagedPool, NewSamples * sizeof(FLOAT)); + FloatOut = ExAllocatePool(NonPagedPool, NewSamples * NumChannels * sizeof(FLOAT)); if (!FloatOut) { ExFreePool(FloatIn); @@ -62,7 +64,7 @@ return STATUS_INSUFFICIENT_RESOURCES; } - ResultOut = ExAllocatePool(NonPagedPool, NewSamples * (BytesPerSample/8)); + ResultOut = ExAllocatePool(NonPagedPool, NewSamples * NumChannels * BytesPerSample); if (!FloatOut) { ExFreePool(FloatIn); @@ -83,31 +85,24 @@ } /* fixme use asm */ - if (BytesPerSample == 8) - { - for(Index = 0; Index < NumSamples; Index++) - FloatIn[Index] = (float)Buffer[Index]; - } - else if (BytesPerSample == 16) - { - PUSHORT Res = (PUSHORT)ResultOut; - for(Index = 0; Index < NumSamples; Index++) - FloatIn[Index] = (float)_byteswap_ushort(Res[Index]); - } - else - { - UNIMPLEMENTED - KeRestoreFloatingPointState(&FloatSave); - ExFreePool(FloatIn); - ExFreePool(FloatOut); - ExFreePool(ResultOut); - return STATUS_UNSUCCESSFUL; + if (BytesPerSample == 1) + { + for(Index = 0; Index < NumSamples * NumChannels; Index++) + FloatIn[Index] = (float)(Buffer[Index] / (1.0 * 0x80)); + } + else if (BytesPerSample == 2) + { + src_short_to_float_array((short*)Buffer, FloatIn, NumSamples * NumChannels); + } + else if (BytesPerSample == 4) + { + src_int_to_float_array((int*)Buffer, FloatIn, NumSamples * NumChannels); } Data.data_in = FloatIn; Data.data_out = FloatOut; - Data.input_frames = NumSamples / NumChannels; - Data.output_frames = NewSamples / NumChannels; + Data.input_frames = NumSamples; + Data.output_frames = NewSamples; Data.src_ratio = (double)NewRate / (double)OldRate; error = src_process(State, &Data); @@ -121,26 +116,33 @@ return STATUS_UNSUCCESSFUL; } - if (BytesPerSample == 8) - { + if (BytesPerSample == 1) + { + /* FIXME perform over/under clipping */ + for(Index = 0; Index < Data.output_frames_gen * NumChannels; Index++) - ResultOut[Index] = lrintf(FloatOut[Index]); - } - else if (BytesPerSample == 16) + ResultOut[Index] = (lrintf(FloatOut[Index]) >> 24); + } + else if (BytesPerSample == 2) { PUSHORT Res = (PUSHORT)ResultOut; - for(Index = 0; Index < Data.output_frames_gen * NumChannels; Index++) - Res[Index] = _byteswap_ushort(lrintf(FloatOut[Index])); - } + src_float_to_short_array(FloatIn, (short*)Res, Data.output_frames_gen * NumChannels); + } + else if (BytesPerSample == 4) + { + PULONG Res = (PULONG)ResultOut; + + src_float_to_int_array(FloatIn, (int*)Res, Data.output_frames_gen * NumChannels); + } + *Result = ResultOut; - *ResultLength = Data.output_frames_gen * (BytesPerSample/8) * NumChannels; + *ResultLength = Data.output_frames_gen * BytesPerSample * NumChannels; ExFreePool(FloatIn); ExFreePool(FloatOut); src_delete(State); KeRestoreFloatingPointState(&FloatSave); - return STATUS_SUCCESS; } @@ -654,7 +656,7 @@ StreamHeader->DataUsed, InputFormat->WaveFormatEx.nSamplesPerSec, OutputFormat->WaveFormatEx.nSamplesPerSec, - OutputFormat->WaveFormatEx.wBitsPerSample, + OutputFormat->WaveFormatEx.wBitsPerSample / 8, OutputFormat->WaveFormatEx.nChannels, &BufferOut, &BufferLength);

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