Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 42671: [win32k] EngCreateDeviceBitmap: handle failure of EngLockSurface. Found by Amine.
by tkreuzer＠svn.reactos.org 14 Aug '09

14 Aug '09

Author: tkreuzer Date: Sat Aug 15 00:08:15 2009 New Revision: 42671 URL: http://svn.reactos.org/svn/reactos?rev=42671&view=rev Log: [win32k] EngCreateDeviceBitmap: handle failure of EngLockSurface. Found by Amine. Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c Modified: trunk/reactos/subsystems/win32/win32k/eng/surface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/surface.c [iso-8859-1] Sat Aug 15 00:08:15 2009 @@ -191,6 +191,13 @@ } pso = EngLockSurface((HSURF)NewBitmap); + if (!pso) + { + DPRINT1("EngLockSurface failed on newly created bitmap!\n"); + GreDeleteObject(NewBitmap); + return NULL; + } + pso->dhsurf = dhsurf; EngUnlockSurface(pso);

1 0

[fireball] 42670: - Merge 42376-42400.
by fireball＠svn.reactos.org 14 Aug '09

14 Aug '09

Author: fireball Date: Fri Aug 14 22:21:33 2009 New Revision: 42670 URL: http://svn.reactos.org/svn/reactos?rev=42670&view=rev Log: - Merge 42376-42400. Added: branches/arwinss/reactos/base/applications/rapps/ (props changed) - copied from r42400, trunk/reactos/base/applications/rapps/ Removed: branches/arwinss/reactos/include/reactos/wine/dlgs.h branches/arwinss/reactos/include/reactos/wine/mmddk.h branches/arwinss/reactos/include/reactos/wine/mmsystem.h branches/arwinss/reactos/include/reactos/wine/prsht.h branches/arwinss/reactos/include/reactos/wine/sys/ branches/arwinss/reactos/include/reactos/wine/winnetwk.h branches/arwinss/reactos/include/reactos/wine/winnls.h branches/arwinss/reactos/include/reactos/wine/winnt.h branches/arwinss/reactos/include/reactos/wine/winspool.h branches/arwinss/reactos/include/reactos/wine/winuser.h branches/arwinss/reactos/lib/rtl/i386/random_asm.S branches/arwinss/reactos/lib/sdk/crt/stdlib/ecvtbuf.c Modified: branches/arwinss/reactos/ (props changed) branches/arwinss/reactos/base/applications/applications.rbuild branches/arwinss/reactos/base/applications/rapps/lang/ (props changed) branches/arwinss/reactos/base/applications/rapps/rapps/ (props changed) branches/arwinss/reactos/base/applications/rapps/res/ (props changed) branches/arwinss/reactos/base/applications/rapps/res/cats/ (props changed) branches/arwinss/reactos/base/services/dhcp/adapter.c branches/arwinss/reactos/dll/directx/dsound/dsound.rbuild branches/arwinss/reactos/dll/ntdll/def/ntdll_arm.def branches/arwinss/reactos/dll/ntdll/def/ntdll_i386.def branches/arwinss/reactos/dll/win32/comctl32/comctl32.rbuild branches/arwinss/reactos/dll/win32/comdlg32/comdlg32.rbuild branches/arwinss/reactos/dll/win32/cryptui/cryptui.rbuild branches/arwinss/reactos/dll/win32/dbghelp/dbghelp.rbuild branches/arwinss/reactos/dll/win32/kernel32/misc/ldr.c branches/arwinss/reactos/dll/win32/mciwave/mciwave.rbuild branches/arwinss/reactos/dll/win32/mpr/mpr.rbuild branches/arwinss/reactos/dll/win32/msvfw32/msvfw32.rbuild branches/arwinss/reactos/dll/win32/msxml3/msxml3.rbuild branches/arwinss/reactos/dll/win32/shell32/shell32.rbuild branches/arwinss/reactos/dll/win32/wininet/wininet.rbuild branches/arwinss/reactos/dll/win32/winmm/winmm.rbuild branches/arwinss/reactos/drivers/ksfilter/ks/api.c branches/arwinss/reactos/drivers/network/afd/afd/bind.c branches/arwinss/reactos/drivers/network/afd/afd/connect.c branches/arwinss/reactos/drivers/network/afd/afd/main.c branches/arwinss/reactos/drivers/network/afd/afd/tdi.c branches/arwinss/reactos/drivers/network/dd/pcnet/requests.c branches/arwinss/reactos/drivers/network/tcpip/include/fileobjs.h branches/arwinss/reactos/drivers/network/tcpip/include/lock.h branches/arwinss/reactos/drivers/network/tcpip/recmutex/recmutex.c branches/arwinss/reactos/drivers/network/tcpip/recmutex/recmutex.h branches/arwinss/reactos/drivers/network/tcpip/tcpip/fileobjs.c branches/arwinss/reactos/drivers/network/tcpip/tcpip/lock.c branches/arwinss/reactos/drivers/network/tcpip/tcpip/main.c branches/arwinss/reactos/include/psdk/ks.h branches/arwinss/reactos/include/psdk/mmddk.h branches/arwinss/reactos/include/psdk/mmsystem.h branches/arwinss/reactos/include/psdk/winnt.h branches/arwinss/reactos/include/reactos/wine/port.h branches/arwinss/reactos/lib/drivers/ip/network/ports.c branches/arwinss/reactos/lib/rtl/random.c branches/arwinss/reactos/lib/rtl/rtl.rbuild branches/arwinss/reactos/lib/sdk/crt/crt.rbuild branches/arwinss/reactos/lib/sdk/crt/stdio/lnx_sprintf.c branches/arwinss/reactos/lib/sdk/crt/stdlib/ecvt.c branches/arwinss/reactos/ntoskrnl/cc/copy.c branches/arwinss/reactos/tools/gendib/gendib.c branches/arwinss/reactos/tools/rsym/rsym.c (props changed) branches/arwinss/reactos/tools/rsym/rsym.h (props changed) branches/arwinss/reactos/tools/rsym/rsym.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym_common.c (props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arwinss/reactos/base/applications/applications.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/applicatio… Modified: branches/arwinss/reactos/base/services/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/services/d… Modified: branches/arwinss/reactos/dll/directx/dsound/dsound.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/directx/dso… Modified: branches/arwinss/reactos/dll/ntdll/def/ntdll_arm.def URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/ntdll/def/n… Modified: branches/arwinss/reactos/dll/ntdll/def/ntdll_i386.def URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/ntdll/def/n… Modified: branches/arwinss/reactos/dll/win32/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comct… Modified: branches/arwinss/reactos/dll/win32/comdlg32/comdlg32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/comdl… Modified: branches/arwinss/reactos/dll/win32/cryptui/cryptui.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/crypt… Modified: branches/arwinss/reactos/dll/win32/dbghelp/dbghelp.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/dbghe… Modified: branches/arwinss/reactos/dll/win32/kernel32/misc/ldr.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/kerne… Modified: branches/arwinss/reactos/dll/win32/mciwave/mciwave.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/mciwa… Modified: branches/arwinss/reactos/dll/win32/mpr/mpr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/mpr/m… Modified: branches/arwinss/reactos/dll/win32/msvfw32/msvfw32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/msvfw… Modified: branches/arwinss/reactos/dll/win32/msxml3/msxml3.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/msxml… Modified: branches/arwinss/reactos/dll/win32/shell32/shell32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/shell… Modified: branches/arwinss/reactos/dll/win32/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winin… Modified: branches/arwinss/reactos/dll/win32/winmm/winmm.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/winmm… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/dd/pcnet/requests.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/tcpip/include/fileobjs.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/tcpip/include/lock.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/tcpip/recmutex/recmutex.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/tcpip/recmutex/recmutex.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/tcpip/tcpip/lock.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/tcpip/tcpip/main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/ks… Modified: branches/arwinss/reactos/include/psdk/mmddk.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/mm… Modified: branches/arwinss/reactos/include/psdk/mmsystem.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/mm… Modified: branches/arwinss/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi… Removed: branches/arwinss/reactos/include/reactos/wine/dlgs.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Removed: branches/arwinss/reactos/include/reactos/wine/mmddk.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Removed: branches/arwinss/reactos/include/reactos/wine/mmsystem.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Modified: branches/arwinss/reactos/include/reactos/wine/port.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Removed: branches/arwinss/reactos/include/reactos/wine/prsht.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Removed: branches/arwinss/reactos/include/reactos/wine/winnetwk.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Removed: branches/arwinss/reactos/include/reactos/wine/winnls.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Removed: branches/arwinss/reactos/include/reactos/wine/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Removed: branches/arwinss/reactos/include/reactos/wine/winspool.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Removed: branches/arwinss/reactos/include/reactos/wine/winuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Modified: branches/arwinss/reactos/lib/drivers/ip/network/ports.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/ip/… Removed: branches/arwinss/reactos/lib/rtl/i386/random_asm.S URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/rtl/i386/ra… Modified: branches/arwinss/reactos/lib/rtl/random.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/rtl/random.… Modified: branches/arwinss/reactos/lib/rtl/rtl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/rtl/rtl.rbu… Modified: branches/arwinss/reactos/lib/sdk/crt/crt.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/sdk/crt/crt… Modified: branches/arwinss/reactos/lib/sdk/crt/stdio/lnx_sprintf.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/sdk/crt/std… Modified: branches/arwinss/reactos/lib/sdk/crt/stdlib/ecvt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/sdk/crt/std… Removed: branches/arwinss/reactos/lib/sdk/crt/stdlib/ecvtbuf.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/sdk/crt/std… Modified: branches/arwinss/reactos/ntoskrnl/cc/copy.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/cc/cop… Modified: branches/arwinss/reactos/tools/gendib/gendib.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/gendib/ge…

1 0

[janderwald] 42669: - Implement KsPropertyHandler, KsPropertyHandlerWithAllocator, KsFastPropertyHandler
by janderwald＠svn.reactos.org 14 Aug '09

14 Aug '09

