[ros-diffs] [fireball] 34627: - Remove useless USE_W32API define from .rbuilds - Fix compilation of a number of modules. - Delete outdated fmifs.h, the one from ReactOS includes should be used instead. - Move more libs to /lib directory.

Author: fireball
Date: Mon Jul 21 04:15:15 2008
New Revision: 34627

URL: http://svn.reactos.org/svn/reactos?rev=34627&view=rev
Log:
- Remove useless USE_W32API define from .rbuilds
- Fix compilation of a number of modules.
- Delete outdated fmifs.h, the one from ReactOS includes should be used instead.
- Move more libs to /lib directory.

Added:
    trunk/rosapps/lib/win32err/   (props changed)
      - copied from r34605, trunk/rosapps/applications/sysutils/lib/
    trunk/rosapps/lib/win32err/win32err.rbuild   (contents, props changed)
      - copied, changed from r34605, trunk/rosapps/applications/sysutils/lib/lib.rbuild
Removed:
    trunk/rosapps/applications/packmgr/gui/lang/pl-PL.rc
    trunk/rosapps/applications/packmgr/gui/lang/sk-SK.rc
    trunk/rosapps/applications/packmgr/gui/lang/uk-UA.rc
    trunk/rosapps/applications/packmgr/lib/lang/pl-PL.rc
    trunk/rosapps/applications/sysutils/fmifs.h
    trunk/rosapps/applications/sysutils/lib/
    trunk/rosapps/lib/win32err/lib.rbuild
Modified:
    trunk/rosapps/applications/applications.rbuild
    trunk/rosapps/applications/cmdutils/comp/comp.rbuild
    trunk/rosapps/applications/cmdutils/mode/mode.rbuild
    trunk/rosapps/applications/cmdutils/sort/sort.rbuild
    trunk/rosapps/applications/cmdutils/tee/tee.rbuild
    trunk/rosapps/applications/cmdutils/touch/touch.rbuild
    trunk/rosapps/applications/cmdutils/uptime/uptime.rbuild
    trunk/rosapps/applications/cmdutils/y/y.rbuild
    trunk/rosapps/applications/devutils/cputointel/cputointel.rbuild
    trunk/rosapps/applications/devutils/gdb2/gdb2.rbuild
    trunk/rosapps/applications/devutils/gdihv/gdihv.rbuild
    trunk/rosapps/applications/devutils/genguid/genguid.rbuild
    trunk/rosapps/applications/devutils/roswebparser/roswebparser.rbuild
    trunk/rosapps/applications/devutils/syscalldump/syscalldump.rbuild
    trunk/rosapps/applications/devutils/zoomin/zoomin.rbuild
    trunk/rosapps/applications/downloader/downloader.rbuild
    trunk/rosapps/applications/fontview/fontview.rbuild
    trunk/rosapps/applications/imagesoft/imagesoft.rbuild
    trunk/rosapps/applications/magnify/magnify.rbuild
    trunk/rosapps/applications/net/ncftp/ncftp.rbuild
    trunk/rosapps/applications/net/netreg/netreg.rbuild
    trunk/rosapps/applications/net/niclist/niclist.rbuild
    trunk/rosapps/applications/net/roshttpd/roshttpd.rbuild
    trunk/rosapps/applications/notevil/notevil.rbuild
    trunk/rosapps/applications/packmgr/cmd-line/rosget.rbuild
    trunk/rosapps/applications/packmgr/gui/main.h
    trunk/rosapps/applications/packmgr/gui/packmgr.rbuild
    trunk/rosapps/applications/packmgr/gui/packmgr.rc
    trunk/rosapps/applications/packmgr/lib/package.rbuild
    trunk/rosapps/applications/packmgr/lib/package.rc
    trunk/rosapps/applications/sysutils/chkdsk/chkdsk.c
    trunk/rosapps/applications/sysutils/chkdsk/chkdsk.rbuild
    trunk/rosapps/applications/sysutils/chklib/chklib.rbuild
    trunk/rosapps/applications/sysutils/ctm/ctm.rbuild
    trunk/rosapps/applications/sysutils/gettype/gettype.rbuild
    trunk/rosapps/applications/sysutils/kill/kill.rbuild
    trunk/rosapps/applications/sysutils/logevent/logevent.rbuild
    trunk/rosapps/applications/sysutils/lsdd/lsdd.rbuild
    trunk/rosapps/applications/sysutils/man/man.rbuild
    trunk/rosapps/applications/sysutils/pedump/pedump.rbuild
    trunk/rosapps/applications/sysutils/regexpl/regexpl.rbuild
    trunk/rosapps/applications/sysutils/screenshot/screenshot.rbuild
    trunk/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild
    trunk/rosapps/applications/sysutils/sysutils.rbuild
    trunk/rosapps/applications/sysutils/tcat/tcat.rbuild
    trunk/rosapps/applications/sysutils/tlist/tlist.rbuild
    trunk/rosapps/applications/sysutils/utils/binpatch/binpatch.rbuild
    trunk/rosapps/applications/sysutils/utils/cat/cat.rbuild
    trunk/rosapps/applications/sysutils/utils/driver/load/load.rbuild
    trunk/rosapps/applications/sysutils/utils/driver/unload/unload.rbuild
    trunk/rosapps/applications/sysutils/utils/infinst/infinst.rbuild
    trunk/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.rbuild
    trunk/rosapps/applications/sysutils/utils/objdir/objdir.rbuild
    trunk/rosapps/applications/sysutils/utils/partinfo/partinfo.rbuild
    trunk/rosapps/applications/sysutils/utils/ps/ps.rbuild
    trunk/rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild
    trunk/rosapps/applications/sysutils/utils/stats/stats.rbuild
    trunk/rosapps/applications/sysutils/utils/tickcount/tickcount.rbuild
    trunk/rosapps/applications/winfile/winfile.rbuild
    trunk/rosapps/applications/winver/winver.rbuild
    trunk/rosapps/applications/write/write.rbuild
    trunk/rosapps/demos/ddraw/ddraw.rbuild
    trunk/rosapps/demos/maze/maze.rbuild
    trunk/rosapps/dflat32/dflat32.rbuild
    trunk/rosapps/lib/dflat32/dflat32.rbuild
    trunk/rosapps/lib/directory.rbuild
    trunk/rosapps/templates/dialog/dialog.rbuild
    trunk/rosapps/templates/mdi/mdi.rbuild
    trunk/rosapps/templates/old_wordpad/old_wordpad.rbuild

Modified: trunk/rosapps/applications/applications.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/applications.…
==============================================================================
--- trunk/rosapps/applications/applications.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/applications.rbuild [iso-8859-1] Mon Jul 21 04:15:15 2008
@@ -25,6 +25,11 @@
 		<xi:include href="fraginator/fraginator.rbuild" />
 	</directory>
 -->
+
+	<directory name="imagesoft">
+		<xi:include href="imagesoft/imagesoft.rbuild" />
+	</directory>
+
 	<directory name="magnify">
 		<xi:include href="magnify/magnify.rbuild" />
 	</directory>
@@ -37,11 +42,9 @@
 		<xi:include href="notevil/notevil.rbuild" />
 	</directory>
 
-	<!--
 	<directory name="packmgr">
 		<xi:include href="packmgr/directory.rbuild" />
 	</directory>
-	-->
 
 	<directory name="sysutils">
 		<xi:include href="sysutils/sysutils.rbuild" />

