Ros-diffs June 2010

ros-diffs@reactos.org

24 participants
407 discussions

[cgutman] 47722: [NTOSKRNL] - Implement IRP_MN_REMOVE_DEVICE handling for PnP root PDOs
by cgutman＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: cgutman Date: Wed Jun 9 20:04:39 2010 New Revision: 47722 URL: http://svn.reactos.org/svn/reactos?rev=47722&view=rev Log: [NTOSKRNL] - Implement IRP_MN_REMOVE_DEVICE handling for PnP root PDOs Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c [iso-8859-1] Wed Jun 9 20:04:39 2010 @@ -1027,10 +1027,12 @@ IN PIRP Irp) { PPNPROOT_PDO_DEVICE_EXTENSION DeviceExtension; + PPNPROOT_FDO_DEVICE_EXTENSION FdoDeviceExtension; PIO_STACK_LOCATION IrpSp; NTSTATUS Status; DeviceExtension = (PPNPROOT_PDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension; + FdoDeviceExtension = (PPNPROOT_FDO_DEVICE_EXTENSION)PnpRootDeviceObject->DeviceExtension; Status = Irp->IoStatus.Status; IrpSp = IoGetCurrentIrpStackLocation(Irp); @@ -1070,7 +1072,32 @@ break; case IRP_MN_REMOVE_DEVICE: - DPRINT1("IRP_MN_REMOVE_DEVICE is UNIMPLEMENTED!\n"); + /* Remove the device from the device list and decrement the device count*/ + KeAcquireGuardedMutex(&FdoDeviceExtension->DeviceListLock); + RemoveEntryList(&DeviceExtension->DeviceInfo->ListEntry); + FdoDeviceExtension->DeviceListCount--; + KeReleaseGuardedMutex(&FdoDeviceExtension->DeviceListLock); + + /* Free some strings we created */ + RtlFreeUnicodeString(&DeviceExtension->DeviceInfo->DeviceDescription); + RtlFreeUnicodeString(&DeviceExtension->DeviceInfo->DeviceID); + RtlFreeUnicodeString(&DeviceExtension->DeviceInfo->InstanceID); + + /* Free the resource requirements list */ + if (DeviceExtension->DeviceInfo->ResourceRequirementsList != NULL) + ExFreePool(DeviceExtension->DeviceInfo->ResourceRequirementsList); + + /* Free the boot resources list */ + if (DeviceExtension->DeviceInfo->ResourceList != NULL) + ExFreePool(DeviceExtension->DeviceInfo->ResourceList); + + /* Free the device info */ + ExFreePool(DeviceExtension->DeviceInfo); + + /* Finally, delete the device object */ + IoDeleteDevice(DeviceObject); + + /* Return success */ Status = STATUS_SUCCESS; break;

1 0

[akhaldi] 47721: Sync uo to HEAD (r47720).
by akhaldi＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: akhaldi Date: Wed Jun 9 18:58:14 2010 New Revision: 47721 URL: http://svn.reactos.org/svn/reactos?rev=47721&view=rev Log: Sync uo to HEAD (r47720). Modified: branches/header-work/ (props changed) branches/header-work/Makefile branches/header-work/dll/win32/comctl32/pager.c branches/header-work/dll/win32/comctl32/propsheet.c branches/header-work/dll/win32/comctl32/rebar.c branches/header-work/dll/win32/comctl32/status.c branches/header-work/dll/win32/comctl32/string.c branches/header-work/dll/win32/comctl32/syslink.c branches/header-work/dll/win32/comctl32/tab.c branches/header-work/dll/win32/comctl32/theme_combo.c branches/header-work/dll/win32/comctl32/toolbar.c branches/header-work/dll/win32/comctl32/tooltips.c branches/header-work/dll/win32/comctl32/trackbar.c branches/header-work/dll/win32/comctl32/treeview.c branches/header-work/dll/win32/comctl32/updown.c branches/header-work/drivers/ksfilter/ks/api.c branches/header-work/drivers/ksfilter/ks/connectivity.c branches/header-work/drivers/ksfilter/ks/event.c branches/header-work/drivers/ksfilter/ks/image.c branches/header-work/drivers/ksfilter/ks/irp.c branches/header-work/drivers/ksfilter/ks/misc.c branches/header-work/drivers/ksfilter/ks/pin.c branches/header-work/drivers/ksfilter/ks/topology.c branches/header-work/drivers/wdm/audio/backpln/portcls/irp.cpp branches/header-work/lib/drivers/ip/transport/tcp/tcp.c branches/header-work/lib/drivers/sound/mmixer/controls.c branches/header-work/lib/drivers/sound/mmixer/mixer.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/header-work/Makefile URL: http://svn.reactos.org/svn/reactos/branches/header-work/Makefile?rev=47721&… Modified: branches/header-work/dll/win32/comctl32/pager.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/string.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/syslink.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/theme_combo.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/dll/win32/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/dll/win32/comctl32/… Modified: branches/header-work/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/ksfilter/ks… Modified: branches/header-work/drivers/ksfilter/ks/connectivity.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/ksfilter/ks… Modified: branches/header-work/drivers/ksfilter/ks/event.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/ksfilter/ks… Modified: branches/header-work/drivers/ksfilter/ks/image.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/ksfilter/ks… Modified: branches/header-work/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/ksfilter/ks… Modified: branches/header-work/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/ksfilter/ks… Modified: branches/header-work/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/ksfilter/ks… Modified: branches/header-work/drivers/ksfilter/ks/topology.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/ksfilter/ks… Modified: branches/header-work/drivers/wdm/audio/backpln/portcls/irp.cpp URL: http://svn.reactos.org/svn/reactos/branches/header-work/drivers/wdm/audio/b… Modified: branches/header-work/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/drivers/ip/tran… Modified: branches/header-work/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/drivers/sound/m… Modified: branches/header-work/lib/drivers/sound/mmixer/mixer.c URL: http://svn.reactos.org/svn/reactos/branches/header-work/lib/drivers/sound/m…

1 0

