Reintegrate header branch
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Fri, 26 Mar 2010 13:50:02 +0000 (13:50 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Fri, 26 Mar 2010 13:50:02 +0000 (13:50 +0000)
- DDKAPI -> NTAPI
- delete duplicate definitions
- move files to right locations
- Fix Mm64BitPhysicalAddress definition
- Add a number of missing definitions
- add XDK

svn path=/trunk/; revision=46466

111 files changed:
1  2 
reactos/boot/freeldr/freeldr/disk/scsiport.c
reactos/dll/win32/gdi32/objects/bitmap.c
reactos/dll/win32/hid/precomp.h
reactos/dll/win32/setupapi/setupapi.rbuild
reactos/dll/win32/setupapi/setupapi_private.h
reactos/drivers/battery/battc/battc.c
reactos/drivers/directx/dxapi/dxapi_driver.h
reactos/drivers/directx/dxg/dxg_int.h
reactos/drivers/filesystems/ext2/inc/ext2fsd.h
reactos/drivers/serial/serial/serial.h
reactos/drivers/storage/ide/uniata/atapi.h
reactos/drivers/storage/ide/uniata/bsmaster.h
reactos/drivers/storage/ide/uniata/config.h
reactos/drivers/storage/ide/uniata/id_ata.cpp
reactos/drivers/storage/ide/uniata/srb.h
reactos/drivers/storage/scsiport/stubs.c
reactos/drivers/video/displays/vga/vgaddi.h
reactos/include/ddk/afilter.h
reactos/include/ddk/bdasup.h
reactos/include/ddk/csq.h
reactos/include/ddk/hidclass.h
reactos/include/ddk/hidpi.h
reactos/include/ddk/mcd.h
reactos/include/ddk/mce.h
reactos/include/ddk/miniport.h
reactos/include/ddk/minitape.h
reactos/include/ddk/ndis.h
reactos/include/ddk/ntagp.h
reactos/include/ddk/ntdd8042.h
reactos/include/ddk/ntddk.h
reactos/include/ddk/ntifs.h
reactos/include/ddk/ntimage.h
reactos/include/ddk/ntpoapi.h
reactos/include/ddk/parallel.h
reactos/include/ddk/scsiwmi.h
reactos/include/ddk/smbus.h
reactos/include/ddk/srb.h
reactos/include/ddk/storport.h
reactos/include/ddk/tdikrnl.h
reactos/include/ddk/upssvc.h
reactos/include/ddk/video.h
reactos/include/ddk/videoagp.h
reactos/include/ddk/wdm.h
reactos/include/ddk/wmilib.h
reactos/include/ndk/ketypes.h
reactos/include/ndk/peb_teb.h
reactos/include/ndk/pstypes.h
reactos/include/ndk/rtlfuncs.h
reactos/include/psdk/atsmedia.h
reactos/include/psdk/batclass.h
reactos/include/psdk/cfg.h
reactos/include/psdk/cfgmgr32.h
reactos/include/psdk/devpropdef.h
reactos/include/psdk/evntprov.h
reactos/include/psdk/ktmtypes.h
reactos/include/psdk/ntdef.h
reactos/include/psdk/ntiologc.h
reactos/include/psdk/ntstatus.h
reactos/include/psdk/tvout.h
reactos/include/psdk/usbioctl.h
reactos/include/psdk/winbase.h
reactos/include/psdk/wincon.h
reactos/include/psdk/windef.h
reactos/include/psdk/wingdi.h
reactos/include/psdk/winnt.h
reactos/include/psdk/winuser.h
reactos/include/reactos/idl/pnp.idl
reactos/include/xdk/amd64/ke.h
reactos/include/xdk/amd64/mm.h
reactos/include/xdk/arm/ke.h
reactos/include/xdk/cmfuncs.h
reactos/include/xdk/cmtypes.h
reactos/include/xdk/exfuncs.h
reactos/include/xdk/extypes.h
reactos/include/xdk/generate.bat
reactos/include/xdk/halfuncs.h
reactos/include/xdk/haltypes.h
reactos/include/xdk/ia64/ke.h
reactos/include/xdk/interlocked.h
reactos/include/xdk/iofuncs.h
reactos/include/xdk/iotypes.h
reactos/include/xdk/kdfuncs.h
reactos/include/xdk/kdtypes.h
reactos/include/xdk/kefuncs.h
reactos/include/xdk/ketypes.h
reactos/include/xdk/mips/ke.h
reactos/include/xdk/mmfuncs.h
reactos/include/xdk/mmtypes.h
reactos/include/xdk/ntddk.template.h
reactos/include/xdk/nttmapi.h
reactos/include/xdk/obfuncs.h
reactos/include/xdk/obtypes.h
reactos/include/xdk/pofuncs.h
reactos/include/xdk/potypes.h
reactos/include/xdk/ppc/ke.h
reactos/include/xdk/psfuncs.h
reactos/include/xdk/pstypes.h
reactos/include/xdk/rtlfuncs.h
reactos/include/xdk/rtltypes.h
reactos/include/xdk/sefuncs.h
reactos/include/xdk/setypes.h
reactos/include/xdk/wdm.template.h
reactos/include/xdk/wmifuncs.h
reactos/include/xdk/wmitypes.h
reactos/include/xdk/x86/ke.h
reactos/include/xdk/x86/mm.h
reactos/include/xdk/zwfuncs.h
reactos/ntoskrnl/include/ntoskrnl.h
reactos/ntoskrnl/mm/mminit.c
reactos/subsystems/subsystems.rbuild
reactos/subsystems/win32/win32k/pch.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,e2d8407..e2d8407
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,6f22e57..6f22e57
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
index 0000000,4623a65..4623a65
mode 000000,100644..100644
--- /dev/null
index 0000000,49e4c91..49e4c91
mode 000000,100644..100644
--- /dev/null
index 0000000,69cc7ce..69cc7ce
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
index 0000000,b807315..b807315
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 0000000,d744cd5..d744cd5
mode 000000,100644..100644
--- /dev/null
index 0000000,2c390a1..2c390a1
mode 000000,100644..100644
--- /dev/null
index 0000000,372e565..372e565
mode 000000,100644..100644
--- /dev/null
index 0000000,9fb3de0..9fb3de0
mode 000000,100644..100644
--- /dev/null
index 0000000,2599a78..2599a78
mode 000000,100644..100644
--- /dev/null
index 0000000,46a5387..46a5387
mode 000000,100644..100644
--- /dev/null
index 0000000,4d18ac1..4d18ac1
mode 000000,100644..100644
--- /dev/null
index 0000000,e26f34a..e26f34a
mode 000000,100644..100644
--- /dev/null
index 0000000,547f4e4..547f4e4
mode 000000,100644..100644
--- /dev/null
index 0000000,a9a0317..a9a0317
mode 000000,100644..100644
--- /dev/null
index 0000000,2920636..2920636
mode 000000,100644..100644
--- /dev/null
index 0000000,722096b..722096b
mode 000000,100644..100644
--- /dev/null
index 0000000,a1a2fcf..a1a2fcf
mode 000000,100644..100644
--- /dev/null
index 0000000,aac22cb..aac22cb
mode 000000,100644..100644
--- /dev/null
index 0000000,1817849..1817849
mode 000000,100644..100644
--- /dev/null
index 0000000,b030a23..b030a23
mode 000000,100644..100644
--- /dev/null
index 0000000,716ee87..716ee87
mode 000000,100644..100644
--- /dev/null
index 0000000,a4bb363..a4bb363
mode 000000,100644..100644
--- /dev/null
index 0000000,31384ad..31384ad
mode 000000,100644..100644
--- /dev/null
index 0000000,b714f97..b714f97
mode 000000,100644..100644
--- /dev/null
index 0000000,e4a23f4..e4a23f4
mode 000000,100644..100644
--- /dev/null
index 0000000,003e9b7..003e9b7
mode 000000,100644..100644
--- /dev/null
index 0000000,721005f..721005f
mode 000000,100644..100644
--- /dev/null
index 0000000,40912fa..40912fa
mode 000000,100644..100644
--- /dev/null
index 0000000,84310a9..84310a9
mode 000000,100644..100644
--- /dev/null
index 0000000,9fd1ec6..9fd1ec6
mode 000000,100644..100644
--- /dev/null
index 0000000,3caf825..3caf825
mode 000000,100644..100644
--- /dev/null
index 0000000,b3a81bc..b3a81bc
mode 000000,100644..100644
--- /dev/null
index 0000000,48666e6..48666e6
mode 000000,100644..100644
--- /dev/null
index 0000000,adda1fb..adda1fb
mode 000000,100644..100644
--- /dev/null
index 0000000,a5302dc..a5302dc
mode 000000,100644..100644
--- /dev/null
index 0000000,ab74f70..ab74f70
mode 000000,100644..100644
--- /dev/null
index 0000000,6c89220..6c89220
mode 000000,100644..100644
--- /dev/null
index 0000000,6892aee..6892aee
mode 000000,100644..100644
--- /dev/null
index 0000000,1005bf1..1005bf1
mode 000000,100644..100644
--- /dev/null
index 0000000,6279a55..6279a55
mode 000000,100644..100644
--- /dev/null
index 0000000,c4fd0ba..c4fd0ba
mode 000000,100644..100644
--- /dev/null
index 0000000,19d4274..19d4274
mode 000000,100644..100644
--- /dev/null
index 0000000,d2cddd1..d2cddd1
mode 000000,100644..100644
--- /dev/null
index 0000000,3299df5..3299df5
mode 000000,100644..100644
--- /dev/null
Simple merge
Simple merge
index 8dc8794,0000000..3bbdd8c
mode 100644,000000..100644
--- /dev/null
@@@ -1,12 -1,0 +1,12 @@@
-               <directory name="ntvdm">
-                       <xi:include href="ntvdm/ntvdm.rbuild" />
-               </directory>
 +<?xml version="1.0"?>
 +<!DOCTYPE group SYSTEM "../tools/rbuild/project.dtd">
 +<group xmlns:xi="http://www.w3.org/2001/XInclude">
 +      <if property="ARCH" value="i386">
++<directory name="ntvdm">
++      <xi:include href="ntvdm/ntvdm.rbuild" />
++</directory>
 +      </if>
 +<directory name="win32">
 +      <xi:include href="win32/win32.rbuild" />
 +</directory>
 +</group>
Simple merge