sync to trunk revision 36100
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Mon, 20 Oct 2008 15:13:53 +0000 (15:13 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Mon, 20 Oct 2008 15:13:53 +0000 (15:13 +0000)
svn path=/branches/ros-amd64-bringup/; revision=36845

19 files changed:
1  2 
reactos/base/applications/msconfig/startuppage.c
reactos/boot/bootdata/packages/reactos.dff
reactos/boot/bootdata/txtsetup.sif
reactos/dll/ntdll/ldr/utils.c
reactos/dll/win32/advapi32/reg/reg.c
reactos/dll/win32/kernel32/thread/fiber.c
reactos/drivers/base/kdcom/kdcom.rbuild
reactos/drivers/network/ndis/ndis/io.c
reactos/include/psdk/prsht.h
reactos/include/psdk/winbase.h
reactos/include/psdk/winnt.h
reactos/include/reactos/idl/svcctl.idl
reactos/lib/3rdparty/libwine/debug.c
reactos/ntoskrnl/config/cmsysini.c
reactos/ntoskrnl/include/internal/cm.h
reactos/ntoskrnl/include/internal/mm.h
reactos/ntoskrnl/mm/mm.c
reactos/tools/rbuild/backend/mingw/modulehandler.cpp
reactos/tools/rbuild/module.cpp

@@@ -124,7 -124,7 +124,7 @@@ GetDisabledAutostartEntriesFromRegistr
                                  else if (!_tcscmp(szSubValueName, _T("item")))
                                      item.iSubItem = 0;
                                  if (item.iSubItem != -1)
-                                                               {
+                                 {
                                      GetLongPathName(Data, Data, (DWORD) _tcsclen(Data));
                                      item.pszText = Data;
                                      SendMessage(hStartupListCtrl, LVM_SETITEMTEXT, item.iItem, (LPARAM) &item);
@@@ -185,10 -185,10 +185,10 @@@ GetAutostartEntriesFromRegistry ( HKEY 
  
                      switch (PtrToLong(hRootKey))
                      {
 -                    case PtrToLong(HKEY_LOCAL_MACHINE):
 +                    case (((LONG_PTR)HKEY_LOCAL_MACHINE) & 0xff):
                          _tcscpy(Path, _T("HKLM\\\0"));
                          break;
 -                    case PtrToLong(HKEY_CURRENT_USER):
 +                    case (((LONG_PTR)HKEY_CURRENT_USER) & 0xff):
                          _tcscpy(Path, _T("HKCU\\\0"));
                          break;
                      default:
@@@ -30,657 -30,663 +30,663 @@@ 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\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\gdi32\gdi32.dll                           1
 -dll\win32\gdiplus\gdiplus.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\kernel32\kernel32.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\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\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\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\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\gdi32\gdi32.dll                           1
 +;dll\win32\gdiplus\gdiplus.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\kernel32\kernel32.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\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\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\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\DejaVuSansCondensed.ttf                 3
 -media\fonts\DejaVuSansCondensed-Bold.ttf            3
 -media\fonts\DejaVuSansCondensed-BoldOblique.ttf     3
 -media\fonts\DejaVuSansCondensed-Oblique.ttf         3
 -media\fonts\DejaVuSans-ExtraLight.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\DejaVuSerifCondensed.ttf                3
 -media\fonts\DejaVuSerifCondensed-Bold.ttf           3
 -media\fonts\DejaVuSerifCondensed-BoldItalic.ttf     3
 -media\fonts\DejaVuSerifCondensed-Italic.ttf         3
 -media\fonts\DejaVuSerif-Italic.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\tahoma.ttf                              3
 -media\fonts\tahomabd.ttf                            3
 -
 -media\fonts\c0419bt_.ttf                            3
 -media\fonts\c0582bt_.ttf                            3
 -media\fonts\c0583bt_.ttf                            3
 -media\fonts\c0611bt_.ttf                            3
 -media\fonts\c0632bt_.ttf                            3
 -media\fonts\c0633bt_.ttf                            3
 -media\fonts\c0648bt_.ttf                            3
 -media\fonts\c0649bt_.ttf                            3
 -media\fonts\courbi.ttf                              3
 -media\fonts\courb.ttf                               3
 -media\fonts\cour.ttf                                3
 -media\fonts\helb____.ttf                            3
 -media\fonts\Marlett.ttf                             3
 -media\fonts\timr____.ttf                            3
 -media\fonts\UTBI____.ttf                            3
 -media\fonts\UTB_____.ttf                            3
 -media\fonts\UTI_____.ttf                            3
 -media\fonts\UTRG____.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\DejaVuSansCondensed.ttf                 3
 +;media\fonts\DejaVuSansCondensed-Bold.ttf            3
 +;media\fonts\DejaVuSansCondensed-BoldOblique.ttf     3
 +;media\fonts\DejaVuSansCondensed-Oblique.ttf         3
 +;media\fonts\DejaVuSans-ExtraLight.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\DejaVuSerifCondensed.ttf                3
 +;media\fonts\DejaVuSerifCondensed-Bold.ttf           3
 +;media\fonts\DejaVuSerifCondensed-BoldItalic.ttf     3
 +;media\fonts\DejaVuSerifCondensed-Italic.ttf         3
 +;media\fonts\DejaVuSerif-Italic.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\tahoma.ttf                              3
 +;media\fonts\tahomabd.ttf                            3
 +
 +;media\fonts\c0419bt_.ttf                            3
 +;media\fonts\c0582bt_.ttf                            3
 +;media\fonts\c0583bt_.ttf                            3
 +;media\fonts\c0611bt_.ttf                            3
 +;media\fonts\c0632bt_.ttf                            3
 +;media\fonts\c0633bt_.ttf                            3
 +;media\fonts\c0648bt_.ttf                            3
 +;media\fonts\c0649bt_.ttf                            3
 +;media\fonts\courbi.ttf                              3
 +;media\fonts\courb.ttf                               3
 +;media\fonts\cour.ttf                                3
 +;media\fonts\helb____.ttf                            3
 +;media\fonts\Marlett.ttf                             3
 +;media\fonts\timr____.ttf                            3
 +;media\fonts\UTBI____.ttf                            3
 +;media\fonts\UTB_____.ttf                            3
 +;media\fonts\UTI_____.ttf                            3
 +;media\fonts\UTRG____.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\csr\csr.exe                              1   optional
 -subsystems\csr\csrsrv\csrsrv.dll                    1   optional
 -subsystems\win\basesrv\basesrv.dll                  1   optional
 -subsystems\win\winsrv\winsrv.dll                    1   optional
 -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\csr\csr.exe                              1   optional
 +;subsystems\csr\csrsrv\csrsrv.dll                    1   optional
 +;subsystems\win\basesrv\basesrv.dll                  1   optional
 +;subsystems\win\winsrv\winsrv.dll                    1   optional
 +;subsystems\ntvdm\ntvdm.exe                          1
 +;subsystems\win32\win32k\win32k.sys                  1
  
  boot\bootdata\bootcdregtest\testboot.bat            7   optional
  tools\dbgprint\dbgprint.exe                         7   optional
  
  ; Modules
 -modules\os2\server\os2srv.dll                                              1   optional
 -modules\os2\dll\win32\doscalls\doscalls.dll                                1   optional
 -modules\posix\server\psxsrv.dll                                            1   optional
 -modules\posix\dll\win32\psxdll\psxdll.dll                                  1   optional
 -modules\rosky\dll\win32\libsky\libsky.dll                                  1   optional
 -modules\rosky\dll\win32\libskygi\libskygi.dll                              1   optional
 -modules\vms\server\vmssrv.dll                                              1   optional
 -modules\vms\dll\win32\vmsdll\vmsdll.dll                                    1   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\dosfsck\dosfsck.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\ramdrv\ramdrv.sys                                  1   optional
 -modules\rosapps\drivers\green\green.sys                                    1   optional
 -modules\rosapps\lib\dflat32\dflat32.dll                                    1   optional
 -modules\rosapps\templates\dialog.exe                                       1   optional
 -modules\rosapps\templates\mdi.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\os2\server\os2srv.dll                                              1   optional
 +;modules\os2\dll\win32\doscalls\doscalls.dll                                1   optional
 +;modules\posix\server\psxsrv.dll                                            1   optional
 +;modules\posix\dll\win32\psxdll\psxdll.dll                                  1   optional
 +;modules\rosky\dll\win32\libsky\libsky.dll                                  1   optional
 +;modules\rosky\dll\win32\libskygi\libskygi.dll                              1   optional
 +;modules\vms\server\vmssrv.dll                                              1   optional
 +;modules\vms\dll\win32\vmsdll\vmsdll.dll                                    1   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\dosfsck\dosfsck.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\ramdrv\ramdrv.sys                                  1   optional
 +;modules\rosapps\drivers\green\green.sys                                    1   optional
 +;modules\rosapps\lib\dflat32\dflat32.dll                                    1   optional
 +;modules\rosapps\templates\dialog.exe                                       1   optional
 +;modules\rosapps\templates\mdi.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\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\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
@@@ -22,7 -22,7 +22,7 @@@ c_1252.nls=,,,,,,,,,,,,
  cdfs.sys=,,,,,,x,,,,,,4
  cdrom.sys=,,,,,,x,,,,,,4
  class2.sys=,,,,,,x,,,,,,4
- kdcom.dll=,,,,,,,,,,,,4
+ kdcom.dll=,,,,,,,,,,,,2
  disk.sys=,,,,,,x,,,,,,4
  floppy.sys=,,,,,,x,,,,,,4
  i8042prt.sys=,,,,,,x,,,,,,4
@@@ -33,8 -33,8 +33,8 @@@ pci.sys=,,,,,,,,,,,,
  scsiport.sys=,,,,,,x,,,,,,4
  uniata.sys=,,,,,,,,,,,,4
  fastfat.sys=,,,,,,x,,,,,,4
 -ramdisk.sys=,,,,,,x,,,,,,4
 -ext2.sys=,,,,,,x,,,,,,4
 +;ramdisk.sys=,,,,,,x,,,,,,4
 +;ext2.sys=,,,,,,x,,,,,,4
  
  [HardwareIdsDatabase]
  *PNP0C08 = acpi
@@@ -267,7 -267,7 +267,7 @@@ LdrpInitializeTlsForProccess(VOID
                                                                &Size);
                 ASSERT(Module->TlsIndex < LdrpTlsCount);
                 TlsData = &LdrpTlsArray[Module->TlsIndex];
 -               TlsData->StartAddressOfRawData = (PVOID)TlsDirectory->StartAddressOfRawData;
 +               TlsData->StartAddressOfRawData = (PVOID)(ULONG_PTR)TlsDirectory->StartAddressOfRawData;
                 TlsData->TlsDataSize = TlsDirectory->EndAddressOfRawData - TlsDirectory->StartAddressOfRawData;
                 TlsData->TlsZeroSize = TlsDirectory->SizeOfZeroFill;
                 if (TlsDirectory->AddressOfCallBacks)
@@@ -470,7 -470,7 +470,7 @@@ LdrAddModuleEntry(PVOID ImageBase
    ASSERT(Module);
    memset(Module, 0, sizeof(LDR_DATA_TABLE_ENTRY));
    Module->DllBase = (PVOID)ImageBase;
 -  Module->EntryPoint = (PVOID)NTHeaders->OptionalHeader.AddressOfEntryPoint;
 +  Module->EntryPoint = (PVOID)(ULONG_PTR)NTHeaders->OptionalHeader.AddressOfEntryPoint;
    if (Module->EntryPoint != 0)
      Module->EntryPoint = (PVOID)((ULONG_PTR)Module->EntryPoint + (ULONG_PTR)Module->DllBase);
    Module->SizeOfImage = LdrpGetResidentSize(NTHeaders);
@@@ -650,38 -650,43 +650,43 @@@ LdrpMapDllImageFile(IN PWSTR SearchPat
                 0,
                 FullNtFileName.Buffer);
  
-   Status = NtReadFile(FileHandle,
-                       NULL,
-                       NULL,
-                       NULL,
-                       &IoStatusBlock,
-                       BlockBuffer,
-                       sizeof(BlockBuffer),
-                       NULL,
-                       NULL);
-   if (!NT_SUCCESS(Status))
+   if (!MapAsDataFile)
      {
-       DPRINT("Dll header read failed: Status = 0x%08lx\n", Status);
-       NtClose(FileHandle);
-       return Status;
-     }
-   /*
-    * Overlay DOS and NT headers structures to the
-    * buffer with DLL's header raw data.
-    */
-   DosHeader = (PIMAGE_DOS_HEADER) BlockBuffer;
-   NTHeaders = (PIMAGE_NT_HEADERS) (BlockBuffer + DosHeader->e_lfanew);
-   /*
-    * Check it is a PE image file.
-    */
-   if ((DosHeader->e_magic != IMAGE_DOS_SIGNATURE)
-       || (DosHeader->e_lfanew == 0L)
-       || (*(PULONG)(NTHeaders) != IMAGE_NT_SIGNATURE))
-     {
-       DPRINT("NTDLL format invalid\n");
-       NtClose(FileHandle);
  
-       return STATUS_UNSUCCESSFUL;
+       Status = NtReadFile(FileHandle,
+                           NULL,
+                           NULL,
+                           NULL,
+                           &IoStatusBlock,
+                           BlockBuffer,
+                           sizeof(BlockBuffer),
+                           NULL,
+                           NULL);
+       if (!NT_SUCCESS(Status))
+         {
+           DPRINT("Dll header read failed: Status = 0x%08lx\n", Status);
+           NtClose(FileHandle);
+           return Status;
+         }
+       /*
+        * Overlay DOS and NT headers structures to the
+        * buffer with DLL's header raw data.
+        */
+       DosHeader = (PIMAGE_DOS_HEADER) BlockBuffer;
+       NTHeaders = (PIMAGE_NT_HEADERS) (BlockBuffer + DosHeader->e_lfanew);
+       /*
+        * Check it is a PE image file.
+        */
+       if ((DosHeader->e_magic != IMAGE_DOS_SIGNATURE)
+           || (DosHeader->e_lfanew == 0L)
+           || (*(PULONG)(NTHeaders) != IMAGE_NT_SIGNATURE))
+         {
+           DPRINT("NTDLL format invalid\n");
+           NtClose(FileHandle);
+           return STATUS_UNSUCCESSFUL;
+         }
      }
  
    /*
@@@ -1046,8 -1051,8 +1051,8 @@@ LdrGetExportByOrdinal 
                      ? RVA(BaseAddress, ExFunctions[Ordinal - ExportDir->Base] )
                      : NULL);
  
 -        if (((ULONG)Function >= (ULONG)ExportDir) &&
 -            ((ULONG)Function < (ULONG)ExportDir + (ULONG)ExportDirSize))
 +        if (((ULONG_PTR)Function >= (ULONG_PTR)ExportDir) &&
 +            ((ULONG_PTR)Function < (ULONG_PTR)ExportDir + (ULONG_PTR)ExportDirSize))
            {
               DPRINT("Forward: %s\n", (PCHAR)Function);
               Function = LdrFixupForward((PCHAR)Function);
@@@ -1131,8 -1136,8 +1136,8 @@@ LdrGetExportByName(PVOID BaseAddress
            {
               Ordinal = ExOrdinals[Hint];
               Function = RVA(BaseAddress, ExFunctions[Ordinal]);
 -             if (((ULONG)Function >= (ULONG)ExportDir) &&
 -                 ((ULONG)Function < (ULONG)ExportDir + (ULONG)ExportDirSize))
 +             if (((ULONG_PTR)Function >= (ULONG_PTR)ExportDir) &&
 +                 ((ULONG_PTR)Function < (ULONG_PTR)ExportDir + (ULONG_PTR)ExportDirSize))
                 {
                    DPRINT("Forward: %s\n", (PCHAR)Function);
                    Function = LdrFixupForward((PCHAR)Function);
            {
               Ordinal = ExOrdinals[mid];
               Function = RVA(BaseAddress, ExFunctions[Ordinal]);
 -             if (((ULONG)Function >= (ULONG)ExportDir) &&
 -                 ((ULONG)Function < (ULONG)ExportDir + (ULONG)ExportDirSize))
 +             if (((ULONG_PTR)Function >= (ULONG_PTR)ExportDir) &&
 +                 ((ULONG_PTR)Function < (ULONG_PTR)ExportDir + (ULONG_PTR)ExportDirSize))
                 {
                    DPRINT("Forward: %s\n", (PCHAR)Function);
                    Function = LdrFixupForward((PCHAR)Function);
@@@ -2058,15 -2063,18 +2063,18 @@@ LdrpLoadModule(IN PWSTR SearchPath OPTI
            {
              *BaseAddress = ImageBase;
            }
-         /* Get and check the NT headers */
-         NtHeaders = RtlImageNtHeader(ImageBase);
-         if (NtHeaders == NULL)
+         if (!MappedAsDataFile)
            {
-             DPRINT1("RtlImageNtHeaders() failed\n");
-             NtUnmapViewOfSection (NtCurrentProcess (), ImageBase);
-             NtClose (SectionHandle);
-             RtlFreeUnicodeString(&FullDosName);
-             return STATUS_UNSUCCESSFUL;
+             /* Get and check the NT headers */
+             NtHeaders = RtlImageNtHeader(ImageBase);
+             if (NtHeaders == NULL)
+               {
+                 DPRINT1("RtlImageNtHeaders() failed\n");
+                 NtUnmapViewOfSection (NtCurrentProcess (), ImageBase);
+                 NtClose (SectionHandle);
+                 RtlFreeUnicodeString(&FullDosName);
+                 return STATUS_UNSUCCESSFUL;
+               }
            }
          DPRINT("Mapped %wZ at %x\n", &FullDosName, ImageBase);
          if (MappedAsDataFile)
@@@ -41,9 -41,9 +41,9 @@@ static VOID CloseDefaultKeys(VOID)
          NtClose(Handle);                                                       \
      }
  #define IsPredefKey(HKey)                                                      \
 -    (((ULONG)(HKey) & 0xF0000000) == 0x80000000)
 +    (((ULONG_PTR)(HKey) & 0xF0000000) == 0x80000000)
  #define GetPredefKeyIndex(HKey)                                                \
 -    ((ULONG)(HKey) & 0x0FFFFFFF)
 +    ((ULONG_PTR)(HKey) & 0x0FFFFFFF)
  
  static NTSTATUS OpenClassesRootKey(PHANDLE KeyHandle);
  static NTSTATUS OpenLocalMachineKey (PHANDLE KeyHandle);
@@@ -1180,6 -1180,13 +1180,13 @@@ RegDeleteKeyA (HKEY hKey
    HANDLE TargetKey;
    NTSTATUS Status;
  
+   /* Make sure we got a subkey */
+   if (!lpSubKey)
+   {
+     /* Fail */
+     return ERROR_INVALID_PARAMETER;
+   }
    Status = MapDefaultKey (&ParentKey,
                            hKey);
    if (!NT_SUCCESS(Status))
@@@ -1234,6 -1241,13 +1241,13 @@@ RegDeleteKeyW (HKEY hKey
    HANDLE TargetKey;
    NTSTATUS Status;
  
+   /* Make sure we got a subkey */
+   if (!lpSubKey)
+   {
+     /* Fail */
+     return ERROR_INVALID_PARAMETER;
+   }
    Status = MapDefaultKey (&ParentKey,
                            hKey);
    if (!NT_SUCCESS(Status))
@@@ -4070,17 -4084,24 +4084,24 @@@ RegQueryValueA (HKEY hKey
                              &ValueSize);
    if (ErrorCode == ERROR_SUCCESS)
      {
-       Value.Length = ValueSize;
-       RtlInitAnsiString (&AnsiString,
-                        NULL);
-       AnsiString.Buffer = lpValue;
-       AnsiString.MaximumLength = *lpcbValue;
-       RtlUnicodeStringToAnsiString (&AnsiString,
-                                   &Value,
-                                   FALSE);
+       if (lpValue != NULL)
+       {
+         Value.Length = ValueSize;
+         RtlInitAnsiString (&AnsiString,
+                          NULL);
+         AnsiString.Buffer = lpValue;
+         AnsiString.MaximumLength = *lpcbValue;
+         RtlUnicodeStringToAnsiString (&AnsiString,
+                                     &Value,
+                                     FALSE);
+         *lpcbValue = ValueSize;
+       }
+       else if (lpcbValue != NULL)
+       {
+           *lpcbValue = ValueSize;
+       }
      }
  
-   *lpcbValue = ValueSize;
    if (Value.Buffer != NULL)
      {
        RtlFreeHeap (ProcessHeap,
@@@ -84,6 -84,7 +84,7 @@@ ConvertThreadToFiberEx(LPVOID lpParamet
      }
  
      /* copy some contextual data from the thread to the fiber */
+     pfCurFiber->Parameter = lpParameter;
      pfCurFiber->ExceptionList = pTeb->Tib.ExceptionList;
      pfCurFiber->StackBase = pTeb->Tib.StackBase;
      pfCurFiber->StackLimit = pTeb->Tib.StackLimit;
@@@ -258,13 -259,6 +259,13 @@@ BaseFiberStartup(VOID
      DPRINT1("Starting Fiber\n");
      BaseThreadStartup((LPTHREAD_START_ROUTINE)Fiber->Context.Eax,
                        (LPVOID)Fiber->Context.Ebx);
 +#elif defined(__x86_64__)
 +    PFIBER Fiber = GetFiberData();
 +
 +    /* Call the Thread Startup Routine */
 +    DPRINT1("Starting Fiber\n");
 +    BaseThreadStartup((LPTHREAD_START_ROUTINE)Fiber->Context.Rax,
 +                      (LPVOID)Fiber->Context.Rbx);
  #else
  #warning Unknown architecture
      UNIMPLEMENTED;
@@@ -1,6 -1,6 +1,6 @@@
  <?xml version="1.0"?>
  <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
- <module name="kdcom" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32/drivers" installname="kdcom.dll">
+ <module name="kdcom" type="kernelmodedll" entrypoint="DriverEntry@8" installbase="system32" installname="kdcom.dll">
        <importlibrary definition="kdcom.spec.def"></importlibrary>
        <bootstrap installbase="$(CDOUTPUT)" nameoncd="kdcom.dll" />
        <include base="kdcom">.</include>
                                <file>kdbg.c</file>
                </directory>
        </if>
 +      <if property="ARCH" value="amd64">
 +              <directory name="i386">
 +                              <file>kdbg.c</file>
 +              </directory>
 +      </if>
        <file>kdcom.spec</file>
  </module>
@@@ -133,7 -133,7 +133,7 @@@ NdisImmediateReadPortUchar
      OUT PUCHAR      Data)
  {
    NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
 -  *Data = READ_PORT_UCHAR((PUCHAR)Port); // FIXME: What to do with WrapperConfigurationContext?
 +  *Data = READ_PORT_UCHAR(UlongToPtr(Port)); // FIXME: What to do with WrapperConfigurationContext?
  }
  
  \f
@@@ -148,7 -148,7 +148,7 @@@ NdisImmediateReadPortUlong
      OUT PULONG      Data)
  {
    NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
 -  *Data = READ_PORT_ULONG((PULONG)Port); // FIXME: What to do with WrapperConfigurationContext?
 +  *Data = READ_PORT_ULONG(UlongToPtr(Port)); // FIXME: What to do with WrapperConfigurationContext?
  }
  
  \f
@@@ -163,7 -163,7 +163,7 @@@ NdisImmediateReadPortUshort
      OUT PUSHORT     Data)
  {
    NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
 -  *Data = READ_PORT_USHORT((PUSHORT)Port); // FIXME: What to do with WrapperConfigurationContext?
 +  *Data = READ_PORT_USHORT(UlongToPtr(Port)); // FIXME: What to do with WrapperConfigurationContext?
  }
  
  \f
@@@ -178,7 -178,7 +178,7 @@@ NdisImmediateWritePortUchar
      IN  UCHAR       Data)
  {
    NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
 -  WRITE_PORT_UCHAR((PUCHAR)Port, Data); // FIXME: What to do with WrapperConfigurationContext?
 +  WRITE_PORT_UCHAR(UlongToPtr(Port), Data); // FIXME: What to do with WrapperConfigurationContext?
  }
  
  \f
@@@ -193,7 -193,7 +193,7 @@@ NdisImmediateWritePortUlong
      IN  ULONG       Data)
  {
    NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
 -  WRITE_PORT_ULONG((PULONG)Port, Data); // FIXME: What to do with WrapperConfigurationContext?
 +  WRITE_PORT_ULONG(UlongToPtr(Port), Data); // FIXME: What to do with WrapperConfigurationContext?
  }
  
  \f
@@@ -208,7 -208,7 +208,7 @@@ NdisImmediateWritePortUshort
      IN  USHORT      Data)
  {
    NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
 -  WRITE_PORT_USHORT((PUSHORT)Port, Data); // FIXME: What to do with WrapperConfigurationContext?
 +  WRITE_PORT_USHORT(UlongToPtr(Port), Data); // FIXME: What to do with WrapperConfigurationContext?
  }
  
  \f
@@@ -811,7 -811,7 +811,7 @@@ NdisMRegisterInterrupt
        return NDIS_STATUS_RESOURCE_CONFLICT;
      }
  
-   NDIS_DbgPrint(MIN_TRACE, ("Function failed\n"));
+   NDIS_DbgPrint(MIN_TRACE, ("Function failed. Status (0x%X).\n", Status));
    return NDIS_STATUS_FAILURE;
  }
  
@@@ -873,7 -873,7 +873,7 @@@ NdisMRegisterIoPortRange
    if(AddressSpace)
      {
        ASSERT(TranslatedAddress.u.HighPart == 0);
 -      *PortOffset = (PVOID) TranslatedAddress.u.LowPart;
 +      *PortOffset = (PVOID)(ULONG_PTR)TranslatedAddress.QuadPart;
        NDIS_DbgPrint(MAX_TRACE, ("Returning 0x%x\n", *PortOffset));
        return NDIS_STATUS_SUCCESS;
      }
@@@ -208,7 -208,10 +208,10 @@@ typedef const PROPSHEETPAGEW *LPCPROPSH
  typedef UINT(CALLBACK *LPFNPSPCALLBACKA)(HWND,UINT,LPPROPSHEETPAGEA);
  typedef UINT(CALLBACK *LPFNPSPCALLBACKW)(HWND,UINT,LPPROPSHEETPAGEW);
  typedef int(CALLBACK *PFNPROPSHEETCALLBACK)(HWND,UINT,LPARAM);
+ #ifndef _HPROPSHEETPAGE_DEFINED
+ #define _HPROPSHEETPAGE_DEFINED
  DECLARE_HANDLE(HPROPSHEETPAGE);
+ #endif /* _HPROPSHEETPAGE_DEFINED */
  typedef struct _PROPSHEETHEADERA {
        DWORD   dwSize;
        DWORD   dwFlags;
@@@ -287,8 -290,8 +290,8 @@@ typedef struct _PSHNOTIFY 
  HPROPSHEETPAGE WINAPI CreatePropertySheetPageA(LPCPROPSHEETPAGEA);
  HPROPSHEETPAGE WINAPI CreatePropertySheetPageW(LPCPROPSHEETPAGEW);
  BOOL WINAPI DestroyPropertySheetPage(HPROPSHEETPAGE);
 -int WINAPI PropertySheetA(LPCPROPSHEETHEADERA);
 -int WINAPI PropertySheetW(LPCPROPSHEETHEADERW);
 +INT_PTR WINAPI PropertySheetA(LPCPROPSHEETHEADERA);
 +INT_PTR WINAPI PropertySheetW(LPCPROPSHEETHEADERW);
  #define PropSheet_AddPage(d,p) SendMessage(d,PSM_ADDPAGE,0,(LPARAM)p)
  #define PropSheet_Apply(d) SendMessage(d,PSM_APPLY,0,0)
  #define PropSheet_CancelToClose(d) SendMessage(d,PSM_CANCELTOCLOSE,0,0)
@@@ -798,6 -798,8 +798,8 @@@ typedef struct _CRITICAL_SECTION 
        HANDLE LockSemaphore;
        ULONG_PTR SpinCount;
  } CRITICAL_SECTION,*PCRITICAL_SECTION,*LPCRITICAL_SECTION;
+ #ifndef _SYSTEMTIME_
+ #define _SYSTEMTIME_
  typedef struct _SYSTEMTIME {
        WORD wYear;
        WORD wMonth;
        WORD wSecond;
        WORD wMilliseconds;
  } SYSTEMTIME,*LPSYSTEMTIME,*PSYSTEMTIME;
+ #endif /* _SYSTEMTIME_ */
  #if (_WIN32_WINNT >= 0x0500)
  typedef WAITORTIMERCALLBACKFUNC WAITORTIMERCALLBACK ;
  #endif
@@@ -882,10 -885,6 +885,6 @@@ typedef enum _FINDEX_SEARCH_OPS 
        FindExSearchLimitToDevices,
        FindExSearchMaxSearchOp
  } FINDEX_SEARCH_OPS;
- typedef enum _ACL_INFORMATION_CLASS {
-       AclRevisionInformation=1,
-       AclSizeInformation
- } ACL_INFORMATION_CLASS;
  typedef struct tagHW_PROFILE_INFOA {
        DWORD dwDockInfo;
        CHAR szHwProfileGuid[HW_PROFILE_GUIDLEN];
@@@ -1974,7 -1973,7 +1973,7 @@@ BOOL WINAPI ReadEventLogW(HANDLE,DWORD,
  BOOL WINAPI ReadFile(HANDLE,PVOID,DWORD,PDWORD,LPOVERLAPPED);
  BOOL WINAPI ReadFileEx(HANDLE,PVOID,DWORD,LPOVERLAPPED,LPOVERLAPPED_COMPLETION_ROUTINE);
  BOOL WINAPI ReadFileScatter(HANDLE,FILE_SEGMENT_ELEMENT*,DWORD,LPDWORD,LPOVERLAPPED);
 -BOOL WINAPI ReadProcessMemory(HANDLE,PCVOID,PVOID,DWORD,PDWORD);
 +BOOL WINAPI ReadProcessMemory(HANDLE,PCVOID,PVOID,SIZE_T,SIZE_T*);
  #if (_WIN32_WINNT >= 0x0600)
  VOID WINAPI RecoveryFinished(BOOL);
  HRESULT WINAPI RecoveryInProgress(OUT PBOOL);
@@@ -140,39 -140,41 +140,39 @@@ typedef WCHAR *PWCHAR,*LPWCH,*PWCH,*NWP
  typedef CONST WCHAR *LPCWCH,*PCWCH,*LPCWSTR,*PCWSTR;
  typedef CHAR *PCHAR,*LPCH,*PCH,*NPSTR,*LPSTR,*PSTR;
  typedef CONST CHAR *LPCCH,*PCCH,*PCSTR,*LPCSTR;
 +typedef PWSTR *PZPWSTR;
 +typedef CONST PWSTR *PCZPWSTR;
 +typedef WCHAR UNALIGNED *LPUWSTR,*PUWSTR;
 +typedef PCWSTR *PZPCWSTR;
 +typedef CONST WCHAR UNALIGNED *LPCUWSTR,*PCUWSTR;
 +typedef PSTR *PZPSTR;
 +typedef CONST PSTR *PCZPSTR;
 +typedef PCSTR *PZPCSTR;
 +
 +#ifdef UNICODE
  #ifndef _TCHAR_DEFINED
  #define _TCHAR_DEFINED
 -#ifdef UNICODE
 -/*
 - * NOTE: This tests UNICODE, which is different from the _UNICODE define
 - *       used to differentiate standard C runtime calls.
 - */
 -typedef WCHAR TCHAR;
 -typedef WCHAR _TCHAR;
 -#else
 -typedef CHAR TCHAR;
 -typedef CHAR _TCHAR;
 -#endif
 +  typedef WCHAR TCHAR,*PTCHAR;
 +  typedef WCHAR TBYTE ,*PTBYTE;
  #endif
 -typedef TCHAR TBYTE,*PTCH,*PTBYTE;
 -typedef TCHAR *LPTCH,*PTSTR,*LPTSTR,*LP,*PTCHAR;
 -typedef const TCHAR *LPCTSTR;
 -#ifdef UNICODE
 -/*
 - * __TEXT is a private macro whose specific use is to force the expansion of a
 - * macro passed as an argument to the macro TEXT.  DO NOT use this
 - * macro within your programs.  It's name and function could change without
 - * notice.
 - */
 -#define __TEXT(q) L##q
 +  typedef LPWSTR LPTCH,PTCH,PTSTR,LPTSTR,LP,PTCHAR;
 +  typedef LPCWSTR PCTSTR,LPCTSTR;
 +  typedef LPUWSTR PUTSTR,LPUTSTR;
 +  typedef LPCUWSTR PCUTSTR,LPCUTSTR;
 +#define __TEXT(quote) L##quote
  #else
 -#define __TEXT(q) q
 +#ifndef _TCHAR_DEFINED
 +#define _TCHAR_DEFINED
 +  typedef char TCHAR,*PTCHAR;
 +  typedef unsigned char TBYTE ,*PTBYTE;
  #endif
 -/*
 - * UNICODE a constant string when UNICODE is defined, else returns the string
 - * unmodified.
 - * The corresponding macros  _TEXT() and _T() for mapping _UNICODE strings
 - * passed to C runtime functions are defined in mingw/tchar.h
 - */
 -#define TEXT(q) __TEXT(q)
 +  typedef LPSTR LPTCH,PTCH,PTSTR,LPTSTR,PUTSTR,LPUTSTR,PTCHAR;
 +  typedef LPCSTR PCTSTR,LPCTSTR,PCUTSTR,LPCUTSTR;
 +#define __TEXT(quote) quote
 +#endif
 +
 +#define TEXT(quote) __TEXT(quote)
 +
  typedef SHORT *PSHORT;
  typedef LONG *PLONG;
  #ifdef STRICT
@@@ -1518,9 -1520,6 +1518,9 @@@ typedef enu
  #define IMAGE_REL_BASED_HIGHLOW 3
  #define IMAGE_REL_BASED_HIGHADJ 4
  #define IMAGE_REL_BASED_MIPS_JMPADDR 5
 +#define IMAGE_REL_BASED_MIPS_JMPADDR16 9
 +#define IMAGE_REL_BASED_IA64_IMM64 9
 +#define IMAGE_REL_BASED_DIR64 10
  #define IMAGE_ARCHIVE_START_SIZE 8
  #define IMAGE_ARCHIVE_START "!<arch>\n"
  #define IMAGE_ARCHIVE_END "`\n"
@@@ -1795,6 -1794,7 +1795,7 @@@ typedef VOID (NTAPI *WORKERCALLBACKFUNC
  #define INCREF(x) ((((x)&~N_BTMASK)<<N_TSHIFT)|(IMAGE_SYM_DTYPE_POINTER<<N_BTSHFT)|((x)&N_BTMASK))
  #define DECREF(x) ((((x)>>N_TSHIFT)&~N_BTMASK)|((x)&N_BTMASK))
  #define TLS_MINIMUM_AVAILABLE 64
+ #define FLS_MAXIMUM_AVAILABLE 128
  #define REPARSE_GUID_DATA_BUFFER_HEADER_SIZE   FIELD_OFFSET(REPARSE_GUID_DATA_BUFFER, GenericReparseBuffer)
  #define MAXIMUM_REPARSE_DATA_BUFFER_SIZE 16384
  #define IO_REPARSE_TAG_RESERVED_ZERO 0
@@@ -1991,6 -1991,11 +1992,11 @@@ typedef struct _ACL 
        WORD AceCount;
        WORD Sbz2;
  } ACL,*PACL;
+ typedef enum _ACL_INFORMATION_CLASS
+ {
+   AclRevisionInformation = 1, 
+   AclSizeInformation
+ } ACL_INFORMATION_CLASS;
  typedef struct _ACL_REVISION_INFORMATION {
        DWORD AclRevision;
  } ACL_REVISION_INFORMATION;
@@@ -4492,11 -4497,7 +4498,11 @@@ static __inline__ PVOID GetCurrentFiber
  #elif defined (_M_AMD64)
  FORCEINLINE PVOID GetCurrentFiber(VOID)
  {
 +  #ifdef NONAMELESSUNION
 +    return (PVOID)__readgsqword(FIELD_OFFSET(NT_TIB, DUMMYUNIONNAME.FiberData));
 +  #else
      return (PVOID)__readgsqword(FIELD_OFFSET(NT_TIB, FiberData));
 +  #endif
  }
  #elif defined (_M_ARM)
      PVOID WINAPI GetCurrentFiber(VOID);
@@@ -4703,7 -4704,7 +4709,7 @@@ MemoryBarrier(VOID
      __asm__ __volatile__("xchgl %%eax, %[Barrier]" : : [Barrier] "m" (Barrier) : "memory");
  }
  #elif defined (_M_AMD64)
 -#define MemoryBarrier()
 +#define MemoryBarrier __faststorefence
  #elif defined(_M_PPC)
  #define MemoryBarrier()
  #elif defined(_M_ARM)
@@@ -15,14 -15,13 +15,13 @@@ const unsigned short SC_MAX_COMMENT_LEN
  const unsigned short SC_MAX_ARGUMENT_LENGTH = 1024;
  const unsigned short SC_MAX_ARGUMENTS = 1024;
  
- typedef unsigned long SECURITY_INFORMATION;
  typedef [handle] LPSTR SVCCTL_HANDLEA;
  typedef [handle] LPWSTR SVCCTL_HANDLEW;
 -typedef [context_handle] unsigned long SC_RPC_HANDLE;
 +typedef [context_handle] ULONG_PTR SC_RPC_HANDLE;
  typedef SC_RPC_HANDLE* LPSC_RPC_HANDLE;
  typedef [context_handle] PVOID SC_RPC_LOCK;
  typedef SC_RPC_LOCK* LPSC_RPC_LOCK;
 -typedef [context_handle] unsigned long SC_NOTIFY_RPC_HANDLE;
 +typedef [context_handle] ULONG_PTR SC_NOTIFY_RPC_HANDLE;
  typedef SC_NOTIFY_RPC_HANDLE* LPSC_NOTIFY_RPC_HANDLE;
  typedef [range(0, 1024 * 4)] DWORD BOUNDED_DWORD_4K;
  typedef BOUNDED_DWORD_4K* LPBOUNDED_DWORD_4K;
@@@ -187,7 -186,7 +186,7 @@@ typedef struct _SC_RPC_CONFIG_INFOA 
          [case(4)] LPSERVICE_FAILURE_ACTIONS_FLAG psfaf;
          [case(5)] LPSERVICE_SID_INFO pssid;
          [case(6)] LPSERVICE_RPC_REQUIRED_PRIVILEGES_INFO psrp;
-         [case(7)] LPSERVICE_PRESHUTDOWN_INFO psps;;
+         [case(7)] LPSERVICE_PRESHUTDOWN_INFO psps;
      };
  } SC_RPC_CONFIG_INFOA, *LPSC_RPC_CONFIG_INFOA;
  
@@@ -184,6 -184,8 +184,8 @@@ static void debug_init(void
  {
      char *wine_debug;
      DWORD dwLength;
+     /* GetEnvironmentVariableA will change LastError! */
+     DWORD LastError = GetLastError(); 
  
      if (nb_debug_options != -1) return;  /* already initialized */
      nb_debug_options = 0;
              free(wine_debug);
          }
      }
+     SetLastError(LastError);
  }
  
  /* varargs wrapper for funcs.dbg_vprintf */
