- 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.

svn path=/trunk/; revision=34627

rosapps/applications/sysutils/chkdsk/chkdsk.c

@@ -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 @@ ChkdskCallback(
 		wprintf(L"UNKNOWN5\r");
 		break;
 
-	case UNKNOWN7:
-		wprintf(L"UNKNOWN7\r");
+	case FSNOTSUPPORTED:
+		wprintf(L"FSNOTSUPPORTED\r");
 		break;
 
-	case UNKNOWN8:
-		wprintf(L"UNKNOWN8\r");
+	case VOLUMEINUSE:
+		wprintf(L"VOLUMEINUSE\r");
 		break;
 
 	case UNKNOWN9:
@@ -269,6 +275,10 @@ ChkdskCallback(
 		wprintf(L"DONEWITHSTRUCTURE\r");
 		break;
 
+	case CLUSTERSIZETOOSMALL:
+		wprintf(L"CLUSTERSIZETOOSMALL\r");
+		break;
+
 	case PROGRESS:
 		percent = (PDWORD) Argument;
 		wprintf(L"%d percent completed.\r", *percent);

rosapps/applications/sysutils/chkdsk/chkdsk.rbuild

@@ -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>