Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 61951: [USBCCGP] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 03 Feb '14

03 Feb '14

Author: akhaldi Date: Mon Feb 3 10:50:41 2014 New Revision: 61951 URL: http://svn.reactos.org/svn/reactos?rev=61951&view=rev Log: [USBCCGP] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/drivers/usb/usbccgp/descriptor.c trunk/reactos/drivers/usb/usbccgp/misc.c trunk/reactos/drivers/usb/usbccgp/pdo.c trunk/reactos/drivers/usb/usbccgp/usbccgp.h Modified: trunk/reactos/drivers/usb/usbccgp/descriptor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/descri… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/descriptor.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/descriptor.c [iso-8859-1] Mon Feb 3 10:50:41 2014 @@ -545,4 +545,3 @@ // return Status; } - Modified: trunk/reactos/drivers/usb/usbccgp/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/misc.c… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/misc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/misc.c [iso-8859-1] Mon Feb 3 10:50:41 2014 @@ -190,4 +190,4 @@ DPRINT1(" Index %lu iInterface %x\n", SubIndex, FunctionDescriptor[Index].InterfaceDescriptorList[SubIndex]->iInterface); } } -} +} Modified: trunk/reactos/drivers/usb/usbccgp/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/pdo.c?… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/pdo.c [iso-8859-1] Mon Feb 3 10:50:41 2014 @@ -10,6 +10,8 @@ */ #include "usbccgp.h" + +#include <ntddk.h> #define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/usb/usbccgp/usbccgp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbccgp/usbccg… ============================================================================== --- trunk/reactos/drivers/usb/usbccgp/usbccgp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbccgp/usbccgp.h [iso-8859-1] Mon Feb 3 10:50:41 2014 @@ -1,13 +1,10 @@ #ifndef USBEHCI_H__ #define USBEHCI_H__ -#include <ntddk.h> +#include <wdm.h> #include <hubbusif.h> #include <usbbusif.h> #include <usbdlib.h> - -/* FIXME: -#include <usbprotocoldefs.h> */ #include <stdio.h> @@ -151,4 +148,4 @@ USBCCGP_EnumerateFunctions( IN PDEVICE_OBJECT DeviceObject); -#endif +#endif /* USBEHCI_H__ */

1 0

[akhaldi] 61950: [SCSIPORT] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 03 Feb '14

03 Feb '14

Author: akhaldi Date: Mon Feb 3 10:49:41 2014 New Revision: 61950 URL: http://svn.reactos.org/svn/reactos?rev=61950&view=rev Log: [SCSIPORT] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/drivers/storage/scsiport/precomp.h trunk/reactos/drivers/storage/scsiport/scsiport.c trunk/reactos/drivers/storage/scsiport/scsiport_int.h trunk/reactos/drivers/storage/scsiport/stubs.c Modified: trunk/reactos/drivers/storage/scsiport/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/p… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/precomp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/precomp.h [iso-8859-1] Mon Feb 3 10:49:41 2014 @@ -1,10 +1 @@ -#include <ntddk.h> -#include <srb.h> -#include <scsi.h> -#include <ntddscsi.h> -#include <ntddstor.h> -#include <ntdddisk.h> -#include <stdio.h> -#include <stdarg.h> - -#include "scsiport_int.h" +#include <wdm.h> Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Mon Feb 3 10:49:41 2014 @@ -29,16 +29,20 @@ #include "precomp.h" -#ifndef NDEBUG +#include <ntddk.h> +#include <stdio.h> +#include <scsi.h> +#include <ntddscsi.h> +#include <ntdddisk.h> + #define NDEBUG -#endif #include <debug.h> +#include "scsiport_int.h" + ULONG InternalDebugLevel = 0x00; #undef ScsiPortMoveMemory - -/* TYPES *********************************************************************/ /* GLOBALS *******************************************************************/ @@ -6407,5 +6411,4 @@ return(Address.u.LowPart); } - /* EOF */ Modified: trunk/reactos/drivers/storage/scsiport/scsiport_int.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport_int.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport_int.h [iso-8859-1] Mon Feb 3 10:49:41 2014 @@ -4,6 +4,8 @@ * DESCRIPTION * An enumeration containing the states in the timer DFA */ + +#pragma once #define VERSION "0.0.3" Modified: trunk/reactos/drivers/storage/scsiport/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/stubs.c [iso-8859-1] Mon Feb 3 10:49:41 2014 @@ -6,9 +6,9 @@ * PROGRAMMER: Timo Kreuzer (timo.kreuzer(a)reactos.org) */ -/* INCLUDES *****************************************************************/ - #include "precomp.h" + +#include <srb.h> #define NDEBUG #include <debug.h> @@ -270,4 +270,3 @@ { WRITE_REGISTER_ULONG(Register, Value); } -

1 0

