Ros-diffs

ros-diffs@reactos.org

81390 discussions

[janderwald] 46576: - Fix trunk installation breakage introduced in 46570
by janderwald＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: janderwald Date: Tue Mar 30 01:08:29 2010 New Revision: 46576 URL: http://svn.reactos.org/svn/reactos?rev=46576&view=rev Log: - Fix trunk installation breakage introduced in 46570 Modified: trunk/reactos/media/inf/syssetup.inf.tpl Modified: trunk/reactos/media/inf/syssetup.inf.tpl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf.tpl… ============================================================================== Binary files - no diff available.

1 0

[jgardou] 46575: [WIN32K] DC_SetOwnerShip : return FALSE on failure
by jgardou＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: jgardou Date: Mon Mar 29 23:53:24 2010 New Revision: 46575 URL: http://svn.reactos.org/svn/reactos?rev=46575&view=rev Log: [WIN32K] DC_SetOwnerShip : return FALSE on failure Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dclife.c [iso-8859-1] Mon Mar 29 23:53:24 2010 @@ -386,7 +386,7 @@ INT Index; PGDI_TABLE_ENTRY Entry; PDC pDC; - BOOL ret; + BOOL ret = FALSE; /* FIXME: This function has broken error handling */

1 0

[sir_richard] 46574: [HALACPI]: Add project, right now it just builds the normal HAL. The idea is to split the generic HAL into legacy (x86 only) and ACPI (x86+ACPI, or x64). Bus handling, reboot/shutdown, PnP, power management (sleep/resume/hibernate), timer, environment variable, debugging, and initialization code is expected to differ between legacy and ACPI, if not more.
by sir_richard＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: sir_richard Date: Mon Mar 29 23:35:31 2010 New Revision: 46574 URL: http://svn.reactos.org/svn/reactos?rev=46574&view=rev Log: [HALACPI]: Add project, right now it just builds the normal HAL. The idea is to split the generic HAL into legacy (x86 only) and ACPI (x86+ACPI, or x64). Bus handling, reboot/shutdown, PnP, power management (sleep/resume/hibernate), timer, environment variable, debugging, and initialization code is expected to differ between legacy and ACPI, if not more. Added: trunk/reactos/hal/halx86/generic/acpi/ trunk/reactos/hal/halx86/generic/legacy/ trunk/reactos/hal/halx86/halacpi.rbuild (with props) Modified: trunk/reactos/hal/halx86/directory.rbuild trunk/reactos/hal/halx86/hal.rbuild trunk/reactos/hal/halx86/hal_generic.rbuild trunk/reactos/hal/halx86/halamd64.rbuild trunk/reactos/hal/halx86/halmps.rbuild trunk/reactos/hal/halx86/halxbox.rbuild Modified: trunk/reactos/hal/halx86/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/directory.rbuil… ============================================================================== --- trunk/reactos/hal/halx86/directory.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/directory.rbuild [iso-8859-1] Mon Mar 29 23:35:31 2010 @@ -8,6 +8,7 @@ <if property="ARCH" value="i386"> <xi:include href="hal.rbuild" /> + <xi:include href="halacpi.rbuild" /> <xi:include href="halxbox.rbuild" /> <if property="BUILD_MP" value="1"> <xi:include href="halmps.rbuild" /> Modified: trunk/reactos/hal/halx86/hal.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal.rbuild?rev=… ============================================================================== --- trunk/reactos/hal/halx86/hal.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal.rbuild [iso-8859-1] Mon Mar 29 23:35:31 2010 @@ -8,7 +8,7 @@ <include base="ntoskrnl">include</include> <define name="_NTHALDLL_" /> <define name="_NTHAL_" /> - <library>hal_generic</library> + <library>hal_generic_legacy</library> <library>hal_generic_up</library> <library>ntoskrnl</library> <library>libcntpr</library> Modified: trunk/reactos/hal/halx86/hal_generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/hal_generic.rbu… ============================================================================== --- trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/hal_generic.rbuild [iso-8859-1] Mon Mar 29 23:35:31 2010 @@ -1,7 +1,53 @@ <?xml version="1.0"?> <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> <group> - <module name="hal_generic" type="objectlibrary"> + <module name="hal_generic_legacy" type="objectlibrary"> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_NTHALDLL_" /> + <define name="_NTHAL_" /> + <directory name="generic"> + <directory name="bus"> + <file>bushndlr.c</file> + <file>isabus.c</file> + <file>halbus.c</file> + <file>pcibus.c</file> + <file>pcidata.c</file> + <file>sysbus.c</file> + </directory> + <file>beep.c</file> + <file>bios.c</file> + <file>cmos.c</file> + <file>display.c</file> + <file>dma.c</file> + <file>drive.c</file> + <file>halinit.c</file> + <file>misc.c</file> + <file>profil.c</file> + <file>reboot.c</file> + <file>sysinfo.c</file> + <file>timer.c</file> + <file>usage.c</file> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>portio.c</file> + <file>systimer.S</file> + <file>trap.S</file> + </directory> + </if> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file>x86bios.c</file> + <file>systimer.S</file> + </directory> + </if> + </directory> + <directory name="include"> + <pch>hal.h</pch> + </directory> + </module> + + <module name="hal_generic_acpi" type="objectlibrary"> <include>include</include> <include base="ntoskrnl">include</include> <define name="_NTHALDLL_" /> Added: trunk/reactos/hal/halx86/halacpi.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halacpi.rbuild?… ============================================================================== --- trunk/reactos/hal/halx86/halacpi.rbuild (added) +++ trunk/reactos/hal/halx86/halacpi.rbuild [iso-8859-1] Mon Mar 29 23:35:31 2010 @@ -1,0 +1,20 @@ +<?xml version="1.0"?> +<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd"> +<group xmlns:xi="http://www.w3.org/2001/XInclude"> + <module name="halacpi" type="kernelmodedll" entrypoint="HalInitSystem@8" installbase="system32" installname="halacpi.dll"> + <importlibrary base="hal" definition="../hal.pspec" /> + <bootstrap installbase="$(CDOUTPUT)" /> + <include>include</include> + <include base="ntoskrnl">include</include> + <define name="_NTHALDLL_" /> + <define name="_NTHAL_" /> + <library>hal_generic_acpi</library> + <library>hal_generic_up</library> + <library>ntoskrnl</library> + <library>libcntpr</library> + <directory name="up"> + <file>halinit_up.c</file> + <file>halup.rc</file> + </directory> + </module> +</group> Propchange: trunk/reactos/hal/halx86/halacpi.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/hal/halx86/halamd64.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halamd64.rbuild… ============================================================================== --- trunk/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halamd64.rbuild [iso-8859-1] Mon Mar 29 23:35:31 2010 @@ -10,7 +10,7 @@ <define name="_DISABLE_TIDENTS" /> <define name="_NTHAL_" /> <define name="_X86BIOS_" /> - <library>hal_generic</library> + <library>hal_generic_acpi</library> <library>hal_generic_up</library> <library>ntoskrnl</library>  Modified: trunk/reactos/hal/halx86/halmps.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halmps.rbuild?r… ============================================================================== --- trunk/reactos/hal/halx86/halmps.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halmps.rbuild [iso-8859-1] Mon Mar 29 23:35:31 2010 @@ -9,7 +9,7 @@ <define name="CONFIG_SMP" /> <define name="_NTHALDLL_" /> <define name="_NTHAL_" /> - <library>hal_generic</library> + <library>hal_generic_legacy</library> <library>hal_generic_mp</library> <library>ntoskrnl</library> <library>libcntpr</library> Modified: trunk/reactos/hal/halx86/halxbox.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/halxbox.rbuild?… ============================================================================== --- trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/halxbox.rbuild [iso-8859-1] Mon Mar 29 23:35:31 2010 @@ -8,7 +8,7 @@ <define name="_NTHALDLL_" /> <define name="_NTHAL_" /> <define name="SARCH_XBOX" /> - <library>hal_generic</library> + <library>hal_generic_legacy</library> <library>hal_generic_up</library> <library>ntoskrnl</library> <library>libcntpr</library>