@@@ -256,7 -259,7 +259,7 @@@ static char *get_temp_buffer( size_t si
      char *ret;
      int idx;
  
 -    idx = interlocked_xchg_add( &pos, 1 ) % (sizeof(list)/sizeof(list[0]));
 +    idx = InterlockedExchangeAdd( &pos, 1 ) % (sizeof(list)/sizeof(list[0]));
      if ((ret = realloc( list[idx], size ))) list[idx] = ret;
      return ret;
  }
@@@ -1080,7 -1080,7 +1080,7 @@@ CmpLoadHiveThread(IN PVOID StartContext
      PAGED_CODE();
      
      /* Get the hive index, make sure it makes sense */
 -    i = (ULONG)StartContext;
 +    i = PtrToUlong(StartContext);
      ASSERT(CmpMachineHiveList[i].Name != NULL);
     
      /* We were started */
@@@ -1275,7 -1275,7 +1275,7 @@@ CmpInitializeHiveList(IN USHORT Flag
                                        0,
                                        NULL,
                                        CmpLoadHiveThread,
 -                                      (PVOID)i);
 +                                      UlongToPtr(i));
          if (NT_SUCCESS(Status))
          {
              /* We don't care about the handle -- the thread self-terminates */
              }
              
              /* Check if we had to allocate a new hive */
