Changeset 10556 for trunk/src/kernel32/disk.cpp

Timestamp:

Mar 24, 2004, 10:23:47 AM (21 years ago)

Author:

sandervl

Message:

VP: GetVolumeInformation: check for file system buffer size

File:

• trunk/src/kernel32/disk.cpp (modified) (4 diffs)

trunk/src/kernel32/disk.cpp

@@ -1 @@
-/* $Id: disk.cpp,v 1.39 2002-09-27 14:35:56 sandervl Exp $ */
+/* $Id: disk.cpp,v 1.40 2004-03-24 09:23:47 sandervl Exp $ */
 
 /*
@@ -374 +374 @@
             else 
             {//pretend everything else is FAT16 (HPFS and FAT have the same file size limit)
-                strcpy(lpFileSystemNameBuffer, "FAT16");
+                // @@VP:20040323 - nFileSystemNameSize may be 0!!!
+                strncpy(lpFileSystemNameBuffer, "FAT16", nFileSystemNameSize);
             }
             if(fForce2GBFileSize) {
@@ -380 +381 @@
                    strcmp(lpFileSystemNameBuffer, "UDF")) 
                 {//everything is FAT -> 2 GB file size limit
-                    strcpy(lpFileSystemNameBuffer, "FAT16");
+                    strncpy(lpFileSystemNameBuffer, "FAT16", nFileSystemNameSize);
                 }
             }
@@ -478 +479 @@
 //******************************************************************************
 //******************************************************************************
-UINT WIN32API GetLogicalDriveStringsW(UINT nBufferLength, LPWSTR lpBuffer)
-{
-    char *asciibuffer = (char *)malloc(nBufferLength+1);
-    DWORD rc;
-
-    dprintf(("KERNEL32:  OS2GetLogicalDriveStringsW\n"));
-
-    rc = O32_GetLogicalDriveStrings(nBufferLength, asciibuffer);
-    if(rc)      AsciiToUnicode(asciibuffer, lpBuffer);
-    free(asciibuffer);
-    return(rc);
+UINT WIN32API GetLogicalDriveStringsW(UINT nBufferLength, LPWSTR lpBufferW)
+{
+   LPSTR  lpBufferA = (LPSTR)HeapAlloc( GetProcessHeap(), 0, sizeof(CHAR) * (nBufferLength + 1) );
+   DWORD   dwResult = GetLogicalDriveStringsA( nBufferLength, lpBufferA );
+
+   dprintf(("KERNEL32: GetLogicalDriveStringsW %d %x", nBufferLength, lpBufferA));
+
+   if ( dwResult && dwResult <= nBufferLength )
+        MultiByteToWideChar( CP_ACP, 0, lpBufferA, dwResult + 1, lpBufferW, nBufferLength );
+
+   HeapFree( GetProcessHeap(), 0, lpBufferA );
+
+   return dwResult;
 }
 //******************************************************************************