Skip to content

Commit 42b02af

Browse files
AmineKhaldiAmineKhaldi
committed
* Include NDK headers on-demand.
svn path=/trunk/; revision=53284
1 parent b73b703 commit 42b02af

File tree

23 files changed

+92
-79
lines changed

23 files changed

+92
-79
lines changed

‎reactos/base/system/lsass/lsass.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#define WIN32_NO_STATUS
2828
#include <windows.h>
2929
#define NTOS_MODE_USER
30-
#include <ndk/ntndk.h>
30+
#include <ndk/psfuncs.h>
3131

3232
#include <lsass/lsasrv.h>
3333
//#include <samsrv.h>

‎reactos/dll/directx/ksuser/ksuser.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
#define WIN32_NO_STATUS
66
#include <windows.h>
7-
//#include <ndk/ntndk.h>
87
#include <ndk/iofuncs.h>
98
#include <ndk/obtypes.h>
109
#include <ndk/rtlfuncs.h>

‎reactos/drivers/directx/dxapi/dxapi_driver.h

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,10 @@
1+
#include <wdm.h>
12

2-
/* DDK/NDK/SDK Headers */
3-
#include <ntddk.h>
4-
#include <ntddmou.h>
5-
#include <ntifs.h>
6-
#include <tvout.h>
7-
#include <ntndk.h>
8-
9-
#include <stdarg.h>
103
#include <windef.h>
114
#include <winerror.h>
125
#include <wingdi.h>
136
#define NT_BUILD_ENVIRONMENT
147
#include <winddi.h>
15-
#include <prntfont.h>
16-
#include <dde.h>
17-
188

199
#include <ddkmapi.h>
2010

@@ -123,7 +113,6 @@ DWORD tblCheckOutBuffer [] =
123113
sizeof(DWORD)
124114
};
125115

126-
127116
/* Internal driver function */
128117
DRVFN gDxApiEntryPoint [] =
129118
{
@@ -150,6 +139,3 @@ DRVFN gDxApiEntryPoint [] =
150139
{DD_DXAPI_ADDVPCAPTUREBUFFER - DD_FIRST_DXAPI, (PFN) DxAddVpCaptureBuffer},
151140
{DD_DXAPI_FLUSHVPCAPTUREBUFFERS - DD_FIRST_DXAPI, (PFN) DxFlushVpCaptureBuffs}
152141
};
153-
154-
155-

‎reactos/drivers/ksfilter/ks/priv.h

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
11
#define _KSDDK_
22

3+
#include <stdio.h>
4+
35
#include <ntifs.h>
4-
#include <ntddk.h>
56
#define NDEBUG
67
//#define YDEBUG
78
#include <debug.h>
89
#include <portcls.h>
9-
#include <ks.h>
1010
#include <kcom.h>
1111
#include <pseh/pseh2.h>
12-
#include <ntndk.h>
1312

14-
#include "ksfunc.h"
15-
#include "kstypes.h"
16-
#include "ksiface.h"
13+
#include <ntimage.h>
14+
#include <ndk/ldrfuncs.h>
1715

18-
#include "ksmedia.h"
16+
#include "ksfunc.h"
1917
#include "bdamedia.h"
2018
#include <swenum.h>
2119

22-
2320
#define TAG_DEVICE_HEADER 'KSDH'
2421
#define REG_PINFLAG_B_MANY 0x4 /* strmif.h */
2522
#define MERIT_DO_NOT_USE 0x200000 /* dshow.h */
@@ -49,15 +46,10 @@ DEFINE_KSPROPERTY_TABLE(PinSet) {\
4946
DEFINE_KSPROPERTY_ITEM_CONNECTION_ALLOCATORFRAMING_EX(PropAllocatorFraming)\
5047
}
5148