[akhaldi] 61949: [PCIIDEX] * Remove one time inclusions from the main header and put them back where they belong. * Improve the GUIDs situation. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 03 Feb '14

03 Feb '14

Author: akhaldi Date: Mon Feb 3 10:48:20 2014 New Revision: 61949 URL: http://svn.reactos.org/svn/reactos?rev=61949&view=rev Log: [PCIIDEX] * Remove one time inclusions from the main header and put them back where they belong. * Improve the GUIDs situation. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/drivers/storage/ide/pciidex/fdo.c trunk/reactos/drivers/storage/ide/pciidex/miniport.c trunk/reactos/drivers/storage/ide/pciidex/pciidex.h trunk/reactos/drivers/storage/ide/pciidex/pdo.c Modified: trunk/reactos/drivers/storage/ide/pciidex/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/pciidex/fdo.c [iso-8859-1] Mon Feb 3 10:48:20 2014 @@ -10,6 +10,9 @@ #define NDEBUG #include <debug.h> + +#include <initguid.h> +#include <wdmguid.h> static NTSTATUS GetBusInterface( Modified: trunk/reactos/drivers/storage/ide/pciidex/miniport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/miniport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/pciidex/miniport.c [iso-8859-1] Mon Feb 3 10:48:20 2014 @@ -6,7 +6,6 @@ * PROGRAMMERS: Hervé Poussineau (hpoussin(a)reactos.org) */ -#define INITGUID #include "pciidex.h" #define NDEBUG Modified: trunk/reactos/drivers/storage/ide/pciidex/pciidex.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/pciidex.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/pciidex/pciidex.h [iso-8859-1] Mon Feb 3 10:48:20 2014 @@ -1,8 +1,5 @@ #include <ntifs.h> -#include <ntddk.h> #include <ide.h> -#include <wdmguid.h> -#include <stdio.h> typedef struct _PCIIDEX_DRIVER_EXTENSION { Modified: trunk/reactos/drivers/storage/ide/pciidex/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/pciide… ============================================================================== --- trunk/reactos/drivers/storage/ide/pciidex/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/pciidex/pdo.c [iso-8859-1] Mon Feb 3 10:48:20 2014 @@ -7,6 +7,8 @@ */ #include "pciidex.h" + +#include <stdio.h> #define NDEBUG #include <debug.h>

1 0

[akhaldi] 61948: [FLOPPY] * Do not include debug.h into the main header. * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 03 Feb '14

03 Feb '14

