fix the build

svn path=/trunk/; revision=21140

diff --git a/reactos/ReactOS.rbuild b/reactos/ReactOS.rbuild
index 6cc2d1a..0c2fc9a 100644 (file)
--- a/reactos/ReactOS.rbuild
+++ b/reactos/ReactOS.rbuild
@@ -38,7 +38,7 @@
   <include>include/GL</include>\r
   <include>include/ndk</include>\r
   <include>include/reactos</include>\r
   <include>include/GL</include>\r
   <include>include/ndk</include>\r
   <include>include/reactos</include>\r

-  \r
+  <include>include/reactos/libs</include>\r

 \r
   <directory name="base">\r
     <xi:include href="base/base.rbuild" />\r
 \r
   <directory name="base">\r
     <xi:include href="base/base.rbuild" />\r

diff --git a/reactos/base/system/lsass/lsass.rbuild b/reactos/base/system/lsass/lsass.rbuild
index 8d947cc..0251bbd 100644 (file)
--- a/reactos/base/system/lsass/lsass.rbuild
+++ b/reactos/base/system/lsass/lsass.rbuild
@@ -2,6 +2,7 @@
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
 <module name="lsass" type="win32gui" installbase="system32" installname="lsass.exe">
        <include base="lsass">.</include>
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
 <module name="lsass" type="win32gui" installbase="system32" installname="lsass.exe">
        <include base="lsass">.</include>

+       <include base="ReactOS">include/reactos/subsys</include>

        <define name="UNICODE" />
        <define name="_UNICODE" />
        <define name="__USE_W32API" />
        <define name="UNICODE" />
        <define name="_UNICODE" />
        <define name="__USE_W32API" />

diff --git a/reactos/base/system/services/services.rbuild b/reactos/base/system/services/services.rbuild
index 9cb19a6..10ca2b0 100644 (file)
--- a/reactos/base/system/services/services.rbuild
+++ b/reactos/base/system/services/services.rbuild
@@ -3,6 +3,7 @@
 <module name="services" type="win32cui" installbase="system32" installname="services.exe">
        <include base="services">.</include>
        <include base="scm_server">.</include>
 <module name="services" type="win32cui" installbase="system32" installname="services.exe">
        <include base="services">.</include>
        <include base="scm_server">.</include>

+       <include base="ReactOS">include/reactos/subsys</include>

        <define name="__USE_W32API" />
        <define name="UNICODE" />
        <define name="_UNICODE" />
        <define name="__USE_W32API" />
        <define name="UNICODE" />
        <define name="_UNICODE" />

diff --git a/reactos/base/system/smss/smss.rbuild b/reactos/base/system/smss/smss.rbuild
index 4f52f8c..8781887 100644 (file)
--- a/reactos/base/system/smss/smss.rbuild
+++ b/reactos/base/system/smss/smss.rbuild
@@ -1,5 +1,6 @@
 <module name="smss" type="nativecui" installbase="system32" installname="smss.exe">
        <include base="smss">.</include>
 <module name="smss" type="nativecui" installbase="system32" installname="smss.exe">
        <include base="smss">.</include>

+       <include base="ReactOS">include/reactos/subsys</include>

        <define name="__USE_W32API" />
        <define name="_DISABLE_TIDENTS" />
        <library>nt</library>
        <define name="__USE_W32API" />
        <define name="_DISABLE_TIDENTS" />
        <library>nt</library>

diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index 6ae2ff9..2862d74 100755 (executable)
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -30,214 +30,221 @@ drivers\bus\acpi\acpi.sys               2
 drivers\bus\isapnp\isapnp.sys           2
 drivers\bus\pci\pci.sys                 2
 drivers\bus\serenum\serenum.sys         2
 drivers\bus\isapnp\isapnp.sys           2
 drivers\bus\pci\pci.sys                 2
 drivers\bus\serenum\serenum.sys         2

-drivers\dd\beep\beep.sys                2
-drivers\dd\bootvid\bootvid.sys          2
-drivers\dd\null\null.sys                2
-drivers\dd\serial\serial.sys            2
+drivers\base\beep\beep.sys              2
+drivers\base\bootvid\bootvid.sys        2
+drivers\base\null\null.sys              2
+drivers\base\serial\serial.sys          2

 drivers\video\displays\vga\vgaddi.dll   1
 drivers\video\displays\framebuf\framebuf.dll 1
 drivers\video\miniport\vga\vgamp.sys    2
 drivers\video\miniport\vbe\vbemp.sys    2
 drivers\video\videoprt\videoprt.sys     2
 drivers\video\displays\vga\vgaddi.dll   1
 drivers\video\displays\framebuf\framebuf.dll 1
 drivers\video\miniport\vga\vgamp.sys    2
 drivers\video\miniport\vbe\vbemp.sys    2
 drivers\video\videoprt\videoprt.sys     2

-drivers\fs\fs_rec\fs_rec.sys            2
-drivers\fs\ms\msfs.sys                  2
-drivers\fs\mup\mup.sys                  2
-drivers\fs\np\npfs.sys                  2
+drivers\filesystems\fs_rec\fs_rec.sys   2
+drivers\filesystems\ms\msfs.sys         2
+drivers\filesystems\mup\mup.sys         2
+drivers\filesystems\np\npfs.sys         2

 drivers\input\i8042prt\i8042prt.sys     2
 drivers\input\kbdclass\kbdclass.sys     2
 drivers\input\mouclass\mouclass.sys     2
 drivers\input\sermouse\sermouse.sys     2
 drivers\input\i8042prt\i8042prt.sys     2
 drivers\input\kbdclass\kbdclass.sys     2
 drivers\input\mouclass\mouclass.sys     2
 drivers\input\sermouse\sermouse.sys     2

