diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 3a31e45f6..81a589cda 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,12 @@
+2004-10-24  Dan Aloni  <da-x@colinux.org>
+
+	* include/ddk/ntapi.h (NtQueryFullAttributesFile,
+	ZwQueryFullAttributesFile): Declare.
+	* include/ddk/ntapi.h (RtlDosPathNameToNtPathName_U):
+	Declare.
+	lib/ntoskrnl.def (ZwQueryDirectoryFile, ZwQueryFullAttributesFile.
+	ZwQueryVolumeInformationFile): Add stubs.
+
 2004-10-18  Danny Smith  <dannysmith@users.sourceforge.net>
 
 	= include/wsahelp.h (WINSOCK_MAPPING, WSHGetWinsockMapping,
diff --git a/winsup/w32api/include/ddk/ntapi.h b/winsup/w32api/include/ddk/ntapi.h
index ba4bedb8c..943452a52 100644
--- a/winsup/w32api/include/ddk/ntapi.h
+++ b/winsup/w32api/include/ddk/ntapi.h
@@ -647,7 +647,7 @@ typedef struct _SYSTEM_MEMORY_USAGE {
 } SYSTEM_MEMORY_USAGE, *PSYSTEM_MEMORY_USAGE;
 
 typedef struct _SYSTEM_MEMORY_USAGE_INFORMATION {
-  ULONG  Reserved;
+  	ULONG  Reserved;
 	PVOID  EndOfData;
 	SYSTEM_MEMORY_USAGE  MemoryUsage[1];
 } SYSTEM_MEMORY_USAGE_INFORMATION, *PSYSTEM_MEMORY_USAGE_INFORMATION;
@@ -670,6 +670,20 @@ ZwQuerySystemInformation(
   IN ULONG  SystemInformationLength,
   OUT PULONG  ReturnLength  OPTIONAL);
 
+NTOSAPI
+NTAPI
+NTSTATUS
+NtQueryFullAttributesFile(
+	IN POBJECT_ATTRIBUTES ObjectAttributes,
+	OUT PFILE_NETWORK_OPEN_INFORMATION FileInformation);
+
+NTOSAPI
+NTAPI
+NTSTATUS
+ZwQueryFullAttributesFile(
+	IN POBJECT_ATTRIBUTES ObjectAttributes,
+ 	OUT PFILE_NETWORK_OPEN_INFORMATION FileInformation);
+
 NTOSAPI
 NTSTATUS
 NTAPI
diff --git a/winsup/w32api/include/ddk/winddk.h b/winsup/w32api/include/ddk/winddk.h
index 771f57418..1f489fa9a 100644
--- a/winsup/w32api/include/ddk/winddk.h
+++ b/winsup/w32api/include/ddk/winddk.h
@@ -4410,6 +4410,15 @@ RtlDeleteRegistryValue(
   IN PCWSTR  Path,
   IN PCWSTR  ValueName);
 
+NTOSAPI
+BOOL
+DDKAPI
+RtlDosPathNameToNtPathName_U(
+  IN PCWSTR  DosPathName,
+  OUT PUNICODE_STRING  NtPathName,
+  OUT PCWSTR  *NtFileNamePart,
+  OUT VOID  *DirectoryInfo);
+
 /*
  * BOOLEAN
  * RtlEqualLuid( 
diff --git a/winsup/w32api/lib/ddk/ntoskrnl.def b/winsup/w32api/lib/ddk/ntoskrnl.def
index 99e3280c1..029d0dee8 100644
--- a/winsup/w32api/lib/ddk/ntoskrnl.def
+++ b/winsup/w32api/lib/ddk/ntoskrnl.def
@@ -1315,10 +1315,10 @@ ZwPowerInformation@20
 ;ZwQueryBootOptions
 ZwQueryDefaultLocale@8
 ZwQueryDefaultUILanguage@4
-;ZwQueryDirectoryFile
+ZwQueryDirectoryFile@44
 ZwQueryDirectoryObject@28
 ;ZwQueryEaFile
-;ZwQueryFullAttributesFile
+ZwQueryFullAttributesFile@8
 ZwQueryInformationFile@20
 ZwQueryInformationJobObject@20
 ZwQueryInformationProcess@20
@@ -1332,7 +1332,7 @@ ZwQuerySecurityObject@20
 ZwQuerySymbolicLinkObject@12
 ZwQuerySystemInformation@16
 ZwQueryValueKey@24
-;ZwQueryVolumeInformationFile
+ZwQueryVolumeInformationFile@20
 ZwReadFile@36
 ZwReplaceKey@12
 ZwRequestWaitReplyPort@12