Author: akhaldi Date: Mon Feb 3 10:46:48 2014 New Revision: 61948 URL: http://svn.reactos.org/svn/reactos?rev=61948&view=rev Log: [FLOPPY] * Do not include debug.h into the main header. * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/drivers/storage/floppy/csqrtns.c trunk/reactos/drivers/storage/floppy/csqrtns.h trunk/reactos/drivers/storage/floppy/floppy.c trunk/reactos/drivers/storage/floppy/floppy.h trunk/reactos/drivers/storage/floppy/hardware.c trunk/reactos/drivers/storage/floppy/hardware.h trunk/reactos/drivers/storage/floppy/ioctl.c trunk/reactos/drivers/storage/floppy/ioctl.h trunk/reactos/drivers/storage/floppy/precomp.h trunk/reactos/drivers/storage/floppy/readwrite.c trunk/reactos/drivers/storage/floppy/readwrite.h Modified: trunk/reactos/drivers/storage/floppy/csqrtns.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/csq… ============================================================================== --- trunk/reactos/drivers/storage/floppy/csqrtns.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/csqrtns.c [iso-8859-1] Mon Feb 3 10:46:48 2014 @@ -39,6 +39,8 @@ */ #include "precomp.h" + +#include <debug.h> /* Global CSQ struct that the CSQ functions initialize and use */ IO_CSQ Csq; @@ -171,4 +173,3 @@ InsertTailList(&IrpQueue, &Irp->Tail.Overlay.ListEntry); KeReleaseSemaphore(&QueueSemaphore, 0, 1, FALSE); } - Modified: trunk/reactos/drivers/storage/floppy/csqrtns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/csq… ============================================================================== --- trunk/reactos/drivers/storage/floppy/csqrtns.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/csqrtns.h [iso-8859-1] Mon Feb 3 10:46:48 2014 @@ -23,6 +23,8 @@ * REVISIONS: * 15-Feb-2004 vizzini - Created */ + +#pragma once #include <csq.h> @@ -51,4 +53,3 @@ VOID NTAPI CsqCompleteCanceledIrp(PIO_CSQ Csq, PIRP Irp); - Modified: trunk/reactos/drivers/storage/floppy/floppy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo… ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/floppy.c [iso-8859-1] Mon Feb 3 10:46:48 2014 @@ -42,6 +42,12 @@ #include "precomp.h" +#include <ntddk.h> +#include <debug.h> + +#include "ioctl.h" +#include "readwrite.h" + /* * Global controller info structures. Each controller gets one. Since the system * will probably have only one, with four being a very unlikely maximum, a static @@ -1192,4 +1198,3 @@ return STATUS_SUCCESS; } - Modified: trunk/reactos/drivers/storage/floppy/floppy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/flo… ============================================================================== --- trunk/reactos/drivers/storage/floppy/floppy.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/floppy.h [iso-8859-1] Mon Feb 3 10:46:48 2014 @@ -23,6 +23,8 @@ * REVISIONS: * 15-Feb-2004 vizzini - Created */ + +#pragma once #define MAX_DEVICE_NAME 255 #define MAX_ARC_PATH_LEN 255 @@ -123,4 +125,3 @@ #define GEOMETRY_144_TRACKSPERCYLINDER 2 #define GEOMETRY_144_SECTORSPERTRACK 18 #define GEOMETRY_144_BYTESPERSECTOR 512 - Modified: trunk/reactos/drivers/storage/floppy/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/har… ============================================================================== --- trunk/reactos/drivers/storage/floppy/hardware.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/hardware.c [iso-8859-1] Mon Feb 3 10:46:48 2014 @@ -49,10 +49,11 @@ #include "precomp.h" +#include <debug.h> + /* * Hardware Support Routines */ - static BOOLEAN NTAPI ReadyForWrite(PCONTROLLER_INFO ControllerInfo) @@ -1041,4 +1042,3 @@ INFO_(FLOPPY, "MAIN_STATUS_REGISTER =0x%x\n", READ_PORT_UCHAR(ControllerInfo->BaseAddress + MAIN_STATUS_REGISTER)); INFO_(FLOPPY, "DIGITAL_INPUT_REGISTER = 0x%x\n", READ_PORT_UCHAR(ControllerInfo->BaseAddress + DIGITAL_INPUT_REGISTER)); } - Modified: trunk/reactos/drivers/storage/floppy/hardware.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/har… ============================================================================== --- trunk/reactos/drivers/storage/floppy/hardware.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/hardware.h [iso-8859-1] Mon Feb 3 10:46:48 2014 @@ -33,6 +33,8 @@ * - Convert these numbers to 100% absolute values; eliminate bit positions * in favor of shifts or bitfields */ + +#pragma once #define FLOPPY_DEFAULT_IRQ 0x6 #define FDC_PORT_BYTES 0x8 @@ -350,4 +352,3 @@ NTSTATUS NTAPI HwTurnOffMotor(PCONTROLLER_INFO ControllerInfo); - Modified: trunk/reactos/drivers/storage/floppy/ioctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/ioc… ============================================================================== --- trunk/reactos/drivers/storage/floppy/ioctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/ioctl.c [iso-8859-1] Mon Feb 3 10:46:48 2014 @@ -33,6 +33,7 @@ #include "precomp.h" +#include <debug.h> NTSTATUS NTAPI DeviceIoctl(PDEVICE_OBJECT DeviceObject, PIRP Irp) @@ -267,4 +268,3 @@ StopMotor(DriveInfo->ControllerInfo); return; } - Modified: trunk/reactos/drivers/storage/floppy/ioctl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/ioc… ============================================================================== --- trunk/reactos/drivers/storage/floppy/ioctl.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/ioctl.h [iso-8859-1] Mon Feb 3 10:46:48 2014 @@ -24,6 +24,8 @@ * 15-Feb-2004 vizzini - Created */ +#pragma once + DRIVER_DISPATCH DeviceIoctl; NTSTATUS NTAPI @@ -31,4 +33,3 @@ VOID NTAPI DeviceIoctlPassive(PDRIVE_INFO DriveInfo, PIRP Irp); - Modified: trunk/reactos/drivers/storage/floppy/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/pre… ============================================================================== --- trunk/reactos/drivers/storage/floppy/precomp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/precomp.h [iso-8859-1] Mon Feb 3 10:46:48 2014 @@ -1,9 +1,5 @@ -#include <ntddk.h> -#include <debug.h> +#include <wdm.h> #include "floppy.h" #include "csqrtns.h" #include "hardware.h" -#include "csqrtns.h" -#include "ioctl.h" -#include "readwrite.h" Modified: trunk/reactos/drivers/storage/floppy/readwrite.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/rea… ============================================================================== --- trunk/reactos/drivers/storage/floppy/readwrite.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/readwrite.c [iso-8859-1] Mon Feb 3 10:46:48 2014 @@ -54,6 +54,7 @@ #include "precomp.h" +#include <debug.h> static IO_ALLOCATION_ACTION NTAPI MapRegisterCallback(PDEVICE_OBJECT DeviceObject, @@ -759,4 +760,3 @@ IoCompleteRequest(Irp, IO_DISK_INCREMENT); StopMotor(DriveInfo->ControllerInfo); } - Modified: trunk/reactos/drivers/storage/floppy/readwrite.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/floppy/rea… ============================================================================== --- trunk/reactos/drivers/storage/floppy/readwrite.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/floppy/readwrite.h [iso-8859-1] Mon Feb 3 10:46:48 2014 @@ -24,6 +24,8 @@ * 15-Feb-2004 vizzini - Created */ +#pragma once + DRIVER_DISPATCH ReadWrite; NTSTATUS NTAPI @@ -31,4 +33,3 @@ VOID NTAPI ReadWritePassive(PDRIVE_INFO DriveInfo, PIRP Irp); -