-drivers\net\afd\afd.sys                 2
-drivers\net\ndis\ndis.sys               2
-drivers\net\tcpip\tcpip.sys             2
-drivers\net\tdi\tdi.sys                 2
-drivers\net\wshtcpip\wshtcpip.dll       1
-drivers\net\dd\ne2000\ne2000.sys        2
-drivers\net\dd\pcnet\pcnet.sys          2
+drivers\network\afd\afd.sys             2
+drivers\network\ndis\ndis.sys           2
+drivers\network\tcpip\tcpip.sys         2
+drivers\network\tdi\tdi.sys             2
+drivers\network\wshtcpip\wshtcpip.dll   1
+drivers\network\dd\ne2000\ne2000.sys    2
+drivers\network\dd\pcnet\pcnet.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

-lib\advapi32\advapi32.dll               1
-lib\advpack\advpack.dll                 1
-lib\aclui\aclui.dll                     1
-lib\avifil32\avifil32.dll               1
-lib\cabinet\cabinet.dll                 1
-lib\cards\cards.dll                     1
-lib\cpl\access\access.cpl               1
-lib\cpl\appwiz\appwiz.cpl               1
-lib\cpl\control\control.exe             1
-lib\cpl\desk\desk.cpl                   1
-lib\cpl\intl\intl.cpl                   1
-lib\cpl\main\main.cpl                   1
-lib\cpl\mmsys\mmsys.cpl                 1
-lib\cpl\ncpa\ncpa.cpl                   1
-lib\cpl\sysdm\sysdm.cpl                 1
-lib\cpl\timedate\timedate.cpl           1
-lib\cfgmgr32\cfgmgr32.dll               1
-lib\comctl32\comctl32.dll               1
-lib\comdlg32\comdlg32.dll               1
-lib\crtdll\crtdll.dll                   1
-lib\crypt32\crypt32.dll                 1
-lib\d3d8thk\d3d8thk.dll                 1
-lib\dbghelp\dbghelp.dll                 1
-lib\ddraw\ddraw.dll                     1
-lib\devenum\devenum.dll                 1
-lib\devmgr\devmgr.dll                   1
-lib\dhcpcsvc\dhcpcsvc.dll               1
-lib\dinput\dinput.dll                   1
-lib\dinput8\dinput8.dll                 1
-lib\dnsapi\dnsapi.dll                   1
-lib\dplay\dplay.dll                     1
-lib\dplayx\dplayx.dll                   1
-lib\dsound\dsound.dll                   1
-lib\dxdiagn\dxdiagn.dll                 1
-lib\fmifs\fmifs.dll                     1
-lib\freetype\freetype.dll               1
-lib\gdi32\gdi32.dll                     1
-lib\gdiplus\gdiplus.dll                 1
-lib\glu32\glu32.dll                     1
-lib\hid\hid.dll                         1
-lib\icmp\icmp.dll                       1
-lib\imagehlp\imagehlp.dll               1
-lib\imm32\imm32.dll                     1
-lib\iphlpapi\iphlpapi.dll               1
-lib\keyboard\kbdbe\kbdbe.dll            1
-lib\keyboard\kbdda\kbdda.dll            1
-lib\keyboard\kbddv\kbddv.dll            1
-lib\keyboard\kbdes\kbdes.dll            1
-lib\keyboard\kbdfr\kbdfr.dll            1
-lib\keyboard\kbdgr\kbdgr.dll            1
-lib\keyboard\kbdhe\kbdhe.dll            1
-lib\keyboard\kbdhu\kbdhu.dll            1
-lib\keyboard\kbdru\kbdru.dll            1
-lib\keyboard\kbdse\kbdse.dll            1
-lib\keyboard\kbdsg\kbdsg.dll            1
-lib\keyboard\kbdsk\kbdsk.dll            1
-lib\keyboard\kbduk\kbduk.dll            1
-lib\keyboard\kbdur\kbdur.dll            1
-lib\keyboard\kbdus\kbdus.dll            1
-lib\keyboard\kbdpo\kbdpo.dll            1
-lib\kernel32\kernel32.dll               1
-lib\lsasrv\lsasrv.dll                   1
-lib\lzexpand\lz32.dll                   1
-lib\mapi32\mapi32.dll                   1
-lib\mesa32\mesa32.dll                   1
-lib\winmm\midimap\midimap.dll           1
-lib\mmdrv\mmdrv.dll                     1
-lib\mpr\mpr.dll                         1
-lib\msacm\msacm32.dll                   1
-lib\msafd\msafd.dll                     1
-lib\msgina\msgina.dll                   1
-lib\msi\msi.dll                         1
-lib\msimg32\msimg32.dll                 1
-lib\msvcrt\msvcrt.dll                   1
-lib\msvcrt20\msvcrt20.dll               1
-lib\msvideo\msvfw32.dll                 1
-lib\mswsock\mswsock.dll                 1
-lib\netapi32\netapi32.dll               1
-lib\netcfgx\netcfgx.dll                 1
-lib\newdev\newdev.dll                   1
-lib\ntdll\ntdll.dll                     1
-lib\ntmarta\ntmarta.dll                 1
-lib\objsel\objsel.dll                   1
-lib\ole32\ole32.dll                     1
-lib\oleacc\oleacc.dll                   1
-lib\oleaut32\oleaut32.dll               1
-lib\oledlg\oledlg.dll                   1
-lib\olepro32\olepro32.dll               1
-lib\opengl32\opengl32.dll               1
-lib\psapi\psapi.dll                     1
-lib\riched20\riched20.dll               1
-lib\richedit\riched32.dll               1
-lib\rpcrt4\rpcrt4.dll                   1
-lib\samlib\samlib.dll                   1
-lib\samsrv\samsrv.dll                   1
-lib\secur32\secur32.dll                 1
-lib\serialui\serialui.dll               1
-lib\setupapi\setupapi.dll               1
-lib\shdocvw\shdocvw.dll                 1
-lib\shell32\shell32.dll                 1
-lib\shfolder\shfolder.dll               1
-lib\shlwapi\shlwapi.dll                 1
-lib\smdll\smdll.dll                     1
-lib\syssetup\syssetup.dll               1
-lib\twain\twain_32.dll                  1
-lib\urlmon\urlmon.dll                   1
-lib\user32\user32.dll                   1
-lib\userenv\userenv.dll                 1
-lib\uxtheme\uxtheme.dll                 1
-lib\version\version.dll                 1
-lib\wininet\wininet.dll                 1
-lib\winmm\winmm.dll                     1
-lib\winspool\winspool.drv               1
-lib\wintrust\wintrust.dll               1
-lib\ws2_32\ws2_32.dll                   1
-lib\ws2help\ws2help.dll                 1
-lib\wshirda\wshirda.dll                 1
-lib\wsock32\wsock32.dll                 1
-subsys\csrss\csrss.exe                  1
-subsys\csrss\win32csr\win32csr.dll      1
-subsys\csr\csr.exe                      1        optional
-subsys\csr\csrsrv\csrsrv.dll            1        optional
-subsys\win\basesrv\basesrv.dll          1        optional
-subsys\win\winsrv\winsrv.dll            1        optional
-subsys\ntvdm\ntvdm.exe                  1
-subsys\smss\smss.exe                    1
-subsys\win32k\win32k.sys                1
-subsys\system\autochk\autochk.exe       1
-subsys\system\cacls\cacls.exe           1
-subsys\system\calc\calc.exe             1
-subsys\system\cmd\cmd.exe               1
-subsys\system\devmgr\devmgrapp.exe      1
-subsys\system\explorer\explorer.exe     4
-subsys\system\explorer\explorer-cfg-template.xml 4
-subsys\system\explorer\notifyhook\notifyhook.dll 1
-subsys\system\format\format.exe         1
-subsys\system\ibrowser\ibrowser.exe     1
-subsys\system\lsass\lsass.exe           1
-subsys\system\msconfig\msconfig.exe     1
-subsys\system\msiexec\msiexec.exe       1
-subsys\system\notepad\notepad.exe       1
-subsys\system\gettype\gettype.exe       1
-subsys\system\regedit\regedit.exe       4
-subsys\system\regedit\clb\clb.dll       1
-subsys\system\regsvr32\regsvr32.exe     1
-subsys\system\reporterror\reporterror.exe 1
-subsys\system\rundll32\rundll32.exe     1
-subsys\system\sc\sc.exe                1
-subsys\system\services\services.exe     1
-subsys\system\servman\servman.exe       1
-subsys\system\setup\setup.exe           1
-subsys\system\taskmgr\taskmgr.exe       1
-subsys\system\userinit\userinit.exe     1
-subsys\system\vmwinst\vmwinst.exe       1
-subsys\system\winlogon\winlogon.exe     1
-subsys\system\winefile\winefile.exe     1
-subsys\system\winver\winver.exe         1
-subsys\system\sm\sm.exe                 1
-subsys\system\expand\expand.exe         1
-subsys\system\hostname\hostname.exe     1
-services\dhcp\dhcp.exe                  1
-services\eventlog\eventlog.exe          1
-services\rpcss\rpcss.exe                1
-services\tcpsvcs\tcpsvcs.exe            1
-services\tcpsvcs\quotes                 5
-services\umpnpmgr\umpnpmgr.exe          1
-apps\utils\net\arp\arp.exe              1
-apps\utils\net\route\route.exe          1
-apps\utils\net\finger\finger.exe        1
-apps\utils\net\ftp\ftp.exe              1
-apps\utils\net\ipconfig\ipconfig.exe    1
-apps\utils\net\netstat\netstat.exe      1
-apps\utils\net\ping\ping.exe            1
-apps\utils\net\telnet\telnet.exe        1
-apps\utils\net\tracert\tracert.exe      1
-apps\utils\net\whois\whois.exe          1
-apps\utils\ps\ps.exe                    1
-apps\utils\rosperf\rosperf.exe          1
-apps\utils\shutdown\shutdown.exe        1
-apps\utils\getfirefox\getfirefox.exe    1
+
+dll\cpl\access\access.cpl               1
+dll\cpl\appwiz\appwiz.cpl               1
+dll\cpl\control\control.exe             1
+dll\cpl\desk\desk.cpl                   1
+dll\cpl\intl\intl.cpl                   1
+dll\cpl\main\main.cpl                   1
+dll\cpl\mmsys\mmsys.cpl                 1
+dll\cpl\ncpa\ncpa.cpl                   1
+dll\cpl\sysdm\sysdm.cpl                 1
+dll\cpl\timedate\timedate.cpl           1
+dll\keyboard\kbdbe\kbdbe.dll            1
+dll\keyboard\kbdda\kbdda.dll            1
+dll\keyboard\kbddv\kbddv.dll            1
+dll\keyboard\kbdes\kbdes.dll            1
+dll\keyboard\kbdfr\kbdfr.dll            1
+dll\keyboard\kbdgr\kbdgr.dll            1
+dll\keyboard\kbdhe\kbdhe.dll            1
+dll\keyboard\kbdhu\kbdhu.dll            1
+dll\keyboard\kbdru\kbdru.dll            1
+dll\keyboard\kbdse\kbdse.dll            1
+dll\keyboard\kbdsg\kbdsg.dll            1
+dll\keyboard\kbdsk\kbdsk.dll            1
+dll\keyboard\kbduk\kbduk.dll            1
+dll\keyboard\kbdur\kbdur.dll            1
+dll\keyboard\kbdus\kbdus.dll            1
+dll\keyboard\kbdpo\kbdpo.dll            1
+dll\3rdparty\freetype\freetype.dll               1
+dll\3rdparty\mesa32\mesa32.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\d3d8thk\d3d8thk.dll                 1
+dll\win32\advapi32\advapi32.dll               1
+dll\win32\advpack\advpack.dll                 1
+dll\win32\aclui\aclui.dll                     1
+dll\win32\avifil32\avifil32.dll               1
+dll\win32\cabinet\cabinet.dll                 1
+dll\win32\cards\cards.dll                     1
+dll\win32\cfgmgr32\cfgmgr32.dll               1
+dll\win32\comctl32\comctl32.dll               1
+dll\win32\comdlg32\comdlg32.dll               1
+dll\win32\crtdll\crtdll.dll                   1
+dll\win32\crypt32\crypt32.dll                 1
+dll\win32\dbghelp\dbghelp.dll                 1
+dll\win32\devenum\devenum.dll                 1
+dll\win32\devmgr\devmgr.dll                   1
+dll\win32\dhcpcsvc\dhcpcsvc.dll               1
+dll\win32\dnsapi\dnsapi.dll                   1
+dll\win32\fmifs\fmifs.dll                     1
+dll\win32\gdi32\gdi32.dll                     1
+dll\win32\gdiplus\gdiplus.dll                 1
+dll\win32\glu32\glu32.dll                     1
+dll\win32\hid\hid.dll                         1
+dll\win32\icmp\icmp.dll                       1
+dll\win32\imagehlp\imagehlp.dll               1
+dll\win32\imm32\imm32.dll                     1
+dll\win32\iphlpapi\iphlpapi.dll               1
+dll\win32\kernel32\kernel32.dll               1
+dll\win32\lsasrv\lsasrv.dll                   1
+dll\win32\lzexpand\lz32.dll                   1
+dll\win32\mapi32\mapi32.dll                   1
+dll\win32\winmm\midimap\midimap.dll           1
+dll\win32\mmdrv\mmdrv.dll                     1
+dll\win32\mpr\mpr.dll                         1
+dll\win32\msacm\msacm32.dll                   1
+dll\win32\msafd\msafd.dll                     1
+dll\win32\msgina\msgina.dll                   1
+dll\win32\msi\msi.dll                         1
+dll\win32\msimg32\msimg32.dll                 1
+dll\win32\msvcrt\msvcrt.dll                   1
+dll\win32\msvcrt20\msvcrt20.dll               1
+dll\win32\msvideo\msvfw32.dll                 1
+dll\win32\mswsock\mswsock.dll                 1
+dll\win32\netapi32\netapi32.dll               1
+dll\win32\netcfgx\netcfgx.dll                 1
+dll\win32\newdev\newdev.dll                   1
+dll\ntdll\ntdll.dll                     1
+dll\win32\ntmarta\ntmarta.dll                 1
+dll\win32\objsel\objsel.dll                   1
+dll\win32\ole32\ole32.dll                     1
+dll\win32\oleacc\oleacc.dll                   1
+dll\win32\oleaut32\oleaut32.dll               1
+dll\win32\oledlg\oledlg.dll                   1
+dll\win32\olepro32\olepro32.dll               1
+dll\win32\opengl32\opengl32.dll               1
+dll\win32\psapi\psapi.dll                     1
+dll\win32\riched20\riched20.dll               1
+dll\win32\richedit\riched32.dll               1
+dll\win32\rpcrt4\rpcrt4.dll                   1
+dll\win32\samlib\samlib.dll             1
+dll\win32\samsrv\samsrv.dll                   1
+dll\win32\secur32\secur32.dll                 1
+dll\win32\serialui\serialui.dll               1
+dll\win32\setupapi\setupapi.dll               1
+dll\win32\shdocvw\shdocvw.dll                 1
+dll\win32\shell32\shell32.dll                 1
+dll\win32\shfolder\shfolder.dll               1
+dll\win32\shlwapi\shlwapi.dll                 1
+dll\win32\smdll\smdll.dll                     1
+dll\win32\syssetup\syssetup.dll               1
+dll\win32\twain\twain_32.dll                  1
+dll\win32\urlmon\urlmon.dll                   1
+dll\win32\user32\user32.dll                   1
+dll\win32\userenv\userenv.dll                 1
+dll\win32\uxtheme\uxtheme.dll                 1
+dll\win32\version\version.dll                 1
+dll\win32\wininet\wininet.dll                 1
+dll\win32\winmm\winmm.dll                     1
+dll\win32\winspool\winspool.drv               1
+dll\win32\wintrust\wintrust.dll               1
+dll\win32\ws2_32\ws2_32.dll                   1
+dll\win32\ws2help\ws2help.dll                 1
+dll\win32\wshirda\wshirda.dll                 1
+dll\win32\wsock32\wsock32.dll                 1
+
+subsystems\win32\csrss\csrss.exe                     1
+subsystems\win32\csrss\win32csr\win32csr.dll         1
+subsystems\csr\csr.exe                         1        optional
+subsystems\csr\csrsrv\csrsrv.dll               1        optional
+subsystems\win\basesrv\basesrv.dll             1        optional
+subsystems\win\winsrv\winsrv.dll               1        optional
+subsystems\ntvdm\ntvdm.exe                     1
+subsystems\smss\smss.exe                       1
+subsystems\win32\win32k\win32k.sys             1
+
+base\applications\games\solitaire\solitaire.exe 1
+base\applications\games\winemine\winemine.exe 1
+base\applications\autochk\autochk.exe       1
+base\applications\cacls\cacls.exe           1
+base\applications\calc\calc.exe             1
+base\applications\cmd\cmd.exe               1
+base\applications\devmgr\devmgrapp.exe      1
+base\applications\explorer\explorer.exe     4
+base\applications\explorer\explorer-cfg-template.xml 4
+base\applications\explorer\notifyhook\notifyhook.dll 1
+base\applications\format\format.exe         1
+base\applications\ibrowser\ibrowser.exe     1
+base\applications\lsass\lsass.exe           1
+base\applications\msconfig\msconfig.exe     1
+base\applications\msiexec\msiexec.exe       1
+base\applications\notepad\notepad.exe       1
+base\applications\gettype\gettype.exe       1
+base\applications\regedit\regedit.exe       4
+base\applications\regedit\clb\clb.dll       1
+base\applications\regsvr32\regsvr32.exe     1
+base\applications\reporterror\reporterror.exe 1
+base\applications\rundll32\rundll32.exe     1
+base\applications\sc\sc.exe                    1
+base\applications\services\services.exe     1
+base\applications\servman\servman.exe       1
+base\applications\setup\setup.exe           1
+base\applications\taskmgr\taskmgr.exe       1
+base\applications\userinit\userinit.exe     1
+base\applications\vmwinst\vmwinst.exe       1
+base\applications\winlogon\winlogon.exe     1
+base\applications\winefile\winefile.exe     1
+base\applications\winver\winver.exe         1
+base\applications\sm\sm.exe                 1
+base\applications\expand\expand.exe         1
+base\applications\hostname\hostname.exe     1
+base\applications\net\arp\arp.exe              1
+base\applications\net\route\route.exe          1
+base\applications\net\finger\finger.exe        1
+base\applications\net\ftp\ftp.exe              1
+base\applications\net\ipconfig\ipconfig.exe    1
+base\applications\net\netstat\netstat.exe      1
+base\applications\net\ping\ping.exe            1
+base\applications\net\telnet\telnet.exe        1
+base\applications\net\tracert\tracert.exe      1
+base\applications\net\whois\whois.exe          1
+base\applications\ps\ps.exe                    1
+base\applications\rosperf\rosperf.exe          1
+base\applications\shutdown\shutdown.exe        1
+base\applications\getfirefox\getfirefox.exe    1
+
+base\services\dhcp\dhcp.exe                  1
+base\services\eventlog\eventlog.exe          1
+base\services\rpcss\rpcss.exe                1
+base\services\tcpsvcs\tcpsvcs.exe            1
+base\services\tcpsvcs\quotes                 5
+base\services\umpnpmgr\umpnpmgr.exe          1
+

 media\fonts\c0419bt_.ttf                3
 media\fonts\c0582bt_.ttf                3
 media\fonts\c0583bt_.ttf                3
 media\fonts\c0419bt_.ttf                3
 media\fonts\c0582bt_.ttf                3
 media\fonts\c0583bt_.ttf                3