[akhaldi] 47720: - Add some header guards.
by akhaldi＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: akhaldi Date: Wed Jun 9 18:30:37 2010 New Revision: 47720 URL: http://svn.reactos.org/svn/reactos?rev=47720&view=rev Log: - Add some header guards. Modified: branches/header-work/include/ddk/csq.h branches/header-work/include/ddk/d4drvif.h branches/header-work/include/ddk/d4iface.h branches/header-work/include/ddk/kbdmou.h branches/header-work/include/ddk/video.h branches/header-work/include/ddk/videoagp.h branches/header-work/include/ddk/ws2san.h branches/header-work/include/psdk/evntrace.h branches/header-work/include/psdk/mswsock.h Modified: branches/header-work/include/ddk/csq.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/csq.h?r… ============================================================================== --- branches/header-work/include/ddk/csq.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/csq.h [iso-8859-1] Wed Jun 9 18:30:37 2010 @@ -54,7 +54,7 @@ #pragma once -#define _REACTOS_CSQ_H +#define _CSQ_H_ #ifdef __cplusplus extern "C" { Modified: branches/header-work/include/ddk/d4drvif.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/d4drvif… ============================================================================== --- branches/header-work/include/ddk/d4drvif.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/d4drvif.h [iso-8859-1] Wed Jun 9 18:30:37 2010 @@ -21,6 +21,8 @@ */ #pragma once + +#define _DOT4DRVIF_H #ifdef __cplusplus extern "C" { Modified: branches/header-work/include/ddk/d4iface.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/d4iface… ============================================================================== --- branches/header-work/include/ddk/d4iface.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/d4iface.h [iso-8859-1] Wed Jun 9 18:30:37 2010 @@ -1,4 +1,6 @@ #pragma once + +#define _DOT4_IFACE_H #ifdef __cplusplus extern "C" { Modified: branches/header-work/include/ddk/kbdmou.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/kbdmou.… ============================================================================== --- branches/header-work/include/ddk/kbdmou.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/kbdmou.h [iso-8859-1] Wed Jun 9 18:30:37 2010 @@ -21,6 +21,8 @@ */ #pragma once + +#define _KBDMOU_ #include <ntddkbd.h> #include <ntddmou.h> Modified: branches/header-work/include/ddk/video.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/video.h… ============================================================================== --- branches/header-work/include/ddk/video.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/video.h [iso-8859-1] Wed Jun 9 18:30:37 2010 @@ -21,6 +21,8 @@ */ #pragma once + +#define __VIDEO_H__ #include "ntddvdeo.h" #include "videoagp.h" Modified: branches/header-work/include/ddk/videoagp.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/videoag… ============================================================================== --- branches/header-work/include/ddk/videoagp.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/videoagp.h [iso-8859-1] Wed Jun 9 18:30:37 2010 @@ -21,6 +21,8 @@ */ #pragma once + +#define __VIDEOAGP_H__ #ifdef __cplusplus extern "C" { Modified: branches/header-work/include/ddk/ws2san.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/ws2san.… ============================================================================== --- branches/header-work/include/ddk/ws2san.h [iso-8859-1] (original) +++ branches/header-work/include/ddk/ws2san.h [iso-8859-1] Wed Jun 9 18:30:37 2010 @@ -21,6 +21,8 @@ */ #pragma once + +#define _WS2SAN_H_ #ifdef __cplusplus extern "C" { Modified: branches/header-work/include/psdk/evntrace.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/evntra… ============================================================================== --- branches/header-work/include/psdk/evntrace.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/evntrace.h [iso-8859-1] Wed Jun 9 18:30:37 2010 @@ -1,4 +1,6 @@ #pragma once + +#define _EVNTRACE_ #ifndef WMIAPI #ifndef MIDL_PASS Modified: branches/header-work/include/psdk/mswsock.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/mswsoc… ============================================================================== --- branches/header-work/include/psdk/mswsock.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/mswsock.h [iso-8859-1] Wed Jun 9 18:30:37 2010 @@ -10,6 +10,8 @@ */ #pragma once + +#define _MSWSOCK_ #ifdef __cplusplus extern "C" {

1 0

[tkreuzer] 47719: [WIN32K] If pbmiSrc->bmiHeader.bV5ClrUsed is 0, calculate the number of colors from the bit depth. Fixes black taskbar icons with vbox driver on 8 bpp
by tkreuzer＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: tkreuzer Date: Wed Jun 9 18:08:23 2010 New Revision: 47719 URL: http://svn.reactos.org/svn/reactos?rev=47719&view=rev Log: [WIN32K] If pbmiSrc->bmiHeader.bV5ClrUsed is 0, calculate the number of colors from the bit depth. Fixes black taskbar icons with vbox driver on 8 bpp Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Wed Jun 9 18:08:23 2010 @@ -1951,15 +1951,21 @@ else { INT i; + ULONG cColorsUsed; + + cColorsUsed = pbmiSrc->bmiHeader.bV5ClrUsed; + if (cColorsUsed == 0) + cColorsUsed = (1 << pbmiSrc->bmiHeader.bV5BitCount); + if(dwColorUse == DIB_PAL_COLORS) { RtlCopyMemory(pbmiDst->bmiColors, pbmiSrc->bmiColors, - pbmiSrc->bmiHeader.bV5ClrUsed * sizeof(WORD)); + cColorsUsed * sizeof(WORD)); } else { - for(i = 0; i < pbmiSrc->bmiHeader.bV5ClrUsed; i++) + for(i = 0; i < cColorsUsed; i++) { SetBMIColor(pbmiDst, (DWORD*)pbmiSrc->bmiColors + i, i); }

1 0