1 0

[akhaldi] 61947: [FDC] * Do not include debug.h into the main header. * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 03 Feb '14

03 Feb '14

Author: akhaldi Date: Mon Feb 3 10:45:04 2014 New Revision: 61947 URL: http://svn.reactos.org/svn/reactos?rev=61947&view=rev Log: [FDC] * Do not include debug.h into the main header. * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/drivers/storage/fdc/fdc/fdc.c trunk/reactos/drivers/storage/fdc/fdc/fdc.h trunk/reactos/drivers/storage/fdc/fdc/fdo.c trunk/reactos/drivers/storage/fdc/fdc/pdo.c Modified: trunk/reactos/drivers/storage/fdc/fdc/fdc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/fdc/fd… ============================================================================== --- trunk/reactos/drivers/storage/fdc/fdc/fdc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/fdc/fdc/fdc.c [iso-8859-1] Mon Feb 3 10:45:04 2014 @@ -12,7 +12,6 @@ #define NDEBUG #include <debug.h> - /* GLOBALS ********************************************************************/ @@ -166,4 +165,4 @@ DriverObject->DriverUnload = FdcDriverUnload; return STATUS_SUCCESS; -} +} Modified: trunk/reactos/drivers/storage/fdc/fdc/fdc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/fdc/fd… ============================================================================== --- trunk/reactos/drivers/storage/fdc/fdc/fdc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/fdc/fdc/fdc.h [iso-8859-1] Mon Feb 3 10:45:04 2014 @@ -7,9 +7,6 @@ */ #include <ntifs.h> -#include <ntddk.h> -#include <stdio.h> -#include <debug.h> #define MAX_DEVICE_NAME 255 #define MAX_ARC_PATH_LEN 255 @@ -124,5 +121,3 @@ FdcPdoPnp( IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp); - -/* EOF */ Modified: trunk/reactos/drivers/storage/fdc/fdc/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/fdc/fd… ============================================================================== --- trunk/reactos/drivers/storage/fdc/fdc/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/fdc/fdc/fdo.c [iso-8859-1] Mon Feb 3 10:45:04 2014 @@ -9,6 +9,9 @@ /* INCLUDES *******************************************************************/ #include "fdc.h" + +#include <stdio.h> +#include <debug.h> /* FUNCTIONS ******************************************************************/ @@ -573,4 +576,4 @@ return Status; } -/* EOF */ +/* EOF */ Modified: trunk/reactos/drivers/storage/fdc/fdc/pdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/fdc/fdc/pd… ============================================================================== --- trunk/reactos/drivers/storage/fdc/fdc/pdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/fdc/fdc/pdo.c [iso-8859-1] Mon Feb 3 10:45:04 2014 @@ -9,6 +9,8 @@ /* INCLUDES *******************************************************************/ #include "fdc.h" + +#include <debug.h> /* FUNCTIONS ******************************************************************/

1 0

[akhaldi] 61946: [CLASSPNP] * Remove one time inclusions from the main header and put them back where they belong. * Improve the GUIDs situation. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 03 Feb '14

03 Feb '14