1 0

[jgardou] 46573: [WIN32K] Free the surface instead of unlocking it
by jgardou＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: jgardou Date: Mon Mar 29 21:50:49 2010 New Revision: 46573 URL: http://svn.reactos.org/svn/reactos?rev=46573&view=rev Log: [WIN32K] Free the surface instead of unlocking it Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] Mon Mar 29 21:50:49 2010 @@ -52,13 +52,15 @@ /* Decrease reference count */ --ppdev->cPdevRefs; + ASSERT(ppdev->cPdevRefs >= 0) ; + /* Check if references are left */ if (ppdev->cPdevRefs == 0) { /* Release surface */ if(ppdev->pSurface) { - SURFACE_ShareUnlockSurface(ppdev->pSurface); + SURFACE_FreeSurface(ppdev->pSurface); ppdev->pfn.DisableSurface(ppdev->dhpdev); }

1 0

[jgardou] 46572: [WIN32K] Implement releasing PDEVOBJs
by jgardou＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: jgardou Date: Mon Mar 29 20:56:02 2010 New Revision: 46572 URL: http://svn.reactos.org/svn/reactos?rev=46572&view=rev Log: [WIN32K] Implement releasing PDEVOBJs Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] Mon Mar 29 20:56:02 2010 @@ -34,9 +34,9 @@ ppdev = ExAllocatePoolWithTag(PagedPool, sizeof(PDEVOBJ), GDITAG_PDEV); if (!ppdev) return NULL; - + RtlZeroMemory(ppdev, sizeof(PDEVOBJ)); - + ppdev->cPdevRefs = 1; return ppdev; @@ -51,13 +51,44 @@ /* Decrease reference count */ --ppdev->cPdevRefs; - + /* Check if references are left */ if (ppdev->cPdevRefs == 0) { - // FIXME: should delete the PDEV now - UNIMPLEMENTED; - ASSERT(FALSE); + /* Release surface */ + if(ppdev->pSurface) + { + SURFACE_ShareUnlockSurface(ppdev->pSurface); + ppdev->pfn.DisableSurface(ppdev->dhpdev); + } + + /* Disable PDEV */ + ppdev->pfn.DisablePDEV(ppdev->dhpdev); + + /* Remove it from list */ + if( ppdev == gppdevList ) + gppdevList = ppdev->ppdevNext ; + else + { + PPDEVOBJ ppdevCurrent = gppdevList; + BOOL found = FALSE ; + while (!found && ppdevCurrent->ppdevNext) + { + if (ppdevCurrent->ppdevNext == ppdev) + found = TRUE; + else + ppdevCurrent = ppdevCurrent->ppdevNext ; + } + if(found) + ppdevCurrent->ppdevNext = ppdev->ppdevNext; + } + + /* Is this the primary one ? */ + if (ppdev == gppdevPrimary) + gppdevPrimary = NULL; + + /* Free it */ + ExFreePoolWithTag(ppdev, GDITAG_PDEV ); } /* Unlock loader */ @@ -179,7 +210,7 @@ pGraphicsDevice = EngpFindGraphicsDevice(pustrDeviceName, 0, 0); if (!pGraphicsDevice) { - DPRINT1("No GRAPHICS_DEVICE found for %ls!\n", + DPRINT1("No GRAPHICS_DEVICE found for %ls!\n", pustrDeviceName ? pustrDeviceName->Buffer : 0); return NULL; } @@ -267,7 +298,7 @@ ppdev->pfn = ppdev2->pfn; ppdev2->pfn = pdevTmp.pfn; - /* Exchange LDEVs */ + /* Exchange LDEVs */ ppdev->pldev = ppdev2->pldev; ppdev2->pldev = pdevTmp.pldev; @@ -291,8 +322,8 @@ ppdev2->gdiinfo = pdevTmp.gdiinfo; /* Notify each driver instance of its new HDEV association */ - ppdev->pfn.CompletePDEV(ppdev->dhpdev, (HDEV)ppdev); - ppdev2->pfn.CompletePDEV(ppdev2->dhpdev, (HDEV)ppdev2); + ppdev->pfn.CompletePDEV(ppdev->dhpdev, (HDEV)ppdev); + ppdev2->pfn.CompletePDEV(ppdev2->dhpdev, (HDEV)ppdev2); } void @@ -338,11 +369,10 @@ PSURFACE pSurface; BOOL retval = FALSE; - // FIXME: dynamic mode switching is broken, need to fix PDEV locking first! - return FALSE; - /* Lock the PDEV */ EngAcquireSemaphore(ppdev->hsemDevLock); + /* And everything else */ + EngAcquireSemaphore(ghsemPDEV); DPRINT1("PDEVOBJ_bSwitchMode, ppdev = %p, pSurface = %p\n", ppdev, ppdev->pSurface); @@ -385,19 +415,14 @@ /* 8. Disable DirectDraw */ - /* 9. Disable old surface */ - SURFACE_ShareUnlockSurface(ppdevTmp->pSurface); - ppdevTmp->pfn.DisableSurface(ppdevTmp->dhpdev); - - /* 10. Disable old PDEV */ - ppdevTmp->pfn.DisablePDEV(ppdevTmp->dhpdev); -// PDEVOBJ_vReleasePdev(ppdevTmp); + PDEVOBJ_vRelease(ppdevTmp); /* Success! */ retval = TRUE; leave: /* Unlock PDEV */ EngReleaseSemaphore(ppdev->hsemDevLock); + EngReleaseSemaphore(ghsemPDEV); DPRINT1("leave, ppdev = %p, pSurface = %p\n", ppdev, ppdev->pSurface); ASSERT(ppdev->pSurface->BitsLock); @@ -524,8 +549,8 @@ pDevCaps->ulLogPixelsX = pGdiInfo->ulLogPixelsX; pDevCaps->ulLogPixelsY = pGdiInfo->ulLogPixelsY; pDevCaps->ulSizePalette = pGdiInfo->ulNumPalReg; - pDevCaps->ulColorRes = pGdiInfo->ulDACRed + - pGdiInfo->ulDACGreen + + pDevCaps->ulColorRes = pGdiInfo->ulDACRed + + pGdiInfo->ulDACGreen + pGdiInfo->ulDACBlue; pDevCaps->ulPhysicalWidth = pGdiInfo->szlPhysSize.cx; pDevCaps->ulPhysicalHeight = pGdiInfo->szlPhysSize.cy;