Author: janderwald Date: Fri Aug 14 21:44:01 2009 New Revision: 42669 URL: http://svn.reactos.org/svn/reactos?rev=42669&view=rev Log: - Implement KsPropertyHandler, KsPropertyHandlerWithAllocator, KsFastPropertyHandler Modified: trunk/reactos/drivers/ksfilter/ks/filter.c trunk/reactos/drivers/ksfilter/ks/property.c Modified: trunk/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/filter… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/filter.c [iso-8859-1] Fri Aug 14 21:44:01 2009 @@ -637,57 +637,6 @@ } NTSTATUS -FindPropertyHandler( - IN PIO_STATUS_BLOCK IoStatus, - IN KSPROPERTY_SET * FilterPropertySet, - IN ULONG FilterPropertySetCount, - IN PKSPROPERTY Property, - IN ULONG InputBufferLength, - IN ULONG OutputBufferLength, - OUT PFNKSHANDLER *PropertyHandler) -{ - ULONG Index, ItemIndex; - - for(Index = 0; Index < FilterPropertySetCount; Index++) - { - if (IsEqualGUIDAligned(&Property->Set, FilterPropertySet[Index].Set)) - { - for(ItemIndex = 0; ItemIndex < FilterPropertySet[Index].PropertiesCount; ItemIndex++) - { - if (FilterPropertySet[Index].PropertyItem[ItemIndex].PropertyId == Property->Id) - { - if (Property->Flags & KSPROPERTY_TYPE_SET) - *PropertyHandler = FilterPropertySet[Index].PropertyItem[ItemIndex].SetPropertyHandler; - - if (Property->Flags & KSPROPERTY_TYPE_GET) - *PropertyHandler = FilterPropertySet[Index].PropertyItem[ItemIndex].GetPropertyHandler; - - if (FilterPropertySet[Index].PropertyItem[ItemIndex].MinProperty > InputBufferLength) - { - /* too small input buffer */ - IoStatus->Information = FilterPropertySet[Index].PropertyItem[ItemIndex].MinProperty; - IoStatus->Status = STATUS_BUFFER_TOO_SMALL; - return STATUS_BUFFER_TOO_SMALL; - } - - if (FilterPropertySet[Index].PropertyItem[ItemIndex].MinData > OutputBufferLength) - { - /* too small output buffer */ - IoStatus->Information = FilterPropertySet[Index].PropertyItem[ItemIndex].MinData; - IoStatus->Status = STATUS_BUFFER_TOO_SMALL; - return STATUS_BUFFER_TOO_SMALL; - } - return STATUS_SUCCESS; - } - } - } - } - return STATUS_UNSUCCESSFUL; -} - - - -NTSTATUS NTAPI IKsFilter_DispatchDeviceIoControl( IN PDEVICE_OBJECT DeviceObject, @@ -724,7 +673,7 @@ } /* find a supported property handler */ - Status = FindPropertyHandler(&Irp->IoStatus, FilterPropertySet, 2, IoStack->Parameters.DeviceIoControl.Type3InputBuffer, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength, &PropertyHandler); + Status = KsPropertyHandler(Irp, 2, FilterPropertySet); if (NT_SUCCESS(Status)) { KSPROPERTY_ITEM_IRP_STORAGE(Irp) = (PVOID)This; Modified: trunk/reactos/drivers/ksfilter/ks/property.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/proper… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/property.c [iso-8859-1] Fri Aug 14 21:44:01 2009 @@ -8,8 +8,129 @@ #include "priv.h" -/* - @unimplemented + +NTSTATUS +FindPropertyHandler( + IN PIO_STATUS_BLOCK IoStatus, + IN const KSPROPERTY_SET* PropertySet, + IN ULONG PropertySetCount, + IN PKSPROPERTY Property, + IN ULONG InputBufferLength, + IN ULONG OutputBufferLength, + OUT PFNKSHANDLER *PropertyHandler) +{ + ULONG Index, ItemIndex; + + for(Index = 0; Index < PropertySetCount; Index++) + { + if (IsEqualGUIDAligned(&Property->Set, PropertySet[Index].Set)) + { + for(ItemIndex = 0; ItemIndex < PropertySet[Index].PropertiesCount; ItemIndex++) + { + if (PropertySet[Index].PropertyItem[ItemIndex].PropertyId == Property->Id) + { + if (PropertySet[Index].PropertyItem[ItemIndex].MinProperty > InputBufferLength) + { + /* too small input buffer */ + IoStatus->Information = PropertySet[Index].PropertyItem[ItemIndex].MinProperty; + return STATUS_INVALID_PARAMETER; + } + + if (PropertySet[Index].PropertyItem[ItemIndex].MinData > OutputBufferLength) + { + /* too small output buffer */ + IoStatus->Information = PropertySet[Index].PropertyItem[ItemIndex].MinData; + return STATUS_BUFFER_TOO_SMALL; + } + + if (Property->Flags & KSPROPERTY_TYPE_SET) + *PropertyHandler = PropertySet[Index].PropertyItem[ItemIndex].SetPropertyHandler; + + if (Property->Flags & KSPROPERTY_TYPE_GET) + *PropertyHandler = PropertySet[Index].PropertyItem[ItemIndex].GetPropertyHandler; + + return STATUS_SUCCESS; + } + } + } + } + return STATUS_NOT_FOUND; +} + + +NTSTATUS +KspPropertyHandler( + IN PIRP Irp, + IN ULONG PropertySetsCount, + IN const KSPROPERTY_SET* PropertySet, + IN PFNKSALLOCATOR Allocator OPTIONAL, + IN ULONG PropertyItemSize OPTIONAL) +{ + PKSPROPERTY Property; + PIO_STACK_LOCATION IoStack; + NTSTATUS Status; + PFNKSHANDLER PropertyHandler; + + /* get current irp stack */ + IoStack = IoGetCurrentIrpStackLocation(Irp); + + /* check if inputbuffer at least holds KSPROPERTY item */ + if (IoStack->Parameters.DeviceIoControl.InputBufferLength < sizeof(KSPROPERTY)) + { + /* invalid parameter */ + Irp->IoStatus.Information = sizeof(KSPROPERTY); + return STATUS_INVALID_BUFFER_SIZE; + } + + /* FIXME probe the input / output buffer if from user mode */ + + + /* get input property request */ + Property = (PKSPROPERTY)IoStack->Parameters.DeviceIoControl.Type3InputBuffer; + + /* sanity check */ + ASSERT(PropertyItemSize == 0 || PropertyItemSize == sizeof(KSPROPERTY_ITEM)); + if (IsEqualGUIDAligned(&Property->Set, &KSPROPSETID_Topology)) + { + /* use KsTopologyPropertyHandler for this business */ + return STATUS_INVALID_PARAMETER; + } + + /* find the property handler */ + Status = FindPropertyHandler(&Irp->IoStatus, PropertySet, PropertySetsCount, Property, IoStack->Parameters.DeviceIoControl.InputBufferLength, IoStack->Parameters.DeviceIoControl.OutputBufferLength, &PropertyHandler); + + if (NT_SUCCESS(Status)) + { + /* call property handler */ + Status = PropertyHandler(Irp, Property, Irp->UserBuffer); + + if (Status == STATUS_BUFFER_TOO_SMALL) + { + /* output buffer is too small */ + if (Allocator) + { + /* allocate the requested amount */ + Status = Allocator(Irp, Irp->IoStatus.Information, FALSE); + + /* check if the block was allocated */ + if (!NT_SUCCESS(Status)) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* re-call property handler */ + Status = PropertyHandler(Irp, Property, Irp->UserBuffer); + } + } + } + + /* done */ + return Status; +} + +/* + @implemented */ KSDDKAPI NTSTATUS @@ -19,13 +140,12 @@ IN ULONG PropertySetsCount, IN const KSPROPERTY_SET* PropertySet) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} - - -/* - @unimplemented + return KspPropertyHandler(Irp, PropertySetsCount, PropertySet, NULL, 0); +} + + +/* + @implemented */ KSDDKAPI NTSTATUS @@ -37,9 +157,47 @@ IN PFNKSALLOCATOR Allocator OPTIONAL, IN ULONG PropertyItemSize OPTIONAL) { - UNIMPLEMENTED; - return STATUS_UNSUCCESSFUL; -} + return KspPropertyHandler(Irp, PropertySetsCount, PropertySet, Allocator, PropertyItemSize); +} + +NTSTATUS +FindFastPropertyHandler( + IN ULONG FastIoCount, + IN const KSFASTPROPERTY_ITEM * FastIoTable, + IN PKSPROPERTY PropertyId, + OUT PFNKSFASTHANDLER * FastPropertyHandler) +{ + ULONG Index; + + /* iterate through all items */ + for(Index = 0; Index < FastIoCount; Index++) + { + if (PropertyId->Id == FastIoTable[Index].PropertyId) + { + if (PropertyId->Flags & KSPROPERTY_TYPE_SET) + { + if (FastIoTable[Index].SetSupported) + { + *FastPropertyHandler = FastIoTable[Index].SetPropertyHandler; + return STATUS_SUCCESS; + } + } + + if (PropertyId->Flags & KSPROPERTY_TYPE_GET) + { + if (FastIoTable[Index].GetSupported) + { + *FastPropertyHandler = FastIoTable[Index].GetPropertyHandler; + return STATUS_SUCCESS; + } + } + } + + } + /* no fast property handler found */ + return STATUS_NOT_FOUND; +} + /* @unimplemented @@ -57,6 +215,68 @@ IN ULONG PropertySetsCount, IN const KSPROPERTY_SET* PropertySet) { - UNIMPLEMENTED; + KSPROPERTY PropRequest; + KPROCESSOR_MODE Mode; + NTSTATUS Status = STATUS_SUCCESS; + ULONG Index; + PFNKSFASTHANDLER FastPropertyHandler; + + if (PropertyLength < sizeof(KSPROPERTY)) + { + /* invalid request */ + return FALSE; + } + + /* get previous mode */ + Mode = ExGetPreviousMode(); + + if (Mode == KernelMode) + { + /* just copy it */ + RtlMoveMemory(&PropRequest, Property, sizeof(KSPROPERTY)); + } + else + { + /* need to probe the buffer */ + _SEH2_TRY + { + ProbeForRead(Property, sizeof(KSPROPERTY), sizeof(UCHAR)); + RtlMoveMemory(&PropRequest, Property, sizeof(KSPROPERTY)); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Exception, get the error code */ + Status = _SEH2_GetExceptionCode(); + }_SEH2_END; + + if (!NT_SUCCESS(Status)) + return FALSE; + } + + /* are there any property sets provided */ + if (PropertySetsCount) + { + /* iterate through all property sets count */ + Index = 0; + do + { + /* does the property id match */ + if (IsEqualGUIDAligned(PropertySet[Index].Set, &PropRequest.Set)) + { + /* try to find a fast property handler */ + Status = FindFastPropertyHandler(PropertySet[Index].FastIoCount, PropertySet[Index].FastIoTable, &PropRequest, &FastPropertyHandler); + + if (NT_SUCCESS(Status)) + { + /* call fast property handler */ + ASSERT(PropertyLength == sizeof(KSPROPERTY)); /* FIXME check if property length is bigger -> copy params */ + ASSERT(Mode == KernelMode); /* FIXME need to probe usermode output buffer */ + return FastPropertyHandler(FileObject, &PropRequest, sizeof(KSPROPERTY), Data, DataLength, IoStatus); + } + } + /* move to next item */ + Index++; + }while(Index < PropertySetsCount); + } return FALSE; }

1 0

[fireball] 42668: - Merge 42350-42376.
by fireball＠svn.reactos.org 14 Aug '09

14 Aug '09