Author: akhaldi Date: Mon Feb 3 10:43:32 2014 New Revision: 61946 URL: http://svn.reactos.org/svn/reactos?rev=61946&view=rev Log: [CLASSPNP] * Remove one time inclusions from the main header and put them back where they belong. * Improve the GUIDs situation. * Improve header inclusions. CORE-7716 Added: trunk/reactos/drivers/storage/classpnp/guid.c (with props) Modified: trunk/reactos/drivers/storage/classpnp/CMakeLists.txt trunk/reactos/drivers/storage/classpnp/autorun.c trunk/reactos/drivers/storage/classpnp/class.c trunk/reactos/drivers/storage/classpnp/classp.h trunk/reactos/drivers/storage/classpnp/classwmi.c trunk/reactos/drivers/storage/classpnp/clntirp.c trunk/reactos/drivers/storage/classpnp/create.c trunk/reactos/drivers/storage/classpnp/debug.c trunk/reactos/drivers/storage/classpnp/debug.h trunk/reactos/drivers/storage/classpnp/lock.c trunk/reactos/drivers/storage/classpnp/obsolete.c trunk/reactos/drivers/storage/classpnp/retry.c trunk/reactos/drivers/storage/classpnp/utils.c trunk/reactos/drivers/storage/classpnp/xferpkt.c Modified: trunk/reactos/drivers/storage/classpnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/C… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] Mon Feb 3 10:43:32 2014 @@ -26,6 +26,7 @@ retry.c utils.c xferpkt.c + guid.c ${CMAKE_CURRENT_BINARY_DIR}/classpnp.def) add_library(classpnp SHARED Modified: trunk/reactos/drivers/storage/classpnp/autorun.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/a… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/autorun.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/autorun.c [iso-8859-1] Mon Feb 3 10:43:32 2014 @@ -22,7 +22,8 @@ --*/ #include "classp.h" -#include "debug.h" + +#include <wmidata.h> #define GESN_TIMEOUT_VALUE (0x4) #define GESN_BUFFER_SIZE (0x8) Modified: trunk/reactos/drivers/storage/classpnp/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] Mon Feb 3 10:43:32 2014 @@ -21,9 +21,12 @@ --*/ -#define CLASS_INIT_GUID 1 #include "classp.h" -#include "debug.h" + +#include <stddef.h> + +#include <initguid.h> +#include <mountdev.h> #ifdef ALLOC_PRAGMA #pragma alloc_text(INIT, DriverEntry) Modified: trunk/reactos/drivers/storage/classpnp/classp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/classp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/classp.h [iso-8859-1] Mon Feb 3 10:43:32 2014 @@ -25,23 +25,10 @@ --*/ -#include <stddef.h> -#include <stdarg.h> #include <ntddk.h> - -#include <scsi.h> -#include <wmidata.h> #include <classpnp.h> - -#if CLASS_INIT_GUID -#include <initguid.h> -#endif - -#include <mountdev.h> #include <ioevent.h> #include <pseh/pseh2.h> - -#include "wmistr.h" extern CLASSPNP_SCAN_FOR_SPECIAL_INFO ClassBadItems[]; @@ -876,3 +863,5 @@ VOID NTAPI FreeDeviceInputMdl(PMDL Mdl); NTSTATUS NTAPI InitializeTransferPackets(PDEVICE_OBJECT Fdo); VOID NTAPI DestroyAllTransferPackets(PDEVICE_OBJECT Fdo); + +#include "debug.h" Modified: trunk/reactos/drivers/storage/classpnp/classwmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/classwmi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/classwmi.c [iso-8859-1] Mon Feb 3 10:43:32 2014 @@ -22,6 +22,8 @@ --*/ #include "classp.h" + +#include <wmistr.h> NTSTATUS NTAPI Modified: trunk/reactos/drivers/storage/classpnp/clntirp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/clntirp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/clntirp.c [iso-8859-1] Mon Feb 3 10:43:32 2014 @@ -22,7 +22,6 @@ --*/ #include "classp.h" -#include "debug.h" /* * EnqueueDeferredClientIrp Modified: trunk/reactos/drivers/storage/classpnp/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/create.c [iso-8859-1] Mon Feb 3 10:43:32 2014 @@ -21,9 +21,7 @@ --*/ -#define CLASS_INIT_GUID 0 #include "classp.h" -#include "debug.h" ULONG BreakOnClose = 0; Modified: trunk/reactos/drivers/storage/classpnp/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/d… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/debug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/debug.c [iso-8859-1] Mon Feb 3 10:43:32 2014 @@ -21,9 +21,7 @@ --*/ - #include "classp.h" -#include "debug.h" #if DBG Modified: trunk/reactos/drivers/storage/classpnp/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/d… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/debug.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/debug.h [iso-8859-1] Mon Feb 3 10:43:32 2014 @@ -22,6 +22,7 @@ --*/ +#pragma once VOID ClassDebugPrint(CLASS_DEBUG_LEVEL DebugPrintLevel, PCCHAR DebugMessage, ...); @@ -144,5 +145,3 @@ #define DBGGETSRBSTATUSSTR(_pSrb) #endif - - Added: trunk/reactos/drivers/storage/classpnp/guid.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/g… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/guid.c (added) +++ trunk/reactos/drivers/storage/classpnp/guid.c [iso-8859-1] Mon Feb 3 10:43:32 2014 @@ -0,0 +1,7 @@ +/* DO NOT USE THE PRECOMPILED HEADER FOR THIS FILE! */ + +#include <ntdef.h> +#include <initguid.h> +#include <ioevent.h> + +/* NO CODE HERE, THIS IS JUST REQUIRED FOR THE GUID DEFINITIONS */ Propchange: trunk/reactos/drivers/storage/classpnp/guid.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/storage/classpnp/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/l… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/lock.c [iso-8859-1] Mon Feb 3 10:43:32 2014 @@ -23,8 +23,6 @@ --*/ #include "classp.h" -#include "debug.h" - LONG LockHighWatermark = 0; LONG LockLowWatermark = 0; Modified: trunk/reactos/drivers/storage/classpnp/obsolete.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/o… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/obsolete.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/obsolete.c [iso-8859-1] Mon Feb 3 10:43:32 2014 @@ -24,7 +24,6 @@ --*/ #include "classp.h" -#include "debug.h" PIRP NTAPI ClassRemoveCScanList(IN PCSCAN_LIST List); VOID NTAPI ClasspInitializeCScanList(IN PCSCAN_LIST List); Modified: trunk/reactos/drivers/storage/classpnp/retry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/r… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/retry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/retry.c [iso-8859-1] Mon Feb 3 10:43:32 2014 @@ -22,7 +22,6 @@ --*/ #include "classp.h" -#include "debug.h" /* * InterpretTransferPacketError Modified: trunk/reactos/drivers/storage/classpnp/utils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/u… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/utils.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/utils.c [iso-8859-1] Mon Feb 3 10:43:32 2014 @@ -22,7 +22,6 @@ --*/ #include "classp.h" -#include "debug.h" #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, ClassGetDeviceParameter) Modified: trunk/reactos/drivers/storage/classpnp/xferpkt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/x… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/xferpkt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/xferpkt.c [iso-8859-1] Mon Feb 3 10:43:32 2014 @@ -22,7 +22,6 @@ --*/ #include "classp.h" -#include "debug.h" #ifdef ALLOC_PRAGMA #pragma alloc_text(PAGE, InitializeTransferPackets)

