[ros-diffs] [janderwald] 32432: - fix compilation with msvc

janderwald at svn.reactos.org janderwald at svn.reactos.org
Wed Feb 20 20:13:53 CET 2008


Author: janderwald
Date: Wed Feb 20 22:13:52 2008
New Revision: 32432

URL: http://svn.reactos.org/svn/reactos?rev=32432&view=rev
Log:
- fix compilation with msvc

Modified:
    trunk/rosapps/fraginator/DriveVolume.cpp

Modified: trunk/rosapps/fraginator/DriveVolume.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/fraginator/DriveVolume.cpp?rev=32432&r1=32431&r2=32432&view=diff
==============================================================================
--- trunk/rosapps/fraginator/DriveVolume.cpp (original)
+++ trunk/rosapps/fraginator/DriveVolume.cpp Wed Feb 20 22:13:52 2008
@@ -48,7 +48,7 @@
     RootPath = Name.c_str();
     RootPath += L"\\";
 
-    Handle = CreateFile
+    Handle = CreateFileW
     (
         FileName,
         MAXIMUM_ALLOWED,                          // access
@@ -71,7 +71,7 @@
         BOOL  Result;
 
         ReturnVal = true;
-        Result = GetVolumeInformation
+        Result = GetVolumeInformationW
         (
             RootPath.c_str(),
             VolName,
@@ -140,7 +140,7 @@
     DWORD FreeClusters;
     DWORD TotalClusters;
 
-    Result = GetDiskFreeSpace
+    Result = GetDiskFreeSpaceW
     (
         RootPath.c_str(),
         &SectorsPerCluster,
@@ -155,7 +155,7 @@
 
     VolInfo.ClusterSize = SectorsPerCluster * BytesPerSector;
 
-    Result = GetDiskFreeSpaceEx
+    Result = GetDiskFreeSpaceExW
     (
         RootPath.c_str(),
         (PULARGE_INTEGER)&nan,
@@ -367,7 +367,7 @@
 
 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 @@
     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 @@
             ScanDirectory (Dir, Callback, UserData);
         }
 
-    } while (FindNextFile (FindHandle, &FindData) == TRUE);
+    } while (FindNextFileW (FindHandle, &FindData) == TRUE);
 
     FindClose (FindHandle);
     return (false);
@@ -497,7 +497,7 @@
 
     FullName = GetDBDir (Info.DirIndice) + Info.Name;
 
-    Handle = CreateFile
+    Handle = CreateFileW
     (
         FullName.c_str(),
         0, //GENERIC_READ,
@@ -688,7 +688,7 @@
     */
 
     // Open file
-    FileHandle = CreateFile
+    FileHandle = CreateFileW
     (
         FullName.c_str (),
         GENERIC_READ,




More information about the Ros-diffs mailing list