Author: fireball Date: Fri Aug 14 21:36:55 2009 New Revision: 42668 URL: http://svn.reactos.org/svn/reactos?rev=42668&view=rev Log: - Merge 42350-42376. Added: branches/arwinss/reactos/include/ddk/swenum.h - copied unchanged from r42375, trunk/reactos/include/ddk/swenum.h Modified: branches/arwinss/reactos/ (props changed) branches/arwinss/reactos/ReactOS-generic.rbuild branches/arwinss/reactos/base/applications/network/ping/ping.c branches/arwinss/reactos/base/applications/paint/drawing.c branches/arwinss/reactos/base/applications/paint/winproc.c branches/arwinss/reactos/base/setup/reactos/reactos.c branches/arwinss/reactos/dll/cpl/mmsys/volume.c branches/arwinss/reactos/dll/win32/gdiplus/graphicspath.c branches/arwinss/reactos/dll/win32/kernel32/kernel32.rbuild branches/arwinss/reactos/drivers/network/afd/afd/tdi.c branches/arwinss/reactos/drivers/network/dd/pcnet/pcnet.c branches/arwinss/reactos/drivers/network/tcpip/tcpip/fileobjs.c branches/arwinss/reactos/drivers/storage/class/ramdisk/ramdisk.c branches/arwinss/reactos/include/ddk/strmini.h branches/arwinss/reactos/lib/3rdparty/mingw/gs_support.c branches/arwinss/reactos/lib/drivers/ip/network/address.c branches/arwinss/reactos/lib/drivers/ip/network/interface.c branches/arwinss/reactos/lib/drivers/ip/network/neighbor.c branches/arwinss/reactos/lib/drivers/ip/transport/datagram/datagram.c branches/arwinss/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c branches/arwinss/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c branches/arwinss/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c branches/arwinss/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/header.c branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c branches/arwinss/reactos/lib/sdk/crt/mbstring/mbslwr.c branches/arwinss/reactos/lib/sdk/crt/stdio/stat64.c branches/arwinss/reactos/ntoskrnl/ke/freeldr.c branches/arwinss/reactos/ntoskrnl/ke/i386/kiinit.c branches/arwinss/reactos/tools/rsym/rsym.c (props changed) branches/arwinss/reactos/tools/rsym/rsym.h (props changed) branches/arwinss/reactos/tools/rsym/rsym.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym_common.c (props changed) Propchange: branches/arwinss/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 14 21:36:55 2009 @@ -1,1 +1,1 @@ -/trunk/reactos:42000-42350,42376,42419 +/trunk/reactos:42000-42376,42419 Modified: branches/arwinss/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ReactOS-generic… ============================================================================== --- branches/arwinss/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/ReactOS-generic.rbuild [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -95,6 +95,7 @@ <group compilerset="msc"> <define name="inline" compiler="cc">__inline</define> + <define name="__STDC__" compiler="cc">1</define> <compilerflag>/Zl</compilerflag> <compilerflag>/Zi</compilerflag> <compilerflag>/W1</compilerflag> Modified: branches/arwinss/reactos/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/applicatio… ============================================================================== --- branches/arwinss/reactos/base/applications/network/ping/ping.c [iso-8859-1] (original) +++ branches/arwinss/reactos/base/applications/network/ping/ping.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -437,6 +437,14 @@ return FALSE; } + if (from->sin_addr.s_addr != Target.sin_addr.s_addr) + { +#ifndef NDEBUG + printf("Bad source address (%s should be %s)\n", inet_ntoa(from->sin_addr), inet_ntoa(Target.sin_addr)); +#endif /* !NDEBUG */ + return FALSE; + } + QueryTime(&LargeTime); RelativeTime.QuadPart = (LargeTime.QuadPart - Icmp->Timestamp.QuadPart); @@ -543,44 +551,40 @@ Timeval.tv_sec = Timeout / 1000; Timeval.tv_usec = Timeout % 1000; - Status = select(0, &Fds, NULL, NULL, &Timeval); - if ((Status != SOCKET_ERROR) && (Status != 0)) - { - Length = sizeof(From); - Status = recvfrom(IcmpSock, Buffer, Size, 0, &From, &Length); + do { + Status = select(0, &Fds, NULL, NULL, &Timeval); + if ((Status != SOCKET_ERROR) && (Status != 0)) + { + Length = sizeof(From); + Status = recvfrom(IcmpSock, Buffer, Size, 0, &From, &Length); #ifndef NDEBUG - printf("Received packet\n"); - DisplayBuffer(Buffer, Status); - printf("\n"); + printf("Received packet\n"); + DisplayBuffer(Buffer, Status); + printf("\n"); #endif /* !NDEBUG */ - } - else - LostCount++; - if (Status == SOCKET_ERROR) - { - if (WSAGetLastError() != WSAETIMEDOUT) - { - printf("Could not receive data (%d).\n", WSAGetLastError()); + } + else + LostCount++; + if (Status == SOCKET_ERROR) + { + if (WSAGetLastError() != WSAETIMEDOUT) + { + printf("Could not receive data (%d).\n", WSAGetLastError()); + GlobalFree(Buffer); + return FALSE; + } + Status = 0; + } + + if (Status == 0) + { + printf("Request timed out.\n"); GlobalFree(Buffer); - return FALSE; - } - Status = 0; - } - - if (Status == 0) - { - printf("Request timed out.\n"); - GlobalFree(Buffer); - return TRUE; - } - - if (!DecodeResponse(Buffer, Status, (PSOCKADDR_IN)&From)) - { - /* FIXME: Wait again as it could be another ICMP message type */ - printf("Request timed out (incomplete datagram received).\n"); - LostCount++; - } + return TRUE; + } + + } while (!DecodeResponse(Buffer, Status, (PSOCKADDR_IN)&From)); GlobalFree(Buffer); return TRUE; Modified: branches/arwinss/reactos/base/applications/paint/drawing.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/applicatio… ============================================================================== --- branches/arwinss/reactos/base/applications/paint/drawing.c [iso-8859-1] (original) +++ branches/arwinss/reactos/base/applications/paint/drawing.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -81,12 +81,13 @@ void Bezier(HDC hdc, POINT p1, POINT p2, POINT p3, POINT p4, int color, int thickness) { + HPEN oldPen; POINT fourPoints[4]; fourPoints[0] = p1; fourPoints[1] = p2; fourPoints[2] = p3; fourPoints[3] = p4; - HPEN oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, color)); + oldPen = SelectObject(hdc, CreatePen(PS_SOLID, thickness, color)); PolyBezier(hdc, fourPoints, 4); DeleteObject(SelectObject(hdc, oldPen)); } Modified: branches/arwinss/reactos/base/applications/paint/winproc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/applicatio… ============================================================================== --- branches/arwinss/reactos/base/applications/paint/winproc.c [iso-8859-1] (original) +++ branches/arwinss/reactos/base/applications/paint/winproc.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -313,8 +313,9 @@ if (hwnd==hwndMiniature) { long mclient[4]; + HDC hdc; GetClientRect(hwndMiniature, (LPRECT)&mclient); - HDC hdc = GetDC(hwndMiniature); + hdc = GetDC(hwndMiniature); BitBlt(hdc, -min(imgXRes*GetScrollPos(hScrollbox, SB_HORZ)/10000, imgXRes-mclient[2]), -min(imgYRes*GetScrollPos(hScrollbox, SB_VERT)/10000, imgYRes-mclient[3]), imgXRes, imgYRes, hDrawingDC, 0, 0, SRCCOPY); ReleaseDC(hwndMiniature, hdc); Modified: branches/arwinss/reactos/base/setup/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/setup/reac… ============================================================================== --- branches/arwinss/reactos/base/setup/reactos/reactos.c [iso-8859-1] (original) +++ branches/arwinss/reactos/base/setup/reactos/reactos.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -364,8 +364,9 @@ if (tindex != CB_ERR) { + WORD LangID; SetupData.SelectedLangId = SendMessage(hList, CB_GETITEMDATA, (WPARAM) tindex, (LPARAM) 0); - WORD LangID = _tcstol(SetupData.pLanguages[SetupData.SelectedLangId].LangId, NULL, 16); + LangID = _tcstol(SetupData.pLanguages[SetupData.SelectedLangId].LangId, NULL, 16); SetThreadLocale(MAKELCID(LangID, SORT_DEFAULT)); // FIXME: need to reload all resource to force // the new language setting Modified: branches/arwinss/reactos/dll/cpl/mmsys/volume.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/cpl/mmsys/v… ============================================================================== --- branches/arwinss/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/cpl/mmsys/volume.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -292,9 +292,9 @@ LPARAM lParam) { static IMGINFO ImgInfo; + PGLOBAL_DATA pGlobalData; UNREFERENCED_PARAMETER(lParam); UNREFERENCED_PARAMETER(wParam); - PGLOBAL_DATA pGlobalData; pGlobalData = (PGLOBAL_DATA)GetWindowLongPtr(hwndDlg, DWLP_USER); Modified: branches/arwinss/reactos/dll/win32/gdiplus/graphicspath.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/gdipl… ============================================================================== --- branches/arwinss/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/gdiplus/graphicspath.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -775,7 +775,7 @@ TRACE("(%p, %d, %d, %d, %d, %.2f, %.2f)\n", path, x, y, width, height, startAngle, sweepAngle); - return GdipAddPathPieI(path, (REAL)x, (REAL)y, (REAL)width, (REAL)height, startAngle, sweepAngle); + return GdipAddPathPie(path, (REAL)x, (REAL)y, (REAL)width, (REAL)height, startAngle, sweepAngle); } GpStatus WINGDIPAPI GdipAddPathPolygon(GpPath *path, GDIPCONST GpPointF *points, INT count) Modified: branches/arwinss/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/kerne… ============================================================================== --- branches/arwinss/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/kernel32/kernel32.rbuild [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -1,155 +1,144 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd"> -<group> - <module name="kernel32_base" type="objectlibrary" crt="dll"> - <include base="kernel32_base">.</include> - <include base="kernel32_base">include</include> - <include base="ReactOS">include/reactos/subsys</include> - <define name="_KERNEL32_" /> - <redefine name="_WIN32_WINNT">0x0600</redefine> - <define name="__NO_CTYPE_INLINES" /> - <define name="NTDDI_VERSION">0x05020100</define> - <dependency>errcodes</dependency> -  - <group compilerset="gcc"> -  - <compilerflag>-fno-unit-at-a-time</compilerflag> - <compilerflag compiler="cxx">-fno-exceptions</compilerflag> - <compilerflag compiler="cxx">-fno-rtti</compilerflag> - </group> - <directory name="debug"> - <file>debugger.c</file> - <file>output.c</file> - </directory> - <directory name="except"> - <file>except.c</file> - </directory> - <directory name="file"> - <file>backup.c</file> - <file>bintype.c</file> - <file>cnotify.c</file> - <file>copy.c</file> - <file>create.c</file> - <file>curdir.c</file> - <file>delete.c</file> - <file>deviceio.c</file> - <file>dir.c</file> - <file>dosdev.c</file> - <file>file.c</file> - <file>find.c</file> - <file>hardlink.c</file> - <file>iocompl.c</file> - <file>lfile.c</file> - <file>lock.c</file> - <file>mailslot.c</file> - <file>move.c</file> - <file>npipe.c</file> - <file>pipe.c</file> - <file>rw.c</file> - <file>tape.c</file> - <file>volume.c</file> - </directory> - <directory name="mem"> - <file>global.c</file> - <file>heap.c</file> - <file>isbad.c</file> - <file>local.c</file> - <file>procmem.c</file> - <file>resnotify.c</file> - <file>section.c</file> - <file>virtual.c</file> - </directory> - <directory name="misc"> - <file>actctx.c</file> - <file>atom.c</file> - <file>chartype.c</file> - <file>collation.c</file> - <file>casemap.c</file> - <file>comm.c</file> - <file>commdcb.c</file> - <file>computername.c</file> - <file>console.c</file> - <file>dllmain.c</file> - <file>env.c</file> - <file>error.c</file> - <file>errormsg.c</file> - <file>fold.c</file> - <file>handle.c</file> - <file>lang.c</file> - <file>ldr.c</file> - <file>lzexpand.c</file> - <file>muldiv.c</file> - <file>nls.c</file> - <file>perfcnt.c</file> - <file>power.c</file> - <file>recovery.c</file> - <file>res.c</file> - <file>sortkey.c</file> - <file>stubs.c</file> - <file>sysinfo.c</file> - <file>time.c</file> - <file>timerqueue.c</file> - <file>toolhelp.c</file> - <file>version.c</file> - </directory> - <directory name="process"> - <file>cmdline.c</file> - <file>procsup.c</file> - <file>job.c</file> - <file>proc.c</file> - <file>session.c</file> - </directory> - <directory name="string"> - <file>lstring.c</file> - </directory> - <directory name="synch"> - <file>condvar.c</file> - <file>critical.c</file> - <file>event.c</file> - <file>mutex.c</file> - <file>sem.c</file> - <file>timer.c</file> - <file>wait.c</file> - </directory> - <directory name="thread"> - <file>fiber.c</file> - <file>fls.c</file> - <file>thread.c</file> - <file>tls.c</file> - </directory> - <directory name="misc"> - <file>lcformat.c</file> - <file>profile.c</file> - <file>utils.c</file> - </directory> - <directory name="thread"> - <if property="ARCH" value="i386"> - <directory name="i386"> - <file>fiber.S</file> - <file>thread.S</file> - </directory> - </if> - </directory> - - <directory name="misc"> - <file>icustubs.cpp</file> - </directory> - <library>normalize</library> - </module> - <module name="kernel32" type="win32dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll" crt="dll"> - <importlibrary definition="kernel32.pspec" /> - <include base="kernel32">.</include> - <include base="kernel32" root="intermediate">.</include> - <include base="kernel32">include</include> - <library>kernel32_base</library> - <library>wine</library> - <library>pseh</library> - <library>win32ksys</library> - - <file>kernel32.rc</file> - - <library>ntdll</library> - </module> -</group> +<module name="kernel32" type="win32dll" crt="dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll"> + <importlibrary definition="kernel32.pspec" /> + <include base="kernel32">.</include> + <include base="kernel32" root="intermediate">.</include> + <include base="kernel32">include</include> + <include base="ReactOS">include/reactos/subsys</include> + <library>wine</library> + <library>pseh</library> + <library>normalize</library> + <library>ntdll</library> + <define name="_KERNEL32_" /> + <redefine name="_WIN32_WINNT">0x0600</redefine> + <define name="__NO_CTYPE_INLINES" /> + <define name="NTDDI_VERSION">0x05020100</define> + <dependency>errcodes</dependency> +  + <group compilerset="gcc"> +  + <compilerflag>-fno-unit-at-a-time</compilerflag> + <compilerflag compiler="cxx">-fno-exceptions</compilerflag> + <compilerflag compiler="cxx">-fno-rtti</compilerflag> + </group> + <directory name="debug"> + <file>debugger.c</file> + <file>output.c</file> + </directory> + <directory name="except"> + <file>except.c</file> + </directory> + <directory name="file"> + <file>backup.c</file> + <file>bintype.c</file> + <file>cnotify.c</file> + <file>copy.c</file> + <file>create.c</file> + <file>curdir.c</file> + <file>delete.c</file> + <file>deviceio.c</file> + <file>dir.c</file> + <file>dosdev.c</file> + <file>file.c</file> + <file>find.c</file> + <file>hardlink.c</file> + <file>iocompl.c</file> + <file>lfile.c</file> + <file>lock.c</file> + <file>mailslot.c</file> + <file>move.c</file> + <file>npipe.c</file> + <file>pipe.c</file> + <file>rw.c</file> + <file>tape.c</file> + <file>volume.c</file> + </directory> + <directory name="mem"> + <file>global.c</file> + <file>heap.c</file> + <file>isbad.c</file> + <file>local.c</file> + <file>procmem.c</file> + <file>resnotify.c</file> + <file>section.c</file> + <file>virtual.c</file> + </directory> + <directory name="misc"> + <file>actctx.c</file> + <file>atom.c</file> + <file>chartype.c</file> + <file>collation.c</file> + <file>casemap.c</file> + <file>comm.c</file> + <file>commdcb.c</file> + <file>computername.c</file> + <file>console.c</file> + <file>dllmain.c</file> + <file>env.c</file> + <file>error.c</file> + <file>errormsg.c</file> + <file>fold.c</file> + <file>handle.c</file> + <file>lang.c</file> + <file>ldr.c</file> + <file>lzexpand.c</file> + <file>muldiv.c</file> + <file>nls.c</file> + <file>perfcnt.c</file> + <file>power.c</file> + <file>recovery.c</file> + <file>res.c</file> + <file>sortkey.c</file> + <file>stubs.c</file> + <file>sysinfo.c</file> + <file>time.c</file> + <file>timerqueue.c</file> + <file>toolhelp.c</file> + <file>version.c</file> + </directory> + <directory name="process"> + <file>cmdline.c</file> + <file>procsup.c</file> + <file>job.c</file> + <file>proc.c</file> + <file>session.c</file> + </directory> + <directory name="string"> + <file>lstring.c</file> + </directory> + <directory name="synch"> + <file>condvar.c</file> + <file>critical.c</file> + <file>event.c</file> + <file>mutex.c</file> + <file>sem.c</file> + <file>timer.c</file> + <file>wait.c</file> + </directory> + <directory name="thread"> + <file>fiber.c</file> + <file>fls.c</file> + <file>thread.c</file> + <file>tls.c</file> + </directory> + <directory name="misc"> + <file>lcformat.c</file> + <file>profile.c</file> + <file>utils.c</file> + </directory> + <directory name="thread"> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>fiber.S</file> + <file>thread.S</file> + </directory> + </if> + </directory> + <directory name="misc"> + <file>icustubs.cpp</file> + </directory> + <file>kernel32.rc</file> +</module> Modified: branches/arwinss/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… ============================================================================== --- branches/arwinss/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ branches/arwinss/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -154,23 +154,6 @@ } -NTSTATUS TdiCloseDevice( - HANDLE Handle, - PFILE_OBJECT FileObject) -{ - AFD_DbgPrint(MAX_TRACE, ("Called. Handle (0x%X) FileObject (0x%X)\n", - Handle, FileObject)); - - if (Handle) - ZwClose(Handle); - - if (FileObject) - ObDereferenceObject(FileObject); - - return STATUS_SUCCESS; -} - - NTSTATUS TdiOpenAddressFile( PUNICODE_STRING DeviceName, PTRANSPORT_ADDRESS Name, Modified: branches/arwinss/reactos/drivers/network/dd/pcnet/pcnet.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… ============================================================================== --- branches/arwinss/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) +++ branches/arwinss/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -1283,7 +1283,7 @@ { ULONG Data; - NdisRawWritePortUshort(Adapter->PortOffset + RAP, BCR4); + NdisRawWritePortUshort(Adapter->PortOffset + RAP, BCR6); NdisRawReadPortUshort(Adapter->PortOffset + BDP, &Data); return Data & BCR6_LEDOUT ? 100 : 10; Modified: branches/arwinss/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… ============================================================================== --- branches/arwinss/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ branches/arwinss/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -98,7 +98,8 @@ (Current->Protocol == SearchContext->Protocol) && (AddrIsEqual(IPAddress, SearchContext->Address) || AddrIsBroadcast(IPAddress, SearchContext->Address) || - AddrIsUnspecified(IPAddress))) { + AddrIsUnspecified(IPAddress) || + AddrIsUnspecified(SearchContext->Address))) { /* We've found a match */ Found = TRUE; break; @@ -139,25 +140,161 @@ } -VOID DeleteAddress(PADDRESS_FILE AddrFile) -/* - * FUNCTION: Deletes an address file object - * ARGUMENTS: - * AddrFile = Pointer to address file object to delete - */ +/* + * FUNCTION: Open an address file object + * ARGUMENTS: + * Request = Pointer to TDI request structure for this request + * Address = Pointer to address to be opened + * Protocol = Protocol on which to open the address + * Options = Pointer to option buffer + * RETURNS: + * Status of operation + */ +NTSTATUS FileOpenAddress( + PTDI_REQUEST Request, + PTA_IP_ADDRESS Address, + USHORT Protocol, + PVOID Options) +{ + IPv4_RAW_ADDRESS IPv4Address; + PADDRESS_FILE AddrFile; + + TI_DbgPrint(MID_TRACE, ("Called (Proto %d).\n", Protocol)); + + AddrFile = exAllocatePool(NonPagedPool, sizeof(ADDRESS_FILE)); + if (!AddrFile) { + TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + return STATUS_INSUFFICIENT_RESOURCES; + } + + TI_DbgPrint(DEBUG_ADDRFILE, ("Address file object allocated at (0x%X).\n", AddrFile)); + + RtlZeroMemory(AddrFile, sizeof(ADDRESS_FILE)); + + AddrFile->Free = AddrFileFree; + + /* Make sure address is a local unicast address or 0 */ + /* FIXME: IPv4 only */ + AddrFile->Family = Address->Address[0].AddressType; + IPv4Address = Address->Address[0].Address[0].in_addr; + if (IPv4Address != 0 && + !AddrLocateADEv4(IPv4Address, &AddrFile->Address)) { + exFreePool(AddrFile); + TI_DbgPrint(MIN_TRACE, ("Non-local address given (0x%X).\n", DN2H(IPv4Address))); + return STATUS_INVALID_PARAMETER; + } + else + { + /* Bound to the default address ... Copy the address type */ + AddrFile->Address.Type = IP_ADDRESS_V4; + } + + TI_DbgPrint(MID_TRACE, ("Opening address %s for communication (P=%d U=%d).\n", + A2S(&AddrFile->Address), Protocol, IPPROTO_UDP)); + + /* Protocol specific handling */ + switch (Protocol) { + case IPPROTO_TCP: + AddrFile->Port = + TCPAllocatePort(Address->Address[0].Address[0].sin_port); + + if ((Address->Address[0].Address[0].sin_port && + AddrFile->Port != Address->Address[0].Address[0].sin_port) || + AddrFile->Port == 0xffff) + { + exFreePool(AddrFile); + return STATUS_INVALID_PARAMETER; + } + + AddrFile->Send = NULL; /* TCPSendData */ + break; + + case IPPROTO_UDP: + TI_DbgPrint(MID_TRACE,("Allocating udp port\n")); + AddrFile->Port = + UDPAllocatePort(Address->Address[0].Address[0].sin_port); + + if ((Address->Address[0].Address[0].sin_port && + AddrFile->Port != Address->Address[0].Address[0].sin_port) || + AddrFile->Port == 0xffff) + { + exFreePool(AddrFile); + return STATUS_INVALID_PARAMETER; + } + + TI_DbgPrint(MID_TRACE,("Setting port %d (wanted %d)\n", + AddrFile->Port, + Address->Address[0].Address[0].sin_port)); + AddrFile->Send = UDPSendDatagram; + break; + + case IPPROTO_ICMP: + AddrFile->Port = 0; + AddrFile->Send = ICMPSendDatagram; + break; + + default: + /* Use raw IP for all other protocols */ + AddrFile->Port = 0; + AddrFile->Send = RawIPSendDatagram; + break; + } + + TI_DbgPrint(MID_TRACE, ("IP protocol number for address file object is %d.\n", + Protocol)); + + TI_DbgPrint(MID_TRACE, ("Port number for address file object is %d.\n", + WN2H(AddrFile->Port))); + + /* Set protocol */ + AddrFile->Protocol = Protocol; + + /* Initialize receive and transmit queues */ + InitializeListHead(&AddrFile->ReceiveQueue); + InitializeListHead(&AddrFile->TransmitQueue); + + /* Initialize spin lock that protects the address file object */ + KeInitializeSpinLock(&AddrFile->Lock); + + /* Set valid flag so the address can be used */ + AF_SET_VALID(AddrFile); + + /* Return address file object */ + Request->Handle.AddressHandle = AddrFile; + + /* Add address file to global list */ + ExInterlockedInsertTailList( + &AddressFileListHead, + &AddrFile->ListEntry, + &AddressFileListLock); + + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); + + return STATUS_SUCCESS; +} + + +/* + * FUNCTION: Closes an address file object + * ARGUMENTS: + * Request = Pointer to TDI request structure for this request + * RETURNS: + * Status of operation + */ +NTSTATUS FileCloseAddress( + PTDI_REQUEST Request) { KIRQL OldIrql; + PADDRESS_FILE AddrFile; + NTSTATUS Status = STATUS_SUCCESS; + PDATAGRAM_SEND_REQUEST SendRequest; + PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; PLIST_ENTRY CurrentEntry; PLIST_ENTRY NextEntry; - PDATAGRAM_SEND_REQUEST SendRequest; - PDATAGRAM_RECEIVE_REQUEST ReceiveRequest; TI_DbgPrint(MID_TRACE, ("Called.\n")); - /* Remove address file from the global list */ - TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); - RemoveEntryList(&AddrFile->ListEntry); - TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); + AddrFile = Request->Handle.AddressHandle; TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); @@ -197,143 +334,9 @@ TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); - (*AddrFile->Free)(AddrFile); - - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); -} - - -/* - * FUNCTION: Open an address file object - * ARGUMENTS: - * Request = Pointer to TDI request structure for this request - * Address = Pointer to address to be opened - * Protocol = Protocol on which to open the address - * Options = Pointer to option buffer - * RETURNS: - * Status of operation - */ -NTSTATUS FileOpenAddress( - PTDI_REQUEST Request, - PTA_IP_ADDRESS Address, - USHORT Protocol, - PVOID Options) -{ - IPv4_RAW_ADDRESS IPv4Address; - PADDRESS_FILE AddrFile; - - TI_DbgPrint(MID_TRACE, ("Called (Proto %d).\n", Protocol)); - - AddrFile = exAllocatePool(NonPagedPool, sizeof(ADDRESS_FILE)); - if (!AddrFile) { - TI_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - return STATUS_INSUFFICIENT_RESOURCES; - } - - TI_DbgPrint(DEBUG_ADDRFILE, ("Address file object allocated at (0x%X).\n", AddrFile)); - - RtlZeroMemory(AddrFile, sizeof(ADDRESS_FILE)); - - AddrFile->Free = AddrFileFree; - - /* Make sure address is a local unicast address or 0 */ - /* FIXME: IPv4 only */ - AddrFile->Family = Address->Address[0].AddressType; - IPv4Address = Address->Address[0].Address[0].in_addr; - if (IPv4Address != 0 && - !AddrLocateADEv4(IPv4Address, &AddrFile->Address)) { - exFreePool(AddrFile); - TI_DbgPrint(MIN_TRACE, ("Non-local address given (0x%X).\n", DN2H(IPv4Address))); - return STATUS_INVALID_PARAMETER; - } - else - { - /* Bound to the default address ... Copy the address type */ - AddrFile->Address.Type = IP_ADDRESS_V4; - } - - TI_DbgPrint(MID_TRACE, ("Opening address %s for communication (P=%d U=%d).\n", - A2S(&AddrFile->Address), Protocol, IPPROTO_UDP)); - - /* Protocol specific handling */ - switch (Protocol) { - case IPPROTO_TCP: - AddrFile->Port = - TCPAllocatePort(Address->Address[0].Address[0].sin_port); - - if ((Address->Address[0].Address[0].sin_port && - AddrFile->Port != Address->Address[0].Address[0].sin_port) || - AddrFile->Port == 0xffff) - { - exFreePool(AddrFile); - return STATUS_INVALID_PARAMETER; - } - - AddrFile->Send = NULL; /* TCPSendData */ - break; - - case IPPROTO_UDP: - TI_DbgPrint(MID_TRACE,("Allocating udp port\n")); - AddrFile->Port = - UDPAllocatePort(Address->Address[0].Address[0].sin_port); - - if ((Address->Address[0].Address[0].sin_port && - AddrFile->Port != Address->Address[0].Address[0].sin_port) || - AddrFile->Port == 0xffff) - { - exFreePool(AddrFile); - return STATUS_INVALID_PARAMETER; - } - - TI_DbgPrint(MID_TRACE,("Setting port %d (wanted %d)\n", - AddrFile->Port, - Address->Address[0].Address[0].sin_port)); - AddrFile->Send = UDPSendDatagram; - break; - - case IPPROTO_ICMP: - AddrFile->Port = 0; - AddrFile->Send = ICMPSendDatagram; - break; - - default: - /* Use raw IP for all other protocols */ - AddrFile->Port = 0; - AddrFile->Send = RawIPSendDatagram; - break; - } - - TI_DbgPrint(MID_TRACE, ("IP protocol number for address file object is %d.\n", - Protocol)); - - TI_DbgPrint(MID_TRACE, ("Port number for address file object is %d.\n", - WN2H(AddrFile->Port))); - - /* Set protocol */ - AddrFile->Protocol = Protocol; - - /* Initialize receive and transmit queues */ - InitializeListHead(&AddrFile->ReceiveQueue); - InitializeListHead(&AddrFile->TransmitQueue); - - /* Initialize spin lock that protects the address file object */ - KeInitializeSpinLock(&AddrFile->Lock); - - /* Set valid flag so the address can be used */ - AF_SET_VALID(AddrFile); - - /* Return address file object */ - Request->Handle.AddressHandle = AddrFile; - - /* Add address file to global list */ - ExInterlockedInsertTailList( - &AddressFileListHead, - &AddrFile->ListEntry, - &AddressFileListLock); - - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - - return STATUS_SUCCESS; + TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); + + return Status; } @@ -344,24 +347,21 @@ * RETURNS: * Status of operation */ -NTSTATUS FileCloseAddress( +NTSTATUS FileFreeAddress( PTDI_REQUEST Request) { - KIRQL OldIrql; PADDRESS_FILE AddrFile; NTSTATUS Status = STATUS_SUCCESS; + KIRQL OldIrql; + + AddrFile = Request->Handle.AddressHandle; TI_DbgPrint(MID_TRACE, ("Called.\n")); - AddrFile = Request->Handle.AddressHandle; - - TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); - - /* Set address file object exclusive to us */ - AF_SET_BUSY(AddrFile); - AF_CLR_VALID(AddrFile); - - TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); + /* Remove address file from the global list */ + TcpipAcquireSpinLock(&AddressFileListLock, &OldIrql); + RemoveEntryList(&AddrFile->ListEntry); + TcpipReleaseSpinLock(&AddressFileListLock, OldIrql); /* Protocol specific handling */ switch (AddrFile->Protocol) { @@ -380,30 +380,7 @@ break; } - TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); - - return Status; -} - - -/* - * FUNCTION: Closes an address file object - * ARGUMENTS: - * Request = Pointer to TDI request structure for this request - * RETURNS: - * Status of operation - */ -NTSTATUS FileFreeAddress( - PTDI_REQUEST Request) -{ - PADDRESS_FILE AddrFile; - NTSTATUS Status = STATUS_SUCCESS; - - AddrFile = Request->Handle.AddressHandle; - - TI_DbgPrint(MID_TRACE, ("Called.\n")); - - DeleteAddress(AddrFile); + (*AddrFile->Free)(AddrFile); TI_DbgPrint(MAX_TRACE, ("Leaving.\n")); Modified: branches/arwinss/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/storage… ============================================================================== --- branches/arwinss/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ branches/arwinss/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -1022,7 +1022,6 @@ Irp->IoStatus.Status = Status; Irp->IoStatus.Information = 0; IoCompleteRequest(Irp, IO_NO_INCREMENT); - return; } NTSTATUS Modified: branches/arwinss/reactos/include/ddk/strmini.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/str… ============================================================================== --- branches/arwinss/reactos/include/ddk/strmini.h [iso-8859-1] (original) +++ branches/arwinss/reactos/include/ddk/strmini.h [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -2,6 +2,7 @@ #define _STREAM_H #include <ntddk.h> +#include <windef.h> #include <ks.h> #define STREAMAPI __stdcall Modified: branches/arwinss/reactos/lib/3rdparty/mingw/gs_support.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/3rdparty/mi… ============================================================================== --- branches/arwinss/reactos/lib/3rdparty/mingw/gs_support.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/3rdparty/mingw/gs_support.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -108,12 +108,22 @@ else #endif { +#ifdef __GNUC__ #ifdef _WIN64 GS_ContextRecord.Rip = (ULONGLONG) __builtin_return_address (0); GS_ContextRecord.Rsp = (ULONGLONG) __builtin_frame_address (0) + 8; #else GS_ContextRecord.Eip = (DWORD) __builtin_return_address (0); GS_ContextRecord.Esp = (DWORD) __builtin_frame_address (0) + 4; +#endif +#else +#ifdef _WIN64 + GS_ContextRecord.Rip = (ULONGLONG) _ReturnAddress(); + GS_ContextRecord.Rsp = (ULONGLONG) _AddressOfReturnAddress(); +#else + GS_ContextRecord.Eip = (DWORD) _ReturnAddress(); + GS_ContextRecord.Esp = (DWORD) _AddressOfReturnAddress(); +#endif #endif } Modified: branches/arwinss/reactos/lib/drivers/ip/network/address.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/ip/… ============================================================================== --- branches/arwinss/reactos/lib/drivers/ip/network/address.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/drivers/ip/network/address.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -122,7 +122,8 @@ { switch (Address->Type) { case IP_ADDRESS_V4: - return (Address->Address.IPv4Address == 0); + return (Address->Address.IPv4Address == 0 || + Address->Address.IPv4Address == 0xFFFFFFFF); case IP_ADDRESS_V6: /* FIXME: IPv6 is not supported */ Modified: branches/arwinss/reactos/lib/drivers/ip/network/interface.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/ip/… ============================================================================== --- branches/arwinss/reactos/lib/drivers/ip/network/interface.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/drivers/ip/network/interface.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -152,6 +152,26 @@ return TRUE; } +static PIP_INTERFACE GetDefaultInterface(VOID) +{ + KIRQL OldIrql; + IF_LIST_ITER(CurrentIF); + + TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql); + ForEachInterface(CurrentIF) { + if (CurrentIF->Context) { + TcpipReleaseSpinLock(&InterfaceListLock, OldIrql); + return CurrentIF; + } + } EndFor(CurrentIF); + TcpipReleaseSpinLock(&InterfaceListLock, OldIrql); + + /* There are no physical interfaces on the system + * so we must pick the loopback interface */ + + return Loopback; +} + PIP_INTERFACE FindOnLinkInterface(PIP_ADDRESS Address) /* * FUNCTION: Checks all on-link prefixes to find out if an address is on-link @@ -166,6 +186,9 @@ TI_DbgPrint(DEBUG_ROUTER, ("Called. Address (0x%X)\n", Address)); TI_DbgPrint(DEBUG_ROUTER, ("Address (%s)\n", A2S(Address))); + + if (AddrIsUnspecified(Address)) + return GetDefaultInterface(); TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql); Modified: branches/arwinss/reactos/lib/drivers/ip/network/neighbor.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/ip/… ============================================================================== --- branches/arwinss/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/drivers/ip/network/neighbor.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -421,7 +421,8 @@ if (NCE == NULL) { TI_DbgPrint(MID_TRACE,("BCAST: %s\n", A2S(&Interface->Broadcast))); - if( AddrIsEqual(Address, &Interface->Broadcast) ) { + if( AddrIsEqual(Address, &Interface->Broadcast) || + AddrIsUnspecified(Address) ) { TI_DbgPrint(MID_TRACE,("Packet targeted at broadcast addr\n")); NCE = NBAddNeighbor(Interface, Address, NULL, Interface->AddressLength, NUD_CONNECTED); Modified: branches/arwinss/reactos/lib/drivers/ip/transport/datagram/datagram.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/ip/… ============================================================================== --- branches/arwinss/reactos/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/drivers/ip/transport/datagram/datagram.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -95,67 +95,60 @@ { PLIST_ENTRY CurrentEntry; PDATAGRAM_RECEIVE_REQUEST Current = NULL; - BOOLEAN Found; PTA_IP_ADDRESS RTAIPAddress; TI_DbgPrint(MAX_TRACE, ("There is a receive request.\n")); /* Search receive request list to find a match */ - Found = FALSE; CurrentEntry = AddrFile->ReceiveQueue.Flink; - while((CurrentEntry != &AddrFile->ReceiveQueue) && (!Found)) { + while(CurrentEntry != &AddrFile->ReceiveQueue) { Current = CONTAINING_RECORD(CurrentEntry, DATAGRAM_RECEIVE_REQUEST, ListEntry); - + CurrentEntry = CurrentEntry->Flink; if( DstPort == AddrFile->Port && (AddrIsEqual(DstAddress, &AddrFile->Address) || AddrIsUnspecified(&AddrFile->Address) || AddrIsUnspecified(DstAddress))) { - Found = TRUE; + /* Remove the request from the queue */ RemoveEntryList(&Current->ListEntry); - break; - } else { - CurrentEntry = CurrentEntry->Flink; + + TI_DbgPrint(MAX_TRACE, ("Suitable receive request found.\n")); + + TI_DbgPrint(MAX_TRACE, + ("Target Buffer: %x, Source Buffer: %x, Size %d\n", + Current->Buffer, DataBuffer, DataSize)); + + /* Copy the data into buffer provided by the user */ + RtlCopyMemory( Current->Buffer, + DataBuffer, + MIN(Current->BufferSize, DataSize) ); + + RTAIPAddress = (PTA_IP_ADDRESS)Current->ReturnInfo->RemoteAddress; + RTAIPAddress->TAAddressCount = 1; + RTAIPAddress->Address->AddressType = TDI_ADDRESS_TYPE_IP; + RTAIPAddress->Address->Address->sin_port = SrcPort; + + TI_DbgPrint(MAX_TRACE, ("(A: %08x) Addr %08x Port %04x\n", + RTAIPAddress, + SrcAddress->Address.IPv4Address, SrcPort)); + + RtlCopyMemory( &RTAIPAddress->Address->Address->in_addr, + &SrcAddress->Address.IPv4Address, + sizeof(SrcAddress->Address.IPv4Address) ); + + TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); + + /* Complete the receive request */ + if (Current->BufferSize < DataSize) + Current->Complete(Current->Context, STATUS_BUFFER_OVERFLOW, Current->BufferSize); + else + Current->Complete(Current->Context, STATUS_SUCCESS, DataSize); + + TcpipAcquireSpinLock(&AddrFile->Lock, &OldIrql); } } TcpipReleaseSpinLock(&AddrFile->Lock, OldIrql); - - if (Found) - { - TI_DbgPrint(MAX_TRACE, ("Suitable receive request found.\n")); - - TI_DbgPrint(MAX_TRACE, - ("Target Buffer: %x, Source Buffer: %x, Size %d\n", - Current->Buffer, DataBuffer, DataSize)); - - if (DataSize > Current->BufferSize) - { - Current->Complete(Current->Context, STATUS_BUFFER_TOO_SMALL, DataSize); - return; - } - - /* Copy the data into buffer provided by the user */ - RtlCopyMemory( Current->Buffer, - DataBuffer, - DataSize ); - - RTAIPAddress = (PTA_IP_ADDRESS)Current->ReturnInfo->RemoteAddress; - RTAIPAddress->TAAddressCount = 1; - RTAIPAddress->Address->AddressType = TDI_ADDRESS_TYPE_IP; - RTAIPAddress->Address->Address->sin_port = SrcPort; - - TI_DbgPrint(MAX_TRACE, ("(A: %08x) Addr %08x Port %04x\n", - RTAIPAddress, - SrcAddress->Address.IPv4Address, SrcPort)); - - RtlCopyMemory( &RTAIPAddress->Address->Address->in_addr, - &SrcAddress->Address.IPv4Address, - sizeof(SrcAddress->Address.IPv4Address) ); - - /* Complete the receive request */ - Current->Complete(Current->Context, STATUS_SUCCESS, DataSize); - } } else if (AddrFile->RegisteredReceiveDatagramHandler) { Modified: branches/arwinss/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/sou… ============================================================================== --- branches/arwinss/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/drivers/sound/mmebuddy/auxiliary/auxMessage.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -21,7 +21,8 @@ /* Standard MME driver entry-point for messages relating to auxiliary devices. */ -APIENTRY DWORD +DWORD +APIENTRY auxMessage( DWORD DeviceId, DWORD Message, Modified: branches/arwinss/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/sou… ============================================================================== --- branches/arwinss/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/drivers/sound/mmebuddy/midi/midMessage.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -21,7 +21,8 @@ /* Standard MME driver entry-point for messages relating to MIDI input. */ -APIENTRY DWORD +DWORD +APIENTRY midMessage( DWORD DeviceId, DWORD Message, Modified: branches/arwinss/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/sou… ============================================================================== --- branches/arwinss/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/drivers/sound/mmebuddy/midi/modMessage.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -21,7 +21,8 @@ /* Standard MME driver entry-point for messages relating to MIDI output. */ -APIENTRY DWORD +DWORD +APIENTRY modMessage( DWORD DeviceId, DWORD Message, Modified: branches/arwinss/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/sou… ============================================================================== --- branches/arwinss/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/drivers/sound/mmebuddy/mixer/mxdMessage.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -21,7 +21,8 @@ /* Standard MME driver entry-point for messages relating to mixers. */ -APIENTRY DWORD +DWORD +APIENTRY mxdMessage( DWORD DeviceId, DWORD Message, Modified: branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/header.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/sou… ============================================================================== --- branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/header.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -224,10 +224,10 @@ PSOUND_DEVICE_INSTANCE SoundDeviceInstance, IN PVOID Parameter) { + PWAVEHDR WaveHeader = (PWAVEHDR) Parameter; + VALIDATE_MMSYS_PARAMETER( SoundDeviceInstance ); VALIDATE_MMSYS_PARAMETER( Parameter ); - - PWAVEHDR WaveHeader = (PWAVEHDR) Parameter; /* Initialise */ WaveHeader->lpNext = NULL; Modified: branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/sou… ============================================================================== --- branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/widMessage.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -22,7 +22,8 @@ Standard MME driver entry-point for messages relating to wave audio input. */ -APIENTRY DWORD +DWORD +APIENTRY widMessage( DWORD DeviceId, DWORD Message, Modified: branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/sou… ============================================================================== --- branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/drivers/sound/mmebuddy/wave/wodMessage.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -31,7 +31,8 @@ Standard MME driver entry-point for messages relating to wave audio output. */ -APIENTRY DWORD +DWORD +APIENTRY wodMessage( DWORD DeviceId, DWORD Message, Modified: branches/arwinss/reactos/lib/sdk/crt/mbstring/mbslwr.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/sdk/crt/mbs… ============================================================================== --- branches/arwinss/reactos/lib/sdk/crt/mbstring/mbslwr.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/sdk/crt/mbstring/mbslwr.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -1,12 +1,10 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/sdk/crt/mbstring/ismbpun.c - * PURPOSE: - * PROGRAMER: - * UPDATE HISTORY: - * 05/30/08: Samuel Serapion adapted from PROJECT C Library - * + * FILE: lib/sdk/crt/mbstring/mbslwr.c + * PURPOSE: Multibyte lowercase functions + * PROGRAMER: Eric Kohl + * Samuel Serapion, adapted from PROJECT C Library */ #include <precomp.h> @@ -33,14 +31,24 @@ */ unsigned char * _mbslwr(unsigned char *x) { - unsigned char *y=x; + unsigned char *y=x; - while (*y) { - if (!_ismbblead(*y)) { + if (x == NULL) + { + return NULL; + } + + while (*y) + { + if (!_ismbblead(*y)) + { *y = tolower(*y); - } else { - *y=_mbctolower(*(unsigned short *)y); - y++; + y++; + } + else + { + *y = _mbctolower(*(unsigned short *)y); + y++; } } return x; Modified: branches/arwinss/reactos/lib/sdk/crt/stdio/stat64.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/sdk/crt/std… ============================================================================== --- branches/arwinss/reactos/lib/sdk/crt/stdio/stat64.c [iso-8859-1] (original) +++ branches/arwinss/reactos/lib/sdk/crt/stdio/stat64.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -128,9 +128,9 @@ _dosmaperr(ERROR_INVALID_PARAMETER); return -1; } - buf->st_mode = _S_IFREG | _S_IREAD; + buf->st_mode = _S_IFREG | ALL_S_IREAD; if (!(hfi.dwFileAttributes & FILE_ATTRIBUTE_READONLY)) - buf->st_mode |= _S_IWRITE; + buf->st_mode |= ALL_S_IWRITE; buf->st_size = ((__int64)hfi.nFileSizeHigh << 32) + hfi.nFileSizeLow; RtlTimeToSecondsSince1970((LARGE_INTEGER *)&hfi.ftLastAccessTime, &dw); buf->st_atime = dw; Modified: branches/arwinss/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ke/fre… ============================================================================== --- branches/arwinss/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] (original) +++ branches/arwinss/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -66,6 +66,9 @@ ULONG NumberDescriptors = 0; MEMORY_DESCRIPTOR MDArray[60] = { { 0, 0, 0 }, }; +/* Old boot style IDT */ +KIDTENTRY KiHackIdt[256]; + /* FUNCTIONS *****************************************************************/ PMEMORY_ALLOCATION_DESCRIPTOR @@ -1266,10 +1269,16 @@ #if defined(_M_IX86) PKTSS Tss; PKGDTENTRY TssEntry; + KDESCRIPTOR IdtDescriptor = { 0, 0, 0 }; + + Ke386GetInterruptDescriptorTable(*(PKDESCRIPTOR)&IdtDescriptor.Limit); + RtlCopyMemory(KiHackIdt, (PVOID)IdtDescriptor.Base, IdtDescriptor.Limit + 1); + IdtDescriptor.Base = (ULONG)&KiHackIdt; + IdtDescriptor.Limit = sizeof(KiHackIdt) - 1; /* Load the GDT and IDT */ Ke386SetGlobalDescriptorTable(*(PKDESCRIPTOR)&KiGdtDescriptor.Limit); - Ke386SetInterruptDescriptorTable(*(PKDESCRIPTOR)&KiIdtDescriptor.Limit); + Ke386SetInterruptDescriptorTable(*(PKDESCRIPTOR)&IdtDescriptor.Limit); /* Initialize the boot TSS */ Tss = &KiBootTss; Modified: branches/arwinss/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ke/i38… ============================================================================== --- branches/arwinss/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] (original) +++ branches/arwinss/reactos/ntoskrnl/ke/i386/kiinit.c [iso-8859-1] Fri Aug 14 21:36:55 2009 @@ -712,34 +712,18 @@ Ke386SetDs(KGDT_R3_DATA | RPL_MASK); Ke386SetEs(KGDT_R3_DATA | RPL_MASK); - /* HACK compensates for KiRosPrepareForSystemStartup hack */ - if ((ULONG)Idt == KiIdtDescriptor.Base) - { - USHORT FlippedSelector; - - FlippedSelector = KiIdt[2].Selector; - KiIdt[2].Selector = KiIdt[2].ExtendedOffset; - KiIdt[2].ExtendedOffset = FlippedSelector; - - FlippedSelector = KiIdt[8].Selector; - KiIdt[8].Selector = KiIdt[8].ExtendedOffset; - KiIdt[8].ExtendedOffset = FlippedSelector; - } - else - { - /* Save NMI and double fault traps */ - RtlCopyMemory(&NmiEntry, &Idt[2], sizeof(KIDTENTRY)); - RtlCopyMemory(&DoubleFaultEntry, &Idt[8], sizeof(KIDTENTRY)); - - /* Copy kernel's trap handlers */ - RtlCopyMemory(Idt, - (PVOID)KiIdtDescriptor.Base, - KiIdtDescriptor.Limit + 1); - - /* Restore NMI and double fault */ - RtlCopyMemory(&Idt[2], &NmiEntry, sizeof(KIDTENTRY)); - RtlCopyMemory(&Idt[8], &DoubleFaultEntry, sizeof(KIDTENTRY)); - } + /* Save NMI and double fault traps */ + RtlCopyMemory(&NmiEntry, &Idt[2], sizeof(KIDTENTRY)); + RtlCopyMemory(&DoubleFaultEntry, &Idt[8], sizeof(KIDTENTRY)); + + /* Copy kernel's trap handlers */ + RtlCopyMemory(Idt, + (PVOID)KiIdtDescriptor.Base, + KiIdtDescriptor.Limit + 1); + + /* Restore NMI and double fault */ + RtlCopyMemory(&Idt[2], &NmiEntry, sizeof(KIDTENTRY)); + RtlCopyMemory(&Idt[8], &DoubleFaultEntry, sizeof(KIDTENTRY)); AppCpuInit: /* Loop until we can release the freeze lock */ Propchange: branches/arwinss/reactos/tools/rsym/rsym.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 14 21:36:55 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym.c:42000-42350,42376,42419 +/trunk/reactos/tools/rsym/rsym.c:42000-42376,42419 Propchange: branches/arwinss/reactos/tools/rsym/rsym.h ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 14 21:36:55 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym.h:42000-42350,42376,42419 +/trunk/reactos/tools/rsym/rsym.h:42000-42376,42419 Propchange: branches/arwinss/reactos/tools/rsym/rsym.mak ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 14 21:36:55 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym.mak:42000-42350,42376,42419 +/trunk/reactos/tools/rsym/rsym.mak:42000-42376,42419 Propchange: branches/arwinss/reactos/tools/rsym/rsym_common.c ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Aug 14 21:36:55 2009 @@ -1,2 +1,2 @@ /branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605 -/trunk/reactos/tools/rsym/rsym_common.c:42000-42350,42376,42419 +/trunk/reactos/tools/rsym/rsym_common.c:42000-42376,42419

