Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 42811: - Fix receiving packets on an interface's broadcast address while bound to an undefined address - Simplify binding to a certain interface
by cgutman＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: cgutman Date: Thu Aug 20 19:25:39 2009 New Revision: 42811 URL: http://svn.reactos.org/svn/reactos?rev=42811&view=rev Log: - Fix receiving packets on an interface's broadcast address while bound to an undefined address - Simplify binding to a certain interface Modified: trunk/reactos/drivers/network/tcpip/include/address.h trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c trunk/reactos/lib/drivers/ip/network/interface.c Modified: trunk/reactos/drivers/network/tcpip/include/address.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/address.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/address.h [iso-8859-1] Thu Aug 20 19:25:39 2009 @@ -55,8 +55,8 @@ PIP_ADDRESS Address1, IPv4_RAW_ADDRESS Address2); -BOOLEAN AddrLocateADEv4( - IPv4_RAW_ADDRESS MatchAddress, PIP_ADDRESS Address); +PIP_INTERFACE AddrLocateInterface( + PIP_ADDRESS MatchAddress); PADDRESS_FILE AddrSearchFirst( PIP_ADDRESS Address, Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Thu Aug 20 19:25:39 2009 @@ -43,18 +43,50 @@ return AddrSearchNext(SearchContext); } -BOOLEAN AddrIsBroadcast( - PIP_ADDRESS PossibleMatch, - PIP_ADDRESS TargetAddress ) { +BOOLEAN AddrIsBroadcastMatch( + PIP_ADDRESS UnicastAddress, + PIP_ADDRESS BroadcastAddress ) { IF_LIST_ITER(IF); ForEachInterface(IF) { - if( AddrIsEqual( &IF->Unicast, PossibleMatch ) && - AddrIsEqual( &IF->Broadcast, TargetAddress ) ) + if ((AddrIsUnspecified(UnicastAddress) || + AddrIsEqual(&IF->Unicast, UnicastAddress)) && + (AddrIsEqual(&IF->Broadcast, BroadcastAddress))) return TRUE; } EndFor(IF); return FALSE; +} + +BOOLEAN AddrReceiveMatch( + PIP_ADDRESS LocalAddress, + PIP_ADDRESS RemoteAddress) +{ + if (AddrIsEqual(LocalAddress, RemoteAddress)) + { + /* Unicast address match */ + return TRUE; + } + + if (AddrIsBroadcastMatch(LocalAddress, RemoteAddress)) + { + /* Broadcast address match */ + return TRUE; + } + + if (AddrIsUnspecified(LocalAddress)) + { + /* Local address unspecified */ + return TRUE; + } + + if (AddrIsUnspecified(RemoteAddress)) + { + /* Remote address unspecified */ + return TRUE; + } + + return FALSE; } /* @@ -96,10 +128,7 @@ /* See if this address matches the search criteria */ if ((Current->Port == SearchContext->Port) && (Current->Protocol == SearchContext->Protocol) && - (AddrIsEqual(IPAddress, SearchContext->Address) || - AddrIsBroadcast(IPAddress, SearchContext->Address) || - AddrIsUnspecified(IPAddress) || - AddrIsUnspecified(SearchContext->Address))) { + (AddrReceiveMatch(IPAddress, SearchContext->Address))) { /* We've found a match */ Found = TRUE; break; @@ -156,7 +185,6 @@ USHORT Protocol, PVOID Options) { - IPv4_RAW_ADDRESS IPv4Address; PADDRESS_FILE AddrFile; TI_DbgPrint(MID_TRACE, ("Called (Proto %d).\n", Protocol)); @@ -176,17 +204,14 @@ /* 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)) { + AddrFile->Address.Address.IPv4Address = Address->Address[0].Address[0].in_addr; + AddrFile->Address.Type = IP_ADDRESS_V4; + + if (!AddrIsUnspecified(&AddrFile->Address) && + !AddrLocateInterface(&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", Modified: trunk/reactos/lib/drivers/ip/network/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/int… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/interface.c [iso-8859-1] Thu Aug 20 19:25:39 2009 @@ -81,36 +81,26 @@ return Status; } -/* - * FUNCTION: Locates and returns an address entry using IPv4 adress as argument - * ARGUMENTS: - * Address = Raw IPv4 address - * RETURNS: - * Pointer to address entry if found, NULL if not found - * NOTES: - * If found, the address is referenced - */ -BOOLEAN AddrLocateADEv4( - IPv4_RAW_ADDRESS MatchAddress, PIP_ADDRESS Address) +PIP_INTERFACE AddrLocateInterface( + PIP_ADDRESS MatchAddress) { KIRQL OldIrql; - BOOLEAN Matched = FALSE; + PIP_INTERFACE RetIF = NULL; IF_LIST_ITER(CurrentIF); TcpipAcquireSpinLock(&InterfaceListLock, &OldIrql); ForEachInterface(CurrentIF) { - if( AddrIsEqualIPv4( &CurrentIF->Unicast, MatchAddress ) || - AddrIsEqualIPv4( &CurrentIF->Broadcast, MatchAddress ) ) { - Address->Type = IP_ADDRESS_V4; - Address->Address.IPv4Address = MatchAddress; - Matched = TRUE; break; + if( AddrIsEqual( &CurrentIF->Unicast, MatchAddress ) || + AddrIsEqual( &CurrentIF->Broadcast, MatchAddress ) ) { + RetIF = CurrentIF; + break; } } EndFor(CurrentIF); TcpipReleaseSpinLock(&InterfaceListLock, OldIrql); - return Matched; + return RetIF; } BOOLEAN HasPrefix(