@@ -335,14 +342,15 @@ media\inf\syssetup.inf                  6
 media\inf\usbport.inf                   6
 media\inf\usbstor.inf                   6
 media\inf\xboxdisp.inf                  6
 media\inf\usbport.inf                   6
 media\inf\usbstor.inf                   6
 media\inf\xboxdisp.inf                  6

+

 modules\os2\server\os2srv.dll           1        optional
 modules\os2\server\os2srv.dll           1        optional

-modules\os2\lib\doscalls\doscalls.dll   1        optional
+modules\os2\dll\win32\doscalls\doscalls.dll   1        optional

 modules\posix\server\psxsrv.dll         1        optional
 modules\posix\server\psxsrv.dll         1        optional

-modules\posix\lib\psxdll\psxdll.dll     1        optional
-modules\rosky\lib\libsky\libsky.dll     1        optional
-modules\rosky\lib\libskygi\libskygi.dll 1        optional
+modules\posix\dll\win32\psxdll\psxdll.dll     1        optional
+modules\rosky\dll\win32\libsky\libsky.dll     1        optional
+modules\rosky\dll\win32\libskygi\libskygi.dll 1        optional

 modules\vms\server\vmssrv.dll           1        optional
 modules\vms\server\vmssrv.dll           1        optional

-modules\vms\lib\vmsdll\vmsdll.dll       1        optional
+modules\vms\dll\win32\vmsdll\vmsdll.dll       1        optional

 modules\rosapps\cmdutils\comp\comp.exe  1        optional
 modules\rosapps\cmdutils\find\find.exe  1        optional
 modules\rosapps\cmdutils\mode\mode.exe  1        optional
 modules\rosapps\cmdutils\comp\comp.exe  1        optional
 modules\rosapps\cmdutils\find\find.exe  1        optional
 modules\rosapps\cmdutils\mode\mode.exe  1        optional


