merge trunk head (37902)
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Sat, 6 Dec 2008 19:06:05 +0000 (19:06 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Sat, 6 Dec 2008 19:06:05 +0000 (19:06 +0000)
svn path=/branches/ros-amd64-bringup/; revision=37904

1  2 
reactos/boot/bootdata/packages/reactos.dff
reactos/drivers/storage/class/cdrom/cdrom.c
reactos/include/ddk/wdm.h
reactos/include/ddk/winddk.h
reactos/ntoskrnl/include/internal/ntoskrnl.h
reactos/tools/widl/typegen.c

@@@ -30,634 -30,634 +30,635 @@@ Signature = "$ReactOS$
  
  
  ; Base files
 -base\applications\cacls\cacls.exe                       1
 -base\applications\calc\calc.exe                         1
 -base\applications\charmap\charmap.exe                   1
 -base\applications\cmdutils\dbgprint\dbgprint.exe        1
 -base\applications\cmdutils\doskey\doskey.exe            1
 -base\applications\cmdutils\find\find.exe                1
 -base\applications\cmdutils\hostname\hostname.exe        1
 -base\applications\cmdutils\more\more.exe                1
 -base\applications\cmdutils\xcopy\xcopy.exe              1
 -base\applications\control\control.exe                   1
 -base\applications\mscutils\devmgmt\devmgmt.exe          1
 -base\applications\mscutils\eventvwr\eventvwr.exe        1
 -base\applications\games\solitaire\sol.exe               1
 -base\applications\games\winemine\winemine.exe           1
 -base\applications\hh\hh.exe                             1
 -base\applications\kbswitch\kbswitch.exe                 1
 -base\applications\kbswitch\kbsdll\kbsdll.dll            1
 -base\applications\logoff\logoff.exe                     1
 -base\applications\msconfig\msconfig.exe                 1
 -base\applications\mstsc\mstsc.exe                       1
 -base\applications\network\arp\arp.exe                   1
 -base\applications\network\dwnl\dwnl.exe                 1
 -base\applications\network\route\route.exe               1
 -base\applications\network\finger\finger.exe             1
 -base\applications\network\ftp\ftp.exe                   1
 -base\applications\network\ipconfig\ipconfig.exe         1
 -base\applications\network\netstat\netstat.exe           1
 -base\applications\network\ping\ping.exe                 1
 -base\applications\network\telnet\telnet.exe             1
 -base\applications\network\tracert\tracert.exe           1
 -base\applications\network\whois\whois.exe               1
 -base\applications\notepad\notepad.exe                   1
 -base\applications\regedit\regedit.exe                   4
 -base\applications\regedit\clb\clb.dll                   1
 -base\applications\sc\sc.exe                             1
 -base\applications\screensavers\3dtext\3dtext.scr        1
 -base\applications\screensavers\logon\logon.scr          1
 -base\applications\mscutils\servman\servman.exe          1
 -base\applications\shutdown\shutdown.exe                 1
 -base\applications\sndvol32\sndvol32.exe                 1
 -base\applications\taskmgr\taskmgr.exe                   1
 -base\applications\winhlp32\winhlp32.exe                 1
 -base\applications\wordpad\wordpad.exe                   1
 -
 -base\services\audiosrv\audiosrv.exe                 1
 -base\services\dhcp\dhcp.exe                         1
 -base\services\eventlog\eventlog.exe                 1
 -base\services\rpcss\rpcss.exe                       1
 -base\services\spoolsv\spoolsv.exe                   1
 -base\services\tcpsvcs\tcpsvcs.exe                   1
 -base\services\tcpsvcs\quotes                        5
 -base\services\umpnpmgr\umpnpmgr.exe                 1
 -
 -base\setup\setup\setup.exe                          1
 -base\setup\vmwinst\vmwinst.exe                      1
 -
 -base\shell\cmd\cmd.exe                              1
 -base\shell\explorer\explorer.exe                    4
 -base\shell\explorer\explorer-cfg-template.xml       4
 -base\shell\explorer\notifyhook\notifyhook.dll       1
 -base\shell\explorer-new\explorer_new.exe            4   optional
 -
 -base\system\autochk\autochk.exe                     1
 -base\system\bootok\bootok.exe                       1
 -base\system\format\format.exe                       1
 -base\system\lsass\lsass.exe                         1
 -base\system\msiexec\msiexec.exe                     1
 -base\system\regsvr32\regsvr32.exe                   1
 -base\system\rundll32\rundll32.exe                   1
 -base\system\services\services.exe                   1
 -base\system\userinit\userinit.exe                   1
 -base\system\winlogon\winlogon.exe                   1
 -base\system\expand\expand.exe                       1
 -base\system\smss\smss.exe                           1
 +;base\applications\cacls\cacls.exe                       1
 +;base\applications\calc\calc.exe                         1
 +;base\applications\charmap\charmap.exe                   1
 +;base\applications\cmdutils\dbgprint\dbgprint.exe        1
 +;base\applications\cmdutils\doskey\doskey.exe            1
 +;base\applications\cmdutils\find\find.exe                1
 +;base\applications\cmdutils\hostname\hostname.exe        1
 +;base\applications\cmdutils\more\more.exe                1
 +;base\applications\cmdutils\xcopy\xcopy.exe              1
 +;base\applications\control\control.exe                   1
 +;base\applications\mscutils\devmgmt\devmgmt.exe          1
 +;base\applications\mscutils\eventvwr\eventvwr.exe        1
 +;base\applications\games\solitaire\sol.exe               1
 +;base\applications\games\winemine\winemine.exe           1
 +;base\applications\hh\hh.exe                             1
 +;base\applications\kbswitch\kbswitch.exe                 1
 +;base\applications\kbswitch\kbsdll\kbsdll.dll            1
 +;base\applications\logoff\logoff.exe                     1
 +;base\applications\msconfig\msconfig.exe                 1
 +;base\applications\mstsc\mstsc.exe                       1
 +;base\applications\network\arp\arp.exe                   1
 +;base\applications\network\dwnl\dwnl.exe                 1
 +;base\applications\network\route\route.exe               1
 +;base\applications\network\finger\finger.exe             1
 +;base\applications\network\ftp\ftp.exe                   1
 +;base\applications\network\ipconfig\ipconfig.exe         1
 +;base\applications\network\netstat\netstat.exe           1
 +;base\applications\network\ping\ping.exe                 1
 +;base\applications\network\telnet\telnet.exe             1
 +;base\applications\network\tracert\tracert.exe           1
 +;base\applications\network\whois\whois.exe               1
 +;base\applications\notepad\notepad.exe                   1
 +;base\applications\regedit\regedit.exe                   4
 +;base\applications\regedit\clb\clb.dll                   1
 +;base\applications\sc\sc.exe                             1
 +;base\applications\screensavers\3dtext\3dtext.scr        1
 +;base\applications\screensavers\logon\logon.scr          1
 +;base\applications\mscutils\servman\servman.exe          1
 +;base\applications\shutdown\shutdown.exe                 1
 +;base\applications\sndvol32\sndvol32.exe                 1
 +;base\applications\taskmgr\taskmgr.exe                   1
 +;base\applications\winhlp32\winhlp32.exe                 1
 +;base\applications\wordpad\wordpad.exe                   1
 +
 +;base\services\audiosrv\audiosrv.exe                 1
 +;base\services\dhcp\dhcp.exe                         1
 +;base\services\eventlog\eventlog.exe                 1
 +;base\services\rpcss\rpcss.exe                       1
 +;base\services\spoolsv\spoolsv.exe                   1
 +;base\services\tcpsvcs\tcpsvcs.exe                   1
 +;base\services\tcpsvcs\quotes                        5
 +;base\services\umpnpmgr\umpnpmgr.exe                 1
 +;base\services\audiosrv\audiosrv.exe                 1
 +
 +;base\setup\setup\setup.exe                          1
 +;base\setup\vmwinst\vmwinst.exe                      1
 +
 +;base\shell\cmd\cmd.exe                              1
 +;base\shell\explorer\explorer.exe                    4
 +;base\shell\explorer\explorer-cfg-template.xml       4
 +;base\shell\explorer\notifyhook\notifyhook.dll       1
 +;base\shell\explorer-new\explorer_new.exe            4   optional
 +
 +;base\system\autochk\autochk.exe                     1
 +;base\system\bootok\bootok.exe                       1
 +;base\system\format\format.exe                       1
 +;base\system\lsass\lsass.exe                         1
 +;base\system\msiexec\msiexec.exe                     1
 +;base\system\regsvr32\regsvr32.exe                   1
 +;base\system\rundll32\rundll32.exe                   1
 +;base\system\services\services.exe                   1
 +;base\system\userinit\userinit.exe                   1
 +;base\system\winlogon\winlogon.exe                   1
 +;base\system\expand\expand.exe                       1
 +;base\system\smss\smss.exe                           1
  
  
  ; Dynamic Link Libraries
 -dll\3rdparty\freetype\freetype.dll                  1
 -dll\3rdparty\mesa32\mesa32.dll                      1
 -dll\3rdparty\dxtn\dxtn.dll                          1   optional
 -
 -dll\cpl\access\access.cpl                           1
 -dll\cpl\appwiz\appwiz.cpl                           1
 -dll\cpl\console\console.dll                         1
 -dll\cpl\desk\desk.cpl                               1
 -dll\cpl\intl\intl.cpl                               1
 -dll\cpl\main\main.cpl                               1
 -dll\cpl\mmsys\mmsys.cpl                             1
 -dll\cpl\ncpa\ncpa.cpl                               1
 -dll\cpl\powercfg\powercfg.cpl                       1
 -dll\cpl\sysdm\sysdm.cpl                             1
 -dll\cpl\timedate\timedate.cpl                       1
 -dll\cpl\input\input.dll                             1
 -dll\cpl\joy\joy.cpl                                 1
 -
 -dll\directx\dinput\dinput.dll                       1
 -dll\directx\dinput8\dinput8.dll                     1
 -dll\directx\dplay\dplay.dll                         1
 -dll\directx\dplayx\dplayx.dll                       1
 -dll\directx\dsound\dsound.dll                       1
 -dll\directx\dxdiagn\dxdiagn.dll                     1
 -dll\directx\ddraw\ddraw.dll                         1
 -dll\directx\d3d8thk\d3d8thk.dll                     1
 -dll\directx\devenum\devenum.dll                     1
 -dll\directx\ksproxy\ksproxy.ax                      1
 -dll\directx\ksuser\ksuser.dll                       1
 -dll\directx\msdmo\msdmo.dll                         1
 -dll\directx\quartz\quartz.dll                       1
 -dll\directx\qedit\qedit.dll                         1
 -dll\directx\wine\d3d8\d3d8.dll                      1
 -dll\directx\wine\wined3d\wined3d.dll                1
 -dll\directx\wine\d3d9\d3d9.dll                      1
 -
 -dll\keyboard\kbda1\kbda1.dll                        1
 -dll\keyboard\kbda2\kbda2.dll                        1
 -dll\keyboard\kbda3\kbda3.dll                        1
 -dll\keyboard\kbdal\kbdal.dll                        1
 -dll\keyboard\kbdarme\kbdarme.dll                    1
 -dll\keyboard\kbdarmw\kbdarmw.dll                    1
 -dll\keyboard\kbdaze\kbdaze.dll                      1
 -dll\keyboard\kbdazel\kbdazel.dll                    1
 -dll\keyboard\kbdbgm\kbdbgm.dll                      1
 -dll\keyboard\kbdbgt\kbdbgt.dll                      1
 -dll\keyboard\kbdblr\kbdblr.dll                      1
 -dll\keyboard\kbdbr\kbdbr.dll                        1
 -dll\keyboard\kbdbga\kbdbga.dll                      1
 -dll\keyboard\kbdbe\kbdbe.dll                        1
 -dll\keyboard\kbdbur\kbdbur.dll                      1
 -dll\keyboard\kbdcan\kbdcan.dll                      1
 -dll\keyboard\kbdcr\kbdcr.dll                        1
 -dll\keyboard\kbdcz1\kbdcz1.dll                      1
 -dll\keyboard\kbdda\kbdda.dll                        1
 -dll\keyboard\kbddv\kbddv.dll                        1
 -dll\keyboard\kbdes\kbdes.dll                        1
 -dll\keyboard\kbdest\kbdest.dll                      1
 -dll\keyboard\kbdfc\kbdfc.dll                        1
 -dll\keyboard\kbdfi\kbdfi.dll                        1
 -dll\keyboard\kbdfr\kbdfr.dll                        1
 -dll\keyboard\kbdgeo\kbdgeo.dll                      1
 -dll\keyboard\kbdgerg\kbdgerg.dll                    1
 -dll\keyboard\kbdgneo\kbdgneo.dll                    1
 -dll\keyboard\kbdgrist\kbdgrist.dll                  1
 -dll\keyboard\kbdgr\kbdgr.dll                        1
 -dll\keyboard\kbdhe\kbdhe.dll                        1
 -dll\keyboard\kbdheb\kbdheb.dll                      1
 -dll\keyboard\kbdhu\kbdhu.dll                        1
 -dll\keyboard\kbdic\kbdic.dll                        1
 -dll\keyboard\kbdinasa\kbdinasa.dll                  1
 -dll\keyboard\kbdinben\kbdinben.dll                  1
 -dll\keyboard\kbdindev\kbdindev.dll                  1
 -dll\keyboard\kbdinguj\kbdinguj.dll                  1
 -dll\keyboard\kbdinmal\kbdinmal.dll                  1
 -dll\keyboard\kbdir\kbdir.dll                        1
 -dll\keyboard\kbdit\kbdit.dll                        1
 -dll\keyboard\kbdja\kbdja.dll                        1
 -dll\keyboard\kbdkaz\kbdkaz.dll                      1
 -dll\keyboard\kbdla\kbdla.dll                        1
 -dll\keyboard\kbdlt\kbdlt.dll                        1
 -dll\keyboard\kbdlv\kbdlv.dll                        1
 -dll\keyboard\kbdmac\kbdmac.dll                      1
 -dll\keyboard\kbdne\kbdne.dll                        1
 -dll\keyboard\kbdno\kbdno.dll                        1
 -dll\keyboard\kbdpl1\kbdpl1.dll                      1
 -dll\keyboard\kbdpo\kbdpo.dll                        1
 -dll\keyboard\kbdro\kbdro.dll                        1
 -dll\keyboard\kbdru\kbdru.dll                        1
 -dll\keyboard\kbdru1\kbdru1.dll                      1
 -dll\keyboard\kbdsg\kbdsg.dll                        1
 -dll\keyboard\kbdsk\kbdsk.dll                        1
 -dll\keyboard\kbdsk1\kbdsk1.dll                      1
 -dll\keyboard\kbdsw\kbdsw.dll                        1
 -dll\keyboard\kbdtat\kbdtat.dll                      1
 -dll\keyboard\kbdth0\kbdth0.dll                      1
 -dll\keyboard\kbdth1\kbdth1.dll                      1
 -dll\keyboard\kbdth2\kbdth2.dll                      1
 -dll\keyboard\kbdth3\kbdth3.dll                      1
 -dll\keyboard\kbdtuf\kbdtuf.dll                      1
 -dll\keyboard\kbdtuq\kbdtuq.dll                      1
 -dll\keyboard\kbduk\kbduk.dll                        1
 -dll\keyboard\kbdur\kbdur.dll                        1
 -dll\keyboard\kbdurs\kbdurs.dll                      1
 -dll\keyboard\kbdus\kbdus.dll                        1
 -dll\keyboard\kbdusa\kbdusa.dll                      1
 -dll\keyboard\kbdusl\kbdusl.dll                      1
 -dll\keyboard\kbdusr\kbdusr.dll                      1
 -dll\keyboard\kbdusx\kbdusx.dll                      1
 -dll\keyboard\kbduzb\kbduzb.dll                      1
 -dll\keyboard\kbdvntc\kbdvntc.dll                    1
 -dll\keyboard\kbdycc\kbdycc.dll                      1
 -dll\keyboard\kbdycl\kbdycl.dll                      1
 -dll\keyboard\kbdko\kbdko.dll                        1
 -
 -dll\ntdll\ntdll.dll                                 1
 -
 -dll\win32\acledit\acledit.dll                       1
 -dll\win32\aclui\aclui.dll                           1
 -dll\win32\advapi32\advapi32.dll                     1
 -dll\win32\advpack\advpack.dll                       1
 -dll\win32\atl\atl.dll                               1
 -dll\win32\authz\authz.dll                           1
 -dll\win32\avifil32\avifil32.dll                     1
 -dll\win32\beepmidi\beepmidi.dll                     1
 -dll\win32\browseui\browseui.dll                     1
 -dll\win32\cabinet\cabinet.dll                       1
 -dll\win32\cards\cards.dll                           1
 -dll\win32\cfgmgr32\cfgmgr32.dll                     1
 -dll\win32\clusapi\clusapi.dll                       1
 -dll\win32\comcat\comcat.dll                         1
 -dll\win32\comctl32\comctl32.dll                     1
 -dll\win32\comdlg32\comdlg32.dll                     1
 -dll\win32\compstui\compstui.dll                     1
 -dll\win32\credui\credui.dll                         1
 -dll\win32\crtdll\crtdll.dll                         1
 -dll\win32\crypt32\crypt32.dll                       1
 -dll\win32\cryptdll\cryptdll.dll                     1
 -dll\win32\cryptnet\cryptnet.dll                     1
 -dll\win32\cryptui\cryptui.dll                       1
 -dll\win32\dbghelp\dbghelp.dll                       1
 -dll\win32\dciman32\dciman32.dll                     1
 -dll\win32\devmgr\devmgr.dll                         1
 -dll\win32\dhcpcsvc\dhcpcsvc.dll                     1
 -dll\win32\dnsapi\dnsapi.dll                         1
 -dll\win32\fmifs\fmifs.dll                           1
 -dll\win32\fusion\fusion.dll                         1
 -dll\win32\gdi32\gdi32.dll                           1
 -dll\win32\gdiplus\gdiplus.dll                       1
 -dll\win32\getuname\getuname.dll                     1
 -dll\win32\glu32\glu32.dll                           1
 -dll\win32\hhctrl.ocx\hhctrl.ocx                     1
 -dll\win32\hid\hid.dll                               1
 -dll\win32\hlink\hlink.dll                           1
 -dll\win32\icmp\icmp.dll                             1
 -dll\win32\imagehlp\imagehlp.dll                     1
 -dll\win32\imm32\imm32.dll                           1
 -dll\win32\inetcomm\inetcomm.dll                     1
 -dll\win32\inetmib1\inetmib1.dll                     1
 -dll\win32\iphlpapi\iphlpapi.dll                     1
 -dll\win32\jscript\jscript.dll                       1
 -dll\win32\kernel32\kernel32.dll                     1
 -dll\win32\localui\localui.dll                       1
 -dll\win32\lsasrv\lsasrv.dll                         1
 -dll\win32\lz32\lz32.dll                             1
 -dll\win32\mapi32\mapi32.dll                         1
 -dll\win32\mlang\mlang.dll                           1
 -dll\win32\mmdrv\mmdrv.dll                           1
 -dll\win32\modemui\modemui.dll                       1
 -dll\win32\mpr\mpr.dll                               1
 -dll\win32\mprapi\mprapi.dll                         1
 -dll\win32\msacm32\msacm32.dll                       1
 -dll\win32\msafd\msafd.dll                           1
 -dll\win32\mscoree\mscoree.dll                       1
 -dll\win32\msgina\msgina.dll                         1
 -dll\win32\mshtml\mshtml.dll                         1
 -dll\win32\mshtml.tlb\mshtml.tlb                     1
 -dll\win32\msi\msi.dll                               1
 -dll\win32\msimg32\msimg32.dll                       1
 -dll\win32\mstask\mstask.dll                         1
 -dll\win32\msvcrt\msvcrt.dll                         1
 -dll\win32\msvcrt20\msvcrt20.dll                     1
 -dll\win32\msvcrt40\msvcrt40.dll                     1
 -dll\win32\msvfw32\msvfw32.dll                       1
 -dll\win32\mswsock\mswsock.dll                       1
 -dll\win32\msxml3\msxml3.dll                         1
 -dll\win32\nddeapi\nddeapi.dll                       1
 -dll\win32\netapi32\netapi32.dll                     1
 -dll\win32\netcfgx\netcfgx.dll                       1
 -dll\win32\netid\netid.dll                           1
 -dll\win32\netshell\netshell.dll                     1
 -dll\win32\newdev\newdev.dll                         1
 -dll\win32\ntdsapi\ntdsapi.dll                       1
 -dll\win32\ntmarta\ntmarta.dll                       1
 -dll\win32\objsel\objsel.dll                         1
 -dll\win32\odbc32\odbc32.dll                         1
 -dll\win32\odbccp32\odbccp32.dll                     1
 -dll\win32\ole32\ole32.dll                           1
 -dll\win32\oleacc\oleacc.dll                         1
 -dll\win32\oleaut32\oleaut32.dll                     1
 -dll\win32\oledlg\oledlg.dll                         1
 -dll\win32\olepro32\olepro32.dll                     1
 -dll\win32\opengl32\opengl32.dll                     1
 -dll\win32\pdh\pdh.dll                               1
 -dll\win32\powrprof\powrprof.dll                     1
 -dll\win32\printui\printui.dll                       1
 -dll\win32\psapi\psapi.dll                           1
 -dll\win32\pstorec\pstorec.dll                       1
 -dll\win32\rasapi32\rasapi32.dll                     1
 -dll\win32\rasdlg\rasdlg.dll                         1
 -dll\win32\rasman\rasman.dll                         1
 -dll\win32\riched20\riched20.dll                     1
 -dll\win32\riched32\riched32.dll                     1
 -dll\win32\rpcrt4\rpcrt4.dll                         1
 -dll\win32\rsabase\rsabase.dll                       1
 -dll\win32\rsaenh\rsaenh.dll                         1
 -dll\win32\samlib\samlib.dll                         1
 -dll\win32\samsrv\samsrv.dll                         1
 -dll\win32\schannel\schannel.dll                     1
 -dll\win32\secur32\secur32.dll                       1
 -dll\win32\security\security.dll                     1
 -dll\win32\sensapi\sensapi.dll                       1
 -dll\win32\serialui\serialui.dll                     1
 -dll\win32\setupapi\setupapi.dll                     1
 -dll\win32\sfc\sfc.dll                               1
 -dll\win32\sfc_os\sfc_os.dll                         1
 -dll\win32\shdocvw\shdocvw.dll                       1
 -dll\win32\shell32\shell32.dll                       1
 -dll\win32\shfolder\shfolder.dll                     1
 -dll\win32\shimgvw\shimgvw.dll                       1
 -dll\win32\shlwapi\shlwapi.dll                       1
 -dll\win32\smdll\smdll.dll                           1
 -dll\win32\snmpapi\snmpapi.dll                       1
 -dll\win32\stdole2.tlb\stdole2.tlb                   1
 -dll\win32\stdole32.tlb\stdole32.tlb                 1
 -dll\win32\sxs\sxs.dll                               1
 -dll\win32\syssetup\syssetup.dll                     1
 -dll\win32\tapi32\tapi32.dll                         1
 -dll\win32\tapiui\tapiui.dll                         1
 -dll\win32\twain_32\twain_32.dll                     1
 -dll\win32\uext2\uext2.dll                           1
 -dll\win32\ufat\ufat.dll                             1
 -dll\win32\ufatx\ufatx.dll                           1   optional
 -dll\win32\untfs\untfs.dll                           1
 -dll\win32\urlmon\urlmon.dll                         1
 -dll\win32\user32\user32.dll                         1
 -dll\win32\userenv\userenv.dll                       1
 -dll\win32\usp10\usp10.dll                           1
 -dll\win32\uxtheme\uxtheme.dll                       1
 -dll\win32\vdmdbg\vdmdbg.dll                         1
 -dll\win32\version\version.dll                       1
 -dll\win32\winfax\winfax.dll                         1
 -dll\win32\winhttp\winhttp.dll                       1
 -dll\win32\wininet\wininet.dll                       1
 -dll\win32\winmm\winmm.dll                           1
 -dll\win32\winspool\winspool.drv                     1
 -dll\win32\winsta\winsta.dll                         1
 -dll\win32\wintrust\wintrust.dll                     1
 -dll\win32\wldap32\wldap32.dll                       1
 -dll\win32\ws2_32\ws2_32.dll                         1
 -dll\win32\ws2help\ws2help.dll                       1
 -dll\win32\wshirda\wshirda.dll                       1
 -dll\win32\wshtcpip\wshtcpip.dll                     1
 -dll\win32\wsock32\wsock32.dll                       1
 -dll\win32\wtsapi32\wtsapi32.dll                     1
 -dll\win32\winmm\midimap\midimap.dll                 1
 -dll\win32\winmm\wavemap\msacm32.drv                 1   optional
 +;dll\3rdparty\freetype\freetype.dll                  1
 +;dll\3rdparty\mesa32\mesa32.dll                      1
 +;dll\3rdparty\dxtn\dxtn.dll                          1   optional
 +
 +;dll\cpl\access\access.cpl                           1
 +;dll\cpl\appwiz\appwiz.cpl                           1
 +;dll\cpl\console\console.dll                         1
 +;dll\cpl\desk\desk.cpl                               1
 +;dll\cpl\intl\intl.cpl                               1
 +;dll\cpl\main\main.cpl                               1
 +;dll\cpl\mmsys\mmsys.cpl                             1
 +;dll\cpl\ncpa\ncpa.cpl                               1
 +;dll\cpl\powercfg\powercfg.cpl                       1
 +;dll\cpl\sysdm\sysdm.cpl                             1
 +;dll\cpl\timedate\timedate.cpl                       1
 +;dll\cpl\input\input.dll                             1
 +;dll\cpl\joy\joy.cpl                                 1
 +
 +;dll\directx\dinput\dinput.dll                       1
 +;dll\directx\dinput8\dinput8.dll                     1
 +;dll\directx\dplay\dplay.dll                         1
 +;dll\directx\dplayx\dplayx.dll                       1
 +;dll\directx\dsound\dsound.dll                       1
 +;dll\directx\dxdiagn\dxdiagn.dll                     1
 +;dll\directx\ddraw\ddraw.dll                         1
 +;dll\directx\d3d8thk\d3d8thk.dll                     1
 +;dll\directx\devenum\devenum.dll                     1
 +;dll\directx\ksproxy\ksproxy.ax                      1
 +;dll\directx\ksuser\ksuser.dll                       1
 +;dll\directx\msdmo\msdmo.dll                         1
 +;dll\directx\quartz\quartz.dll                       1
 +;dll\directx\qedit\qedit.dll                         1
 +;dll\directx\wine\d3d8\d3d8.dll                      1
 +;dll\directx\wine\wined3d\wined3d.dll                1
 +;dll\directx\wine\d3d9\d3d9.dll                      1
 +
 +;dll\keyboard\kbda1\kbda1.dll                        1
 +;dll\keyboard\kbda2\kbda2.dll                        1
 +;dll\keyboard\kbda3\kbda3.dll                        1
 +;dll\keyboard\kbdal\kbdal.dll                        1
 +;dll\keyboard\kbdarme\kbdarme.dll                    1
 +;dll\keyboard\kbdarmw\kbdarmw.dll                    1
 +;dll\keyboard\kbdaze\kbdaze.dll                      1
 +;dll\keyboard\kbdazel\kbdazel.dll                    1
 +;dll\keyboard\kbdbgm\kbdbgm.dll                      1
 +;dll\keyboard\kbdbgt\kbdbgt.dll                      1
 +;dll\keyboard\kbdblr\kbdblr.dll                      1
 +;dll\keyboard\kbdbr\kbdbr.dll                        1
 +;dll\keyboard\kbdbga\kbdbga.dll                      1
 +;dll\keyboard\kbdbe\kbdbe.dll                        1
 +;dll\keyboard\kbdbur\kbdbur.dll                      1
 +;dll\keyboard\kbdcan\kbdcan.dll                      1
 +;dll\keyboard\kbdcr\kbdcr.dll                        1
 +;dll\keyboard\kbdcz1\kbdcz1.dll                      1
 +;dll\keyboard\kbdda\kbdda.dll                        1
 +;dll\keyboard\kbddv\kbddv.dll                        1
 +;dll\keyboard\kbdes\kbdes.dll                        1
 +;dll\keyboard\kbdest\kbdest.dll                      1
 +;dll\keyboard\kbdfc\kbdfc.dll                        1
 +;dll\keyboard\kbdfi\kbdfi.dll                        1
 +;dll\keyboard\kbdfr\kbdfr.dll                        1
 +;dll\keyboard\kbdgeo\kbdgeo.dll                      1
 +;dll\keyboard\kbdgerg\kbdgerg.dll                    1
 +;dll\keyboard\kbdgneo\kbdgneo.dll                    1
 +;dll\keyboard\kbdgrist\kbdgrist.dll                  1
 +;dll\keyboard\kbdgr\kbdgr.dll                        1
 +;dll\keyboard\kbdhe\kbdhe.dll                        1
 +;dll\keyboard\kbdheb\kbdheb.dll                      1
 +;dll\keyboard\kbdhu\kbdhu.dll                        1
 +;dll\keyboard\kbdic\kbdic.dll                        1
 +;dll\keyboard\kbdinasa\kbdinasa.dll                  1
 +;dll\keyboard\kbdinben\kbdinben.dll                  1
 +;dll\keyboard\kbdindev\kbdindev.dll                  1
 +;dll\keyboard\kbdinguj\kbdinguj.dll                  1
 +;dll\keyboard\kbdinmal\kbdinmal.dll                  1
 +;dll\keyboard\kbdir\kbdir.dll                        1
 +;dll\keyboard\kbdit\kbdit.dll                        1
 +;dll\keyboard\kbdja\kbdja.dll                        1
 +;dll\keyboard\kbdkaz\kbdkaz.dll                      1
 +;dll\keyboard\kbdla\kbdla.dll                        1
 +;dll\keyboard\kbdlt\kbdlt.dll                        1
 +;dll\keyboard\kbdlv\kbdlv.dll                        1
 +;dll\keyboard\kbdmac\kbdmac.dll                      1
 +;dll\keyboard\kbdne\kbdne.dll                        1
 +;dll\keyboard\kbdno\kbdno.dll                        1
 +;dll\keyboard\kbdpl1\kbdpl1.dll                      1
 +;dll\keyboard\kbdpo\kbdpo.dll                        1
 +;dll\keyboard\kbdro\kbdro.dll                        1
 +;dll\keyboard\kbdru\kbdru.dll                        1
 +;dll\keyboard\kbdru1\kbdru1.dll                      1
 +;dll\keyboard\kbdsg\kbdsg.dll                        1
 +;dll\keyboard\kbdsk\kbdsk.dll                        1
 +;dll\keyboard\kbdsk1\kbdsk1.dll                      1
 +;dll\keyboard\kbdsw\kbdsw.dll                        1
 +;dll\keyboard\kbdtat\kbdtat.dll                      1
 +;dll\keyboard\kbdth0\kbdth0.dll                      1
 +;dll\keyboard\kbdth1\kbdth1.dll                      1
 +;dll\keyboard\kbdth2\kbdth2.dll                      1
 +;dll\keyboard\kbdth3\kbdth3.dll                      1
 +;dll\keyboard\kbdtuf\kbdtuf.dll                      1
 +;dll\keyboard\kbdtuq\kbdtuq.dll                      1
 +;dll\keyboard\kbduk\kbduk.dll                        1
 +;dll\keyboard\kbdur\kbdur.dll                        1
 +;dll\keyboard\kbdurs\kbdurs.dll                      1
 +;dll\keyboard\kbdus\kbdus.dll                        1
 +;dll\keyboard\kbdusa\kbdusa.dll                      1
 +;dll\keyboard\kbdusl\kbdusl.dll                      1
 +;dll\keyboard\kbdusr\kbdusr.dll                      1
 +;dll\keyboard\kbdusx\kbdusx.dll                      1
 +;dll\keyboard\kbduzb\kbduzb.dll                      1
 +;dll\keyboard\kbdvntc\kbdvntc.dll                    1
 +;dll\keyboard\kbdycc\kbdycc.dll                      1
 +;dll\keyboard\kbdycl\kbdycl.dll                      1
 +;dll\keyboard\kbdko\kbdko.dll                        1
 +
 +;dll\nt;dll\ntdll.dll                                 1
 +
 +;dll\win32\acledit\acledit.dll                       1
 +;dll\win32\aclui\aclui.dll                           1
 +;dll\win32\advapi32\advapi32.dll                     1
 +;dll\win32\advpack\advpack.dll                       1
 +;dll\win32\atl\atl.dll                               1
 +;dll\win32\authz\authz.dll                           1
 +;dll\win32\avifil32\avifil32.dll                     1
 +;dll\win32\beepmidi\beepmidi.dll                     1
 +;dll\win32\browseui\browseui.dll                     1
 +;dll\win32\cabinet\cabinet.dll                       1
 +;dll\win32\cards\cards.dll                           1
 +;dll\win32\cfgmgr32\cfgmgr32.dll                     1
 +;dll\win32\clusapi\clusapi.dll                       1
 +;dll\win32\comcat\comcat.dll                         1
 +;dll\win32\comctl32\comctl32.dll                     1
 +;dll\win32\comdlg32\comdlg32.dll                     1
 +;dll\win32\compstui\compstui.dll                     1
 +;dll\win32\credui\credui.dll                         1
 +;dll\win32\crtdll\crtdll.dll                         1
 +;dll\win32\crypt32\crypt32.dll                       1
 +;dll\win32\cryptdll\cryptdll.dll                     1
 +;dll\win32\cryptnet\cryptnet.dll                     1
 +;dll\win32\cryptui\cryptui.dll                       1
 +;dll\win32\dbghelp\dbghelp.dll                       1
 +;dll\win32\dciman32\dciman32.dll                     1
 +;dll\win32\devmgr\devmgr.dll                         1
 +;dll\win32\dhcpcsvc\dhcpcsvc.dll                     1
 +;dll\win32\dnsapi\dnsapi.dll                         1
 +;dll\win32\fmifs\fmifs.dll                           1
 +;dll\win32\fusion\fusion.dll                         1
 +;dll\win32\gdi32\gdi32.dll                           1
 +;dll\win32\gdiplus\gdiplus.dll                       1
 +;dll\win32\getuname\getuname.dll                     1
 +;dll\win32\glu32\glu32.dll                           1
 +;dll\win32\hhctrl.ocx\hhctrl.ocx                     1
 +;dll\win32\hid\hid.dll                               1
 +;dll\win32\hlink\hlink.dll                           1
 +;dll\win32\icmp\icmp.dll                             1
 +;dll\win32\imagehlp\imagehlp.dll                     1
 +;dll\win32\imm32\imm32.dll                           1
 +;dll\win32\inetcomm\inetcomm.dll                     1
 +;dll\win32\inetmib1\inetmib1.dll                     1
 +;dll\win32\iphlpapi\iphlpapi.dll                     1
 +;dll\win32\jscript\jscript.dll                       1
 +;dll\win32\kernel32\kernel32.dll                     1
++;dll\win32\localui\localui.dll                       1
 +;dll\win32\lsasrv\lsasrv.dll                         1
 +;dll\win32\lz32\lz32.dll                             1
 +;dll\win32\mapi32\mapi32.dll                         1
 +;dll\win32\mlang\mlang.dll                           1
 +;dll\win32\mmdrv\mmdrv.dll                           1
 +;dll\win32\modemui\modemui.dll                       1
 +;dll\win32\mpr\mpr.dll                               1
 +;dll\win32\mprapi\mprapi.dll                         1
 +;dll\win32\msacm32\msacm32.dll                       1
 +;dll\win32\msafd\msafd.dll                           1
 +;dll\win32\mscoree\mscoree.dll                       1
 +;dll\win32\msgina\msgina.dll                         1
 +;dll\win32\mshtml\mshtml.dll                         1
 +;dll\win32\mshtml.tlb\mshtml.tlb                     1
 +;dll\win32\msi\msi.dll                               1
 +;dll\win32\msimg32\msimg32.dll                       1
 +;dll\win32\mstask\mstask.dll                         1
 +;dll\win32\msvcrt\msvcrt.dll                         1
 +;dll\win32\msvcrt20\msvcrt20.dll                     1
 +;dll\win32\msvcrt40\msvcrt40.dll                     1
 +;dll\win32\msvfw32\msvfw32.dll                       1
 +;dll\win32\mswsock\mswsock.dll                       1
 +;dll\win32\msxml3\msxml3.dll                         1
 +;dll\win32\nddeapi\nddeapi.dll                       1
 +;dll\win32\netapi32\netapi32.dll                     1
 +;dll\win32\netcfgx\netcfgx.dll                       1
 +;dll\win32\netid\netid.dll                           1
 +;dll\win32\netshell\netshell.dll                     1
 +;dll\win32\newdev\newdev.dll                         1
 +;dll\win32\ntdsapi\ntdsapi.dll                       1
 +;dll\win32\ntmarta\ntmarta.dll                       1
 +;dll\win32\objsel\objsel.dll                         1
 +;dll\win32\odbc32\odbc32.dll                         1
 +;dll\win32\odbccp32\odbccp32.dll                     1
 +;dll\win32\ole32\ole32.dll                           1
 +;dll\win32\oleacc\oleacc.dll                         1
 +;dll\win32\oleaut32\oleaut32.dll                     1
 +;dll\win32\oledlg\oledlg.dll                         1
 +;dll\win32\olepro32\olepro32.dll                     1
 +;dll\win32\opengl32\opengl32.dll                     1
 +;dll\win32\pdh\pdh.dll                               1
 +;dll\win32\powrprof\powrprof.dll                     1
 +;dll\win32\printui\printui.dll                       1
 +;dll\win32\psapi\psapi.dll                           1
 +;dll\win32\pstorec\pstorec.dll                       1
 +;dll\win32\rasapi32\rasapi32.dll                     1
 +;dll\win32\rasdlg\rasdlg.dll                         1
 +;dll\win32\rasman\rasman.dll                         1
 +;dll\win32\riched20\riched20.dll                     1
 +;dll\win32\riched32\riched32.dll                     1
 +;dll\win32\rpcrt4\rpcrt4.dll                         1
 +;dll\win32\rsabase\rsabase.dll                       1
 +;dll\win32\rsaenh\rsaenh.dll                         1
 +;dll\win32\samlib\samlib.dll                         1
 +;dll\win32\samsrv\samsrv.dll                         1
 +;dll\win32\schannel\schannel.dll                     1
 +;dll\win32\secur32\secur32.dll                       1
 +;dll\win32\security\security.dll                     1
 +;dll\win32\sensapi\sensapi.dll                       1
 +;dll\win32\serialui\serialui.dll                     1
 +;dll\win32\setupapi\setupapi.dll                     1
 +;dll\win32\sfc\sfc.dll                               1
 +;dll\win32\sfc_os\sfc_os.dll                         1
 +;dll\win32\shdocvw\shdocvw.dll                       1
 +;dll\win32\shell32\shell32.dll                       1
 +;dll\win32\shfolder\shfolder.dll                     1
 +;dll\win32\shimgvw\shimgvw.dll                       1
 +;dll\win32\shlwapi\shlwapi.dll                       1
 +;dll\win32\smdll\smdll.dll                           1
 +;dll\win32\snmpapi\snmpapi.dll                       1
 +;dll\win32\stdole2.tlb\stdole2.tlb                   1
 +;dll\win32\stdole32.tlb\stdole32.tlb                 1
 +;dll\win32\sxs\sxs.dll                               1
 +;dll\win32\syssetup\syssetup.dll                     1
 +;dll\win32\tapi32\tapi32.dll                         1
 +;dll\win32\tapiui\tapiui.dll                         1
 +;dll\win32\twain_32\twain_32.dll                     1
 +;dll\win32\uext2\uext2.dll                           1
 +;dll\win32\ufat\ufat.dll                             1
 +;dll\win32\ufatx\ufatx.dll                           1   optional
 +;dll\win32\untfs\untfs.dll                           1
 +;dll\win32\urlmon\urlmon.dll                         1
 +;dll\win32\user32\user32.dll                         1
 +;dll\win32\userenv\userenv.dll                       1
 +;dll\win32\usp10\usp10.dll                           1
 +;dll\win32\uxtheme\uxtheme.dll                       1
 +;dll\win32\vdmdbg\vdmdbg.dll                         1
 +;dll\win32\version\version.dll                       1
 +;dll\win32\winfax\winfax.dll                         1
 +;dll\win32\winhttp\winhttp.dll                       1
 +;dll\win32\wininet\wininet.dll                       1
 +;dll\win32\winmm\winmm.dll                           1
 +;dll\win32\winspool\winspool.drv                     1
 +;dll\win32\winsta\winsta.dll                         1
 +;dll\win32\wintrust\wintrust.dll                     1
 +;dll\win32\wldap32\wldap32.dll                       1
 +;dll\win32\ws2_32\ws2_32.dll                         1
 +;dll\win32\ws2help\ws2help.dll                       1
 +;dll\win32\wshirda\wshirda.dll                       1
 +;dll\win32\wshtcpip\wshtcpip.dll                     1
 +;dll\win32\wsock32\wsock32.dll                       1
 +;dll\win32\wtsapi32\wtsapi32.dll                     1
 +;dll\win32\winmm\midimap\midimap.dll                 1
 +;dll\win32\winmm\wavemap\msacm32.drv                 1   optional
  
  ; Shell Extensions
 -dll\shellext\deskadp\deskadp.dll                    1
 -dll\shellext\deskmon\deskmon.dll                    1
 +;dll\shellext\deskadp\deskadp.dll                    1
 +;dll\shellext\deskmon\deskmon.dll                    1
  
  ; Drivers
 -drivers\base\bootvid\bootvid.dll                    1
 -drivers\base\beep\beep.sys                          2
 -drivers\base\null\null.sys                          2
 +;drivers\base\bootvid\bootvid.dll                    1
 +;drivers\base\beep\beep.sys                          2
 +;drivers\base\null\null.sys                          2
  
 -drivers\bus\isapnp\isapnp.sys                       2
 +;drivers\bus\isapnp\isapnp.sys                       2
  
 -drivers\directx\dxapi\dxapi.sys                     2
 -drivers\directx\dxg\dxg.sys                         2
 -drivers\directx\dxgthk\dxgthk.sys                   2
 +;drivers\directx\dxapi\dxapi.sys                     2
 +;drivers\directx\dxg\dxg.sys                         2
 +;drivers\directx\dxgthk\dxgthk.sys                   2
  
 -drivers\filesystems\fs_rec\fs_rec.sys               2
 -drivers\filesystems\msfs\msfs.sys                   2
 -drivers\filesystems\mup\mup.sys                     2
 -drivers\filesystems\npfs\npfs.sys                   2
 +;drivers\filesystems\fs_rec\fs_rec.sys               2
 +;drivers\filesystems\msfs\msfs.sys                   2
 +;drivers\filesystems\mup\mup.sys                     2
 +;drivers\filesystems\npfs\npfs.sys                   2
  
 -drivers\input\mouclass\mouclass.sys                 2
 -drivers\input\sermouse\sermouse.sys                 2
 +;drivers\input\mouclass\mouclass.sys                 2
 +;drivers\input\sermouse\sermouse.sys                 2
  
 -drivers\network\afd\afd.sys                         2
 -drivers\network\ndis\ndis.sys                       2
 -drivers\network\tcpip\tcpip.sys                     2
 -drivers\network\tdi\tdi.sys                         2
 -drivers\network\dd\ne2000\ne2000.sys                2
 -drivers\network\dd\pcnet\pcnet.sys                  2
 +;drivers\network\afd\afd.sys                         2
 +;drivers\network\ndis\ndis.sys                       2
 +;drivers\network\tcpip\tcpip.sys                     2
 +;drivers\network\tdi\tdi.sys                         2
 +;drivers\network\dd\ne2000\ne2000.sys                2
 +;drivers\network\dd\pcnet\pcnet.sys                  2
  
 -drivers\serial\serenum\serenum.sys                  2
 -drivers\serial\serial\serial.sys                    2
 +;drivers\serial\serenum\serenum.sys                  2
 +;drivers\serial\serial\serial.sys                    2
  
 -drivers\storage\ide\pciide\pciide.sys               2
 -drivers\storage\ide\pciidex\pciidex.sys             2
 +;drivers\storage\ide\pciide\pciide.sys               2
 +;drivers\storage\ide\pciidex\pciidex.sys             2
  
 -;drivers\usb\miniport\usbohci\usbohci.sys           2
 -;drivers\usb\miniport\usbuhci\usbuhci.sys           2
 -;drivers\usb\usbhub\usbhub.sys                      2
 -;drivers\usb\usbport\usbport.sys                    2
 -drivers\usb\nt4compat\usbdriver\usbdriver.sys       2
 +;;drivers\usb\miniport\usbohci\usbohci.sys           2
 +;;drivers\usb\miniport\usbuhci\usbuhci.sys           2
 +;;drivers\usb\usbhub\usbhub.sys                      2
 +;;drivers\usb\usbport\usbport.sys                    2
 +;drivers\usb\nt4compat\usbdriver\usbdriver.sys       2
  
 -drivers\video\displays\vga\vgaddi.dll               1
 -drivers\video\displays\framebuf\framebuf.dll        1
 -drivers\video\miniport\vga\vgamp.sys                2
 -drivers\video\miniport\vbe\vbemp.sys                2
 -drivers\video\videoprt\videoprt.sys                 2
 +;drivers\video\displays\vga\vgaddi.dll               1
 +;drivers\video\displays\framebuf\framebuf.dll        1
 +;drivers\video\miniport\vga\vgamp.sys                2
 +;drivers\video\miniport\vbe\vbemp.sys                2
 +;drivers\video\videoprt\videoprt.sys                 2
  
 -drivers\wmi\wmilib.sys                              2
 +;drivers\wmi\wmilib.sys                              2
  
  ; Media
 -media\fonts\DejaVuSans.ttf                          3
 -media\fonts\DejaVuSans-Bold.ttf                     3
 -media\fonts\DejaVuSans-BoldOblique.ttf              3
 -media\fonts\DejaVuSansMono.ttf                      3
 -media\fonts\DejaVuSansMono-Bold.ttf                 3
 -media\fonts\DejaVuSansMono-BoldOblique.ttf          3
 -media\fonts\DejaVuSansMono-Oblique.ttf              3
 -media\fonts\DejaVuSans-Oblique.ttf                  3
 -media\fonts\DejaVuSerif.ttf                         3
 -media\fonts\DejaVuSerif-Bold.ttf                    3
 -media\fonts\DejaVuSerif-BoldItalic.ttf              3
 -media\fonts\DejaVuSerif-Italic.ttf                  3
 -
 -media\fonts\FreeMono.ttf                            3
 -media\fonts\FreeMonoBold.ttf                        3
 -media\fonts\FreeMonoBoldOblique.ttf                 3
 -media\fonts\FreeMonoOblique.ttf                     3
 -
 -media\fonts\LiberationMono-Bold.ttf                 3
 -media\fonts\LiberationMono-BoldItalic.ttf           3
 -media\fonts\LiberationMono-Italic.ttf               3
 -media\fonts\LiberationMono-Regular.ttf              3
 -media\fonts\LiberationSans-Bold.ttf                 3
 -media\fonts\LiberationSans-BoldItalic.ttf           3
 -media\fonts\LiberationSans-Italic.ttf               3
 -media\fonts\LiberationSans-Regular.ttf              3
 -media\fonts\LiberationSerif-Bold.ttf                3
 -media\fonts\LiberationSerif-BoldItalic.ttf          3
 -media\fonts\LiberationSerif-Italic.ttf              3
 -media\fonts\LiberationSerif-Regular.ttf             3
 -
 -media\fonts\Marlett.ttf                             3
 -media\fonts\tahoma.ttf                              3
 -media\fonts\tahomabd.ttf                            3
 -
 -media\nls\c_037.nls                                 1
 -media\nls\c_500.nls                                 1
 -media\nls\c_737.nls                                 1
 -media\nls\c_775.nls                                 1
 -media\nls\c_850.nls                                 1
 -media\nls\c_852.nls                                 1
 -media\nls\c_855.nls                                 1
 -media\nls\c_856.nls                                 1
 -media\nls\c_857.nls                                 1
 -media\nls\c_860.nls                                 1
 -media\nls\c_861.nls                                 1
 -media\nls\c_862.nls                                 1
 -media\nls\c_863.nls                                 1
 -media\nls\c_864.nls                                 1
 -media\nls\c_865.nls                                 1
 -media\nls\c_866.nls                                 1
 -media\nls\c_869.nls                                 1
 -media\nls\c_874.nls                                 1
 -media\nls\c_875.nls                                 1
 -media\nls\c_878.nls                                 1
 -media\nls\c_932.nls                                 1
 -media\nls\c_936.nls                                 1
 -media\nls\c_949.nls                                 1
 -media\nls\c_950.nls                                 1
 -media\nls\c_1006.nls                                1
 -media\nls\c_1026.nls                                1
 -media\nls\c_1250.nls                                1
 -media\nls\c_1251.nls                                1
 -media\nls\c_1253.nls                                1
 -media\nls\c_1254.nls                                1
 -media\nls\c_1255.nls                                1
 -media\nls\c_1256.nls                                1
 -media\nls\c_1257.nls                                1
 -media\nls\c_1258.nls                                1
 -media\nls\c_10000.nls                               1
 -media\nls\c_10006.nls                               1
 -media\nls\c_10007.nls                               1
 -media\nls\c_10029.nls                               1
 -media\nls\c_10079.nls                               1
 -media\nls\c_10081.nls                               1
 -media\nls\c_20866.nls                               1
 -media\nls\c_28591.nls                               1
 -media\nls\c_28592.nls                               1
 -media\nls\c_28593.nls                               1
 -media\nls\c_28594.nls                               1
 -media\nls\c_28595.nls                               1
 -media\nls\c_28596.nls                               1
 -media\nls\c_28597.nls                               1
 -media\nls\c_28598.nls                               1
 -media\nls\c_28599.nls                               1
 -media\drivers\etc\services                          5
 -media\inf\acpi.inf                                  6
 -media\inf\cdrom.inf                                 6
 -media\inf\display.inf                               6
 -media\inf\font.inf                                  6
 -media\inf\hdc.inf                                   6
 -media\inf\intl.inf                                  6
 -media\inf\layout.inf                                6
 -media\inf\machine.inf                               6
 -media\inf\msmouse.inf                               6
 -media\inf\keyboard.inf                              6
 -media\inf\NET_NIC.inf                               6
 -media\inf\netamd.inf                                6
 -media\inf\netisa.inf                                6
 -media\inf\netrtpnt.inf                              6
 -media\inf\nettcpip.inf                              6
 -media\inf\ports.inf                                 6
 -media\inf\scsi.inf                                  6
 -media\inf\syssetup.inf                              6
 -media\inf\usbport.inf                               6
 -media\inf\usb.inf                                   6
 -media\inf\usbstor.inf                               6
 -media\inf\xboxdisp.inf                              6
 +;media\fonts\DejaVuSans.ttf                          3
 +;media\fonts\DejaVuSans-Bold.ttf                     3
 +;media\fonts\DejaVuSans-BoldOblique.ttf              3
 +;media\fonts\DejaVuSansMono.ttf                      3
 +;media\fonts\DejaVuSansMono-Bold.ttf                 3
 +;media\fonts\DejaVuSansMono-BoldOblique.ttf          3
 +;media\fonts\DejaVuSansMono-Oblique.ttf              3
 +;media\fonts\DejaVuSans-Oblique.ttf                  3
 +;media\fonts\DejaVuSerif.ttf                         3
 +;media\fonts\DejaVuSerif-Bold.ttf                    3
 +;media\fonts\DejaVuSerif-BoldItalic.ttf              3
 +;media\fonts\DejaVuSerif-Italic.ttf                  3
 +
 +;media\fonts\FreeMono.ttf                            3
 +;media\fonts\FreeMonoBold.ttf                        3
 +;media\fonts\FreeMonoBoldOblique.ttf                 3
 +;media\fonts\FreeMonoOblique.ttf                     3
 +
 +;media\fonts\LiberationMono-Bold.ttf                 3
 +;media\fonts\LiberationMono-BoldItalic.ttf           3
 +;media\fonts\LiberationMono-Italic.ttf               3
 +;media\fonts\LiberationMono-Regular.ttf              3
 +;media\fonts\LiberationSans-Bold.ttf                 3
 +;media\fonts\LiberationSans-BoldItalic.ttf           3
 +;media\fonts\LiberationSans-Italic.ttf               3
 +;media\fonts\LiberationSans-Regular.ttf              3
 +;media\fonts\LiberationSerif-Bold.ttf                3
 +;media\fonts\LiberationSerif-BoldItalic.ttf          3
 +;media\fonts\LiberationSerif-Italic.ttf              3
 +;media\fonts\LiberationSerif-Regular.ttf             3
 +
 +;media\fonts\Marlett.ttf                             3
 +;media\fonts\tahoma.ttf                              3
 +;media\fonts\tahomabd.ttf                            3
 +
 +;media\nls\c_037.nls                                 1
 +;media\nls\c_500.nls                                 1
 +;media\nls\c_737.nls                                 1
 +;media\nls\c_775.nls                                 1
 +;media\nls\c_850.nls                                 1
 +;media\nls\c_852.nls                                 1
 +;media\nls\c_855.nls                                 1
 +;media\nls\c_856.nls                                 1
 +;media\nls\c_857.nls                                 1
 +;media\nls\c_860.nls                                 1
 +;media\nls\c_861.nls                                 1
 +;media\nls\c_862.nls                                 1
 +;media\nls\c_863.nls                                 1
 +;media\nls\c_864.nls                                 1
 +;media\nls\c_865.nls                                 1
 +;media\nls\c_866.nls                                 1
 +;media\nls\c_869.nls                                 1
 +;media\nls\c_874.nls                                 1
 +;media\nls\c_875.nls                                 1
 +;media\nls\c_878.nls                                 1
 +;media\nls\c_932.nls                                 1
 +;media\nls\c_936.nls                                 1
 +;media\nls\c_949.nls                                 1
 +;media\nls\c_950.nls                                 1
 +;media\nls\c_1006.nls                                1
 +;media\nls\c_1026.nls                                1
 +;media\nls\c_1250.nls                                1
 +;media\nls\c_1251.nls                                1
 +;media\nls\c_1253.nls                                1
 +;media\nls\c_1254.nls                                1
 +;media\nls\c_1255.nls                                1
 +;media\nls\c_1256.nls                                1
 +;media\nls\c_1257.nls                                1
 +;media\nls\c_1258.nls                                1
 +;media\nls\c_10000.nls                               1
 +;media\nls\c_10006.nls                               1
 +;media\nls\c_10007.nls                               1
 +;media\nls\c_10029.nls                               1
 +;media\nls\c_10079.nls                               1
 +;media\nls\c_10081.nls                               1
 +;media\nls\c_20866.nls                               1
 +;media\nls\c_28591.nls                               1
 +;media\nls\c_28592.nls                               1
 +;media\nls\c_28593.nls                               1
 +;media\nls\c_28594.nls                               1
 +;media\nls\c_28595.nls                               1
 +;media\nls\c_28596.nls                               1
 +;media\nls\c_28597.nls                               1
 +;media\nls\c_28598.nls                               1
 +;media\nls\c_28599.nls                               1
 +;media\drivers\etc\services                          5
 +;media\inf\acpi.inf                                  6
 +;media\inf\cdrom.inf                                 6
 +;media\inf\display.inf                               6
 +;media\inf\font.inf                                  6
 +;media\inf\hdc.inf                                   6
 +;media\inf\intl.inf                                  6
 +;media\inf\layout.inf                                6
 +;media\inf\machine.inf                               6
 +;media\inf\msmouse.inf                               6
 +;media\inf\keyboard.inf                              6
 +;media\inf\NET_NIC.inf                               6
 +;media\inf\netamd.inf                                6
 +;media\inf\netisa.inf                                6
 +;media\inf\netrtpnt.inf                              6
 +;media\inf\nettcpip.inf                              6
 +;media\inf\ports.inf                                 6
 +;media\inf\scsi.inf                                  6
 +;media\inf\syssetup.inf                              6
 +;media\inf\usbport.inf                               6
 +;media\inf\usb.inf                                   6
 +;media\inf\usbstor.inf                               6
 +;media\inf\xboxdisp.inf                              6
  
  ; Subsystems
 -subsystems\win32\csrss\csrss.exe                    1
 -subsystems\win32\csrss\win32csr\win32csr.dll        1
 -subsystems\ntvdm\ntvdm.exe                          1
 -subsystems\win32\win32k\win32k.sys                  1
 +;subsystems\win32\csrss\csrss.exe                    1
 +;subsystems\win32\csrss\win32csr\win32csr.dll        1
 +;subsystems\ntvdm\ntvdm.exe                          1
 +;subsystems\win32\win32k\win32k.sys                  1
  boot\bootdata\bootcdregtest\testboot.bat            7   optional
  
  ; Modules
 -modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr              1   optional
 -modules\rosapps\applications\screensavers\matrix\matrix.scr                1   optional
 -modules\rosapps\applications\screensavers\blankscr\scrnsave.scr            1   optional
 -modules\rosapps\applications\screensavers\starfield\starfield.scr          1   optional
 -modules\rosapps\applications\screensavers\mazescr\mazescr.scr              1   optional
 -modules\rosapps\applications\screensavers\butterflies\butterflies.scr      1   optional
 -modules\rosapps\applications\cmdutils\comp\comp.exe                                     1   optional
 -modules\rosapps\applications\cmdutils\mode\mode.exe                                     1   optional
 -modules\rosapps\applications\cmdutils\sort\sort.exe                                     1   optional
 -modules\rosapps\applications\cmdutils\tee\tee.exe                                       1   optional
 -modules\rosapps\applications\cmdutils\touch\touch.exe                                   1   optional
 -modules\rosapps\applications\cmdutils\uptime\uptime.exe                                 1   optional
 -modules\rosapps\applications\cmdutils\y\y.exe                                           1   optional
 -modules\rosapps\applications\devutils\gdb2\gdb2.exe                                     1   optional
 -modules\rosapps\applications\devutils\gdihv\gdihv.exe                                   1   optional
 -modules\rosapps\applications\devutils\genguid\genguid.exe                               1   optional
 -modules\rosapps\applications\sysutils\gettype\gettype.exe                               1   optional
 -modules\rosapps\applications\devutils\roswebparser\roswebparser.exe                     1   optional
 -modules\rosapps\applications\devutils\zoomin\zoomin.exe                                 1   optional
 -modules\rosapps\applications\downloader\downloader.exe                                  1   optional
 -modules\rosapps\applications\downloader\downloader.xml                                  1   optional
 -modules\rosapps\applications\fontview\fontview.exe                                      1   optional
 -modules\rosapps\applications\imagesoft\imagesoft.exe                                    1   optional
 -modules\rosapps\applications\net\ncftp\ncftp.exe                                        1   optional
 -modules\rosapps\applications\net\netreg\netreg.exe                                      1   optional
 -modules\rosapps\applications\net\niclist\niclist.exe                                    1   optional
 -modules\rosapps\applications\net\roshttpd\roshttpd.exe                                  1   optional
 -modules\rosapps\applications\notevil\notevil.exe                                        1   optional
 -modules\rosapps\applications\magnify\magnify.exe                                        1   optional
 -modules\rosapps\applications\packmgr\cmd-line\rosget.exe                                1   optional
 -modules\rosapps\applications\packmgr\gui\packmgr.exe                                    1   optional
 -modules\rosapps\applications\packmgr\lib\package.dll                                    1   optional
 -modules\rosapps\applications\sysutils\chkdsk\chkdsk.exe                                 1   optional
 -modules\rosapps\applications\sysutils\systeminfo\systeminfo.exe                         1   optional
 -modules\rosapps\applications\sysutils\chklib\chklib.exe                                 1   optional
 -modules\rosapps\applications\sysutils\ctm\ctm.exe                                       1   optional
 -modules\rosapps\applications\sysutils\kill\kill.exe                                     1   optional
 -modules\rosapps\applications\sysutils\lsdd\lsdd.exe                                     1   optional
 -modules\rosapps\applications\sysutils\man\man.exe                                       1   optional
 -modules\rosapps\applications\sysutils\pedump\pedump.exe                                 1   optional
 -modules\rosapps\applications\sysutils\regexpl\regexpl.exe                               1   optional
 -modules\rosapps\applications\sysutils\tcat\tcat.exe                                     1   optional
 -modules\rosapps\applications\sysutils\tlist\tlist.exe                                   1   optional
 -modules\rosapps\applications\sysutils\screenshot\screenshot.exe                         1   optional
 -modules\rosapps\applications\sysutils\utils\binpatch\binpatch.exe                       1   optional
 -modules\rosapps\applications\sysutils\utils\cat\cat.exe                                 1   optional
 -modules\rosapps\applications\sysutils\utils\driver\load\load.exe                        1   optional
 -modules\rosapps\applications\sysutils\utils\driver\unload\unload.exe                    1   optional
 -modules\rosapps\applications\sysutils\utils\infinst\infinst.exe                         1   optional
 -modules\rosapps\applications\sysutils\utils\nts2w32err\nts2w32err.exe                   1   optional
 -modules\rosapps\applications\sysutils\utils\objdir\objdir.exe                           1   optional
 -modules\rosapps\applications\sysutils\utils\partinfo\partinfo.exe                       1   optional
 -modules\rosapps\applications\sysutils\utils\ps\ps.exe                                   1   optional
 -modules\rosapps\applications\sysutils\utils\rosperf\rosperf.exe                         1   optional
 -modules\rosapps\applications\sysutils\utils\stats\stats.exe                             1   optional
 -modules\rosapps\applications\sysutils\utils\tickcount\tickcount.exe                     1   optional
 -modules\rosapps\applications\winfile\winfile.exe                                        1   optional
 -modules\rosapps\applications\winver\winver.exe                                          1   optional
 -modules\rosapps\applications\write\write.exe                                            1   optional
 -modules\rosapps\demos\ddraw\ddraw_demo.exe                                 1   optional
 -modules\rosapps\demos\maze\maze.exe                                        1   optional
 -modules\rosapps\dflat32\edit.exe                                           1   optional
 -modules\rosapps\drivers\avtest\avtest.sys                                  1   optional
 -modules\rosapps\drivers\green\green.sys                                    1   optional
 -modules\rosapps\templates\dialog\dialog.exe                                       1   optional
 -modules\rostests\winetests\advapi32\advapi32_winetest.exe                  7   optional
 -modules\rostests\winetests\advpack\advpack_winetest.exe                    7   optional
 -modules\rostests\winetests\browseui\browseui_winetest.exe                  7   optional
 -modules\rostests\winetests\cabinet\cabinet_winetest.exe                    7   optional
 -modules\rostests\winetests\comcat\comcat_winetest.exe                      7   optional
 -modules\rostests\winetests\comctl32\comctl32_winetest.exe                  7   optional
 -modules\rostests\winetests\comdlg32\comdlg32_winetest.exe                  7   optional
 -modules\rostests\winetests\gdi32\gdi32_winetest.exe                        7   optional
 -modules\rostests\winetests\gdiplus\gdiplus_winetest.exe                    7   optional
 -modules\rostests\winetests\hlink\hlink_winetest.exe                        7   optional
 -modules\rostests\winetests\icmp\icmp_winetest.exe                          7   optional
 -modules\rostests\winetests\kernel32\kernel32_winetest.exe                  7   optional
 -modules\rostests\winetests\lz32\lz32_winetest.exe                          7   optional
 -modules\rostests\winetests\mapi32\mapi32_winetest.exe                      7   optional
 -modules\rostests\winetests\mlang\mlang_winetest.exe                        7   optional
 -modules\rostests\winetests\mshtml\mshtml_winetest.exe                      7   optional
 -modules\rostests\winetests\msi\msi_winetest.exe                            7   optional
 -modules\rostests\winetests\mstask\mstask_winetest.exe                      7   optional
 -modules\rostests\winetests\msvcrt\msvcrt_winetest.exe                      7   optional
 -modules\rostests\winetests\netapi32\netapi32_winetest.exe                  7   optional
 -modules\rostests\winetests\ntdll\ntdll_winetest.exe                        7   optional
 -modules\rostests\winetests\odbccp32\odbccp32_winetest.exe                  7   optional
 -modules\rostests\winetests\ole32\ole32_winetest.exe                        7   optional
 -modules\rostests\winetests\oleaut32\oleaut32_winetest.exe                  7   optional
 -modules\rostests\winetests\powrprof\powrprof_winetest.exe                  7   optional
 -modules\rostests\winetests\psapi\psapi_winetest.exe                        7   optional
 -modules\rostests\winetests\riched20\riched20_winetest.exe                  7   optional
 -modules\rostests\winetests\rpcrt4\rpcrt4_winetest.exe                      7   optional
 -modules\rostests\winetests\rsabase\rsabase_winetest.exe                    7   optional
 -modules\rostests\winetests\rsaenh\rsaenh_winetest.exe                      7   optional
 -modules\rostests\winetests\schannel\schannel_winetest.exe                  7   optional
 -modules\rostests\winetests\secur32\secur32_winetest.exe                    7   optional
 -modules\rostests\winetests\setupapi\setupapi_winetest.exe                  7   optional
 -modules\rostests\winetests\shdocvw\shdocvw_winetest.exe                    7   optional
 -modules\rostests\winetests\shell32\shell32_winetest.exe                    7   optional
 -modules\rostests\winetests\shlwapi\shlwapi_winetest.exe                    7   optional
 -modules\rostests\winetests\urlmon\urlmon_winetest.exe                      7   optional
 -modules\rostests\winetests\user32\user32_winetest.exe                      7   optional
 -modules\rostests\winetests\usp10\usp10_winetest.exe                        7   optional
 -modules\rostests\winetests\uxtheme\uxtheme_winetest.exe                    7   optional
 -modules\rostests\winetests\version\version_winetest.exe                    7   optional
 -modules\rostests\winetests\winhttp\winhttp_winetest.exe                    7   optional
 -modules\rostests\winetests\wininet\wininet_winetest.exe                    7   optional
 -modules\wallpaper\lake.bmp                                                 4   optional
 +;modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr              1   optional
 +;modules\rosapps\applications\screensavers\matrix\matrix.scr                1   optional
 +;modules\rosapps\applications\screensavers\blankscr\scrnsave.scr            1   optional
 +;modules\rosapps\applications\screensavers\starfield\starfield.scr          1   optional
 +;modules\rosapps\applications\screensavers\mazescr\mazescr.scr              1   optional
 +;modules\rosapps\applications\screensavers\butterflies\butterflies.scr      1   optional
 +;modules\rosapps\applications\cmdutils\comp\comp.exe                                     1   optional
 +;modules\rosapps\applications\cmdutils\mode\mode.exe                                     1   optional
 +;modules\rosapps\applications\cmdutils\sort\sort.exe                                     1   optional
 +;modules\rosapps\applications\cmdutils\tee\tee.exe                                       1   optional
 +;modules\rosapps\applications\cmdutils\touch\touch.exe                                   1   optional
 +;modules\rosapps\applications\cmdutils\uptime\uptime.exe                                 1   optional
 +;modules\rosapps\applications\cmdutils\y\y.exe                                           1   optional
 +;modules\rosapps\applications\devutils\gdb2\gdb2.exe                                     1   optional
 +;modules\rosapps\applications\devutils\gdihv\gdihv.exe                                   1   optional
 +;modules\rosapps\applications\devutils\genguid\genguid.exe                               1   optional
 +;modules\rosapps\applications\devutils\gettype\gettype.exe                               1   optional
 +;modules\rosapps\applications\devutils\roswebparser\roswebparser.exe                     1   optional
 +;modules\rosapps\applications\devutils\zoomin\zoomin.exe                                 1   optional
 +;modules\rosapps\applications\downloader\downloader.exe                                  1   optional
 +;modules\rosapps\applications\downloader\downloader.xml                                  1   optional
 +;modules\rosapps\applications\fontview\fontview.exe                                      1   optional
 +;modules\rosapps\applications\imagesoft\imagesoft.exe                                    1   optional
 +;modules\rosapps\applications\net\ncftp\ncftp.exe                                        1   optional
 +;modules\rosapps\applications\net\netreg\netreg.exe                                      1   optional
 +;modules\rosapps\applications\net\niclist\niclist.exe                                    1   optional
 +;modules\rosapps\applications\net\roshttpd\roshttpd.exe                                      1   optional
 +;modules\rosapps\applications\notevil\notevil.exe                                        1   optional
 +;modules\rosapps\applications\magnify\magnify.exe                                        1   optional
 +;modules\rosapps\applications\packmgr\cmd-line\rosget.exe                                1   optional
 +;modules\rosapps\applications\packmgr\gui\packmgr.exe                                    1   optional
 +;modules\rosapps\applications\packmgr\lib\package.dll                                    1   optional
 +;modules\rosapps\applications\sysutils\chkdsk\chkdsk.exe                                 1   optional
 +;modules\rosapps\applications\sysutils\systeminfo\systeminfo.exe                         1   optional
 +;modules\rosapps\applications\sysutils\chklib\chklib.exe                                 1   optional
 +;modules\rosapps\applications\sysutils\ctm\ctm.exe                                       1   optional
 +;modules\rosapps\applications\sysutils\kill\kill.exe                                     1   optional
 +;modules\rosapps\applications\sysutils\lsdd\lsdd.exe                                     1   optional
 +;modules\rosapps\applications\sysutils\man\man.exe                                       1   optional
 +;modules\rosapps\applications\sysutils\pedump\pedump.exe                                 1   optional
 +;modules\rosapps\applications\sysutils\regexpl\regexpl.exe                               1   optional
 +;modules\rosapps\applications\sysutils\tcat\tcat.exe                                     1   optional
 +;modules\rosapps\applications\sysutils\tlist\tlist.exe                                   1   optional
 +;modules\rosapps\applications\sysutils\screenshot\screenshot.exe                                  1   optional
 +;modules\rosapps\applications\sysutils\utils\binpatch\binpatch.exe                       1   optional
 +;modules\rosapps\applications\sysutils\utils\cat\cat.exe                                 1   optional
 +;modules\rosapps\applications\sysutils\utils\driver\load\load.exe                        1   optional
 +;modules\rosapps\applications\sysutils\utils\driver\unload\unload.exe                    1   optional
 +;modules\rosapps\applications\sysutils\utils\infinst\infinst.exe                         1   optional
 +;modules\rosapps\applications\sysutils\utils\nts2w32err\nts2w32err.exe                   1   optional
 +;modules\rosapps\applications\sysutils\utils\objdir\objdir.exe                           1   optional
 +;modules\rosapps\applications\sysutils\utils\partinfo\partinfo.exe                       1   optional
 +;modules\rosapps\applications\sysutils\utils\ps\ps.exe                                   1   optional
 +;modules\rosapps\applications\sysutils\utils\rosperf\rosperf.exe                         1   optional
 +;modules\rosapps\applications\sysutils\utils\stats\stats.exe                             1   optional
 +;modules\rosapps\applications\sysutils\utils\tickcount\tickcount.exe                     1   optional
 +;modules\rosapps\applications\winfile\winfile.exe                                        1   optional
 +;modules\rosapps\applications\winver\winver.exe                                          1   optional
 +;modules\rosapps\applications\write\write.exe                                            1   optional
 +;modules\rosapps\demos\ddraw\ddraw_demo.exe                                 1   optional
 +;modules\rosapps\demos\maze\maze.exe                                        1   optional
 +;modules\rosapps\dflat32\edit.exe                                           1   optional
 +;modules\rosapps\drivers\avtest\avtest.sys                                  1   optional
 +;modules\rosapps\drivers\green\green.sys                                    1   optional
 +;modules\rosapps\templates\dialog\dialog.exe                                       1   optional
 +;modules\rostests\winetests\advapi32\advapi32_winetest.exe                  7   optional
 +;modules\rostests\winetests\advpack\advpack_winetest.exe                    7   optional
 +;modules\rostests\winetests\browseui\browseui_winetest.exe                  7   optional
 +;modules\rostests\winetests\cabinet\cabinet_winetest.exe                    7   optional
 +;modules\rostests\winetests\comcat\comcat_winetest.exe                      7   optional
 +;modules\rostests\winetests\comctl32\comctl32_winetest.exe                  7   optional
 +;modules\rostests\winetests\comdlg32\comdlg32_winetest.exe                  7   optional
 +;modules\rostests\winetests\gdi32\gdi32_winetest.exe                        7   optional
 +;modules\rostests\winetests\gdiplus\gdiplus_winetest.exe                    7   optional
 +;modules\rostests\winetests\hlink\hlink_winetest.exe                        7   optional
 +;modules\rostests\winetests\icmp\icmp_winetest.exe                          7   optional
 +;modules\rostests\winetests\kernel32\kernel32_winetest.exe                  7   optional
 +;modules\rostests\winetests\lz32\lz32_winetest.exe                          7   optional
 +;modules\rostests\winetests\mapi32\mapi32_winetest.exe                      7   optional
 +;modules\rostests\winetests\mlang\mlang_winetest.exe                        7   optional
 +;modules\rostests\winetests\mshtml\mshtml_winetest.exe                      7   optional
 +;modules\rostests\winetests\msi\msi_winetest.exe                            7   optional
 +;modules\rostests\winetests\mstask\mstask_winetest.exe                      7   optional
 +;modules\rostests\winetests\msvcrt\msvcrt_winetest.exe                      7   optional
 +;modules\rostests\winetests\netapi32\netapi32_winetest.exe                  7   optional
 +;modules\rostests\winetests\ntdll\ntdll_winetest.exe                        7   optional
 +;modules\rostests\winetests\odbccp32\odbccp32_winetest.exe                  7   optional
 +;modules\rostests\winetests\ole32\ole32_winetest.exe                        7   optional
 +;modules\rostests\winetests\oleaut32\oleaut32_winetest.exe                  7   optional
 +;modules\rostests\winetests\powrprof\powrprof_winetest.exe                  7   optional
 +;modules\rostests\winetests\psapi\psapi_winetest.exe                        7   optional
 +;modules\rostests\winetests\riched20\riched20_winetest.exe                  7   optional
 +;modules\rostests\winetests\rpcrt4\rpcrt4_winetest.exe                      7   optional
 +;modules\rostests\winetests\rsabase\rsabase_winetest.exe                    7   optional
 +;modules\rostests\winetests\rsaenh\rsaenh_winetest.exe                      7   optional
 +;modules\rostests\winetests\schannel\schannel_winetest.exe                  7   optional
 +;modules\rostests\winetests\secur32\secur32_winetest.exe                    7   optional
 +;modules\rostests\winetests\setupapi\setupapi_winetest.exe                  7   optional
 +;modules\rostests\winetests\shdocvw\shdocvw_winetest.exe                    7   optional
 +;modules\rostests\winetests\shell32\shell32_winetest.exe                    7   optional
 +;modules\rostests\winetests\shlwapi\shlwapi_winetest.exe                    7   optional
 +;modules\rostests\winetests\urlmon\urlmon_winetest.exe                      7   optional
 +;modules\rostests\winetests\user32\user32_winetest.exe                      7   optional
 +;modules\rostests\winetests\usp10\usp10_winetest.exe                        7   optional
 +;modules\rostests\winetests\uxtheme\uxtheme_winetest.exe                    7   optional
 +;modules\rostests\winetests\version\version_winetest.exe                    7   optional
 +;modules\rostests\winetests\winhttp\winhttp_winetest.exe                    7   optional
 +;modules\rostests\winetests\wininet\wininet_winetest.exe                    7   optional
 +;modules\wallpaper\lake.bmp                                                 4   optional
  
  ; Native libraries
 -modules\windows\mfc42.dll                                                  1   optional
 -modules\windows\vmx_fb.dll                                                 1   optional
 -modules\windows\vmx_mode.dll                                               1   optional
 -modules\windows\vmx_svga.sys                                               2   optional
 -modules\windows\vmx_svga.inf                                               6   optional
 -modules\windows\kvmnet.sys                                                 2   optional
 -modules\windows\kvmnet.inf                                                 6   optional
 +;modules\windows\mfc42.dll                                                  1   optional
 +;modules\windows\vmx_fb.dll                                                 1   optional
 +;modules\windows\vmx_mode.dll                                               1   optional
 +;modules\windows\vmx_svga.sys                                               2   optional
 +;modules\windows\vmx_svga.inf                                               6   optional
 +;modules\windows\kvmnet.sys                                                 2   optional
 +;modules\windows\kvmnet.inf                                                 6   optional
@@@ -2913,7 -2913,7 +2913,7 @@@ CdRomDeviceControlCompletion
                                              srb,
                                              irpStack->MajorFunction,
                                              irpStack->Parameters.DeviceIoControl.IoControlCode,
-                                                                                       MAXIMUM_RETRIES - ((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1),
+                                             MAXIMUM_RETRIES - ((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1),
                                              &status);
  
          DebugPrint((2, "CdRomDeviceControlCompletion: IRP will %sbe retried\n",
  
          if (retry && (realIrpNextStack->Parameters.Others.Argument1 = (PVOID)((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1-1))) {
  
              if (((ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1)) {
  
                  //
@@@ -5126,7 -5127,7 +5127,7 @@@ Return Value
          // The data buffer must be aligned.
          //
  
 -        srb->DataBuffer = (PVOID) (((ULONG) (context + 1) + (alignment - 1)) &
 +        srb->DataBuffer = (PVOID) (((ULONG_PTR) (context + 1) + (alignment - 1)) &
              ~(alignment - 1));
  
  
@@@ -5876,13 -5877,13 +5877,13 @@@ Return Value
          irpStack = IoGetCurrentIrpStackLocation(irp);
  
          if (irpStack->Parameters.Others.Argument3) {
 -            ULONG count;
 +            ULONG_PTR count;
  
              //
              // Decrement the countdown timer and put the IRP back in the list.
              //
  
-             count = (ULONG_PTR)irpStack->Parameters.Others.Argument3;
+             count = (ULONG_PTR) irpStack->Parameters.Others.Argument3;
              count--;
              irpStack->Parameters.Others.Argument3 = (PVOID) count;
  
@@@ -6496,7 -6497,7 +6497,7 @@@ Return Value
      PIO_STACK_LOCATION  irpStack;
      NTSTATUS            status;
      BOOLEAN             retry;
 -    ULONG               retryCount;
 +    ULONG_PTR           retryCount;
      ULONG               lastSector;
      PIRP                originalIrp;
      PCDROM_DATA         cddata;
@@@ -181,8 -181,29 +181,8 @@@ InterlockedBitTestAndReset(IN LONG vola
  #endif\r
  }\r
  \r
 -static __inline__ BOOLEAN\r
 -BitScanReverse(OUT ULONG *Index,\r
 -               IN ULONG Mask)\r
 -{\r
 -      BOOLEAN BitPosition = 0;\r
 -#if defined(_M_IX86)\r
 -      __asm__ __volatile__("bsrl %2,%0\n\t"\r
 -                           "setnz %1\n\t"\r
 -                           :"=&r" (*Index), "=q" (BitPosition)\r
 -                           :"rm" (Mask)\r
 -                           :"memory");\r
 -      return BitPosition;\r
 -#else\r
 -      /* Slow implementation for now */\r
 -      for( *Index = 31; *Index; (*Index)-- ) {\r
 -              if( (1<<*Index) & Mask ) {\r
 -                      return TRUE;\r
 -              }\r
 -      }\r
 -\r
 -      return FALSE;\r
 -#endif\r
 -}\r
 +#define BitScanForward _BitScanForward\r
 +#define BitScanReverse _BitScanReverse\r
  \r
  #endif\r
  \r
@@@ -565,144 -586,6 +565,6 @@@ typedef struct _SE_IMPERSONATION_STATE 
  #define SERVICE_DEMAND_START           0x00000003\r
  #define SERVICE_DISABLED               0x00000004\r
  \r
\r
\r
- //\r
- // Architecture Defined Contexts\r
- //\r
- #if defined(_M_IX86)\r
- #define SIZE_OF_80387_REGISTERS       80\r
- #define CONTEXT_i386  0x10000\r
- #define CONTEXT_i486  0x10000\r
- #define CONTEXT_CONTROL       (CONTEXT_i386|0x00000001L)\r
- #define CONTEXT_INTEGER       (CONTEXT_i386|0x00000002L)\r
- #define CONTEXT_SEGMENTS      (CONTEXT_i386|0x00000004L)\r
- #define CONTEXT_FLOATING_POINT        (CONTEXT_i386|0x00000008L)\r
- #define CONTEXT_DEBUG_REGISTERS       (CONTEXT_i386|0x00000010L)\r
- #define CONTEXT_EXTENDED_REGISTERS (CONTEXT_i386|0x00000020L)\r
- #define CONTEXT_FULL  (CONTEXT_CONTROL|CONTEXT_INTEGER|CONTEXT_SEGMENTS)\r
- #define MAXIMUM_SUPPORTED_EXTENSION  512\r
\r
- #define EXCEPTION_READ_FAULT    0\r
- #define EXCEPTION_WRITE_FAULT   1\r
- #define EXCEPTION_EXECUTE_FAULT 8\r
\r
- typedef struct _FLOATING_SAVE_AREA {\r
-     ULONG ControlWord;\r
-     ULONG StatusWord;\r
-     ULONG TagWord;\r
-     ULONG ErrorOffset;\r
-     ULONG ErrorSelector;\r
-     ULONG DataOffset;\r
-     ULONG DataSelector;\r
-     UCHAR RegisterArea[SIZE_OF_80387_REGISTERS];\r
-     ULONG Cr0NpxState;\r
- } FLOATING_SAVE_AREA, *PFLOATING_SAVE_AREA;\r
\r
- typedef struct _CONTEXT {\r
-     ULONG ContextFlags;\r
-     ULONG Dr0;\r
-     ULONG Dr1;\r
-     ULONG Dr2;\r
-     ULONG Dr3;\r
-     ULONG Dr6;\r
-     ULONG Dr7;\r
-     FLOATING_SAVE_AREA FloatSave;\r
-     ULONG SegGs;\r
-     ULONG SegFs;\r
-     ULONG SegEs;\r
-     ULONG SegDs;\r
-     ULONG Edi;\r
-     ULONG Esi;\r
-     ULONG Ebx;\r
-     ULONG Edx;\r
-     ULONG Ecx;\r
-     ULONG Eax;\r
-     ULONG Ebp;\r
-     ULONG Eip;\r
-     ULONG SegCs;\r
-     ULONG EFlags;\r
-     ULONG Esp;\r
-     ULONG SegSs;\r
-     UCHAR ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION];\r
- } CONTEXT;\r
\r
- #elif defined(_M_AMD64)\r
\r
- #define BitTest _bittest\r
- #define BitTest64 _bittest64\r
- #define BitTestAndComplement _bittestandcomplement\r
- #define BitTestAndComplement64 _bittestandcomplement64\r
- #define BitTestAndSet _bittestandset\r
- #define BitTestAndSet64 _bittestandset64\r
- #define BitTestAndReset _bittestandreset\r
- #define BitTestAndReset64 _bittestandreset64\r
- #define InterlockedBitTestAndSet _interlockedbittestandset\r
- #define InterlockedBitTestAndSet64 _interlockedbittestandset64\r
- #define InterlockedBitTestAndReset _interlockedbittestandreset\r
- #define InterlockedBitTestAndReset64 _interlockedbittestandreset64\r
\r
- #elif defined(_M_ARM)\r
\r
- //\r
- // FIXME: Move to armddk.h?\r
- //\r
\r
- /* The following flags control the contents of the CONTEXT structure. */\r
\r
- #define CONTEXT_ARM    0x0000040\r
- #define CONTEXT_CONTROL         (CONTEXT_ARM | 0x00000001L)\r
- #define CONTEXT_INTEGER         (CONTEXT_ARM | 0x00000002L)\r
\r
- #define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER)\r
\r
- typedef struct _CONTEXT {\r
-       /* The flags values within this flag control the contents of\r
-          a CONTEXT record.\r
\r
-          If the context record is used as an input parameter, then\r
-          for each portion of the context record controlled by a flag\r
-          whose value is set, it is assumed that that portion of the\r
-          context record contains valid context. If the context record\r
-          is being used to modify a thread's context, then only that\r
-          portion of the threads context will be modified.\r
\r
-          If the context record is used as an IN OUT parameter to capture\r
-          the context of a thread, then only those portions of the thread's\r
-          context corresponding to set flags will be returned.\r
\r
-          The context record is never used as an OUT only parameter. */\r
\r
-       ULONG ContextFlags;\r
\r
-       /* This section is specified/returned if the ContextFlags word contains\r
-          the flag CONTEXT_INTEGER. */\r
-       ULONG R0;\r
-       ULONG R1;\r
-       ULONG R2;\r
-       ULONG R3;\r
-       ULONG R4;\r
-       ULONG R5;\r
-       ULONG R6;\r
-       ULONG R7;\r
-       ULONG R8;\r
-       ULONG R9;\r
-       ULONG R10;\r
-       ULONG R11;\r
-       ULONG R12;\r
\r
-       ULONG Sp;\r
-       ULONG Lr;\r
-       ULONG Pc;\r
-       ULONG Psr;\r
- } CONTEXT;\r
\r
- #else\r
- #error "Undefined processor architecture"\r
- #endif\r
\r
\r
\r
  //\r
  // Exception Records\r
  //\r
@@@ -215,6 -215,10 +215,10 @@@ struct _COMPRESSED_DATA_INFO
  #define KERNEL_LARGE_STACK_SIZE             61440
  #define KERNEL_LARGE_STACK_COMMIT           12288
  
+ #define EXCEPTION_READ_FAULT    0
+ #define EXCEPTION_WRITE_FAULT   1
+ #define EXCEPTION_EXECUTE_FAULT 8
  #define DPFLTR_ERROR_LEVEL                  0
  #define DPFLTR_WARNING_LEVEL                1
  #define DPFLTR_TRACE_LEVEL                  2
@@@ -5448,6 -5452,58 +5452,58 @@@ typedef VOI
  
  #ifdef _X86_
  
+ #define SIZE_OF_80387_REGISTERS       80
+ #define CONTEXT_i386  0x10000
+ #define CONTEXT_i486  0x10000
+ #define CONTEXT_CONTROL       (CONTEXT_i386|0x00000001L)
+ #define CONTEXT_INTEGER       (CONTEXT_i386|0x00000002L)
+ #define CONTEXT_SEGMENTS      (CONTEXT_i386|0x00000004L)
+ #define CONTEXT_FLOATING_POINT        (CONTEXT_i386|0x00000008L)
+ #define CONTEXT_DEBUG_REGISTERS       (CONTEXT_i386|0x00000010L)
+ #define CONTEXT_EXTENDED_REGISTERS (CONTEXT_i386|0x00000020L)
+ #define CONTEXT_FULL  (CONTEXT_CONTROL|CONTEXT_INTEGER|CONTEXT_SEGMENTS)
+ #define MAXIMUM_SUPPORTED_EXTENSION  512
+ typedef struct _FLOATING_SAVE_AREA {
+     ULONG ControlWord;
+     ULONG StatusWord;
+     ULONG TagWord;
+     ULONG ErrorOffset;
+     ULONG ErrorSelector;
+     ULONG DataOffset;
+     ULONG DataSelector;
+     UCHAR RegisterArea[SIZE_OF_80387_REGISTERS];
+     ULONG Cr0NpxState;
+ } FLOATING_SAVE_AREA, *PFLOATING_SAVE_AREA;
+ typedef struct _CONTEXT {
+     ULONG ContextFlags;
+     ULONG Dr0;
+     ULONG Dr1;
+     ULONG Dr2;
+     ULONG Dr3;
+     ULONG Dr6;
+     ULONG Dr7;
+     FLOATING_SAVE_AREA FloatSave;
+     ULONG SegGs;
+     ULONG SegFs;
+     ULONG SegEs;
+     ULONG SegDs;
+     ULONG Edi;
+     ULONG Esi;
+     ULONG Ebx;
+     ULONG Edx;
+     ULONG Ecx;
+     ULONG Eax;
+     ULONG Ebp;
+     ULONG Eip;
+     ULONG SegCs;
+     ULONG EFlags;
+     ULONG Esp;
+     ULONG SegSs;
+     UCHAR ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION];
+ } CONTEXT;
  //
  // Types to use to contain PFNs and their counts.
  //
@@@ -5556,154 -5612,8 +5612,154 @@@ KeGetCurrentThread
  
  #define KI_USER_SHARED_DATA               0xffdf0000
  
 +#define PAGE_SIZE                         0x1000
 +#define PAGE_SHIFT                        12L
 +
 +#define SharedUserData                    ((KUSER_SHARED_DATA * CONST) KI_USER_SHARED_DATA)
 +
 +extern NTKERNELAPI PVOID MmHighestUserAddress;
 +extern NTKERNELAPI PVOID MmSystemRangeStart;
 +extern NTKERNELAPI ULONG_PTR MmUserProbeAddress;
 +
 +#define MM_HIGHEST_USER_ADDRESS           MmHighestUserAddress
 +#define MM_SYSTEM_RANGE_START             MmSystemRangeStart
 +#define MM_USER_PROBE_ADDRESS             MmUserProbeAddress
 +#define MM_LOWEST_USER_ADDRESS            (PVOID)0x10000
 +#define MM_LOWEST_SYSTEM_ADDRESS          (PVOID)0xC0C00000
 +
 +#define MM_KSEG0_BASE       MM_SYSTEM_RANGE_START
 +#define MM_SYSTEM_SPACE_END 0xFFFFFFFF
 +
  #elif defined(__x86_64__)
  
 +#define CONTEXT_AMD64 0x100000
 +#if !defined(RC_INVOKED)
 +#define CONTEXT_CONTROL (CONTEXT_AMD64 | 0x1L)
 +#define CONTEXT_INTEGER (CONTEXT_AMD64 | 0x2L)
 +#define CONTEXT_SEGMENTS (CONTEXT_AMD64 | 0x4L)
 +#define CONTEXT_FLOATING_POINT (CONTEXT_AMD64 | 0x8L)
 +#define CONTEXT_DEBUG_REGISTERS (CONTEXT_AMD64 | 0x10L)
 +
 +#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_FLOATING_POINT)
 +#define CONTEXT_ALL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS | CONTEXT_FLOATING_POINT | CONTEXT_DEBUG_REGISTERS)
 +
 +#define CONTEXT_EXCEPTION_ACTIVE 0x8000000
 +#define CONTEXT_SERVICE_ACTIVE 0x10000000
 +#define CONTEXT_EXCEPTION_REQUEST 0x40000000
 +#define CONTEXT_EXCEPTION_REPORTING 0x80000000
 +#endif
 +
 +typedef struct DECLSPEC_ALIGN(16) _M128A {
 +    ULONGLONG Low;
 +    LONGLONG High;
 +} M128A, *PM128A;
 +
 +typedef struct _XMM_SAVE_AREA32 {
 +    USHORT ControlWord;
 +    USHORT StatusWord;
 +    UCHAR TagWord;
 +    UCHAR Reserved1;
 +    USHORT ErrorOpcode;
 +    ULONG ErrorOffset;
 +    USHORT ErrorSelector;
 +    USHORT Reserved2;
 +    ULONG DataOffset;
 +    USHORT DataSelector;
 +    USHORT Reserved3;
 +    ULONG MxCsr;
 +    ULONG MxCsr_Mask;
 +    M128A FloatRegisters[8];
 +    M128A XmmRegisters[16];
 +    UCHAR Reserved4[96];
 +} XMM_SAVE_AREA32, *PXMM_SAVE_AREA32;
 +
 +typedef struct DECLSPEC_ALIGN(16) _CONTEXT {
 +    ULONG64 P1Home;
 +    ULONG64 P2Home;
 +    ULONG64 P3Home;
 +    ULONG64 P4Home;
 +    ULONG64 P5Home;
 +    ULONG64 P6Home;
 +
 +    /* Control flags */
 +    ULONG ContextFlags;
 +    ULONG MxCsr;
 +
 +    /* Segment */
 +    USHORT SegCs;
 +    USHORT SegDs;
 +    USHORT SegEs;
 +    USHORT SegFs;
 +    USHORT SegGs;
 +    USHORT SegSs;
 +    USHORT EFlags;
 +
 +    /* Debug */
 +    ULONG64 Dr0;
 +    ULONG64 Dr1;
 +    ULONG64 Dr2;
 +    ULONG64 Dr3;
 +    ULONG64 Dr6;
 +    ULONG64 Dr7;
 +
 +    /* Integer */
 +    ULONG64 Rax;
 +    ULONG64 Rcx;
 +    ULONG64 Rdx;
 +    ULONG64 Rbx;
 +    ULONG64 Rsp;
 +    ULONG64 Rbp;
 +    ULONG64 Rsi;
 +    ULONG64 Rdi;
 +    ULONG64 R8;
 +    ULONG64 R9;
 +    ULONG64 R10;
 +    ULONG64 R11;
 +    ULONG64 R12;
 +    ULONG64 R13;
 +    ULONG64 R14;
 +    ULONG64 R15;
 +
 +    /* Counter */
 +    ULONG64 Rip;
 +
 +   /* Floating point */
 +   union {
 +       XMM_SAVE_AREA32 FltSave;
 +       struct {
 +           M128A Header[2];
 +           M128A Legacy[8];
 +           M128A Xmm0;
 +           M128A Xmm1;
 +           M128A Xmm2;
 +           M128A Xmm3;
 +           M128A Xmm4;
 +           M128A Xmm5;
 +           M128A Xmm6;
 +           M128A Xmm7;
 +           M128A Xmm8;
 +           M128A Xmm9;
 +           M128A Xmm10;
 +           M128A Xmm11;
 +           M128A Xmm12;
 +           M128A Xmm13;
 +           M128A Xmm14;
 +           M128A Xmm15;
 +      } DUMMYSTRUCTNAME;
 +    } DUMMYUNIONNAME;
 +
 +     /* Vector */
 +    M128A VectorRegister[26];
 +    ULONG64 VectorControl;
 +
 +    /* Debug control */
 +    ULONG64 DebugControl;
 +    ULONG64 LastBranchToRip;
 +    ULONG64 LastBranchFromRip;
 +    ULONG64 LastExceptionToRip;
 +    ULONG64 LastExceptionFromRip;
 +} CONTEXT;
 +
  //
  // Types to use to contain PFNs and their counts.
  //
@@@ -5746,13 -5656,6 +5802,13 @@@ typedef LONG64 SPFN_NUMBER, *PSPFN_NUMB
  #define PDE_TOP     0xFFFFF6FB7FFFFFFFULL
  #define PTE_TOP     0xFFFFF6FFFFFFFFFFULL
  
 +extern NTKERNELAPI PVOID MmHighestUserAddress;
 +extern NTKERNELAPI PVOID MmSystemRangeStart;
 +extern NTKERNELAPI ULONG_PTR MmUserProbeAddress;
 +
 +#define MM_HIGHEST_USER_ADDRESS           MmHighestUserAddress
 +#define MM_SYSTEM_RANGE_START             MmSystemRangeStart
 +#define MM_USER_PROBE_ADDRESS             MmUserProbeAddress
  #define MM_LOWEST_USER_ADDRESS   (PVOID)0x10000
  #define MM_LOWEST_SYSTEM_ADDRESS (PVOID)0xFFFF080000000000ULL
  #define KI_USER_SHARED_DATA       0xFFFFF78000000000ULL
@@@ -5954,6 -5857,25 +6010,6 @@@ KeGetCurrentProcessorNumber(VOID
  #error Unknown architecture
  #endif
  
 -#define PAGE_SIZE                         0x1000
 -#define PAGE_SHIFT                        12L
 -
 -#define SharedUserData                    ((KUSER_SHARED_DATA * CONST) KI_USER_SHARED_DATA)
 -
 -extern NTKERNELAPI PVOID MmHighestUserAddress;
 -extern NTKERNELAPI PVOID MmSystemRangeStart;
 -extern NTKERNELAPI ULONG_PTR MmUserProbeAddress;
 -
 -#define MM_HIGHEST_USER_ADDRESS           MmHighestUserAddress
 -#define MM_SYSTEM_RANGE_START             MmSystemRangeStart
 -#define MM_USER_PROBE_ADDRESS             MmUserProbeAddress
 -#define MM_LOWEST_USER_ADDRESS            (PVOID)0x10000
 -#define MM_LOWEST_SYSTEM_ADDRESS          (PVOID)0xC0C00000
 -
 -#define MM_KSEG0_BASE       MM_SYSTEM_RANGE_START
 -#define MM_SYSTEM_SPACE_END 0xFFFFFFFF
 -
 -
  #define EFLAG_SIGN                        0x8000
  #define EFLAG_ZERO                        0x4000
  #define EFLAG_SELECT                      (EFLAG_SIGN | EFLAG_ZERO)
@@@ -6118,15 -6040,15 +6174,15 @@@ InterlockedExchangeAdd
  #define InterlockedCompareExchangePointer _InterlockedCompareExchangePointer
  #define InterlockedExchangePointer _InterlockedExchangePointer
  
 -#define ExInterlockedPopEntrySList(Head, Lock) ExpInterlockedPopEntrySList(Head)
 -#define ExInterlockedPushEntrySList(Head, Entry, Lock) ExpInterlockedPushEntrySList(Head, Entry)
 -#define ExInterlockedFlushSList(Head) ExpInterlockedFlushSList(Head)
 +//#define ExInterlockedPopEntrySList(Head, Lock) ExpInterlockedPopEntrySList(Head)
 +//#define ExInterlockedPushEntrySList(Head, Entry, Lock) ExpInterlockedPushEntrySList(Head, Entry)
 +//#define ExInterlockedFlushSList(Head) ExpInterlockedFlushSList(Head)
  
  #if !defined(_WINBASE_)
  #define InterlockedPopEntrySList(Head) ExpInterlockedPopEntrySList(Head)
  #define InterlockedPushEntrySList(Head, Entry) ExpInterlockedPushEntrySList(Head, Entry)
 -#define InterlockedFlushSList(Head) ExpInterlockedFlushSList(Head)
 -#define QueryDepthSList(Head) ExQueryDepthSList(Head)
 +//#define InterlockedFlushSList(Head) ExpInterlockedFlushSList(Head)
 +//#define QueryDepthSList(Head) ExQueryDepthSList(Head)
  #endif // !defined(_WINBASE_)
  
  #endif // _M_AMD64
@@@ -6855,18 -6777,12 +6911,18 @@@ NTAP
  RtlFreeUnicodeString(
    IN PUNICODE_STRING  UnicodeString);
  
 +#if (defined(_M_AMD64) || defined(_M_IA64)) && !defined(_REALLY_GET_CALLERS_CALLER_)
 +#define RtlGetCallersAddress(CallersAddress, CallersCaller) \
 +    *CallersAddress = (PVOID)_ReturnAddress(); \
 +    *CallersCaller = NULL;
 +#else
  NTSYSAPI
  VOID
  NTAPI
  RtlGetCallersAddress(
    OUT PVOID  *CallersAddress,
    OUT PVOID  *CallersCaller);
 +#endif
  
  NTSYSAPI
  NTSTATUS
@@@ -8989,12 -8905,6 +9045,6 @@@ NTAP
  IoGetRelatedDeviceObject(
    IN PFILE_OBJECT  FileObject);
  
- NTKERNELAPI
- ULONG
- NTAPI
- IoGetRemainingStackSize(
-   VOID);
  NTKERNELAPI
  VOID
  NTAPI
@@@ -9002,6 -8912,20 +9052,20 @@@ IoGetStackLimits
    OUT PULONG_PTR  LowLimit,
    OUT PULONG_PTR  HighLimit);
  
+ FORCEINLINE
+ ULONG_PTR
+ IoGetRemainingStackSize(
+   VOID
+ )
+ {
+     ULONG_PTR End, Begin;
+     ULONG_PTR Result;
+     IoGetStackLimits(&Begin, &End);
+     Result = (ULONG_PTR)(&End) - Begin;
+     return Result;
+ }
  NTKERNELAPI
  VOID
  NTAPI
@@@ -9373,12 -9297,11 +9437,12 @@@ IoReuseIrp
   *   IN PIRP  Irp,
   *   IN PDRIVER_CANCEL  CancelRoutine)
   */
 -#define IoSetCancelRoutine( Irp, NewCancelRoutine ) (  \
 - (PDRIVER_CANCEL)InterlockedExchange( (PLONG)&(Irp)->CancelRoutine, (LONG)(NewCancelRoutine) ) )
 -    
 -    
 -    /*
 +#define IoSetCancelRoutine(_Irp, \
 +                           _CancelRoutine) \
 +  ((PDRIVER_CANCEL) InterlockedExchangePointer( \
 +    (PVOID *) &(_Irp)->CancelRoutine, (PVOID) (_CancelRoutine)))
 +
 +/*
   * VOID
   * IoSetCompletionRoutine(
   *   IN PIRP  Irp,
@@@ -6,7 -6,7 +6,7 @@@
   */
  #define PLACE_IN_SECTION(s)   __attribute__((section (s)))
  #ifdef __GNUC__
- #define INIT_FUNCTION         PLACE_IN_SECTION("init")
+ #define INIT_FUNCTION         PLACE_IN_SECTION("INIT")
  #define PAGE_LOCKED_FUNCTION  PLACE_IN_SECTION("pagelk")
  #define PAGE_UNLOCKED_FUNCTION        PLACE_IN_SECTION("pagepo")
  #else
  #include "hal.h"
  #include "arch/intrin_i.h"
  
 +ULONG (*FrLdrDbgPrint)(const char *Format, ...);
 +
 +#include <pshpack1.h>
 +/*
 + * Defines a descriptor as it appears in the processor tables
 + */
 +typedef struct __DESCRIPTOR
 +{
 +  ULONG a;
 +  ULONG b;
 +} IDT_DESCRIPTOR, GDT_DESCRIPTOR;
 +
 +#include <poppack.h>
 +//extern GDT_DESCRIPTOR KiGdt[256];
 +
 +/*
 + * Initalization functions (called once by main())
 + */
 +BOOLEAN NTAPI ObInit(VOID);
 +BOOLEAN NTAPI CmInitSystem1(VOID);
 +VOID NTAPI CmShutdownSystem(VOID);
 +BOOLEAN NTAPI KdInitSystem(ULONG Reserved, PLOADER_PARAMETER_BLOCK LoaderBlock);
 +
 +/* FIXME - RtlpCreateUnicodeString is obsolete and should be removed ASAP! */
 +BOOLEAN FASTCALL
 +RtlpCreateUnicodeString(
 +   IN OUT PUNICODE_STRING UniDest,
 +   IN PCWSTR  Source,
 +   IN POOL_TYPE PoolType);
 +
 +VOID
 +NTAPI
 +RtlpLogException(IN PEXCEPTION_RECORD ExceptionRecord,
 +                 IN PCONTEXT ContextRecord,
 +                 IN PVOID ContextData,
 +                 IN ULONG Size);
 +
  /*
   * generic information class probing code
   */
@@@ -162,7 -125,6 +162,7 @@@ typedef struct _INFORMATION_CLASS_INF
  
  #endif
  
 +#ifndef _WIN64
  C_ASSERT(FIELD_OFFSET(KUSER_SHARED_DATA, SystemCall) == 0x300);
  C_ASSERT(FIELD_OFFSET(KTHREAD, InitialStack) == KTHREAD_INITIAL_STACK);
  C_ASSERT(FIELD_OFFSET(KTHREAD, Teb) == KTHREAD_TEB);
@@@ -177,8 -139,6 +177,8 @@@ C_ASSERT(FIELD_OFFSET(KPROCESS, Directo
  C_ASSERT(FIELD_OFFSET(KPCR, Tib.ExceptionList) == KPCR_EXCEPTION_LIST);
  
  C_ASSERT(FIELD_OFFSET(KPCR, Self) == KPCR_SELF);
 +#endif
 +
  #ifdef _M_IX86
  C_ASSERT(FIELD_OFFSET(KPCR, IRR) == KPCR_IRR);
  C_ASSERT(FIELD_OFFSET(KPCR, IDR) == KPCR_IDR);
@@@ -984,7 -984,7 +984,7 @@@ static void write_user_tfs(FILE *file, 
  {
      unsigned int start, absoff, flags;
      unsigned int align = 0, ualign = 0;
-     const char *name;
+     const char *name = NULL;
      type_t *utype = get_user_type(type, &name);
      size_t usize = user_type_has_variable_size(utype) ? 0 : type_memsize(utype, &ualign);
      size_t size = type_memsize(type, &align);
@@@ -2457,11 -2457,12 +2457,12 @@@ void write_typeformatstring(FILE *file
  static unsigned int get_required_buffer_size_type(
      const type_t *type, const char *name, unsigned int *alignment)
  {
+     const char *uname;
+     const type_t *utype;
      *alignment = 0;
-     if (is_user_type(type))
+     if ((utype = get_user_type(type, &uname)))
      {
-         const char *uname;
-         const type_t *utype = get_user_type(type, &uname);
          return get_required_buffer_size_type(utype, uname, alignment);
      }
      else
@@@ -2727,8 -2728,8 +2728,8 @@@ void print_phase_basetype(FILE *file, i
      }
  
      if (phase == PHASE_MARSHAL)
 -        print_file(file, indent, "MIDL_memset(_StubMsg.Buffer, 0, (0x%x - (long)_StubMsg.Buffer) & 0x%x);\n", alignment, alignment - 1);
 -    print_file(file, indent, "_StubMsg.Buffer = (unsigned char *)(((long)_StubMsg.Buffer + %u) & ~0x%x);\n",
 +        print_file(file, indent, "MIDL_memset(_StubMsg.Buffer, 0, (0x%x - (size_t)_StubMsg.Buffer) & 0x%x);\n", alignment, alignment - 1);
 +    print_file(file, indent, "_StubMsg.Buffer = (unsigned char *)(((size_t)_StubMsg.Buffer + %u) & ~0x%x);\n",
                  alignment - 1, alignment - 1);
  
      if (phase == PHASE_MARSHAL)
@@@ -3195,11 -3196,9 +3196,9 @@@ void declare_stub_args( FILE *file, in
              write_type_decl_left(file, var->type);
              fprintf(file, " ");
              if (var->type->declarray) {
-                 fprintf(file, "( *");
-                 write_name(file, var);
-                 fprintf(file, " )");
+                 fprintf(file, "(*%s)", get_name(var));
              } else
-                 write_name(file, var);
+                 fprintf(file, "%s", get_name(var));
              write_type_right(file, var->type, FALSE);
              fprintf(file, ";\n");
  
@@@ -3230,8 -3229,7 +3229,7 @@@ void assign_stub_out_args( FILE *file, 
  
          if (!in_attr)
          {
-             print_file(file, indent, "");
-             write_name(file, var);
+             print_file(file, indent, "%s", get_name(var));
  
              if (is_context_handle(var->type))
              {