1 0

[sginsberg] 42810: - Fix some C4115 in typeof.h
by sginsberg＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: sginsberg Date: Thu Aug 20 19:15:46 2009 New Revision: 42810 URL: http://svn.reactos.org/svn/reactos?rev=42810&view=rev Log: - Fix some C4115 in typeof.h Modified: trunk/reactos/include/reactos/wine/typeof.h Modified: trunk/reactos/include/reactos/wine/typeof.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/typeo… ============================================================================== --- trunk/reactos/include/reactos/wine/typeof.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/typeof.h [iso-8859-1] Thu Aug 20 19:15:46 2009 @@ -15,6 +15,14 @@ #define __typeof_size __typeof_intptr #define __typeof_wchar unsigned short #endif + +struct IUnknown; +struct _tagIMEINFO; +struct tagSTYLEBUFW; +struct tagCANDIDATELIST; +struct tagIMEMENUITEMINFOW; +struct _xsltStylesheet; +struct jpeg_decompress_struct; typedef struct IWineD3D * (__stdcall typeof(WineDirect3DCreate))(unsigned int, struct IUnknown *); typedef struct IWineD3DClipper * (__stdcall typeof(WineDirect3DCreateClipper))(struct IUnknown *);

1 0

[mkupfer] 42809: - 4th part of German translation of rapps entries. - change some entries to proper values
by mkupfer＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: mkupfer Date: Thu Aug 20 18:40:57 2009 New Revision: 42809 URL: http://svn.reactos.org/svn/reactos?rev=42809&view=rev Log: - 4th part of German translation of rapps entries. - change some entries to proper values Modified: trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt trunk/reactos/base/applications/rapps/rapps/tileworld.txt trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt trunk/reactos/base/applications/rapps/rapps/utorrent.txt trunk/reactos/base/applications/rapps/rapps/vb5run.txt trunk/reactos/base/applications/rapps/rapps/vb6run.txt trunk/reactos/base/applications/rapps/rapps/vc2005run.txt trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt trunk/reactos/base/applications/rapps/rapps/vc2008run.txt trunk/reactos/base/applications/rapps/rapps/vc6run.txt trunk/reactos/base/applications/rapps/rapps/winboard.txt Modified: trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/sdl_runtime.txt [iso-8859-1] Thu Aug 20 18:40:57 2009 @@ -11,9 +11,8 @@ URLDownload = http://www.libsdl.org/release/SDL-1.2.13-win32.zip CDPath = none - [Section.0407] -Name = Simple Direct Media Layer (SDL) Laufzeitumgebung +Name = Simple Direct Media Layer (SDL) Laufzeitsystem Licence = Unbekannt Description = Erforderlich um einige Open Source Spiele auszufÃ¼hren. Sie brauchen 7-Zip oder einen Ã¤hnlichen Entpacker um es zu entpacken. Size = Unbekannt Modified: trunk/reactos/base/applications/rapps/rapps/tileworld.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tileworld.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/tileworld.txt [iso-8859-1] Thu Aug 20 18:40:57 2009 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = Tile World @@ -10,3 +10,9 @@ URLSite = Unknown URLDownload = http://www.muppetlabs.com/~breadbox/pub/software/tworld/tworld-1.3.0-win32-… CDPath = none + +[Section.0407] +Licence = Unbekannt +Description = SchÃ¶ner Klon von Chip's Challange ursprÃ¼nglich etnwickelt fÃ¼r Atari Lynx. EnthÃ¤lt CCLP2 Graphics Pack, deshalb wird das urheberrechtlich geschÃ¼tzte Original nicht benÃ¶tigt. +Size = Unbekannt +URLSite = Unbekannt Modified: trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt [iso-8859-1] Thu Aug 20 18:40:57 2009 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = TuxPaint @@ -10,3 +10,9 @@ URLSite = Unknown URLDownload = http://ovh.dl.sourceforge.net/sourceforge/tuxpaint/tuxpaint-0.9.19-win32-in… CDPath = none + +[Section.0407] +Licence = Unbekannt +Description = Ein Open Source Bitmap Zeichenprogramm fÃ¼r kleine Kinder. +Size = Unbekannt +URLSite = Unbekannt Modified: trunk/reactos/base/applications/rapps/rapps/utorrent.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/utorrent.txt [iso-8859-1] Thu Aug 20 18:40:57 2009 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = uTorrent @@ -10,3 +10,9 @@ URLSite = Unknown URLDownload = http://download.utorrent.com/1.8.2/utorrent-1.8.2.upx.exe CDPath = none + +[Section.0407] +Licence = Unbekannt +Description = Kleiner und schneller BitTorrent Client. +Size = Unbekannt +URLSite = Unbekannt Modified: trunk/reactos/base/applications/rapps/rapps/vb5run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vb5run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vb5run.txt [iso-8859-1] Thu Aug 20 18:40:57 2009 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = Visual Basic 5 Runtime @@ -10,3 +10,9 @@ URLSite = Unknown URLDownload = http://download.microsoft.com/download/vb50pro/utility/1/win98/en-us/msvbvm… CDPath = none + +[Section.0407] +Licence = Unbekannt +Description = Visual Basic 5 Laufzeitsystem +Size = Unbekannt +URLSite = Unbekannt Modified: trunk/reactos/base/applications/rapps/rapps/vb6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vb6run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vb6run.txt [iso-8859-1] Thu Aug 20 18:40:57 2009 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = Visual Basic 6 Runtime @@ -10,3 +10,9 @@ URLSite = Unknown URLDownload = http://download.microsoft.com/download/vb60pro/install/6/win98me/en-us/vbru… CDPath = none + +[Section.0407] +Licence = Unbekannt +Description = Visual Basic 6 Laufzeitsystem +Size = Unbekannt +URLSite = Unbekannt Modified: trunk/reactos/base/applications/rapps/rapps/vc2005run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2005run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2005run.txt [iso-8859-1] Thu Aug 20 18:40:57 2009 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = Visual Studio 2005 Runtime @@ -10,3 +10,9 @@ URLSite = Unknown URLDownload = http://download.microsoft.com/download/d/3/4/d342efa6-3266-4157-a2ec-517486… CDPath = none + +[Section.0407] +Licence = Unbekannt +Description = Visual Studio 2005 Laufzeitsystem +Size = Unbekannt +URLSite = Unbekannt Modified: trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2005sp1run.txt [iso-8859-1] Thu Aug 20 18:40:57 2009 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = Visual Studio 2005 Runtime SP1 @@ -10,3 +10,9 @@ URLSite = Unknown URLDownload = http://download.microsoft.com/download/e/1/c/e1c773de-73ba-494a-a5ba-f24906… CDPath = none + +[Section.0407] +Licence = Unbekannt +Description = Visual Studio 2005 Laufzeitsystem SP1 +Size = Unbekannt +URLSite = Unbekannt Modified: trunk/reactos/base/applications/rapps/rapps/vc2008run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc2008run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc2008run.txt [iso-8859-1] Thu Aug 20 18:40:57 2009 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = Visual Studio 2008 Runtime @@ -10,3 +10,9 @@ URLSite = Unknown URLDownload = http://download.microsoft.com/download/1/1/1/1116b75a-9ec3-481a-a3c8-1777b5… CDPath = none + +[Section.0407] +Licence = Unbekannt +Description = Visual Studio 2008 Laufzeitsystem +Size = Unbekannt +URLSite = Unbekannt Modified: trunk/reactos/base/applications/rapps/rapps/vc6run.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/vc6run.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/vc6run.txt [iso-8859-1] Thu Aug 20 18:40:57 2009 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = Visual Studio 6 Runtime @@ -10,3 +10,9 @@ URLSite = Unknown URLDownload = http://download.microsoft.com/download/vc60pro/update/1/w9xnt4/en-us/vc6red… CDPath = none + +[Section.0407] +Licence = Unbekannt +Description = Visual Studio 6 Laufzeitsystem +Size = Unbekannt +URLSite = Unbekannt Modified: trunk/reactos/base/applications/rapps/rapps/winboard.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/winboard.txt [iso-8859-1] Thu Aug 20 18:40:57 2009 @@ -1,4 +1,4 @@ -ï»¿; UTF-8 +; UTF-8 [Section] Name = WinBoard @@ -10,3 +10,10 @@ URLSite = Unknown URLDownload = http://ftp.gnu.org/gnu/winboard/winboard-4_2_7b.exe CDPath = none + +[Section.0407] +Description = WinBoard ist ein grafisches Schachbrett fÃ¼r Windows/ReactOS welches als Nutzerinterface fÃ¼r GNU Chess, Crafty oder andere Schachprogramme, fÃ¼r Internet Schachserver und fÃ¼r Briefschach dient. +Size = Unbekannt +URLSite = Unbekannt + +

