Sync with trunk head (part 1 of 2)

svn path=/branches/header-work/; revision=47094

diff --cc ReactOS-arm.rbuild
Simple merge

diff --cc base/applications/cmdutils/reg/reg.rbuild
Simple merge

diff --cc base/applications/downloader/downloader.rbuild
Simple merge

diff --cc base/applications/fontview/fontview.rbuild
Simple merge

diff --cc base/applications/kbswitch/kbswitch.rbuild
Simple merge

diff --cc base/applications/magnify/magnify.rbuild
Simple merge

diff --cc base/applications/mplay32/mplay32.rbuild
Simple merge

diff --cc base/applications/mscutils/eventvwr/eventvwr.rbuild
Simple merge

diff --cc base/applications/network/ping/ping.c
Simple merge

diff --cc base/applications/notepad/settings.c
Simple merge

diff --cc base/applications/notepad/text.c
Simple merge

diff --cc base/applications/paint/lang/it-IT.rc
Simple merge

diff --cc base/applications/paint/main.c
Simple merge

diff --cc base/applications/paint/mouse.c
Simple merge

diff --cc base/applications/rapps/rapps.rbuild
Simple merge

diff --cc base/applications/rapps/rapps/firefox3.txt
Simple merge

diff --cc base/applications/rapps/rapps/mirandaim.txt
Simple merge

diff --cc base/applications/rapps/rapps/openttd.txt
Simple merge

diff --cc base/applications/rapps/rapps/opera.txt
Simple merge

diff --cc base/applications/rapps/rapps/scite.txt
Simple merge

diff --cc base/applications/rapps/rapps/scummvm.txt
Simple merge

diff --cc base/applications/rapps/rapps/seamonkey.txt
Simple merge

diff --cc base/applications/rapps/rapps/thunderbird.txt
Simple merge

diff --cc base/applications/rapps/rapps/utorrent.txt
Simple merge

diff --cc base/applications/regedit/framewnd.c
Simple merge

diff --cc base/applications/taskmgr/applpage.c
Simple merge

diff --cc base/applications/taskmgr/perfdata.c
Simple merge

diff --cc base/applications/taskmgr/perfdata.h
Simple merge

diff --cc base/applications/taskmgr/procpage.c
Simple merge

diff --cc base/applications/taskmgr/taskmgr.c
Simple merge

diff --cc base/applications/winhlp32/hlpfile.c
Simple merge

diff --cc base/applications/winver/winver.rbuild
Simple merge

diff --cc base/services/rpcss/rpcss.rbuild
Simple merge

diff --cc base/services/telnetd/telnetd.rbuild
Simple merge

diff --cc base/services/tftpd/tftpd.rbuild
Simple merge

diff --cc base/setup/usetup/bootsup.c
Simple merge

diff --cc base/setup/usetup/inffile.c
Simple merge

diff --cc base/setup/usetup/inffile.h
Simple merge

diff --cc base/setup/usetup/interface/usetup.c
Simple merge

diff --cc base/setup/usetup/registry.c
Simple merge

diff --cc base/setup/usetup/registry.h
Simple merge

diff --cc base/setup/usetup/usetup.rbuild
Simple merge

diff --cc base/shell/cmd/console.c
Simple merge

diff --cc base/shell/cmd/filecomp.c
Simple merge

diff --cc base/shell/explorer/res/startmenu.ico
index 492e388,b0c5059..b0c5059
Binary files differ

diff --cc base/system/format/format.c
Simple merge

diff --cc base/system/runonce/runonce.rbuild
Simple merge

diff --cc base/system/userinit/userinit.c
Simple merge

diff --cc boot/bootdata/bootcd/bootcd.rbuild
Simple merge

diff --cc boot/bootdata/hivecls_arm.inf
Simple merge

diff --cc boot/bootdata/hivecls_i386.inf
Simple merge

diff --cc boot/bootdata/hivedef_arm.inf
Simple merge

diff --cc boot/bootdata/hivedef_i386.inf
index 9650563,905f5ef..905f5ef
Binary files differ

diff --cc boot/bootdata/livecd/livecd.rbuild
Simple merge

diff --cc boot/bootdata/packages/reactos.dff
Simple merge

diff --cc boot/bootdata/txtsetup.sif
Simple merge

diff --cc boot/freeldr/freeldr/arch/amd64/arch.S
Simple merge

diff --cc boot/freeldr/freeldr/arch/amd64/boot.S
Simple merge

diff --cc boot/freeldr/freeldr/arch/amd64/drvmap.S
Simple merge

diff --cc boot/freeldr/freeldr/arch/amd64/i386cpu.S
Simple merge

diff --cc boot/freeldr/freeldr/arch/amd64/i386pnp.S
Simple merge

diff --cc boot/freeldr/freeldr/arch/amd64/i386trap.S
Simple merge

diff --cc boot/freeldr/freeldr/arch/amd64/int386.S
Simple merge

diff --cc boot/freeldr/freeldr/arch/amd64/loader.c
Simple merge

diff --cc boot/freeldr/freeldr/arch/amd64/mb.S
Simple merge

diff --cc boot/freeldr/freeldr/arch/i386/hardware.c
Simple merge

diff --cc boot/freeldr/freeldr/arch/i386/machpc.c
Simple merge

diff --cc boot/freeldr/freeldr/arch/i386/machxbox.c
Simple merge

diff --cc boot/freeldr/freeldr/arch/i386/miscboot.c
Simple merge

diff --cc boot/freeldr/freeldr/arch/i386/xboxhw.c
Simple merge

diff --cc boot/freeldr/freeldr/arch/powerpc/mach.c
Simple merge

diff --cc boot/freeldr/freeldr/disk/disk.c
Simple merge

diff --cc boot/freeldr/freeldr/disk/partition.c
Simple merge

diff --cc boot/freeldr/freeldr/freeldr_arch.rbuild
Simple merge

diff --cc boot/freeldr/freeldr/freeldr_base.rbuild
Simple merge

diff --cc boot/freeldr/freeldr/include/arch/amd64/amd64.h
Simple merge

diff --cc boot/freeldr/freeldr/include/disk.h
Simple merge

diff --cc boot/freeldr/freeldr/include/machine.h
Simple merge

diff --cc boot/freeldr/freeldr/linuxboot.c
Simple merge

diff --cc boot/freeldr/freeldr/machine.c
Simple merge

diff --cc boot/freeldr/freeldr/reactos/arcname.c
Simple merge

diff --cc boot/freeldr/freeldr/reactos/reactos.c
Simple merge

diff --cc boot/freeldr/freeldr/windows/amd64/wlmemory.c
Simple merge

diff --cc dll/cpl/desk/appearance.c
Simple merge

diff --cc dll/cpl/desk/background.c
Simple merge

diff --cc dll/cpl/desk/effappdlg.c
Simple merge

diff --cc dll/cpl/sysdm/lang/uk-UA.rc
Simple merge

diff --cc dll/directx/bdaplgin/pincontrol.cpp
Simple merge

diff --cc dll/directx/ksproxy/allocator.cpp
Simple merge

diff --cc dll/directx/ksproxy/enumpins.cpp
Simple merge

diff --cc dll/directx/ksproxy/input_pin.cpp
Simple merge

diff --cc dll/directx/ksproxy/mediasample.cpp
Simple merge

diff --cc dll/directx/ksproxy/output_pin.cpp
Simple merge

diff --cc dll/directx/ksproxy/precomp.h
Simple merge

diff --cc dll/directx/ksproxy/proxy.cpp
Simple merge

diff --cc dll/directx/msdvbnp/enumpins.cpp
Simple merge

diff --cc dll/directx/msdvbnp/msdvbnp.cpp
Simple merge

diff --cc dll/directx/msdvbnp/precomp.h
Simple merge

diff --cc dll/directx/qedit/samplegrabber.c
Simple merge

diff --cc dll/directx/quartz/avidec.c
Simple merge

diff --cc dll/directx/quartz/avisplit.c
Simple merge

diff --cc dll/ntdll/ldr/utils.c
Simple merge

diff --cc dll/win32/activeds/activeds.spec
Simple merge

diff --cc dll/win32/activeds/activeds_main.c
Simple merge

diff --cc dll/win32/actxprxy/actxprxy.rbuild
Simple merge

diff --cc dll/win32/atl/atl_ax.c
Simple merge

diff --cc dll/win32/avifil32/rsrc.rc
Simple merge

diff --cc dll/win32/cabinet/fdi.c
Simple merge

diff --cc dll/win32/comdlg32/filedlg.c
Simple merge

diff --cc dll/win32/comdlg32/fontdlg.c
Simple merge

diff --cc dll/win32/comdlg32/printdlg.c
Simple merge

diff --cc dll/win32/crypt32/base64.c
Simple merge

diff --cc dll/win32/crypt32/decode.c
Simple merge

diff --cc dll/win32/devmgr/lang/cs-CZ.rc
Simple merge

diff --cc dll/win32/gdi32/include/gdi32p.h
Simple merge

diff --cc dll/win32/gdi32/objects/dc.c
Simple merge

diff --cc dll/win32/gdi32/objects/region.c
Simple merge

diff --cc dll/win32/gdiplus/brush.c
Simple merge

diff --cc dll/win32/gdiplus/font.c
Simple merge

diff --cc dll/win32/gdiplus/gdiplus.spec
Simple merge

diff --cc dll/win32/gdiplus/gdiplus_private.h
Simple merge

diff --cc dll/win32/gdiplus/graphics.c
Simple merge

diff --cc dll/win32/gdiplus/image.c
Simple merge

diff --cc dll/win32/hhctrl.ocx/hhctrl.c
Simple merge

diff --cc dll/win32/inetcomm/mimeintl.c
Simple merge

diff --cc dll/win32/inetcomm/mimeole.c
Simple merge

diff --cc dll/win32/inseng/inseng_main.c
Simple merge

diff --cc dll/win32/jscript/jscript.h
Simple merge

diff --cc dll/win32/jscript/regexp.c
Simple merge

diff --cc dll/win32/jscript/string.c
Simple merge

diff --cc dll/win32/kernel32/file/dir.c
Simple merge

diff --cc dll/win32/kernel32/kernel32.pspec
Simple merge

diff --cc dll/win32/kernel32/misc/stubs.c
Simple merge

diff --cc dll/win32/localspl/provider.c
Simple merge

diff --cc dll/win32/lpk/dllmain.c
Simple merge

diff --cc dll/win32/mciavi32/mciavi.c
Simple merge

diff --cc dll/win32/mcicda/mcicda.c
Simple merge

diff --cc dll/win32/mciqtz32/mciqtz.c
Simple merge

diff --cc dll/win32/mciqtz32/mciqtz_private.h
Simple merge

diff --cc dll/win32/mciseq/mcimidi.c
Simple merge

diff --cc dll/win32/mciwave/mciwave.c
Simple merge

diff --cc dll/win32/msacm32/msacm32.rbuild
Simple merge

diff --cc dll/win32/mscoree/mscoree.rbuild
Simple merge

diff --cc dll/win32/mscoree/mscoree.spec
Simple merge

diff --cc dll/win32/mscoree/mscoree_main.c
Simple merge

diff --cc dll/win32/mscoree/mscoree_private.h
Simple merge