1 0

[fireball] 42667: - Merge 42300-42350.
by fireball＠svn.reactos.org 14 Aug '09

14 Aug '09

Author: fireball Date: Fri Aug 14 21:19:54 2009 New Revision: 42667 URL: http://svn.reactos.org/svn/reactos?rev=42667&view=rev Log: - Merge 42300-42350. Modified: branches/arwinss/reactos/ (props changed) branches/arwinss/reactos/base/applications/cmdutils/doskey/doskey.c branches/arwinss/reactos/base/setup/usetup/interface/usetup.c branches/arwinss/reactos/base/shell/cmd/cmd.c branches/arwinss/reactos/base/shell/cmd/console.c branches/arwinss/reactos/base/shell/cmd/dir.c branches/arwinss/reactos/base/shell/cmd/memory.c branches/arwinss/reactos/base/shell/cmd/misc.c branches/arwinss/reactos/base/shell/cmd/mklink.c branches/arwinss/reactos/base/shell/cmd/parser.c branches/arwinss/reactos/base/system/winlogon/winlogon.c branches/arwinss/reactos/dll/cpl/desk/preview.c branches/arwinss/reactos/dll/cpl/desk/settings.c branches/arwinss/reactos/dll/cpl/input/add.c branches/arwinss/reactos/dll/win32/advapi32/reg/reg.c branches/arwinss/reactos/dll/win32/beepmidi/beepmidi.c branches/arwinss/reactos/dll/win32/kernel32/file/rw.c branches/arwinss/reactos/dll/win32/msafd/misc/dllmain.c branches/arwinss/reactos/dll/win32/setupapi/devinst.c branches/arwinss/reactos/dll/win32/setupapi/install.c branches/arwinss/reactos/dll/win32/ws2_32/misc/ns.c branches/arwinss/reactos/dll/win32/ws2_32/misc/stubs.c branches/arwinss/reactos/drivers/base/bootvid/i386/bootdata.c branches/arwinss/reactos/drivers/base/bootvid/i386/vga.c branches/arwinss/reactos/drivers/base/bootvid/precomp.h branches/arwinss/reactos/drivers/directx/dxapi/dxapi_driver.h branches/arwinss/reactos/drivers/directx/dxg/dxg_int.h branches/arwinss/reactos/drivers/ksfilter/ks/api.c branches/arwinss/reactos/drivers/ksfilter/ks/bag.c branches/arwinss/reactos/drivers/ksfilter/ks/connectivity.c branches/arwinss/reactos/drivers/ksfilter/ks/device.c branches/arwinss/reactos/drivers/ksfilter/ks/filter.c branches/arwinss/reactos/drivers/ksfilter/ks/irp.c branches/arwinss/reactos/drivers/ksfilter/ks/pin.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/irp.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c branches/arwinss/reactos/drivers/wdm/audio/drm/drmk/stubs.cpp branches/arwinss/reactos/drivers/wdm/audio/filters/kmixer/pin.c branches/arwinss/reactos/drivers/wdm/audio/legacy/wdmaud/control.c branches/arwinss/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h branches/arwinss/reactos/drivers/wdm/audio/sysaudio/main.c branches/arwinss/reactos/drivers/wdm/audio/sysaudio/pin.c branches/arwinss/reactos/include/ddk/ntdef.h branches/arwinss/reactos/include/ddk/ntifs.h branches/arwinss/reactos/include/ddk/wdm.h branches/arwinss/reactos/include/ddk/winddk.h branches/arwinss/reactos/include/psdk/delayimp.h branches/arwinss/reactos/include/psdk/npapi.h branches/arwinss/reactos/include/psdk/winbase.h branches/arwinss/reactos/include/psdk/windef.h branches/arwinss/reactos/lib/3rdparty/mingw/mingw.rbuild branches/arwinss/reactos/lib/cmlib/cmdata.h branches/arwinss/reactos/lib/fslib/ext2lib/Mke2fs.c branches/arwinss/reactos/ntoskrnl/ex/shutdown.c branches/arwinss/reactos/ntoskrnl/include/internal/i386/intrin_i.h branches/arwinss/reactos/ntoskrnl/ke/i386/cpu.c branches/arwinss/reactos/ntoskrnl/ke/i386/kiinit.c branches/arwinss/reactos/ntoskrnl/ke/i386/trap.s branches/arwinss/reactos/ntoskrnl/mm/ARM3/expool.c branches/arwinss/reactos/ntoskrnl/mm/pool.c branches/arwinss/reactos/subsystems/win32/csrss/api/handle.c branches/arwinss/reactos/subsystems/win32/csrss/api/wapi.c branches/arwinss/reactos/subsystems/win32/csrss/win32csr/alias.c branches/arwinss/reactos/tools/rbuild/backend/mingw/mingw.cpp branches/arwinss/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/arwinss/reactos/tools/rbuild/backend/mingw/modulehandler.h branches/arwinss/reactos/tools/rsym/rsym.c (props changed) branches/arwinss/reactos/tools/rsym/rsym.h (props changed) branches/arwinss/reactos/tools/rsym/rsym.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym_common.c (props changed) branches/arwinss/reactos/tools/winebuild/winglue.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arwinss/reactos/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/applicatio… Modified: branches/arwinss/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/setup/uset… Modified: branches/arwinss/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/shell/cmd/… Modified: branches/arwinss/reactos/base/shell/cmd/console.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/shell/cmd/… Modified: branches/arwinss/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/shell/cmd/… Modified: branches/arwinss/reactos/base/shell/cmd/memory.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/shell/cmd/… Modified: branches/arwinss/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/shell/cmd/… Modified: branches/arwinss/reactos/base/shell/cmd/mklink.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/shell/cmd/… Modified: branches/arwinss/reactos/base/shell/cmd/parser.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/shell/cmd/… Modified: branches/arwinss/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/system/win… Modified: branches/arwinss/reactos/dll/cpl/desk/preview.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/cpl/desk/pr… Modified: branches/arwinss/reactos/dll/cpl/desk/settings.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/cpl/desk/se… Modified: branches/arwinss/reactos/dll/cpl/input/add.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/cpl/input/a… Modified: branches/arwinss/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/advap… Modified: branches/arwinss/reactos/dll/win32/beepmidi/beepmidi.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/beepm… Modified: branches/arwinss/reactos/dll/win32/kernel32/file/rw.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/kerne… Modified: branches/arwinss/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/msafd… Modified: branches/arwinss/reactos/dll/win32/setupapi/devinst.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/setup… Modified: branches/arwinss/reactos/dll/win32/setupapi/install.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/setup… Modified: branches/arwinss/reactos/dll/win32/ws2_32/misc/ns.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/ws2_3… Modified: branches/arwinss/reactos/dll/win32/ws2_32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/ws2_3… Modified: branches/arwinss/reactos/drivers/base/bootvid/i386/bootdata.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/base/bo… Modified: branches/arwinss/reactos/drivers/base/bootvid/i386/vga.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/base/bo… Modified: branches/arwinss/reactos/drivers/base/bootvid/precomp.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/base/bo… Modified: branches/arwinss/reactos/drivers/directx/dxapi/dxapi_driver.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/directx… Modified: branches/arwinss/reactos/drivers/directx/dxg/dxg_int.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/directx… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/bag.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/filter_topology.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/filter_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/interfaces.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/irp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/irpstream.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/pin_dmus.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/pin_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/pin_wavepci.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/pin_wavert.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/port_topology.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/port_wavecyclic.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/drm/drmk/stubs.cpp URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/filters/kmixer/pin.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/legacy/wdmaud/wdmaud.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/sysaudio/main.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/sysaudio/pin.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/ntd… Modified: branches/arwinss/reactos/include/ddk/ntifs.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/nti… Modified: branches/arwinss/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/wdm… Modified: branches/arwinss/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/win… Modified: branches/arwinss/reactos/include/psdk/delayimp.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/de… Modified: branches/arwinss/reactos/include/psdk/npapi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/np… Modified: branches/arwinss/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi… Modified: branches/arwinss/reactos/include/psdk/windef.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi… Modified: branches/arwinss/reactos/lib/3rdparty/mingw/mingw.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/3rdparty/mi… Modified: branches/arwinss/reactos/lib/cmlib/cmdata.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/cmlib/cmdat… Modified: branches/arwinss/reactos/lib/fslib/ext2lib/Mke2fs.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/fslib/ext2l… Modified: branches/arwinss/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ex/shu… Modified: branches/arwinss/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/includ… Modified: branches/arwinss/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ke/i38… Modified: branches/arwinss/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ke/i38… Modified: branches/arwinss/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ke/i38… Modified: branches/arwinss/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/ARM… Modified: branches/arwinss/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/poo… Modified: branches/arwinss/reactos/subsystems/win32/csrss/api/handle.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/csrss/api/wapi.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/alias.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rbuild/ba… Modified: branches/arwinss/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rbuild/ba… Modified: branches/arwinss/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rbuild/ba… Modified: branches/arwinss/reactos/tools/winebuild/winglue.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/winebuild…