[akhaldi] 47718: - Temporarily move those headers from PSDK to DDK (due to svn awesomeness).
by akhaldi＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: akhaldi Date: Wed Jun 9 17:33:59 2010 New Revision: 47718 URL: http://svn.reactos.org/svn/reactos?rev=47718&view=rev Log: - Temporarily move those headers from PSDK to DDK (due to svn awesomeness). Added: branches/header-work/include/ddk/compstui.h - copied unchanged from r47698, branches/header-work/include/psdk/compstui.h branches/header-work/include/ddk/devioctl.h - copied unchanged from r47698, branches/header-work/include/psdk/devioctl.h branches/header-work/include/ddk/kcom.h - copied unchanged from r47698, branches/header-work/include/psdk/kcom.h branches/header-work/include/ddk/ksdebug.h - copied unchanged from r47698, branches/header-work/include/psdk/ksdebug.h branches/header-work/include/ddk/ksuuids.h - copied unchanged from r47698, branches/header-work/include/psdk/ksuuids.h branches/header-work/include/ddk/lmon.h - copied unchanged from r47698, branches/header-work/include/psdk/lmon.h branches/header-work/include/ddk/nettypes.h - copied unchanged from r47698, branches/header-work/include/psdk/nettypes.h branches/header-work/include/ddk/newdev.h - copied unchanged from r47698, branches/header-work/include/psdk/newdev.h branches/header-work/include/ddk/ntddchgr.h - copied unchanged from r47698, branches/header-work/include/psdk/ntddchgr.h branches/header-work/include/ddk/ntddmou.h - copied unchanged from r47698, branches/header-work/include/psdk/ntddmou.h branches/header-work/include/ddk/ntddstor.h - copied unchanged from r47698, branches/header-work/include/psdk/ntddstor.h branches/header-work/include/ddk/winddi.h - copied unchanged from r47698, branches/header-work/include/psdk/winddi.h branches/header-work/include/ddk/winddiui.h - copied unchanged from r47698, branches/header-work/include/psdk/winddiui.h branches/header-work/include/ddk/winsplp.h - copied unchanged from r47698, branches/header-work/include/psdk/winsplp.h Removed: branches/header-work/include/psdk/compstui.h branches/header-work/include/psdk/devioctl.h branches/header-work/include/psdk/kcom.h branches/header-work/include/psdk/ksdebug.h branches/header-work/include/psdk/ksuuids.h branches/header-work/include/psdk/lmon.h branches/header-work/include/psdk/nettypes.h branches/header-work/include/psdk/newdev.h branches/header-work/include/psdk/ntddchgr.h branches/header-work/include/psdk/ntddmou.h branches/header-work/include/psdk/ntddstor.h branches/header-work/include/psdk/winddi.h branches/header-work/include/psdk/winddiui.h branches/header-work/include/psdk/winsplp.h [This mail would be too long, it was shortened to contain the URLs only.] Removed: branches/header-work/include/psdk/compstui.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/compst… Removed: branches/header-work/include/psdk/devioctl.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/devioc… Removed: branches/header-work/include/psdk/kcom.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/kcom.h… Removed: branches/header-work/include/psdk/ksdebug.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ksdebu… Removed: branches/header-work/include/psdk/ksuuids.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ksuuid… Removed: branches/header-work/include/psdk/lmon.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/lmon.h… Removed: branches/header-work/include/psdk/nettypes.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/nettyp… Removed: branches/header-work/include/psdk/newdev.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/newdev… Removed: branches/header-work/include/psdk/ntddchgr.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ntddch… Removed: branches/header-work/include/psdk/ntddmou.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ntddmo… Removed: branches/header-work/include/psdk/ntddstor.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/ntddst… Removed: branches/header-work/include/psdk/winddi.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/winddi… Removed: branches/header-work/include/psdk/winddiui.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/winddi… Removed: branches/header-work/include/psdk/winsplp.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/winspl…

1 0

[akhaldi] 47717: - Update ReactOS-amd64.rbuild
by akhaldi＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: akhaldi Date: Wed Jun 9 17:22:54 2010 New Revision: 47717 URL: http://svn.reactos.org/svn/reactos?rev=47717&view=rev Log: - Update ReactOS-amd64.rbuild Modified: branches/header-work/ReactOS-amd64.rbuild Modified: branches/header-work/ReactOS-amd64.rbuild URL: http://svn.reactos.org/svn/reactos/branches/header-work/ReactOS-amd64.rbuil… ============================================================================== --- branches/header-work/ReactOS-amd64.rbuild [iso-8859-1] (original) +++ branches/header-work/ReactOS-amd64.rbuild [iso-8859-1] Wed Jun 9 17:22:54 2010 @@ -34,8 +34,8 @@   <compilerflag>-U_X86_</compilerflag> + <compilerflag>-UWIN32</compilerflag> <compilerflag>-Wno-format</compilerflag> - <compilerflag>-fno-leading-underscore</compilerflag> </group> <group linkerset="ld"> @@ -44,14 +44,31 @@ <linkerflag>-section-alignment=0x1000</linkerflag> <linkerflag>--unique=.eh_frame</linkerflag> <linkerflag>-static</linkerflag> - <linkerflag>-fno-leading-underscore</linkerflag> - <linkerflag>-shared</linkerflag> <linkerflag>--exclude-all-symbols</linkerflag> </group> <if property="USERMODE" value="1"> <directory name="base"> - <xi:include href="base/base.rbuild" /> + <directory name="applications"> + <xi:include href="base/applications/applications.rbuild" /> + </directory> + <directory name="services"> + <xi:include href="base/services/services.rbuild" /> + </directory> + <directory name="setup"> + <xi:include href="base/setup/setup.rbuild" /> + </directory> + <directory name="shell"> + <directory name="cmd"> + <xi:include href="base/shell/cmd/cmd.rbuild" /> + </directory> + <directory name="explorer-new"> + <xi:include href="base/shell/explorer-new/explorer.rbuild" /> + </directory> + </directory> + <directory name="system"> + <xi:include href="base/system/system.rbuild" /> + </directory> </directory> <directory name="dll"> <xi:include href="dll/dll.rbuild" />

1 0