diff --cc dll/win32/msctf/displayattributemgr.c
index 0000000,75248cd..75248cd
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/msctf/displayattributemgr.c
+++ b/dll/win32/msctf/displayattributemgr.c

diff --cc dll/win32/msctf/inputprocessor.c
Simple merge

diff --cc dll/win32/msctf/msctf.c
Simple merge

diff --cc dll/win32/msctf/msctf.rbuild
Simple merge

diff --cc dll/win32/msctf/msctf_internal.h
Simple merge

diff --cc dll/win32/msctf/regsvr.c
Simple merge

diff --cc dll/win32/msgsm32.acm/msgsm32.c
Simple merge

diff --cc dll/win32/mshtml/dispex.c
Simple merge

diff --cc dll/win32/mshtml/editor.c
Simple merge

diff --cc dll/win32/mshtml/htmlelem.c
Simple merge

diff --cc dll/win32/mshtml/htmlwindow.c
Simple merge

diff --cc dll/win32/mshtml/install.c
Simple merge

diff --cc dll/win32/mshtml/mshtml_private.h
Simple merge

diff --cc dll/win32/mshtml/navigate.c
Simple merge

diff --cc dll/win32/mshtml/nsembed.c
Simple merge

diff --cc dll/win32/mshtml/nsevents.c
Simple merge

diff --cc dll/win32/mshtml/nsio.c
Simple merge

diff --cc dll/win32/mshtml/olecmd.c
Simple merge

diff --cc dll/win32/mshtml/view.c
Simple merge

diff --cc dll/win32/msimtf/activeimmapp.c
Simple merge

diff --cc dll/win32/msvfw32/mciwnd.c
Simple merge

diff --cc dll/win32/msvidc32/msvideo1.c
Simple merge

diff --cc dll/win32/msxml3/dispex.c
Simple merge

diff --cc dll/win32/msxml3/element.c
Simple merge

diff --cc dll/win32/msxml3/main.c
Simple merge

diff --cc dll/win32/msxml3/node.c
Simple merge

diff --cc dll/win32/netcfgx/lang/cs-CZ.rc
Simple merge

diff --cc dll/win32/netcfgx/netcfgx.c
Simple merge

diff --cc dll/win32/netcfgx/tcpipconf_notify.c
Simple merge

diff --cc dll/win32/netid/lang/cs-CZ.rc
Simple merge

diff --cc dll/win32/netid/lang/it-IT.rc
Simple merge

diff --cc dll/win32/netshell/lang/bg-BG.rc
Simple merge

diff --cc dll/win32/netshell/lang/cs-CZ.rc
Simple merge

diff --cc dll/win32/netshell/lang/da-DK.rc
Simple merge

diff --cc dll/win32/netshell/lang/de-DE.rc
Simple merge

diff --cc dll/win32/netshell/lang/el-GR.rc
Simple merge

diff --cc dll/win32/netshell/lang/en-US.rc
Simple merge

diff --cc dll/win32/netshell/lang/es-ES.rc
Simple merge

diff --cc dll/win32/netshell/lang/fr-FR.rc
Simple merge

diff --cc dll/win32/netshell/lang/hu-HU.rc
Simple merge

diff --cc dll/win32/netshell/lang/id-ID.rc
Simple merge

diff --cc dll/win32/netshell/lang/it-IT.rc
Simple merge

diff --cc dll/win32/netshell/lang/ja-JP.rc
Simple merge

diff --cc dll/win32/netshell/lang/nl-NL.rc
Simple merge

diff --cc dll/win32/netshell/lang/no-NO.rc
Simple merge

diff --cc dll/win32/netshell/lang/pl-PL.rc
Simple merge

diff --cc dll/win32/netshell/lang/ro-RO.rc
Simple merge

diff --cc dll/win32/netshell/lang/ru-RU.rc
Simple merge

diff --cc dll/win32/netshell/lang/sv-SE.rc
Simple merge

diff --cc dll/win32/netshell/lang/uk-UA.rc
Simple merge

diff --cc dll/win32/netshell/lang/zh-CN.rc
Simple merge

diff --cc dll/win32/netshell/lanstatusui.c
Simple merge

diff --cc dll/win32/ntmarta/ntmarta.c
Simple merge

diff --cc dll/win32/ole32/compobj.c
Simple merge

diff --cc dll/win32/ole32/ftmarshal.c
Simple merge

diff --cc dll/win32/ole32/ifs.c
Simple merge

diff --cc dll/win32/ole32/moniker.c
Simple merge

diff --cc dll/win32/ole32/ole32.rbuild
Simple merge

diff --cc dll/win32/ole32/rpc.c
Simple merge

diff --cc dll/win32/ole32/storage32.c
Simple merge

diff --cc dll/win32/ole32/storage32.h
Simple merge

diff --cc dll/win32/oleaut32/olepicture.c
Simple merge

diff --cc dll/win32/oleaut32/regsvr.c
Simple merge

diff --cc dll/win32/oleaut32/typelib.c
Simple merge

diff --cc dll/win32/oleaut32/typelib2.c
Simple merge

diff --cc dll/win32/oleaut32/vartype.c
Simple merge

diff --cc dll/win32/rsaenh/rsaenh.c
Simple merge

diff --cc dll/win32/rsaenh/sha2.c
Simple merge

diff --cc dll/win32/schannel/lsamode.c
Simple merge

diff --cc dll/win32/setupapi/interface.c
Simple merge

diff --cc dll/win32/setupapi/lang/cs-CZ.rc
Simple merge

diff --cc dll/win32/shell32/dialogs.c
Simple merge

diff --cc dll/win32/shell32/folder_options.c
Simple merge

diff --cc dll/win32/shell32/folders.c
Simple merge

diff --cc dll/win32/shell32/fprop.c
Simple merge

diff --cc dll/win32/shell32/lang/bg-BG.rc
Simple merge

diff --cc dll/win32/shell32/lang/ca-ES.rc
Simple merge

diff --cc dll/win32/shell32/lang/cs-CZ.rc
Simple merge

diff --cc dll/win32/shell32/lang/da-DK.rc
Simple merge

diff --cc dll/win32/shell32/lang/de-DE.rc
Simple merge

diff --cc dll/win32/shell32/lang/el-GR.rc
Simple merge

diff --cc dll/win32/shell32/lang/en-GB.rc
Simple merge

diff --cc dll/win32/shell32/lang/en-US.rc
Simple merge

diff --cc dll/win32/shell32/lang/es-ES.rc
Simple merge

diff --cc dll/win32/shell32/lang/fi-FI.rc
Simple merge

diff --cc dll/win32/shell32/lang/fr-FR.rc
Simple merge

diff --cc dll/win32/shell32/lang/hu-HU.rc
Simple merge

diff --cc dll/win32/shell32/lang/it-IT.rc
Simple merge

diff --cc dll/win32/shell32/lang/ja-JP.rc
Simple merge

diff --cc dll/win32/shell32/lang/ko-KR.rc
Simple merge

diff --cc dll/win32/shell32/lang/nl-NL.rc
Simple merge

diff --cc dll/win32/shell32/lang/no-NO.rc
Simple merge

diff --cc dll/win32/shell32/lang/pl-PL.rc
Simple merge

diff --cc dll/win32/shell32/lang/pt-BR.rc
Simple merge

diff --cc dll/win32/shell32/lang/pt-PT.rc
Simple merge

diff --cc dll/win32/shell32/lang/ro-RO.rc
Simple merge

diff --cc dll/win32/shell32/lang/ru-RU.rc
Simple merge

diff --cc dll/win32/shell32/lang/sk-SK.rc
Simple merge

diff --cc dll/win32/shell32/lang/sl-SI.rc
Simple merge

diff --cc dll/win32/shell32/lang/sv-SE.rc
Simple merge

diff --cc dll/win32/shell32/lang/tr-TR.rc
Simple merge

diff --cc dll/win32/shell32/lang/uk-UA.rc
Simple merge

diff --cc dll/win32/shell32/lang/zh-CN.rc
Simple merge

diff --cc dll/win32/shell32/lang/zh-TW.rc
Simple merge

diff --cc dll/win32/shell32/she_ocmenu.c
Simple merge

diff --cc dll/win32/shell32/shfldr_cpanel.c
Simple merge

diff --cc dll/win32/shell32/shfldr_fonts.c
Simple merge

diff --cc dll/win32/shell32/shlfileop.c
Simple merge

diff --cc dll/win32/shell32/shresdef.h
Simple merge

diff --cc dll/win32/shell32/shv_def_cmenu.c
Simple merge

diff --cc dll/win32/shlwapi/ordinal.c
Simple merge

diff --cc dll/win32/shlwapi/shlwapi.spec
Simple merge

diff --cc dll/win32/shlwapi/url.c
Simple merge

diff --cc dll/win32/sti/regsvr.c
Simple merge

diff --cc dll/win32/sti/sti.c
index 0000000,974bd06..974bd06
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/sti/sti.c
+++ b/dll/win32/sti/sti.c

diff --cc dll/win32/sti/sti.rbuild
Simple merge

diff --cc dll/win32/sti/sti.spec
Simple merge

diff --cc dll/win32/sti/sti_main.c
Simple merge

diff --cc dll/win32/sti/sti_private.h
index 0000000,b5e106b..b5e106b
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/sti/sti_private.h
+++ b/dll/win32/sti/sti_private.h

diff --cc dll/win32/sti/sti_wia.idl
index 0000000,aaac943..aaac943
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/sti/sti_wia.idl
+++ b/dll/win32/sti/sti_wia.idl

diff --cc dll/win32/syssetup/lang/it-IT.rc
Simple merge

diff --cc dll/win32/syssetup/wizard.c
Simple merge

diff --cc dll/win32/urlmon/bindprot.c
Simple merge

diff --cc dll/win32/urlmon/regsvr.c
Simple merge

diff --cc dll/win32/urlmon/urlmon_main.c
Simple merge

diff --cc dll/win32/urlmon/urlmon_main.h
Simple merge

diff --cc dll/win32/urlmon/urlmon_urlmon.idl
Simple merge

diff --cc dll/win32/urlmon/usrmarshal.c
Simple merge

diff --cc dll/win32/user32/controls/button.c
Simple merge

diff --cc dll/win32/user32/misc/stubs.c
Simple merge

diff --cc dll/win32/user32/windows/menu.c
Simple merge

diff --cc dll/win32/userenv/lang/cs-CZ.rc
Simple merge

diff --cc dll/win32/userenv/setup.c
Simple merge

diff --cc dll/win32/usp10/bidi.c
index 0000000,28b5d3e..28b5d3e
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/usp10/bidi.c
+++ b/dll/win32/usp10/bidi.c

diff --cc dll/win32/usp10/usp10.c
Simple merge

diff --cc dll/win32/usp10/usp10.rbuild
Simple merge

diff --cc dll/win32/usp10/usp10.spec
Simple merge

diff --cc dll/win32/usp10/usp10_internal.h
index 0000000,60e4eff..60e4eff
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/usp10/usp10_internal.h
+++ b/dll/win32/usp10/usp10_internal.h

diff --cc dll/win32/version/resource.c
Simple merge

diff --cc dll/win32/windowscodecs/bmpdecode.c
Simple merge