Modified: trunk/rosapps/applications/cmdutils/comp/comp.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/comp…
==============================================================================
--- trunk/rosapps/applications/cmdutils/comp/comp.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/cmdutils/comp/comp.rbuild [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -1,5 +1,4 @@
 <module name="comp" type="win32cui"
installbase="system32" installname="comp.exe"
allowwarnings="true">
-    <define name="__USE_W32API" />
     <library>kernel32</library>
     <file>comp.c</file>
     <file>comp.rc</file>

Modified: trunk/rosapps/applications/cmdutils/mode/mode.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/mode…
==============================================================================
--- trunk/rosapps/applications/cmdutils/mode/mode.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/cmdutils/mode/mode.rbuild [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -1,7 +1,6 @@
 <module name="mode" type="win32cui"
installbase="system32" installname="mode.exe">
 	<include base="mode">.</include>
 	<include base="mode">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

Modified: trunk/rosapps/applications/cmdutils/sort/sort.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/sort…
==============================================================================
--- trunk/rosapps/applications/cmdutils/sort/sort.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/cmdutils/sort/sort.rbuild [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -1,5 +1,4 @@
 <module name="sort" type="win32cui"
installbase="system32" installname="sort.exe">
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

Modified: trunk/rosapps/applications/cmdutils/tee/tee.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/tee/…
==============================================================================
--- trunk/rosapps/applications/cmdutils/tee/tee.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/cmdutils/tee/tee.rbuild [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -1,5 +1,4 @@
 <module name="tee" type="win32cui"
installbase="system32" installname="tee.exe">
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

Modified: trunk/rosapps/applications/cmdutils/touch/touch.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/touc…
==============================================================================
--- trunk/rosapps/applications/cmdutils/touch/touch.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/cmdutils/touch/touch.rbuild [iso-8859-1] Mon Jul 21
04:15:15 2008
@@ -1,6 +1,5 @@
 <module name="touch" type="win32cui"
installbase="system32" installname="touch.exe">
 	<include base="touch">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>ntdll</library>

Modified: trunk/rosapps/applications/cmdutils/uptime/uptime.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/upti…
==============================================================================
--- trunk/rosapps/applications/cmdutils/uptime/uptime.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/cmdutils/uptime/uptime.rbuild [iso-8859-1] Mon Jul 21
04:15:15 2008
@@ -1,5 +1,4 @@
 <module name="uptime" type="win32cui"
installbase="system32" installname="uptime.exe"
allowwarnings="true">
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 <!-- <define name="LINUX_OUTPUT"></define> -->

Modified: trunk/rosapps/applications/cmdutils/y/y.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/cmdutils/y/y.…
==============================================================================
--- trunk/rosapps/applications/cmdutils/y/y.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/cmdutils/y/y.rbuild [iso-8859-1] Mon Jul 21 04:15:15 2008
@@ -1,5 +1,4 @@
 <module name="y" type="win32cui" installbase="system32"
installname="y.exe">
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

Modified: trunk/rosapps/applications/devutils/cputointel/cputointel.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/cput…
==============================================================================
--- trunk/rosapps/applications/devutils/cputointel/cputointel.rbuild [iso-8859-1]
(original)
+++ trunk/rosapps/applications/devutils/cputointel/cputointel.rbuild [iso-8859-1] Mon Jul
21 04:15:15 2008
@@ -1,6 +1,5 @@
 <module name="cputointel" type="win32cui"
installbase="system32" installname="cputointel.exe" 
stdlib="host">
 	<include base="cputointel">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

Modified: trunk/rosapps/applications/devutils/gdb2/gdb2.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/gdb2…
==============================================================================
--- trunk/rosapps/applications/devutils/gdb2/gdb2.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/gdb2/gdb2.rbuild [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -1,6 +1,5 @@
 <module name="gdb2" type="win32cui"
installbase="system32" installname="gdb2.exe" 
stdlib="host">
 	<include base="gdb2">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

Modified: trunk/rosapps/applications/devutils/gdihv/gdihv.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/gdih…
==============================================================================
--- trunk/rosapps/applications/devutils/gdihv/gdihv.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/gdihv/gdihv.rbuild [iso-8859-1] Mon Jul 21
04:15:15 2008
@@ -1,6 +1,5 @@
 <module name="gdihv" type="win32gui"
installbase="system32" installname="gdihv.exe">
 	<include base="gdihv">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>user32</library>

Modified: trunk/rosapps/applications/devutils/genguid/genguid.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/geng…
==============================================================================
--- trunk/rosapps/applications/devutils/genguid/genguid.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/genguid/genguid.rbuild [iso-8859-1] Mon Jul 21
04:15:15 2008
@@ -1,5 +1,4 @@
 <module name="genguid" type="win32cui"
installbase="system32" installname="genguid.exe">
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

Modified: trunk/rosapps/applications/devutils/roswebparser/roswebparser.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/rosw…
==============================================================================
--- trunk/rosapps/applications/devutils/roswebparser/roswebparser.rbuild [iso-8859-1]
(original)
+++ trunk/rosapps/applications/devutils/roswebparser/roswebparser.rbuild [iso-8859-1] Mon
Jul 21 04:15:15 2008
@@ -2,9 +2,9 @@
 	<include base="zoomin">.</include>
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
-	<define name="__USE_W32API" />
-      <library>kernel32</library>
+	
+	<library>kernel32</library>
+
 	<file>roswebparser.c</file>
-      <file>utf8.c</file>
-
+	<file>utf8.c</file>
 </module>

Modified: trunk/rosapps/applications/devutils/syscalldump/syscalldump.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/sysc…
==============================================================================
--- trunk/rosapps/applications/devutils/syscalldump/syscalldump.rbuild [iso-8859-1]
(original)
+++ trunk/rosapps/applications/devutils/syscalldump/syscalldump.rbuild [iso-8859-1] Mon
Jul 21 04:15:15 2008
@@ -1,6 +1,5 @@
 <module name="syscalldump" type="win32cui"
installname="syscalldump.exe">
 	<include base="syscalldump">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

Modified: trunk/rosapps/applications/devutils/zoomin/zoomin.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/zoom…
==============================================================================
--- trunk/rosapps/applications/devutils/zoomin/zoomin.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/devutils/zoomin/zoomin.rbuild [iso-8859-1] Mon Jul 21
04:15:15 2008
@@ -2,7 +2,6 @@
 	<include base="zoomin">.</include>
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>

Modified: trunk/rosapps/applications/downloader/downloader.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/downloader/do…
==============================================================================
--- trunk/rosapps/applications/downloader/downloader.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/downloader/downloader.rbuild [iso-8859-1] Mon Jul 21
04:15:15 2008
@@ -5,7 +5,6 @@
 		<include base="downloader">.</include>
 		<include base="expat">.</include>
 
-		<define name="__USE_W32API" />
 		<define name="WINVER">0x0501</define>
 		<define name="_WIN32_IE">0x0600</define>
 

Modified: trunk/rosapps/applications/fontview/fontview.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/fontview/font…
==============================================================================
--- trunk/rosapps/applications/fontview/fontview.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/fontview/fontview.rbuild [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -1,6 +1,5 @@
 <module name="fontview" type="win32gui"
installbase="system32" installname="fontview.exe">
 	<include base="fontview">.</include>
-	<define name="__USE_W32API" />
 	<library>gdi32</library>
 	<library>user32</library>
 	<library>shell32</library>

Modified: trunk/rosapps/applications/imagesoft/imagesoft.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/imagesoft/ima…
==============================================================================
--- trunk/rosapps/applications/imagesoft/imagesoft.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/imagesoft/imagesoft.rbuild [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -2,7 +2,6 @@
 <rbuild xmlns:xi="http://www.w3.org/2001/XInclude">
 	<module name="imagesoft" type="win32gui"
installbase="system32" installname="imagesoft.exe"
unicode="yes">
 		<include base="imagesoft">.</include>
-		<define name="__USE_W32API" />
 		<define name="_WIN32_IE">0x0600</define>
 		<define name="_WIN32_WINNT">0x0501</define>
 		<library>kernel32</library>

Modified: trunk/rosapps/applications/magnify/magnify.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/magnify/magni…
==============================================================================
--- trunk/rosapps/applications/magnify/magnify.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/magnify/magnify.rbuild [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -2,7 +2,6 @@
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
 <module name="magnify" type="win32gui"
installbase="system32" installname="magnify.exe">
 	<include base="magnify">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0600</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>user32</library>

Modified: trunk/rosapps/applications/net/ncftp/ncftp.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/ncftp/ncf…
==============================================================================
--- trunk/rosapps/applications/net/ncftp/ncftp.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/net/ncftp/ncftp.rbuild [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -6,7 +6,6 @@
 	<include base="ncftp">ncftp</include>
 
 	<define name="ncftp" />
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

Modified: trunk/rosapps/applications/net/netreg/netreg.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/netreg/ne…
==============================================================================
--- trunk/rosapps/applications/net/netreg/netreg.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/net/netreg/netreg.rbuild [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -1,6 +1,5 @@
 <module name="netreg" type="win32cui"
installbase="system32" installname="netreg.exe" 
stdlib="host">
 	<include base="netreg">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

Modified: trunk/rosapps/applications/net/niclist/niclist.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/niclist/n…
==============================================================================
--- trunk/rosapps/applications/net/niclist/niclist.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/net/niclist/niclist.rbuild [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -1,6 +1,5 @@
 <module name="niclist" type="win32cui"
installbase="system32" installname="niclist.exe">
 	<include base="niclist">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

Modified: trunk/rosapps/applications/net/roshttpd/roshttpd.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/roshttpd/…
==============================================================================
--- trunk/rosapps/applications/net/roshttpd/roshttpd.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/net/roshttpd/roshttpd.rbuild [iso-8859-1] Mon Jul 21
04:15:15 2008
@@ -2,7 +2,6 @@
 <!DOCTYPE project SYSTEM "tools/rbuild/project.dtd">
 <module name="roshttpd" type="win32cui"
installbase="system32" installname="roshttpd.exe"
stdlib="host">
 	<include base="roshttpd">include</include>
-	<define name="__USE_W32API" />
 	<define name="__USE_W32_SOCKETS" />
 	<define name="_WIN32_IE">0x600</define>
 	<define name="_WIN32_WINNT">0x501</define>

Modified: trunk/rosapps/applications/notevil/notevil.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/notevil/notev…
==============================================================================
--- trunk/rosapps/applications/notevil/notevil.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/notevil/notevil.rbuild [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -1,6 +1,5 @@
 <module name="notevil" type="win32cui"
installbase="system32" installname="notevil.exe">
 	<include base="notevil">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

Modified: trunk/rosapps/applications/packmgr/cmd-line/rosget.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/packmgr/cmd-l…
==============================================================================
--- trunk/rosapps/applications/packmgr/cmd-line/rosget.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/packmgr/cmd-line/rosget.rbuild [iso-8859-1] Mon Jul 21
04:15:15 2008
@@ -1,6 +1,5 @@
 <module name="rosget" type="win32cui"
installbase="system32" installname="rosget.exe">
 	<include base="package">.</include>
-	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>

Removed: trunk/rosapps/applications/packmgr/gui/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/packmgr/gui/l…
==============================================================================
--- trunk/rosapps/applications/packmgr/gui/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/rosapps/applications/packmgr/gui/lang/pl-PL.rc (removed)
@@ -1,99 +1,0 @@
-/*
- *      translated by Caemyr - Olaf Siejka (Feb, 2008)
- *      Use ReactOS forum PM or IRC to contact me
- *      http://www.reactos.org
- *      IRC: irc.freenode.net #reactos-pl;
- */
-
-LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-
-/* Dialogs */
-IDD_OPTIONS DIALOGEX DISCARDABLE  0, 0, 180, 200
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Opcje"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT	"Brak opcji do ustawienia.", 0, 50, 95, 80, 8
-END
-
-IDD_DOIT DIALOGEX DISCARDABLE  0, 0, 180, 100
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Wykonywanie zadañ"
-FONT 8, "MS Shell Dlg"
-BEGIN
-
-    CTEXT	    "{Stan}", IDC_TSTATUS, 0, 10, 180, 8
-
-    CONTROL         "", IDC_STATUS1, "msctls_progress32", PBS_SMOOTH,
20, 25, 140, 15
-
-    CONTROL         "", IDC_STATUS2, "msctls_progress32", PBS_SMOOTH,
20, 45, 140, 15
-
-    PUSHBUTTON      "Przerwij", IDC_CANCEL, 65, 70, 50, 14, WS_DISABLED
-END
-
-IDR_POPUP MENU DISCARDABLE
-BEGIN
-    POPUP "PopUp", MENUBARBREAK
-    BEGIN
-        MENUITEM "Brak zadañ",        	    	1, GRAYED
-        MENUITEM "Instaluj (zalecane)",         2, GRAYED
-        MENUITEM "Instaluj ze Ÿród³a",          3, GRAYED
-        MENUITEM "Uaktualnij",                  4, GRAYED
-        MENUITEM "Odinstaluj",                  5, GRAYED
-        MENUITEM SEPARATOR
-        MENUITEM "Opcje",                       8
-        MENUITEM SEPARATOR
-        MENUITEM "ZróbTo",                      6
-    END
-END
-
-/*
- *      translated by Caemyr - Olaf Siejka (Feb, 2008)
- *      Use ReactOS forum PM or IRC to contact me
- *      http://www.reactos.org
- *      IRC: irc.freenode.net #reactos-pl;
- */
-
-LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-
-/* Dialogs */
-IDD_OPTIONS DIALOGEX DISCARDABLE  0, 0, 180, 200
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Opcje"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT	"Brak opcji do ustawienia.", 0, 50, 95, 80, 8
-END
-
-IDD_DOIT DIALOGEX DISCARDABLE  0, 0, 180, 100
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Wykonywanie zadañ"
-FONT 8, "MS Shell Dlg"
-BEGIN
-
-    CTEXT	    "{Stan}", IDC_TSTATUS, 0, 10, 180, 8
-
-    CONTROL         "", IDC_STATUS1, "msctls_progress32", PBS_SMOOTH,
20, 25, 140, 15
-
-    CONTROL         "", IDC_STATUS2, "msctls_progress32", PBS_SMOOTH,
20, 45, 140, 15
-
-    PUSHBUTTON      "Przerwij", IDC_CANCEL, 65, 70, 50, 14, WS_DISABLED
-END
-
-IDR_POPUP MENU DISCARDABLE
-BEGIN
-    POPUP "PopUp", MENUBARBREAK
-    BEGIN
-        MENUITEM "Brak zadañ",        	    	1, GRAYED
-        MENUITEM "Instaluj (zalecane)",         2, GRAYED
-        MENUITEM "Instaluj ze Ÿród³a",          3, GRAYED
-        MENUITEM "Uaktualnij",                  4, GRAYED
-        MENUITEM "Odinstaluj",                  5, GRAYED
-        MENUITEM SEPARATOR
-        MENUITEM "Opcje",                       8
-        MENUITEM SEPARATOR
-        MENUITEM "ZróbTo",                      6
-    END
-END
-
-

Removed: trunk/rosapps/applications/packmgr/gui/lang/sk-SK.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/packmgr/gui/l…
==============================================================================
--- trunk/rosapps/applications/packmgr/gui/lang/sk-SK.rc [iso-8859-1] (original)
+++ trunk/rosapps/applications/packmgr/gui/lang/sk-SK.rc (removed)
@@ -1,44 +1,0 @@
-/* TRANSLATOR:  Mário Kaèmár /Mario Kacmar/ aka Kario (kario(a)szm.sk)
- * DATE OF TR:  03-02-2008
- */
-
-LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT
-
-/* Dialogs */
-IDD_OPTIONS DIALOGEX DISCARDABLE  0, 0, 180, 200
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Možnosti"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT	"Zatia¾ nie sú žiadne možnosti.", 0, 50, 95, 80, 8
-END
-
-IDD_DOIT DIALOGEX DISCARDABLE  0, 0, 180, 100
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Vykonávam operácie"
-FONT 8, "MS Shell Dlg"
-BEGIN
-
-    CTEXT	    "{Status}", IDC_TSTATUS, 0, 10, 180, 8
-
-    CONTROL         "", IDC_STATUS1, "msctls_progress32", PBS_SMOOTH,
20, 25, 140, 15
-
-    CONTROL         "", IDC_STATUS2, "msctls_progress32", PBS_SMOOTH,
20, 45, 140, 15
-
-    PUSHBUTTON      "Zruši", IDC_CANCEL, 65, 70, 50, 14, WS_DISABLED
-END
-
-IDR_POPUP MENU DISCARDABLE
-BEGIN
-    POPUP "PopUp", MENUBARBREAK
-    BEGIN
-        MENUITEM "Žiadna akcia",        	    	1, GRAYED
-        MENUITEM "Inštalova (odporúèané)",       2, GRAYED
-        MENUITEM "Inštalova zo zdrojových kódov",         3, GRAYED
-        MENUITEM "Aktualizova",                      4, GRAYED
-        MENUITEM "Odinštalova",                   5, GRAYED
-        MENUITEM SEPARATOR
-        MENUITEM "Možnosti",                     8
-        MENUITEM SEPARATOR
-        MENUITEM "Spravi",                        6
-    END

Removed: trunk/rosapps/applications/packmgr/gui/lang/uk-UA.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/packmgr/gui/l…
==============================================================================
--- trunk/rosapps/applications/packmgr/gui/lang/uk-UA.rc [iso-8859-1] (original)
+++ trunk/rosapps/applications/packmgr/gui/lang/uk-UA.rc (removed)
@@ -1,50 +1,0 @@
-/*
- * PROJECT:     ReactOS Package Manager
- * LICENSE:     GPL - See COPYING in the top level directory
- * FILE:        rosapps/packmgr/gui/uk.rc
- * PURPOSE:     Ukraianian Language File for packmgr
- * TRANSLATOR:  Artem Reznikov
- */
-
-LANGUAGE LANG_UKRAINIAN, SUBLANG_DEFAULT
-
-/* Dialogs */
-IDD_OPTIONS DIALOGEX DISCARDABLE  0, 0, 180, 200
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Ïàðàìåòðè"
-FONT 8, "MS Shell Dlg"
-BEGIN
-    LTEXT	"Ùå íåìຠí³ÿêèõ ïàðàìåòð³â.", 0, 50, 95, 80, 8
-END
-
-IDD_DOIT DIALOGEX DISCARDABLE  0, 0, 180, 100
-STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Âèêîíàííÿ îïåðàö³é"
-FONT 8, "MS Shell Dlg"
-BEGIN
-
-    CTEXT	    "{Status}", IDC_TSTATUS, 0, 10, 180, 8
-
-    CONTROL         "", IDC_STATUS1, "msctls_progress32", PBS_SMOOTH,
20, 25, 140, 15
-
-    CONTROL         "", IDC_STATUS2, "msctls_progress32", PBS_SMOOTH,
20, 45, 140, 15
-
-    PUSHBUTTON      "Ïåðåðâàòè", IDC_CANCEL, 65, 70, 50, 14, WS_DISABLED
-END
-
-IDR_POPUP MENU DISCARDABLE
-BEGIN
-    POPUP "PopUp", MENUBARBREAK
-    BEGIN
-        MENUITEM "Íåìຠ䳿",        	    	1, GRAYED
-        MENUITEM "Óñòàíîâèòè (ðåêîìåíäîâàíî)",  2, GRAYED
-        MENUITEM "Óñòàíîâèòè ç âèõ³äíèõ êîä³â", 3, GRAYED
-        MENUITEM "Îíîâèòè",                     4, GRAYED
-        MENUITEM "Âèäàëèòè",                    5, GRAYED
-        MENUITEM SEPARATOR
-        MENUITEM "Ïàðàìåòðè",                   8
-        MENUITEM SEPARATOR
-        MENUITEM "Âèêîíàòè",                    6
-    END
-END
-

Modified: trunk/rosapps/applications/packmgr/gui/main.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/packmgr/gui/m…
==============================================================================
--- trunk/rosapps/applications/packmgr/gui/main.h [iso-8859-1] (original)
+++ trunk/rosapps/applications/packmgr/gui/main.h [iso-8859-1] Mon Jul 21 04:15:15 2008
@@ -38,8 +38,6 @@
 
 /* Toolbar Releated */
 
-#define TBSTYLE_FLAT 2048
-
 // This is the struct where the toolbar is defined
 extern const TBBUTTON Buttons [];
 

Modified: trunk/rosapps/applications/packmgr/gui/packmgr.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/packmgr/gui/p…
==============================================================================
--- trunk/rosapps/applications/packmgr/gui/packmgr.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/packmgr/gui/packmgr.rbuild [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -1,7 +1,6 @@
 <module name="packmgr" type="win32gui"
installbase="system32" installname="packmgr.exe">
 	<include base="package">.</include>
 	<include base="packmgr">.</include>
-	<define name="__USE_W32API" />
 	<define name="UNICODE" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>

Modified: trunk/rosapps/applications/packmgr/gui/packmgr.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/packmgr/gui/p…
==============================================================================
--- trunk/rosapps/applications/packmgr/gui/packmgr.rc [iso-8859-1] (original)
+++ trunk/rosapps/applications/packmgr/gui/packmgr.rc [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -18,9 +18,6 @@
 #include "lang/en-US.rc"
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
-#include "lang/pl-PL.rc"
 #include "lang/ru-RU.rc"
-#include "lang/sk-SK.rc"
-#include "lang/uk-UA.rc"
 
 /* EOF */

Removed: trunk/rosapps/applications/packmgr/lib/lang/pl-PL.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/packmgr/lib/l…
==============================================================================
--- trunk/rosapps/applications/packmgr/lib/lang/pl-PL.rc [iso-8859-1] (original)
+++ trunk/rosapps/applications/packmgr/lib/lang/pl-PL.rc (removed)
@@ -1,62 +1,0 @@
-/*
- *      translated by Caemyr - Olaf Siejka (Feb, 2008)
- *      Use ReactOS forum PM or IRC to contact me
- *      http://www.reactos.org
- *      IRC: irc.freenode.net #reactos-pl;
- */
-
-LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-
-/* String Tables */
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_LOAD	   "£adowanie ..."
-  ERR_OK	   "Zadanie ukoñczone."
-  ERR_PACK	   "Nie uda³o siê zainstalowaæ wszystkich pakietów\n\nProszê sprawdziæ
szczegó³y w logach."
-  ERR_GENERIC      "Wyst¹pi³ b³¹d. \nWiêcej informacji znajduje siê w logach."
-  ERR_DOWNL	   "Niezbêdny plik nie móg³ zostaæ œci¹gniêty!\nWiêcej informacji
znajduje siê w logach."
-  ERR_FILE	   "B³¹d podczas wykonywania skryptu.\nPlik nie móg³ zostaæ
otwarty."
-
-  ERR_SYNATX       "B³¹d podczas wykonywania skryptu.\nNieprawid³owa
sk³adnia."
-  ERR_CALL         "B³¹d podczas wykonywania skryptu.\nFunkcja nie zosta³a
znaleziona."
-  ERR_PARAMETER    "B³¹d podczas wykonywania skryptu.\nB³êdny parametr(y)."
-
-  ERR_DEP1	   "Do zainstalowania tego pakietu konieczne jest uprzednie
zainstalowanie nastêpuj¹cych:\n\n"
-  ERR_DEP2	   "\nCzy chcesz je teraz zainstalowaæ ?"
-  ERR_READY	   "Wybra³eœ instalacjê %d pakietu(ów). Aby je zainstalowaæ, musisz
przeczytaæ i zaakceptowaæ licencjê ka¿dego z nich. \n\nCzy chcesz kontynuowaæ ?"
-END
-
-123 RCDATA	   "options.xml"
-
-/* EOF */
-/*
- *      translated by Caemyr - Olaf Siejka (Feb, 2008)
- *      Use ReactOS forum PM or IRC to contact me
- *      http://www.reactos.org
- *      IRC: irc.freenode.net #reactos-pl;
- */
-
-LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
-
-/* String Tables */
-STRINGTABLE DISCARDABLE
-BEGIN
-  IDS_LOAD	   "£adowanie ..."
-  ERR_OK	   "Zadanie ukoñczone."
-  ERR_PACK	   "Nie uda³o siê zainstalowaæ wszystkich pakietów\n\nProszê sprawdziæ
szczegó³y w logach."
-  ERR_GENERIC      "Wyst¹pi³ b³¹d. \nWiêcej informacji znajduje siê w logach."
-  ERR_DOWNL	   "Niezbêdny plik nie móg³ zostaæ œci¹gniêty!\nWiêcej informacji
znajduje siê w logach."
-  ERR_FILE	   "B³¹d podczas wykonywania skryptu.\nPlik nie móg³ zostaæ
otwarty."
-
-  ERR_SYNATX       "B³¹d podczas wykonywania skryptu.\nNieprawid³owa
sk³adnia."
-  ERR_CALL         "B³¹d podczas wykonywania skryptu.\nFunkcja nie zosta³a
znaleziona."
-  ERR_PARAMETER    "B³¹d podczas wykonywania skryptu.\nB³êdny parametr(y)."
-
-  ERR_DEP1	   "Do zainstalowania tego pakietu konieczne jest uprzednie
zainstalowanie nastêpuj¹cych:\n\n"
-  ERR_DEP2	   "\nCzy chcesz je teraz zainstalowaæ ?"
-  ERR_READY	   "Wybra³eœ instalacjê %d pakietu(ów). Aby je zainstalowaæ, musisz
przeczytaæ i zaakceptowaæ licencjê ka¿dego z nich. \n\nCzy chcesz kontynuowaæ ?"
-END
-
-123 RCDATA	   "options.xml"
-
-/* EOF */

Modified: trunk/rosapps/applications/packmgr/lib/package.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/packmgr/lib/p…
==============================================================================
--- trunk/rosapps/applications/packmgr/lib/package.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/packmgr/lib/package.rbuild [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -3,7 +3,6 @@
 	<include base="package">.</include>
 
 	<define name="UNICODE" />
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 
@@ -12,6 +11,7 @@
 	<library>user32</library>
 	<library>expat</library>
 	<library>urlmon</library>
+	<library>shell32</library>
 
 	<file>download.cpp</file>
 	<file>functions.cpp</file>

Modified: trunk/rosapps/applications/packmgr/lib/package.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/packmgr/lib/p…
==============================================================================
--- trunk/rosapps/applications/packmgr/lib/package.rc [iso-8859-1] (original)
+++ trunk/rosapps/applications/packmgr/lib/package.rc [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -15,7 +15,6 @@
 #include "lang/en-US.rc"
 #include "lang/es-ES.rc"
 #include "lang/fr-FR.rc"
-#include "lang/pl-PL.rc"
 #include "lang/ru-RU.rc"
 #include "lang/uk-UA.rc"
 

Modified: trunk/rosapps/applications/sysutils/chkdsk/chkdsk.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/chkd…
==============================================================================
--- trunk/rosapps/applications/sysutils/chkdsk/chkdsk.c [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/chkdsk/chkdsk.c [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -36,11 +36,17 @@
 // 1999 April (Emanuele Aliberti)
 // 	Adapted for ReactOS and egcs.
 //
+// 2008 July (Aleksey Bragin)
+// 	Cleanup, use ReactOS's fmifs.h
+//
 //======================================================================
+#define WIN32_NO_STATUS
+#define NTOS_MODE_USER
 #define UNICODE
 #include <windows.h>
 #include <stdio.h>
-#include <fmifs.h>
+#include <ndk/ntndk.h>
+#include <fmifs/fmifs.h>
 #define _UNICODE 1
 #include <tchar.h>
 #include "config.h"
@@ -233,12 +239,12 @@
 		wprintf(L"UNKNOWN5\r");
 		break;
 
-	case UNKNOWN7:
-		wprintf(L"UNKNOWN7\r");
-		break;
-
-	case UNKNOWN8:
-		wprintf(L"UNKNOWN8\r");
+	case FSNOTSUPPORTED:
+		wprintf(L"FSNOTSUPPORTED\r");
+		break;
+
+	case VOLUMEINUSE:
+		wprintf(L"VOLUMEINUSE\r");
 		break;
 
 	case UNKNOWN9:
@@ -267,6 +273,10 @@
 
 	case DONEWITHSTRUCTURE:
 		wprintf(L"DONEWITHSTRUCTURE\r");
+		break;
+
+	case CLUSTERSIZETOOSMALL:
+		wprintf(L"CLUSTERSIZETOOSMALL\r");
 		break;
 
 	case PROGRESS:

Modified: trunk/rosapps/applications/sysutils/chkdsk/chkdsk.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/chkd…
==============================================================================
--- trunk/rosapps/applications/sysutils/chkdsk/chkdsk.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/chkdsk/chkdsk.rbuild [iso-8859-1] Mon Jul 21
04:15:15 2008
@@ -1,9 +1,12 @@
-<module name="chkdsk" type="win32cui"
installbase="system32" installname="chkdsk.exe"
allowwarnings="true">
-	<define name="__USE_W32API" />
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
+<module name="chkdsk" type="win32cui"
installbase="system32" installname="chkdsk.exe"
allowwarnings="true" unicode="yes">
+	<include base="reactos">include/reactos/libs/fmifs</include>
+	<include base="chkdsk>..</include>
+
 	<library>fmifs</library>
+	<library>win32err</library>
 	<library>ntdll</library>
+	<library>kernel32</library>
+
 	<file>chkdsk.c</file>
 	<file>chkdsk.rc</file>
 </module>

Modified: trunk/rosapps/applications/sysutils/chklib/chklib.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/chkl…
==============================================================================
--- trunk/rosapps/applications/sysutils/chklib/chklib.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/chklib/chklib.rbuild [iso-8859-1] Mon Jul 21
04:15:15 2008
@@ -1,10 +1,12 @@
 <module name="chklib" type="win32cui"
installbase="system32" installname="chklib.exe"
allowwarnings="true">
-	<linkerflag>--numeric-sort</linkerflag>
-	<define name="__USE_W32API" />
+	<include base="chklib>..</include>
+
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
+
+	<library>win32err</library>
 	<library>kernel32</library>
-	<library>win32err</library>
+
 	<file>chklib.c</file>
 	<file>chklib.rc</file>
 </module>

Modified: trunk/rosapps/applications/sysutils/ctm/ctm.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/ctm/…
==============================================================================
--- trunk/rosapps/applications/sysutils/ctm/ctm.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/ctm/ctm.rbuild [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -1,5 +1,4 @@
 <module name="ctm" type="win32cui"
installbase="system32" installname="ctm.exe"
unicode="yes">
-	<define name="__USE_W32API" />
 	<library>epsapi</library>
 	<library>ntdll</library>
 	<library>kernel32</library>

Removed: trunk/rosapps/applications/sysutils/fmifs.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/fmif…
==============================================================================
--- trunk/rosapps/applications/sysutils/fmifs.h [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/fmifs.h (removed)
@@ -1,129 +1,0 @@
-#ifndef _FMIFS_H
-#define _FMIFS_H
-/* $Id$
- *
- * fmifs.h
- *
- * Copyright (c) 1998 Mark Russinovich
- * Systems Internals
- * http://www.sysinternals.com
- *
- * Typedefs and definitions for using chkdsk and formatex
- * functions exported by the fmifs.dll library.
- *
- * ---
- *
- * 1999-02-18 (Emanuele Aliberti)
- * 	Normalized function names.
- *
- */
-#ifndef _INC_WINDOWS_
-#include <windows.h>
-#endif
-
-/* Output command */
-typedef
-struct
-{
-	DWORD Lines;
-	PCHAR Output;
-
-} TEXTOUTPUT, *PTEXTOUTPUT;
-
-
-/* Callback command types */
-typedef
-enum
-{
-	PROGRESS,
-	DONEWITHSTRUCTURE,
-	UNKNOWN2,
-	UNKNOWN3,
-	UNKNOWN4,
-	UNKNOWN5,
-	INSUFFICIENTRIGHTS,
-	UNKNOWN7,
-	UNKNOWN8,
-	UNKNOWN9,
-	UNKNOWNA,
-	DONE,
-	UNKNOWNC,
-	UNKNOWND,
-	OUTPUT,
-	STRUCTUREPROGRESS
-
-} CALLBACKCOMMAND;
-
-
-/* FMIFS callback definition */
-typedef
-BOOL
-(STDCALL * PFMIFSCALLBACK) (
-	CALLBACKCOMMAND	Command,
-	DWORD		SubAction,
-	PVOID		ActionInfo
-	);
-
-/* Chkdsk command in FMIFS */
-VOID
-STDCALL
-ChkDsk(
-	PWCHAR		DriveRoot,
-	PWCHAR		Format,
-	BOOL		CorrectErrors,
-	BOOL		Verbose,
-	BOOL		CheckOnlyIfDirty,
-	BOOL		ScanDrive,
-	PVOID		Unused2,
-	PVOID		Unused3,
-	PFMIFSCALLBACK	Callback
-	);
-
-/* ChkdskEx command in FMIFS (not in the original) */
-VOID
-STDCALL
-ChkDskEx(
-	PWCHAR		DriveRoot,
-	PWCHAR		Format,
-	BOOL		CorrectErrors,
-	BOOL		Verbose,
-	BOOL		CheckOnlyIfDirty,
-	BOOL		ScanDrive,
-	PVOID		Unused2,
-	PVOID		Unused3,
-	PFMIFSCALLBACK	Callback
-	);
-
-/* DiskCopy command in FMIFS */
-
-VOID
-STDCALL
-DiskCopy(VOID);
-
-/* Enable/Disable volume compression */
-BOOL
-STDCALL
-EnableVolumeCompression(
-	PWCHAR	DriveRoot,
-	BOOL	Enable
-	);
-
-/* Format command in FMIFS */
-
-/* media flags */
-#define FMIFS_HARDDISK 0xC
-#define FMIFS_FLOPPY   0x8
-
-VOID
-STDCALL
-FormatEx(
-	PWCHAR		DriveRoot,
-	DWORD		MediaFlag,
-	PWCHAR		Format,
-	PWCHAR		Label,
-	BOOL		QuickFormat,
-	DWORD		ClusterSize,
-	PFMIFSCALLBACK	Callback
-	);
-
-#endif /* ndef _FMIFS_H */

Modified: trunk/rosapps/applications/sysutils/gettype/gettype.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/gett…
==============================================================================
--- trunk/rosapps/applications/sysutils/gettype/gettype.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/gettype/gettype.rbuild [iso-8859-1] Mon Jul 21
04:15:15 2008
@@ -1,7 +1,6 @@
 <module name="gettype" type="win32cui"
installbase="system32" installname="gettype.exe"
unicode="yes">
 	<include base="gettype">.</include>
 	<define name="_WIN32_WINNT">0x0501</define>
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>shell32</library>
 	<library>mpr</library>

Modified: trunk/rosapps/applications/sysutils/kill/kill.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/kill…
==============================================================================
--- trunk/rosapps/applications/sysutils/kill/kill.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/kill/kill.rbuild [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -1,5 +1,4 @@
 <module name="kill" type="win32cui"
installbase="system32" installname="kill.exe">
-	<define name="__USE_W32API" />
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>user32</library>

Modified: trunk/rosapps/applications/sysutils/logevent/logevent.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/loge…
==============================================================================
--- trunk/rosapps/applications/sysutils/logevent/logevent.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/logevent/logevent.rbuild [iso-8859-1] Mon Jul 21
04:15:15 2008
@@ -1,7 +1,6 @@
 <?xml version="1.0"?>
 
 <module name="logevent" type="win32cui"
installbase="system32" installname="logevent.exe"
allowwarnings="true">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>advapi32</library>
 	<file>logevent.c</file>

Modified: trunk/rosapps/applications/sysutils/lsdd/lsdd.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/lsdd…
==============================================================================
--- trunk/rosapps/applications/sysutils/lsdd/lsdd.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/lsdd/lsdd.rbuild [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -1,8 +1,7 @@
 <module name="lsdd" type="win32cui"
installbase="system32" installname="lsdd.exe">
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
-	<library>lib</library>
+	<library>win32err</library>
 	<library>kernel32</library>
 	<library>user32</library>
 

Modified: trunk/rosapps/applications/sysutils/man/man.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/man/…
==============================================================================
--- trunk/rosapps/applications/sysutils/man/man.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/man/man.rbuild [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -1,5 +1,4 @@
 <module name="man" type="win32cui"
installbase="system32" installname="man.exe">
-	<define name="__USE_W32API" />
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>user32</library>

Modified: trunk/rosapps/applications/sysutils/pedump/pedump.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/pedu…
==============================================================================
--- trunk/rosapps/applications/sysutils/pedump/pedump.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/pedump/pedump.rbuild [iso-8859-1] Mon Jul 21
04:15:15 2008
@@ -1,5 +1,4 @@
 <module name="pedump" type="win32cui"
installbase="system32" installname="pedump.exe">
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>ntdll</library>

Modified: trunk/rosapps/applications/sysutils/regexpl/regexpl.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/rege…
==============================================================================
--- trunk/rosapps/applications/sysutils/regexpl/regexpl.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/regexpl/regexpl.rbuild [iso-8859-1] Mon Jul 21
04:15:15 2008
@@ -1,6 +1,5 @@
 <module name="regexpl" type="win32cui"
installbase="system32" installname="regexpl.exe"
stdlib="host">
 	<include base="regexpl">.</include>
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>advapi32</library>

Modified: trunk/rosapps/applications/sysutils/screenshot/screenshot.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/scre…
==============================================================================
--- trunk/rosapps/applications/sysutils/screenshot/screenshot.rbuild [iso-8859-1]
(original)
+++ trunk/rosapps/applications/sysutils/screenshot/screenshot.rbuild [iso-8859-1] Mon Jul
21 04:15:15 2008
@@ -1,6 +1,5 @@
 <module name="screenshot" type="win32gui"
installbase="system32" installname="screenshot.exe"
unicode="yes">
 	<include base="screenshot">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

Modified: trunk/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/syst…
==============================================================================
--- trunk/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild [iso-8859-1]
(original)
+++ trunk/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild [iso-8859-1] Mon Jul
21 04:15:15 2008
@@ -1,5 +1,4 @@
 <module name="systeminfo" type="win32cui"
installbase="system32" installname="systeminfo.exe">
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

Modified: trunk/rosapps/applications/sysutils/sysutils.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/sysu…
==============================================================================
--- trunk/rosapps/applications/sysutils/sysutils.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/sysutils.rbuild [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -1,18 +1,16 @@
 <?xml version="1.0"?>
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
-	<directory name="lib">
-		<xi:include href="lib/lib.rbuild" />
-	</directory>
-
 	<directory name="ctm">
 		<xi:include href="ctm/ctm.rbuild" />
 	</directory>
 
-	<!--
 	<directory name="chkdsk">
 		<xi:include href="chkdsk/chkdsk.rbuild" />
 	</directory>
-	-->
+
+	<directory name="chklib">
+		<xi:include href="chklib/chklib.rbuild" />
+	</directory>
 
 	<directory name="gettype">
 		<xi:include href="gettype/gettype.rbuild" />

Modified: trunk/rosapps/applications/sysutils/tcat/tcat.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/tcat…
==============================================================================
--- trunk/rosapps/applications/sysutils/tcat/tcat.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/tcat/tcat.rbuild [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -1,5 +1,4 @@
 <module name="tcat" type="win32cui"
installbase="system32" installname="tcat.exe">
-	<define name="__USE_W32API" />
 	<library>ntdll</library>
 	<library>kernel32</library>
 	<library>user32</library>

Modified: trunk/rosapps/applications/sysutils/tlist/tlist.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/tlis…
==============================================================================
--- trunk/rosapps/applications/sysutils/tlist/tlist.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/tlist/tlist.rbuild [iso-8859-1] Mon Jul 21
04:15:15 2008
@@ -1,5 +1,4 @@
 <module name="tlist" type="win32cui"
installbase="system32" installname="tlist.exe">
-	<define name="__USE_W32API" />
 	<library>epsapi</library>
 	<!-- <library>tgetopt</library> -->
 	<library>kernel32</library>

Modified: trunk/rosapps/applications/sysutils/utils/binpatch/binpatch.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util…
==============================================================================
--- trunk/rosapps/applications/sysutils/utils/binpatch/binpatch.rbuild [iso-8859-1]
(original)
+++ trunk/rosapps/applications/sysutils/utils/binpatch/binpatch.rbuild [iso-8859-1] Mon
Jul 21 04:15:15 2008
@@ -1,5 +1,4 @@
 <module name="binpatch" type="win32cui"
installbase="bin" installname="binpatch.exe" >
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>patch.c</file>

Modified: trunk/rosapps/applications/sysutils/utils/cat/cat.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util…
==============================================================================
--- trunk/rosapps/applications/sysutils/utils/cat/cat.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/utils/cat/cat.rbuild [iso-8859-1] Mon Jul 21
04:15:15 2008
@@ -1,5 +1,4 @@
 <module name="cat" type="win32cui" installbase="bin"
installname="cat.exe" >
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>cat.c</file>

Modified: trunk/rosapps/applications/sysutils/utils/driver/load/load.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util…
==============================================================================
--- trunk/rosapps/applications/sysutils/utils/driver/load/load.rbuild [iso-8859-1]
(original)
+++ trunk/rosapps/applications/sysutils/utils/driver/load/load.rbuild [iso-8859-1] Mon Jul
21 04:15:15 2008
@@ -1,5 +1,4 @@
 <module name="load" type="win32cui" installbase="bin"
installname="load.exe" unicode="true" >
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>user32</library>

Modified: trunk/rosapps/applications/sysutils/utils/driver/unload/unload.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util…
==============================================================================
--- trunk/rosapps/applications/sysutils/utils/driver/unload/unload.rbuild [iso-8859-1]
(original)
+++ trunk/rosapps/applications/sysutils/utils/driver/unload/unload.rbuild [iso-8859-1] Mon
Jul 21 04:15:15 2008
@@ -1,5 +1,4 @@
 <module name="unload" type="win32cui" installbase="bin"
installname="unload.exe" unicode="true">
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>user32</library>

Modified: trunk/rosapps/applications/sysutils/utils/infinst/infinst.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util…
==============================================================================
--- trunk/rosapps/applications/sysutils/utils/infinst/infinst.rbuild [iso-8859-1]
(original)
+++ trunk/rosapps/applications/sysutils/utils/infinst/infinst.rbuild [iso-8859-1] Mon Jul
21 04:15:15 2008
@@ -1,5 +1,4 @@
 <module name="infinst" type="win32cui" installbase="bin"
installname="infinst.exe" >
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>ntdll</library>
 	<library>user32</library>

Modified: trunk/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util…
==============================================================================
--- trunk/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.rbuild [iso-8859-1]
(original)
+++ trunk/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.rbuild [iso-8859-1]
Mon Jul 21 04:15:15 2008
@@ -1,5 +1,4 @@
 <module name="nts2w32err" type="win32cui"
installbase="bin" installname="nts2w32err.exe" >
-	<define name="__USE_W32API" />
 	<library>msvcrt</library>
 	<library>kernel32</library>
 	<library>ntdll</library>

Modified: trunk/rosapps/applications/sysutils/utils/objdir/objdir.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util…
==============================================================================
--- trunk/rosapps/applications/sysutils/utils/objdir/objdir.rbuild [iso-8859-1]
(original)
+++ trunk/rosapps/applications/sysutils/utils/objdir/objdir.rbuild [iso-8859-1] Mon Jul 21
04:15:15 2008
@@ -1,7 +1,4 @@
 <module name="objdir" type="win32cui" installbase="bin"
installname="objdir.exe">
-	<define name="__USE_W32API" />
-	<define name="UNICODE" />
-	<define name="_UNICODE" />
 	<library>msvcrt</library>
 	<library>kernel32</library>
 	<library>ntdll</library>

Modified: trunk/rosapps/applications/sysutils/utils/partinfo/partinfo.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util…
==============================================================================
--- trunk/rosapps/applications/sysutils/utils/partinfo/partinfo.rbuild [iso-8859-1]
(original)
+++ trunk/rosapps/applications/sysutils/utils/partinfo/partinfo.rbuild [iso-8859-1] Mon
Jul 21 04:15:15 2008
@@ -1,5 +1,4 @@
 <module name="partinfo" type="win32cui"
installbase="bin" installname="partinfo.exe"
allowwarnings="true">
-	<define name="__USE_W32API" />
 	<library>msvcrt</library>
 	<library>kernel32</library>
 	<library>ntdll</library>

Modified: trunk/rosapps/applications/sysutils/utils/ps/ps.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util…
==============================================================================
--- trunk/rosapps/applications/sysutils/utils/ps/ps.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/utils/ps/ps.rbuild [iso-8859-1] Mon Jul 21
04:15:15 2008
@@ -1,6 +1,5 @@
 <module name="ps" type="win32cui" installbase="bin"
installname="ps.exe">
     <include base="ps">.</include>
-    <define name="__USE_W32API" />
     <library>user32</library>
     <library>kernel32</library>
     <library>ntdll</library>

Modified: trunk/rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util…
==============================================================================
--- trunk/rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild [iso-8859-1]
(original)
+++ trunk/rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild [iso-8859-1] Mon Jul
21 04:15:15 2008
@@ -1,6 +1,5 @@
 <module name="rosperf" type="win32cui"
installbase="system32" installname="rosperf.exe">
     <include base="rosperf">.</include>
-    <define name="__USE_W32API" />
     <define name="UNICODE" />
     <define name="WINVER">0x0501</define>
     <library>version</library>

Modified: trunk/rosapps/applications/sysutils/utils/stats/stats.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util…
==============================================================================
--- trunk/rosapps/applications/sysutils/utils/stats/stats.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/sysutils/utils/stats/stats.rbuild [iso-8859-1] Mon Jul 21
04:15:15 2008
@@ -1,5 +1,4 @@
 <module name="stats" type="win32cui" installbase="bin"
installname="stats.exe" unicode="true" >
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>stats.c</file>

Modified: trunk/rosapps/applications/sysutils/utils/tickcount/tickcount.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/util…
==============================================================================
--- trunk/rosapps/applications/sysutils/utils/tickcount/tickcount.rbuild [iso-8859-1]
(original)
+++ trunk/rosapps/applications/sysutils/utils/tickcount/tickcount.rbuild [iso-8859-1] Mon
Jul 21 04:15:15 2008
@@ -1,5 +1,4 @@
 <module name="tickcount" type="win32cui"
installbase="bin" installname="tickcount.exe" unicode="true"
>
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>ntdll</library>
 	<file>tickcount.c</file>

Modified: trunk/rosapps/applications/winfile/winfile.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winfile/winfi…
==============================================================================
--- trunk/rosapps/applications/winfile/winfile.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/winfile/winfile.rbuild [iso-8859-1] Mon Jul 21 04:15:15
2008
@@ -3,7 +3,6 @@
   <module name="winfile" type="win32gui"
installbase="system32" installname="winfile.exe"
allowwarnings="true">
     <include base="winfile">.</include>
     <define name="UNICODE" />
-    <define name="__USE_W32API" />
     <define name="_WIN32_IE">0x0501</define>
     <define name="_WIN32_WINNT">0x0501</define>
     <library>shell32</library>

Modified: trunk/rosapps/applications/winver/winver.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/winver/winver…
==============================================================================
--- trunk/rosapps/applications/winver/winver.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/winver/winver.rbuild [iso-8859-1] Mon Jul 21 04:15:15 2008
@@ -1,6 +1,5 @@
 <module name="winver" type="win32gui"
installbase="system32" installname="winver.exe"
unicode="yes">
 	<include base="winver">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>shell32</library>

Modified: trunk/rosapps/applications/write/write.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/write/write.r…
==============================================================================
--- trunk/rosapps/applications/write/write.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/applications/write/write.rbuild [iso-8859-1] Mon Jul 21 04:15:15 2008
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="write" type="win32gui"
installbase="system32" installname="write.exe"
unicode="yes">
 	<include base="write">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0600</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

Modified: trunk/rosapps/demos/ddraw/ddraw.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/ddraw/ddraw.rbuild?r…
==============================================================================
--- trunk/rosapps/demos/ddraw/ddraw.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/demos/ddraw/ddraw.rbuild [iso-8859-1] Mon Jul 21 04:15:15 2008
@@ -1,7 +1,6 @@
 <module name="ddraw_demo" type="win32gui"
installbase="system32" installname="ddraw_demo.exe"
allowwarnings="true">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>ddraw</library>

Modified: trunk/rosapps/demos/maze/maze.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/maze/maze.rbuild?rev…
==============================================================================
--- trunk/rosapps/demos/maze/maze.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/demos/maze/maze.rbuild [iso-8859-1] Mon Jul 21 04:15:15 2008
@@ -1,7 +1,6 @@
 <module name="maze" type="win32gui"
installbase="system32" installname="maze.exe">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
-	<define name="__USE_W32API" />
 	<library>kernel32</library>
 	<library>gdi32</library>
 	<library>user32</library>

Modified: trunk/rosapps/dflat32/dflat32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/dflat32/dflat32.rbuild?rev…
==============================================================================
--- trunk/rosapps/dflat32/dflat32.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/dflat32/dflat32.rbuild [iso-8859-1] Mon Jul 21 04:15:15 2008
@@ -1,7 +1,6 @@
 <module name="dflat32" type="win32cui"
installbase="system32" installname="edit.exe">
 	<include base="ReactOS">include/wine</include>
 	<include base="dflat32">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>

Modified: trunk/rosapps/lib/dflat32/dflat32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/dflat32/dflat32.rbuild…
==============================================================================
--- trunk/rosapps/lib/dflat32/dflat32.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/lib/dflat32/dflat32.rbuild [iso-8859-1] Mon Jul 21 04:15:15 2008
@@ -1,6 +1,5 @@
 <module name="dflat32lib" type="win32dll"
baseadress="0x98000000" installbase="system32"
installname="dflat32.dll">
 	<importlibrary definition="dflat32.def" />
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 

Modified: trunk/rosapps/lib/directory.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/directory.rbuild?rev=3…
==============================================================================
--- trunk/rosapps/lib/directory.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/lib/directory.rbuild [iso-8859-1] Mon Jul 21 04:15:15 2008
@@ -9,9 +9,13 @@
 	<directory name="libjpeg">
 		<xi:include href="libjpeg/libjpeg.rbuild" />
 	</directory>
+
 	<directory name="libpng">
 		<xi:include href="libpng/libpng.rbuild" />
 	</directory>
 
+	<directory name="win32err">
+		<xi:include href="win32err/win32err.rbuild" />
+	</directory>
 </group>
 

Propchange: trunk/rosapps/lib/win32err/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jul 21 04:15:15 2008
@@ -1,0 +1,7 @@
+GNUmakefile
+*.vcproj
+*.user
+*.cbp
+*.ncb
+*.suo
+*.sln

Propchange: trunk/rosapps/lib/win32err/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Removed: trunk/rosapps/lib/win32err/lib.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/sysutils/lib/…
==============================================================================
--- trunk/rosapps/lib/win32err/lib.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/lib/win32err/lib.rbuild (removed)
@@ -1,6 +1,0 @@
-<module name="lib" type="objectlibrary">
-	<define name="__USE_W32API" />
-	<define name="_WIN32_IE">0x0501</define>
-	<define name="_WIN32_WINNT">0x0501</define>
-	<file>win32err.c</file>
-</module>

Copied: trunk/rosapps/lib/win32err/win32err.rbuild (from r34605,
trunk/rosapps/applications/sysutils/lib/lib.rbuild)
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/lib/win32err/win32err.rbui…
==============================================================================
--- trunk/rosapps/applications/sysutils/lib/lib.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/lib/win32err/win32err.rbuild [iso-8859-1] Mon Jul 21 04:15:15 2008
@@ -1,5 +1,4 @@
-<module name="lib" type="objectlibrary">
-	<define name="__USE_W32API" />
+<module name="win32err" type="objectlibrary">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<file>win32err.c</file>

Propchange: trunk/rosapps/lib/win32err/win32err.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/rosapps/lib/win32err/win32err.rbuild
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: trunk/rosapps/templates/dialog/dialog.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/templates/dialog/dialog.rb…
==============================================================================
--- trunk/rosapps/templates/dialog/dialog.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/templates/dialog/dialog.rbuild [iso-8859-1] Mon Jul 21 04:15:15 2008
@@ -1,6 +1,5 @@
 <module name="template_dialog" type="win32cui"
installname="dialog.exe" allowwarnings="true">
 	<include base="template_dialog">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>ntdll</library>

Modified: trunk/rosapps/templates/mdi/mdi.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/templates/mdi/mdi.rbuild?r…
==============================================================================
--- trunk/rosapps/templates/mdi/mdi.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/templates/mdi/mdi.rbuild [iso-8859-1] Mon Jul 21 04:15:15 2008
@@ -1,6 +1,5 @@
 <module name="template_mdi" type="win32cui"
installname="mdi.exe" allowwarnings="true">
 	<include base="template_mdi">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>ntdll</library>

Modified: trunk/rosapps/templates/old_wordpad/old_wordpad.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/rosapps/templates/old_wordpad/old_…
==============================================================================
--- trunk/rosapps/templates/old_wordpad/old_wordpad.rbuild [iso-8859-1] (original)
+++ trunk/rosapps/templates/old_wordpad/old_wordpad.rbuild [iso-8859-1] Mon Jul 21
04:15:15 2008
@@ -2,7 +2,6 @@
 <!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="old_wordpad" type="win32gui"
installbase="system32" installname="old_wordpad.exe"
unicode="yes">
 	<include base="old_wordpad">.</include>
-	<define name="__USE_W32API" />
 	<define name="_WIN32_IE">0x0600</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<library>kernel32</library>