[akhaldi] 47716: [DDK] - Replace dciddi.h with the one from mingw-w64 [PSDK] - Get rid of duplicate dciddi.h
by akhaldi＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: akhaldi Date: Wed Jun 9 17:19:06 2010 New Revision: 47716 URL: http://svn.reactos.org/svn/reactos?rev=47716&view=rev Log: [DDK] - Replace dciddi.h with the one from mingw-w64 [PSDK] - Get rid of duplicate dciddi.h Added: branches/header-work/include/ddk/dciddi.h (with props) Removed: branches/header-work/include/psdk/dciddi.h Added: branches/header-work/include/ddk/dciddi.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/ddk/dciddi.… ============================================================================== --- branches/header-work/include/ddk/dciddi.h (added) +++ branches/header-work/include/ddk/dciddi.h [iso-8859-1] Wed Jun 9 17:19:06 2010 @@ -1,0 +1,165 @@ +/** + * This file has no copyright assigned and is placed in the Public Domain. + * This file is part of the w64 mingw-runtime package. + * No warranty is given; refer to the file DISCLAIMER.PD within this package. + */ +#ifndef _INC_DCIDDI +#define _INC_DCIDDI + +#ifdef __cplusplus +extern "C" { +#endif + +#define DCICOMMAND 3075 +#define DCI_VERSION 0x0100 + +#define DCICREATEPRIMARYSURFACE 1 +#define DCICREATEOFFSCREENSURFACE 2 +#define DCICREATEOVERLAYSURFACE 3 +#define DCIENUMSURFACE 4 +#define DCIESCAPE 5 + +#define DCI_OK 0 +#define DCI_FAIL_GENERIC -1 +#define DCI_FAIL_UNSUPPORTEDVERSION -2 +#define DCI_FAIL_INVALIDSURFACE -3 +#define DCI_FAIL_UNSUPPORTED -4 + +#define DCI_ERR_CURRENTLYNOTAVAIL -5 +#define DCI_ERR_INVALIDRECT -6 +#define DCI_ERR_UNSUPPORTEDFORMAT -7 +#define DCI_ERR_UNSUPPORTEDMASK -8 +#define DCI_ERR_TOOBIGHEIGHT -9 +#define DCI_ERR_TOOBIGWIDTH -10 +#define DCI_ERR_TOOBIGSIZE -11 +#define DCI_ERR_OUTOFMEMORY -12 +#define DCI_ERR_INVALIDPOSITION -13 +#define DCI_ERR_INVALIDSTRETCH -14 +#define DCI_ERR_INVALIDCLIPLIST -15 +#define DCI_ERR_SURFACEISOBSCURED -16 +#define DCI_ERR_XALIGN -17 +#define DCI_ERR_YALIGN -18 +#define DCI_ERR_XYALIGN -19 +#define DCI_ERR_WIDTHALIGN -20 +#define DCI_ERR_HEIGHTALIGN -21 + +#define DCI_STATUS_POINTERCHANGED 1 +#define DCI_STATUS_STRIDECHANGED 2 +#define DCI_STATUS_FORMATCHANGED 4 +#define DCI_STATUS_SURFACEINFOCHANGED 8 +#define DCI_STATUS_CHROMAKEYCHANGED 16 +#define DCI_STATUS_WASSTILLDRAWING 32 + +#define DCI_SUCCESS(error) (((DCIRVAL)error) >= 0) + +#define DCI_SURFACE_TYPE 0x0000000F +#define DCI_PRIMARY 0x00000000 +#define DCI_OFFSCREEN 0x00000001 +#define DCI_OVERLAY 0x00000002 +#define DCI_VISIBLE 0x00000010 +#define DCI_CHROMAKEY 0x00000020 +#define DCI_1632_ACCESS 0x00000040 +#define DCI_DWORDSIZE 0x00000080 +#define DCI_DWORDALIGN 0x00000100 +#define DCI_WRITEONLY 0x00000200 +#define DCI_ASYNC 0x00000400 + +#define DCI_CAN_STRETCHX 0x00001000 +#define DCI_CAN_STRETCHY 0x00002000 +#define DCI_CAN_STRETCHXY (DCI_CAN_STRETCHX | DCI_CAN_STRETCHY) + +#define DCI_CAN_STRETCHXN 0x00004000 +#define DCI_CAN_STRETCHYN 0x00008000 +#define DCI_CAN_STRETCHXYN (DCI_CAN_STRETCHXN | DCI_CAN_STRETCHYN) + +#define DCI_CANOVERLAY 0x00010000 + + typedef int DCIRVAL; + + typedef struct _DCICMD { + DWORD dwCommand; + DWORD dwParam1; + DWORD dwParam2; + DWORD dwVersion; + DWORD dwReserved; + } DCICMD; + + typedef struct _DCICREATEINPUT { + DCICMD cmd; + DWORD dwCompression; + DWORD dwMask[3]; + DWORD dwWidth; + DWORD dwHeight; + DWORD dwDCICaps; + DWORD dwBitCount; + LPVOID lpSurface; + } DCICREATEINPUT,*LPDCICREATEINPUT; + + typedef struct _DCISURFACEINFO { + DWORD dwSize; + DWORD dwDCICaps; + DWORD dwCompression; + DWORD dwMask[3]; + DWORD dwWidth; + DWORD dwHeight; + LONG lStride; + DWORD dwBitCount; + ULONG_PTR dwOffSurface; + WORD wSelSurface; + WORD wReserved; + DWORD dwReserved1; + DWORD dwReserved2; + DWORD dwReserved3; + DCIRVAL (CALLBACK *BeginAccess) (LPVOID,LPRECT); + void (CALLBACK *EndAccess) (LPVOID); + void (CALLBACK *DestroySurface) (LPVOID); + } DCISURFACEINFO,*LPDCISURFACEINFO; + + typedef void (*ENUM_CALLBACK)(LPDCISURFACEINFO lpSurfaceInfo,LPVOID lpContext); + + typedef struct _DCIENUMINPUT { + DCICMD cmd; + RECT rSrc; + RECT rDst; + void (CALLBACK *EnumCallback)(LPDCISURFACEINFO,LPVOID); + LPVOID lpContext; + } DCIENUMINPUT,*LPDCIENUMINPUT; + + typedef DCISURFACEINFO DCIPRIMARY,*LPDCIPRIMARY; + + typedef struct _DCIOFFSCREEN { + DCISURFACEINFO dciInfo; + DCIRVAL (CALLBACK *Draw) (LPVOID); + DCIRVAL (CALLBACK *SetClipList) (LPVOID,LPRGNDATA); + DCIRVAL (CALLBACK *SetDestination) (LPVOID,LPRECT,LPRECT); + } DCIOFFSCREEN,*LPDCIOFFSCREEN; + + typedef struct _DCIOVERLAY { + DCISURFACEINFO dciInfo; + DWORD dwChromakeyValue; + DWORD dwChromakeyMask; + } DCIOVERLAY,*LPDCIOVERLAY; + +#ifndef YVU9 +#define YVU9 mmioFOURCC('Y','V','U','9') +#endif +#ifndef Y411 +#define Y411 mmioFOURCC('Y','4','1','1') +#endif +#ifndef YUY2 +#define YUY2 mmioFOURCC('Y','U','Y','2') +#endif +#ifndef YVYU +#define YVYU mmioFOURCC('Y','V','Y','U') +#endif +#ifndef UYVY +#define UYVY mmioFOURCC('U','Y','V','Y') +#endif +#ifndef Y211 +#define Y211 mmioFOURCC('Y','2','1','1') +#endif + +#ifdef __cplusplus +} +#endif +#endif Propchange: branches/header-work/include/ddk/dciddi.h ------------------------------------------------------------------------------ svn:eol-style = native Removed: branches/header-work/include/psdk/dciddi.h URL: http://svn.reactos.org/svn/reactos/branches/header-work/include/psdk/dciddi… ============================================================================== --- branches/header-work/include/psdk/dciddi.h [iso-8859-1] (original) +++ branches/header-work/include/psdk/dciddi.h (removed) @@ -1,185 +1,0 @@ -/* - * DCI driver interface - * - * Copyright (C) 2001 Ove Kaaven - * Copyright (C) 2008 Magnus Olsen, Aleksey Bragin - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#ifndef __INC_DCIDDI -#define __INC_DCIDDI - -#ifdef __cplusplus -extern "C" { -#endif - -/* DCI Command Escape */ -#define DCICOMMAND 3075 -#define DCI_VERSION 0x0100 - -#define DCICREATEPRIMARYSURFACE 1 -#define DCICREATEOFFSCREENSURFACE 2 -#define DCICREATEOVERLAYSURFACE 3 -#define DCIENUMSURFACE 4 -#define DCIESCAPE 5 - -typedef int DCIRVAL; /* DCI callback return type */ - -/* DCI Errors and success codes*/ -#define DCI_SUCCESS(error) (((DCIRVAL)error) >= 0) - -#define DCI_STATUS_POINTERCHANGED 1 -#define DCI_STATUS_STRIDECHANGED 2 -#define DCI_STATUS_FORMATCHANGED 4 -#define DCI_STATUS_SURFACEINFOCHANGED 8 -#define DCI_STATUS_CHROMAKEYCHANGED 16 -#define DCI_STATUS_WASSTILLDRAWING 32 - -#define DCI_OK 0 -#define DCI_FAIL_GENERIC -1 -#define DCI_FAIL_UNSUPPORTEDVERSION -2 -#define DCI_FAIL_INVALIDSURFACE -3 -#define DCI_FAIL_UNSUPPORTED -4 - -#define DCI_ERR_CURRENTLYNOTAVAIL -5 -#define DCI_ERR_INVALIDRECT -6 -#define DCI_ERR_UNSUPPORTEDFORMAT -7 -#define DCI_ERR_UNSUPPORTEDMASK -8 -#define DCI_ERR_TOOBIGHEIGHT -9 -#define DCI_ERR_TOOBIGWIDTH -10 -#define DCI_ERR_TOOBIGSIZE -11 -#define DCI_ERR_OUTOFMEMORY -12 -#define DCI_ERR_INVALIDPOSITION -13 -#define DCI_ERR_INVALIDSTRETCH -14 -#define DCI_ERR_INVALIDCLIPLIST -15 -#define DCI_ERR_SURFACEISOBSCURED -16 -#define DCI_ERR_XALIGN -17 -#define DCI_ERR_YALIGN -18 -#define DCI_ERR_XYALIGN -19 -#define DCI_ERR_WIDTHALIGN -20 -#define DCI_ERR_HEIGHTALIGN -21 - -/* Capabilities */ -#define DCI_SURFACE_TYPE 0x0000000F -#define DCI_PRIMARY 0x00000000 -#define DCI_OFFSCREEN 0x00000001 -#define DCI_OVERLAY 0x00000002 -#define DCI_VISIBLE 0x00000010 -#define DCI_CHROMAKEY 0x00000020 -#define DCI_1632_ACCESS 0x00000040 -#define DCI_DWORDSIZE 0x00000080 -#define DCI_DWORDALIGN 0x00000100 -#define DCI_WRITEONLY 0x00000200 -#define DCI_ASYNC 0x00000400 -#define DCI_CAN_STRETCHX 0x00001000 -#define DCI_CAN_STRETCHY 0x00002000 -#define DCI_CAN_STRETCHXY (DCI_CAN_STRETCHX | DCI_CAN_STRETCHY) -#define DCI_CAN_STRETCHXN 0x00004000 -#define DCI_CAN_STRETCHYN 0x00008000 -#define DCI_CAN_STRETCHXYN (DCI_CAN_STRETCHXN | DCI_CAN_STRETCHYN) -#define DCI_CANOVERLAY 0x00010000 - -/* FOURCC codes */ -#ifndef YVU9 -#define YVU9 mmioFOURCC('Y','V','U','9') -#endif -#ifndef Y411 -#define Y411 mmioFOURCC('Y','4','1','1') -#endif -#ifndef YUY2 -#define YUY2 mmioFOURCC('Y','U','Y','2') -#endif -#ifndef YVYU -#define YVYU mmioFOURCC('Y','V','Y','U') -#endif -#ifndef UYVY -#define UYVY mmioFOURCC('U','Y','V','Y') -#endif -#ifndef Y211 -#define Y211 mmioFOURCC('Y','2','1','1') -#endif - -/***************************************************************************** - * Escape command structures - */ -typedef struct _DCICMD { - DWORD dwCommand; - DWORD dwParam1; - DWORD dwParam2; - DWORD dwVersion; - DWORD dwReserved; -} DCICMD; - -typedef struct _DCICREATEINPUT { - DCICMD cmd; - DWORD dwCompression; - DWORD dwMask[3]; - DWORD dwWidth; - DWORD dwHeight; - DWORD dwDCICaps; - DWORD dwBitCount; - LPVOID lpSurface; -} DCICREATEINPUT, *LPDCICREATEINPUT; - -typedef struct _DCISURFACEINFO { - DWORD dwSize; - DWORD dwDCICaps; - DWORD dwCompression; - DWORD dwMask[3]; - DWORD dwWidth; - DWORD dwHeight; - LONG lStride; - DWORD dwBitCount; - ULONG_PTR dwOffSurface; - WORD wSelSurface; - WORD wReserved; - DWORD dwReserved1; - DWORD dwReserved2; - DWORD dwReserved3; - DCIRVAL (CALLBACK *BeginAccess)(LPVOID, LPRECT); - void (CALLBACK *EndAccess)(LPVOID); - void (CALLBACK *DestroySurface)(LPVOID); -} DCISURFACEINFO, *LPDCISURFACEINFO, DCIPRIMARY, *LPDCIPRIMARY; - -typedef void (*ENUM_CALLBACK)(LPDCISURFACEINFO lpSurfaceInfo, - LPVOID lpContext); - -typedef struct _DCIENUMINPUT { - DCICMD cmd; - RECT rSrc; - RECT rDst; - void (CALLBACK *EnumCallback)(LPDCISURFACEINFO, LPVOID); - LPVOID lpContext; -} DCIENUMINPUT, *LPDCIENUMINPUT; - -typedef struct _DCIOFFSCREEN { - DCISURFACEINFO dciInfo; - DCIRVAL (CALLBACK *Draw) (LPVOID); - DCIRVAL (CALLBACK *SetClipList) (LPVOID, LPRGNDATA); - DCIRVAL (CALLBACK *SetDestination) (LPVOID, LPRECT, LPRECT); -} DCIOFFSCREEN, *LPDCIOFFSCREEN; - -typedef struct _DCIOVERLAY { - DCISURFACEINFO dciInfo; - DWORD dwChromakeyValue; - DWORD dwChromakeyMask; -} DCIOVERLAY, *LPDCIOVERLAY; - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __INC_DCIDDI */

