Changeset 4473 for trunk/src/kernel32

Timestamp:

Oct 10, 2000, 12:51:19 AM (25 years ago)

Author:

sandervl

Message:

GetDirectoryA replaced with correct implementation

Location:

trunk/src/kernel32

Files:

• directory.cpp (modified) (3 diffs)
• oslibdos.cpp (modified) (2 diffs)
• oslibdos.h (modified) (2 diffs)

trunk/src/kernel32/directory.cpp

@@ -1 @@
-/* $Id: directory.cpp,v 1.31 2000-10-06 15:16:03 sandervl Exp $ */
+/* $Id: directory.cpp,v 1.32 2000-10-09 22:51:17 sandervl Exp $ */
 
 /*
@@ -103 +103 @@
  * Variables :
  * Result    :
- * Remark    :
+ * Remark    : returned length is number of characters required or used for current dir
+ *             *excluding* terminator
  * Status    :
  *
@@ -114 +115 @@
  UINT rc;
 
-  rc = O32_GetCurrentDirectory(nBufferLength, lpBuffer);
-  if(rc) {
-    dprintf(("CurrentDirectory = %s", lpBuffer)); 
+  rc = OSLibDosQueryDir(nBufferLength, lpBuffer);
+  if(rc && rc < nBufferLength) {
+       dprintf(("CurrentDirectory = %s (%d)", lpBuffer, rc)); 
   }
+  else dprintf(("CurrentDirectory returned %d", rc)); 
   return rc;
 }

trunk/src/kernel32/oslibdos.cpp

@@ -1 @@
-/* $Id: oslibdos.cpp,v 1.47 2000-10-02 13:38:56 sandervl Exp $ */
+/* $Id: oslibdos.cpp,v 1.48 2000-10-09 22:51:18 sandervl Exp $ */
 /*
  * Wrappers for OS/2 Dos* API
@@ -2041 +2041 @@
   return rc;
 }
+//******************************************************************************
+//returned length is number of characters required or used for current dir
+//*excluding* terminator
+//******************************************************************************
+ULONG OSLibDosQueryDir(DWORD length, LPSTR lpszCurDir)
+{
+  ULONG  drivemap, currentdisk, len;
+  char  *lpszCurDriveAndDir = lpszCurDir +3;
+  APIRET rc;
+
+   len = (length > 3) ? length - 3 : 0;
+
+   rc = DosQueryCurrentDir(0, lpszCurDriveAndDir, &len);
+   if(rc != ERROR_BUFFER_OVERFLOW)
+   {
+        if(rc)
+        {
+             SetLastError(error2WinError(rc,ERROR_INVALID_PARAMETER));
+             return 0;
+        }
+        len = strlen(lpszCurDriveAndDir) + 3;
+
+        // Dir returned by DosQueryCurDir doesn't include drive, so add it 
+        DosQueryCurrentDisk(&currentdisk, &drivemap);
+
+        if(isupper(lpszCurDir[3])) {
+             lpszCurDir[0] = (char)('A' - 1 + currentdisk);
+        }
+        else lpszCurDir[0] = (char)('a' - 1 + currentdisk);
+
+        lpszCurDir[1] = ':';
+        lpszCurDir[2] = '\\';
+   }
+   else len += 3;   // + 3 since DosQueryCurDir doesn't include drive
+   return len;
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/kernel32/oslibdos.h

@@ -1 @@
-/* $Id: oslibdos.h,v 1.24 2000-09-25 04:35:00 phaller Exp $ */
+/* $Id: oslibdos.h,v 1.25 2000-10-09 22:51:19 sandervl Exp $ */
 
 /*
@@ -284 +284 @@
 
 ULONG OSLibDosQueryModuleName(ULONG hModule, int cchName, char *pszName);
+ULONG OSLibDosQueryDir(DWORD length, LPSTR lpszCurDir);