1 0

[fireball] 42666: - Merge 42250-42300.
by fireball＠svn.reactos.org 14 Aug '09

14 Aug '09

Author: fireball Date: Fri Aug 14 21:07:41 2009 New Revision: 42666 URL: http://svn.reactos.org/svn/reactos?rev=42666&view=rev Log: - Merge 42250-42300. Modified: branches/arwinss/reactos/ (props changed) branches/arwinss/reactos/boot/freeldr/freeldr/mm/meminit.c branches/arwinss/reactos/dll/win32/msafd/msafd.h branches/arwinss/reactos/drivers/ksfilter/ks/api.c branches/arwinss/reactos/drivers/ksfilter/ks/bag.c branches/arwinss/reactos/drivers/ksfilter/ks/device.c branches/arwinss/reactos/drivers/ksfilter/ks/driver.c branches/arwinss/reactos/drivers/ksfilter/ks/event.c branches/arwinss/reactos/drivers/ksfilter/ks/filter.c branches/arwinss/reactos/drivers/ksfilter/ks/filterfactory.c branches/arwinss/reactos/drivers/ksfilter/ks/image.c branches/arwinss/reactos/drivers/ksfilter/ks/irp.c branches/arwinss/reactos/drivers/ksfilter/ks/ks.rbuild branches/arwinss/reactos/drivers/ksfilter/ks/ksfunc.h branches/arwinss/reactos/drivers/ksfilter/ks/ksiface.h branches/arwinss/reactos/drivers/ksfilter/ks/kstypes.h branches/arwinss/reactos/drivers/ksfilter/ks/misc.c branches/arwinss/reactos/drivers/ksfilter/ks/pin.c branches/arwinss/reactos/include/ddk/winddk.h branches/arwinss/reactos/include/psdk/ks.h branches/arwinss/reactos/include/reactos/win32k/ntuser.h branches/arwinss/reactos/ntoskrnl/dbgk/dbgkobj.c branches/arwinss/reactos/ntoskrnl/mm/i386/page.c branches/arwinss/reactos/ntoskrnl/mm/mmfault.c branches/arwinss/reactos/ntoskrnl/mm/mminit.c branches/arwinss/reactos/ntoskrnl/mm/section.c branches/arwinss/reactos/tools/rgenstat/module_list.txt branches/arwinss/reactos/tools/rsym/rsym.c (props changed) branches/arwinss/reactos/tools/rsym/rsym.h (props changed) branches/arwinss/reactos/tools/rsym/rsym.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym_common.c (props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arwinss/reactos/boot/freeldr/freeldr/mm/meminit.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/dll/win32/msafd/msafd.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/msafd… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/bag.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/device.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/driver.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/event.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/filter.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/filterfactory.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/image.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/ks.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/ksfunc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/ksiface.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/kstypes.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/win… Modified: branches/arwinss/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/ks… Modified: branches/arwinss/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Modified: branches/arwinss/reactos/ntoskrnl/dbgk/dbgkobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/dbgk/d… Modified: branches/arwinss/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/i38… Modified: branches/arwinss/reactos/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/mmf… Modified: branches/arwinss/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/mmi… Modified: branches/arwinss/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/sec… Modified: branches/arwinss/reactos/tools/rgenstat/module_list.txt URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rgenstat/…