@@ -351,15 +359,13 @@ modules\rosapps\cmdutils\sort\sort.exe  1        optional
 modules\rosapps\cmdutils\tee\tee.exe    1        optional
 modules\rosapps\cmdutils\touch\touch.exe       1 optional
 modules\rosapps\cmdutils\y\y.exe        1        optional
 modules\rosapps\cmdutils\tee\tee.exe    1        optional
 modules\rosapps\cmdutils\touch\touch.exe       1 optional
 modules\rosapps\cmdutils\y\y.exe        1        optional

-modules\rosapps\games\solitaire\sol.exe 1        optional
-modules\rosapps\games\winemine\winemine.exe    1 optional

 modules\rosapps\mc\mc.exe               1        optional
 modules\rosapps\net\ncftp\ncftp.exe     1        optional
 modules\rosapps\net\niclist\niclist.exe 1        optional
 modules\rosapps\notevil\notevil.exe     1        optional
 modules\rosapps\packmgr\cmd-line\rosget.exe    1 optional
 modules\rosapps\packmgr\gui\packmgr.exe 1        optional
 modules\rosapps\mc\mc.exe               1        optional
 modules\rosapps\net\ncftp\ncftp.exe     1        optional
 modules\rosapps\net\niclist\niclist.exe 1        optional
 modules\rosapps\notevil\notevil.exe     1        optional
 modules\rosapps\packmgr\cmd-line\rosget.exe    1 optional
 modules\rosapps\packmgr\gui\packmgr.exe 1        optional