-                       if (CmpMachineHiveList[i].Allocate)
+             if (CmpMachineHiveList[i].Allocate)
              {
                  /* Sync the new hive */
-                               //HvSyncHive((PHHIVE)(CmpMachineHiveList[i].CmHive2));
-                       }   
+                 //HvSyncHive((PHHIVE)(CmpMachineHiveList[i].CmHive2));
+             }
          }
          
          /* Check if we created a new hive */
@@@ -838,6 -838,12 +838,12 @@@ CmpAddToDelayedClose
      IN BOOLEAN LockHeldExclusively
  );
  
+ VOID
+ NTAPI
+ CmpArmDelayedCloseTimer(
+     VOID
+ );
  VOID
  NTAPI
  CmpRemoveFromDelayedClose(IN PCM_KEY_CONTROL_BLOCK Kcb);
@@@ -1277,7 -1283,7 +1283,7 @@@ CmpCreateEvent
  PVOID
  NTAPI
  CmpAllocate(
 -    IN ULONG Size,
 +    IN SIZE_T Size,
      IN BOOLEAN Paged,
      IN ULONG Tag
  );
@@@ -388,8 -388,6 +388,6 @@@ typedef VOI
      BOOLEAN Dirty
  );
  
- PMM_AVL_TABLE MmKernelAddressSpace;
  /* marea.c *******************************************************************/
  
  NTSTATUS