diff --cc dll/win32/windowscodecs/clsfactory.c
Simple merge

diff --cc dll/win32/windowscodecs/converter.c
Simple merge

diff --cc dll/win32/windowscodecs/gifformat.c
Simple merge

diff --cc dll/win32/windowscodecs/icoformat.c
Simple merge

diff --cc dll/win32/windowscodecs/jpegformat.c
Simple merge

diff --cc dll/win32/windowscodecs/palette.c
Simple merge

diff --cc dll/win32/windowscodecs/pngformat.c
Simple merge

diff --cc dll/win32/windowscodecs/regsvr.c
Simple merge

diff --cc dll/win32/windowscodecs/stream.c
Simple merge

diff --cc dll/win32/windowscodecs/tiffformat.c
index 0000000,fe87ddd..fe87ddd
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/dll/win32/windowscodecs/tiffformat.c
+++ b/dll/win32/windowscodecs/tiffformat.c

diff --cc dll/win32/windowscodecs/wincodecs_private.h
Simple merge

diff --cc dll/win32/windowscodecs/windowscodecs.rbuild
Simple merge

diff --cc dll/win32/wininet/internet.c
Simple merge

diff --cc dll/win32/wininet/urlcache.c
Simple merge

diff --cc dll/win32/wintrust/asn.c
Simple merge

diff --cc dll/win32/ws2_32/misc/ns.c
Simple merge

diff --cc drivers/bus/acpi/acpi.rbuild
Simple merge

diff --cc drivers/bus/directory.rbuild
Simple merge

diff --cc drivers/bus/isapnp/fdo.c
index 0000000,51a0f4b..51a0f4b
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/drivers/bus/isapnp/fdo.c
+++ b/drivers/bus/isapnp/fdo.c

diff --cc drivers/bus/isapnp/hardware.c
index 0000000,99e5d44..99e5d44
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/drivers/bus/isapnp/hardware.c
+++ b/drivers/bus/isapnp/hardware.c

diff --cc drivers/bus/isapnp/isapnp.c
Simple merge

diff --cc drivers/bus/isapnp/isapnp.h
Simple merge

diff --cc drivers/bus/isapnp/isapnp.rbuild
Simple merge

diff --cc drivers/bus/isapnp/isapnphw.h
index 0000000,aec8719..aec8719
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/drivers/bus/isapnp/isapnphw.h
+++ b/drivers/bus/isapnp/isapnphw.h

diff --cc drivers/bus/isapnp/pdo.c
index 0000000,0292f20..0292f20
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/drivers/bus/isapnp/pdo.c
+++ b/drivers/bus/isapnp/pdo.c

diff --cc drivers/bus/pci/fdo.c
Simple merge

diff --cc drivers/bus/pci/pdo.c
Simple merge

diff --cc drivers/bus/pcmcia/fdo.c
index 0000000,348fd1c..348fd1c
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/drivers/bus/pcmcia/fdo.c
+++ b/drivers/bus/pcmcia/fdo.c

diff --cc drivers/bus/pcmcia/pcmcia.c
index 0000000,54d23da..54d23da
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/drivers/bus/pcmcia/pcmcia.c
+++ b/drivers/bus/pcmcia/pcmcia.c

diff --cc drivers/bus/pcmcia/pcmcia.h
index 0000000,32dd5f2..32dd5f2
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/drivers/bus/pcmcia/pcmcia.h
+++ b/drivers/bus/pcmcia/pcmcia.h

diff --cc drivers/bus/pcmcia/pcmcia.rbuild
index 0000000,2d33ce5..2d33ce5
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/drivers/bus/pcmcia/pcmcia.rbuild
+++ b/drivers/bus/pcmcia/pcmcia.rbuild

diff --cc drivers/bus/pcmcia/pcmcia.rc
index 0000000,1395816..1395816
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/drivers/bus/pcmcia/pcmcia.rc
+++ b/drivers/bus/pcmcia/pcmcia.rc

diff --cc drivers/bus/pcmcia/pdo.c
index 0000000,0e4d168..0e4d168
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/drivers/bus/pcmcia/pdo.c
+++ b/drivers/bus/pcmcia/pdo.c

diff --cc drivers/ksfilter/ks/allocators.c
Simple merge

diff --cc drivers/ksfilter/ks/api.c
Simple merge

diff --cc drivers/ksfilter/ks/bag.c
Simple merge

diff --cc drivers/ksfilter/ks/clocks.c
Simple merge

diff --cc drivers/ksfilter/ks/connectivity.c
Simple merge

diff --cc drivers/ksfilter/ks/device.c
Simple merge

diff --cc drivers/ksfilter/ks/deviceinterface.c
Simple merge

diff --cc drivers/ksfilter/ks/driver.c
Simple merge

diff --cc drivers/ksfilter/ks/filter.c
Simple merge

diff --cc drivers/ksfilter/ks/filterfactory.c
Simple merge

diff --cc drivers/ksfilter/ks/irp.c
Simple merge

diff --cc drivers/ksfilter/ks/ksfunc.h
Simple merge

diff --cc drivers/ksfilter/ks/ksiface.h
Simple merge

diff --cc drivers/ksfilter/ks/kstypes.h
Simple merge

diff --cc drivers/ksfilter/ks/methods.c
Simple merge

diff --cc drivers/ksfilter/ks/misc.c
Simple merge

diff --cc drivers/ksfilter/ks/pin.c
Simple merge

diff --cc drivers/ksfilter/ks/priv.h
Simple merge

diff --cc drivers/ksfilter/ks/property.c
Simple merge

diff --cc drivers/ksfilter/ks/topology.c
Simple merge

diff --cc drivers/multimedia/bdasup/precomp.h
Simple merge

diff --cc drivers/network/afd/afd/lock.c
Simple merge

diff --cc drivers/network/ndis/ndis.rbuild
Simple merge

diff --cc drivers/network/ndis/ndis.spec
index 0000000,bd3eaea..bd3eaea
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/drivers/network/ndis/ndis.spec
+++ b/drivers/network/ndis/ndis.spec

diff --cc drivers/network/ndis/ndis/miniport.c
Simple merge

diff --cc drivers/network/tdi/misc/tdi.spec
index 0000000,a181064..a181064
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/drivers/network/tdi/misc/tdi.spec
+++ b/drivers/network/tdi/misc/tdi.spec

diff --cc drivers/network/tdi/tdi.rbuild
Simple merge

diff --cc drivers/storage/class/cdrom/cdrom.c
Simple merge

diff --cc drivers/storage/class/ramdisk/ramdisk.c
Simple merge

diff --cc drivers/storage/ide/uniata/id_ata.cpp
Simple merge

diff --cc drivers/usb/usbehci/common.c
Simple merge

diff --cc drivers/usb/usbehci/fdo.c
Simple merge

diff --cc drivers/usb/usbehci/irp.c
Simple merge

diff --cc drivers/usb/usbehci/pdo.c
Simple merge

diff --cc drivers/usb/usbehci/urbreq.c
Simple merge

diff --cc drivers/usb/usbehci/usbehci.c
Simple merge

diff --cc drivers/usb/usbehci/usbehci.h
Simple merge

diff --cc drivers/usb/usbehci/usbiffn.c
Simple merge

diff --cc drivers/usb/usbehci/usbiffn.h
Simple merge

diff --cc drivers/video/displays/vga/objects/pointer.c
Simple merge

diff --cc hal/halx86/directory.rbuild
Simple merge

diff --cc hal/halx86/generic/acpi/halpnpdd.c
Simple merge

diff --cc hal/halx86/generic/halinit.c
Simple merge

diff --cc hal/halx86/hal_generic.rbuild
Simple merge

diff --cc hal/halx86/hal_mini.rbuild
index 0000000,a7baed4..a7baed4
mode 000000,100644..100644
--- /dev/null
--- 2/reactos/hal/halx86/hal_mini.rbuild
+++ b/hal/halx86/hal_mini.rbuild

diff --cc hal/halx86/halamd64.rbuild
Simple merge

diff --cc include/ddk/hubbusif.h
Simple merge