-modules\rosapps\packmgr\lib\package.dll 1        optional
+modules\rosapps\packmgr\dll\win32\package.dll 1        optional

 modules\rosapps\sysutils\ctm\ctm.exe    1        optional
 modules\rosapps\sysutils\lsdd\lsdd.exe  1        optional
 modules\rosapps\sysutils\man\man.exe    1        optional
 modules\rosapps\sysutils\ctm\ctm.exe    1        optional
 modules\rosapps\sysutils\lsdd\lsdd.exe  1        optional
 modules\rosapps\sysutils\man\man.exe    1        optional

diff --git a/reactos/dll/ntdll/ntdll.rbuild b/reactos/dll/ntdll/ntdll.rbuild
index eacce54..e2b213a 100644 (file)
--- a/reactos/dll/ntdll/ntdll.rbuild
+++ b/reactos/dll/ntdll/ntdll.rbuild
@@ -2,6 +2,7 @@
        <bootstrap base="reactos/system32" />
        <importlibrary definition="def/ntdll.def" />
        <include base="ntdll">inc</include>
        <bootstrap base="reactos/system32" />
        <importlibrary definition="def/ntdll.def" />
        <include base="ntdll">inc</include>

+       <include base="ReactOS">include/reactos/subsys</include>

        <define name="__NTDLL__" />
        <define name="_DISABLE_TIDENTS" />
        <define name="__USE_W32API" />
        <define name="__NTDLL__" />
        <define name="_DISABLE_TIDENTS" />
        <define name="__USE_W32API" />