@@@ -1270,14 -1268,14 +1268,14 @@@ NTAP
  MmCreateProcessAddressSpace(
      IN ULONG MinWs,
      IN PEPROCESS Dest,
 -    IN PULONG DirectoryTableBase
 +    IN PULONG_PTR DirectoryTableBase
  );
  
  NTSTATUS
  NTAPI
  MmInitializeHandBuiltProcess(
      IN PEPROCESS Process,
 -    IN PULONG DirectoryTableBase
 +    IN PULONG_PTR DirectoryTableBase
  );
  
  
diff --combined reactos/ntoskrnl/mm/mm.c
@@@ -14,7 -14,7 +14,7 @@@
  
  /* GLOBALS *****************************************************************/
  
 -ULONG MmUserProbeAddress = 0;
 +ULONG_PTR MmUserProbeAddress = 0;
  PVOID MmHighestUserAddress = NULL;
  PBOOLEAN Mm64BitPhysicalAddress = FALSE;
  PVOID MmSystemRangeStart = NULL;
@@@ -22,6 -22,8 +22,8 @@@ ULONG MmReadClusterSize
  
  MM_STATS MmStats;
  
+ PMM_AVL_TABLE MmKernelAddressSpace;
  /* FUNCTIONS ****************************************************************/
  
  VOID