1 0

[fireball] 42665: - Merge 42200-42250. Without dll/win32/ws2help (causes merge problems).
by fireball＠svn.reactos.org 14 Aug '09

14 Aug '09

Author: fireball Date: Fri Aug 14 20:56:27 2009 New Revision: 42665 URL: http://svn.reactos.org/svn/reactos?rev=42665&view=rev Log: - Merge 42200-42250. Without dll/win32/ws2help (causes merge problems). Added: branches/arwinss/reactos/drivers/filesystems/fs_rec/udfs.h - copied unchanged from r42250, trunk/reactos/drivers/filesystems/fs_rec/udfs.h Removed: branches/arwinss/reactos/dll/win32/ws2help_new/ branches/arwinss/reactos/ntoskrnl/mm/npool.c Modified: branches/arwinss/reactos/ (props changed) branches/arwinss/reactos/base/applications/cmdutils/dbgprint/dbgprint.c branches/arwinss/reactos/base/services/dhcp/api.c branches/arwinss/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c branches/arwinss/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c branches/arwinss/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c branches/arwinss/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h branches/arwinss/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h branches/arwinss/reactos/boot/freeldr/freeldr/include/freeldr.h branches/arwinss/reactos/boot/freeldr/freeldr/machine.c branches/arwinss/reactos/boot/freeldr/freeldr/reactos/binhive.c branches/arwinss/reactos/boot/freeldr/freeldr/reactos/setupldr.c branches/arwinss/reactos/boot/freeldr/freeldr/rtl/libsupp.c branches/arwinss/reactos/boot/freeldr/freeldr/ui/tui.c branches/arwinss/reactos/boot/freeldr/freeldr/video/fade.c branches/arwinss/reactos/dll/win32/advapi32/sec/ac.c branches/arwinss/reactos/dll/win32/avicap32/avicap32.c branches/arwinss/reactos/dll/win32/avicap32/avicap32.spec branches/arwinss/reactos/drivers/filesystems/fs_rec/fs_rec.h branches/arwinss/reactos/drivers/filesystems/fs_rec/udfs.c branches/arwinss/reactos/drivers/filesystems/msfs/msfs.h branches/arwinss/reactos/drivers/input/i8042prt/mouse.c branches/arwinss/reactos/drivers/ksfilter/ks/irp.c branches/arwinss/reactos/drivers/network/afd/afd/lock.c branches/arwinss/reactos/drivers/network/ndis/ndis/misc.c branches/arwinss/reactos/drivers/storage/class/ramdisk/ramdisk.c branches/arwinss/reactos/drivers/storage/ide/atapi/atapi.c branches/arwinss/reactos/drivers/video/displays/framebuf/pointer.c branches/arwinss/reactos/drivers/video/font/bmfd/bmfd.h branches/arwinss/reactos/drivers/video/font/ftfd/ftfd.h branches/arwinss/reactos/drivers/video/videoprt/agp.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/private.h branches/arwinss/reactos/hal/halx86/mp/apic.c branches/arwinss/reactos/hal/halx86/mp/mpsirql.c branches/arwinss/reactos/include/crt/process.h branches/arwinss/reactos/include/ddk/ddkmapi.h branches/arwinss/reactos/include/ddk/hidclass.h branches/arwinss/reactos/include/ddk/miniport.h branches/arwinss/reactos/include/ddk/ndis.h branches/arwinss/reactos/include/ddk/ntdd8042.h branches/arwinss/reactos/include/ddk/ntdef.h branches/arwinss/reactos/include/ddk/portcls.h branches/arwinss/reactos/include/ddk/scsiwmi.h branches/arwinss/reactos/include/ddk/srb.h branches/arwinss/reactos/include/ddk/stdunk.h branches/arwinss/reactos/include/ddk/tdikrnl.h branches/arwinss/reactos/include/ddk/video.h branches/arwinss/reactos/include/ddk/winddk.h branches/arwinss/reactos/include/host/typedefs.h branches/arwinss/reactos/include/ndk/dbgkfuncs.h branches/arwinss/reactos/include/psdk/delayimp.h branches/arwinss/reactos/include/psdk/ks.h branches/arwinss/reactos/include/psdk/winnt.h branches/arwinss/reactos/include/reactos/win32k/ntgdityp.h branches/arwinss/reactos/include/reactos/win32k/ntuser.h branches/arwinss/reactos/lib/drivers/ip/transport/tcp/if.c branches/arwinss/reactos/lib/drivers/ip/transport/udp/udp.c branches/arwinss/reactos/lib/sdk/delayimp/delayimp.c branches/arwinss/reactos/lib/sdk/uuid/uuid.rbuild branches/arwinss/reactos/ntoskrnl/ex/shutdown.c branches/arwinss/reactos/ntoskrnl/include/internal/mm.h branches/arwinss/reactos/ntoskrnl/kd/kdmain.c branches/arwinss/reactos/ntoskrnl/kdbg/kdb.c branches/arwinss/reactos/ntoskrnl/ke/procobj.c branches/arwinss/reactos/ntoskrnl/ke/wait.c branches/arwinss/reactos/ntoskrnl/mm/ARM3/expool.c branches/arwinss/reactos/ntoskrnl/mm/ARM3/hypermap.c branches/arwinss/reactos/ntoskrnl/mm/ARM3/i386/init.c branches/arwinss/reactos/ntoskrnl/mm/ARM3/miarm.h branches/arwinss/reactos/ntoskrnl/mm/dbgpool.c branches/arwinss/reactos/ntoskrnl/mm/freelist.c branches/arwinss/reactos/ntoskrnl/mm/i386/page.c branches/arwinss/reactos/ntoskrnl/mm/mminit.c branches/arwinss/reactos/ntoskrnl/mm/pe.c branches/arwinss/reactos/ntoskrnl/mm/pool.c branches/arwinss/reactos/ntoskrnl/ntoskrnl-generic.rbuild branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c branches/arwinss/reactos/tools/rbuild/backend/mingw/modulehandler.cpp branches/arwinss/reactos/tools/rbuild/backend/mingw/modulehandler.h branches/arwinss/reactos/tools/rbuild/module.cpp branches/arwinss/reactos/tools/rbuild/rbuild.h branches/arwinss/reactos/tools/rsym/rsym.c (props changed) branches/arwinss/reactos/tools/rsym/rsym.h (props changed) branches/arwinss/reactos/tools/rsym/rsym.mak (props changed) branches/arwinss/reactos/tools/rsym/rsym_common.c (props changed) [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/arwinss/reactos/base/applications/cmdutils/dbgprint/dbgprint.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/applicatio… Modified: branches/arwinss/reactos/base/services/dhcp/api.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/base/services/d… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/arch/i386/i386vid.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/arch/i386/pcdisk.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/include/arch/i386/machpc.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/include/arch/i386/machxbox.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/machine.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/reactos/binhive.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/reactos/setupldr.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/ui/tui.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/boot/freeldr/freeldr/video/fade.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/boot/freeldr/fr… Modified: branches/arwinss/reactos/dll/win32/advapi32/sec/ac.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/advap… Modified: branches/arwinss/reactos/dll/win32/avicap32/avicap32.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/avica… Modified: branches/arwinss/reactos/dll/win32/avicap32/avicap32.spec URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/avica… Modified: branches/arwinss/reactos/drivers/filesystems/fs_rec/fs_rec.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/filesys… Modified: branches/arwinss/reactos/drivers/filesystems/fs_rec/udfs.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/filesys… Modified: branches/arwinss/reactos/drivers/filesystems/msfs/msfs.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/filesys… Modified: branches/arwinss/reactos/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/input/i… Modified: branches/arwinss/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/ksfilte… Modified: branches/arwinss/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/network/ndis/ndis/misc.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/network… Modified: branches/arwinss/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/storage… Modified: branches/arwinss/reactos/drivers/storage/ide/atapi/atapi.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/storage… Modified: branches/arwinss/reactos/drivers/video/displays/framebuf/pointer.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/video/d… Modified: branches/arwinss/reactos/drivers/video/font/bmfd/bmfd.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/video/f… Modified: branches/arwinss/reactos/drivers/video/font/ftfd/ftfd.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/video/f… Modified: branches/arwinss/reactos/drivers/video/videoprt/agp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/video/v… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/interrupt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/drivers/wdm/audio/backpln/portcls/private.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/drivers/wdm/aud… Modified: branches/arwinss/reactos/hal/halx86/mp/apic.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/hal/halx86/mp/a… Modified: branches/arwinss/reactos/hal/halx86/mp/mpsirql.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/hal/halx86/mp/m… Modified: branches/arwinss/reactos/include/crt/process.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/crt/pro… Modified: branches/arwinss/reactos/include/ddk/ddkmapi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/ddk… Modified: branches/arwinss/reactos/include/ddk/hidclass.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/hid… Modified: branches/arwinss/reactos/include/ddk/miniport.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/min… Modified: branches/arwinss/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/ndi… Modified: branches/arwinss/reactos/include/ddk/ntdd8042.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/ntd… Modified: branches/arwinss/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/ntd… Modified: branches/arwinss/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/por… Modified: branches/arwinss/reactos/include/ddk/scsiwmi.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/scs… Modified: branches/arwinss/reactos/include/ddk/srb.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/srb… Modified: branches/arwinss/reactos/include/ddk/stdunk.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/std… Modified: branches/arwinss/reactos/include/ddk/tdikrnl.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/tdi… Modified: branches/arwinss/reactos/include/ddk/video.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/vid… Modified: branches/arwinss/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ddk/win… Modified: branches/arwinss/reactos/include/host/typedefs.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/host/ty… Modified: branches/arwinss/reactos/include/ndk/dbgkfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/ndk/dbg… Modified: branches/arwinss/reactos/include/psdk/delayimp.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/de… Modified: branches/arwinss/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/ks… Modified: branches/arwinss/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/psdk/wi… Modified: branches/arwinss/reactos/include/reactos/win32k/ntgdityp.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Modified: branches/arwinss/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/include/reactos… Modified: branches/arwinss/reactos/lib/drivers/ip/transport/tcp/if.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/ip/… Modified: branches/arwinss/reactos/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/drivers/ip/… Modified: branches/arwinss/reactos/lib/sdk/delayimp/delayimp.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/sdk/delayim… Modified: branches/arwinss/reactos/lib/sdk/uuid/uuid.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/lib/sdk/uuid/uu… Modified: branches/arwinss/reactos/ntoskrnl/ex/shutdown.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ex/shu… Modified: branches/arwinss/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/includ… Modified: branches/arwinss/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/kd/kdm… Modified: branches/arwinss/reactos/ntoskrnl/kdbg/kdb.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/kdbg/k… Modified: branches/arwinss/reactos/ntoskrnl/ke/procobj.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ke/pro… Modified: branches/arwinss/reactos/ntoskrnl/ke/wait.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ke/wai… Modified: branches/arwinss/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/ARM… Modified: branches/arwinss/reactos/ntoskrnl/mm/ARM3/hypermap.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/ARM… Modified: branches/arwinss/reactos/ntoskrnl/mm/ARM3/i386/init.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/ARM… Modified: branches/arwinss/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/ARM… Modified: branches/arwinss/reactos/ntoskrnl/mm/dbgpool.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/dbg… Modified: branches/arwinss/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/fre… Modified: branches/arwinss/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/i38… Modified: branches/arwinss/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/mmi… Removed: branches/arwinss/reactos/ntoskrnl/mm/npool.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/npo… Modified: branches/arwinss/reactos/ntoskrnl/mm/pe.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/pe.… Modified: branches/arwinss/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/mm/poo… Modified: branches/arwinss/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/ntoskrnl/ntoskr… Modified: branches/arwinss/reactos/subsystems/win32/csrss/win32csr/desktopbg.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… Modified: branches/arwinss/reactos/tools/rbuild/backend/mingw/modulehandler.cpp URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rbuild/ba… Modified: branches/arwinss/reactos/tools/rbuild/backend/mingw/modulehandler.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rbuild/ba… Modified: branches/arwinss/reactos/tools/rbuild/module.cpp URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rbuild/mo… Modified: branches/arwinss/reactos/tools/rbuild/rbuild.h URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/tools/rbuild/rb…

