[ros-diffs] [pschweitzer] 33199: - Added a stub for NtfsLib - Added a stub for untfs.dll - Added the support of untfs.dll to autochk.exe (and a bit reviewed code when loading provider) That way, autochk won't complain anymore... And it creates places to work!

Author: pschweitzer
Date: Wed Apr 30 16:35:23 2008
New Revision: 33199

URL: http://svn.reactos.org/svn/reactos?rev=33199&view=rev
Log:
- Added a stub for NtfsLib
- Added a stub for untfs.dll
- Added the support of untfs.dll to autochk.exe (and a bit reviewed code when loading
provider)
That way, autochk won't complain anymore... And it creates places to work!

Added:
    trunk/reactos/dll/win32/untfs/
    trunk/reactos/dll/win32/untfs/untfs.c   (with props)
    trunk/reactos/dll/win32/untfs/untfs.def   (with props)
    trunk/reactos/dll/win32/untfs/untfs.rbuild   (with props)
    trunk/reactos/dll/win32/untfs/untfs.rc   (with props)
    trunk/reactos/lib/fslib/ntfslib/
    trunk/reactos/lib/fslib/ntfslib/ntfslib.c   (with props)
    trunk/reactos/lib/fslib/ntfslib/ntfslib.h   (with props)
    trunk/reactos/lib/fslib/ntfslib/ntfslib.rbuild   (with props)
Modified:
    trunk/reactos/base/system/autochk/autochk.c
    trunk/reactos/baseaddress.rbuild
    trunk/reactos/boot/bootdata/packages/reactos.dff
    trunk/reactos/dll/win32/win32.rbuild
    trunk/reactos/lib/fslib/directory.rbuild