@@@ -450,7 -452,7 +452,7 @@@ NTSTATU
  NTAPI
  NtResetWriteWatch(IN HANDLE ProcessHandle,
                   IN PVOID BaseAddress,
 -                 IN ULONG RegionSize)
 +                 IN SIZE_T RegionSize)
  {
      UNIMPLEMENTED;
      return STATUS_NOT_IMPLEMENTED;
@@@ -174,6 -174,7 +174,7 @@@ MingwModuleHandler::InstanciateHandler 
                case MessageHeader:
                case IdlHeader:
                case EmbeddedTypeLib:
+               case BootSector:
                        handler = new MingwModuleHandler( module );
                        break;
                case BuildTool:
                        break;
                case KeyboardLayout:
                case KernelModeDLL:
+               case KernelModeDriver:
                        handler = new MingwKernelModeDLLModuleHandler ( module );
                        break;
                case NativeDLL:
                case Win32OCX:
                        handler = new MingwWin32OCXModuleHandler ( module );
                        break;
-               case KernelModeDriver:
-                       handler = new MingwKernelModeDriverModuleHandler ( module );
-                       break;
                case BootLoader:
                        handler = new MingwBootLoaderModuleHandler ( module );
                        break;
-               case BootSector:
-                       handler = new MingwBootSectorModuleHandler ( module );
-                       break;
                case BootProgram:
                        handler = new MingwBootProgramModuleHandler ( module );
                        break;
@@@ -265,33 -261,6 +261,6 @@@ MingwModuleHandler::GetBasename ( cons
        return "";
  }
  
- string
- MingwModuleHandler::GetExtraDependencies (
-       const FileLocation *file ) const
- {
-       string extension = GetExtension ( *file );
-       if ( extension == ".idl" || extension == ".IDL" )
-       {
-               const FileLocation *header;
-               switch ( module.type )
-               {
-                       case RpcServer: header = GetRpcServerHeaderFilename ( file ); break;
-                       case RpcClient: header = GetRpcClientHeaderFilename ( file ); break;
-                       case RpcProxy: header = GetRpcProxyHeaderFilename ( file ); break;
-                       case IdlHeader: header = GetIdlHeaderFilename ( file ); break;
-                       default: header = NULL; break;
-               }
-               if ( !header )
-                       return "";
-               string dependencies = backend->GetFullName ( *header );
-               delete header;
-               return " " + dependencies;
-       }
-       else
-               return "";
- }
  string
  MingwModuleHandler::GetCompilationUnitDependencies (
        const CompilationUnit& compilationUnit ) const
@@@ -440,8 -409,6 +409,8 @@@ MingwModuleHandler::GetObjectFilename 
                newExtension = ".rc";
        else if ( extension == ".spec" || extension == ".SPEC" )
                newExtension = ".stubs.o";
 +      else if ( extension == ".pspec" || extension == ".PSPEC" )
 +              newExtension = ".stubs.o";
        else if ( extension == ".idl" || extension == ".IDL" )
        {
                if ( module.type == RpcServer )
@@@ -1111,21 -1078,6 +1080,21 @@@ Rule winebuildKMRule ( "$(INTERMEDIATE)
                         "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c",
                         "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o",
                         "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
 +Rule winebuildPCRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
 +                       "\t$(ECHO_WINEBLD)\n"
 +                       "\t${gcc} -xc -E $(source) -I. > $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n"
 +                       "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n"
 +                       "$(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c: $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec $(WINEBUILD_TARGET)\n"
 +                       "\t$(ECHO_WINEBLD)\n"
 +                       "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).stubs.c --pedll $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec\n"
 +                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o: $(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c$(dependencies) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
 +                       "\t$(ECHO_CC)\n"
 +                       "\t${gcc} -o $@ $($(module_name)_CFLAGS)$(compiler_flags) -c $<\n",
 +                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec",
 +                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def",
 +                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.c",
 +                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).stubs.o",
 +                       "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)", NULL );
  Rule winebuildRule ( "$(INTERMEDIATE)$(SEP)$(source_dir)$(SEP)$(source_name_noext).spec.def: $(source)$(dependencies) $(WINEBUILD_TARGET) | $(INTERMEDIATE)$(SEP)$(source_dir)\n"
                       "\t$(ECHO_WINEBLD)\n"
                       "\t$(Q)$(WINEBUILD_TARGET) $(WINEBUILD_FLAGS) -o $(INTERMEDIATE)$(SEP)$(source_path)$(SEP)$(source_name_noext).spec.def --def -E $(source)\n"
@@@ -1311,7 -1263,6 +1280,7 @@@ MingwModuleHandler::GenerateCommands 
                { HostDontCare, TypeDontCare, ".mc", &wmcRule },
                { HostFalse, Kernel, ".spec", &winebuildKMRule },
                { HostFalse, KernelModeDLL, ".spec", &winebuildKMRule },
 +              { HostDontCare, TypeDontCare, ".pspec", &winebuildPCRule },
                { HostDontCare, TypeDontCare, ".spec", &winebuildRule },
                { HostDontCare, RpcServer, ".idl", &widlServerRule },
                { HostDontCare, RpcClient, ".idl", &widlClientRule },
  
        for ( i = 0; i < sizeof ( rules ) / sizeof ( rules[0] ); i++ )
        {
-               if ( rules[i].host != HostDontCare && rules[i].host != module.host )
+               if ( rules[i].host != HostDontCare && rules[i].host != ModuleHandlerInformations[module.type].DefaultHost )
                        continue;
                if ( rules[i].type != TypeDontCare && rules[i].type != module.type )
                        continue;
        {
                GenerateGccCommand ( &sourceFile,
                                     customRule,
-                                    GetCompilationUnitDependencies ( compilationUnit ) + GetExtraDependencies ( &sourceFile ) + extraDependencies );
+                                    GetCompilationUnitDependencies ( compilationUnit ) + extraDependencies );
        }
        else if ( customRule )
                customRule->Execute ( fMakefile, backend, module, &sourceFile, clean_files );
@@@ -1656,8 -1607,8 +1625,8 @@@ MingwModuleHandler::GenerateObjectFileT
  
        if ( pchFilename )
        {
-               string cc = ( module.host == HostTrue ? "${host_gcc}" : "${gcc}" );
-               string cppc = ( module.host == HostTrue ? "${host_gpp}" : "${gpp}" );
+               string cc = ( ModuleHandlerInformations[module.type].DefaultHost == HostTrue ? "${host_gcc}" : "${gcc}" );
+               string cppc = ( ModuleHandlerInformations[module.type].DefaultHost == HostTrue ? "${host_gpp}" : "${gpp}" );
  
                const FileLocation& baseHeaderFile = *module.pch->file;
                CLEAN_FILE ( *pchFilename );
@@@ -1867,7 -1818,7 +1836,7 @@@ MingwModuleHandler::GenerateOtherMacro
                &module.linkerFlags,
                used_defs );
  
-       if ( module.host == HostFalse )
+       if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse )
        {
                GenerateMacros (
                        "+=",
        }
  
        string globalCflags = "";
-       if ( module.host == HostFalse )
+       if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse )
                globalCflags += " $(PROJECT_CFLAGS)";
        else
                globalCflags += " -Wall -Wpointer-arith -D__REACTOS__";
                globalCflags += " -pipe";
        if ( !module.allowWarnings )
                globalCflags += " -Werror";
-       if ( module.host == HostTrue )
+       if ( ModuleHandlerInformations[module.type].DefaultHost == HostTrue )
        {
                if ( module.cplusplus )
                        globalCflags += " $(HOST_CPPFLAGS)";
                cflagsMacro.c_str (),
                globalCflags.c_str () );
  
-       if ( module.host == HostFalse )
+       if ( ModuleHandlerInformations[module.type].DefaultHost == HostFalse )
        {
                fprintf (
                        fMakefile,
                linkDepsMacro.c_str (),
                libsMacro.c_str () );
  
-       string cflags = TypeSpecificCFlags();
-       if ( cflags.size() > 0 )
+       const char *cflags = ModuleHandlerInformations[module.type].cflags;
+       if ( strlen( cflags ) > 0 )
        {
                fprintf ( fMakefile,
                          "%s += %s\n\n",
                          cflagsMacro.c_str (),
-                         cflags.c_str () );
+                         cflags );
        }
  
-       string nasmflags = TypeSpecificNasmFlags();
-       if ( nasmflags.size () > 0 )
+       const char* nasmflags = ModuleHandlerInformations[module.type].nasmflags;
+       if ( strlen( nasmflags ) > 0 )
        {
                fprintf ( fMakefile,
                          "%s += %s\n\n",
                          nasmflagsMacro.c_str (),
-                         nasmflags.c_str () );
+                         nasmflags );
        }
  
-       string linkerflags = TypeSpecificLinkerFlags();
-       if ( linkerflags.size() > 0 )
+       const char *linkerflags = ModuleHandlerInformations[module.type].linkerflags;
+       if ( strlen( linkerflags ) > 0 )
        {
                fprintf ( fMakefile,
                          "%s += %s\n\n",
                          linkerflagsMacro.c_str (),
-                         linkerflags.c_str () );
+                         linkerflags );
        }
  
        if ( IsStaticLibrary ( module ) && module.isStartupLib )
