Changeset 4171 for trunk/src

Timestamp:

Sep 3, 2000, 11:32:19 AM (25 years ago)

Author:

sandervl

Message:

more logging + DeviceIoControl handlemanager wrapper added

Location:

trunk/src/kernel32

Files:

• Fileio.cpp (modified) (3 diffs)
• HandleManager.cpp (modified) (2 diffs)
• disk.cpp (modified) (4 diffs)
• hmfile.cpp (modified) (3 diffs)

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.36 2000-07-04 08:41:12 sandervl Exp $ */
+/* $Id: Fileio.cpp,v 1.37 2000-09-03 09:32:04 sandervl Exp $ */
 
 /*
@@ -410 +410 @@
  BOOL rc;
 
-#if 0
+#if 1
+  dprintf(("DeleteFileA %s", lpszFile));
   return 1;
 #else
@@ -1147 +1148 @@
 //******************************************************************************
 //******************************************************************************
+ODINFUNCTION8(BOOL, DeviceIoControl, HANDLE, hDevice, DWORD, dwIoControlCode,
+              LPVOID, lpInBuffer, DWORD, nInBufferSize,
+              LPVOID, lpOutBuffer, DWORD, nOutBufferSize,
+              LPDWORD, lpBytesReturned, LPOVERLAPPED, lpOverlapped)
+{
+    return HMDeviceIoControl(hDevice, dwIoControlCode, lpInBuffer, nInBufferSize,
+                             lpOutBuffer, nOutBufferSize, lpBytesReturned, lpOverlapped);
+}
+//******************************************************************************
+//******************************************************************************

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.46 2000-08-11 18:42:53 sandervl Exp $ */
+/* $Id: HandleManager.cpp,v 1.47 2000-09-03 09:32:06 sandervl Exp $ */
 
 /*
@@ -2849 +2849 @@
  *****************************************************************************/
 
-BOOL WIN32API DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode,
-                              LPVOID lpInBuffer, DWORD nInBufferSize,
-                              LPVOID lpOutBuffer, DWORD nOutBufferSize,
-                              LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped)
+BOOL HMDeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode,
+                       LPVOID lpInBuffer, DWORD nInBufferSize,
+                       LPVOID lpOutBuffer, DWORD nOutBufferSize,
+                       LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped)
 {
   int       iIndex;                           /* index into the handle table */

trunk/src/kernel32/disk.cpp

@@ -1 @@
-/* $Id: disk.cpp,v 1.14 2000-08-17 18:22:18 sandervl Exp $ */
+/* $Id: disk.cpp,v 1.15 2000-09-03 09:32:13 sandervl Exp $ */
 
 /*
@@ -246 +246 @@
    if(lpVolumeSerialNumber || lpVolumeNameBuffer) {
         rc = OSLibDosQueryVolumeSerialAndName(drive, lpVolumeSerialNumber, lpVolumeNameBuffer, nVolumeNameSize);
+        if(lpVolumeSerialNumber) {
+                dprintf2(("Volume serial number: %x", *lpVolumeSerialNumber));
+        }
+        if(lpVolumeNameBuffer) {
+                dprintf2(("Volume name: %s", lpVolumeNameBuffer));
+        }
    }
    if(lpFileSystemNameBuffer || lpMaximumComponentLength) {
@@ -253 +259 @@
         }
         rc = OSLibDosQueryVolumeFS(drive, lpFileSystemNameBuffer, nFileSystemNameSize);
+        if(lpFileSystemNameBuffer) {
+                dprintf2(("File system name: %s", lpFileSystemNameBuffer));
+        }
    }
    if(lpMaximumComponentLength) {
@@ -273 +282 @@
         }
         else    *lpFileSystemFlags = 0;
+
+        dprintf2(("File system flags: %x", lpFileSystemFlags));
    }
 

trunk/src/kernel32/hmfile.cpp

@@ -1 @@
-/* $Id: hmfile.cpp,v 1.18 2000-08-14 08:10:10 sandervl Exp $ */
+/* $Id: hmfile.cpp,v 1.19 2000-09-03 09:32:19 sandervl Exp $ */
 
 /*
@@ -345 +345 @@
   else
   {
+    dprintf(("ERROR: DuplicateHandle; invalid parameter!!"));
     SetLastError(ERROR_INVALID_PARAMETER);
     return FALSE;
@@ -789 +790 @@
 
   if(!pFT1 && !pFT2 && !pFT3) {//TODO: does NT do this?
+        dprintf(("ERROR: GetFileTime: invalid parameter!"));
         SetLastError(ERROR_INVALID_PARAMETER);
         return FALSE;