52-
5349
#define DEFINE_KSPROPERTY_STREAMSET(PinSet,\
5450
PropStreamAllocator, PropMasterClock, PropPipeId)\
5551
DEFINE_KSPROPERTY_TABLE(PinSet) {\
5652
DEFINE_KSPROPERTY_ITEM_STREAM_ALLOCATOR(PropStreamAllocator, PropStreamAllocator),\
5753
DEFINE_KSPROPERTY_ITEM_STREAM_MASTERCLOCK(PropMasterClock, PropMasterClock),\
5854
DEFINE_KSPROPERTY_ITEM_STREAM_PIPE_ID(PropPipeId, PropPipeId)\
5955
}
60-
61-
62-
63-

‎reactos/drivers/video/videoprt/videoprt.h

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,20 @@
2323
#define VIDEOPRT_H
2424

2525
#include <stdio.h>
26-
#include <ntddk.h>
26+
27+
#include <ntifs.h>
28+
#include <ndk/exfuncs.h>
29+
#include <ndk/halfuncs.h>
30+
#include <ndk/inbvfuncs.h>
31+
#include <ndk/kefuncs.h>
32+
#include <ndk/rtlfuncs.h>
33+
2734
#define __BROKEN__
2835
#include <miniport.h>
2936
#include <video.h>
30-
#include <ntddvdeo.h>
3137
#include <ntagp.h>
32-
#include <ntifs.h>
33-
#include <ndk/ntndk.h>
3438
#include <dderror.h>
3539
#include <windef.h>
36-
3740
#include <initguid.h>
3841
#include <wdmguid.h>
3942

‎reactos/drivers/wdm/audio/backpln/audio_test/audio_test.c

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,17 @@
44
#define _KSDDK_
55

66
#include <windows.h>
7-
#include <mmsystem.h>
87
#include <stdio.h>
98
#include <math.h>
109
#include <setupapi.h>
11-
#include <ndk/ntndk.h>
12-
#include <ks.h>
10+
#include <ndk/umtypes.h>
1311
#include <ksmedia.h>
1412
#include "interface.h"
1513

16-
1714
#define _2pi 6.283185307179586476925286766559
1815

19-
20-
21-
#include <ks.h>
22-
23-
2416
GUID CategoryGuid = {STATIC_KSCATEGORY_AUDIO};
2517