@@@ -2124,7 -2075,7 +2093,7 @@@ MingwModuleHandler::GetDefaultDependenc
        string_list& dependencies ) const
  {
        /* Avoid circular dependency */
-       if ( module.host == HostTrue )
+       if ( ModuleHandlerInformations[module.type].DefaultHost == HostTrue )
                return;
  
        if (module.name != "psdk" && 
@@@ -2475,55 -2426,6 +2444,6 @@@ voi
  MingwKernelModeDLLModuleHandler::GenerateKernelModeDLLModuleTarget ()
  {
        string targetMacro ( GetTargetMacro ( module ) );
-       string workingDirectory = GetWorkingDirectory ( );
-       string linkDepsMacro = GetLinkingDependenciesMacro ();
-       GenerateImportLibraryTargetIfNeeded ();
-       if ( module.non_if_data.compilationUnits.size () > 0 )
-       {
-               GenerateRules ();
-               string dependencies = linkDepsMacro + " " + objectsMacro;
-               string linkerParameters = ssprintf ( "-subsystem=native -entry=%s -image-base=%s -file-alignment=0x1000 -section-alignment=0x1000 -shared",
-                                                    module.GetEntryPoint(!(Environment::GetArch() == "arm")).c_str (),
-                                                    module.baseaddress.c_str () );
-               GenerateLinkerCommand ( dependencies,
-                                       linkerParameters,
-                                       " -sections" );
-       }
-       else
-       {
-               GeneratePhonyTarget();
-       }
- }
- MingwKernelModeDriverModuleHandler::MingwKernelModeDriverModuleHandler (
-       const Module& module_ )
-       : MingwModuleHandler ( module_ )
- {
- }
- void
- MingwKernelModeDriverModuleHandler::AddImplicitLibraries ( Module& module )
- {
-       MingwAddDebugSupportLibraries ( module, DebugKernelMode );
- }
- void
- MingwKernelModeDriverModuleHandler::Process ()
- {
-       GenerateKernelModeDriverModuleTarget ();
- }
- void
- MingwKernelModeDriverModuleHandler::GenerateKernelModeDriverModuleTarget ()
- {
-       string targetMacro ( GetTargetMacro (module) );
        string workingDirectory = GetWorkingDirectory ();
        string linkDepsMacro = GetLinkingDependenciesMacro ();
  
@@@ -2703,6 -2605,8 +2623,8 @@@ MingwAddImplicitLibraries( Module &modu
                                links_to_crt = true;
                        }
                }
+               pLibrary = new Library ( module, "debugsup_ntdll" );
+               module.non_if_data.libraries.push_back(pLibrary);
                return;
        }
  
                pLibrary = new Library ( module, "msvcrt" );
                module.non_if_data.libraries.push_back ( pLibrary );
        }