1 0

[cgutman] 46571: [NTOSKRNL] - Don't try to detect ACPI in IopEnumerateDetectedDevices because the only reason we got there is because ACPI is NOT present (as reported by IopIsAcpiComputer)
by cgutman＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: cgutman Date: Mon Mar 29 18:56:42 2010 New Revision: 46571 URL: http://svn.reactos.org/svn/reactos?rev=46571&view=rev Log: [NTOSKRNL] - Don't try to detect ACPI in IopEnumerateDetectedDevices because the only reason we got there is because ACPI is NOT present (as reported by IopIsAcpiComputer) Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Mon Mar 29 18:56:42 2010 @@ -2166,11 +2166,6 @@ const UNICODE_STRING IdentifierPci = RTL_CONSTANT_STRING(L"PCI"); UNICODE_STRING HardwareIdPci = RTL_CONSTANT_STRING(L"*PNP0A03\0"); static ULONG DeviceIndexPci = 0; -#ifdef ENABLE_ACPI - const UNICODE_STRING IdentifierAcpi = RTL_CONSTANT_STRING(L"ACPI BIOS"); - UNICODE_STRING HardwareIdAcpi = RTL_CONSTANT_STRING(L"*PNP0C08\0"); - static ULONG DeviceIndexAcpi = 0; -#endif const UNICODE_STRING IdentifierSerial = RTL_CONSTANT_STRING(L"SerialController"); UNICODE_STRING HardwareIdSerial = RTL_CONSTANT_STRING(L"*PNP0501\0"); static ULONG DeviceIndexSerial = 0; @@ -2460,14 +2455,6 @@ DeviceIndex = DeviceIndexIsa++; IsDeviceDesc = FALSE; } -#ifdef ENABLE_ACPI - else if (RtlCompareUnicodeString(&ValueName, &IdentifierAcpi, FALSE) == 0) - { - pHardwareId = &HardwareIdAcpi; - DeviceIndex = DeviceIndexAcpi++; - IsDeviceDesc = FALSE; - } -#endif else { DPRINT("Unknown device '%wZ'\n", &ValueName);