diff --git a/reactos/dll/win32/kernel32/kernel32.rbuild b/reactos/dll/win32/kernel32/kernel32.rbuild
index 8a5f230..f102881 100644 (file)
--- a/reactos/dll/win32/kernel32/kernel32.rbuild
+++ b/reactos/dll/win32/kernel32/kernel32.rbuild
@@ -1,6 +1,7 @@
 <module name="kernel32_base" type="objectlibrary">
        <include base="kernel32_base">.</include>
        <include base="kernel32_base">include</include>
 <module name="kernel32_base" type="objectlibrary">
        <include base="kernel32_base">.</include>
        <include base="kernel32_base">include</include>

+       <include base="ReactOS">include/reactos/subsys</include>

        <define name="_DISABLE_TIDENTS" />
        <define name="_SEH_NO_NATIVE_NLG" />
        <define name="__USE_W32API" />
        <define name="_DISABLE_TIDENTS" />
        <define name="_SEH_NO_NATIVE_NLG" />
        <define name="__USE_W32API" />

diff --git a/reactos/dll/win32/kernel32/misc/errormsg.c b/reactos/dll/win32/kernel32/misc/errormsg.c
index 9ca05a5..a5cf5e3 100644 (file)
--- a/reactos/dll/win32/kernel32/misc/errormsg.c
+++ b/reactos/dll/win32/kernel32/misc/errormsg.c
@@ -28,7 +28,7 @@
 #define NDEBUG
 
 #include "../include/debug.h"
 #define NDEBUG
 
 #include "../include/debug.h"

-#include "../include/wine/unicode.h"
+#include "wine/unicode.h"

 
 #define TRACE DPRINT
 #define FIXME DPRINT
 
 #define TRACE DPRINT
 #define FIXME DPRINT

diff --git a/reactos/dll/win32/msafd/msafd.rbuild b/reactos/dll/win32/msafd/msafd.rbuild
index d2f6ba6..3dd3063 100644 (file)
--- a/reactos/dll/win32/msafd/msafd.rbuild
+++ b/reactos/dll/win32/msafd/msafd.rbuild
@@ -1,6 +1,7 @@
 <module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}" installbase="system32" installname="msafd.dll">
        <importlibrary definition="msafd.def" />
        <include base="msafd">include</include>
 <module name="msafd" type="win32dll" baseaddress="${BASEADDRESS_MSAFD}" installbase="system32" installname="msafd.dll">
        <importlibrary definition="msafd.def" />
        <include base="msafd">include</include>

+       <include base="ReactOS">include/reactos/drivers</include>

        <define name="UNICODE" />
        <define name="_UNICODE" />
        <define name="__REACTOS__" />
        <define name="UNICODE" />
        <define name="_UNICODE" />
        <define name="__REACTOS__" />

diff --git a/reactos/dll/win32/secur32/secur32.rbuild b/reactos/dll/win32/secur32/secur32.rbuild
index a3b2317..d9555fd 100644 (file)
--- a/reactos/dll/win32/secur32/secur32.rbuild
+++ b/reactos/dll/win32/secur32/secur32.rbuild
@@ -1,6 +1,7 @@
 <module name="secur32" type="win32dll" baseaddress="${BASEADDRESS_SECUR32}" installbase="system32" installname="secur32.dll">
        <importlibrary definition="secur32.def" />
        <include base="secur32">.</include>
 <module name="secur32" type="win32dll" baseaddress="${BASEADDRESS_SECUR32}" installbase="system32" installname="secur32.dll">
        <importlibrary definition="secur32.def" />
        <include base="secur32">.</include>

+       <include base="ReactOS">include/reactos/subsys</include>

        <define name="__SECUR32__" />
        <define name="__USE_W32API" />
        <define name="_WIN32_WINNT">0x501</define>
        <define name="__SECUR32__" />
        <define name="__USE_W32API" />
        <define name="_WIN32_WINNT">0x501</define>

diff --git a/reactos/dll/win32/smdll/smdll.rbuild b/reactos/dll/win32/smdll/smdll.rbuild
index ab85dd9..0b3dd9d 100644 (file)
--- a/reactos/dll/win32/smdll/smdll.rbuild
+++ b/reactos/dll/win32/smdll/smdll.rbuild
@@ -1,6 +1,7 @@
 <module name="smdll" type="nativedll" baseaddress="${BASEADDRESS_SMDLL}" installbase="system32" installname="smdll.dll">
        <importlibrary definition="smdll.def" />
        <include base="smdll">.</include>
 <module name="smdll" type="nativedll" baseaddress="${BASEADDRESS_SMDLL}" installbase="system32" installname="smdll.dll">
        <importlibrary definition="smdll.def" />
        <include base="smdll">.</include>

+       <include base="ReactOS">include/reactos/subsys</include>

        <define name="__USE_W32API" />
        <define name="_DISABLE_TIDENTS" />
        <library>smlib</library>
        <define name="__USE_W32API" />
        <define name="_DISABLE_TIDENTS" />
        <library>smlib</library>