+       pLibrary = new Library ( module, "debugsup_ntdll" );
+       module.non_if_data.libraries.push_back(pLibrary);
  }
  
  void
  MingwWin32DLLModuleHandler::AddImplicitLibraries ( Module& module )
  {
        MingwAddImplicitLibraries ( module );
-       MingwAddDebugSupportLibraries ( module, DebugUserMode );
  }
  
  void
@@@ -2774,7 -2680,6 +2698,6 @@@ voi
  MingwWin32OCXModuleHandler::AddImplicitLibraries ( Module& module )
  {
        MingwAddImplicitLibraries ( module );
-       MingwAddDebugSupportLibraries ( module, DebugUserMode );
  }
  
  void
@@@ -2823,7 -2728,6 +2746,6 @@@ voi
  MingwWin32CUIModuleHandler::AddImplicitLibraries ( Module& module )
  {
        MingwAddImplicitLibraries ( module );
-       MingwAddDebugSupportLibraries ( module, DebugUserMode );
  }
  
  void
@@@ -2872,7 -2776,6 +2794,6 @@@ voi
  MingwWin32GUIModuleHandler::AddImplicitLibraries ( Module& module )
  {
        MingwAddImplicitLibraries ( module );
-       MingwAddDebugSupportLibraries ( module, DebugUserMode );
  }
  
  void