1 0

[janderwald] 46570: - Add bda.inf, kscaptur.inf
by janderwald＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: janderwald Date: Mon Mar 29 17:18:50 2010 New Revision: 46570 URL: http://svn.reactos.org/svn/reactos?rev=46570&view=rev Log: - Add bda.inf, kscaptur.inf Added: trunk/reactos/media/inf/bda.inf (with props) trunk/reactos/media/inf/kscaptur.inf (with props) Modified: trunk/reactos/media/inf/inf.rbuild trunk/reactos/media/inf/syssetup.inf.tpl Added: trunk/reactos/media/inf/bda.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/bda.inf?rev=4657… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/inf/bda.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/inf.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/inf.rbuild?rev=4… ============================================================================== --- trunk/reactos/media/inf/inf.rbuild [iso-8859-1] (original) +++ trunk/reactos/media/inf/inf.rbuild [iso-8859-1] Mon Mar 29 17:18:50 2010 @@ -4,6 +4,7 @@ <installfile installbase="inf">acpi.inf</installfile> <installfile installbase="inf">audio.inf</installfile> <installfile installbase="inf">battery.inf</installfile> + <installfile installbase="inf">bda.inf</installfile> <installfile installbase="inf">cdrom.inf</installfile> <installfile installbase="inf">cpu.inf</installfile> <installfile installbase="inf">display.inf</installfile> @@ -13,6 +14,7 @@ <installfile installbase="inf">intl.inf</installfile> <installfile installbase="inf">keyboard.inf</installfile> <installfile installbase="inf">ks.inf</installfile> + <installfile installbase="inf">kscaptur.inf</installfile> <installfile installbase="inf">layout.inf</installfile> <installfile installbase="inf">machine.inf</installfile> <installfile installbase="inf">msmouse.inf</installfile> Added: trunk/reactos/media/inf/kscaptur.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/kscaptur.inf?rev… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/inf/kscaptur.inf ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: trunk/reactos/media/inf/syssetup.inf.tpl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/syssetup.inf.tpl… ============================================================================== Binary files - no diff available.

1 0

