From 9cd1948c7daab2fdfb2fcff35c7390fc9ab87b0f Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Wed, 20 Feb 2008 19:13:52 +0000 Subject: [PATCH] - fix compilation with msvc svn path=/trunk/; revision=32432 --- rosapps/fraginator/DriveVolume.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/rosapps/fraginator/DriveVolume.cpp b/rosapps/fraginator/DriveVolume.cpp index 3b0863fa29f..be576289b7b 100644 --- a/rosapps/fraginator/DriveVolume.cpp +++ b/rosapps/fraginator/DriveVolume.cpp @@ -48,7 +48,7 @@ bool DriveVolume::Open (wstring Name) RootPath = Name.c_str(); RootPath += L"\\"; - Handle = CreateFile + Handle = CreateFileW ( FileName, MAXIMUM_ALLOWED, // access @@ -71,7 +71,7 @@ bool DriveVolume::Open (wstring Name) BOOL Result; ReturnVal = true; - Result = GetVolumeInformation + Result = GetVolumeInformationW ( RootPath.c_str(), VolName, @@ -140,7 +140,7 @@ bool DriveVolume::ObtainInfo (void) DWORD FreeClusters; DWORD TotalClusters; - Result = GetDiskFreeSpace + Result = GetDiskFreeSpaceW ( RootPath.c_str(), &SectorsPerCluster, @@ -155,7 +155,7 @@ bool DriveVolume::ObtainInfo (void) VolInfo.ClusterSize = SectorsPerCluster * BytesPerSector; - Result = GetDiskFreeSpaceEx + Result = GetDiskFreeSpaceExW ( RootPath.c_str(), (PULARGE_INTEGER)&nan, @@ -367,7 +367,7 @@ uint32 DriveVolume::RemoveDBFile (uint32 Indice) bool DriveVolume::ScanDirectory (wstring DirPrefix, ScanCallback Callback, void *UserData) { - WIN32_FIND_DATA FindData; + WIN32_FIND_DATAW FindData; HANDLE FindHandle; wstring SearchString; uint32 DirIndice; @@ -377,7 +377,7 @@ bool DriveVolume::ScanDirectory (wstring DirPrefix, ScanCallback Callback, void SearchString = DirPrefix; SearchString += L"*.*"; ZeroMemory (&FindData, sizeof (FindData)); - FindHandle = FindFirstFile (SearchString.c_str(), &FindData); + FindHandle = FindFirstFileW (SearchString.c_str(), &FindData); if (FindHandle == INVALID_HANDLE_VALUE) return (false); @@ -460,7 +460,7 @@ bool DriveVolume::ScanDirectory (wstring DirPrefix, ScanCallback Callback, void ScanDirectory (Dir, Callback, UserData); } - } while (FindNextFile (FindHandle, &FindData) == TRUE); + } while (FindNextFileW (FindHandle, &FindData) == TRUE); FindClose (FindHandle); return (false); @@ -497,7 +497,7 @@ bool DriveVolume::GetClusterInfo (FileInfo &Info, HANDLE &HandleResult) FullName = GetDBDir (Info.DirIndice) + Info.Name; - Handle = CreateFile + Handle = CreateFileW ( FullName.c_str(), 0, //GENERIC_READ, @@ -688,7 +688,7 @@ bool DriveVolume::MoveFileDumb (uint32 FileIndice, uint64 NewLCN) */ // Open file - FileHandle = CreateFile + FileHandle = CreateFileW ( FullName.c_str (), GENERIC_READ, -- 2.17.1