@@@ -2978,35 -2881,6 +2899,6 @@@ MingwBootLoaderModuleHandler::GenerateB
  }
  
  
- MingwBootSectorModuleHandler::MingwBootSectorModuleHandler (
-       const Module& module_ )
-       : MingwModuleHandler ( module_ )
- {
- }
- void
- MingwBootSectorModuleHandler::Process ()
- {
-       GenerateBootSectorModuleTarget ();
- }
- void
- MingwBootSectorModuleHandler::GenerateBootSectorModuleTarget ()
- {
-       string objectsMacro = GetObjectsMacro ( module );
-       GenerateRules ();
-       fprintf ( fMakefile, ".PHONY: %s\n\n",
-                 module.name.c_str ());
-       fprintf ( fMakefile,
-                 "%s: %s\n",
-                 module.name.c_str (),
-                 objectsMacro.c_str () );
- }
  MingwBootProgramModuleHandler::MingwBootProgramModuleHandler (
        const Module& module_ )
        : MingwModuleHandler ( module_ )
@@@ -245,7 -245,6 +245,6 @@@ Module::Module ( const Project& project
          linkerScript (NULL),
          pch (NULL),
          cplusplus (false),
-         host (HostDefault),
          output (NULL),
          install (NULL)
  {
        else
                underscoreSymbols = false;
  
-       att = moduleNode.GetAttribute ( "host", false );
-       if ( att != NULL )
-       {
-               const char* p = att->value.c_str();
-               if ( !stricmp ( p, "true" ) || !stricmp ( p, "yes" ) )
-                       host = HostTrue;
-               else if ( !stricmp ( p, "false" ) || !stricmp ( p, "no" ) )
-                       host = HostFalse;
-               else
-               {
-                       throw InvalidAttributeValueException (
-                               moduleNode.location,
-                               "host",
-                               att->value );
-               }
-       }
        att = moduleNode.GetAttribute ( "isstartuplib", false );
        if ( att != NULL )
        {
                {
                        throw InvalidAttributeValueException (
                                moduleNode.location,
-                               "host",
+                               "isstartuplib",
                                att->value );
                }
        }
@@@ -1262,14 -1244,6 +1244,14 @@@ Module::GetEntryPoint(bool leadingUnder
                result = "_";
  
        result += entrypoint;
 +
 +      if (Environment::GetArch() == "amd64")
 +      {
 +              size_t at_index = result.find_last_of( '@' );
 +              if ( at_index != result.npos )
 +                      return result.substr (0, at_index );
 +      }
 +
        return result;
  }