1 0

[sginsberg] 42808: - Get rid of some more assumptions that the default calling convention is stdcall
by sginsberg＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: sginsberg Date: Thu Aug 20 16:45:32 2009 New Revision: 42808 URL: http://svn.reactos.org/svn/reactos?rev=42808&view=rev Log: - Get rid of some more assumptions that the default calling convention is stdcall Modified: trunk/reactos/include/ddk/punknown.h trunk/reactos/include/ddk/unknown.h trunk/reactos/include/reactos/subsys/csr/server.h Modified: trunk/reactos/include/ddk/punknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/punknown.h?rev… ============================================================================== --- trunk/reactos/include/ddk/punknown.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/punknown.h [iso-8859-1] Thu Aug 20 16:45:32 2009 @@ -80,7 +80,7 @@ Constructor callback definition */ -typedef HRESULT (*PFNCREATEINSTANCE)( +typedef HRESULT (NTAPI *PFNCREATEINSTANCE)( OUT PUNKNOWN* Unknown, IN REFCLSID ClassId, IN PUNKNOWN OuterUnknown, Modified: trunk/reactos/include/ddk/unknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/unknown.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/unknown.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/unknown.h [iso-8859-1] Thu Aug 20 16:45:32 2009 @@ -44,7 +44,7 @@ typedef IUnknown *PUNKNOWN; typedef HRESULT -(*PFNCREATEINSTANCE) +(NTAPI *PFNCREATEINSTANCE) ( OUT PUNKNOWN * Unknown, IN REFCLSID ClassId, Modified: trunk/reactos/include/reactos/subsys/csr/server.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr… ============================================================================== --- trunk/reactos/include/reactos/subsys/csr/server.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/subsys/csr/server.h [iso-8859-1] Thu Aug 20 16:45:32 2009 @@ -107,7 +107,7 @@ /* FUNCTION TYPES ************************************************************/ typedef NTSTATUS -(*PCSR_CONNECT_CALLBACK)( +(NTAPI *PCSR_CONNECT_CALLBACK)( IN PCSR_PROCESS CsrProcess, IN OUT PVOID ConnectionInfo, IN OUT PULONG ConnectionInfoLength @@ -115,25 +115,25 @@ typedef VOID -(*PCSR_DISCONNECT_CALLBACK)(IN PCSR_PROCESS CsrProcess); - -typedef -NTSTATUS -(*PCSR_NEWPROCESS_CALLBACK)( +(NTAPI *PCSR_DISCONNECT_CALLBACK)(IN PCSR_PROCESS CsrProcess); + +typedef +NTSTATUS +(NTAPI *PCSR_NEWPROCESS_CALLBACK)( IN PCSR_PROCESS Parent, IN PCSR_PROCESS CsrProcess ); typedef VOID -(*PCSR_HARDERROR_CALLBACK)( +(NTAPI *PCSR_HARDERROR_CALLBACK)( IN PCSR_THREAD CsrThread, IN PHARDERROR_MSG HardErrorMessage ); typedef ULONG -(*PCSR_SHUTDOWNPROCESS_CALLBACK)( +(NTAPI *PCSR_SHUTDOWNPROCESS_CALLBACK)( IN PCSR_PROCESS CsrProcess, IN ULONG Flags, IN BOOLEAN FirstPhase