[janderwald] 46569: [MSDVBNP] - Implement IBDA_EthernetFilter, IBDA_IPV4Filter, IBDA_IPV6Filter
by janderwald＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: janderwald Date: Mon Mar 29 15:12:16 2010 New Revision: 46569 URL: http://svn.reactos.org/svn/reactos?rev=46569&view=rev Log: [MSDVBNP] - Implement IBDA_EthernetFilter, IBDA_IPV4Filter, IBDA_IPV6Filter Added: trunk/reactos/dll/directx/msdvbnp/ethernetfilter.cpp (with props) trunk/reactos/dll/directx/msdvbnp/ipv4.cpp (with props) trunk/reactos/dll/directx/msdvbnp/ipv6.cpp (with props) Modified: trunk/reactos/dll/directx/msdvbnp/msdvbnp.rbuild trunk/reactos/dll/directx/msdvbnp/networkprovider.cpp trunk/reactos/dll/directx/msdvbnp/precomp.h Added: trunk/reactos/dll/directx/msdvbnp/ethernetfilter.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdvbnp/ethern… ============================================================================== --- trunk/reactos/dll/directx/msdvbnp/ethernetfilter.cpp (added) +++ trunk/reactos/dll/directx/msdvbnp/ethernetfilter.cpp [iso-8859-1] Mon Mar 29 15:12:16 2010 @@ -1,0 +1,169 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS BDA Proxy + * FILE: dll/directx/msdvbnp/ethernetfilter.cpp + * PURPOSE: IBDA_EthernetFilter interface + * + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ +#include "precomp.h" + +class CEthernetFilter : public IBDA_EthernetFilter +{ +public: + STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); + + STDMETHODIMP_(ULONG) AddRef(); + STDMETHODIMP_(ULONG) Release(); + + //IBDA_EthernetFilter + HRESULT STDMETHODCALLTYPE GetMulticastListSize(ULONG *pulcbAddresses); + HRESULT STDMETHODCALLTYPE PutMulticastList(ULONG ulcbAddresses, BYTE * pAddressList); + HRESULT STDMETHODCALLTYPE GetMulticastList(ULONG *pulcbAddresses, BYTE *pAddressList); + HRESULT STDMETHODCALLTYPE PutMulticastMode(ULONG ulModeMask); + HRESULT STDMETHODCALLTYPE GetMulticastMode(ULONG *pulModeMask); + + + CEthernetFilter(IBDA_NetworkProvider * pNetworkProvider); + virtual ~CEthernetFilter(); + +protected: + IBDA_NetworkProvider * m_pNetworkProvider; + ULONG m_ulcbAddresses; + BYTE * m_pAddressList; + ULONG m_ulModeMask; +}; + +CEthernetFilter::CEthernetFilter( + IBDA_NetworkProvider * pNetworkProvider) : m_pNetworkProvider(pNetworkProvider), + m_ulcbAddresses(0), + m_pAddressList(0), + m_ulModeMask(0) +{ +} + +CEthernetFilter::~CEthernetFilter() +{ + if (m_pAddressList) + CoTaskMemFree(m_pAddressList); +} + +HRESULT +STDMETHODCALLTYPE +CEthernetFilter::QueryInterface( + REFIID InterfaceId, + PVOID* Interface) +{ + assert(m_pNetworkProvider); + return m_pNetworkProvider->QueryInterface(InterfaceId, Interface); +} + +ULONG +STDMETHODCALLTYPE +CEthernetFilter::AddRef() +{ + assert(m_pNetworkProvider); + return m_pNetworkProvider->AddRef(); +} + +ULONG +STDMETHODCALLTYPE +CEthernetFilter::Release() +{ + assert(m_pNetworkProvider); + return m_pNetworkProvider->Release(); +} + +//------------------------------------------------------------------- +//IBDA_EthernetFilter +// + +HRESULT +STDMETHODCALLTYPE +CEthernetFilter::PutMulticastList( + ULONG ulcbAddresses, + BYTE * pAddressList) +{ + if (!ulcbAddresses || !pAddressList) + return E_POINTER; + + if (m_pAddressList) + CoTaskMemFree(m_pAddressList); + + m_pAddressList = (BYTE*)CoTaskMemAlloc(ulcbAddresses); + if (!m_pAddressList) + return E_OUTOFMEMORY; + + CopyMemory(m_pAddressList, pAddressList, ulcbAddresses); + m_ulcbAddresses = ulcbAddresses; + return NOERROR; +} + +HRESULT +STDMETHODCALLTYPE +CEthernetFilter::GetMulticastList( + ULONG *pulcbAddresses, + BYTE *pAddressList) +{ + if (!pulcbAddresses || !pAddressList) + return E_POINTER; + + if (*pulcbAddresses < m_ulcbAddresses) + return E_OUTOFMEMORY; + + CopyMemory(pAddressList, m_pAddressList, m_ulcbAddresses); + *pulcbAddresses = m_ulcbAddresses; + return NOERROR; +} + +HRESULT +STDMETHODCALLTYPE +CEthernetFilter::GetMulticastListSize( + ULONG *pulcbAddresses) +{ + if (!pulcbAddresses) + return E_POINTER; + + *pulcbAddresses = m_ulcbAddresses; + return NOERROR; +} + +HRESULT +STDMETHODCALLTYPE +CEthernetFilter::PutMulticastMode( + ULONG ulModeMask) +{ + m_ulModeMask = ulModeMask; + return NOERROR; +} + +HRESULT +STDMETHODCALLTYPE +CEthernetFilter::GetMulticastMode( + ULONG *pulModeMask) +{ + *pulModeMask = m_ulModeMask; + return NOERROR; +} + +HRESULT +WINAPI +CEthernetFilter_fnConstructor( + IBDA_NetworkProvider * pNetworkProvider, + REFIID riid, + LPVOID * ppv) +{ + CEthernetFilter * filter = new CEthernetFilter(pNetworkProvider); + + if (!filter) + return E_OUTOFMEMORY; + + if (FAILED(filter->QueryInterface(riid, ppv))) + { + /* not supported */ + delete filter; + return E_NOINTERFACE; + } + + return NOERROR; +} Propchange: trunk/reactos/dll/directx/msdvbnp/ethernetfilter.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/msdvbnp/ipv4.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdvbnp/ipv4.c… ============================================================================== --- trunk/reactos/dll/directx/msdvbnp/ipv4.cpp (added) +++ trunk/reactos/dll/directx/msdvbnp/ipv4.cpp [iso-8859-1] Mon Mar 29 15:12:16 2010 @@ -1,0 +1,170 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS BDA Proxy + * FILE: dll/directx/msdvbnp/ipv4.cpp + * PURPOSE: IBDA_IPV4Filter interface + * + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ +#include "precomp.h" + +class CIPV4Filter : public IBDA_IPV4Filter +{ +public: + STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); + STDMETHODIMP_(ULONG) AddRef(); + STDMETHODIMP_(ULONG) Release(); + + //IBDA_IPV4Filter + HRESULT STDMETHODCALLTYPE GetMulticastListSize(ULONG *pulcbAddresses); + HRESULT STDMETHODCALLTYPE PutMulticastList(ULONG ulcbAddresses, BYTE * pAddressList); + HRESULT STDMETHODCALLTYPE GetMulticastList(ULONG *pulcbAddresses, BYTE *pAddressList); + HRESULT STDMETHODCALLTYPE PutMulticastMode(ULONG ulModeMask); + HRESULT STDMETHODCALLTYPE GetMulticastMode(ULONG *pulModeMask); + + + CIPV4Filter(IBDA_NetworkProvider * pNetworkProvider); + virtual ~CIPV4Filter(); + +protected: + IBDA_NetworkProvider * m_pNetworkProvider; + ULONG m_ulcbAddresses; + BYTE * m_pAddressList; + ULONG m_ulModeMask; +}; + +CIPV4Filter::CIPV4Filter( + IBDA_NetworkProvider * pNetworkProvider) : m_pNetworkProvider(pNetworkProvider), + m_ulcbAddresses(0), + m_pAddressList(0), + m_ulModeMask(0) +{ +} + +CIPV4Filter::~CIPV4Filter() +{ + if (m_pAddressList) + CoTaskMemFree(m_pAddressList); +} + + +HRESULT +STDMETHODCALLTYPE +CIPV4Filter::QueryInterface( + REFIID InterfaceId, + PVOID* Interface) +{ + assert(m_pNetworkProvider); + return m_pNetworkProvider->QueryInterface(InterfaceId, Interface); +} + +ULONG +STDMETHODCALLTYPE +CIPV4Filter::AddRef() +{ + assert(m_pNetworkProvider); + return m_pNetworkProvider->AddRef(); +} + +ULONG +STDMETHODCALLTYPE +CIPV4Filter::Release() +{ + assert(m_pNetworkProvider); + return m_pNetworkProvider->Release(); +} + +//------------------------------------------------------------------- +//IBDA_IPV4Filter +// + + +HRESULT +STDMETHODCALLTYPE +CIPV4Filter::GetMulticastListSize( + ULONG *pulcbAddresses) +{ + if (!pulcbAddresses) + return E_POINTER; + + *pulcbAddresses = 0; + return NOERROR; +} + +HRESULT +STDMETHODCALLTYPE +CIPV4Filter::PutMulticastList( + ULONG ulcbAddresses, + BYTE * pAddressList) +{ + if (!ulcbAddresses || !pAddressList) + return E_POINTER; + + if (m_pAddressList) + CoTaskMemFree(m_pAddressList); + + m_pAddressList = (BYTE*)CoTaskMemAlloc(ulcbAddresses); + if (!m_pAddressList) + return E_OUTOFMEMORY; + + CopyMemory(m_pAddressList, pAddressList, ulcbAddresses); + m_ulcbAddresses = ulcbAddresses; + return NOERROR; +} + +HRESULT +STDMETHODCALLTYPE +CIPV4Filter::GetMulticastList( + ULONG *pulcbAddresses, + BYTE *pAddressList) +{ + if (!pulcbAddresses || !pAddressList) + return E_POINTER; + + if (*pulcbAddresses < m_ulcbAddresses) + return E_OUTOFMEMORY; + + CopyMemory(pAddressList, m_pAddressList, m_ulcbAddresses); + *pulcbAddresses = m_ulcbAddresses; + return NOERROR; +} + +HRESULT +STDMETHODCALLTYPE +CIPV4Filter::PutMulticastMode( + ULONG ulModeMask) +{ + m_ulModeMask = ulModeMask; + return NOERROR; +} + +HRESULT +STDMETHODCALLTYPE +CIPV4Filter::GetMulticastMode( + ULONG *pulModeMask) +{ + *pulModeMask = m_ulModeMask; + return NOERROR; +} + +HRESULT +WINAPI +CIPV4Filter_fnConstructor( + IBDA_NetworkProvider * pNetworkProvider, + REFIID riid, + LPVOID * ppv) +{ + CIPV4Filter * filter = new CIPV4Filter(pNetworkProvider); + + if (!filter) + return E_OUTOFMEMORY; + + if (FAILED(filter->QueryInterface(riid, ppv))) + { + /* not supported */ + delete filter; + return E_NOINTERFACE; + } + + return NOERROR; +} Propchange: trunk/reactos/dll/directx/msdvbnp/ipv4.cpp ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/directx/msdvbnp/ipv6.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdvbnp/ipv6.c… ============================================================================== --- trunk/reactos/dll/directx/msdvbnp/ipv6.cpp (added) +++ trunk/reactos/dll/directx/msdvbnp/ipv6.cpp [iso-8859-1] Mon Mar 29 15:12:16 2010 @@ -1,0 +1,167 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS BDA Proxy + * FILE: dll/directx/msdvbnp/ipv6.cpp + * PURPOSE: IBDA_IPV6Filter interface + * + * PROGRAMMERS: Johannes Anderwald (janderwald(a)reactos.org) + */ +#include "precomp.h" + +class CIPV6Filter : public IBDA_IPV6Filter +{ +public: + STDMETHODIMP QueryInterface( REFIID InterfaceId, PVOID* Interface); + STDMETHODIMP_(ULONG) AddRef(); + STDMETHODIMP_(ULONG) Release(); + + //IBDA_IPV6Filter + HRESULT STDMETHODCALLTYPE GetMulticastListSize(ULONG *pulcbAddresses); + HRESULT STDMETHODCALLTYPE PutMulticastList(ULONG ulcbAddresses, BYTE * pAddressList); + HRESULT STDMETHODCALLTYPE GetMulticastList(ULONG *pulcbAddresses, BYTE *pAddressList); + HRESULT STDMETHODCALLTYPE PutMulticastMode(ULONG ulModeMask); + HRESULT STDMETHODCALLTYPE GetMulticastMode(ULONG *pulModeMask); + + CIPV6Filter(IBDA_NetworkProvider * pNetworkProvider); + virtual ~CIPV6Filter(); + +protected: + IBDA_NetworkProvider * m_pNetworkProvider; + ULONG m_ulcbAddresses; + BYTE * m_pAddressList; + ULONG m_ulModeMask; +}; + +CIPV6Filter::CIPV6Filter( + IBDA_NetworkProvider * pNetworkProvider) : m_pNetworkProvider(pNetworkProvider), + m_ulcbAddresses(0), + m_pAddressList(0), + m_ulModeMask(0) +{ +} + +CIPV6Filter::~CIPV6Filter() +{ + if (m_pAddressList) + CoTaskMemFree(m_pAddressList); +} + +HRESULT +STDMETHODCALLTYPE +CIPV6Filter::QueryInterface( + REFIID InterfaceId, + PVOID* Interface) +{ + assert(m_pNetworkProvider); + return m_pNetworkProvider->QueryInterface(InterfaceId, Interface); +} + +ULONG +STDMETHODCALLTYPE +CIPV6Filter::AddRef() +{ + assert(m_pNetworkProvider); + return m_pNetworkProvider->AddRef(); +} + +ULONG +STDMETHODCALLTYPE +CIPV6Filter::Release() +{ + assert(m_pNetworkProvider); + return m_pNetworkProvider->Release(); +} + +//------------------------------------------------------------------- +//IBDA_IPV6Filter +// + +HRESULT +STDMETHODCALLTYPE +CIPV6Filter::GetMulticastListSize( + ULONG *pulcbAddresses) +{ + if (!pulcbAddresses) + return E_POINTER; + + *pulcbAddresses = 0; + return NOERROR; +} + +HRESULT +STDMETHODCALLTYPE +CIPV6Filter::GetMulticastList( + ULONG *pulcbAddresses, + BYTE *pAddressList) +{ + if (!pulcbAddresses || !pAddressList) + return E_POINTER; + + if (*pulcbAddresses < m_ulcbAddresses) + return E_OUTOFMEMORY; + + CopyMemory(pAddressList, m_pAddressList, m_ulcbAddresses); + *pulcbAddresses = m_ulcbAddresses; + return NOERROR; +} + +HRESULT +STDMETHODCALLTYPE +CIPV6Filter::PutMulticastList( + ULONG ulcbAddresses, + BYTE * pAddressList) +{ + if (!ulcbAddresses || !pAddressList) + return E_POINTER; + + if (m_pAddressList) + CoTaskMemFree(m_pAddressList); + + m_pAddressList = (BYTE*)CoTaskMemAlloc(ulcbAddresses); + if (!m_pAddressList) + return E_OUTOFMEMORY; + + CopyMemory(m_pAddressList, pAddressList, ulcbAddresses); + m_ulcbAddresses = ulcbAddresses; + return NOERROR; +} + +HRESULT +STDMETHODCALLTYPE +CIPV6Filter::PutMulticastMode( + ULONG ulModeMask) +{ + m_ulModeMask = ulModeMask; + return NOERROR; +} + +HRESULT +STDMETHODCALLTYPE +CIPV6Filter::GetMulticastMode( + ULONG *pulModeMask) +{ + *pulModeMask = m_ulModeMask; + return NOERROR; +} + +HRESULT +WINAPI +CIPV6Filter_fnConstructor( + IBDA_NetworkProvider * pNetworkProvider, + REFIID riid, + LPVOID * ppv) +{ + CIPV6Filter * filter = new CIPV6Filter(pNetworkProvider); + + if (!filter) + return E_OUTOFMEMORY; + + if (FAILED(filter->QueryInterface(riid, ppv))) + { + /* not supported */ + delete filter; + return E_NOINTERFACE; + } + + return NOERROR; +} Propchange: trunk/reactos/dll/directx/msdvbnp/ipv6.cpp ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/directx/msdvbnp/msdvbnp.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdvbnp/msdvbn… ============================================================================== --- trunk/reactos/dll/directx/msdvbnp/msdvbnp.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdvbnp/msdvbnp.rbuild [iso-8859-1] Mon Mar 29 15:12:16 2010 @@ -22,8 +22,11 @@ <file>classfactory.cpp</file> <file>enum_mediatypes.cpp</file> <file>enumpins.cpp</file> + <file>ethernetfilter.cpp</file> <file>msdvbnp.cpp</file> <file>msdvbnp.rc</file> + <file>ipv4.cpp</file> + <file>ipv6.cpp</file> <file>networkprovider.cpp</file> <file>pin.cpp</file> <file>scanningtuner.cpp</file> Modified: trunk/reactos/dll/directx/msdvbnp/networkprovider.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdvbnp/networ… ============================================================================== --- trunk/reactos/dll/directx/msdvbnp/networkprovider.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdvbnp/networkprovider.cpp [iso-8859-1] Mon Mar 29 15:12:16 2010 @@ -74,6 +74,9 @@ GUID m_ClassID; DeviceFilterStack m_DeviceFilters; IScanningTuner * m_Tuner; + IBDA_IPV6Filter * m_IPV6Filter; + IBDA_IPV4Filter * m_IPV4Filter; + IBDA_EthernetFilter * m_EthernetFilter; }; HRESULT @@ -112,6 +115,51 @@ } m_Tuner->AddRef(); *Output = (IUnknown*)m_Tuner; + + return NOERROR; + } + + if (IsEqualGUID(refiid, IID_IBDA_IPV6Filter)) + { + // construct scanning tuner + if (!m_IPV6Filter) + { + HRESULT hr = CIPV6Filter_fnConstructor((IBDA_NetworkProvider*)this, refiid, (void**)&m_IPV6Filter); + if (FAILED(hr)) + return hr; + } + m_IPV6Filter->AddRef(); + *Output = (IUnknown*)m_IPV6Filter; + + return NOERROR; + } + + if (IsEqualGUID(refiid, IID_IBDA_IPV4Filter)) + { + // construct scanning tuner + if (!m_IPV4Filter) + { + HRESULT hr = CIPV4Filter_fnConstructor((IBDA_NetworkProvider*)this, refiid, (void**)&m_IPV4Filter); + if (FAILED(hr)) + return hr; + } + m_IPV4Filter->AddRef(); + *Output = (IUnknown*)m_IPV4Filter; + + return NOERROR; + } + + if (IsEqualGUID(refiid, IID_IBDA_EthernetFilter)) + { + // construct scanning tuner + if (!m_EthernetFilter) + { + HRESULT hr = CIPV4Filter_fnConstructor((IBDA_NetworkProvider*)this, refiid, (void**)&m_EthernetFilter); + if (FAILED(hr)) + return hr; + } + m_EthernetFilter->AddRef(); + *Output = (IUnknown*)m_EthernetFilter; return NOERROR; } @@ -163,7 +211,10 @@ m_ReferenceClock(0), m_FilterState(State_Stopped), m_DeviceFilters(), - m_Tuner(0) + m_Tuner(0), + m_IPV6Filter(0), + m_IPV4Filter(0), + m_EthernetFilter(0) { m_Pins[0] = 0; Modified: trunk/reactos/dll/directx/msdvbnp/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/msdvbnp/precom… ============================================================================== --- trunk/reactos/dll/directx/msdvbnp/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/msdvbnp/precomp.h [iso-8859-1] Mon Mar 29 15:12:16 2010 @@ -82,6 +82,30 @@ REFIID riid, LPVOID * ppv); +/* ethernetfilter.cpp */ +HRESULT +WINAPI +CEthernetFilter_fnConstructor( + IBDA_NetworkProvider * pNetworkProvider, + REFIID riid, + LPVOID * ppv); + +/* ipv6.cpp */ +HRESULT +WINAPI +CIPV6Filter_fnConstructor( + IBDA_NetworkProvider * pNetworkProvider, + REFIID riid, + LPVOID * ppv); + +/* ipv4.cpp */ +HRESULT +WINAPI +CIPV4Filter_fnConstructor( + IBDA_NetworkProvider * pNetworkProvider, + REFIID riid, + LPVOID * ppv); + #ifndef _MSC_VER extern const GUID CLSID_DVBTNetworkProvider; #endif