1 0

[janderwald] 42664: [KS] - Proper implement KsValidateConnectRequest - Dataformat isnt not yet checked
by janderwald＠svn.reactos.org 14 Aug '09

14 Aug '09

Author: janderwald Date: Fri Aug 14 11:27:24 2009 New Revision: 42664 URL: http://svn.reactos.org/svn/reactos?rev=42664&view=rev Log: [KS] - Proper implement KsValidateConnectRequest - Dataformat isnt not yet checked Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c Modified: trunk/reactos/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/connec… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/connectivity.c [iso-8859-1] Fri Aug 14 11:27:24 2009 @@ -8,6 +8,21 @@ #include "priv.h" + +KSPIN_INTERFACE StandardPinInterface = +{ + {STATIC_KSINTERFACESETID_Standard}, + KSINTERFACE_STANDARD_STREAMING, + 0 +}; + +KSPIN_MEDIUM StandardPinMedium = +{ + {STATIC_KSMEDIUMSETID_Standard}, + KSMEDIUM_TYPE_ANYINSTANCE, + 0 +}; + /* @implemented @@ -50,61 +65,112 @@ IN KSPIN_DESCRIPTOR* Descriptor, OUT PKSPIN_CONNECT* Connect) { - PIO_STACK_LOCATION IoStack; PKSPIN_CONNECT ConnectDetails; - LPWSTR PinName = L"{146F1A80-4791-11D0-A5D6-28DB04C10000}\\"; - PKSDATAFORMAT DataFormat; - LPWSTR Offset; - - IoStack = IoGetCurrentIrpStackLocation(Irp); - if (!IoStack->FileObject->FileName.Buffer) + PKSPIN_INTERFACE Interface; + PKSPIN_MEDIUM Medium; + ULONG Size; + NTSTATUS Status; + ULONG Index; + ULONG Count; + BOOLEAN Found; + + /* did the caller miss the connect parameter */ + if (!Connect) return STATUS_INVALID_PARAMETER; - if (IoStack->FileObject->FileName.Length < wcslen(PinName) + sizeof(KSPIN_CONNECT) + sizeof(KSDATAFORMAT)) - return STATUS_INVALID_PARAMETER; - - Offset = wcsstr(IoStack->FileObject->FileName.Buffer, PinName); - if (!Offset) - { - /* request is not targeted for a pin */ - return STATUS_INVALID_PARAMETER; - } - - ConnectDetails = (PKSPIN_CONNECT)(Offset + wcslen(PinName)); - - if (ConnectDetails->PinToHandle != NULL) - { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; - } - + /* set create param size */ + Size = sizeof(KSPIN_CONNECT); + + /* fetch create parameters */ + Status = KspCopyCreateRequest(Irp, + KSSTRING_Pin, + &Size, + (PVOID*)&ConnectDetails); + + /* check for success */ + if (!NT_SUCCESS(Status)) + return Status; + + /* is pin id out of bounds */ if (ConnectDetails->PinId >= DescriptorsCount) return STATUS_INVALID_PARAMETER; -#if 0 - if (!IsEqualGUIDAligned(&ConnectDetails->Interface.Set, &KSINTERFACESETID_Standard) && - ConnectDetails->Interface.Id != KSINTERFACE_STANDARD_STREAMING) - { - //FIXME - // validate provided interface set - DPRINT1("FIXME\n"); - } - - if (!IsEqualGUIDAligned(&ConnectDetails->Medium.Set, &KSMEDIUMSETID_Standard) && - ConnectDetails->Medium.Id != KSMEDIUM_TYPE_ANYINSTANCE) - { - //FIXME - // validate provided medium set - DPRINT1("FIXME\n"); - } -#endif + /* does the pin have interface details filled in */ + if (Descriptor[ConnectDetails->PinId].InterfacesCount && Descriptor[ConnectDetails->PinId].Interfaces) + { + /* use provided pin interface count */ + Count = Descriptor[ConnectDetails->PinId].InterfacesCount; + Interface = (PKSPIN_INTERFACE)Descriptor[ConnectDetails->PinId].Interfaces; + } + else + { + /* use standard pin interface */ + Count = 1; + Interface = &StandardPinInterface; + } + + /* now check the interface */ + Found = FALSE; + Index = 0; + do + { + if (IsEqualGUIDAligned(&Interface[Index].Set, &ConnectDetails->Interface.Set) && + Interface[Index].Id == ConnectDetails->Interface.Id) + { + /* found a matching interface */ + Found = TRUE; + break; + } + /* iterate to next interface */ + Index++; + }while(Index < Count); + + if (!Found) + { + /* pin doesnt support this interface */ + return STATUS_NO_MATCH; + } + + /* does the pin have medium details filled in */ + if (Descriptor[ConnectDetails->PinId].MediumsCount && Descriptor[ConnectDetails->PinId].Mediums) + { + /* use provided pin interface count */ + Count = Descriptor[ConnectDetails->PinId].MediumsCount; + Medium = (PKSPIN_MEDIUM)Descriptor[ConnectDetails->PinId].Mediums; + } + else + { + /* use standard pin interface */ + Count = 1; + Medium = &StandardPinMedium; + } + + /* now check the interface */ + Found = FALSE; + Index = 0; + do + { + if (IsEqualGUIDAligned(&Medium[Index].Set, &ConnectDetails->Medium.Set) && + Medium[Index].Id == ConnectDetails->Medium.Id) + { + /* found a matching interface */ + Found = TRUE; + break; + } + /* iterate to next medium */ + Index++; + }while(Index < Count); + + if (!Found) + { + /* pin doesnt support this medium */ + return STATUS_NO_MATCH; + } /// FIXME /// implement format checking - DataFormat = (PKSDATAFORMAT) (ConnectDetails + 1); *Connect = ConnectDetails; - return STATUS_SUCCESS; }

