Author: akhaldi Date: Wed Aug 17 14:04:33 2011 New Revision: 53284
URL: http://svn.reactos.org/svn/reactos?rev=53284&view=rev Log: * Include NDK headers on-demand.
Modified: trunk/reactos/base/system/lsass/lsass.c trunk/reactos/dll/directx/ksuser/ksuser.h trunk/reactos/drivers/directx/dxapi/dxapi_driver.h trunk/reactos/drivers/ksfilter/ks/priv.h trunk/reactos/drivers/video/videoprt/videoprt.h trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c trunk/reactos/hal/halx86/include/hal.h trunk/reactos/lib/epsapi/enum/precomp.h trunk/reactos/lib/fslib/ntfslib/ntfslib.h trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h trunk/reactos/lib/lsalib/lsa.c trunk/reactos/lib/newinflib/builddep.h trunk/reactos/lib/rtl/rtl.h trunk/reactos/lib/sdk/crt/precomp.h trunk/reactos/lib/sdk/nt/entry_point.c trunk/reactos/lib/smlib/precomp.h trunk/reactos/ntoskrnl/include/ntoskrnl.h trunk/reactos/subsystems/ntvdm/ntvdm.c trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h trunk/reactos/subsystems/win32/csrss/csrss.c trunk/reactos/subsystems/win32/csrss/include/api.h trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h trunk/reactos/subsystems/win32/win32k/pch.h
Modified: trunk/reactos/base/system/lsass/lsass.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/lsass/lsass.c?r... ============================================================================== --- trunk/reactos/base/system/lsass/lsass.c [iso-8859-1] (original) +++ trunk/reactos/base/system/lsass/lsass.c [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -27,7 +27,7 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/psfuncs.h>
#include <lsass/lsasrv.h> //#include <samsrv.h>
Modified: trunk/reactos/dll/directx/ksuser/ksuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ksuser/ksuser.h... ============================================================================== --- trunk/reactos/dll/directx/ksuser/ksuser.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/ksuser/ksuser.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -4,7 +4,6 @@
#define WIN32_NO_STATUS #include <windows.h> -//#include <ndk/ntndk.h> #include <ndk/iofuncs.h> #include <ndk/obtypes.h> #include <ndk/rtlfuncs.h>
Modified: trunk/reactos/drivers/directx/dxapi/dxapi_driver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/directx/dxapi/dxapi... ============================================================================== --- trunk/reactos/drivers/directx/dxapi/dxapi_driver.h [iso-8859-1] (original) +++ trunk/reactos/drivers/directx/dxapi/dxapi_driver.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -1,20 +1,10 @@ +#include <wdm.h>
-/* DDK/NDK/SDK Headers */ -#include <ntddk.h> -#include <ntddmou.h> -#include <ntifs.h> -#include <tvout.h> -#include <ntndk.h> - -#include <stdarg.h> #include <windef.h> #include <winerror.h> #include <wingdi.h> #define NT_BUILD_ENVIRONMENT #include <winddi.h> -#include <prntfont.h> -#include <dde.h> -
#include <ddkmapi.h>
@@ -123,7 +113,6 @@ sizeof(DWORD) };
- /* Internal driver function */ DRVFN gDxApiEntryPoint [] = { @@ -150,6 +139,3 @@ {DD_DXAPI_ADDVPCAPTUREBUFFER - DD_FIRST_DXAPI, (PFN) DxAddVpCaptureBuffer}, {DD_DXAPI_FLUSHVPCAPTUREBUFFERS - DD_FIRST_DXAPI, (PFN) DxFlushVpCaptureBuffs} }; - - -
Modified: trunk/reactos/drivers/ksfilter/ks/priv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/priv.h?... ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/priv.h [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/priv.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -1,24 +1,21 @@ #define _KSDDK_
+#include <stdio.h> + #include <ntifs.h> -#include <ntddk.h> #define NDEBUG //#define YDEBUG #include <debug.h> #include <portcls.h> -#include <ks.h> #include <kcom.h> #include <pseh/pseh2.h> -#include <ntndk.h> + +#include <ntimage.h> +#include <ndk/ldrfuncs.h>
#include "ksfunc.h" -#include "kstypes.h" -#include "ksiface.h" - -#include "ksmedia.h" #include "bdamedia.h" #include <swenum.h> -
#define TAG_DEVICE_HEADER 'KSDH' #define REG_PINFLAG_B_MANY 0x4 /* strmif.h */ @@ -49,7 +46,6 @@ DEFINE_KSPROPERTY_ITEM_CONNECTION_ALLOCATORFRAMING_EX(PropAllocatorFraming)\ }
- #define DEFINE_KSPROPERTY_STREAMSET(PinSet,\ PropStreamAllocator, PropMasterClock, PropPipeId)\ DEFINE_KSPROPERTY_TABLE(PinSet) {\ @@ -57,7 +53,3 @@ DEFINE_KSPROPERTY_ITEM_STREAM_MASTERCLOCK(PropMasterClock, PropMasterClock),\ DEFINE_KSPROPERTY_ITEM_STREAM_PIPE_ID(PropPipeId, PropPipeId)\ } - - - -
Modified: trunk/reactos/drivers/video/videoprt/videoprt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/vide... ============================================================================== --- trunk/reactos/drivers/video/videoprt/videoprt.h [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/videoprt.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -23,17 +23,20 @@ #define VIDEOPRT_H
#include <stdio.h> -#include <ntddk.h> + +#include <ntifs.h> +#include <ndk/exfuncs.h> +#include <ndk/halfuncs.h> +#include <ndk/inbvfuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/rtlfuncs.h> + #define __BROKEN__ #include <miniport.h> #include <video.h> -#include <ntddvdeo.h> #include <ntagp.h> -#include <ntifs.h> -#include <ndk/ntndk.h> #include <dderror.h> #include <windef.h> - #include <initguid.h> #include <wdmguid.h>
Modified: trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/a... ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -4,25 +4,16 @@ #define _KSDDK_
#include <windows.h> -#include <mmsystem.h> #include <stdio.h> #include <math.h> #include <setupapi.h> -#include <ndk/ntndk.h> -#include <ks.h> +#include <ndk/umtypes.h> #include <ksmedia.h> #include "interface.h"
- #define _2pi 6.283185307179586476925286766559
- - -#include <ks.h> - - GUID CategoryGuid = {STATIC_KSCATEGORY_AUDIO}; -
const GUID KSPROPSETID_Pin = {0x8C134960L, 0x51AD, 0x11CF, {0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00}}; const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}}; @@ -33,7 +24,6 @@ const GUID KSDATAFORMAT_TYPE_AUDIO = {0x73647561L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; const GUID KSDATAFORMAT_SUBTYPE_PCM = {0x00000001L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; const GUID KSDATAFORMAT_SPECIFIER_WAVEFORMATEX = {0x05589f81L, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}; -
VOID TestKs()
Modified: trunk/reactos/hal/halx86/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/hal.h?re... ============================================================================== --- trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -27,7 +27,13 @@ #include <bugcodes.h> #include <ntdddisk.h> #include <arc/arc.h> -#include <ntndk.h> + +#include <ndk/asm.h> +#include <ndk/halfuncs.h> +#include <ndk/inbvfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/rtlfuncs.h>
/* Internal shared PCI and ACPI header */ #include <drivers/pci/pci.h>
Modified: trunk/reactos/lib/epsapi/enum/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/epsapi/enum/precomp.h?r... ============================================================================== --- trunk/reactos/lib/epsapi/enum/precomp.h [iso-8859-1] (original) +++ trunk/reactos/lib/epsapi/enum/precomp.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -1,6 +1,9 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/exfuncs.h> +#include <ndk/mmfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h>
#include <epsapi/epsapi.h>
Modified: trunk/reactos/lib/fslib/ntfslib/ntfslib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ntfslib/ntfslib.h... ============================================================================== --- trunk/reactos/lib/fslib/ntfslib/ntfslib.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/ntfslib/ntfslib.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -6,5 +6,5 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/umtypes.h> #include <fmifs/fmifs.h>
Modified: trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/vfatxlib/vfatxlib... ============================================================================== --- trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h [iso-8859-1] (original) +++ trunk/reactos/lib/fslib/vfatxlib/vfatxlib.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -6,7 +6,10 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/iofuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h> #include <fmifs/fmifs.h>
#include <pshpack1.h>
Modified: trunk/reactos/lib/lsalib/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/lsalib/lsa.c?rev=53284&... ============================================================================== --- trunk/reactos/lib/lsalib/lsa.c [iso-8859-1] (original) +++ trunk/reactos/lib/lsalib/lsa.c [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -9,7 +9,9 @@
/* INCLUDES ******************************************************************/
-#include <ndk/ntndk.h> +#include <ndk/lpctypes.h> +#include <ndk/lpcfuncs.h> +#include <ndk/rtlfuncs.h> #include <psdk/ntsecapi.h> #include <lsass/lsass.h>
Modified: trunk/reactos/lib/newinflib/builddep.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/newinflib/builddep.h?re... ============================================================================== --- trunk/reactos/lib/newinflib/builddep.h [iso-8859-1] (original) +++ trunk/reactos/lib/newinflib/builddep.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -61,7 +61,9 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/iofuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h>
extern PVOID InfpHeap;
Modified: trunk/reactos/lib/rtl/rtl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.h?rev=53284&... ============================================================================== --- trunk/reactos/lib/rtl/rtl.h [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/rtl.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -22,7 +22,19 @@
/* PSDK/NDK Headers */ #include <windows.h> -#include <ndk/ntndk.h> +#include <ndk/cmfuncs.h> +#include <ndk/exfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/kdfuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/ldrfuncs.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> +#include <ndk/setypes.h> +#include <ndk/sefuncs.h> +#include <ndk/umfuncs.h>
/* Internal RTL header */ #include "rtlp.h"
Modified: trunk/reactos/lib/sdk/crt/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/precomp.h?rev=5... ============================================================================== --- trunk/reactos/lib/sdk/crt/precomp.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/precomp.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -27,7 +27,7 @@ /* PSDK/NDK Headers */ #define WIN32_NO_STATUS #include <windows.h> -#include <ndk/ntndk.h> +#include <ndk/rtlfuncs.h>
#if !defined(_MSC_VER) #include <stdint.h>
Modified: trunk/reactos/lib/sdk/nt/entry_point.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/nt/entry_point.c?re... ============================================================================== --- trunk/reactos/lib/sdk/nt/entry_point.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/nt/entry_point.c [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -13,7 +13,8 @@ #include <stdio.h> #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h>
NTSTATUS __cdecl
Modified: trunk/reactos/lib/smlib/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/precomp.h?rev=532... ============================================================================== --- trunk/reactos/lib/smlib/precomp.h [iso-8859-1] (original) +++ trunk/reactos/lib/smlib/precomp.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -12,7 +12,11 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/cmfuncs.h> +#include <ndk/lpctypes.h> +#include <ndk/lpcfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/rtlfuncs.h>
#include <sm/helper.h>
Modified: trunk/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/ntoskrnl.h... ============================================================================== --- trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/ntoskrnl.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -33,7 +33,25 @@ #include <arc/arc.h> #undef NTHALAPI #define NTHALAPI __declspec(dllimport) -#include <ntndk.h> +#include <ndk/asm.h> +#include <ndk/cctypes.h> +#include <ndk/cmfuncs.h> +#include <ndk/dbgkfuncs.h> +#include <ndk/exfuncs.h> +#include <ndk/halfuncs.h> +#include <ndk/inbvfuncs.h> +#include <ndk/iofuncs.h> +#include <ndk/kdfuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/ldrfuncs.h> +#include <ndk/lpcfuncs.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/pofuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> +#include <ndk/sefuncs.h> +#include <ndk/vftypes.h> #undef TEXT #define TEXT(s) L##s #include <regstr.h>
Modified: trunk/reactos/subsystems/ntvdm/ntvdm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/ntvdm.c?re... ============================================================================== --- trunk/reactos/subsystems/ntvdm/ntvdm.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/ntvdm.c [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -13,11 +13,7 @@ #define WIN32_NO_STATUS #include <windows.h> #include <stdio.h> -#include <wchar.h> #include "resource.h" - -#define NTOS_MODE_USER -#include <ndk/ntndk.h>
#define NDEBUG #include <debug.h>
Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrs... ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrsrv/srv.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -4,7 +4,7 @@ #define WIN32_NO_STATUS #include <windows.h> #include <winnt.h> -#include <ndk/ntndk.h> +#include <ndk/lpctypes.h>
/* CSR Header */ //#include <csr/server.h>
Modified: trunk/reactos/subsystems/win32/csrss/csrss.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrs... ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrss.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/csrss.c [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -11,7 +11,6 @@
#define WIN32_NO_STATUS #include <windows.h> -#include <ndk/ntndk.h> #include <api.h> #define NDEBUG #include <debug.h>
Modified: trunk/reactos/subsystems/win32/csrss/include/api.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/incl... ============================================================================== --- trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/include/api.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -9,7 +9,8 @@ #pragma once
#define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h>
#include <csrss/csrss.h>
Modified: trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win3... ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/w32csr.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -2,35 +2,24 @@ #define WIN32_NO_STATUS #include <windows.h> #define NTOS_MODE_USER -#include <ndk/ntndk.h> +#include <ndk/mmtypes.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h>
-#include <accctrl.h> #include <psapi.h> - -/* Our own BLUE.SYS Driver for Console Output */ -#include <blue/ntddblue.h>
/* External Winlogon Header */ #include <winlogon.h>
/* Internal CSRSS Headers */ -#include <api.h> #include <conio.h> #include <csrplugin.h> #include <desktopbg.h> -#include "file.h" #include "guiconsole.h" #include "tuiconsole.h" -#include <win32csr.h>
/* Public Win32K Headers */ -#include <win32k/ntusrtyp.h> #include <win32k/ntuser.h> -#include <win32k/callback.h> - -#include <tchar.h> -#include <wchar.h> -#include <cpl.h>
#include "resource.h"
Modified: trunk/reactos/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/pch... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/pch.h [iso-8859-1] Wed Aug 17 14:04:33 2011 @@ -19,7 +19,14 @@ #include <ntddmou.h> #include <ntifs.h> #include <tvout.h> -#include <ntndk.h> +#include <ndk/exfuncs.h> +#include <ndk/kdfuncs.h> +#include <ndk/kefuncs.h> +#include <ndk/lpcfuncs.h> +#include <ndk/mmfuncs.h> +#include <ndk/obfuncs.h> +#include <ndk/psfuncs.h> +#include <ndk/rtlfuncs.h> #include <ntstrsafe.h>
/* Win32 Headers */