Changeset 7342 for trunk/src/kernel32/Fileio.cpp

Timestamp:

Nov 14, 2001, 7:39:52 PM (24 years ago)

Author:

sandervl

Message:

removed unnecessary changes

File:

• trunk/src/kernel32/Fileio.cpp (modified) (3 diffs)

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.54 2001-11-14 12:30:35 phaller Exp $ */
+/* $Id: Fileio.cpp,v 1.55 2001-11-14 18:39:52 sandervl Exp $ */
 
 /*
@@ -531 +531 @@
                            DWORD              dwCopyFlags)
 {
-#ifdef __WIN32OS2__
-  LPSTR sourceA;
-  LPSTR destA;
-  STACK_strdupWtoA(lpExistingFileName, sourceA)
-  STACK_strdupWtoA(lpNewFileName, destA)
-#else
-  LPSTR sourceA = HEAP_strdupWtoA( GetProcessHeap(), 0, lpExistingFileName );
-  LPSTR destA   = HEAP_strdupWtoA( GetProcessHeap(), 0, lpNewFileName );
-#endif
-  
-  BOOL ret = CopyFileExA(sourceA,
-                         destA,
-                         lpProgressRoutine,
-                         lpData,
-                         pbCancel,
-                         dwCopyFlags);
-  
-#ifndef __WIN32OS2__
-  HeapFree( GetProcessHeap(), 0, sourceA );
-  HeapFree( GetProcessHeap(), 0, destA );
-#endif
-  
-  return ret;
+    LPSTR sourceA = HEAP_strdupWtoA( GetProcessHeap(), 0, lpExistingFileName );
+    LPSTR destA   = HEAP_strdupWtoA( GetProcessHeap(), 0, lpNewFileName );
+
+    BOOL ret = CopyFileExA(sourceA,
+                           destA,
+                           lpProgressRoutine,
+                           lpData,
+                           pbCancel,
+                           dwCopyFlags);
+
+    HeapFree( GetProcessHeap(), 0, sourceA );
+    HeapFree( GetProcessHeap(), 0, destA );
+
+    return ret;
 }
 //******************************************************************************
@@ -1392 +1383 @@
               LPVOID, lpFileInformation)
 {
-#ifdef __WIN32OS2__
-  LPSTR nameA;
-  STACK_strdupWtoA(lpFileName, nameA)
-#else
   LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, lpFileName );
-#endif
-  
   BOOL res = GetFileAttributesExA( nameA, fInfoLevelId, lpFileInformation);
-  
-#ifndef __WIN32OS2__
   HeapFree( GetProcessHeap(), 0, nameA );
-#endif
   return res;
 }