diff --git a/reactos/dll/win32/user32/user32.rbuild b/reactos/dll/win32/user32/user32.rbuild
index eb3192a..7df7fe6 100644 (file)
--- a/reactos/dll/win32/user32/user32.rbuild
+++ b/reactos/dll/win32/user32/user32.rbuild
@@ -2,6 +2,7 @@
        <importlibrary definition="user32.def" />
        <include base="user32">.</include>
        <include base="user32">include</include>
        <importlibrary definition="user32.def" />
        <include base="user32">.</include>
        <include base="user32">include</include>

+       <include base="ReactOS">include/reactos/subsys</include>

        <define name="_DISABLE_TIDENTS" />
        <define name="UNICODE" />
        <define name="__REACTOS__" />
        <define name="_DISABLE_TIDENTS" />
        <define name="UNICODE" />
        <define name="__REACTOS__" />

diff --git a/reactos/dll/win32/winmm/wavemap/wavemap.xml b/reactos/dll/win32/winmm/wavemap/wavemap.xml
index 88bba78..25fd37f 100644 (file)
--- a/reactos/dll/win32/winmm/wavemap/wavemap.xml
+++ b/reactos/dll/win32/winmm/wavemap/wavemap.xml
@@ -1,7 +1,7 @@
 <module name="wavemap" type="win32dll" baseaddress="${BASEADDRESS_WAVEMAP}" installbase="system32" installname="wavemap.dll" allowwarnings="true">
        <importlibrary definition="msacm.spec.def" />
        <include base="wavemap">.</include>
 <module name="wavemap" type="win32dll" baseaddress="${BASEADDRESS_WAVEMAP}" installbase="system32" installname="wavemap.dll" allowwarnings="true">
        <importlibrary definition="msacm.spec.def" />
        <include base="wavemap">.</include>

-       <include base="ReactOS">include/wine</include>
+       <include base="ReactOS">include/reactos/wine</include>

        <define name="UNICODE" />
        <define name="_UNICODE" />
        <define name="__REACTOS__" />
        <define name="UNICODE" />
        <define name="_UNICODE" />
        <define name="__REACTOS__" />

diff --git a/reactos/dll/win32/winmm/winmm.xml b/reactos/dll/win32/winmm/winmm.xml
index b4d9339..d1e744b 100644 (file)
--- a/reactos/dll/win32/winmm/winmm.xml
+++ b/reactos/dll/win32/winmm/winmm.xml
@@ -1,7 +1,7 @@
 <module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll" allowwarnings="true">
        <importlibrary definition="winmm.spec.def" />
        <include base="winmm">.</include>
 <module name="winmm" type="win32dll" baseaddress="${BASEADDRESS_WINMM}" installbase="system32" installname="winmm.dll" allowwarnings="true">
        <importlibrary definition="winmm.spec.def" />
        <include base="winmm">.</include>

-       <include base="ReactOS">include/wine</include>
+       <include base="ReactOS">include/reactos/wine</include>

        <define name="__REACTOS__" />
        <define name="__USE_W32API" />
        <define name="_WIN32_IE">0x600</define>
        <define name="__REACTOS__" />
        <define name="__USE_W32API" />
        <define name="_WIN32_IE">0x600</define>

diff --git a/reactos/drivers/base/blue/blue.xml b/reactos/drivers/base/blue/blue.xml
index 551f8e5..9b46a48 100644 (file)
--- a/reactos/drivers/base/blue/blue.xml
+++ b/reactos/drivers/base/blue/blue.xml
@@ -1,6 +1,7 @@
 <module name="blue" type="kernelmodedriver" installbase="system32/drivers" installname="blue.sys">
        <bootstrap base="reactos" />
         <define name="__USE_W32API" />
 <module name="blue" type="kernelmodedriver" installbase="system32/drivers" installname="blue.sys">
        <bootstrap base="reactos" />
         <define name="__USE_W32API" />

+       <include base="ReactOS">include/reactos/drivers</include>

        <library>ntoskrnl</library>
        <library>hal</library>
        <file>blue.c</file>
        <library>ntoskrnl</library>
        <library>hal</library>
        <file>blue.c</file>

diff --git a/reactos/drivers/network/afd/afd.xml b/reactos/drivers/network/afd/afd.xml
index f5a4dc6..da89b3c 100644 (file)
--- a/reactos/drivers/network/afd/afd.xml
+++ b/reactos/drivers/network/afd/afd.xml
@@ -1,5 +1,6 @@
 <module name="afd" type="kernelmodedriver" installbase="system32/drivers" installname="afd.sys">
        <include base="afd">include</include>
 <module name="afd" type="kernelmodedriver" installbase="system32/drivers" installname="afd.sys">
        <include base="afd">include</include>

+       <include base="ReactOS">include/reactos/drivers</include>

        <define name="__USE_W32API" />
        <library>pseh</library>
        <library>ntoskrnl</library>
        <define name="__USE_W32API" />
        <library>pseh</library>
        <library>ntoskrnl</library>

diff --git a/reactos/drivers/storage/diskdump/diskdump.xml b/reactos/drivers/storage/diskdump/diskdump.xml
index 0543bc1..428f682 100644 (file)
--- a/reactos/drivers/storage/diskdump/diskdump.xml
+++ b/reactos/drivers/storage/diskdump/diskdump.xml
@@ -1,6 +1,7 @@
 <module name="diskdump" type="kernelmodedriver" installbase="system32/drivers" installname="diskdump.sys">
        <bootstrap base="reactos" />
        <define name="__USE_W32API" />
 <module name="diskdump" type="kernelmodedriver" installbase="system32/drivers" installname="diskdump.sys">
        <bootstrap base="reactos" />
        <define name="__USE_W32API" />

