Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-01 19:51:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed usage of NtQueryDirectoryObject()

Browse source 
svn path=/trunk/; revision=13310
This commit is contained in:
Thomas Bluemel 2005-01-26 13:54:53 +00:00
parent c4ee7a37ef
commit c7348f1204
1 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

35
reactos/apps/utils/objdir/objdir.c
View file

@ -79,10 +79,14 @@ StatusToName (NTSTATUS Status)
return "STATUS_PATH_SYNTAX_BAD"; return "STATUS_PATH_SYNTAX_BAD";
case STATUS_NO_MORE_ENTRIES: case STATUS_NO_MORE_ENTRIES:
return "STATUS_NO_MORE_ENTRIES"; return "STATUS_NO_MORE_ENTRIES";
case STATUS_MORE_ENTRIES:
return "STATUS_MORE_ENTRIES";
case STATUS_ACCESS_DENIED: case STATUS_ACCESS_DENIED:
return "STATUS_ACCESS_DENIED"; return "STATUS_ACCESS_DENIED";
case STATUS_UNSUCCESSFUL: case STATUS_UNSUCCESSFUL:
return "STATUS_UNSUCCESSFUL"; return "STATUS_UNSUCCESSFUL";
case STATUS_INVALID_HANDLE:
return "STATUS_INVALID_HANDLE";
} }
sprintf (RawValue, "0x%08lx", Status); sprintf (RawValue, "0x%08lx", Status);
return (const char *) RawValue; return (const char *) RawValue;
@ -173,8 +177,9 @@ ListDirectory (
OBJECT_ATTRIBUTES ObjectAttributes; OBJECT_ATTRIBUTES ObjectAttributes;
NTSTATUS Status; NTSTATUS Status;
HANDLE DirectoryHandle; HANDLE DirectoryHandle;
BYTE DirectoryEntry [MAX_DIR_ENTRY * sizeof(OBJECT_DIRECTORY_INFORMATION)]; BYTE DirectoryEntry [512];
POBJECT_DIRECTORY_INFORMATION pDirectoryEntry = (POBJECT_DIRECTORY_INFORMATION) DirectoryEntry; POBJECT_DIRECTORY_INFORMATION pDirectoryEntry = (POBJECT_DIRECTORY_INFORMATION) DirectoryEntry;
POBJECT_DIRECTORY_INFORMATION pDirectoryEntries = (POBJECT_DIRECTORY_INFORMATION) DirectoryEntry;
ULONG Context = 0; ULONG Context = 0;
ULONG ReturnLength = 0; ULONG ReturnLength = 0;
ULONG EntryCount = 0; ULONG EntryCount = 0;
@ -217,25 +222,23 @@ ListDirectory (
return (FALSE); return (FALSE);
} }
printf ("\n Directory of %s\n\n", DirectoryNameA); printf ("\n Directory of %s\n\n", DirectoryNameA);
for(;;)
{
/* /*
* Enumerate each item in the directory. * Enumerate each item in the directory.
*/ */
Status = NtQueryDirectoryObject ( Status = NtQueryDirectoryObject (
DirectoryHandle, DirectoryHandle,
pDirectoryEntry, pDirectoryEntries,
sizeof DirectoryEntry, sizeof DirectoryEntry,
FALSE,/* ReturnSingleEntry */ FALSE,/* ReturnSingleEntry */
TRUE, /* RestartScan */ FALSE, /* RestartScan */
& Context, & Context,
& ReturnLength & ReturnLength
); );
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status) && Status != STATUS_NO_MORE_ENTRIES)
{ {
if (STATUS_NO_MORE_ENTRIES == Status)
{
NtClose (DirectoryHandle);
return TRUE;
}
printf ( printf (
"Failed to query directory object (Status: %s)\n", "Failed to query directory object (Status: %s)\n",
StatusToName (Status) StatusToName (Status)
@ -243,12 +246,17 @@ ListDirectory (
NtClose (DirectoryHandle); NtClose (DirectoryHandle);
return (FALSE); return (FALSE);
} }
while (0 != pDirectoryEntry->ObjectTypeName.Length) if (Status == STATUS_NO_MORE_ENTRIES)
{
break;
}
pDirectoryEntry = pDirectoryEntries;
while (EntryCount < Context)
{ {
CHAR ObjectNameA [MAX_PATH]; CHAR ObjectNameA [MAX_PATH];
CHAR TypeNameA [MAX_PATH]; CHAR TypeNameA [MAX_PATH];
CHAR TargetNameA [MAX_PATH]; CHAR TargetNameA [MAX_PATH];
if (0 == wcscmp (L"SymbolicLink", pDirectoryEntry->ObjectTypeName.Buffer)) if (0 == wcscmp (L"SymbolicLink", pDirectoryEntry->ObjectTypeName.Buffer))
{ {
if (TRUE == ExpandSymbolicLink ( if (TRUE == ExpandSymbolicLink (
@ -258,7 +266,7 @@ ListDirectory (
) )
) )
{ {
printf ( printf (
"%-16s %s -> %s\n", "%-16s %s -> %s\n",
RawUszAsz (pDirectoryEntry->ObjectTypeName.Buffer, TypeNameA), RawUszAsz (pDirectoryEntry->ObjectTypeName.Buffer, TypeNameA),
@ -283,9 +291,10 @@ ListDirectory (
RawUszAsz (pDirectoryEntry->ObjectName.Buffer, ObjectNameA) RawUszAsz (pDirectoryEntry->ObjectName.Buffer, ObjectNameA)
); );
} }
++ EntryCount;
++ pDirectoryEntry; ++ pDirectoryEntry;
++ EntryCount;
} }
};
printf ("\n\t%lu object(s)\n", EntryCount); printf ("\n\t%lu object(s)\n", EntryCount);
/* /*
* Free any resource. * Free any resource.