1 0

[janderwald] 47715: [MMIXER] - Handle failure of device enumeration - Add sanity check
by janderwald＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: janderwald Date: Wed Jun 9 16:51:16 2010 New Revision: 47715 URL: http://svn.reactos.org/svn/reactos?rev=47715&view=rev Log: [MMIXER] - Handle failure of device enumeration - Add sanity check Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c trunk/reactos/lib/drivers/sound/mmixer/mixer.c Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Wed Jun 9 16:51:16 2010 @@ -385,6 +385,8 @@ SrcLine->Line.Target.wPid = MixerInfo->MixCaps.wPid; SrcLine->Line.Target.vDriverVersion = MixerInfo->MixCaps.vDriverVersion; InitializeListHead(&SrcLine->LineControlsExtraData); + + ASSERT(MixerInfo->MixCaps.szPname[MAXPNAMELEN-1] == L'\0'); wcscpy(SrcLine->Line.Target.szPname, MixerInfo->MixCaps.szPname); } Modified: trunk/reactos/lib/drivers/sound/mmixer/mixer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/m… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/mixer.c [iso-8859-1] Wed Jun 9 16:51:16 2010 @@ -472,6 +472,13 @@ // enumeration has finished break; } + else + { + DPRINT1("Failed to enumerate device %lu\n", DeviceIndex); + + // TODO cleanup + return Status; + } } else {