1 0

[akhaldi] 61945: [DISK_NEW] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 03 Feb '14

03 Feb '14

Author: akhaldi Date: Mon Feb 3 10:40:25 2014 New Revision: 61945 URL: http://svn.reactos.org/svn/reactos?rev=61945&view=rev Log: [DISK_NEW] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/drivers/storage/class/disk_new/data.c trunk/reactos/drivers/storage/class/disk_new/disk.c trunk/reactos/drivers/storage/class/disk_new/disk.h trunk/reactos/drivers/storage/class/disk_new/diskwmi.c trunk/reactos/drivers/storage/class/disk_new/enum.c trunk/reactos/drivers/storage/class/disk_new/geometry.c Modified: trunk/reactos/drivers/storage/class/disk_new/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk_new/data.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk_new/data.c [iso-8859-1] Mon Feb 3 10:40:25 2014 @@ -79,4 +79,3 @@ #ifdef ALLOC_DATA_PRAGMA #pragma data_seg() #endif - Modified: trunk/reactos/drivers/storage/class/disk_new/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk_new/disk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk_new/disk.c [iso-8859-1] Mon Feb 3 10:40:25 2014 @@ -26,9 +26,8 @@ // Now instantiate the GUIDs // -#include "initguid.h" -#include "ntddstor.h" -#include "ioevent.h" +#include <initguid.h> +#include <ioevent.h> NTSTATUS NTAPI Modified: trunk/reactos/drivers/storage/class/disk_new/disk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk_new/disk.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk_new/disk.h [iso-8859-1] Mon Feb 3 10:40:25 2014 @@ -19,22 +19,21 @@ Revision History: --*/ + #undef _WIN32_WINNT #define _WIN32_WINNT 0x0501 #define NTDDI_VERSION NTDDI_WINXP -#include "ntddk.h" -#include "scsi.h" +#include <ntddk.h> #include <wmidata.h> -#include "classpnp.h" +#include <classpnp.h> + #if defined(JAPAN) && defined(_X86_) -#include "machine.h" +#include <machine.h> #endif -#include <wmistr.h> - #if defined(_X86_) -#include "mountdev.h" +#include <mountdev.h> #endif #ifdef ExAllocatePool @@ -976,4 +975,3 @@ #define DiskHashGuid(Guid) (((PULONG) &Guid)[0] ^ ((PULONG) &Guid)[0] ^ ((PULONG) &Guid)[0] ^ ((PULONG) &Guid)[0]) - Modified: trunk/reactos/drivers/storage/class/disk_new/diskwmi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk_new/diskwmi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk_new/diskwmi.c [iso-8859-1] Mon Feb 3 10:40:25 2014 @@ -21,6 +21,8 @@ --*/ #include "disk.h" + +#include <wmistr.h> NTSTATUS NTAPI Modified: trunk/reactos/drivers/storage/class/disk_new/enum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk_new/enum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk_new/enum.c [iso-8859-1] Mon Feb 3 10:40:25 2014 @@ -1244,4 +1244,3 @@ KeSetEvent(&(diskData->PartitioningEvent), IO_NO_INCREMENT, FALSE); return; } - Modified: trunk/reactos/drivers/storage/class/disk_new/geometry.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/disk… ============================================================================== --- trunk/reactos/drivers/storage/class/disk_new/geometry.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/disk_new/geometry.c [iso-8859-1] Mon Feb 3 10:40:25 2014 @@ -21,9 +21,7 @@ --*/ - #include "disk.h" -#include "ntddstor.h" #if defined (_X86_)