diff --cc include/ddk/ntddk.h
index 73aa6d6,0000000..5fd8438
mode 100644,000000..100644
--- 1/include/ddk/ntddk.h
--- /dev/null
+++ b/include/ddk/ntddk.h
@@@ -1,5648 -1,0 +1,5649 @@@
- #ifdef _X86_
 +/*
 + * ntddk.h
 + *
 + * Windows NT Device Driver Kit
 + *
 + * This file is part of the ReactOS DDK package.
 + *
 + * Contributors:
 + *   Amine Khaldi
 + *   Timo Kreuzer (timo.kreuzer@reactos.org)
 + *
 + * THIS SOFTWARE IS NOT COPYRIGHTED
 + *
 + * This source code is offered for use in the public domain. You may
 + * use, modify or distribute it freely.
 + *
 + * This code is distributed in the hope that it will be useful but
 + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY
 + * DISCLAIMED. This includes but is not limited to warranties of
 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 + *
 + */
 +
 +#pragma once
 +
 +#define _NTDDK_
 +
 +#if !defined(_NTHAL_) && !defined(_NTIFS_)
 +#define _NTDDK_INCLUDED_
 +#define _DDK_DRIVER_
 +#endif
 +
 +/* Dependencies */
 +
 +#define NT_INCLUDED
 +#define _CTYPE_DISABLE_MACROS
 +
 +#include <wdm.h>
 +#include <excpt.h>
 +#include <ntdef.h>
 +#include <ntstatus.h>
 +#include <mce.h>
 +#include <bugcodes.h>
 +#include <ntiologc.h>
 +
 +#include <stdarg.h> // FIXME
 +#include <basetyps.h> // FIXME
 +
 +
 +#ifdef __cplusplus
 +extern "C" {
 +#endif
 +
 +/* GUID and UUID */
 +#ifndef _NTLSA_IFS_
 +#ifndef _NTLSA_AUDIT_
 +#define _NTLSA_AUDIT_
 +
 +#ifndef GUID_DEFINED
 +#include <guiddef.h>
 +#endif
 +
 +#endif /* _NTLSA_AUDIT_ */
 +#endif /* _NTLSA_IFS_ */
 +
 +typedef GUID UUID;
 +
 +struct _LOADER_PARAMETER_BLOCK;
 +struct _CREATE_DISK;
 +struct _DRIVE_LAYOUT_INFORMATION_EX;
 +struct _SET_PARTITION_INFORMATION_EX;
 +
 +typedef struct _BUS_HANDLER *PBUS_HANDLER;
 +typedef struct _DEVICE_HANDLER_OBJECT *PDEVICE_HANDLER_OBJECT;
 +#if defined(_NTHAL_INCLUDED_)
 +typedef struct _KAFFINITY_EX *PKAFFINITY_EX;
 +#endif
 +typedef struct _PEB *PPEB;
 +
 +#ifndef _NTIMAGE_
 +
 +typedef struct _IMAGE_NT_HEADERS *PIMAGE_NT_HEADERS32;
 +typedef struct _IMAGE_NT_HEADERS64 *PIMAGE_NT_HEADERS64;
 +
 +#ifdef _WIN64
 +typedef PIMAGE_NT_HEADERS64 PIMAGE_NT_HEADERS;
 +#else
 +typedef PIMAGE_NT_HEADERS32 PIMAGE_NT_HEADERS;
 +#endif
 +
 +#endif /* _NTIMAGE_ */
 +
 +/******************************************************************************
 + *                            Executive Types                                 *
 + ******************************************************************************/
 +typedef struct _ZONE_SEGMENT_HEADER {
 +  SINGLE_LIST_ENTRY SegmentList;
 +  PVOID Reserved;
 +} ZONE_SEGMENT_HEADER, *PZONE_SEGMENT_HEADER;
 +
 +typedef struct _ZONE_HEADER {
 +  SINGLE_LIST_ENTRY FreeList;
 +  SINGLE_LIST_ENTRY SegmentList;
 +  ULONG BlockSize;
 +  ULONG TotalSegmentSize;
 +} ZONE_HEADER, *PZONE_HEADER;
 +
 +#define PROTECTED_POOL                    0x80000000
 +
 +/******************************************************************************
 + *                         I/O Manager Types                                  *
 + ******************************************************************************/
 +
 +/* DEVICE_OBJECT.Flags */
 +#define DO_DEVICE_HAS_NAME                0x00000040
 +#define DO_SYSTEM_BOOT_PARTITION          0x00000100
 +#define DO_LONG_TERM_REQUESTS             0x00000200
 +#define DO_NEVER_LAST_DEVICE              0x00000400
 +#define DO_LOW_PRIORITY_FILESYSTEM        0x00010000
 +#define DO_SUPPORTS_TRANSACTIONS          0x00040000
 +#define DO_FORCE_NEITHER_IO               0x00080000
 +#define DO_VOLUME_DEVICE_OBJECT           0x00100000
 +#define DO_SYSTEM_SYSTEM_PARTITION        0x00200000
 +#define DO_SYSTEM_CRITICAL_PARTITION      0x00400000
 +#define DO_DISALLOW_EXECUTE               0x00800000
 +
 +#ifndef _ARC_DDK_
 +#define _ARC_DDK_
 +typedef enum _CONFIGURATION_TYPE {
 +  ArcSystem,
 +  CentralProcessor,
 +  FloatingPointProcessor,
 +  PrimaryIcache,
 +  PrimaryDcache,
 +  SecondaryIcache,
 +  SecondaryDcache,
 +  SecondaryCache,
 +  EisaAdapter,
 +  TcAdapter,
 +  ScsiAdapter,
 +  DtiAdapter,
 +  MultiFunctionAdapter,
 +  DiskController,
 +  TapeController,
 +  CdromController,
 +  WormController,
 +  SerialController,
 +  NetworkController,
 +  DisplayController,
 +  ParallelController,
 +  PointerController,
 +  KeyboardController,
 +  AudioController,
 +  OtherController,
 +  DiskPeripheral,
 +  FloppyDiskPeripheral,
 +  TapePeripheral,
 +  ModemPeripheral,
 +  MonitorPeripheral,
 +  PrinterPeripheral,
 +  PointerPeripheral,
 +  KeyboardPeripheral,
 +  TerminalPeripheral,
 +  OtherPeripheral,
 +  LinePeripheral,
 +  NetworkPeripheral,
 +  SystemMemory,
 +  DockingInformation,
 +  RealModeIrqRoutingTable,
 +  RealModePCIEnumeration,
 +  MaximumType
 +} CONFIGURATION_TYPE, *PCONFIGURATION_TYPE;
 +#endif /* !_ARC_DDK_ */
 +
 +/*
 +** IRP function codes
 +*/
 +
 +#define IRP_MN_QUERY_DIRECTORY            0x01
 +#define IRP_MN_NOTIFY_CHANGE_DIRECTORY    0x02
 +
 +#define IRP_MN_USER_FS_REQUEST            0x00
 +#define IRP_MN_MOUNT_VOLUME               0x01
 +#define IRP_MN_VERIFY_VOLUME              0x02
 +#define IRP_MN_LOAD_FILE_SYSTEM           0x03
 +#define IRP_MN_TRACK_LINK                 0x04
 +#define IRP_MN_KERNEL_CALL                0x04
 +
 +#define IRP_MN_LOCK                       0x01
 +#define IRP_MN_UNLOCK_SINGLE              0x02
 +#define IRP_MN_UNLOCK_ALL                 0x03
 +#define IRP_MN_UNLOCK_ALL_BY_KEY          0x04
 +
 +#define IRP_MN_FLUSH_AND_PURGE          0x01
 +
 +#define IRP_MN_NORMAL                     0x00
 +#define IRP_MN_DPC                        0x01
 +#define IRP_MN_MDL                        0x02
 +#define IRP_MN_COMPLETE                   0x04
 +#define IRP_MN_COMPRESSED                 0x08
 +
 +#define IRP_MN_MDL_DPC                    (IRP_MN_MDL | IRP_MN_DPC)
 +#define IRP_MN_COMPLETE_MDL               (IRP_MN_COMPLETE | IRP_MN_MDL)
 +#define IRP_MN_COMPLETE_MDL_DPC           (IRP_MN_COMPLETE_MDL | IRP_MN_DPC)
 +
 +#define IRP_MN_QUERY_LEGACY_BUS_INFORMATION 0x18
 +
 +#define IO_CHECK_CREATE_PARAMETERS      0x0200
 +#define IO_ATTACH_DEVICE                0x0400
 +#define IO_IGNORE_SHARE_ACCESS_CHECK    0x0800
 +
 +typedef NTSTATUS
 +(NTAPI *PIO_QUERY_DEVICE_ROUTINE)(
 +  IN PVOID Context,
 +  IN PUNICODE_STRING PathName,
 +  IN INTERFACE_TYPE BusType,
 +  IN ULONG BusNumber,
 +  IN PKEY_VALUE_FULL_INFORMATION *BusInformation,
 +  IN CONFIGURATION_TYPE ControllerType,
 +  IN ULONG ControllerNumber,
 +  IN PKEY_VALUE_FULL_INFORMATION *ControllerInformation,
 +  IN CONFIGURATION_TYPE PeripheralType,
 +  IN ULONG PeripheralNumber,
 +  IN PKEY_VALUE_FULL_INFORMATION *PeripheralInformation);
 +
 +typedef enum _IO_QUERY_DEVICE_DATA_FORMAT {
 +  IoQueryDeviceIdentifier = 0,
 +  IoQueryDeviceConfigurationData,
 +  IoQueryDeviceComponentInformation,
 +  IoQueryDeviceMaxData
 +} IO_QUERY_DEVICE_DATA_FORMAT, *PIO_QUERY_DEVICE_DATA_FORMAT;
 +
 +typedef VOID
 +(NTAPI *PDRIVER_REINITIALIZE)(
 +  IN struct _DRIVER_OBJECT *DriverObject,
 +  IN PVOID Context OPTIONAL,
 +  IN ULONG Count);
 +
 +typedef struct _CONTROLLER_OBJECT {
 +  CSHORT Type;
 +  CSHORT Size;
 +  PVOID ControllerExtension;
 +  KDEVICE_QUEUE DeviceWaitQueue;
 +  ULONG Spare1;
 +  LARGE_INTEGER Spare2;
 +} CONTROLLER_OBJECT, *PCONTROLLER_OBJECT;
 +
 +#define DRVO_REINIT_REGISTERED          0x00000008
 +#define DRVO_INITIALIZED                0x00000010
 +#define DRVO_BOOTREINIT_REGISTERED      0x00000020
 +#define DRVO_LEGACY_RESOURCES           0x00000040
 +
 +typedef struct _CONFIGURATION_INFORMATION {
 +  ULONG DiskCount;
 +  ULONG FloppyCount;
 +  ULONG CdRomCount;
 +  ULONG TapeCount;
 +  ULONG ScsiPortCount;
 +  ULONG SerialCount;
 +  ULONG ParallelCount;
 +  BOOLEAN AtDiskPrimaryAddressClaimed;
 +  BOOLEAN AtDiskSecondaryAddressClaimed;
 +  ULONG Version;
 +  ULONG MediumChangerCount;
 +} CONFIGURATION_INFORMATION, *PCONFIGURATION_INFORMATION;
 +
 +typedef struct _DISK_SIGNATURE {
 +  ULONG PartitionStyle;
 +  _ANONYMOUS_UNION union {
 +    struct {
 +      ULONG Signature;
 +      ULONG CheckSum;
 +    } Mbr;
 +    struct {
 +      GUID DiskId;
 +    } Gpt;
 +  } DUMMYUNIONNAME;
 +} DISK_SIGNATURE, *PDISK_SIGNATURE;
 +
 +typedef struct _TXN_PARAMETER_BLOCK {
 +  USHORT Length;
 +  USHORT TxFsContext;
 +  PVOID TransactionObject;
 +} TXN_PARAMETER_BLOCK, *PTXN_PARAMETER_BLOCK;
 +
 +#define TXF_MINIVERSION_DEFAULT_VIEW        (0xFFFE)
 +
 +typedef struct _IO_DRIVER_CREATE_CONTEXT {
 +  CSHORT Size;
 +  struct _ECP_LIST *ExtraCreateParameter;
 +  PVOID DeviceObjectHint;
 +  PTXN_PARAMETER_BLOCK TxnParameters;
 +} IO_DRIVER_CREATE_CONTEXT, *PIO_DRIVER_CREATE_CONTEXT;
 +
 +typedef struct _AGP_TARGET_BUS_INTERFACE_STANDARD {
 +  USHORT Size;
 +  USHORT Version;
 +  PVOID Context;
 +  PINTERFACE_REFERENCE InterfaceReference;
 +  PINTERFACE_DEREFERENCE InterfaceDereference;
 +  PGET_SET_DEVICE_DATA SetBusData;
 +  PGET_SET_DEVICE_DATA GetBusData;
 +  UCHAR CapabilityID;
 +} AGP_TARGET_BUS_INTERFACE_STANDARD, *PAGP_TARGET_BUS_INTERFACE_STANDARD;
 +
 +typedef NTSTATUS
 +(NTAPI *PGET_LOCATION_STRING)(
 +  IN OUT PVOID Context OPTIONAL,
 +  OUT PWCHAR *LocationStrings);
 +
 +typedef struct _PNP_LOCATION_INTERFACE {
 +  USHORT Size;
 +  USHORT Version;
 +  PVOID Context;
 +  PINTERFACE_REFERENCE InterfaceReference;
 +  PINTERFACE_DEREFERENCE InterfaceDereference;
 +  PGET_LOCATION_STRING GetLocationString;
 +} PNP_LOCATION_INTERFACE, *PPNP_LOCATION_INTERFACE;
 +
 +typedef enum _ARBITER_ACTION {
 +  ArbiterActionTestAllocation,
 +  ArbiterActionRetestAllocation,
 +  ArbiterActionCommitAllocation,
 +  ArbiterActionRollbackAllocation,
 +  ArbiterActionQueryAllocatedResources,
 +  ArbiterActionWriteReservedResources,
 +  ArbiterActionQueryConflict,
 +  ArbiterActionQueryArbitrate,
 +  ArbiterActionAddReserved,
 +  ArbiterActionBootAllocation
 +} ARBITER_ACTION, *PARBITER_ACTION;
 +
 +typedef struct _ARBITER_CONFLICT_INFO {
 +  PDEVICE_OBJECT OwningObject;
 +  ULONGLONG Start;
 +  ULONGLONG End;
 +} ARBITER_CONFLICT_INFO, *PARBITER_CONFLICT_INFO;
 +
 +typedef struct _ARBITER_TEST_ALLOCATION_PARAMETERS {
 +  IN OUT PLIST_ENTRY ArbitrationList;
 +  IN ULONG AllocateFromCount;
 +  IN PCM_PARTIAL_RESOURCE_DESCRIPTOR AllocateFrom;
 +} ARBITER_TEST_ALLOCATION_PARAMETERS, *PARBITER_TEST_ALLOCATION_PARAMETERS;
 +
 +typedef struct _ARBITER_RETEST_ALLOCATION_PARAMETERS {
 +  IN OUT PLIST_ENTRY ArbitrationList;
 +  IN ULONG AllocateFromCount;
 +  IN PCM_PARTIAL_RESOURCE_DESCRIPTOR AllocateFrom;
 +} ARBITER_RETEST_ALLOCATION_PARAMETERS, *PARBITER_RETEST_ALLOCATION_PARAMETERS;
 +
 +typedef struct _ARBITER_BOOT_ALLOCATION_PARAMETERS {
 +  IN OUT PLIST_ENTRY ArbitrationList;
 +} ARBITER_BOOT_ALLOCATION_PARAMETERS, *PARBITER_BOOT_ALLOCATION_PARAMETERS;
 +
 +typedef struct _ARBITER_QUERY_ALLOCATED_RESOURCES_PARAMETERS {
 +  OUT PCM_PARTIAL_RESOURCE_LIST *AllocatedResources;
 +} ARBITER_QUERY_ALLOCATED_RESOURCES_PARAMETERS, *PARBITER_QUERY_ALLOCATED_RESOURCES_PARAMETERS;
 +
 +typedef struct _ARBITER_QUERY_CONFLICT_PARAMETERS {
 +  IN PDEVICE_OBJECT PhysicalDeviceObject;
 +  IN PIO_RESOURCE_DESCRIPTOR ConflictingResource;
 +  OUT PULONG ConflictCount;
 +  OUT PARBITER_CONFLICT_INFO *Conflicts;
 +} ARBITER_QUERY_CONFLICT_PARAMETERS, *PARBITER_QUERY_CONFLICT_PARAMETERS;
 +
 +typedef struct _ARBITER_QUERY_ARBITRATE_PARAMETERS {
 +  IN PLIST_ENTRY ArbitrationList;
 +} ARBITER_QUERY_ARBITRATE_PARAMETERS, *PARBITER_QUERY_ARBITRATE_PARAMETERS;
 +
 +typedef struct _ARBITER_ADD_RESERVED_PARAMETERS {
 +  IN PDEVICE_OBJECT ReserveDevice;
 +} ARBITER_ADD_RESERVED_PARAMETERS, *PARBITER_ADD_RESERVED_PARAMETERS;
 +
 +typedef struct _ARBITER_PARAMETERS {
 +  union {
 +    ARBITER_TEST_ALLOCATION_PARAMETERS TestAllocation;
 +    ARBITER_RETEST_ALLOCATION_PARAMETERS RetestAllocation;
 +    ARBITER_BOOT_ALLOCATION_PARAMETERS BootAllocation;
 +    ARBITER_QUERY_ALLOCATED_RESOURCES_PARAMETERS QueryAllocatedResources;
 +    ARBITER_QUERY_CONFLICT_PARAMETERS QueryConflict;
 +    ARBITER_QUERY_ARBITRATE_PARAMETERS QueryArbitrate;
 +    ARBITER_ADD_RESERVED_PARAMETERS AddReserved;
 +  } Parameters;
 +} ARBITER_PARAMETERS, *PARBITER_PARAMETERS;
 +
 +typedef enum _ARBITER_REQUEST_SOURCE {
 +  ArbiterRequestUndefined = -1,
 +  ArbiterRequestLegacyReported,
 +  ArbiterRequestHalReported,
 +  ArbiterRequestLegacyAssigned,
 +  ArbiterRequestPnpDetected,
 +  ArbiterRequestPnpEnumerated
 +} ARBITER_REQUEST_SOURCE;
 +
 +typedef enum _ARBITER_RESULT {
 +  ArbiterResultUndefined = -1,
 +  ArbiterResultSuccess,
 +  ArbiterResultExternalConflict,
 +  ArbiterResultNullRequest
 +} ARBITER_RESULT;
 +
 +#define ARBITER_FLAG_BOOT_CONFIG 0x00000001
 +
 +typedef struct _ARBITER_LIST_ENTRY {
 +  LIST_ENTRY ListEntry;
 +  ULONG AlternativeCount;
 +  PIO_RESOURCE_DESCRIPTOR Alternatives;
 +  PDEVICE_OBJECT PhysicalDeviceObject;
 +  ARBITER_REQUEST_SOURCE RequestSource;
 +  ULONG Flags;
 +  LONG_PTR WorkSpace;
 +  INTERFACE_TYPE InterfaceType;
 +  ULONG SlotNumber;
 +  ULONG BusNumber;
 +  PCM_PARTIAL_RESOURCE_DESCRIPTOR Assignment;
 +  PIO_RESOURCE_DESCRIPTOR SelectedAlternative;
 +  ARBITER_RESULT Result;
 +} ARBITER_LIST_ENTRY, *PARBITER_LIST_ENTRY;
 +
 +typedef NTSTATUS
 +(NTAPI *PARBITER_HANDLER)(
 +  IN OUT PVOID Context,
 +  IN ARBITER_ACTION Action,
 +  IN OUT PARBITER_PARAMETERS Parameters);
 +
 +#define ARBITER_PARTIAL 0x00000001
 +
 +typedef struct _ARBITER_INTERFACE {
 +  USHORT Size;
 +  USHORT Version;
 +  PVOID Context;
 +  PINTERFACE_REFERENCE InterfaceReference;
 +  PINTERFACE_DEREFERENCE InterfaceDereference;
 +  PARBITER_HANDLER ArbiterHandler;
 +  ULONG Flags;
 +} ARBITER_INTERFACE, *PARBITER_INTERFACE;
 +
 +typedef enum _RESOURCE_TRANSLATION_DIRECTION {
 +  TranslateChildToParent,
 +  TranslateParentToChild
 +} RESOURCE_TRANSLATION_DIRECTION;
 +
 +typedef NTSTATUS
 +(NTAPI *PTRANSLATE_RESOURCE_HANDLER)(
 +  IN OUT PVOID Context OPTIONAL,
 +  IN PCM_PARTIAL_RESOURCE_DESCRIPTOR Source,
 +  IN RESOURCE_TRANSLATION_DIRECTION Direction,
 +  IN ULONG AlternativesCount OPTIONAL,
 +  IN IO_RESOURCE_DESCRIPTOR Alternatives[],
 +  IN PDEVICE_OBJECT PhysicalDeviceObject,
 +  OUT PCM_PARTIAL_RESOURCE_DESCRIPTOR Target);
 +
 +typedef NTSTATUS
 +(NTAPI *PTRANSLATE_RESOURCE_REQUIREMENTS_HANDLER)(
 +  IN OUT PVOID Context OPTIONAL,
 +  IN PIO_RESOURCE_DESCRIPTOR Source,
 +  IN PDEVICE_OBJECT PhysicalDeviceObject,
 +  OUT PULONG TargetCount,
 +  OUT PIO_RESOURCE_DESCRIPTOR *Target);
 +
 +typedef struct _TRANSLATOR_INTERFACE {
 +  USHORT Size;
 +  USHORT Version;
 +  PVOID Context;
 +  PINTERFACE_REFERENCE InterfaceReference;
 +  PINTERFACE_DEREFERENCE InterfaceDereference;
 +  PTRANSLATE_RESOURCE_HANDLER TranslateResources;
 +  PTRANSLATE_RESOURCE_REQUIREMENTS_HANDLER TranslateResourceRequirements;
 +} TRANSLATOR_INTERFACE, *PTRANSLATOR_INTERFACE;
 +
 +typedef struct _PCI_AGP_CAPABILITY {
 +  PCI_CAPABILITIES_HEADER Header;
 +  USHORT Minor:4;
 +  USHORT Major:4;
 +  USHORT Rsvd1:8;
 +  struct _PCI_AGP_STATUS {
 +    ULONG Rate:3;
 +    ULONG Agp3Mode:1;
 +    ULONG FastWrite:1;
 +    ULONG FourGB:1;
 +    ULONG HostTransDisable:1;
 +    ULONG Gart64:1;
 +    ULONG ITA_Coherent:1;
 +    ULONG SideBandAddressing:1;
 +    ULONG CalibrationCycle:3;
 +    ULONG AsyncRequestSize:3;
 +    ULONG Rsvd1:1;
 +    ULONG Isoch:1;
 +    ULONG Rsvd2:6;
 +    ULONG RequestQueueDepthMaximum:8;
 +  } AGPStatus;
 +  struct _PCI_AGP_COMMAND {
 +    ULONG Rate:3;
 +    ULONG Rsvd1:1;
 +    ULONG FastWriteEnable:1;
 +    ULONG FourGBEnable:1;
 +    ULONG Rsvd2:1;
 +    ULONG Gart64:1;
 +    ULONG AGPEnable:1;
 +    ULONG SBAEnable:1;
 +    ULONG CalibrationCycle:3;
 +    ULONG AsyncReqSize:3;
 +    ULONG Rsvd3:8;
 +    ULONG RequestQueueDepth:8;
 +  } AGPCommand;
 +} PCI_AGP_CAPABILITY, *PPCI_AGP_CAPABILITY;
 +
 +typedef enum _EXTENDED_AGP_REGISTER {
 +  IsochStatus,
 +  AgpControl,
 +  ApertureSize,
 +  AperturePageSize,
 +  GartLow,
 +  GartHigh,
 +  IsochCommand
 +} EXTENDED_AGP_REGISTER, *PEXTENDED_AGP_REGISTER;
 +
 +typedef struct _PCI_AGP_ISOCH_STATUS {
 +  ULONG ErrorCode:2;
 +  ULONG Rsvd1:1;
 +  ULONG Isoch_L:3;
 +  ULONG Isoch_Y:2;
 +  ULONG Isoch_N:8;
 +  ULONG Rsvd2:16;
 +} PCI_AGP_ISOCH_STATUS, *PPCI_AGP_ISOCH_STATUS;
 +
 +typedef struct _PCI_AGP_CONTROL {
 +  ULONG Rsvd1:7;
 +  ULONG GTLB_Enable:1;
 +  ULONG AP_Enable:1;
 +  ULONG CAL_Disable:1;
 +  ULONG Rsvd2:22;
 +} PCI_AGP_CONTROL, *PPCI_AGP_CONTROL;
 +
 +typedef struct _PCI_AGP_APERTURE_PAGE_SIZE {
 +  USHORT PageSizeMask:11;
 +  USHORT Rsvd1:1;
 +  USHORT PageSizeSelect:4;
 +} PCI_AGP_APERTURE_PAGE_SIZE, *PPCI_AGP_APERTURE_PAGE_SIZE;
 +
 +typedef struct _PCI_AGP_ISOCH_COMMAND {
 +  USHORT Rsvd1:6;
 +  USHORT Isoch_Y:2;
 +  USHORT Isoch_N:8;
 +} PCI_AGP_ISOCH_COMMAND, *PPCI_AGP_ISOCH_COMMAND;
 +
 +typedef struct PCI_AGP_EXTENDED_CAPABILITY {
 +  PCI_AGP_ISOCH_STATUS IsochStatus;
 +  PCI_AGP_CONTROL AgpControl;
 +  USHORT ApertureSize;
 +  PCI_AGP_APERTURE_PAGE_SIZE AperturePageSize;
 +  ULONG GartLow;
 +  ULONG GartHigh;
 +  PCI_AGP_ISOCH_COMMAND IsochCommand;
 +} PCI_AGP_EXTENDED_CAPABILITY, *PPCI_AGP_EXTENDED_CAPABILITY;
 +
 +#define PCI_AGP_RATE_1X     0x1
 +#define PCI_AGP_RATE_2X     0x2
 +#define PCI_AGP_RATE_4X     0x4
 +
 +#define PCIX_MODE_CONVENTIONAL_PCI  0x0
 +#define PCIX_MODE1_66MHZ            0x1
 +#define PCIX_MODE1_100MHZ           0x2
 +#define PCIX_MODE1_133MHZ           0x3
 +#define PCIX_MODE2_266_66MHZ        0x9
 +#define PCIX_MODE2_266_100MHZ       0xA
 +#define PCIX_MODE2_266_133MHZ       0xB
 +#define PCIX_MODE2_533_66MHZ        0xD
 +#define PCIX_MODE2_533_100MHZ       0xE
 +#define PCIX_MODE2_533_133MHZ       0xF
 +
 +#define PCIX_VERSION_MODE1_ONLY     0x0
 +#define PCIX_VERSION_MODE2_ECC      0x1
 +#define PCIX_VERSION_DUAL_MODE_ECC  0x2
 +
 +typedef struct _PCIX_BRIDGE_CAPABILITY {
 +  PCI_CAPABILITIES_HEADER Header;
 +  union {
 +    _ANONYMOUS_STRUCT struct {
 +      USHORT Bus64Bit:1;
 +      USHORT Bus133MHzCapable:1;
 +      USHORT SplitCompletionDiscarded:1;
 +      USHORT UnexpectedSplitCompletion:1;
 +      USHORT SplitCompletionOverrun:1;
 +      USHORT SplitRequestDelayed:1;
 +      USHORT BusModeFrequency:4;
 +      USHORT Rsvd:2;
 +      USHORT Version:2;
 +      USHORT Bus266MHzCapable:1;
 +      USHORT Bus533MHzCapable:1;
 +    } DUMMYSTRUCTNAME;
 +  USHORT AsUSHORT;
 +  } SecondaryStatus;
 +  union {
 +    _ANONYMOUS_STRUCT struct {
 +      ULONG FunctionNumber:3;
 +      ULONG DeviceNumber:5;
 +      ULONG BusNumber:8;
 +      ULONG Device64Bit:1;
 +      ULONG Device133MHzCapable:1;
 +      ULONG SplitCompletionDiscarded:1;
 +      ULONG UnexpectedSplitCompletion:1;
 +      ULONG SplitCompletionOverrun:1;
 +      ULONG SplitRequestDelayed:1;
 +      ULONG Rsvd:7;
 +      ULONG DIMCapable:1;
 +      ULONG Device266MHzCapable:1;
 +      ULONG Device533MHzCapable:1;
 +    } DUMMYSTRUCTNAME;
 +    ULONG AsULONG;
 +  } BridgeStatus;
 +  USHORT UpstreamSplitTransactionCapacity;
 +  USHORT UpstreamSplitTransactionLimit;
 +  USHORT DownstreamSplitTransactionCapacity;
 +  USHORT DownstreamSplitTransactionLimit;
 +  union {
 +    _ANONYMOUS_STRUCT struct {
 +      ULONG SelectSecondaryRegisters:1;
 +      ULONG ErrorPresentInOtherBank:1;
 +      ULONG AdditionalCorrectableError:1;
 +      ULONG AdditionalUncorrectableError:1;
 +      ULONG ErrorPhase:3;
 +      ULONG ErrorCorrected:1;
 +      ULONG Syndrome:8;
 +      ULONG ErrorFirstCommand:4;
 +      ULONG ErrorSecondCommand:4;
 +      ULONG ErrorUpperAttributes:4;
 +      ULONG ControlUpdateEnable:1;
 +      ULONG Rsvd:1;
 +      ULONG DisableSingleBitCorrection:1;
 +      ULONG EccMode:1;
 +    } DUMMYSTRUCTNAME;
 +  ULONG AsULONG;
 +  } EccControlStatus;
 +  ULONG EccFirstAddress;
 +  ULONG EccSecondAddress;
 +  ULONG EccAttribute;
 +} PCIX_BRIDGE_CAPABILITY, *PPCIX_BRIDGE_CAPABILITY;
 +
 +typedef struct _PCI_SUBSYSTEM_IDS_CAPABILITY {
 +  PCI_CAPABILITIES_HEADER Header;
 +  USHORT Reserved;
 +  USHORT SubVendorID;
 +  USHORT SubSystemID;
 +} PCI_SUBSYSTEM_IDS_CAPABILITY, *PPCI_SUBSYSTEM_IDS_CAPABILITY;
 +
 +#define OSC_FIRMWARE_FAILURE                            0x02
 +#define OSC_UNRECOGNIZED_UUID                           0x04
 +#define OSC_UNRECOGNIZED_REVISION                       0x08
 +#define OSC_CAPABILITIES_MASKED                         0x10
 +
 +#define PCI_ROOT_BUS_OSC_METHOD_CAPABILITY_REVISION     0x01
 +
 +typedef struct _PCI_ROOT_BUS_OSC_SUPPORT_FIELD {
 +  union {
 +    _ANONYMOUS_STRUCT struct {
 +      ULONG ExtendedConfigOpRegions:1;
 +      ULONG ActiveStatePowerManagement:1;
 +      ULONG ClockPowerManagement:1;
 +      ULONG SegmentGroups:1;
 +      ULONG MessageSignaledInterrupts:1;
 +      ULONG WindowsHardwareErrorArchitecture:1;
 +      ULONG Reserved:26;
 +    } DUMMYSTRUCTNAME;
 +    ULONG AsULONG;
 +  } u;
 +} PCI_ROOT_BUS_OSC_SUPPORT_FIELD, *PPCI_ROOT_BUS_OSC_SUPPORT_FIELD;
 +
 +typedef struct _PCI_ROOT_BUS_OSC_CONTROL_FIELD {
 +  union {
 +    _ANONYMOUS_STRUCT struct {
 +      ULONG ExpressNativeHotPlug:1;
 +      ULONG ShpcNativeHotPlug:1;
 +      ULONG ExpressNativePME:1;
 +      ULONG ExpressAdvancedErrorReporting:1;
 +      ULONG ExpressCapabilityStructure:1;
 +      ULONG Reserved:27;
 +    } DUMMYSTRUCTNAME;
 +  ULONG AsULONG;
 +  } u;
 +} PCI_ROOT_BUS_OSC_CONTROL_FIELD, *PPCI_ROOT_BUS_OSC_CONTROL_FIELD;
 +
 +typedef enum _PCI_HARDWARE_INTERFACE {
 +  PciConventional,
 +  PciXMode1,
 +  PciXMode2,
 +  PciExpress
 +} PCI_HARDWARE_INTERFACE, *PPCI_HARDWARE_INTERFACE;
 +
 +typedef enum {
 +  BusWidth32Bits,
 +  BusWidth64Bits
 +} PCI_BUS_WIDTH;
 +
 +typedef struct _PCI_ROOT_BUS_HARDWARE_CAPABILITY {
 +  PCI_HARDWARE_INTERFACE SecondaryInterface;
 +  _ANONYMOUS_STRUCT struct {
 +    BOOLEAN BusCapabilitiesFound;
 +    ULONG CurrentSpeedAndMode;
 +    ULONG SupportedSpeedsAndModes;
 +    BOOLEAN DeviceIDMessagingCapable;
 +    PCI_BUS_WIDTH SecondaryBusWidth;
 +  } DUMMYSTRUCTNAME;
 +  PCI_ROOT_BUS_OSC_SUPPORT_FIELD OscFeatureSupport;
 +  PCI_ROOT_BUS_OSC_CONTROL_FIELD OscControlRequest;
 +  PCI_ROOT_BUS_OSC_CONTROL_FIELD OscControlGranted;
 +} PCI_ROOT_BUS_HARDWARE_CAPABILITY, *PPCI_ROOT_BUS_HARDWARE_CAPABILITY;
 +
 +typedef union _PCI_EXPRESS_CAPABILITIES_REGISTER {
 +  _ANONYMOUS_STRUCT struct {
 +    USHORT CapabilityVersion:4;
 +    USHORT DeviceType:4;
 +    USHORT SlotImplemented:1;
 +    USHORT InterruptMessageNumber:5;
 +    USHORT Rsvd:2;
 +  } DUMMYSTRUCTNAME;
 +  USHORT AsUSHORT;
 +} PCI_EXPRESS_CAPABILITIES_REGISTER, *PPCI_EXPRESS_CAPABILITIES_REGISTER;
 +
 +typedef union _PCI_EXPRESS_DEVICE_CAPABILITIES_REGISTER {
 +  _ANONYMOUS_STRUCT struct {
 +    ULONG MaxPayloadSizeSupported:3;
 +    ULONG PhantomFunctionsSupported:2;
 +    ULONG ExtendedTagSupported:1;
 +    ULONG L0sAcceptableLatency:3;
 +    ULONG L1AcceptableLatency:3;
 +    ULONG Undefined:3;
 +    ULONG RoleBasedErrorReporting:1;
 +    ULONG Rsvd1:2;
 +    ULONG CapturedSlotPowerLimit:8;
 +    ULONG CapturedSlotPowerLimitScale:2;
 +    ULONG Rsvd2:4;
 +  } DUMMYSTRUCTNAME;
 +  ULONG AsULONG;
 +} PCI_EXPRESS_DEVICE_CAPABILITIES_REGISTER, *PPCI_EXPRESS_DEVICE_CAPABILITIES_REGISTER;
 +
 +#define PCI_EXPRESS_AER_DEVICE_CONTROL_MASK 0x07;
 +
 +typedef union _PCI_EXPRESS_DEVICE_CONTROL_REGISTER {
 +  _ANONYMOUS_STRUCT struct {
 +    USHORT CorrectableErrorEnable:1;
 +    USHORT NonFatalErrorEnable:1;
 +    USHORT FatalErrorEnable:1;
 +    USHORT UnsupportedRequestErrorEnable:1;
 +    USHORT EnableRelaxedOrder:1;
 +    USHORT MaxPayloadSize:3;
 +    USHORT ExtendedTagEnable:1;
 +    USHORT PhantomFunctionsEnable:1;
 +    USHORT AuxPowerEnable:1;
 +    USHORT NoSnoopEnable:1;
 +    USHORT MaxReadRequestSize:3;
 +    USHORT BridgeConfigRetryEnable:1;
 +  } DUMMYSTRUCTNAME;
 +  USHORT AsUSHORT;
 +} PCI_EXPRESS_DEVICE_CONTROL_REGISTER, *PPCI_EXPRESS_DEVICE_CONTROL_REGISTER;
 +
 +#define PCI_EXPRESS_AER_DEVICE_STATUS_MASK 0x0F;
 +
 +typedef union _PCI_EXPRESS_DEVICE_STATUS_REGISTER {
 +  _ANONYMOUS_STRUCT struct {
 +    USHORT CorrectableErrorDetected:1;
 +    USHORT NonFatalErrorDetected:1;
 +    USHORT FatalErrorDetected:1;
 +    USHORT UnsupportedRequestDetected:1;
 +    USHORT AuxPowerDetected:1;
 +    USHORT TransactionsPending:1;
 +    USHORT Rsvd:10;
 +  } DUMMYSTRUCTNAME;
 +  USHORT AsUSHORT;
 +} PCI_EXPRESS_DEVICE_STATUS_REGISTER, *PPCI_EXPRESS_DEVICE_STATUS_REGISTER;
 +
 +typedef union _PCI_EXPRESS_LINK_CAPABILITIES_REGISTER {
 +  _ANONYMOUS_STRUCT struct {
 +    ULONG MaximumLinkSpeed:4;
 +    ULONG MaximumLinkWidth:6;
 +    ULONG ActiveStatePMSupport:2;
 +    ULONG L0sExitLatency:3;
 +    ULONG L1ExitLatency:3;
 +    ULONG ClockPowerManagement:1;
 +    ULONG SurpriseDownErrorReportingCapable:1;
 +    ULONG DataLinkLayerActiveReportingCapable:1;
 +    ULONG Rsvd:3;
 +    ULONG PortNumber:8;
 +  } DUMMYSTRUCTNAME;
 +  ULONG AsULONG;
 +} PCI_EXPRESS_LINK_CAPABILITIES_REGISTER, *PPCI_EXPRESS_LINK_CAPABILITIES_REGISTER;
 +
 +typedef union _PCI_EXPRESS_LINK_CONTROL_REGISTER {
 +  _ANONYMOUS_STRUCT struct {
 +    USHORT ActiveStatePMControl:2;
 +    USHORT Rsvd1:1;
 +    USHORT ReadCompletionBoundary:1;
 +    USHORT LinkDisable:1;
 +    USHORT RetrainLink:1;
 +    USHORT CommonClockConfig:1;
 +    USHORT ExtendedSynch:1;
 +    USHORT EnableClockPowerManagement:1;
 +    USHORT Rsvd2:7;
 +  } DUMMYSTRUCTNAME;
 +  USHORT AsUSHORT;
 +} PCI_EXPRESS_LINK_CONTROL_REGISTER, *PPCI_EXPRESS_LINK_CONTROL_REGISTER;
 +
 +typedef union _PCI_EXPRESS_LINK_STATUS_REGISTER {
 +  _ANONYMOUS_STRUCT struct {
 +    USHORT LinkSpeed:4;
 +    USHORT LinkWidth:6;
 +    USHORT Undefined:1;
 +    USHORT LinkTraining:1;
 +    USHORT SlotClockConfig:1;
 +    USHORT DataLinkLayerActive:1;
 +    USHORT Rsvd:2;
 +  } DUMMYSTRUCTNAME;
 +  USHORT AsUSHORT;
 +} PCI_EXPRESS_LINK_STATUS_REGISTER, *PPCI_EXPRESS_LINK_STATUS_REGISTER;
 +
 +typedef union _PCI_EXPRESS_SLOT_CAPABILITIES_REGISTER {
 +  _ANONYMOUS_STRUCT struct {
 +    ULONG AttentionButtonPresent:1;
 +    ULONG PowerControllerPresent:1;
 +    ULONG MRLSensorPresent:1;
 +    ULONG AttentionIndicatorPresent:1;
 +    ULONG PowerIndicatorPresent:1;
 +    ULONG HotPlugSurprise:1;
 +    ULONG HotPlugCapable:1;
 +    ULONG SlotPowerLimit:8;
 +    ULONG SlotPowerLimitScale:2;
 +    ULONG ElectromechanicalLockPresent:1;
 +    ULONG NoCommandCompletedSupport:1;
 +    ULONG PhysicalSlotNumber:13;
 +  } DUMMYSTRUCTNAME;
 +  ULONG AsULONG;
 +} PCI_EXPRESS_SLOT_CAPABILITIES_REGISTER, *PPCI_EXPRESS_SLOT_CAPABILITIES_REGISTER;
 +
 +typedef union _PCI_EXPRESS_SLOT_CONTROL_REGISTER {
 +  _ANONYMOUS_STRUCT struct {
 +    USHORT AttentionButtonEnable:1;
 +    USHORT PowerFaultDetectEnable:1;
 +    USHORT MRLSensorEnable:1;
 +    USHORT PresenceDetectEnable:1;
 +    USHORT CommandCompletedEnable:1;
 +    USHORT HotPlugInterruptEnable:1;
 +    USHORT AttentionIndicatorControl:2;
 +    USHORT PowerIndicatorControl:2;
 +    USHORT PowerControllerControl:1;
 +    USHORT ElectromechanicalLockControl:1;
 +    USHORT DataLinkStateChangeEnable:1;
 +    USHORT Rsvd:3;
 +  } DUMMYSTRUCTNAME;
 +  USHORT AsUSHORT;
 +} PCI_EXPRESS_SLOT_CONTROL_REGISTER, *PPCI_EXPRESS_SLOT_CONTROL_REGISTER;
 +
 +typedef union _PCI_EXPRESS_SLOT_STATUS_REGISTER {
 +  _ANONYMOUS_STRUCT struct {
 +    USHORT AttentionButtonPressed:1;
 +    USHORT PowerFaultDetected:1;
 +    USHORT MRLSensorChanged:1;
 +    USHORT PresenceDetectChanged:1;
 +    USHORT CommandCompleted:1;
 +    USHORT MRLSensorState:1;
 +    USHORT PresenceDetectState:1;
 +    USHORT ElectromechanicalLockEngaged:1;
 +    USHORT DataLinkStateChanged:1;
 +    USHORT Rsvd:7;
 +  } DUMMYSTRUCTNAME;
 +  USHORT AsUSHORT;
 +} PCI_EXPRESS_SLOT_STATUS_REGISTER, *PPCI_EXPRESS_SLOT_STATUS_REGISTER;
 +
 +typedef union _PCI_EXPRESS_ROOT_CONTROL_REGISTER {
 +  _ANONYMOUS_STRUCT struct {
 +    USHORT CorrectableSerrEnable:1;
 +    USHORT NonFatalSerrEnable:1;
 +    USHORT FatalSerrEnable:1;
 +    USHORT PMEInterruptEnable:1;
 +    USHORT CRSSoftwareVisibilityEnable:1;
 +    USHORT Rsvd:11;
 +  } DUMMYSTRUCTNAME;
 +  USHORT AsUSHORT;
 +} PCI_EXPRESS_ROOT_CONTROL_REGISTER, *PPCI_EXPRESS_ROOT_CONTROL_REGISTER;
 +
 +typedef union _PCI_EXPRESS_ROOT_CAPABILITIES_REGISTER {
 +  _ANONYMOUS_STRUCT struct {
 +    USHORT CRSSoftwareVisibility:1;
 +    USHORT Rsvd:15;
 +  } DUMMYSTRUCTNAME;
 +  USHORT AsUSHORT;
 +} PCI_EXPRESS_ROOT_CAPABILITIES_REGISTER, *PPCI_EXPRESS_ROOT_CAPABILITIES_REGISTER;
 +
 +typedef union _PCI_EXPRESS_ROOT_STATUS_REGISTER {
 +  _ANONYMOUS_STRUCT struct {
 +    ULONG PMERequestorId:16;
 +    ULONG PMEStatus:1;
 +    ULONG PMEPending:1;
 +    ULONG Rsvd:14;
 +  } DUMMYSTRUCTNAME;
 +  ULONG AsULONG;
 +} PCI_EXPRESS_ROOT_STATUS_REGISTER, *PPCI_EXPRESS_ROOT_STATUS_REGISTER;
 +
 +typedef struct _PCI_EXPRESS_CAPABILITY {
 +  PCI_CAPABILITIES_HEADER Header;
 +  PCI_EXPRESS_CAPABILITIES_REGISTER ExpressCapabilities;
 +  PCI_EXPRESS_DEVICE_CAPABILITIES_REGISTER DeviceCapabilities;
 +  PCI_EXPRESS_DEVICE_CONTROL_REGISTER DeviceControl;
 +  PCI_EXPRESS_DEVICE_STATUS_REGISTER DeviceStatus;
 +  PCI_EXPRESS_LINK_CAPABILITIES_REGISTER LinkCapabilities;
 +  PCI_EXPRESS_LINK_CONTROL_REGISTER LinkControl;
 +  PCI_EXPRESS_LINK_STATUS_REGISTER LinkStatus;
 +  PCI_EXPRESS_SLOT_CAPABILITIES_REGISTER SlotCapabilities;
 +  PCI_EXPRESS_SLOT_CONTROL_REGISTER SlotControl;
 +  PCI_EXPRESS_SLOT_STATUS_REGISTER SlotStatus;
 +  PCI_EXPRESS_ROOT_CONTROL_REGISTER RootControl;
 +  PCI_EXPRESS_ROOT_CAPABILITIES_REGISTER RootCapabilities;
 +  PCI_EXPRESS_ROOT_STATUS_REGISTER RootStatus;
 +} PCI_EXPRESS_CAPABILITY, *PPCI_EXPRESS_CAPABILITY;
 +
 +typedef enum {
 +  MRLClosed = 0,
 +  MRLOpen
 +} PCI_EXPRESS_MRL_STATE;
 +
 +typedef enum {
 +  SlotEmpty = 0,
 +  CardPresent
 +} PCI_EXPRESS_CARD_PRESENCE;
 +
 +typedef enum {
 +  IndicatorOn = 1,
 +  IndicatorBlink,
 +  IndicatorOff
 +} PCI_EXPRESS_INDICATOR_STATE;
 +
 +typedef enum {
 +  PowerOn = 0,
 +  PowerOff
 +} PCI_EXPRESS_POWER_STATE;
 +
 +typedef enum {
 +  L0sEntrySupport = 1,
 +  L0sAndL1EntrySupport = 3
 +} PCI_EXPRESS_ASPM_SUPPORT;
 +
 +typedef enum {
 +  L0sAndL1EntryDisabled,
 +  L0sEntryEnabled,
 +  L1EntryEnabled,
 +  L0sAndL1EntryEnabled
 +} PCI_EXPRESS_ASPM_CONTROL;
 +
 +typedef enum {
 +  L0s_Below64ns = 0,
 +  L0s_64ns_128ns,
 +  L0s_128ns_256ns,
 +  L0s_256ns_512ns,
 +  L0s_512ns_1us,
 +  L0s_1us_2us,
 +  L0s_2us_4us,
 +  L0s_Above4us
 +} PCI_EXPRESS_L0s_EXIT_LATENCY;
 +
 +typedef enum {
 +  L1_Below1us = 0,
 +  L1_1us_2us,
 +  L1_2us_4us,
 +  L1_4us_8us,
 +  L1_8us_16us,
 +  L1_16us_32us,
 +  L1_32us_64us,
 +  L1_Above64us
 +} PCI_EXPRESS_L1_EXIT_LATENCY;
 +
 +typedef enum {
 +  PciExpressEndpoint = 0,
 +  PciExpressLegacyEndpoint,
 +  PciExpressRootPort = 4,
 +  PciExpressUpstreamSwitchPort,
 +  PciExpressDownstreamSwitchPort,
 +  PciExpressToPciXBridge,
 +  PciXToExpressBridge,
 +  PciExpressRootComplexIntegratedEndpoint,
 +  PciExpressRootComplexEventCollector
 +} PCI_EXPRESS_DEVICE_TYPE;
 +
 +typedef enum {
 +  MaxPayload128Bytes = 0,
 +  MaxPayload256Bytes,
 +  MaxPayload512Bytes,
 +  MaxPayload1024Bytes,
 +  MaxPayload2048Bytes,
 +  MaxPayload4096Bytes
 +} PCI_EXPRESS_MAX_PAYLOAD_SIZE;
 +
 +typedef union _PCI_EXPRESS_PME_REQUESTOR_ID {
 +  _ANONYMOUS_STRUCT struct {
 +    USHORT FunctionNumber:3;
 +    USHORT DeviceNumber:5;
 +    USHORT BusNumber:8;
 +  } DUMMYSTRUCTNAME;
 +  USHORT AsUSHORT;
 +} PCI_EXPRESS_PME_REQUESTOR_ID, *PPCI_EXPRESS_PME_REQUESTOR_ID;
 +
 +typedef enum _PHYSICAL_COUNTER_RESOURCE_DESCRIPTOR_TYPE {
 +  ResourceTypeSingle = 0,
 +  ResourceTypeRange,
 +  ResourceTypeExtendedCounterConfiguration,
 +  ResourceTypeOverflow,
 +  ResourceTypeMax
 +} PHYSICAL_COUNTER_RESOURCE_DESCRIPTOR_TYPE;
 +
 +typedef struct _PHYSICAL_COUNTER_RESOURCE_DESCRIPTOR {
 +  PHYSICAL_COUNTER_RESOURCE_DESCRIPTOR_TYPE Type;
 +  ULONG Flags;
 +  union {
 +    ULONG CounterIndex;
 +    ULONG ExtendedRegisterAddress;
 +    struct {
 +      ULONG Begin;
 +      ULONG End;
 +    } Range;
 +  } u;
 +} PHYSICAL_COUNTER_RESOURCE_DESCRIPTOR, *PPHYSICAL_COUNTER_RESOURCE_DESCRIPTOR;
 +
 +typedef struct _PHYSICAL_COUNTER_RESOURCE_LIST {
 +  ULONG Count;
 +  PHYSICAL_COUNTER_RESOURCE_DESCRIPTOR Descriptors[ANYSIZE_ARRAY];
 +} PHYSICAL_COUNTER_RESOURCE_LIST, *PPHYSICAL_COUNTER_RESOURCE_LIST;
 +
 +typedef VOID
 +(NTAPI *PciPin2Line)(
 +  IN struct _BUS_HANDLER *BusHandler,
 +  IN struct _BUS_HANDLER *RootHandler,
 +  IN PCI_SLOT_NUMBER SlotNumber,
 +  IN PPCI_COMMON_CONFIG PciData);
 +
 +typedef VOID
 +(NTAPI *PciLine2Pin)(
 +  IN struct _BUS_HANDLER *BusHandler,
 +  IN struct _BUS_HANDLER *RootHandler,
 +  IN PCI_SLOT_NUMBER SlotNumber,
 +  IN PPCI_COMMON_CONFIG PciNewData,
 +  IN PPCI_COMMON_CONFIG PciOldData);
 +
 +typedef VOID
 +(NTAPI *PciReadWriteConfig)(
 +  IN struct _BUS_HANDLER *BusHandler,
 +  IN PCI_SLOT_NUMBER Slot,
 +  IN PVOID Buffer,
 +  IN ULONG Offset,
 +  IN ULONG Length);
 +
 +#define PCI_DATA_TAG ' ICP'
 +#define PCI_DATA_VERSION 1
 +
 +typedef struct _PCIBUSDATA {
 +  ULONG Tag;
 +  ULONG Version;
 +  PciReadWriteConfig ReadConfig;
 +  PciReadWriteConfig WriteConfig;
 +  PciPin2Line Pin2Line;
 +  PciLine2Pin Line2Pin;
 +  PCI_SLOT_NUMBER ParentSlot;
 +  PVOID Reserved[4];
 +} PCIBUSDATA, *PPCIBUSDATA;
 +
 +#ifndef _PCIINTRF_X_
 +#define _PCIINTRF_X_
 +
 +typedef ULONG
 +(NTAPI *PCI_READ_WRITE_CONFIG)(
 +  IN PVOID Context,
 +  IN ULONG BusOffset,
 +  IN ULONG Slot,
 +  IN PVOID Buffer,
 +  IN ULONG Offset,
 +  IN ULONG Length);
 +
 +typedef VOID
 +(NTAPI *PCI_PIN_TO_LINE)(
 +  IN PVOID Context,
 +  IN PPCI_COMMON_CONFIG PciData);
 +
 +typedef VOID
 +(NTAPI *PCI_LINE_TO_PIN)(
 +  IN PVOID Context,
 +  IN PPCI_COMMON_CONFIG PciNewData,
 +  IN PPCI_COMMON_CONFIG PciOldData);
 +
 +typedef VOID
 +(NTAPI *PCI_ROOT_BUS_CAPABILITY)(
 +  IN PVOID Context,
 +  OUT PPCI_ROOT_BUS_HARDWARE_CAPABILITY HardwareCapability);
 +
 +typedef VOID
 +(NTAPI *PCI_EXPRESS_WAKE_CONTROL)(
 +  IN PVOID Context,
 +  IN BOOLEAN EnableWake);
 +
 +typedef struct _PCI_BUS_INTERFACE_STANDARD {
 +  USHORT Size;
 +  USHORT Version;
 +  PVOID Context;
 +  PINTERFACE_REFERENCE InterfaceReference;
 +  PINTERFACE_DEREFERENCE InterfaceDereference;
 +  PCI_READ_WRITE_CONFIG ReadConfig;
 +  PCI_READ_WRITE_CONFIG WriteConfig;
 +  PCI_PIN_TO_LINE PinToLine;
 +  PCI_LINE_TO_PIN LineToPin;
 +  PCI_ROOT_BUS_CAPABILITY RootBusCapability;
 +  PCI_EXPRESS_WAKE_CONTROL ExpressWakeControl;
 +} PCI_BUS_INTERFACE_STANDARD, *PPCI_BUS_INTERFACE_STANDARD;
 +
 +#define PCI_BUS_INTERFACE_STANDARD_VERSION 1
 +
 +#endif /* _PCIINTRF_X_ */
 +
 +#if (NTDDI_VERSION >= NTDDI_WIN7)
 +
 +#define FILE_CHARACTERISTICS_EXPECT_ORDERLY_REMOVAL_EX     0x00004000
 +#define FILE_CHARACTERISTICS_EXPECT_SURPRISE_REMOVAL_EX    0x00008000
 +#define FILE_CHARACTERISTICS_REMOVAL_POLICY_MASK_EX \
 +  (FILE_CHARACTERISTICS_EXPECT_ORDERLY_REMOVAL_EX | \
 +   FILE_CHARACTERISTICS_EXPECT_SURPRISE_REMOVAL_EX)
 +
 +#define FILE_CHARACTERISTICS_EXPECT_ORDERLY_REMOVAL_DEPRECATED 0x00000200
 +#define FILE_CHARACTERISTICS_EXPECT_SURPRISE_REMOVAL_DEPRECATED 0x00000300
 +#define FILE_CHARACTERISTICS_REMOVAL_POLICY_MASK_DEPRECATED 0x00000300
 +
 +#else
 +
 +#define FILE_CHARACTERISTICS_EXPECT_ORDERLY_REMOVAL     0x00000200
 +#define FILE_CHARACTERISTICS_EXPECT_SURPRISE_REMOVAL    0x00000300
 +#define FILE_CHARACTERISTICS_REMOVAL_POLICY_MASK        0x00000300
 +
 +#define FILE_CHARACTERISTICS_EXPECT_ORDERLY_REMOVAL_EX FILE_CHARACTERISTICS_EXPECT_ORDERLY_REMOVAL
 +#define FILE_CHARACTERISTICS_EXPECT_SURPRISE_REMOVAL_EX FILE_CHARACTERISTICS_EXPECT_SURPRISE_REMOVAL
 +#define FILE_CHARACTERISTICS_REMOVAL_POLICY_MASK_EX FILE_CHARACTERISTICS_REMOVAL_POLICY_MASK
 +
 +#endif /* (NTDDI_VERSION >= NTDDI_WIN7) */
 +
 +#define FILE_CHARACTERISTICS_PROPAGATED (FILE_REMOVABLE_MEDIA  | \
 +                                         FILE_READ_ONLY_DEVICE | \
 +                                         FILE_FLOPPY_DISKETTE  | \
 +                                         FILE_WRITE_ONCE_MEDIA | \
 +                                         FILE_DEVICE_SECURE_OPEN)
 +
 +typedef struct _FILE_ALIGNMENT_INFORMATION {
 +  ULONG AlignmentRequirement;
 +} FILE_ALIGNMENT_INFORMATION, *PFILE_ALIGNMENT_INFORMATION;
 +
 +typedef struct _FILE_NAME_INFORMATION {
 +  ULONG FileNameLength;
 +  WCHAR FileName[1];
 +} FILE_NAME_INFORMATION, *PFILE_NAME_INFORMATION;
 +
 +
 +typedef struct _FILE_ATTRIBUTE_TAG_INFORMATION {
 +  ULONG FileAttributes;
 +  ULONG ReparseTag;
 +} FILE_ATTRIBUTE_TAG_INFORMATION, *PFILE_ATTRIBUTE_TAG_INFORMATION;
 +
 +typedef struct _FILE_DISPOSITION_INFORMATION {
 +  BOOLEAN DeleteFile;
 +} FILE_DISPOSITION_INFORMATION, *PFILE_DISPOSITION_INFORMATION;
 +
 +typedef struct _FILE_END_OF_FILE_INFORMATION {
 +  LARGE_INTEGER EndOfFile;
 +} FILE_END_OF_FILE_INFORMATION, *PFILE_END_OF_FILE_INFORMATION;
 +
 +typedef struct _FILE_VALID_DATA_LENGTH_INFORMATION {
 +  LARGE_INTEGER ValidDataLength;
 +} FILE_VALID_DATA_LENGTH_INFORMATION, *PFILE_VALID_DATA_LENGTH_INFORMATION;
 +
 +typedef struct _FILE_FS_LABEL_INFORMATION {