Modified: trunk/reactos/base/system/autochk/autochk.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/autochk/autoch…
==============================================================================
--- trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/autochk/autochk.c [iso-8859-1] Wed Apr 30 16:35:23 2008
@@ -243,16 +243,24 @@
 LoadProvider(
     IN PWCHAR FileSystem)
 {
-    UNICODE_STRING ProviderDll = RTL_CONSTANT_STRING(L"ufat.dll");
+    UNICODE_STRING ProviderDll;
     PVOID BaseAddress;
     NTSTATUS Status;
 
     /* FIXME: add more providers here */
 
-    if (wcscmp(FileSystem, L"FAT") != 0
-     && wcscmp(FileSystem, L"FAT32") != 0)
-    {
-        return NULL;
+    if (wcscmp(FileSystem, L"NTFS") == 0)
+    {
+      RtlInitUnicodeString(&ProviderDll, L"untfs.dll");
+    }
+    else if (wcscmp(FileSystem, L"FAT") == 0
+             || wcscmp(FileSystem, L"FAT32") == 0)
+    {
+      RtlInitUnicodeString(&ProviderDll, L"ufat.dll");
+    }
+    else
+    {
+      return NULL;
     }
 
     Status = LdrLoadDll(NULL, NULL, &ProviderDll, &BaseAddress);

Modified: trunk/reactos/baseaddress.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/baseaddress.rbuild?rev=331…
==============================================================================
--- trunk/reactos/baseaddress.rbuild [iso-8859-1] (original)
+++ trunk/reactos/baseaddress.rbuild [iso-8859-1] Wed Apr 30 16:35:23 2008
@@ -13,6 +13,7 @@
   <property name="BASEADDRESS_JOY" value="0x589b0000" />
   <property name="BASEADDRESS_UXTHEME" value="0x5ad70000" />
   <property name="BASEADDRESS_VDMDBG" value="0x5b0d0000" />
+  <property name="BASEADDRESS_UNTFS" value="0x5b340000" />
   <property name="BASEADDRESS_OBJSEL" value="0x5b400000" />
   <property name="BASEADDRESS_UFAT" value="0x5b570000" />
   <property name="BASEADDRESS_TAPIUI" value="0x5b770000" />

Modified: trunk/reactos/boot/bootdata/packages/reactos.dff
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea…
==============================================================================
--- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Wed Apr 30 16:35:23
2008
@@ -293,6 +293,7 @@
 dll\win32\twain_32\twain_32.dll                     1
 dll\win32\ufat\ufat.dll                             1
 dll\win32\ufatx\ufatx.dll                           1   optional
+dll\win32\untfs\untfs.dll                           1
 dll\win32\urlmon\urlmon.dll                         1
 dll\win32\user32\user32.dll                         1
 dll\win32\userenv\userenv.dll                       1

Added: trunk/reactos/dll/win32/untfs/untfs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/untfs/untfs.c?re…
==============================================================================
--- trunk/reactos/dll/win32/untfs/untfs.c (added)
+++ trunk/reactos/dll/win32/untfs/untfs.c [iso-8859-1] Wed Apr 30 16:35:23 2008
@@ -1,0 +1,27 @@
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         NTFS File System Management
+ * FILE:            dll/win32/untfs/untfs.c
+ * PURPOSE:         untfs DLL initialisation
+ *
+ * PROGRAMMERS:     Pierre Schweitzer
+ */
+
+#define WIN32_NO_STATUS
+#include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
+#include <fmifs/fmifs.h>
+
+INT WINAPI
+DllMain(
+	IN HINSTANCE hinstDLL,
+	IN DWORD     dwReason,
+	IN LPVOID    lpvReserved)
+{
+	UNREFERENCED_PARAMETER(hinstDLL);
+	UNREFERENCED_PARAMETER(dwReason);
+	UNREFERENCED_PARAMETER(lpvReserved);
+
+	return TRUE;
+}

Propchange: trunk/reactos/dll/win32/untfs/untfs.c
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/win32/untfs/untfs.def
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/untfs/untfs.def?…
==============================================================================
--- trunk/reactos/dll/win32/untfs/untfs.def (added)
+++ trunk/reactos/dll/win32/untfs/untfs.def [iso-8859-1] Wed Apr 30 16:35:23 2008
@@ -1,0 +1,4 @@
+LIBRARY UNTFS.DLL
+EXPORTS
+ChkdskEx=NtfsChkdsk@24
+FormatEx=NtfsFormat@24

Propchange: trunk/reactos/dll/win32/untfs/untfs.def
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/win32/untfs/untfs.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/untfs/untfs.rbui…
==============================================================================
--- trunk/reactos/dll/win32/untfs/untfs.rbuild (added)
+++ trunk/reactos/dll/win32/untfs/untfs.rbuild [iso-8859-1] Wed Apr 30 16:35:23 2008
@@ -1,0 +1,10 @@
+<module name="untfs" type="win32dll"
baseaddress="${BASEADDRESS_UNTFS}" installbase="system32"
installname="untfs.dll">
+	<importlibrary definition="untfs.def" />
+	<include base="untfs">.</include>
+	<define name="_DISABLE_TIDENTS" />
+	<define name="_WIN32_WINNT">0x0600</define>
+	<library>ntfslib</library>
+	<library>ntdll</library>
+	<file>untfs.c</file>
+	<file>untfs.rc</file>
+</module>

Propchange: trunk/reactos/dll/win32/untfs/untfs.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/dll/win32/untfs/untfs.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/untfs/untfs.rc?r…
==============================================================================
--- trunk/reactos/dll/win32/untfs/untfs.rc (added)
+++ trunk/reactos/dll/win32/untfs/untfs.rc [iso-8859-1] Wed Apr 30 16:35:23 2008
@@ -1,0 +1,5 @@
+#define REACTOS_VERSION_DLL
+#define REACTOS_STR_FILE_DESCRIPTION	"NTFS File System Management\0"
+#define REACTOS_STR_INTERNAL_NAME	"untfs\0"
+#define REACTOS_STR_ORIGINAL_FILENAME	"untfs.dll\0"
+#include <reactos/version.rc>

Propchange: trunk/reactos/dll/win32/untfs/untfs.rc
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: trunk/reactos/dll/win32/win32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev…
==============================================================================
--- trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/win32.rbuild [iso-8859-1] Wed Apr 30 16:35:23 2008
@@ -316,6 +316,9 @@
 <directory name="ufatx">
 	<xi:include href="ufatx/ufatx.rbuild" />
 </directory>
+<directory name="untfs">
+	<xi:include href="untfs/untfs.rbuild" />
+</directory>
 <directory name="urlmon">
 	<xi:include href="urlmon/urlmon.rbuild" />
 </directory>

Modified: trunk/reactos/lib/fslib/directory.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/directory.rbuild…
==============================================================================
--- trunk/reactos/lib/fslib/directory.rbuild [iso-8859-1] (original)
+++ trunk/reactos/lib/fslib/directory.rbuild [iso-8859-1] Wed Apr 30 16:35:23 2008
@@ -3,6 +3,9 @@
 <group xmlns:xi="http://www.w3.org/2001/XInclude">
 	<directory name="ext2lib">
 		<xi:include href="ext2lib/ext2lib.rbuild" />
+	</directory>
+	<directory name="ntfslib">
+		<xi:include href="ntfslib/ntfslib.rbuild" />
 	</directory>
 	<directory name="vfatlib">
 		<xi:include href="vfatlib/vfatlib.rbuild" />

Added: trunk/reactos/lib/fslib/ntfslib/ntfslib.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ntfslib/ntfslib.…
==============================================================================
--- trunk/reactos/lib/fslib/ntfslib/ntfslib.c (added)
+++ trunk/reactos/lib/fslib/ntfslib/ntfslib.c [iso-8859-1] Wed Apr 30 16:35:23 2008
@@ -1,0 +1,36 @@
+/*
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     ReactOS NTFS FS library
+ * FILE:        lib/fslib/ntfslib/ntfslib.c
+ * PURPOSE:     NTFS lib
+ * PROGRAMMERS: Pierre Schweitzer
+ */
+#include "ntfslib.h"
+
+#define NDEBUG
+#include <debug.h>
+
+NTSTATUS NTAPI
+NtfsFormat(PUNICODE_STRING DriveRoot,
+           FMIFS_MEDIA_FLAG MediaFlag,
+           PUNICODE_STRING Label,
+           BOOLEAN QuickFormat,
+           ULONG ClusterSize,
+           PFMIFSCALLBACK Callback)
+{
+  UNIMPLEMENTED;
+  return STATUS_SUCCESS;
+}
+
+
+NTSTATUS WINAPI
+NtfsChkdsk(IN PUNICODE_STRING DriveRoot,
+           IN BOOLEAN FixErrors,
+           IN BOOLEAN Verbose,
+           IN BOOLEAN CheckOnlyIfDirty,
+           IN BOOLEAN ScanDrive,
+           IN PFMIFSCALLBACK Callback)
+{
+  UNIMPLEMENTED;
+  return STATUS_SUCCESS;
+}

Propchange: trunk/reactos/lib/fslib/ntfslib/ntfslib.c
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/lib/fslib/ntfslib/ntfslib.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ntfslib/ntfslib.…
==============================================================================
--- trunk/reactos/lib/fslib/ntfslib/ntfslib.h (added)
+++ trunk/reactos/lib/fslib/ntfslib/ntfslib.h [iso-8859-1] Wed Apr 30 16:35:23 2008
@@ -1,0 +1,10 @@
+/*
+ * COPYRIGHT:   See COPYING in the top level directory
+ * PROJECT:     ReactOS NTFS FS library
+ * FILE:        lib/fslib/ntfslib/ntfslib.h
+ */
+#define WIN32_NO_STATUS
+#include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
+#include <fmifs/fmifs.h>

Propchange: trunk/reactos/lib/fslib/ntfslib/ntfslib.h
------------------------------------------------------------------------------
    svn:eol-style = native

Added: trunk/reactos/lib/fslib/ntfslib/ntfslib.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/fslib/ntfslib/ntfslib.…
==============================================================================
--- trunk/reactos/lib/fslib/ntfslib/ntfslib.rbuild (added)
+++ trunk/reactos/lib/fslib/ntfslib/ntfslib.rbuild [iso-8859-1] Wed Apr 30 16:35:23 2008
@@ -1,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
+<module name="ntfslib" type="staticlibrary">
+	<include base="ntfslib">.</include>
+	<define name="_DISABLE_TIDENTS" />
+	<file>ntfslib.c</file>
+</module>

Propchange: trunk/reactos/lib/fslib/ntfslib/ntfslib.rbuild
------------------------------------------------------------------------------
    svn:eol-style = native