1 0

[akhaldi] 61944: [CDROM_NEW] * Move some inclusions to the main header. * Improve header inclusions. * Remove inclusions and definitions that already exist in the main header. * Improve the GUIDs s...
by akhaldi＠svn.reactos.org 03 Feb '14

03 Feb '14

Author: akhaldi Date: Mon Feb 3 10:39:05 2014 New Revision: 61944 URL: http://svn.reactos.org/svn/reactos?rev=61944&view=rev Log: [CDROM_NEW] * Move some inclusions to the main header. * Improve header inclusions. * Remove inclusions and definitions that already exist in the main header. * Improve the GUIDs situation. CORE-7716 Removed: trunk/reactos/drivers/storage/class/cdrom_new/sec.h Modified: trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c trunk/reactos/drivers/storage/class/cdrom_new/cdrom.h trunk/reactos/drivers/storage/class/cdrom_new/data.c trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c trunk/reactos/drivers/storage/class/cdrom_new/mmc.c trunk/reactos/drivers/storage/class/cdrom_new/sec.c trunk/reactos/drivers/storage/class/cdrom_new/trace.h Modified: trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt [iso-8859-1] Mon Feb 3 10:39:05 2014 @@ -1,4 +1,5 @@ -include_directories(..) + +include_directories(${REACTOS_SOURCE_DIR}/drivers/storage/class) list(APPEND SOURCE cdrom.c Modified: trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c [iso-8859-1] Mon Feb 3 10:39:05 2014 @@ -24,16 +24,6 @@ --*/ -#include "stddef.h" -#include "string.h" - -#include "ntddk.h" -#include "initguid.h" - -#include "ntddcdvd.h" -#include "classpnp.h" - -#include "ntddstor.h" #include "cdrom.h" #ifdef ALLOC_PRAGMA Modified: trunk/reactos/drivers/storage/class/cdrom_new/cdrom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/cdrom.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/cdrom.h [iso-8859-1] Mon Feb 3 10:39:05 2014 @@ -28,7 +28,11 @@ #ifndef __CDROMP_H__ #define __CDROMP_H__ -#include "ntddmmc.h" +#include <ntddk.h> +#include <ntddcdvd.h> +#include <classpnp.h> +#include <ntddmmc.h> + #include "trace.h" extern CLASSPNP_SCAN_FOR_SPECIAL_INFO CdromHackItems[]; @@ -872,4 +876,4 @@ IN BOOLEAN CalledFromWorkItem ); -#endif // __CDROMP_H__ +#endif /* __CDROMP_H__ */ Modified: trunk/reactos/drivers/storage/class/cdrom_new/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/data.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/data.c [iso-8859-1] Mon Feb 3 10:39:05 2014 @@ -17,9 +17,7 @@ --*/ -#include "ntddk.h" -#include "classpnp.h" -#include "trace.h" +#include "cdrom.h" #ifdef ALLOC_DATA_PRAGMA #pragma data_seg("PAGE") Modified: trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c [iso-8859-1] Mon Feb 3 10:39:05 2014 @@ -24,18 +24,7 @@ --*/ -#include "stddef.h" -#include "string.h" - -#include "ntddk.h" - -#include "ntddcdvd.h" -#include "classpnp.h" - -#include "initguid.h" -#include "ntddstor.h" #include "cdrom.h" - #if DBG PUCHAR READ_DVD_STRUCTURE_FORMAT_STRINGS[DvdMaxDescriptor+1] = { Modified: trunk/reactos/drivers/storage/class/cdrom_new/mmc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/mmc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/mmc.c [iso-8859-1] Mon Feb 3 10:39:05 2014 @@ -24,8 +24,6 @@ --*/ -#include "ntddk.h" -#include "classpnp.h" #include "cdrom.h" NTSTATUS Modified: trunk/reactos/drivers/storage/class/cdrom_new/sec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/sec.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/sec.c [iso-8859-1] Mon Feb 3 10:39:05 2014 @@ -4,8 +4,7 @@ --*/ - -#include "sec.h" +#include "cdrom.h" NTSTATUS NTAPI Removed: trunk/reactos/drivers/storage/class/cdrom_new/sec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/sec.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/sec.h (removed) @@ -1,9 +0,0 @@ -/*-- - -Copyright (C) Microsoft Corporation, 1999 - ---*/ - -#include "ntddk.h" -#include "classpnp.h" -#include "cdrom.h" Modified: trunk/reactos/drivers/storage/class/cdrom_new/trace.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/trace.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/trace.h [iso-8859-1] Mon Feb 3 10:39:05 2014 @@ -8,6 +8,7 @@ */ +#pragma once #define TraceLogger(x, ...) DbgPrint(__VA_ARGS__) #define TraceLog(x) TraceLogger x @@ -49,5 +50,3 @@ WPP_DEFINE_BIT(CdromSecError) /* bit 30 = 0x00000000 */ \ WPP_DEFINE_BIT(CdromSecInfo) /* bit 31 = 0x00000000 */ \ ) - -