26-
2718
const GUID KSPROPSETID_Pin = {0x8C134960L, 0x51AD, 0x11CF, {0x87, 0x8A, 0x94, 0xF8, 0x01, 0xC1, 0x00, 0x00}};
2819
const GUID KSPROPSETID_Connection = {0x1D58C920L, 0xAC9B, 0x11CF, {0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00}};
2920
const GUID KSPROPSETID_Sysaudio = {0xCBE3FAA0L, 0xCC75, 0x11D0, {0xB4, 0x65, 0x00, 0x00, 0x1A, 0x18, 0x18, 0xE6}};
@@ -34,7 +25,6 @@ const GUID KSDATAFORMAT_TYPE_AUDIO = {0x73647561L, 0x0000, 0x0010,
3425
const GUID KSDATAFORMAT_SUBTYPE_PCM = {0x00000001L, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
3526
const GUID KSDATAFORMAT_SPECIFIER_WAVEFORMATEX = {0x05589f81L, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}};
3627

37-
3828
VOID
3929
TestKs()
4030
{

‎reactos/hal/halx86/include/hal.h

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,13 @@
2727
#include <bugcodes.h>
2828
#include <ntdddisk.h>
2929
#include <arc/arc.h>
30-
#include <ntndk.h>
30+
31+
#include <ndk/asm.h>
32+
#include <ndk/halfuncs.h>
33+
#include <ndk/inbvfuncs.h>
34+
#include <ndk/iofuncs.h>
35+
#include <ndk/kefuncs.h>
36+
#include <ndk/rtlfuncs.h>
3137

3238
/* Internal shared PCI and ACPI header */
3339
#include <drivers/pci/pci.h>

‎reactos/lib/epsapi/enum/precomp.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
#define WIN32_NO_STATUS
22
#include <windows.h>
33
#define NTOS_MODE_USER
4-
#include <ndk/ntndk.h>
4+
#include <ndk/exfuncs.h>
5+
#include <ndk/mmfuncs.h>
6+
#include <ndk/psfuncs.h>
7+
#include <ndk/rtlfuncs.h>
58

69
#include <epsapi/epsapi.h>

‎reactos/lib/fslib/ntfslib/ntfslib.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
#define WIN32_NO_STATUS
77
#include <windows.h>
88
#define NTOS_MODE_USER
9-
#include <ndk/ntndk.h>
9+
#include <ndk/umtypes.h>
1010
#include <fmifs/fmifs.h>

‎reactos/lib/fslib/vfatxlib/vfatxlib.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
#define WIN32_NO_STATUS
77
#include <windows.h>
88
#define NTOS_MODE_USER
9-
#include <ndk/ntndk.h>
9+
#include <ndk/iofuncs.h>
10+
#include <ndk/kefuncs.h>
11+
#include <ndk/obfuncs.h>
12+
#include <ndk/rtlfuncs.h>
1013
#include <fmifs/fmifs.h>
1114

1215
#include <pshpack1.h>

‎reactos/lib/lsalib/lsa.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99

1010
/* INCLUDES ******************************************************************/
1111

12-
#include <ndk/ntndk.h>
12+
#include <ndk/lpctypes.h>
13+
#include <ndk/lpcfuncs.h>
14+
#include <ndk/rtlfuncs.h>
1315
#include <psdk/ntsecapi.h>
1416
#include <lsass/lsass.h>
1517

‎reactos/lib/newinflib/builddep.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ BOOLEAN NTAPI RtlIsTextUnicode( PVOID buf, INT len, INT *pf );
6161
#define WIN32_NO_STATUS
6262
#include <windows.h>
6363
#define NTOS_MODE_USER
64-
#include <ndk/ntndk.h>
64+
#include <ndk/iofuncs.h>
65+
#include <ndk/obfuncs.h>
66+
#include <ndk/rtlfuncs.h>
6567

6668
extern PVOID InfpHeap;
6769

‎reactos/lib/rtl/rtl.h

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,19 @@
2222

2323
/* PSDK/NDK Headers */
2424
#include <windows.h>
25-
#include <ndk/ntndk.h>
25+
#include <ndk/cmfuncs.h>
26+
#include <ndk/exfuncs.h>
27+
#include <ndk/iofuncs.h>
28+
#include <ndk/kdfuncs.h>
29+
#include <ndk/kefuncs.h>
30+
#include <ndk/ldrfuncs.h>
31+
#include <ndk/mmfuncs.h>
32+
#include <ndk/obfuncs.h>
33+
#include <ndk/psfuncs.h>
34+
#include <ndk/rtlfuncs.h>
35+
#include <ndk/setypes.h>
36+
#include <ndk/sefuncs.h>
37+
#include <ndk/umfuncs.h>
2638

2739
/* Internal RTL header */
2840
#include "rtlp.h"

‎reactos/lib/sdk/crt/precomp.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
/* PSDK/NDK Headers */
2828
#define WIN32_NO_STATUS
2929
#include <windows.h>
30-
#include <ndk/ntndk.h>
30+
#include <ndk/rtlfuncs.h>
3131

3232
#if !defined(_MSC_VER)
3333
#include <stdint.h>

‎reactos/lib/sdk/nt/entry_point.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
#include <stdio.h>
1414
#include <windows.h>
1515
#define NTOS_MODE_USER
16-
#include <ndk/ntndk.h>
16+
#include <ndk/psfuncs.h>
17+
#include <ndk/rtlfuncs.h>
1718

1819
NTSTATUS
1920
__cdecl

‎reactos/lib/smlib/precomp.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@
1212
#define WIN32_NO_STATUS
1313
#include <windows.h>
1414
#define NTOS_MODE_USER
15-
#include <ndk/ntndk.h>
15+
#include <ndk/cmfuncs.h>
16+
#include <ndk/lpctypes.h>
17+
#include <ndk/lpcfuncs.h>
18+
#include <ndk/obfuncs.h>
19+
#include <ndk/rtlfuncs.h>
1620

1721
#include <sm/helper.h>
1822

‎reactos/ntoskrnl/include/ntoskrnl.h

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,25 @@
3333
#include <arc/arc.h>
3434
#undef NTHALAPI
3535
#define NTHALAPI __declspec(dllimport)
36-
#include <ntndk.h>
36+
#include <ndk/asm.h>
37+
#include <ndk/cctypes.h>
38+
#include <ndk/cmfuncs.h>
39+
#include <ndk/dbgkfuncs.h>
40+
#include <ndk/exfuncs.h>
41+
#include <ndk/halfuncs.h>
42+
#include <ndk/inbvfuncs.h>
43+
#include <ndk/iofuncs.h>
44+
#include <ndk/kdfuncs.h>
45+
#include <ndk/kefuncs.h>
46+
#include <ndk/ldrfuncs.h>
47+
#include <ndk/lpcfuncs.h>
48+
#include <ndk/mmfuncs.h>
49+
#include <ndk/obfuncs.h>
50+
#include <ndk/pofuncs.h>
51+
#include <ndk/psfuncs.h>
52+
#include <ndk/rtlfuncs.h>
53+
#include <ndk/sefuncs.h>
54+
#include <ndk/vftypes.h>
3755
#undef TEXT
3856
#define TEXT(s) L##s
3957
#include <regstr.h>

‎reactos/subsystems/ntvdm/ntvdm.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,8 @@
1313
#define WIN32_NO_STATUS
1414
#include <windows.h>
1515
#include <stdio.h>
16-
#include <wchar.h>
1716
#include "resource.h"
1817

19-
#define NTOS_MODE_USER
20-
#include <ndk/ntndk.h>
21-
2218
#define NDEBUG
2319
#include <debug.h>
2420

‎reactos/subsystems/win32/csrss/csrsrv/srv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#define WIN32_NO_STATUS
55
#include <windows.h>
66
#include <winnt.h>
7-
#include <ndk/ntndk.h>
7+
#include <ndk/lpctypes.h>
88

99
/* CSR Header */
1010
//#include <csr/server.h>

‎reactos/subsystems/win32/csrss/csrss.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
#define WIN32_NO_STATUS
1313
#include <windows.h>
14-
#include <ndk/ntndk.h>
1514
#include <api.h>
1615
#define NDEBUG
1716
#include <debug.h>

‎reactos/subsystems/win32/csrss/include/api.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
#pragma once
1010

1111
#define NTOS_MODE_USER
12-
#include <ndk/ntndk.h>
12+
#include <ndk/psfuncs.h>
13+
#include <ndk/rtlfuncs.h>
1314

1415
#include <csrss/csrss.h>
1516

‎reactos/subsystems/win32/csrss/win32csr/w32csr.h

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,24 @@
22
#define WIN32_NO_STATUS
33
#include <windows.h>
44
#define NTOS_MODE_USER
5-
#include <ndk/ntndk.h>
5+
#include <ndk/mmtypes.h>
6+
#include <ndk/mmfuncs.h>
7+
#include <ndk/obfuncs.h>
68

7-
#include <accctrl.h>
89
#include <psapi.h>
910

10-
/* Our own BLUE.SYS Driver for Console Output */
11-
#include <blue/ntddblue.h>
12-
1311
/* External Winlogon Header */
1412
#include <winlogon.h>
1513

1614
/* Internal CSRSS Headers */
17-
#include <api.h>
1815
#include <conio.h>
1916
#include <csrplugin.h>
2017
#include <desktopbg.h>
21-
#include "file.h"
2218
#include "guiconsole.h"
2319
#include "tuiconsole.h"
24-
#include <win32csr.h>
2520

2621
/* Public Win32K Headers */
27-
#include <win32k/ntusrtyp.h>
2822
#include <win32k/ntuser.h>
29-
#include <win32k/callback.h>
30-
31-
#include <tchar.h>
32-
#include <wchar.h>
33-
#include <cpl.h>
3423

3524
#include "resource.h"
3625

0 commit comments

Comments
 (0)