Changeset 1713 for trunk/src

Timestamp:

Nov 12, 1999, 3:57:15 PM (26 years ago)

Author:

sandervl

Message:

device driver handlemanager class added

Location:

trunk/src/kernel32

Files:

• Fileio.cpp (modified) (2 diffs)
• HandleManager.cpp (modified) (3 diffs)
• KERNEL32.CPP (modified) (2 diffs)
• devio.cpp (deleted)
• devio.h (deleted)
• hmdevice.cpp (modified) (2 diffs)
• hmdevice.h (modified) (3 diffs)
• hmdevio.cpp (added)
• hmdevio.h (added)
• hmopen32.cpp (modified) (2 diffs)
• initterm.cpp (modified) (3 diffs)
• makefile (modified) (4 diffs)

trunk/src/kernel32/Fileio.cpp

@@ -1 @@
-/* $Id: Fileio.cpp,v 1.14 1999-11-08 13:43:11 sandervl Exp $ */
+/* $Id: Fileio.cpp,v 1.15 1999-11-12 14:57:12 sandervl Exp $ */
 
 /*
@@ -27 +27 @@
 #include <heapstring.h>
 #include "handlemanager.h"
-#include "devio.h"
 #include "oslibdos.h"
 

trunk/src/kernel32/HandleManager.cpp

@@ -1 @@
-/* $Id: HandleManager.cpp,v 1.24 1999-11-12 13:41:53 davidr Exp $ */
-
-/*
- *
- * Project Odin Software License can be found in LICENSE.TXT
- *
- */
+/* $Id: HandleManager.cpp,v 1.25 1999-11-12 14:57:13 sandervl Exp $ */
+
 /*
  * Win32 Unified Handle Manager for OS/2
@@ -12 +7 @@
  *
  * @(#) HandleManager.Cpp       1.0.0   1998/02/11 PH start
+ *
+ * Project Odin Software License can be found in LICENSE.TXT
+ *
  */
 
@@ -2547 +2545 @@
 }
 
+/*****************************************************************************
+ * Name      : HMDeviceIoControl
+ * Purpose   : router function for DeviceIoControl
+ * Parameters:
+ * Variables :
+ * Result    :
+ * Remark    :
+ * Status    :
+ *
+ * Author    : Sander van Leeuwen
+ *****************************************************************************/
+
+BOOL WIN32API DeviceIoControl(HANDLE hDevice, DWORD dwIoControlCode,
+                              LPVOID lpInBuffer, DWORD nInBufferSize,
+                              LPVOID lpOutBuffer, DWORD nOutBufferSize,
+                              LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped)
+{
+  int       iIndex;                           /* index into the handle table */
+  BOOL      fResult;       /* result from the device handler's CloseHandle() */
+  PHMHANDLE pHMHandle;       /* pointer to the handle structure in the table */
+
+                                                          /* validate handle */
+  iIndex = _HMHandleQuery(hDevice);                           /* get the index */
+  if (-1 == iIndex)                                               /* error ? */
+  {
+    SetLastError(ERROR_INVALID_HANDLE);       /* set win32 error information */
+    return (FALSE);                                        /* signal failure */
+  }
+
+  pHMHandle = &TabWin32Handles[iIndex];               /* call device handler */
+  fResult = pHMHandle->pDeviceHandler->DeviceIoControl(&pHMHandle->hmHandleData,
+                                                dwIoControlCode,
+                                                lpInBuffer, nInBufferSize,
+                                                lpOutBuffer, nOutBufferSize,
+                                                lpBytesReturned, lpOverlapped);
+
+  return (fResult);                                   /* deliver return code */
+}

trunk/src/kernel32/KERNEL32.CPP

@@ -1 @@
-/* $Id: KERNEL32.CPP,v 1.30 1999-11-11 19:10:08 sandervl Exp $ */
+/* $Id: KERNEL32.CPP,v 1.31 1999-11-12 14:57:12 sandervl Exp $ */
 
 /*
@@ -31 +31 @@
 
 #include "misc.h"
-#include "devio.h"
 #include "except.h"
 #include <builtin.h>

trunk/src/kernel32/hmdevice.cpp

@@ -1 @@
-/* $Id: hmdevice.cpp,v 1.8 1999-09-01 19:12:17 phaller Exp $ */
+/* $Id: hmdevice.cpp,v 1.9 1999-11-12 14:57:13 sandervl Exp $ */
 
 /*
@@ -1056 +1056 @@
   return(NULL);
 }
+
+/*****************************************************************************
+ * Name      : DWORD HMDeviceHandler::DeviceIoControl
+ * Purpose   : send command to device driver
+ * Variables :
+ * Result    : 
+ * Remark    :
+ * Status    :
+ *
+ * Author    : Sander van Leeuwen
+ *****************************************************************************/
+
+BOOL HMDeviceHandler::DeviceIoControl(PHMHANDLEDATA pHMHandleData, DWORD dwIoControlCode,
+                                      LPVOID lpInBuffer, DWORD nInBufferSize,
+                                      LPVOID lpOutBuffer, DWORD nOutBufferSize,
+                                      LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped)
+{
+  dprintf(("KERNEL32: HandleManager::DeviceHandler::DeviceIoControl(%08xh,%08xh,%08xh,%08xh,%08xh,%08xh)\n",
+           pHMHandleData->hHMHandle,
+           dwIoControlCode,
+           lpInBuffer,
+           nInBufferSize,
+           lpOutBuffer, nOutBufferSize));
+
+  return(FALSE);
+}