1 0

[akhaldi] 61943: [CDROM] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 03 Feb '14

03 Feb '14

Author: akhaldi Date: Mon Feb 3 10:35:35 2014 New Revision: 61943 URL: http://svn.reactos.org/svn/reactos?rev=61943&view=rev Log: [CDROM] * Remove one time inclusions from the main header and put them back where they belong. * Improve header inclusions. CORE-7716 Modified: trunk/reactos/drivers/storage/class/cdrom/CMakeLists.txt trunk/reactos/drivers/storage/class/cdrom/cdrom.c trunk/reactos/drivers/storage/class/cdrom/findscsi.c trunk/reactos/drivers/storage/class/cdrom/precomp.h Modified: trunk/reactos/drivers/storage/class/cdrom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/CMakeLists.txt [iso-8859-1] Mon Feb 3 10:35:35 2014 @@ -1,5 +1,5 @@ -include_directories(..) +include_directories(${REACTOS_SOURCE_DIR}/drivers/storage/class) add_library(cdrom SHARED cdrom.c findscsi.c cdrom.rc) Modified: trunk/reactos/drivers/storage/class/cdrom/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/cdrom.c [iso-8859-1] Mon Feb 3 10:35:35 2014 @@ -7,6 +7,13 @@ */ #include "precomp.h" + +#include <ntddk.h> +#include <scsi.h> +#include <ntdddisk.h> +#include <ntddcdrm.h> +#include <include/class2.h> +#include <stdio.h> //#define NDEBUG #include <debug.h> Modified: trunk/reactos/drivers/storage/class/cdrom/findscsi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/findscsi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/findscsi.c [iso-8859-1] Mon Feb 3 10:35:35 2014 @@ -306,4 +306,3 @@ #endif return (STATUS_OBJECT_PATH_NOT_FOUND); } - Modified: trunk/reactos/drivers/storage/class/cdrom/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom/precomp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom/precomp.h [iso-8859-1] Mon Feb 3 10:35:35 2014 @@ -1,7 +1,2 @@ -#include <ntddk.h> -#include <scsi.h> -#include <ntddscsi.h> -#include <ntdddisk.h> -#include <ntddcdrm.h> -#include <include/class2.h> -#include <stdio.h> +#include <ntdef.h> +#include <ntstatus.h>

1 0

[akhaldi] 61942: [BLUE] * Improve header inclusions. CORE-7716
by akhaldi＠svn.reactos.org 03 Feb '14

03 Feb '14

Author: akhaldi Date: Mon Feb 3 10:33:35 2014 New Revision: 61942 URL: http://svn.reactos.org/svn/reactos?rev=61942&view=rev Log: [BLUE] * Improve header inclusions. CORE-7716 Modified: trunk/reactos/drivers/setup/blue/blue.c trunk/reactos/drivers/setup/blue/blue.h trunk/reactos/drivers/setup/blue/font.c Modified: trunk/reactos/drivers/setup/blue/blue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.c?… ============================================================================== --- trunk/reactos/drivers/setup/blue/blue.c [iso-8859-1] (original) +++ trunk/reactos/drivers/setup/blue/blue.c [iso-8859-1] Mon Feb 3 10:33:35 2014 @@ -10,7 +10,6 @@ /* INCLUDES ******************************************************************/ -//#include <intrin.h> #include "blue.h" #define NDEBUG Modified: trunk/reactos/drivers/setup/blue/blue.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/blue.h?… ============================================================================== --- trunk/reactos/drivers/setup/blue/blue.h [iso-8859-1] (original) +++ trunk/reactos/drivers/setup/blue/blue.h [iso-8859-1] Mon Feb 3 10:33:35 2014 @@ -6,9 +6,7 @@ * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org) */ -/* DEFINITIONS ***************************************************************/ - -#include <ntddk.h> +#include <wdm.h> typedef struct _SECURITY_ATTRIBUTES SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES; Modified: trunk/reactos/drivers/setup/blue/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/setup/blue/font.c?… ============================================================================== --- trunk/reactos/drivers/setup/blue/font.c [iso-8859-1] (original) +++ trunk/reactos/drivers/setup/blue/font.c [iso-8859-1] Mon Feb 3 10:33:35 2014 @@ -10,8 +10,9 @@ /* INCLUDES ***************************************************************/ +#include "blue.h" + #include <ntddk.h> -#include "blue.h" #define NDEBUG #include <debug.h> @@ -256,4 +257,3 @@ } } } -

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