1 0

[janderwald] 47714: [KS] - Perform all allocations / frees in dedicated alloc / free function
by janderwald＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: janderwald Date: Wed Jun 9 14:44:46 2010 New Revision: 47714 URL: http://svn.reactos.org/svn/reactos?rev=47714&view=rev Log: [KS] - Perform all allocations / frees in dedicated alloc / free function Modified: trunk/reactos/drivers/ksfilter/ks/api.c trunk/reactos/drivers/ksfilter/ks/connectivity.c trunk/reactos/drivers/ksfilter/ks/event.c trunk/reactos/drivers/ksfilter/ks/image.c trunk/reactos/drivers/ksfilter/ks/irp.c trunk/reactos/drivers/ksfilter/ks/misc.c trunk/reactos/drivers/ksfilter/ks/pin.c trunk/reactos/drivers/ksfilter/ks/topology.c Modified: trunk/reactos/drivers/ksfilter/ks/api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/api.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/api.c [iso-8859-1] Wed Jun 9 14:44:46 2010 @@ -530,7 +530,7 @@ return STATUS_INVALID_PARAMETER; /* allocate a device header */ - Header = ExAllocatePoolWithTag(PagedPool, sizeof(KSIDEVICE_HEADER), TAG_DEVICE_HEADER); + Header = AllocateItem(PagedPool, sizeof(KSIDEVICE_HEADER)); /* check for success */ if (!Header) @@ -597,7 +597,7 @@ return; KspFreeCreateItems(&Header->ItemList); - ExFreePoolWithTag(Header, TAG_DEVICE_HEADER); + FreeItem(Header); } /* @@ -641,7 +641,7 @@ /* check for an file object */ /* allocate the object header */ - ObjectHeader = ExAllocatePoolWithTag(NonPagedPool, sizeof(KSIOBJECT_HEADER), TAG_DEVICE_HEADER); + ObjectHeader = AllocateItem(NonPagedPool, sizeof(KSIOBJECT_HEADER)); if (!ObjectHeader) return STATUS_INSUFFICIENT_RESOURCES; @@ -659,10 +659,10 @@ { /* copy object class */ ObjectHeader->ObjectClass.MaximumLength = IoStack->FileObject->FileName.MaximumLength; - ObjectHeader->ObjectClass.Buffer = ExAllocatePoolWithTag(NonPagedPool, ObjectHeader->ObjectClass.MaximumLength, TAG_DEVICE_HEADER); + ObjectHeader->ObjectClass.Buffer = AllocateItem(NonPagedPool, ObjectHeader->ObjectClass.MaximumLength); if (!ObjectHeader->ObjectClass.Buffer) { - ExFreePoolWithTag(ObjectHeader, TAG_DEVICE_HEADER); + FreeItem(ObjectHeader); return STATUS_INSUFFICIENT_RESOURCES; } RtlCopyUnicodeString(&ObjectHeader->ObjectClass, &IoStack->FileObject->FileName); @@ -726,7 +726,7 @@ if (ObjectHeader->ObjectClass.Buffer) { /* release object class buffer */ - ExFreePoolWithTag(ObjectHeader->ObjectClass.Buffer, TAG_DEVICE_HEADER); + FreeItem(ObjectHeader->ObjectClass.Buffer); } if (ObjectHeader->Unknown) @@ -739,7 +739,7 @@ KspFreeCreateItems(&ObjectHeader->ItemList); /* free object header */ - ExFreePoolWithTag(ObjectHeader, TAG_DEVICE_HEADER); + FreeItem(ObjectHeader); } @@ -914,11 +914,11 @@ if (AllocateEntry) { /* allocate create item */ - Item = ExAllocatePool(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM)); + Item = AllocateItem(NonPagedPool, sizeof(KSOBJECT_CREATE_ITEM)); if (!Item) { /* no memory */ - ExFreePool(CreateEntry); + FreeItem(CreateEntry); return STATUS_INSUFFICIENT_RESOURCES; } @@ -931,7 +931,7 @@ Item->ObjectClass.MaximumLength = CreateItem->ObjectClass.MaximumLength; /* copy object class */ - Item->ObjectClass.Buffer = ExAllocatePool(NonPagedPool, Item->ObjectClass.MaximumLength); + Item->ObjectClass.Buffer = AllocateItem(NonPagedPool, Item->ObjectClass.MaximumLength); if (!Item->ObjectClass.Buffer) { /* release resources */ @@ -1747,7 +1747,7 @@ Length = wcslen(BusIdentifier) * sizeof(WCHAR); Length += sizeof(BUS_ENUM_DEVICE_EXTENSION); - BusDeviceExtension = ExAllocatePool(NonPagedPool, Length); + BusDeviceExtension = AllocateItem(NonPagedPool, Length); if (!BusDeviceExtension) { /* not enough memory */ @@ -1772,12 +1772,12 @@ BusDeviceExtension->ServicePath.Length = 0; BusDeviceExtension->ServicePath.MaximumLength = Length; - BusDeviceExtension->ServicePath.Buffer = ExAllocatePool(NonPagedPool, Length); + BusDeviceExtension->ServicePath.Buffer = AllocateItem(NonPagedPool, Length); if (!BusDeviceExtension->ServicePath.Buffer) { /* not enough memory */ - ExFreePool(BusDeviceExtension); + FreeItem(BusDeviceExtension); return STATUS_INSUFFICIENT_RESOURCES; } @@ -1798,8 +1798,8 @@ /* check for success */ if (!NT_SUCCESS(Status)) { - ExFreePool(BusDeviceExtension->ServicePath.Buffer); - ExFreePool(BusDeviceExtension); + FreeItem(BusDeviceExtension->ServicePath.Buffer); + FreeItem(BusDeviceExtension); return Status; } @@ -1808,8 +1808,8 @@ if (!NT_SUCCESS(Status)) { - ExFreePool(BusDeviceExtension->ServicePath.Buffer); - ExFreePool(BusDeviceExtension); + FreeItem(BusDeviceExtension->ServicePath.Buffer); + FreeItem(BusDeviceExtension); return Status; } @@ -1836,8 +1836,8 @@ } /* free device extension */ - ExFreePool(BusDeviceExtension->ServicePath.Buffer); - ExFreePool(BusDeviceExtension); + FreeItem(BusDeviceExtension->ServicePath.Buffer); + FreeItem(BusDeviceExtension); return STATUS_DEVICE_REMOVED; } @@ -2795,7 +2795,7 @@ } /* free the symbolic link list */ - ExFreePool(SymbolicLinkList); + FreeItem(SymbolicLinkList); } return Status; 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] Wed Jun 9 14:44:46 2010 @@ -239,7 +239,7 @@ /* allocate buffer for the registry key */ Path.Length = 0; Path.MaximumLength = MediaPath.MaximumLength + GuidString.MaximumLength; - Path.Buffer = ExAllocatePool(NonPagedPool, Path.MaximumLength); + Path.Buffer = AllocateItem(NonPagedPool, Path.MaximumLength); if (!Path.Buffer) { /* not enough memory */ @@ -262,7 +262,7 @@ DPRINT("ZwOpenKey() status 0x%08lx %S\n", Status, Path.Buffer); /* free path buffer */ - ExFreePool(Path.Buffer); + FreeItem(Path.Buffer); /* check for success */ if (!NT_SUCCESS(Status)) @@ -281,7 +281,7 @@ } /* allocate buffer to read key info */ - KeyInfo = (PKEY_VALUE_PARTIAL_INFORMATION) ExAllocatePool(NonPagedPool, Size); + KeyInfo = (PKEY_VALUE_PARTIAL_INFORMATION) AllocateItem(NonPagedPool, Size); if (!KeyInfo) { /* not enough memory */ @@ -298,7 +298,7 @@ if (!NT_SUCCESS(Status)) { /* failed to read key */ - ExFreePool(KeyInfo); + FreeItem(KeyInfo); return Status; } @@ -545,13 +545,13 @@ if (KeyInfo->DataLength + sizeof(WCHAR) > IoStack->Parameters.DeviceIoControl.OutputBufferLength) { Status = STATUS_BUFFER_OVERFLOW; - ExFreePool(KeyInfo); + FreeItem(KeyInfo); break; } RtlMoveMemory(Irp->UserBuffer, &KeyInfo->Data, KeyInfo->DataLength); ((LPWSTR)Irp->UserBuffer)[KeyInfo->DataLength / sizeof(WCHAR)] = L'\0'; - ExFreePool(KeyInfo); + FreeItem(KeyInfo); break; case KSPROPERTY_PIN_PROPOSEDATAFORMAT: Size = sizeof(KSDATAFORMAT); Modified: trunk/reactos/drivers/ksfilter/ks/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/event.… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/event.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/event.c [iso-8859-1] Wed Jun 9 14:44:46 2010 @@ -292,7 +292,7 @@ else { /* allocate it from nonpaged pool */ - EventEntry = ExAllocatePool(NonPagedPool, Size); + EventEntry = AllocateItem(NonPagedPool, Size); } if (!EventEntry) @@ -529,7 +529,7 @@ } /* free event entry */ - ExFreePool(EventEntry); + FreeItem(EventEntry); } Modified: trunk/reactos/drivers/ksfilter/ks/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/image.… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/image.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/image.c [iso-8859-1] Wed Jun 9 14:44:46 2010 @@ -45,7 +45,7 @@ if (NT_SUCCESS(Status)) { /* allocate resource buffer */ - Result = ExAllocatePool(PoolType, Size); + Result = AllocateItem(PoolType, Size); if (Result) { /* copy resource */ @@ -75,7 +75,7 @@ if (Result) { /* free resource buffer in case of a failure */ - ExFreePool(Result); + FreeItem(Result); } } /* done */ @@ -127,7 +127,7 @@ /* allocate image name buffer */ ImageName->MaximumLength = sizeof(ImagePath) + ImageLength; - ImageName->Buffer = ExAllocatePool(PagedPool, ImageName->MaximumLength); + ImageName->Buffer = AllocateItem(PagedPool, ImageName->MaximumLength); /* check for success */ if (!ImageName->Buffer) @@ -145,7 +145,7 @@ if (!NT_SUCCESS(Status)) { /* unexpected error */ - ExFreePool(ImageName->Buffer); + FreeItem(ImageName->Buffer); return Status; } @@ -154,13 +154,13 @@ Status = KspQueryRegValue(RegKey, L"ResourceId", NULL, &ImageLength, ValueType); /* allocate resource id buffer*/ - *ResourceId = (ULONG_PTR)ExAllocatePool(PagedPool, ImageLength); + *ResourceId = (ULONG_PTR)AllocateItem(PagedPool, ImageLength); /* check for success */ if (!*ResourceId) { /* insufficient memory */ - ExFreePool(ImageName->Buffer); + FreeItem(ImageName->Buffer); return STATUS_INSUFFICIENT_RESOURCES; } /* now query for resource id */ @@ -169,8 +169,8 @@ if (!NT_SUCCESS(Status)) { /* unexpected error */ - ExFreePool(ImageName->Buffer); - ExFreePool((PVOID)*ResourceId); + FreeItem(ImageName->Buffer); + FreeItem((PVOID)*ResourceId); } /* return result */ @@ -209,7 +209,7 @@ /* initialize subkey buffer */ SubKeyName.Length = 0; SubKeyName.MaximumLength = Modules.MaximumLength + ModuleName->MaximumLength; - SubKeyName.Buffer = ExAllocatePool(PagedPool, SubKeyName.MaximumLength); + SubKeyName.Buffer = AllocateItem(PagedPool, SubKeyName.MaximumLength); /* check for success */ if (!SubKeyName.Buffer) @@ -240,7 +240,7 @@ } /* free subkey string */ - ExFreePool(SubKeyName.Buffer); + FreeItem(SubKeyName.Buffer); /* close device key */ ZwClose(hKey); Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Wed Jun 9 14:44:46 2010 @@ -101,7 +101,7 @@ if (NT_SUCCESS(Status)) { /* free old descriptor */ - ExFreePool(Descriptor); + FreeItem(Descriptor); /* mark create item as changed */ CreateItem->Flags |= KSCREATE_ITEM_SECURITYCHANGED; @@ -896,7 +896,7 @@ if (Length && ( (!HeaderSize) || (Length % HeaderSize == 0) || ((ProbeFlags & KSPROBE_ALLOWFORMATCHANGE) && (Length == sizeof(KSSTREAM_HEADER))) ) ) { /* allocate stream header buffer */ - Irp->AssociatedIrp.SystemBuffer = ExAllocatePool(NonPagedPool, Length); + Irp->AssociatedIrp.SystemBuffer = AllocateItem(NonPagedPool, Length); if (!Irp->AssociatedIrp.SystemBuffer) { Modified: trunk/reactos/drivers/ksfilter/ks/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/misc.c… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/misc.c [iso-8859-1] Wed Jun 9 14:44:46 2010 @@ -26,7 +26,6 @@ FreeItem( IN PVOID Item) { - ExFreePool(Item); } Modified: trunk/reactos/drivers/ksfilter/ks/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/pin.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/pin.c [iso-8859-1] Wed Jun 9 14:44:46 2010 @@ -1560,7 +1560,7 @@ Size = sizeof(KSISTREAM_POINTER) + ContextSize; /* allocate new stream pointer */ - NewFrame = (PKSISTREAM_POINTER)ExAllocatePool(NonPagedPool, Size); + NewFrame = (PKSISTREAM_POINTER)AllocateItem(NonPagedPool, Size); if (!NewFrame) return STATUS_INSUFFICIENT_RESOURCES; Modified: trunk/reactos/drivers/ksfilter/ks/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/topolo… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] Wed Jun 9 14:44:46 2010 @@ -30,7 +30,7 @@ Name.MaximumLength = wcslen(ObjectType) * sizeof(WCHAR) + CreateParametersSize + 2 * sizeof(WCHAR); Name.MaximumLength += sizeof(WCHAR); /* acquire request buffer */ - Name.Buffer = ExAllocatePool(NonPagedPool, Name.MaximumLength); + Name.Buffer = AllocateItem(NonPagedPool, Name.MaximumLength); /* check for success */ if (!Name.Buffer) { @@ -68,7 +68,7 @@ IO_NO_PARAMETER_CHECKING | IO_FORCE_ACCESS_CHECK); /* free request buffer */ - ExFreePool(Name.Buffer); + FreeItem(Name.Buffer); return Status; } @@ -200,7 +200,7 @@ KeyName.Length = 0; KeyName.MaximumLength = LocalMachine.Length + GuidString.Length + sizeof(WCHAR); - KeyName.Buffer = ExAllocatePool(PagedPool, KeyName.MaximumLength); + KeyName.Buffer = AllocateItem(PagedPool, KeyName.MaximumLength); if (!KeyName.Buffer) { Irp->IoStatus.Information = 0; @@ -217,7 +217,7 @@ InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, NULL, NULL); Status = ZwOpenKey(&hKey, GENERIC_READ, &ObjectAttributes); - ExFreePool(KeyName.Buffer); + FreeItem(KeyName.Buffer); if (!NT_SUCCESS(Status)) { @@ -235,7 +235,7 @@ } ASSERT(Size); - KeyInfo = (PKEY_VALUE_PARTIAL_INFORMATION) ExAllocatePool(NonPagedPool, Size); + KeyInfo = (PKEY_VALUE_PARTIAL_INFORMATION) AllocateItem(NonPagedPool, Size); if (!KeyInfo) { Status = STATUS_NO_MEMORY; @@ -245,7 +245,7 @@ Status = ZwQueryValueKey(hKey, &Name, KeyValuePartialInformation, (PVOID)KeyInfo, Size, &Size); if (!NT_SUCCESS(Status)) { - ExFreePool(KeyInfo); + FreeItem(KeyInfo); ZwClose(hKey); Irp->IoStatus.Information = 0; break; @@ -256,14 +256,14 @@ { Irp->IoStatus.Information = KeyInfo->DataLength + sizeof(WCHAR); Status = STATUS_MORE_ENTRIES; - ExFreePool(KeyInfo); + FreeItem(KeyInfo); break; } RtlMoveMemory(Irp->UserBuffer, &KeyInfo->Data, KeyInfo->DataLength); ((LPWSTR)Irp->UserBuffer)[KeyInfo->DataLength / sizeof(WCHAR)] = L'\0'; Irp->IoStatus.Information = KeyInfo->DataLength + sizeof(WCHAR); - ExFreePool(KeyInfo); + FreeItem(KeyInfo); break; default: Irp->IoStatus.Information = 0;

