Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed warnings.

Browse source 
svn path=/trunk/; revision=3827
This commit is contained in:
Eric Kohl 2002-12-06 17:33:16 +00:00
parent 5c0db541d3
commit 72136233fb
1 changed files with 31 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
reactos/lib/kernel32/file/volume.c
View file

@ -1,4 +1,4 @@
/* $Id: volume.c,v 1.26 2002/09/08 10:22:42 chorns Exp $ /* $Id: volume.c,v 1.27 2002/12/06 17:33:16 ekohl Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries * PROJECT: ReactOS system libraries
@ -30,18 +30,21 @@
#define MAX_DOS_DRIVES 26 #define MAX_DOS_DRIVES 26
HANDLE InternalOpenDirW(PWCHAR DirName, BOOLEAN Write)
{
UNICODE_STRING NtPathU;
OBJECT_ATTRIBUTES ObjectAttributes;
NTSTATUS errCode;
IO_STATUS_BLOCK IoStatusBlock;
HANDLE hFile;
if (!RtlDosPathNameToNtPathName_U ((LPWSTR)DirName, static HANDLE
&NtPathU, InternalOpenDirW(LPCWSTR DirName,
NULL, BOOLEAN Write)
NULL)) {
UNICODE_STRING NtPathU;
OBJECT_ATTRIBUTES ObjectAttributes;
NTSTATUS errCode;
IO_STATUS_BLOCK IoStatusBlock;
HANDLE hFile;
if (!RtlDosPathNameToNtPathName_U((LPWSTR)DirName,
&NtPathU,
NULL,
NULL))
{ {
DPRINT("Invalid path\n"); DPRINT("Invalid path\n");
SetLastError(ERROR_BAD_PATHNAME); SetLastError(ERROR_BAD_PATHNAME);
@ -76,6 +79,7 @@ HANDLE InternalOpenDirW(PWCHAR DirName, BOOLEAN Write)
return hFile; return hFile;
} }
DWORD STDCALL DWORD STDCALL
GetLogicalDriveStringsA(DWORD nBufferLength, GetLogicalDriveStringsA(DWORD nBufferLength,
LPSTR lpBuffer) LPSTR lpBuffer)
@ -222,12 +226,12 @@ GetDiskFreeSpaceW(
GetCurrentDirectoryW (MAX_PATH, RootPathName); GetCurrentDirectoryW (MAX_PATH, RootPathName);
RootPathName[3] = 0; RootPathName[3] = 0;
} }
if (INVALID_HANDLE_VALUE == (hFile = InternalOpenDirW((PWCHAR)lpRootPathName, FALSE))) hFile = InternalOpenDirW(lpRootPathName, FALSE);
if (INVALID_HANDLE_VALUE == hFile)
{ {
return FALSE; return FALSE;
} }
errCode = NtQueryVolumeInformationFile(hFile, errCode = NtQueryVolumeInformationFile(hFile,
&IoStatusBlock, &IoStatusBlock,
@ -321,8 +325,9 @@ GetDiskFreeSpaceExW(
GetCurrentDirectoryW (MAX_PATH, RootPathName); GetCurrentDirectoryW (MAX_PATH, RootPathName);
RootPathName[3] = 0; RootPathName[3] = 0;
} }
if (INVALID_HANDLE_VALUE == (hFile = InternalOpenDirW(lpDirectoryName, FALSE))) hFile = InternalOpenDirW(lpDirectoryName, FALSE);
if (INVALID_HANDLE_VALUE == hFile)
{ {
return FALSE; return FALSE;
} }
@ -555,11 +560,11 @@ GetVolumeInformationW(
DPRINT("FileFsVolume %p\n", FileFsVolume); DPRINT("FileFsVolume %p\n", FileFsVolume);
DPRINT("FileFsAttribute %p\n", FileFsAttribute); DPRINT("FileFsAttribute %p\n", FileFsAttribute);
hFile = InternalOpenDirW(lpRootPathName, FALSE); hFile = InternalOpenDirW(lpRootPathName, FALSE);
if (hFile == INVALID_HANDLE_VALUE) if (hFile == INVALID_HANDLE_VALUE)
{ {
return FALSE; return FALSE;
} }
DPRINT("hFile: %x\n", hFile); DPRINT("hFile: %x\n", hFile);
errCode = NtQueryVolumeInformationFile(hFile, errCode = NtQueryVolumeInformationFile(hFile,
@ -677,8 +682,9 @@ SetVolumeLabelW(LPCWSTR lpRootPathName,
LabelInfo->VolumeLabelLength = LabelLength; LabelInfo->VolumeLabelLength = LabelLength;
wcscpy(LabelInfo->VolumeLabel, wcscpy(LabelInfo->VolumeLabel,
lpVolumeName); lpVolumeName);
if (INVALID_HANDLE_VALUE == (hFile = InternalOpenDirW(lpRootPathName, TRUE))) hFile = InternalOpenDirW(lpRootPathName, TRUE);
if (INVALID_HANDLE_VALUE == hFile)
{ {
return FALSE; return FALSE;
} }