Changeset 3593 for trunk/src

Timestamp:

May 23, 2000, 8:45:13 PM (25 years ago)

Author:

sandervl

Message:

some bugfixes + GetVolumeInformation rewrite

Location:

trunk/src/kernel32

Files:

• disk.cpp (modified) (4 diffs)
• hmopen32.cpp (modified) (2 diffs)
• lang.cpp (modified) (3 diffs)
• oslibdos.cpp (modified) (3 diffs)
• oslibdos.h (modified) (2 diffs)

trunk/src/kernel32/disk.cpp

@@ -1 @@
-/* $Id: disk.cpp,v 1.11 2000-05-20 13:30:27 sandervl Exp $ */
+/* $Id: disk.cpp,v 1.12 2000-05-23 18:45:12 sandervl Exp $ */
 
 /*
@@ -20 +20 @@
 #include <string.h>
 #include "unicode.h"
+#include "oslibdos.h"
 
 #define DBG_LOCALLOG  DBG_disk
@@ -220 +221 @@
               DWORD,   nFileSystemNameSize)
 {
+   CHAR   tmpstring[256];
+   ULONG  drive;
+   BOOL   rc;
+
    dprintf(("GetVolumeInformationA %s", lpRootPathName));
-   return O32_GetVolumeInformation(lpRootPathName,
-                                   lpVolumeNameBuffer,
-                                   nVolumeNameSize,
-                                   lpVolumeSerialNumber,
-                                   lpMaximumComponentLength,
-                                   lpFileSystemFlags,
-                                   lpFileSystemNameBuffer,
-                                   nFileSystemNameSize);
-}
-//******************************************************************************
-//******************************************************************************
-
+
+   if(lpRootPathName == NULL) {
+        GetCurrentDirectoryA(sizeof(tmpstring), tmpstring);
+        lpRootPathName = tmpstring;
+   }
+
+   if('A' <= *lpRootPathName && *lpRootPathName <= 'Z') {
+        drive = *lpRootPathName - 'A' + 1;
+   }
+   else 
+   if('a' <= *lpRootPathName && *lpRootPathName <= 'z') {
+        drive = *lpRootPathName - 'a' + 1;
+   }
+   else {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+   }
+
+   if(lpVolumeSerialNumber || lpVolumeNameBuffer) {
+        rc = OSLibDosQueryVolumeSerialAndName(drive, lpVolumeSerialNumber, lpVolumeNameBuffer, nVolumeNameSize);
+   }
+   if(lpFileSystemNameBuffer || lpMaximumComponentLength) {
+        if(!lpFileSystemNameBuffer) {
+                lpFileSystemNameBuffer = tmpstring;
+        }
+        rc = OSLibDosQueryVolumeFS(drive, lpFileSystemNameBuffer, nFileSystemNameSize);
+   }
+   if(lpMaximumComponentLength) {
+        if(!strcmp(lpFileSystemNameBuffer, "FAT")) {
+                *lpMaximumComponentLength = 11;
+        }
+        else    *lpMaximumComponentLength = 255; //TODO: Always correct? (CDFS?)
+   }
+   if(lpFileSystemFlags) {
+        if(strcmp(lpFileSystemNameBuffer, "FAT")) {
+                *lpFileSystemFlags = FS_CASE_IS_PRESERVED;
+        }
+        else
+        if(!strcmp(lpFileSystemNameBuffer, "CDFS")) {
+                *lpFileSystemFlags = FS_CASE_SENSITIVE; //NT4 returns this
+        }
+        else
+        if(!strcmp(lpFileSystemNameBuffer, "UDF")) {//TODO: correct?
+                *lpFileSystemFlags = FS_CASE_SENSITIVE | FS_UNICODE_STORED_ON_DISK;
+        }
+        else    *lpFileSystemFlags = 0;
+   }
+
+   if(rc) {
+        SetLastError(rc);
+        return FALSE;
+   }
+   return TRUE;
+}
+//******************************************************************************
+//******************************************************************************
 ODINFUNCTION8(BOOL,    GetVolumeInformationW,
               LPCWSTR, lpRootPathName,
@@ -261 +310 @@
     asciiroot = NULL;
 
-  // @@@PH switch to ODIN_
-  rc = GetVolumeInformationA(asciiroot,
+  rc = ODIN_GetVolumeInformationA(asciiroot,
                              asciivol,
                              nVolumeNameSize,

trunk/src/kernel32/hmopen32.cpp

@@ -1 @@
-/* $Id: hmopen32.cpp,v 1.22 2000-05-22 19:07:56 sandervl Exp $ */
+/* $Id: hmopen32.cpp,v 1.23 2000-05-23 18:45:12 sandervl Exp $ */
 
 /*
@@ -786 +786 @@
     pHMHandleData->hHMHandle = hFile;
 
-    ::GetFileTime(hFile,
-                  NULL,
-                  NULL,
-                  &filetime );
+    GetFileTime(pHMHandleData,
+                NULL,
+                NULL,
+                &filetime );
     FileTimeToDosDateTime(&filetime,
                           &filedatetime[0],

trunk/src/kernel32/lang.cpp

@@ -1 @@
-/* $Id: lang.cpp,v 1.20 2000-05-22 19:07:57 sandervl Exp $ */
+/* $Id: lang.cpp,v 1.21 2000-05-23 18:45:12 sandervl Exp $ */
 /*
  * Win32 language API functions for OS/2
@@ -154 +154 @@
 LANGID WIN32API GetUserDefaultLangID()
 {
-  dprintf(("KERNEL32:  OS2GetUserDefaultLangID, returns %x", GetLanguageId()));
+  dprintf2(("KERNEL32:  GetUserDefaultLangID, returns %x", GetLanguageId()));
   return(GetLanguageId());
 }
@@ -161 +161 @@
 LANGID WIN32API GetSystemDefaultLangID(void)
 {
-  dprintf(("KERNEL32:  OS2GetSystemDefaultLangID returns %x", MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US)));
+  dprintf2(("KERNEL32:  GetSystemDefaultLangID returns %x", MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US)));
   return(MAKELANGID(LANG_ENGLISH, SUBLANG_ENGLISH_US));
 }

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.27 2000-05-22 19:07:58 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.28 2000-05-23 18:45:12 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -15 +15 @@
 #define INCL_DOSMEMMGR
 #define INCL_DOSPROCESS
+#define INCL_DOSFILEMGR
 #define INCL_DOSERRORS
 #define INCL_NPIPES
@@ -1217 +1218 @@
   return TRUE;
 }
+//******************************************************************************
+#define FSATTACH_SIZE   256
+//******************************************************************************
+DWORD OSLibDosQueryVolumeFS(int drive, LPSTR lpFileSystemNameBuffer, DWORD nFileSystemNameSize)
+{
+ PFSQBUFFER2 fsinfo = (PFSQBUFFER2) alloca(FSATTACH_SIZE);
+ ULONG       cb     = FSATTACH_SIZE;
+ char        drv[3] = "A:";
+ char       *fsname;
+ APIRET      rc;
+
+   if(lpFileSystemNameBuffer == NULL) {
+        DebugInt3();
+        return ERROR_INVALID_PARAMETER_W;
+   }
+   drv[0] = (char)('A' + drive - 1);
+
+   DosError(FERR_DISABLEHARDERR);
+   rc = DosQueryFSAttach(drv, 1, FSAIL_QUERYNAME, fsinfo, &cb);
+   DosError(FERR_ENABLEHARDERR); 
+
+   switch(rc) {
+   case ERROR_INVALID_DRIVE:
+        return ERROR_INVALID_DRIVE_W;
+   case ERROR_NO_VOLUME_LABEL:
+        return ERROR_NO_VOLUME_LABEL_W;
+   case NO_ERROR:
+        break;
+   default:
+        return ERROR_NOT_ENOUGH_MEMORY; //whatever
+   }
+
+   fsname = (char *)&fsinfo->szName[0] + fsinfo->cbName + 1;
+   if(strlen(fsname) < nFileSystemNameSize) {
+        strcpy(lpFileSystemNameBuffer, fsname);
+   }
+   else return ERROR_BUFFER_OVERFLOW_W;
+   return 0;
+}
+//******************************************************************************
+typedef struct _FSINFOBUF 
+{
+        ULONG           ulVolser;          /* Volume serial number            */
+        VOLUMELABEL     vol;               /* Volume lable                    */
+} FSINFOBUF;
+//******************************************************************************
+DWORD OSLibDosQueryVolumeSerialAndName(int drive, LPDWORD lpVolumeSerialNumber, 
+                                       LPSTR lpVolumeNameBuffer, DWORD nVolumeNameSize)
+{
+ FSINFOBUF fsi;
+ APIRET    rc;
+
+   DosError(FERR_DISABLEHARDERR);
+   rc = DosQueryFSInfo(drive, FSIL_VOLSER, &fsi, sizeof(fsi));
+   DosError(FERR_ENABLEHARDERR);
+
+   switch(rc) {
+   case ERROR_INVALID_DRIVE:
+        return ERROR_INVALID_DRIVE_W;
+   case ERROR_NO_VOLUME_LABEL:
+        return ERROR_NO_VOLUME_LABEL_W;
+   case NO_ERROR:
+        break;
+   default:
+        return ERROR_NOT_ENOUGH_MEMORY; //whatever
+   }
+
+   if(lpVolumeSerialNumber) {
+         *lpVolumeSerialNumber = fsi.ulVolser;
+   }
+   if(lpVolumeNameBuffer) 
+   {
+        if(nVolumeNameSize > fsi.vol.cch) {
+             strcpy(lpVolumeNameBuffer, (PCHAR)fsi.vol.szVolLabel);
+        }
+        else return ERROR_BUFFER_OVERFLOW_W;
+   }
+
+   return ERROR_SUCCESS_W;
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/kernel32/oslibdos.h

@@ -1 @@
-/* $Id: oslibdos.h,v 1.14 2000-05-22 19:07:59 sandervl Exp $ */
+/* $Id: oslibdos.h,v 1.15 2000-05-23 18:45:13 sandervl Exp $ */
 
 /*
@@ -152 +152 @@
 BOOL  OSLibDosFindClose(DWORD hFindFile);
 
+DWORD OSLibDosQueryVolumeFS(int drive, LPSTR lpFileSystemNameBuffer, DWORD nFileSystemNameSize);
+DWORD OSLibDosQueryVolumeSerialAndName(int drive, LPDWORD lpVolumeSerialNumber, LPSTR lpVolumeNameBuffer, DWORD nVolumeNameSize);
+
+
 #endif