1 0

[janderwald] 42663: - A few header updates
by janderwald＠svn.reactos.org 14 Aug '09

14 Aug '09

Author: janderwald Date: Fri Aug 14 11:26:05 2009 New Revision: 42663 URL: http://svn.reactos.org/svn/reactos?rev=42663&view=rev Log: - A few header updates Modified: trunk/reactos/include/psdk/ks.h Modified: trunk/reactos/include/psdk/ks.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ks.h?rev=4266… ============================================================================== --- trunk/reactos/include/psdk/ks.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ks.h [iso-8859-1] Fri Aug 14 11:26:05 2009 @@ -297,7 +297,7 @@ #endif #define STATIC_KSINTERFACESETID_Standard \ - 0x1A8766A0L, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + 0x1A8766A0L, 0x62CE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} DEFINE_GUIDSTRUCT("1A8766A0-62CE-11CF-A5D6-28DB04C10000", KSINTERFACESETID_Standard); #define KSINTERFACESETID_Standard DEFINE_GUIDNAMED(KSINTERFACESETID_Standard) @@ -326,7 +326,7 @@ #define KSMEDIUM_TYPE_ANYINSTANCE 0 #define STATIC_KSMEDIUMSETID_Standard \ - 0x4747B320L, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00 + 0x4747B320L, 0x62CE, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00} DEFINE_GUIDSTRUCT("4747B320-62CE-11CF-A5D6-28DB04C10000", KSMEDIUMSETID_Standard); #define KSMEDIUMSETID_Standard DEFINE_GUIDNAMED(KSMEDIUMSETID_Standard) @@ -3625,6 +3625,22 @@ IN ULONG OUtSize, OUT PULONG BytesReturned); +KSDDKAPI +PKSPIN +NTAPI +KsFilterGetFirstChildPin( + IN PKSFILTER Filter, + IN ULONG PinId + ); + +KSDDKAPI +PFILE_OBJECT +NTAPI +KsPinGetConnectedPinFileObject( + IN PKSPIN Pin + ); + + #endif /* =============================================================== @@ -3988,11 +4004,21 @@ IN ULONG Length); +KSDDKAPI +VOID +NTAPI +KsReleaseControl( + IN PVOID Object + ); + #define KsDiscard(object, pointer) \ KsRemoveItemFromObjectBag(object->Bag, pointer, TRUE) #define KsFilterAcquireControl(Filter) \ KsAcquireControl((PVOID) Filter); + +#define KsFilterReleaseControl(Filter) \ + KsReleaseControl((PVOID) Filter); #define KsFilterAddEvent(Filter, EventEntry) \ KsAddEvent(Filter,EventEntry);

1 0

[tkreuzer] 42662: More fix NtUserSetWindowContextHelpId. Spotted by Cameron.
by tkreuzer＠svn.reactos.org 14 Aug '09

14 Aug '09

Author: tkreuzer Date: Fri Aug 14 03:37:28 2009 New Revision: 42662 URL: http://svn.reactos.org/svn/reactos?rev=42662&view=rev Log: More fix NtUserSetWindowContextHelpId. Spotted by Cameron. Modified: trunk/reactos/dll/win32/user32/include/user32p.h Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Fri Aug 14 03:37:28 2009 @@ -41,7 +41,7 @@ (BOOL)NtUserCallTwoParam((DWORD)hWnd, (DWORD)hRgn, TWOPARAM_ROUTINE_VALIDATERGN) #define NtUserSetWindowContextHelpId(hWnd, dwContextHelpId) \ - (BOOL)NtUserCallHwndParam(hwnd, dwContextHelpId, HWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID) + (BOOL)NtUserCallHwndParam(hWnd, dwContextHelpId, HWNDPARAM_ROUTINE_SETWNDCONTEXTHLPID) #define NtUserSetCaretPos(X, Y) \ (BOOL)NtUserCallTwoParam((DWORD)X, (DWORD)Y, TWOPARAM_ROUTINE_SETCARETPOS)

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