1 0

[sginsberg] 42807: - Get rid of DECLSPEC_EXPORT from DDK - "Isolate Hal* #defines, which are absent in WDK, they should not be used in kernel development." No, exactly, and they shouldn't be used in Xbox HAL either
by sginsberg＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: sginsberg Date: Thu Aug 20 15:57:16 2009 New Revision: 42807 URL: http://svn.reactos.org/svn/reactos?rev=42807&view=rev Log: - Get rid of DECLSPEC_EXPORT from DDK - "Isolate Hal* #defines, which are absent in WDK, they should not be used in kernel development." No, exactly, and they shouldn't be used in Xbox HAL either Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c trunk/reactos/include/ddk/ntdef.h trunk/reactos/include/ddk/winddk.h Modified: trunk/reactos/hal/halx86/xbox/part_xbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/xbox/part_xbox.… ============================================================================== --- trunk/reactos/hal/halx86/xbox/part_xbox.c [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/xbox/part_xbox.c [iso-8859-1] Thu Aug 20 15:57:16 2009 @@ -304,7 +304,10 @@ return STATUS_ACCESS_DENIED; } -#define HalExamineMBR HALDISPATCH->HalExamineMBR +#define HalExamineMBR HALDISPATCH->HalExamineMBR +#define HalIoReadPartitionTable HALDISPATCH->HalIoReadPartitionTable +#define HalIoSetPartitionInformation HALDISPATCH->HalIoSetPartitionInformation +#define HalIoWritePartitionTable HALDISPATCH->HalIoWritePartitionTable void HalpXboxInitPartIo(void) Modified: trunk/reactos/include/ddk/ntdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntdef.h?rev=42… ============================================================================== --- trunk/reactos/include/ddk/ntdef.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntdef.h [iso-8859-1] Thu Aug 20 15:57:16 2009 @@ -193,7 +193,6 @@ // Done the same way as in windef.h for now #define DECLSPEC_IMPORT __declspec(dllimport) -#define DECLSPEC_EXPORT __declspec(dllexport) #define DECLSPEC_NORETURN __declspec(noreturn) Modified: trunk/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/winddk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/winddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/winddk.h [iso-8859-1] Thu Aug 20 15:57:16 2009 @@ -2855,7 +2855,7 @@ extern NTSYSAPI PHAL_DISPATCH HalDispatchTable; #define HALDISPATCH ((PHAL_DISPATCH)&HalDispatchTable) #else -extern DECLSPEC_EXPORT HAL_DISPATCH HalDispatchTable; +extern __declspec(dllexport) HAL_DISPATCH HalDispatchTable; #define HALDISPATCH (&HalDispatchTable) #endif @@ -2876,14 +2876,6 @@ #define HalMirrorPhysicalMemory HALDISPATCH->HalMirrorPhysicalMemory #define HalEndOfBoot HALDISPATCH->HalEndOfBoot #define HalMirrorVerify HALDISPATCH->HalMirrorVerify - -#ifndef _NTOSKRNL_ -#define HalDeviceControl HALDISPATCH->HalDeviceControl -#define HalIoAssignDriveLetters HALDISPATCH->HalIoAssignDriveLetters -#define HalIoReadPartitionTable HALDISPATCH->HalIoReadPartitionTable -#define HalIoSetPartitionInformation HALDISPATCH->HalIoSetPartitionInformation -#define HalIoWritePartitionTable HALDISPATCH->HalIoWritePartitionTable -#endif typedef enum _FILE_INFORMATION_CLASS { FileDirectoryInformation = 1,