+       <include base="ReactOS">include/reactos/drivers</include>

        <library definition="diskdump.def" />
        <library>ntoskrnl</library>
        <library>hal</library>
        <library definition="diskdump.def" />
        <library>ntoskrnl</library>
        <library>hal</library>

diff --git a/reactos/include/reactos/subsys/csrss/csrss.h b/reactos/include/reactos/subsys/csrss/csrss.h
index 9a018ba..0ce2044 100644 (file)
--- a/reactos/include/reactos/subsys/csrss/csrss.h
+++ b/reactos/include/reactos/subsys/csrss/csrss.h
@@ -1,7 +1,7 @@
 #ifndef __INCLUDE_CSRSS_CSRSS_H
 #define __INCLUDE_CSRSS_CSRSS_H
 
 #ifndef __INCLUDE_CSRSS_CSRSS_H
 #define __INCLUDE_CSRSS_CSRSS_H
 

-#include <blue/ntddblue.h>
+#include <drivers/blue/ntddblue.h>

 
 #define CSR_NATIVE     0x0000
 #define CSR_CONSOLE    0x0001
 
 #define CSR_NATIVE     0x0000
 #define CSR_CONSOLE    0x0001

diff --git a/reactos/lib/smlib/smlib.xml b/reactos/lib/smlib/smlib.xml
index d5da77a..546b20b 100644 (file)
--- a/reactos/lib/smlib/smlib.xml
+++ b/reactos/lib/smlib/smlib.xml
@@ -1,5 +1,6 @@
 <module name="smlib" type="staticlibrary">
        <include base="smlib">.</include>
 <module name="smlib" type="staticlibrary">
        <include base="smlib">.</include>

+       <include base="ReactOS">include/reactos/subsys</include>

        <define name="__USE_W32API" />
        <define name="_DISABLE_TIDENTS" />
        <file>connect.c</file>
        <define name="__USE_W32API" />
        <define name="_DISABLE_TIDENTS" />
        <file>connect.c</file>

diff --git a/reactos/ntoskrnl/ntoskrnl.rbuild b/reactos/ntoskrnl/ntoskrnl.rbuild
index 6e60e5a..4646fb2 100644 (file)
--- a/reactos/ntoskrnl/ntoskrnl.rbuild
+++ b/reactos/ntoskrnl/ntoskrnl.rbuild
@@ -9,6 +9,7 @@
        <define name="__USE_W32API" />
        <include base="kjs">include</include>
        <include base="ntoskrnl">include</include>
        <define name="__USE_W32API" />
        <include base="kjs">include</include>
        <include base="ntoskrnl">include</include>

+       <include base="ReactOS">include/reactos/drivers</include>

        <library>csq</library>
        <library>hal</library>
        <library>kjs</library>
        <library>csq</library>
        <library>hal</library>
        <library>kjs</library>

diff --git a/reactos/subsystems/win32/csrss/csrss.rbuild b/reactos/subsystems/win32/csrss/csrss.rbuild
index 668b4ff..ab05af2 100644 (file)
--- a/reactos/subsystems/win32/csrss/csrss.rbuild
+++ b/reactos/subsystems/win32/csrss/csrss.rbuild
@@ -1,6 +1,8 @@
 <module name="csrss" type="nativecui" installbase="system32" installname="csrss.exe">
        <include base="csrss">.</include>
        <include base="csrss">include</include>
 <module name="csrss" type="nativecui" installbase="system32" installname="csrss.exe">
        <include base="csrss">.</include>
        <include base="csrss">include</include>

+       <include base="ReactOS">include/reactos/subsys</include>
+       <include base="ReactOS">include/reactos/drivers</include>

        <define name="__USE_W32API" />
        <define name="_WIN32_WINNT">0x0600</define>
        <define name="WINVER">0x0501</define>
        <define name="__USE_W32API" />
        <define name="_WIN32_WINNT">0x0600</define>
        <define name="WINVER">0x0501</define>

diff --git a/reactos/subsystems/win32/csrss/win32csr/win32csr.xml b/reactos/subsystems/win32/csrss/win32csr/win32csr.xml
index f7c19a1..09c4297 100644 (file)
--- a/reactos/subsystems/win32/csrss/win32csr/win32csr.xml
+++ b/reactos/subsystems/win32/csrss/win32csr/win32csr.xml
@@ -2,6 +2,8 @@
        <importlibrary definition="win32csr.def" />
        <include base="win32csr">.</include>
        <include base="csrss">include</include>
        <importlibrary definition="win32csr.def" />
        <include base="win32csr">.</include>
        <include base="csrss">include</include>

+       <include base="ReactOS">include/reactos/subsys</include>
+       <include base="ReactOS">include/reactos/drivers</include>

        <define name="_DISABLE_TIDENTS" />
        <define name="__USE_W32API" />
        <define name="_WIN32_WINNT">0x0500</define>
        <define name="_DISABLE_TIDENTS" />
        <define name="__USE_W32API" />
        <define name="_WIN32_WINNT">0x0500</define>

diff --git a/reactos/subsystems/win32/win32k/win32k.rbuild b/reactos/subsystems/win32/win32k/win32k.rbuild
index 3c0f958..5752880 100644 (file)
--- a/reactos/subsystems/win32/win32k/win32k.rbuild
+++ b/reactos/subsystems/win32/win32k/win32k.rbuild
@@ -3,6 +3,8 @@
        <include base="win32k">include</include>
        <include base="ntoskrnl">include</include>
        <include base="freetype">include</include>
        <include base="win32k">include</include>
        <include base="ntoskrnl">include</include>
        <include base="freetype">include</include>

+       <include base="ReactOS">include/reactos/subsys</include>
+       <include base="ReactOS">include/reactos/drivers</include>

        <define name="UNICODE" />
        <define name="__USE_W32API" />
        <define name="_WIN32_WINNT">0x0501</define>
        <define name="UNICODE" />
        <define name="__USE_W32API" />
        <define name="_WIN32_WINNT">0x0501</define>