Sync trunk r40500
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Thu, 16 Apr 2009 14:44:19 +0000 (14:44 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Thu, 16 Apr 2009 14:44:19 +0000 (14:44 +0000)
svn path=/branches/ros-amd64-bringup/; revision=40543

33 files changed:
1  2 
reactos/ReactOS-amd64.rbuild
reactos/base/shell/explorer/explorer.cpp
reactos/base/shell/explorer/shell/mainframe.cpp
reactos/base/shell/explorer/shell/shellbrowser.cpp
reactos/boot/bootdata/packages/reactos.dff
reactos/boot/freeldr/freeldr/windows/winldr.c
reactos/dll/directx/directx.rbuild
reactos/dll/win32/kernel32/process/proc.c
reactos/dll/win32/kernel32/process/procsup.c
reactos/dll/win32/user32/include/dde_private.h
reactos/dll/win32/user32/include/user32.h
reactos/dll/win32/user32/misc/dde.c
reactos/drivers/bus/isapnp/isapnp.c
reactos/drivers/network/afd/afd/listen.c
reactos/drivers/network/afd/afd/lock.c
reactos/drivers/network/afd/afd/main.c
reactos/drivers/network/ndis/ndis.rbuild
reactos/drivers/network/ndis/ndis/io.c
reactos/drivers/network/tcpip/tcpip/dispatch.c
reactos/drivers/wdm/audio/backpln/directory.rbuild
reactos/drivers/wdm/audio/backpln/portcls/irpstream.c
reactos/include/reactos/win32k/ntuser.h
reactos/lib/rtl/heap.c
reactos/ntoskrnl/ke/i386/ctxswitch.S
reactos/ntoskrnl/ke/spinlock.c
reactos/ntoskrnl/mm/section.c
reactos/subsystems/win32/win32k/eng/engwindow.c
reactos/subsystems/win32/win32k/ntuser/class.c
reactos/subsystems/win32/win32k/ntuser/hook.c
reactos/subsystems/win32/win32k/ntuser/menu.c
reactos/subsystems/win32/win32k/ntuser/misc.c
reactos/subsystems/win32/win32k/ntuser/painting.c
reactos/subsystems/win32/win32k/ntuser/simplecall.c

index c0876e5,0000000..00b456d
mode 100644,000000..100644
--- /dev/null
@@@ -1,339 -1,0 +1,342 @@@
-               <!-- directory name="ksfilter">
 +<?xml version="1.0"?>
 +<!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
 +<project name="ReactOS" makefile="makefile-amd64.auto" xmlns:xi="http://www.w3.org/2001/XInclude">
 +      <xi:include href="config-amd64.rbuild">
 +              <xi:fallback>
 +                      <xi:include href="config-amd64.template.rbuild" />
 +              </xi:fallback>
 +      </xi:include>
 +
 +      <define name="_M_AMD64" />
 +      <define name="_AMD64_" />
 +      <define name="_M_AXP64" />
 +      <define name="__x86_64__" />
 +      <!-- define name="_X86AMD64_" / FIXME: what is this used for? -->
 +      <define name="_WIN64" />
 +      <define name="TARGET_amd64" host="true" />
 +
 +      <define name="USE_COMPILER_EXCEPTIONS" />
 +
 +      <property name="PLATFORM" value="PC"/>
 +      <property name="usewrc" value="false"/>
 +      <property name="WINEBUILD_FLAGS" value="--kill-at"/>
 +      <property name="NTOSKRNL_SHARED" value="-shared"/>
 +
 +      <if property="OPTIMIZE" value="1">
 +              <compilerflag>-Os</compilerflag>
 +              <compilerflag>-ftracer</compilerflag>
 +              <compilerflag>-momit-leaf-frame-pointer</compilerflag>
 +      </if>
 +      <if property="OPTIMIZE" value="2">
 +              <compilerflag>-Os</compilerflag>
 +      </if>
 +      <if property="OPTIMIZE" value="3">
 +              <compilerflag>-O1</compilerflag>
 +      </if>
 +      <if property="OPTIMIZE" value="4">
 +              <compilerflag>-O2</compilerflag>
 +      </if>
 +      <if property="OPTIMIZE" value="5">
 +              <compilerflag>-O3</compilerflag>
 +      </if>
 +
 +      <compilerflag>-U_X86_</compilerflag>
 +      <compilerflag>-mpreferred-stack-boundary=4</compilerflag>
 +      <compilerflag>-fno-strict-aliasing</compilerflag>
 +      <compilerflag>-Wno-strict-aliasing</compilerflag>
 +      <compilerflag>-Wpointer-arith</compilerflag>
 +      <linkerflag>-disable-stdcall-fixup</linkerflag>
 +      <linkerflag>-static</linkerflag>
 +      <linkerflag>--unique=.eh_frame</linkerflag>
 +
 +<!-- Here starts <xi:include href="ReactOS-generic.rbuild" /> -->
 +
 +      <xi:include href="baseaddress.rbuild" />
 +
 +      <define name="__REACTOS__" />
 +      <if property="DBG" value="1">
 +              <define name="DBG">1</define>
 +              <define name="_SEH_ENABLE_TRACE" />
 +              <property name="DBG_OR_KDBG" value="true" />
 +      </if>
 +      <if property="KDBG" value="1">
 +              <define name="KDBG">1</define>
 +              <property name="DBG_OR_KDBG" value="true" />
 +      </if>
 +
 +      <!-- The version target valid values are: Nt4 , NT5 , NT51 -->
 +      <property name="VERSION_TARGET" value="NT52" />
 +
 +      <if property="VERSION_TARGET" value="NT4">
 +              <define name="WINVER" overridable="true">0x400</define>
 +              <define name="_WIN32_IE">0x600</define>
 +              <define name="_WIN32_WINNT" overridable="true">0x400</define>
 +              <define name="_WIN32_WINDOWS">0x400</define>
 +              <define name="_SETUPAPI_VER">0x400</define>
 +      </if>
 +
 +      <if property="VERSION_TARGET" value="NT5">
 +              <define name="WINVER" overridable="true">0x500</define>
 +              <define name="_WIN32_IE">0x600</define>
 +              <define name="_WIN32_WINNT" overridable="true">0x500</define>
 +              <define name="_WIN32_WINDOWS">0x500</define>
 +              <define name="_SETUPAPI_VER">0x500</define>
 +      </if>
 +
 +      <if property="VERSION_TARGET" value="NT51">
 +              <define name="WINVER" overridable="true">0x501</define>
 +              <define name="_WIN32_IE">0x600</define>
 +              <define name="_WIN32_WINNT" overridable="true">0x501</define>
 +              <define name="_WIN32_WINDOWS">0x501</define>
 +              <define name="_SETUPAPI_VER">0x501</define>
 +      </if>
 +
 +      <if property="VERSION_TARGET" value="NT52">
 +              <define name="WINVER" overridable="true">0x502</define>
 +              <define name="_WIN32_IE">0x600</define>
 +              <define name="_WIN32_WINNT" overridable="true">0x502</define>
 +              <define name="_WIN32_WINDOWS">0x502</define>
 +              <define name="_SETUPAPI_VER">0x502</define>
 +      </if>
 +
 +      <if property="VERSION_TARGET" value="NT6">
 +              <define name="WINVER" overridable="true">0x600</define>
 +              <define name="_WIN32_IE">0x600</define>
 +              <define name="_WIN32_WINNT" overridable="true">0x600</define>
 +              <define name="_WIN32_WINDOWS">0x600</define>
 +              <define name="_SETUPAPI_VER">0x600</define>
 +      </if>
 +
 +      <include>.</include>
 +      <include>include</include>
 +      <include root="intermediate">include</include>
 +      <include>include/psdk</include>
 +      <include root="intermediate">include/psdk</include>
 +      <include>include/dxsdk</include>
 +      <include root="intermediate">include/dxsdk</include>
 +      <include>include/crt</include>
 +      <include>include/crt/mingw32</include>
 +      <include>include/ddk</include>
 +      <include>include/GL</include>
 +      <include>include/ndk</include>
 +      <include>include/reactos</include>
 +      <include root="intermediate">include/reactos</include>
 +      <include root="intermediate">include/reactos/mc</include>
 +      <include>include/reactos/libs</include>
 +
 +      <include host="true">include</include>
 +      <include host="true" root="intermediate">include</include>
 +      <include host="true">include/reactos</include>
 +      <include host="true">include/reactos/wine</include>
 +
 +      <if property="USERMODE" value="1">
 +              <directory name="base">
 +                      <xi:include href="base/base.rbuild" />
 +              </directory>
 +
 +              <directory name="dll">
 +                      <xi:include href="dll/dll.rbuild" />
 +              </directory>
 +      </if>
 +
 +      <directory name="boot">
 +              <xi:include href="boot/boot.rbuild" />
 +      </directory>
 +
 +      <directory name="drivers">
 +              <directory name="bus">
 +                      <directory name="pci">
 +                              <xi:include href="drivers/bus/pci/pci.rbuild" />
 +                      </directory>
 +              </directory>
 +
 +              <!-- directory name="directx">
 +                      <xi:include href="drivers/directx/directory.rbuild" />
 +              </directory -->
 +
-               </directory -->
++              <directory name="ksfilter">
 +                      <xi:include href="drivers/ksfilter/directory.rbuild" />
-               <!-- directory name="wdm">
++              </directory>
 +
 +              <!-- directory name="multimedia">
 +                      <xi:include href="drivers/multimedia/directory.rbuild" />
 +              </directory -->
 +
 +              <directory name="parallel">
 +                      <xi:include href="drivers/parallel/directory.rbuild" />
 +              </directory>
 +
 +              <directory name="serial">
 +                      <xi:include href="drivers/serial/directory.rbuild" />
 +              </directory>
 +
 +              <!--directory name="usb">       
 +                      <xi:include href="drivers/usb/directory.rbuild" />
 +              </directory-->
 +      
 +              <!--directory name="video">
 +                      <xi:include href="drivers/video/directory.rbuild" />
 +              </directory-->
 +      
-               </directory -->
++              <directory name="wdm">
 +                      <xi:include href="drivers/wdm/wdm.rbuild" />
++              </directory>
 +
 +              <directory name="wmi">
 +                      <xi:include href="drivers/wmi/wmilib.rbuild" />
 +              </directory>
 +
 +              <directory name="base">
 +                      <xi:include href="drivers/base/directory.rbuild" />
 +              </directory>
 +              <directory name="filesystems">
 +                      <xi:include href="drivers/filesystems/directory.rbuild" />
 +              </directory>
 +              <directory name="input">
 +                      <xi:include href="drivers/input/directory.rbuild" />
 +              </directory>
 +              <directory name="network">
 +                      <xi:include href="drivers/network/directory.rbuild" />
 +              </directory>
 +              <directory name="setup">
 +                      <xi:include href="drivers/setup/directory.rbuild" />
 +              </directory>
 +              <directory name="storage">
 +                      <directory name="class">
 +                              <directory name="cdrom">
 +                                      <xi:include href="drivers/storage/class/cdrom/cdrom.rbuild" />
 +                              </directory>
 +                              <directory name="class2">
 +                                      <xi:include href="drivers/storage/class/class2/class2.rbuild" />
 +                              </directory>
 +                              <directory name="disk">
 +                                      <xi:include href="drivers/storage/class/disk/disk.rbuild" />
 +                              </directory>
 +                      </directory>
 +                      <directory name="floppy">
 +                              <xi:include href="drivers/storage/floppy/floppy.rbuild" />
 +                      </directory>
 +                      <directory name="ide">
 +                              <directory name="atapi">
 +                                      <xi:include href="drivers/storage/ide/atapi/atapi.rbuild" />
 +                              </directory>
 +                      </directory>
 +                      <directory name="port">
 +                              <xi:include href="drivers/storage/port/directory.rbuild" />
 +                      </directory>
 +                      <directory name="scsiport">
 +                              <xi:include href="drivers/storage/scsiport/scsiport.rbuild" />
 +                      </directory>
 +              </directory>
 +      </directory>
 +
 +      <directory name="hal">
 +              <xi:include href="hal/hal.rbuild" />
 +      </directory>
 +
 +      <directory name="include">
 +              <xi:include href="include/directory.rbuild" />
 +      </directory>
 +
 +      <directory name="lib">
 +              <directory name="3rdparty">
 +                      <directory name="adns">
 +                              <xi:include href="lib/3rdparty/adns/adns.rbuild" />
 +                      </directory>
 +                      <directory name="bzip2">
 +                              <xi:include href="lib/3rdparty/bzip2/bzip2.rbuild" />
 +                      </directory>
 +                      <directory name="expat">
 +                              <xi:include href="lib/3rdparty/expat/expat.rbuild" />
 +                      </directory>
 +                      <directory name="icu4ros">
 +                              <xi:include href="lib/3rdparty/icu4ros/icu4ros.rbuild" />
 +                      </directory>
++                      <directory name="libsamplerate">
++                              <xi:include href="lib/3rdparty/libsamplerate/libsamplerate.rbuild" />
++                      </directory>
 +                      <directory name="libwine">
 +                              <xi:include href="lib/3rdparty/libwine/libwine.rbuild" />
 +                      </directory>
 +                      <directory name="libxml2">
 +                              <xi:include href="lib/3rdparty/libxml2/libxml2.rbuild" />
 +                      </directory>
 +
 +                      <if property="USERMODE" value="1">
 +                              <directory name="mingw">
 +                                      <xi:include href="lib/3rdparty/mingw/mingw.rbuild" />
 +                              </directory>
 +                      </if>
 +                      <directory name="zlib">
 +                              <xi:include href="lib/3rdparty/zlib/zlib.rbuild" />
 +                      </directory>
 +              </directory>
 +              <directory name="sdk">
 +                      <xi:include href="lib/sdk/sdk.rbuild" />
 +              </directory>
 +              <directory name="cmlib">
 +                      <xi:include href="lib/cmlib/cmlib.rbuild" />
 +              </directory>
 +              <directory name="debugsup">
 +                      <xi:include href="lib/debugsup/debugsup.rbuild" />
 +              </directory>
 +              <directory name="drivers">
 +                      <xi:include href="lib/drivers/directory.rbuild" />
 +              </directory>
 +              <directory name="epsapi">
 +                      <xi:include href="lib/epsapi/epsapi.rbuild" />
 +              </directory>
 +              <directory name="fslib">
 +                      <xi:include href="lib/fslib/directory.rbuild" />
 +              </directory>
 +              <directory name="host">
 +                      <xi:include href="lib/host/directory.rbuild" />
 +              </directory>
 +              <directory name="inflib">
 +                      <xi:include href="lib/inflib/inflib.rbuild" />
 +              </directory>
 +              <directory name="nls">
 +                      <xi:include href="lib/nls/nls.rbuild" />
 +              </directory>
 +              <directory name="ntdllsys">
 +                      <xi:include href="lib/ntdllsys/ntdllsys.rbuild" />
 +              </directory>
 +              <directory name="pseh">
 +                      <xi:include href="lib/pseh/pseh.rbuild" />
 +              </directory>
 +              <directory name="recyclebin">
 +                      <xi:include href="lib/recyclebin/recyclebin.rbuild" />
 +              </directory>
 +              <directory name="rossym">
 +                      <xi:include href="lib/rossym/rossym.rbuild" />
 +              </directory>
 +              <directory name="rtl">
 +                      <xi:include href="lib/rtl/rtl.rbuild" />
 +              </directory>
 +              <directory name="smlib">
 +                      <xi:include href="lib/smlib/smlib.rbuild" />
 +              </directory>
 +              <directory name="win32ksys">
 +                      <xi:include href="lib/win32ksys/win32ksys.rbuild" />
 +              </directory>
 +      </directory>
 +
 +      <directory name="media">
 +              <xi:include href="media/media.rbuild" />
 +      </directory>
 +
 +      <directory name="ntoskrnl">
 +              <xi:include href="ntoskrnl/ntoskrnl.rbuild" />
 +      </directory>
 +
 +      <!-- directory name="subsystems">
 +              <xi:include href="subsystems/subsystems.rbuild" />
 +      </directory -->
 +
 +      <directory name="tools">
 +              <xi:include href="tools/tools.rbuild" />
 +      </directory>
 +
 +<!-- Here ends <xi:include href="ReactOS-generic.rbuild" /> -->
 +
 +</project>
@@@ -30,736 -30,729 +30,742 @@@ 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\lodctr\lodctr.exe            1
 -base\applications\cmdutils\more\more.exe                1
 -base\applications\cmdutils\xcopy\xcopy.exe              1
 -base\applications\control\control.exe                   1
 -base\applications\downloader\downloader.exe             1
 -base\applications\downloader\downloader.xml             1
 -base\applications\dxdiag\dxdiag.exe                     1
 -base\applications\fontview\fontview.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                             4
 -base\applications\kbswitch\kbswitch.exe                 1
 -base\applications\kbswitch\kbsdll\kbsdll.dll            1
 -base\applications\logoff\logoff.exe                     1
 -base\applications\magnify\magnify.exe                   1
 -base\applications\mplay32\mplay32.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\regedt32\regedt32.exe                 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                 4
 -base\applications\winver\winver.exe                     1
 -base\applications\wordpad\wordpad.exe                   1
 -base\applications\write\write.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\telnetd\telnetd.exe                   1
 -base\services\tcpsvcs\quotes                        5
 -base\services\umpnpmgr\umpnpmgr.exe                 1
 -base\services\wlansvc\wlansvc.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\lodctr\lodctr.exe            1
 +;base\applications\cmdutils\more\more.exe                1
 +;base\applications\cmdutils\xcopy\xcopy.exe              1
 +;base\applications\control\control.exe                   1
++;base\applications\downloader\downloader.exe             1
++;base\applications\downloader\downloader.xml             1
 +;base\applications\dxdiag\dxdiag.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                             4
 +;base\applications\kbswitch\kbswitch.exe                 1
 +;base\applications\kbswitch\kbsdll\kbsdll.dll            1
 +;base\applications\logoff\logoff.exe                     1
 +;base\applications\mplay32\mplay32.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\regedt32\regedt32.exe                 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                 4
 +;base\applications\wordpad\wordpad.exe                   1
++;base\applications\write\write.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\telnetd\telnetd.exe                   1
 +;base\services\tcpsvcs\quotes                        5
 +;base\services\umpnpmgr\umpnpmgr.exe                 1
 +;base\services\wlansvc\wlansvc.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\mesa32\mesa32.dll                      1
 -dll\3rdparty\libjpeg\libjpeg.dll                    1
 -dll\3rdparty\libxslt\libxslt.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\hdwwiz\hdwwiz.cpl                           1
 -dll\cpl\input\input.dll                             1
 -dll\cpl\intl\intl.cpl                               1
 -dll\cpl\joy\joy.cpl                                 1
 +;dll\3rdparty\mesa32\mesa32.dll                      1
 +;dll\3rdparty\libjpeg\libjpeg.dll                    1
 +;dll\3rdparty\libxslt\libxslt.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\hdwwiz\hdwwiz.cpl                           1
 +;dll\cpl\input\input.dll                             1
 +;dll\cpl\intl\intl.cpl                               1
 +;dll\cpl\joy\joy.cpl                                 1
  ;dll\cpl\liccpa\liccpa.cpl                          1
 -dll\cpl\main\main.cpl                               1
 -dll\cpl\mmsys\mmsys.cpl                             1
 -dll\cpl\ncpa\ncpa.cpl                               1
 +;dll\cpl\main\main.cpl                               1
 +;dll\cpl\mmsys\mmsys.cpl                             1
 +;dll\cpl\ncpa\ncpa.cpl                               1
  ;dll\cpl\odbccp32\odbccp32.cpl                      1
 -dll\cpl\powercfg\powercfg.cpl                       1
 -dll\cpl\sysdm\sysdm.cpl                             1
 +;dll\cpl\powercfg\powercfg.cpl                       1
 +;dll\cpl\sysdm\sysdm.cpl                             1
  ;dll\cpl\telephon\telephon.cpl                      1
 -dll\cpl\timedate\timedate.cpl                       1
 +;dll\cpl\timedate\timedate.cpl                       1
  ;dll\cpl\usrmgr\usrmgr.cpl                          1
  
 -dll\directx\amstream\amstream.dll                   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\wine\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\kbdcz\kbdcz.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\kbdlt1\kbdlt1.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\activeds\activeds.dll                     1
 -dll\win32\advapi32\advapi32.dll                     1
 -dll\win32\advpack\advpack.dll                       1
 -dll\win32\actxprxy\actxprxy.dll                     1
 -dll\win32\atl\atl.dll                               1
 -dll\win32\authz\authz.dll                           1
 -dll\win32\avifil32\avifil32.dll                     1
 -dll\win32\beepmidi\beepmidi.dll                     1
 -dll\win32\browseui\browseui.dll                     1
 -dll\win32\cabinet\cabinet.dll                       1
 -dll\win32\cards\cards.dll                           1
 -dll\win32\cfgmgr32\cfgmgr32.dll                     1
 -dll\win32\clusapi\clusapi.dll                       1
 -dll\win32\comcat\comcat.dll                         1
 -dll\win32\comctl32\comctl32.dll                     1
 -dll\win32\comdlg32\comdlg32.dll                     1
 -dll\win32\compstui\compstui.dll                     1
 -dll\win32\credui\credui.dll                         1
 -dll\win32\crtdll\crtdll.dll                         1
 -dll\win32\crypt32\crypt32.dll                       1
 -dll\win32\cryptdlg\cryptdlg.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\dwmapi\dwmapi.dll                         1
 -dll\win32\devmgr\devmgr.dll                         1
 -dll\win32\dhcpcsvc\dhcpcsvc.dll                     1
 -dll\win32\dnsapi\dnsapi.dll                         1
 -dll\win32\fmifs\fmifs.dll                           1
 -dll\win32\fusion\fusion.dll                         1
 -dll\win32\gdi32\gdi32.dll                           1
 -dll\win32\gdiplus\gdiplus.dll                       1
 -dll\win32\getuname\getuname.dll                     1
 -dll\win32\glu32\glu32.dll                           1
 -dll\win32\hhctrl.ocx\hhctrl.ocx                     1
 -dll\win32\hid\hid.dll                               1
 -dll\win32\hlink\hlink.dll                           1
 -dll\win32\httpapi\httpapi.dll                       1
 -dll\win32\iccvid\iccvid.dll                         1
 -dll\win32\icmp\icmp.dll                             1
 -dll\win32\imaadp32.acm\imaadp32.acm                 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\initpki\initpki.dll                       1
 -dll\win32\inseng\inseng.dll                         1
 -dll\win32\iphlpapi\iphlpapi.dll                     1
 -dll\win32\itircl\itircl.dll                         1
 -dll\win32\itss\itss.dll                             1
 -dll\win32\jscript\jscript.dll                       1
 -dll\win32\kernel32\kernel32.dll                     1
 -dll\win32\loadperf\loadperf.dll                     1
 -dll\win32\localspl\localspl.dll                     1
 -dll\win32\localui\localui.dll                       1
 -dll\win32\lsasrv\lsasrv.dll                         1
 -dll\win32\lz32\lz32.dll                             1
 -dll\win32\mapi32\mapi32.dll                         1
 -dll\win32\mciavi32\mciavi32.dll                     1
 -dll\win32\mcicda\mcicda.dll                         1
 -dll\win32\mciqtz32\mciqtz32.dll                     1
 -dll\win32\mciseq\mciseq.dll                         1
 -dll\win32\mciwave\mciwave.dll                       1
 -dll\win32\mlang\mlang.dll                           1
 -dll\win32\mmdrv\mmdrv.dll                           1
 -dll\win32\modemui\modemui.dll                       1
 -dll\win32\mpr\mpr.dll                               1
 -dll\win32\mprapi\mprapi.dll                         1
 -dll\win32\msacm32\msacm32.dll                       1
 -dll\win32\msadp32.acm\msadp32.acm                   1
 -dll\win32\msafd\msafd.dll                           1
 -dll\win32\mscat32\mscat32.dll                       1
 -dll\win32\mscms\mscms.dll                           1
 -dll\win32\mscoree\mscoree.dll                       1
 -dll\win32\msctf\msctf.dll                           1
 -dll\win32\msftedit\msftedit.dll                     1
 -dll\win32\msg711.acm\msg711.acm                     1
 -dll\win32\msgina\msgina.dll                         1
 -dll\win32\mshtml\mshtml.dll                         1
 -dll\win32\mshtml.tlb\mshtml.tlb                     1
 -dll\win32\msi\msi.dll                               1
 -dll\win32\msimg32\msimg32.dll                       1
 -dll\win32\msimtf\msimtf.dll                         1
 -dll\win32\msisip\msisip.dll                         1
 -dll\win32\msisys.ocx\msisys.ocx                     1
 -dll\win32\msnet32\msnet32.dll                       1
 -dll\win32\msrle32\msrle32.dll                       1
 -dll\win32\mssign32\mssign32.dll                     1
 -dll\win32\mssip32\mssip32.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\msvidc32\msvidc32.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\ntprint\ntprint.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\olecli32\olecli32.dll                     1
 -dll\win32\oledlg\oledlg.dll                         1
 -dll\win32\olepro32\olepro32.dll                     1
 -dll\win32\olesvr32\olesvr32.dll                     1
 -dll\win32\olethk32\olethk32.dll                     1
 -dll\win32\opengl32\opengl32.dll                     1
 -dll\win32\pdh\pdh.dll                               1
 -dll\win32\pidgen\pidgen.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\qmgr\qmgr.dll                             1
 -dll\win32\qmgrprxy\qmgrprxy.dll                     1
 -dll\win32\query\query.dll                           1
 -dll\win32\rasapi32\rasapi32.dll                     1
 -dll\win32\rasdlg\rasdlg.dll                         1
 -dll\win32\resutils\resutils.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\sccbase\sccbase.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\shdoclc\shdoclc.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\slbcsp\slbcsp.dll                         1
 -dll\win32\smdll\smdll.dll                           1
 -dll\win32\snmpapi\snmpapi.dll                       1
 -dll\win32\softpub\softpub.dll                       1
 -dll\win32\spoolss\spoolss.dll                       1
 -dll\win32\srclient\srclient.dll                     1
 -dll\win32\stdole2.tlb\stdole2.tlb                   1
 -dll\win32\stdole32.tlb\stdole32.tlb                 1
 -dll\win32\sti\sti.dll                               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\traffic\traffic.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\updspapi\updspapi.dll                     1
 -dll\win32\url\url.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\winemp3.acm\winemp3.acm                   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\wintab32\wintab32.dll                     1
 -dll\win32\wlanapi\wlanapi.dll                       1
 -dll\win32\wintrust\wintrust.dll                     1
 -dll\win32\wldap32\wldap32.dll                       1
 -dll\win32\wmi\wmi.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\wuapi\wuapi.dll                           1
 -dll\win32\winmm\midimap\midimap.dll                 1
 -dll\win32\winmm\wavemap\msacm32.drv                 1   optional
 -dll\win32\wdmaud.drv\wdmaud.drv                     1
++;dll\directx\amstream\amstream.dll                   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\wine\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\kbdcz\kbdcz.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\kbdlt1\kbdlt1.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\activeds\activeds.dll                     1
 +;dll\win32\advapi32\advapi32.dll                     1
 +;dll\win32\advpack\advpack.dll                       1
 +;dll\win32\actxprxy\actxprxy.dll                     1
 +;dll\win32\atl\atl.dll                               1
 +;dll\win32\authz\authz.dll                           1
 +;dll\win32\avifil32\avifil32.dll                     1
 +;dll\win32\beepmidi\beepmidi.dll                     1
 +;dll\win32\browseui\browseui.dll                     1
 +;dll\win32\cabinet\cabinet.dll                       1
 +;dll\win32\cards\cards.dll                           1
 +;dll\win32\cfgmgr32\cfgmgr32.dll                     1
 +;dll\win32\clusapi\clusapi.dll                       1
 +;dll\win32\comcat\comcat.dll                         1
 +;dll\win32\comctl32\comctl32.dll                     1
 +;dll\win32\comdlg32\comdlg32.dll                     1
 +;dll\win32\compstui\compstui.dll                     1
 +;dll\win32\credui\credui.dll                         1
 +;dll\win32\crtdll\crtdll.dll                         1
 +;dll\win32\crypt32\crypt32.dll                       1
 +;dll\win32\cryptdlg\cryptdlg.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\dwmapi\dwmapi.dll                         1
 +;dll\win32\devmgr\devmgr.dll                         1
 +;dll\win32\dhcpcsvc\dhcpcsvc.dll                     1
 +;dll\win32\dnsapi\dnsapi.dll                         1
 +;dll\win32\fmifs\fmifs.dll                           1
 +;dll\win32\fusion\fusion.dll                         1
 +;dll\win32\gdi32\gdi32.dll                           1
 +;dll\win32\gdiplus\gdiplus.dll                       1
 +;dll\win32\getuname\getuname.dll                     1
 +;dll\win32\glu32\glu32.dll                           1
 +;dll\win32\hhctrl.ocx\hhctrl.ocx                     1
 +;dll\win32\hid\hid.dll                               1
 +;dll\win32\hlink\hlink.dll                           1
 +;dll\win32\httpapi\httpapi.dll                       1
 +;dll\win32\iccvid\iccvid.dll                         1
 +;dll\win32\icmp\icmp.dll                             1
 +;dll\win32\imaadp32.acm\imaadp32.acm                 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\initpki\initpki.dll                       1
 +;dll\win32\inseng\inseng.dll                         1
 +;dll\win32\iphlpapi\iphlpapi.dll                     1
 +;dll\win32\itircl\itircl.dll                         1
 +;dll\win32\itss\itss.dll                             1
 +;dll\win32\jscript\jscript.dll                       1
 +;dll\win32\kernel32\kernel32.dll                     1
 +;dll\win32\loadperf\loadperf.dll                     1
 +;dll\win32\localspl\localspl.dll                     1
 +;dll\win32\localui\localui.dll                       1
 +;dll\win32\lsasrv\lsasrv.dll                         1
 +;dll\win32\lz32\lz32.dll                             1
 +;dll\win32\mapi32\mapi32.dll                         1
 +;dll\win32\mciavi32\mciavi32.dll                     1
 +;dll\win32\mcicda\mcicda.dll                         1
 +;dll\win32\mciqtz32\mciqtz32.dll                     1
 +;dll\win32\mciseq\mciseq.dll                         1
 +;dll\win32\mciwave\mciwave.dll                       1
 +;dll\win32\mlang\mlang.dll                           1
 +;dll\win32\mmdrv\mmdrv.dll                           1
 +;dll\win32\modemui\modemui.dll                       1
 +;dll\win32\mpr\mpr.dll                               1
 +;dll\win32\mprapi\mprapi.dll                         1
 +;dll\win32\msacm32\msacm32.dll                       1
 +;dll\win32\msadp32.acm\msadp32.acm                   1
 +;dll\win32\msafd\msafd.dll                           1
 +;dll\win32\mscat32\mscat32.dll                       1
 +;dll\win32\mscms\mscms.dll                           1
 +;dll\win32\mscoree\mscoree.dll                       1
 +;dll\win32\msctf\msctf.dll                           1
 +;dll\win32\msftedit\msftedit.dll                     1
 +;dll\win32\msg711.acm\msg711.acm                     1
 +;dll\win32\msgina\msgina.dll                         1
 +;dll\win32\mshtml\mshtml.dll                         1
 +;dll\win32\mshtml.tlb\mshtml.tlb                     1
 +;dll\win32\msi\msi.dll                               1
 +;dll\win32\msimg32\msimg32.dll                       1
 +;dll\win32\msimtf\msimtf.dll                         1
 +;dll\win32\msisip\msisip.dll                         1
 +;dll\win32\msisys.ocx\msisys.ocx                     1
 +;dll\win32\msnet32\msnet32.dll                       1
 +;dll\win32\msrle32\msrle32.dll                       1
 +;dll\win32\mssign32\mssign32.dll                     1
 +;dll\win32\mssip32\mssip32.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\msvidc32\msvidc32.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\ntprint\ntprint.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\olecli32\olecli32.dll                     1
 +;dll\win32\oledlg\oledlg.dll                         1
 +;dll\win32\olepro32\olepro32.dll                     1
 +;dll\win32\olesvr32\olesvr32.dll                     1
 +;dll\win32\olethk32\olethk32.dll                     1
 +;dll\win32\opengl32\opengl32.dll                     1
 +;dll\win32\pdh\pdh.dll                               1
 +;dll\win32\pidgen\pidgen.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\qmgr\qmgr.dll                             1
 +;dll\win32\qmgrprxy\qmgrprxy.dll                     1
 +;dll\win32\query\query.dll                           1
 +;dll\win32\rasapi32\rasapi32.dll                     1
 +;dll\win32\rasdlg\rasdlg.dll                         1
 +;dll\win32\resutils\resutils.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\sccbase\sccbase.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\shdoclc\shdoclc.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\slbcsp\slbcsp.dll                         1
 +;dll\win32\smdll\smdll.dll                           1
 +;dll\win32\snmpapi\snmpapi.dll                       1
 +;dll\win32\softpub\softpub.dll                       1
 +;dll\win32\spoolss\spoolss.dll                       1
 +;dll\win32\srclient\srclient.dll                     1
 +;dll\win32\stdole2.tlb\stdole2.tlb                   1
 +;dll\win32\stdole32.tlb\stdole32.tlb                 1
 +;dll\win32\sti\sti.dll                               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\traffic\traffic.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\updspapi\updspapi.dll                     1
 +;dll\win32\url\url.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\winemp3.acm\winemp3.acm                   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\wintab32\wintab32.dll                     1
 +;dll\win32\wlanapi\wlanapi.dll                       1
 +;dll\win32\wintrust\wintrust.dll                     1
 +;dll\win32\wldap32\wldap32.dll                       1
 +;dll\win32\wmi\wmi.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\wuapi\wuapi.dll                           1
 +;dll\win32\winmm\midimap\midimap.dll                 1
 +;dll\win32\winmm\wavemap\msacm32.drv                 1   optional
 +;dll\win32\wdmaud.drv\wdmaud.drv                     1
  
  ; 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\bus\isapnp\isapnp.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\input\mouclass\mouclass.sys                 2
 -drivers\input\sermouse\sermouse.sys                 2
 -
 -drivers\ksfilter\ks\ks.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\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\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\font\ftfd\ftfd.dll                   1
 -
 -drivers\wdm\audio\filters\kmixer\kmixer.sys         2
 -drivers\wdm\audio\sysaudio\sysaudio.sys             2
 -drivers\wdm\audio\legacy\wdmaud\wdmaud.sys          2
 -drivers\wdm\audio\backpln\portcls\portcls.sys       2
 -drivers\wdm\audio\drm\drmk\drmk.sys                 2
 -drivers\wmi\wmilib.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\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\input\mouclass\mouclass.sys                 2
 +;drivers\input\sermouse\sermouse.sys                 2
 +
 +;drivers\ksfilter\ks\ks.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\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\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\font\ftfd\ftfd.dll                   1
 +
 +;drivers\wdm\audio\filters\kmixer\kmixer.sys         2
 +;drivers\wdm\audio\sysaudio\sysaudio.sys             2
 +;drivers\wdm\audio\legacy\wdmaud\wdmaud.sys          2
 +;drivers\wdm\audio\backpln\portcls\portcls.sys       2
 +;drivers\wdm\audio\drm\drmk\drmk.sys                 2
 +;drivers\wmi\wmilib.sys                              2
  
  ; Media
 -media\fonts\DejaVuSans.ttf                          3
 -media\fonts\DejaVuSans-Bold.ttf                     3
 -media\fonts\DejaVuSans-BoldOblique.ttf              3
 -media\fonts\DejaVuSansMono.ttf                      3
 -media\fonts\DejaVuSansMono-Bold.ttf                 3
 -media\fonts\DejaVuSansMono-BoldOblique.ttf          3
 -media\fonts\DejaVuSansMono-Oblique.ttf              3
 -media\fonts\DejaVuSans-Oblique.ttf                  3
 -media\fonts\DejaVuSerif.ttf                         3
 -media\fonts\DejaVuSerif-Bold.ttf                    3
 -media\fonts\DejaVuSerif-BoldItalic.ttf              3
 -media\fonts\DejaVuSerif-Italic.ttf                  3
 -
 -media\fonts\FreeMono.ttf                            3
 -media\fonts\FreeMonoBold.ttf                        3
 -media\fonts\FreeMonoBoldOblique.ttf                 3
 -media\fonts\FreeMonoOblique.ttf                     3
 -
 -media\fonts\LiberationMono-Bold.ttf                 3
 -media\fonts\LiberationMono-BoldItalic.ttf           3
 -media\fonts\LiberationMono-Italic.ttf               3
 -media\fonts\LiberationMono-Regular.ttf              3
 -media\fonts\LiberationSans-Bold.ttf                 3
 -media\fonts\LiberationSans-BoldItalic.ttf           3
 -media\fonts\LiberationSans-Italic.ttf               3
 -media\fonts\LiberationSans-Regular.ttf              3
 -media\fonts\LiberationSerif-Bold.ttf                3
 -media\fonts\LiberationSerif-BoldItalic.ttf          3
 -media\fonts\LiberationSerif-Italic.ttf              3
 -media\fonts\LiberationSerif-Regular.ttf             3
 -
 -media\fonts\Marlett.ttf                             3
 -media\fonts\tahoma.ttf                              3
 -media\fonts\tahomabd.ttf                            3
 -
 -media\nls\c_037.nls                                 1
 -media\nls\c_500.nls                                 1
 -media\nls\c_737.nls                                 1
 -media\nls\c_775.nls                                 1
 -media\nls\c_850.nls                                 1
 -media\nls\c_852.nls                                 1
 -media\nls\c_855.nls                                 1
 -media\nls\c_856.nls                                 1
 -media\nls\c_857.nls                                 1
 -media\nls\c_860.nls                                 1
 -media\nls\c_861.nls                                 1
 -media\nls\c_862.nls                                 1
 -media\nls\c_863.nls                                 1
 -media\nls\c_864.nls                                 1
 -media\nls\c_865.nls                                 1
 -media\nls\c_866.nls                                 1
 -media\nls\c_869.nls                                 1
 -media\nls\c_874.nls                                 1
 -media\nls\c_875.nls                                 1
 -media\nls\c_878.nls                                 1
 -media\nls\c_932.nls                                 1
 -media\nls\c_936.nls                                 1
 -media\nls\c_949.nls                                 1
 -media\nls\c_950.nls                                 1
 -media\nls\c_1006.nls                                1
 -media\nls\c_1026.nls                                1
 -media\nls\c_1250.nls                                1
 -media\nls\c_1251.nls                                1
 -media\nls\c_1253.nls                                1
 -media\nls\c_1254.nls                                1
 -media\nls\c_1255.nls                                1
 -media\nls\c_1256.nls                                1
 -media\nls\c_1257.nls                                1
 -media\nls\c_1258.nls                                1
 -media\nls\c_10000.nls                               1
 -media\nls\c_10006.nls                               1
 -media\nls\c_10007.nls                               1
 -media\nls\c_10029.nls                               1
 -media\nls\c_10079.nls                               1
 -media\nls\c_10081.nls                               1
 -media\nls\c_20866.nls                               1
 -media\nls\c_21866.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\nls\c_28600.nls                               1
 -media\nls\c_28603.nls                               1
 -media\nls\c_28604.nls                               1
 -media\nls\c_28605.nls                               1
 -media\nls\c_28606.nls                               1
 -media\drivers\etc\services                          5
 -media\inf\audio.inf                                 6
 -media\inf\acpi.inf                                  6
 -media\inf\cdrom.inf                                 6
 -media\inf\display.inf                               6
 -media\inf\font.inf                                  6
 -media\inf\fdc.inf                                   6
 -media\inf\hdc.inf                                   6
 -media\inf\intl.inf                                  6
 -media\inf\layout.inf                                6
 -media\inf\machine.inf                               6
 -media\inf\msmouse.inf                               6
 -media\inf\keyboard.inf                              6
 -media\inf\NET_NIC.inf                               6
 -media\inf\netamd.inf                                6
 -media\inf\netisa.inf                                6
 -media\inf\netrtpnt.inf                              6
 -media\inf\nettcpip.inf                              6
 -media\inf\ports.inf                                 6
 -media\inf\scsi.inf                                  6
 -media\inf\syssetup.inf                              6
 -media\inf\usbport.inf                               6
 -media\inf\usb.inf                                   6
 -media\inf\usbstor.inf                               6
 -media\inf\xboxdisp.inf                              6
 +;media\fonts\DejaVuSans.ttf                          3
 +;media\fonts\DejaVuSans-Bold.ttf                     3
 +;media\fonts\DejaVuSans-BoldOblique.ttf              3
 +;media\fonts\DejaVuSansMono.ttf                      3
 +;media\fonts\DejaVuSansMono-Bold.ttf                 3
 +;media\fonts\DejaVuSansMono-BoldOblique.ttf          3
 +;media\fonts\DejaVuSansMono-Oblique.ttf              3
 +;media\fonts\DejaVuSans-Oblique.ttf                  3
 +;media\fonts\DejaVuSerif.ttf                         3
 +;media\fonts\DejaVuSerif-Bold.ttf                    3
 +;media\fonts\DejaVuSerif-BoldItalic.ttf              3
 +;media\fonts\DejaVuSerif-Italic.ttf                  3
 +
 +;media\fonts\FreeMono.ttf                            3
 +;media\fonts\FreeMonoBold.ttf                        3
 +;media\fonts\FreeMonoBoldOblique.ttf                 3
 +;media\fonts\FreeMonoOblique.ttf                     3
 +
 +;media\fonts\LiberationMono-Bold.ttf                 3
 +;media\fonts\LiberationMono-BoldItalic.ttf           3
 +;media\fonts\LiberationMono-Italic.ttf               3
 +;media\fonts\LiberationMono-Regular.ttf              3
 +;media\fonts\LiberationSans-Bold.ttf                 3
 +;media\fonts\LiberationSans-BoldItalic.ttf           3
 +;media\fonts\LiberationSans-Italic.ttf               3
 +;media\fonts\LiberationSans-Regular.ttf              3
 +;media\fonts\LiberationSerif-Bold.ttf                3
 +;media\fonts\LiberationSerif-BoldItalic.ttf          3
 +;media\fonts\LiberationSerif-Italic.ttf              3
 +;media\fonts\LiberationSerif-Regular.ttf             3
 +
 +;media\fonts\Marlett.ttf                             3
 +;media\fonts\tahoma.ttf                              3
 +;media\fonts\tahomabd.ttf                            3
 +
 +;media\nls\c_037.nls                                 1
 +;media\nls\c_500.nls                                 1
 +;media\nls\c_737.nls                                 1
 +;media\nls\c_775.nls                                 1
 +;media\nls\c_850.nls                                 1
 +;media\nls\c_852.nls                                 1
 +;media\nls\c_855.nls                                 1
 +;media\nls\c_856.nls                                 1
 +;media\nls\c_857.nls                                 1
 +;media\nls\c_860.nls                                 1
 +;media\nls\c_861.nls                                 1
 +;media\nls\c_862.nls                                 1
 +;media\nls\c_863.nls                                 1
 +;media\nls\c_864.nls                                 1
 +;media\nls\c_865.nls                                 1
 +;media\nls\c_866.nls                                 1
 +;media\nls\c_869.nls                                 1
 +;media\nls\c_874.nls                                 1
 +;media\nls\c_875.nls                                 1
 +;media\nls\c_878.nls                                 1
 +;media\nls\c_932.nls                                 1
 +;media\nls\c_936.nls                                 1
 +;media\nls\c_949.nls                                 1
 +;media\nls\c_950.nls                                 1
 +;media\nls\c_1006.nls                                1
 +;media\nls\c_1026.nls                                1
 +;media\nls\c_1250.nls                                1
 +;media\nls\c_1251.nls                                1
 +;media\nls\c_1253.nls                                1
 +;media\nls\c_1254.nls                                1
 +;media\nls\c_1255.nls                                1
 +;media\nls\c_1256.nls                                1
 +;media\nls\c_1257.nls                                1
 +;media\nls\c_1258.nls                                1
 +;media\nls\c_10000.nls                               1
 +;media\nls\c_10006.nls                               1
 +;media\nls\c_10007.nls                               1
 +;media\nls\c_10029.nls                               1
 +;media\nls\c_10079.nls                               1
 +;media\nls\c_10081.nls                               1
 +;media\nls\c_20866.nls                               1
 +;media\nls\c_21866.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\nls\c_28600.nls                               1
 +;media\nls\c_28603.nls                               1
 +;media\nls\c_28604.nls                               1
 +;media\nls\c_28605.nls                               1
 +;media\nls\c_28606.nls                               1
 +;media\drivers\etc\services                          5
 +;media\inf\audio.inf                                 6
 +;media\inf\acpi.inf                                  6
 +;media\inf\cdrom.inf                                 6
 +;media\inf\display.inf                               6
 +;media\inf\font.inf                                  6
 +;media\inf\fdc.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
  
  ; Ini Files
 -boot\bootdata\system.ini                            4
 +;boot\bootdata\system.ini                            4
  
  ; Subsystems
 -subsystems\win32\csrss\csrss.exe                    1
 -subsystems\win32\csrss\win32csr\win32csr.dll        1
 -subsystems\ntvdm\ntvdm.exe                          1
 -subsystems\win32\win32k\win32k.sys                  1
 +;subsystems\win32\csrss\csrss.exe                    1
 +;subsystems\win32\csrss\win32csr\win32csr.dll        1
 +;subsystems\ntvdm\ntvdm.exe                          1
 +;subsystems\win32\win32k\win32k.sys                  1
  boot\bootdata\bootcdregtest\testboot.bat            7   optional
  
  ; Modules
- ;modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr              1   optional
- ;modules\rosapps\applications\screensavers\matrix\matrix.scr                1   optional
- ;modules\rosapps\applications\screensavers\blankscr\scrnsave.scr            1   optional
- ;modules\rosapps\applications\screensavers\starfield\starfield.scr          1   optional
- ;modules\rosapps\applications\screensavers\mazescr\mazescr.scr              1   optional
- ;modules\rosapps\applications\screensavers\butterflies\butterflies.scr      1   optional
- ;modules\rosapps\applications\cmdutils\comp\comp.exe                                     1   optional
- ;modules\rosapps\applications\cmdutils\mode\mode.exe                                     1   optional
- ;modules\rosapps\applications\cmdutils\sort\sort.exe                                     1   optional
- ;modules\rosapps\applications\cmdutils\tee\tee.exe                                       1   optional
- ;modules\rosapps\applications\cmdutils\touch\touch.exe                                   1   optional
- ;modules\rosapps\applications\cmdutils\uptime\uptime.exe                                 1   optional
- ;modules\rosapps\applications\cmdutils\y\y.exe                                           1   optional
- ;modules\rosapps\applications\devutils\gdb2\gdb2.exe                                     1   optional
- ;modules\rosapps\applications\devutils\gdihv\gdihv.exe                                   1   optional
- ;modules\rosapps\applications\devutils\genguid\genguid.exe                               1   optional
- ;modules\rosapps\applications\sysutils\gettype\gettype.exe                               1   optional
- ;modules\rosapps\applications\devutils\roswebparser\roswebparser.exe                     1   optional
- ;modules\rosapps\applications\devutils\zoomin\zoomin.exe                                 1   optional
- ;modules\rosapps\applications\downloader\downloader.exe                                  1   optional
- ;modules\rosapps\applications\downloader\downloader.xml                                  1   optional
- ;modules\rosapps\applications\fontview\fontview.exe                                      1   optional
- ;modules\rosapps\applications\imagesoft\imagesoft.exe                                    1   optional
- ;modules\rosapps\applications\net\ncftp\ncftp.exe                                        1   optional
- ;modules\rosapps\applications\net\netreg\netreg.exe                                      1   optional
- ;modules\rosapps\applications\net\niclist\niclist.exe                                    1   optional
- ;modules\rosapps\applications\net\roshttpd\roshttpd.exe                                  1   optional
- ;modules\rosapps\applications\notevil\notevil.exe                                        1   optional
- ;modules\rosapps\applications\magnify\magnify.exe                                        1   optional
- ;modules\rosapps\applications\packmgr\cmd-line\rosget.exe                                1   optional
- ;modules\rosapps\applications\packmgr\gui\packmgr.exe                                    1   optional
- ;modules\rosapps\applications\packmgr\lib\package.dll                                    1   optional
- ;modules\rosapps\applications\sysutils\chkdsk\chkdsk.exe                                 1   optional
- ;modules\rosapps\applications\sysutils\systeminfo\systeminfo.exe                         1   optional
- ;modules\rosapps\applications\sysutils\chklib\chklib.exe                                 1   optional
- ;modules\rosapps\applications\sysutils\ctm\ctm.exe                                       1   optional
- ;modules\rosapps\applications\sysutils\kill\kill.exe                                     1   optional
- ;modules\rosapps\applications\sysutils\lsdd\lsdd.exe                                     1   optional
- ;modules\rosapps\applications\sysutils\man\man.exe                                       1   optional
- ;modules\rosapps\applications\sysutils\pedump\pedump.exe                                 1   optional
- ;modules\rosapps\applications\sysutils\regexpl\regexpl.exe                               1   optional
- ;modules\rosapps\applications\sysutils\tcat\tcat.exe                                     1   optional
- ;modules\rosapps\applications\sysutils\telnetd\telnetd.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\green\green.sys                                    2   optional
- ;modules\rosapps\templates\dialog\dialog.exe                                1   optional
- ;modules\rostests\rosautotest\rosautotest.exe                               1   optional
- ;modules\rostests\tests\pseh2\pseh2_test.exe                                7   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\crypt32\crypt32_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\iphlpapi\iphlpapi_winetest.exe                  7   optional
- ;modules\rostests\winetests\jscript\jscript_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\msxml3\msxml3_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\rostests\winetests\wintrust\wintrust_winetest.exe                  7   optional
- ;modules\rostests\winetests\wlanapi\wlanapi_winetest.exe                    7   optional
- ;modules\rostests\winetests\ws2_32\ws2_32_winetest.exe                      7   optional
- ;modules\wallpaper\Angelus_02_ROSWP.bmp                                     4   optional
+ modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr              1   optional
+ modules\rosapps\applications\screensavers\matrix\matrix.scr                1   optional
+ modules\rosapps\applications\screensavers\blankscr\scrnsave.scr            1   optional
+ modules\rosapps\applications\screensavers\starfield\starfield.scr          1   optional
+ modules\rosapps\applications\screensavers\mazescr\mazescr.scr              1   optional
+ modules\rosapps\applications\screensavers\butterflies\butterflies.scr      1   optional
+ modules\rosapps\applications\cmdutils\comp\comp.exe                                     1   optional
+ modules\rosapps\applications\cmdutils\mode\mode.exe                                     1   optional
+ modules\rosapps\applications\cmdutils\sort\sort.exe                                     1   optional
+ modules\rosapps\applications\cmdutils\tee\tee.exe                                       1   optional
+ modules\rosapps\applications\cmdutils\touch\touch.exe                                   1   optional
+ modules\rosapps\applications\cmdutils\uptime\uptime.exe                                 1   optional
+ modules\rosapps\applications\cmdutils\y\y.exe                                           1   optional
+ modules\rosapps\applications\devutils\gdb2\gdb2.exe                                     1   optional
+ modules\rosapps\applications\devutils\gdihv\gdihv.exe                                   1   optional
+ modules\rosapps\applications\devutils\genguid\genguid.exe                               1   optional
+ modules\rosapps\applications\sysutils\gettype\gettype.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\sysutils\chkdsk\chkdsk.exe                                 1   optional
++modules\rosapps\applications\net\ncftp\ncftp.exe                                        1   optional
++modules\rosapps\applications\net\netreg\netreg.exe                                      1   optional
++modules\rosapps\applications\net\niclist\niclist.exe                                    1   optional
++modules\rosapps\applications\net\roshttpd\roshttpd.exe                                  1   optional
++modules\rosapps\applications\notevil\notevil.exe                                        1   optional
++modules\rosapps\applications\magnify\magnify.exe                                        1   optional
++modules\rosapps\applications\packmgr\cmd-line\rosget.exe                                1   optional
++modules\rosapps\applications\packmgr\gui\packmgr.exe                                    1   optional
++modules\rosapps\applications\packmgr\lib\package.dll                                    1   optional
++modules\rosapps\applications\sysutils\chkdsk\chkdsk.exe                                 1   optional
+ modules\rosapps\applications\sysutils\systeminfo\systeminfo.exe                         1   optional
+ modules\rosapps\applications\sysutils\chklib\chklib.exe                                 1   optional
+ modules\rosapps\applications\sysutils\ctm\ctm.exe                                       1   optional
+ modules\rosapps\applications\sysutils\kill\kill.exe                                     1   optional
+ modules\rosapps\applications\sysutils\lsdd\lsdd.exe                                     1   optional
+ modules\rosapps\applications\sysutils\man\man.exe                                       1   optional
+ modules\rosapps\applications\sysutils\pedump\pedump.exe                                 1   optional
+ modules\rosapps\applications\sysutils\regexpl\regexpl.exe                               1   optional
+ modules\rosapps\applications\sysutils\tcat\tcat.exe                                     1   optional
++modules\rosapps\applications\sysutils\telnetd\telnetd.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\green\green.sys                                    2   optional
++modules\rosapps\templates\dialog\dialog.exe                                1   optional
+ modules\rostests\rosautotest\rosautotest.exe                               1   optional
+ modules\rostests\tests\pseh2\pseh2_test.exe                                7   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\crypt32\crypt32_winetest.exe                    7   optional
+ modules\rostests\winetests\cryptnet\cryptnet_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\iphlpapi\iphlpapi_winetest.exe                  7   optional
+ modules\rostests\winetests\jscript\jscript_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\msxml3\msxml3_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\rostests\winetests\wintrust\wintrust_winetest.exe                  7   optional
+ modules\rostests\winetests\wlanapi\wlanapi_winetest.exe                    7   optional
+ modules\rostests\winetests\ws2_32\ws2_32_winetest.exe                      7   optional
+ modules\wallpaper\Angelus_02_ROSWP.bmp                                     4   optional
  
  ; Native libraries
;modules\windows\mfc42.dll                                                  1   optional
;modules\windows\vmx_fb.dll                                                 1   optional
;modules\windows\vmx_mode.dll                                               1   optional
;modules\windows\vmx_svga.sys                                               2   optional
;modules\windows\vmx_svga.inf                                               6   optional
;modules\windows\kvmnet.sys                                                 2   optional
;modules\windows\kvmnet.inf                                                 6   optional
+ modules\windows\mfc42.dll                                                  1   optional
+ modules\windows\vmx_fb.dll                                                 1   optional
+ modules\windows\vmx_mode.dll                                               1   optional
+ modules\windows\vmx_svga.sys                                               2   optional
+ modules\windows\vmx_svga.inf                                               6   optional
+ modules\windows\kvmnet.sys                                                 2   optional
+ modules\windows\kvmnet.inf                                                 6   optional
  
  ; Gecko
;modules\windows\wine_gecko-0.9.1.cab                                       4   optional
+ modules\windows\wine_gecko-0.9.1.cab                                       4   optional
@@@ -1,9 -1,9 +1,12 @@@
  <?xml version="1.0"?>
  <!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
  <group xmlns:xi="http://www.w3.org/2001/XInclude">
+       <directory name="amstream">
+               <xi:include href="amstream/amstream.rbuild" />
+       </directory>
 +      <directory name="d3d8">
 +              <xi:include href="d3d8/d3d8.rbuild" />
 +      </directory>
        <directory name="d3d8thk">
                <xi:include href="d3d8thk/d3d8thk.rbuild" />
        </directory>
Simple merge
Simple merge
@@@ -1,9 -1,9 +1,9 @@@
  <?xml version="1.0"?>\r
  <!DOCTYPE group SYSTEM "../../../../tools/rbuild/project.dtd">\r
  <group xmlns:xi="http://www.w3.org/2001/XInclude">\r
--      <directory name="audio_test">\r
++      <!--directory name="audio_test">\r
                <xi:include href="audio_test/audio_test.rbuild" />\r
--      </directory>\r
++      </directory-->\r
        <directory name="portcls">\r
                <xi:include href="portcls/portcls.rbuild" />\r
        </directory>\r
@@@ -115,10 -110,10 +115,10 @@@ typedef struct tagARENA_FRE
  /* Max size of the blocks on the free lists */
  static const DWORD HEAP_freeListSizes[HEAP_NB_FREE_LISTS] =
  {
-     0x20, 0x80, 0x200, ~0UL
+     0x10, 0x20, 0x80, 0x200, ~0UL
  };
  
 -typedef struct
 +typedef union
  {
      ARENA_FREE  arena;
      void        *aligment[4];
Simple merge
Simple merge
Simple merge
@@@ -83,29 -83,26 +83,29 @@@ NtUserGetThreadState
     {
        case THREADSTATE_GETTHREADINFO:
           GetW32ThreadInfo();
 -         RETURN(0);
 -
 +         break;
        case THREADSTATE_FOCUSWINDOW:
 -         RETURN( (DWORD)IntGetThreadFocusWindow());
 +         ret = (DWORD_PTR)IntGetThreadFocusWindow();
 +         break;
        case THREADSTATE_CAPTUREWINDOW:
           /* FIXME should use UserEnterShared */
 -         RETURN( (DWORD)IntGetCapture());
 +         ret = (DWORD_PTR)IntGetCapture();
 +         break;
        case THREADSTATE_PROGMANWINDOW:
-          ret = (DWORD_PTR)GetW32ThreadInfo()->Desktop->hProgmanWindow;
 -         RETURN( (DWORD)GetW32ThreadInfo()->pDeskInfo->hProgmanWindow);
++         ret = (DWORD_PTR)GetW32ThreadInfo()->pDeskInfo->hProgmanWindow;
 +         break;
        case THREADSTATE_TASKMANWINDOW:
-          ret = (DWORD_PTR)GetW32ThreadInfo()->Desktop->hTaskManWindow;
 -         RETURN( (DWORD)GetW32ThreadInfo()->pDeskInfo->hTaskManWindow);
++         ret = (DWORD_PTR)GetW32ThreadInfo()->pDeskInfo->hTaskManWindow;
 +         break;
        case THREADSTATE_ACTIVEWINDOW:
 -         RETURN ( (DWORD)UserGetActiveWindow());
 +         ret = (DWORD_PTR)UserGetActiveWindow();
 +         break;
     }
 -   RETURN( 0);
  
 -CLEANUP:
 -   DPRINT("Leave NtUserGetThreadState, ret=%i\n",_ret_);
 +   DPRINT("Leave NtUserGetThreadState, ret=%i\n", ret);
     UserLeave();
 -   END_CLEANUP;
 +
 +   return ret;
  }
  
  
@@@ -463,9 -460,8 +463,8 @@@ GetW32ProcessInfo(VOID
              pi->hUserHeap = W32Process->HeapMappings.KernelMapping;
              pi->UserHeapDelta = (ULONG_PTR)W32Process->HeapMappings.KernelMapping -
                                  (ULONG_PTR)W32Process->HeapMappings.UserMapping;
-             pi->psi = gpsi;
  
 -            if (InterlockedCompareExchangePointer(&W32Process->ProcessInfo,
 +            if (InterlockedCompareExchangePointer((PVOID*)&W32Process->ProcessInfo,
                                                    pi,
                                                    NULL) != NULL)
              {
@@@ -452,8 -452,8 +452,8 @@@ NtUserCallTwoParam
     {
        case TWOPARAM_ROUTINE_GETWINDOWRGNBOX:
           {
 -            DWORD Ret;
 +            DWORD_PTR Ret;
-             RECT rcRect;
+             RECTL rcRect;
              Window = UserGetWindowObject((HWND)Param1);
              if (!Window) RETURN(ERROR);