1 0

[sginsberg] 42806: - Remove usage of dllexport for most dlls and drivers -- we use .def/.spec instead.
by sginsberg＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: sginsberg Date: Thu Aug 20 15:45:01 2009 New Revision: 42806 URL: http://svn.reactos.org/svn/reactos?rev=42806&view=rev Log: - Remove usage of dllexport for most dlls and drivers -- we use .def/.spec instead. Modified: trunk/reactos/include/ddk/cfgmgr32.h trunk/reactos/include/ddk/hidpi.h trunk/reactos/include/ddk/mcd.h trunk/reactos/include/ddk/ndis.h trunk/reactos/include/ddk/smbus.h trunk/reactos/include/ddk/storport.h trunk/reactos/include/ddk/tdikrnl.h trunk/reactos/include/ddk/upssvc.h trunk/reactos/include/ddk/usbcamdi.h trunk/reactos/include/psdk/authz.h trunk/reactos/include/psdk/batclass.h Modified: trunk/reactos/include/ddk/cfgmgr32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/cfgmgr32.h?rev… ============================================================================== --- trunk/reactos/include/ddk/cfgmgr32.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/cfgmgr32.h [iso-8859-1] Thu Aug 20 15:45:01 2009 @@ -30,7 +30,7 @@ #endif #if defined(_CFGMGR32_) -#define CMAPI DECLSPEC_EXPORT +#define CMAPI #else #define CMAPI DECLSPEC_IMPORT #endif Modified: trunk/reactos/include/ddk/hidpi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/hidpi.h?rev=42… ============================================================================== --- trunk/reactos/include/ddk/hidpi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/hidpi.h [iso-8859-1] Thu Aug 20 15:45:01 2009 @@ -30,7 +30,7 @@ #endif #if defined(_HIDPI_) - #define HIDAPI DECLSPEC_EXPORT + #define HIDAPI #else #define HIDAPI DECLSPEC_IMPORT #endif Modified: trunk/reactos/include/ddk/mcd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/mcd.h?rev=4280… ============================================================================== --- trunk/reactos/include/ddk/mcd.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/mcd.h [iso-8859-1] Thu Aug 20 15:45:01 2009 @@ -32,7 +32,7 @@ #endif #if defined(_MCD_) - #define CHANGERAPI DECLSPEC_EXPORT + #define CHANGERAPI #else #define CHANGERAPI DECLSPEC_IMPORT #endif Modified: trunk/reactos/include/ddk/ndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ndis.h?rev=428… ============================================================================== --- trunk/reactos/include/ddk/ndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ndis.h [iso-8859-1] Thu Aug 20 15:45:01 2009 @@ -47,7 +47,7 @@ #endif #if defined(NDIS_WRAPPER) - #define NDISAPI DECLSPEC_EXPORT + #define NDISAPI #else #define NDISAPI DECLSPEC_IMPORT #endif Modified: trunk/reactos/include/ddk/smbus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/smbus.h?rev=42… ============================================================================== --- trunk/reactos/include/ddk/smbus.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/smbus.h [iso-8859-1] Thu Aug 20 15:45:01 2009 @@ -30,7 +30,7 @@ #if !defined(SMBCLASS) #define SMBCLASSAPI DECLSPEC_IMPORT #else - #define SMBCLASSAPI DECLSPEC_EXPORT + #define SMBCLASSAPI #endif #define SMB_BUS_REQUEST \ Modified: trunk/reactos/include/ddk/storport.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/storport.h?rev… ============================================================================== --- trunk/reactos/include/ddk/storport.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/storport.h [iso-8859-1] Thu Aug 20 15:45:01 2009 @@ -30,7 +30,7 @@ #endif #if defined(_STORPORT_) - #define STORPORTAPI DECLSPEC_EXPORT + #define STORPORTAPI #else #define STORPORTAPI DECLSPEC_IMPORT #endif Modified: trunk/reactos/include/ddk/tdikrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/tdikrnl.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/tdikrnl.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/tdikrnl.h [iso-8859-1] Thu Aug 20 15:45:01 2009 @@ -30,7 +30,7 @@ #endif #if defined(_TDI_) - #define TDIKRNLAPI DECLSPEC_EXPORT + #define TDIKRNLAPI #else #define TDIKRNLAPI DECLSPEC_IMPORT #endif Modified: trunk/reactos/include/ddk/upssvc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/upssvc.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/upssvc.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/upssvc.h [iso-8859-1] Thu Aug 20 15:45:01 2009 @@ -28,7 +28,7 @@ #endif #if defined(_APCUPS_) - #define UPSAPI DECLSPEC_EXPORT + #define UPSAPI #else #define UPSAPI DECLSPEC_IMPORT #endif Modified: trunk/reactos/include/ddk/usbcamdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/usbcamdi.h?rev… ============================================================================== --- trunk/reactos/include/ddk/usbcamdi.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/usbcamdi.h [iso-8859-1] Thu Aug 20 15:45:01 2009 @@ -34,7 +34,7 @@ #pragma pack(push,4) #if defined(_BATTERYCLASS_) - #define USBCAMAPI DECLSPEC_EXPORT + #define USBCAMAPI #else #define USBCAMAPI DECLSPEC_IMPORT #endif Modified: trunk/reactos/include/psdk/authz.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/authz.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/authz.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/authz.h [iso-8859-1] Thu Aug 20 15:45:01 2009 @@ -20,7 +20,7 @@ #if !defined(_AUTHZ_) #define AUTHZAPI DECLSPEC_IMPORT #else -#define AUTHZAPI DECLSPEC_EXPORT +#define AUTHZAPI #endif #ifdef __cplusplus Modified: trunk/reactos/include/psdk/batclass.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/batclass.h?re… ============================================================================== --- trunk/reactos/include/psdk/batclass.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/batclass.h [iso-8859-1] Thu Aug 20 15:45:01 2009 @@ -28,7 +28,7 @@ #endif #if defined(_BATTERYCLASS_) - #define BCLASSAPI DECLSPEC_EXPORT + #define BCLASSAPI #else #define BCLASSAPI DECLSPEC_IMPORT #endif