1 0

[janderwald] 47713: [KS] - Fix memory leak
by janderwald＠svn.reactos.org 09 Jun '10

09 Jun '10

Author: janderwald Date: Wed Jun 9 14:16:05 2010 New Revision: 47713 URL: http://svn.reactos.org/svn/reactos?rev=47713&view=rev Log: [KS] - Fix memory leak Modified: trunk/reactos/drivers/ksfilter/ks/topology.c Modified: trunk/reactos/drivers/ksfilter/ks/topology.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/topolo… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/topology.c [iso-8859-1] Wed Jun 9 14:16:05 2010 @@ -205,24 +205,27 @@ { Irp->IoStatus.Information = 0; Status = STATUS_INSUFFICIENT_RESOURCES; + RtlFreeUnicodeString(&GuidString); break; } RtlAppendUnicodeStringToString(&KeyName, &LocalMachine); RtlAppendUnicodeStringToString(&KeyName, &GuidString); + RtlFreeUnicodeString(&GuidString); InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, NULL, NULL); Status = ZwOpenKey(&hKey, GENERIC_READ, &ObjectAttributes); + ExFreePool(KeyName.Buffer); + if (!NT_SUCCESS(Status)) { DPRINT1("ZwOpenKey() failed with status 0x%08lx\n", Status); - ExFreePool(KeyName.Buffer); - Irp->IoStatus.Information = 0; - break; - } - ExFreePool(KeyName.Buffer); + Irp->IoStatus.Information = 0; + break; + } + Status = ZwQueryValueKey(hKey, &Name, KeyValuePartialInformation, NULL, 0, &Size); if (!NT_SUCCESS(Status) && Status != STATUS_BUFFER_TOO_SMALL) { @@ -231,6 +234,7 @@ break; } + ASSERT(Size); KeyInfo = (PKEY_VALUE_PARTIAL_INFORMATION) ExAllocatePool(NonPagedPool, Size); if (!KeyInfo) {

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2010