trunk/src/kernel32/hmdevice.h

@@ -1 @@
-/* $Id: hmdevice.h,v 1.9 1999-09-01 19:12:17 phaller Exp $ */
+/* $Id: hmdevice.h,v 1.10 1999-11-12 14:57:14 sandervl Exp $ */
 
 /*
@@ -27 +27 @@
 #define HMTYPE_UNKNOWN  0
 #define HMTYPE_MEMMAP   1
+#define HMTYPE_DEVICE   2
 //.....
 
@@ -280 +281 @@
                                      LPVOID                     lpBaseAddress);
 
+                    /* this is a handler method for calls to DeviceIoControl() */
+  virtual BOOL   DeviceIoControl    (PHMHANDLEDATA pHMHandleData, DWORD dwIoControlCode,
+                                     LPVOID lpInBuffer, DWORD nInBufferSize,
+                                     LPVOID lpOutBuffer, DWORD nOutBufferSize,
+                                     LPDWORD lpBytesReturned, LPOVERLAPPED lpOverlapped);
+
 };
 

trunk/src/kernel32/hmopen32.cpp

@@ -1 @@
-/* $Id: hmopen32.cpp,v 1.10 1999-11-12 11:38:39 sandervl Exp $ */
+/* $Id: hmopen32.cpp,v 1.11 1999-11-12 14:57:15 sandervl Exp $ */
 
 /*
@@ -155 +155 @@
   if (strncmp(lpFileName,       // "support" for local unc names
               "\\\\.\\",
-              4) == 0)
-    lpFileName+=4;
+              4) == 0) 
+  {
+        lpFileName+=4;
+  }
 
   // create from template

trunk/src/kernel32/initterm.cpp

@@ -1 @@
-/* $Id: initterm.cpp,v 1.23 1999-11-09 14:19:46 sandervl Exp $ */
+/* $Id: initterm.cpp,v 1.24 1999-11-12 14:57:15 sandervl Exp $ */
 
 /*
@@ -44 +44 @@
 #include "mmap.h"
 #include "directory.h"
+#include "hmdevio.h"
 
 /*-------------------------------------------------------------------*/
@@ -133 +134 @@
             HMInitialize();             /* store standard handles within HandleManager */
             InitDirectories();
+            RegisterDevices();
             break;
         }

trunk/src/kernel32/makefile

@@ -1 @@
-# $Id: makefile,v 1.56 1999-11-11 19:10:09 sandervl Exp $
+# $Id: makefile,v 1.57 1999-11-12 14:57:15 sandervl Exp $
 
 #
@@ -30 +30 @@
 
 OBJS = KERNEL32.OBJ KOBJECTS.OBJ CONSOLE.OBJ CONIN.OBJ \
-CONBUFFER.OBJ CONOUT.OBJ UNICODE.OBJ network.OBJ DEVIO.OBJ \
+CONBUFFER.OBJ CONOUT.OBJ UNICODE.OBJ network.OBJ HMDEVIO.OBJ \
 profile.obj THREAD.OBJ virtual.obj THUNK.OBJ OBSOLETE.OBJ COMM.OBJ\
 MESSAGE.OBJ RESOURCE.OBJ EXCEPTIONS.OBJ heapshared.obj \
@@ -144 +144 @@
     os2heap.h
 
-initterm.OBJ: .\initterm.cpp initterm.h  $(PDWIN32_INCLUDE)\heapshared.h  mmap.h directory.h
+initterm.OBJ: .\initterm.cpp initterm.h  $(PDWIN32_INCLUDE)\heapshared.h  mmap.h directory.h hmdevio.h
 
 thunk.OBJ: \
@@ -169 +169 @@
     oslibexcept.h
 
-devio.OBJ: \
-    .\devio.cpp \
+hmdevio.OBJ: \
+    .\hmdevio.cpp \
     exceptutil.h \
-    devio.h \
+    hmdevio.h \
     map.h \
     cio.h