1 0

[janderwald] 42805: - Implement KsCopyObjectBagItems
by janderwald＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: janderwald Date: Thu Aug 20 15:21:24 2009 New Revision: 42805 URL: http://svn.reactos.org/svn/reactos?rev=42805&view=rev Log: - Implement KsCopyObjectBagItems Modified: trunk/reactos/drivers/ksfilter/ks/bag.c Modified: trunk/reactos/drivers/ksfilter/ks/bag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/bag.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/bag.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/bag.c [iso-8859-1] Thu Aug 20 15:21:24 2009 @@ -235,7 +235,7 @@ } /* - @unimplemented + @implemented */ KSDDKAPI NTSTATUS @@ -244,8 +244,55 @@ IN KSOBJECT_BAG ObjectBagDestination, IN KSOBJECT_BAG ObjectBagSource) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + PKSIOBJECT_BAG ObjectBagDest, ObjectBagSrc; + PLIST_ENTRY Entry; + PKSIOBJECT_BAG_ENTRY BagEntry; + NTSTATUS Status = STATUS_SUCCESS; + + /* get object bag src */ + ObjectBagSrc = (PKSIOBJECT_BAG)ObjectBagSource; + + /* get object bag dst */ + ObjectBagDest = (PKSIOBJECT_BAG)ObjectBagDestination; + + /* acquire source mutex */ + KeWaitForSingleObject(ObjectBagSrc->BagMutex, Executive, KernelMode, FALSE, NULL); + + if (ObjectBagSrc->BagMutex != ObjectBagDest->BagMutex) + { + /* acquire destination mutex */ + KeWaitForSingleObject(ObjectBagDest->BagMutex, Executive, KernelMode, FALSE, NULL); + } + + /* point to first item */ + Entry = ObjectBagSrc->ObjectList.Flink; + /* first scan the list if the item is already inserted */ + while(Entry != &ObjectBagSrc->ObjectList) + { + /* get bag entry */ + BagEntry = (PKSIOBJECT_BAG_ENTRY)CONTAINING_RECORD(Entry, KSIOBJECT_BAG_ENTRY, Entry); + + /* add the item */ + Status = KsAddItemToObjectBag(ObjectBagDestination, BagEntry->Item, BagEntry->Free); + + /* check for success */ + if (!NT_SUCCESS(Status)) + break; + + /* move to next entry */ + Entry = Entry->Flink; + } + + if (ObjectBagSrc->BagMutex != ObjectBagDest->BagMutex) + { + /* release destination mutex */ + KeReleaseMutex(ObjectBagDest->BagMutex, FALSE); + } + + /* release source mutex */ + KeReleaseMutex(ObjectBagSrc->BagMutex, FALSE); + + return Status; } /*

1 0

[janderwald] 42804: - Implement DllInitialize
by janderwald＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: janderwald Date: Thu Aug 20 14:38:52 2009 New Revision: 42804 URL: http://svn.reactos.org/svn/reactos?rev=42804&view=rev Log: - Implement DllInitialize Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.c trunk/reactos/drivers/multimedia/bdasup/bdasup.spec Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/bdasup/… ============================================================================== --- trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] Thu Aug 20 14:38:52 2009 @@ -154,6 +154,21 @@ */ NTSTATUS NTAPI +DllInitialize( + PUNICODE_STRING RegistryPath) +{ + KeInitializeSpinLock(&g_Settings.FilterFactoryInstanceListLock); + InitializeListHead(&g_Settings.FilterFactoryInstanceList); + g_Settings.Initialized = TRUE; + + return STATUS_SUCCESS; +} + +/* + @implemented +*/ +NTSTATUS +NTAPI BdaCheckChanges(IN PIRP Irp) { if (!Irp) Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/bdasup/… ============================================================================== --- trunk/reactos/drivers/multimedia/bdasup/bdasup.spec [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/bdasup/bdasup.spec [iso-8859-1] Thu Aug 20 14:38:52 2009 @@ -1,3 +1,4 @@ +@ stdcall DllInitialize(ptr) @ stdcall BdaCheckChanges(ptr) @ stdcall BdaCommitChanges(ptr) @ stdcall BdaCreateFilterFactory(ptr ptr ptr)