1 0

[tkreuzer] 46568: Define PPEB in ntddk.h
by tkreuzer＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: tkreuzer Date: Mon Mar 29 13:40:06 2010 New Revision: 46568 URL: http://svn.reactos.org/svn/reactos?rev=46568&view=rev Log: Define PPEB in ntddk.h Modified: trunk/reactos/include/ddk/ntddk.h trunk/reactos/include/ndk/peb_teb.h Modified: trunk/reactos/include/ddk/ntddk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddk.h?rev=46… ============================================================================== --- trunk/reactos/include/ddk/ntddk.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddk.h [iso-8859-1] Mon Mar 29 13:40:06 2010 @@ -69,6 +69,8 @@ typedef GUID UUID; typedef struct _BUS_HANDLER *PBUS_HANDLER; + +typedef struct _PEB *PPEB; #define EXCEPTION_READ_FAULT 0 #define EXCEPTION_WRITE_FAULT 1 Modified: trunk/reactos/include/ndk/peb_teb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/peb_teb.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/peb_teb.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/peb_teb.h [iso-8859-1] Mon Mar 29 13:40:06 2010 @@ -1,4 +1,3 @@ - #define PASTE2(x,y) x##y #define PASTE(x,y) PASTE2(x,y) @@ -17,6 +16,10 @@ #define GDI_HANDLE_BUFFER_SIZE 60 #else #define GDI_HANDLE_BUFFER_SIZE 34 +#endif + +#if defined(_NTDDK_INCLUDED_) || defined(_NTIFS_) +#define PPEB PPEB_RENAMED #endif typedef struct STRUCT(_PEB) @@ -152,6 +155,7 @@ #endif } STRUCT(PEB), *STRUCT(PPEB); +#undef PPEB #if defined(_WIN64) && !defined(EXPLICIT_32BIT) C_ASSERT(FIELD_OFFSET(STRUCT(PEB), Mutant) == 0x08);

1 0

[tkreuzer] 46567: Merge winnt.h
by tkreuzer＠svn.reactos.org 29 Mar '10

29 Mar '10

Author: tkreuzer Date: Mon Mar 29 13:23:09 2010 New Revision: 46567 URL: http://svn.reactos.org/svn/reactos?rev=46567&view=rev Log: Merge winnt.h Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Mon Mar 29 13:23:09 2010 @@ -3411,6 +3411,12 @@ struct _EXCEPTION_POINTERS *ExceptionInfo ); +typedef struct _GROUP_AFFINITY { + KAFFINITY Mask; + WORD Group; + WORD Reserved[3]; +} GROUP_AFFINITY, *PGROUP_AFFINITY; + typedef struct _EVENTLOGRECORD { DWORD Length; DWORD Reserved;

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