1 0

[sginsberg] 42803: - Release ntddsnd.h, portcls.h. punknown.h and stdunk.h to the public domain (silverblade and janderwald have agreed to this).
by sginsberg＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: sginsberg Date: Thu Aug 20 14:27:08 2009 New Revision: 42803 URL: http://svn.reactos.org/svn/reactos?rev=42803&view=rev Log: - Release ntddsnd.h, portcls.h. punknown.h and stdunk.h to the public domain (silverblade and janderwald have agreed to this). Modified: trunk/reactos/include/ddk/ntddsnd.h trunk/reactos/include/ddk/portcls.h trunk/reactos/include/ddk/punknown.h trunk/reactos/include/ddk/stdunk.h Modified: trunk/reactos/include/ddk/ntddsnd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddsnd.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/ntddsnd.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddsnd.h [iso-8859-1] Thu Aug 20 14:27:08 2009 @@ -1,6 +1,8 @@ /* ReactOS Sound System NT4 Multimedia Audio Support (ntddsnd.h) + + This file is in the public domain. Author: Andrew Greenwood (andrew.greenwood(a)silverblade.co.uk) Modified: trunk/reactos/include/ddk/portcls.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/portcls.h?rev=… ============================================================================== --- trunk/reactos/include/ddk/portcls.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/portcls.h [iso-8859-1] Thu Aug 20 14:27:08 2009 @@ -1,6 +1,8 @@ /* ReactOS Kernel Streaming Port Class + + This file is in the public domain. Andrew Greenwood Modified: trunk/reactos/include/ddk/punknown.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/punknown.h?rev… ============================================================================== --- trunk/reactos/include/ddk/punknown.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/punknown.h [iso-8859-1] Thu Aug 20 14:27:08 2009 @@ -2,7 +2,7 @@ ReactOS Kernel-Mode COM by Andrew Greenwood - Please see COPYING in the top-level directory for license information. + This file is in the public domain. */ #ifndef _UNKNOWN_H_ Modified: trunk/reactos/include/ddk/stdunk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/stdunk.h?rev=4… ============================================================================== --- trunk/reactos/include/ddk/stdunk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/stdunk.h [iso-8859-1] Thu Aug 20 14:27:08 2009 @@ -2,8 +2,7 @@ ReactOS Kernel-Mode COM IUnknown implementations - LICENSE - Please see COPYING in the top-level directory for license information. + This file is in the public domain. AUTHORS Andrew Greenwood

1 0

[janderwald] 42802: - Define automation tables for Filter & Pin - Plug in automation tables when creating a new filter factory / pin
by janderwald＠svn.reactos.org 20 Aug '09

20 Aug '09

Author: janderwald Date: Thu Aug 20 14:26:09 2009 New Revision: 42802 URL: http://svn.reactos.org/svn/reactos?rev=42802&view=rev Log: - Define automation tables for Filter & Pin - Plug in automation tables when creating a new filter factory / pin Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.c Modified: trunk/reactos/drivers/multimedia/bdasup/bdasup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/bdasup/… ============================================================================== --- trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] (original) +++ trunk/reactos/drivers/multimedia/bdasup/bdasup.c [iso-8859-1] Thu Aug 20 14:26:09 2009 @@ -1,11 +1,93 @@ #include "precomp.h" + +const GUID KSPROPSETID_BdaPinControl = {0xded49d5, 0xa8b7, 0x4d5d, {0x97, 0xa1, 0x12, 0xb0, 0xc1, 0x95, 0x87, 0x4d}}; +const GUID KSMETHODSETID_BdaDeviceConfiguration = {0x71985f45, 0x1ca1, 0x11d3, {0x9c, 0xc8, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0}}; +const GUID KSPROPSETID_BdaTopology = {0xa14ee835, 0x0a23, 0x11d3, {0x9c, 0xc7, 0x0, 0xc0, 0x4f, 0x79, 0x71, 0xe0}}; BDA_GLOBAL g_Settings = { 0, 0, {NULL, NULL} +}; + +KSPROPERTY_ITEM FilterPropertyItem[] = +{ + DEFINE_KSPROPERTY_ITEM_BDA_NODE_TYPES(BdaPropertyNodeTypes, NULL), + DEFINE_KSPROPERTY_ITEM_BDA_PIN_TYPES( BdaPropertyPinTypes, NULL), + DEFINE_KSPROPERTY_ITEM_BDA_TEMPLATE_CONNECTIONS(BdaPropertyTemplateConnections, NULL), + DEFINE_KSPROPERTY_ITEM_BDA_NODE_METHODS(BdaPropertyNodeMethods, NULL), + DEFINE_KSPROPERTY_ITEM_BDA_NODE_PROPERTIES(BdaPropertyNodeProperties, NULL), + DEFINE_KSPROPERTY_ITEM_BDA_NODE_EVENTS(BdaPropertyNodeEvents, NULL), + DEFINE_KSPROPERTY_ITEM_BDA_CONTROLLING_PIN_ID(BdaPropertyGetControllingPinId, NULL), + DEFINE_KSPROPERTY_ITEM_BDA_NODE_DESCRIPTORS(BdaPropertyNodeDescriptors, NULL) +}; + + +KSPROPERTY_SET FilterPropertySet = +{ + &KSPROPSETID_BdaTopology, + 8, + FilterPropertyItem, + 0, + NULL +}; + +KSMETHOD_ITEM FilterMethodItem[] = +{ + //DEFINE_KSMETHOD_ITEM_BDA_CREATE_PIN_FACTORY(BdaMethodCreatePin, NULL), + DEFINE_KSMETHOD_ITEM_BDA_CREATE_TOPOLOGY(BdaMethodCreateTopology, NULL) +}; + +KSMETHOD_SET FilterMethodSet = +{ + &KSMETHODSETID_BdaDeviceConfiguration, + 2, + FilterMethodItem, + 0, + NULL +}; + +KSAUTOMATION_TABLE FilterAutomationTable = +{ + 1, + sizeof(KSPROPERTY_SET), + &FilterPropertySet, + 1, + sizeof(KSMETHOD_SET), + &FilterMethodSet, + 0, + sizeof(KSEVENT_SET), + NULL +}; + +KSPROPERTY_ITEM PinPropertyItem[] = +{ + DEFINE_KSPROPERTY_ITEM_BDA_PIN_ID(BdaPropertyGetPinControl, NULL), + DEFINE_KSPROPERTY_ITEM_BDA_PIN_TYPE(BdaPropertyGetPinControl, NULL) +}; + +KSPROPERTY_SET PinPropertySet = +{ + &KSPROPSETID_BdaPinControl, + 2, + PinPropertyItem, + 0, + NULL +}; + +KSAUTOMATION_TABLE PinAutomationTable = +{ + 1, + sizeof(KSPROPERTY_SET), + &PinPropertySet, + 0, + sizeof(KSMETHOD_SET), + NULL, + 0, + sizeof(KSEVENT_SET), + NULL }; @@ -158,10 +240,17 @@ PBDA_FILTER_INSTANCE_ENTRY FilterInstance; KIRQL OldLevel; NTSTATUS Status; - - /* FIXME provide a default automation table - * to handle requests which the driver doesnt implement - */ + KSFILTER_DESCRIPTOR FilterDescriptor; + + /* backup filter descriptor */ + RtlMoveMemory(&FilterDescriptor, pFilterDescriptor, sizeof(KSFILTER_DESCRIPTOR)); + + /* merge the automation tables */ + Status = KsMergeAutomationTables((PKSAUTOMATION_TABLE*)&FilterDescriptor.AutomationTable, (PKSAUTOMATION_TABLE)pFilterDescriptor->AutomationTable, &FilterAutomationTable, NULL); + + /* check for success */ + if (!NT_SUCCESS(Status)) + return Status; /* allocate filter instance */ FilterInstance = AllocateItem(NonPagedPool, sizeof(BDA_FILTER_INSTANCE_ENTRY)); @@ -172,7 +261,7 @@ } /* create the filter factory */ - Status = KsCreateFilterFactory(pKSDevice->FunctionalDeviceObject, pFilterDescriptor, NULL, NULL, 0, NULL, NULL, &FilterFactory); + Status = KsCreateFilterFactory(pKSDevice->FunctionalDeviceObject, &FilterDescriptor, NULL, NULL, 0, NULL, NULL, &FilterFactory); /* check for success */ if (NT_SUCCESS(Status)) @@ -233,14 +322,10 @@ PBDA_FILTER_INSTANCE_ENTRY InstanceEntry; NTSTATUS Status; ULONG PinId; + KSPIN_DESCRIPTOR_EX NewPinDescriptor; if (!pulPinId || !pKSFilter) return STATUS_INVALID_PARAMETER; - - - /* FIXME provide a default automation table - * to handle requests which the driver doesnt implement - */ /* get parent filter factory */ FilterFactory = KsFilterGetParentFilterFactory(pKSFilter); @@ -281,15 +366,26 @@ /* get pin descriptor */ PinDescriptor = (PKSPIN_DESCRIPTOR_EX)&InstanceEntry->FilterTemplate->pFilterDescriptor->PinDescriptors[ulPinType]; - /* create the pin factory */ - Status = KsFilterCreatePinFactory(pKSFilter, PinDescriptor, &PinId); + /* make a copy of the pin descriptor */ + RtlMoveMemory(&NewPinDescriptor, PinDescriptor, sizeof(KSPIN_DESCRIPTOR_EX)); + + /* merge the automation tables */ + Status = KsMergeAutomationTables((PKSAUTOMATION_TABLE*)&NewPinDescriptor.AutomationTable, (PKSAUTOMATION_TABLE)PinDescriptor->AutomationTable, &PinAutomationTable, pKSFilter->Bag); /* check for success */ if (NT_SUCCESS(Status)) { - /* store result */ - *pulPinId = PinId; - } + /* create the pin factory */ + Status = KsFilterCreatePinFactory(pKSFilter, &NewPinDescriptor, &PinId); + + /* check for success */ + if (NT_SUCCESS(Status)) + { + /* store result */ + *pulPinId = PinId; + } + } + DPRINT("BdaCreatePin Result %x\n", Status); return Status;

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