Changeset 21916 for trunk/src/kernel32/hmdevio.cpp

Timestamp:

Dec 18, 2011, 10:28:22 PM (14 years ago)

Author:

dmik

Message:

Merge branch gcc-kmk to trunk.

Location:

trunk

Files:

• . (modified) (2 props)
• src/kernel32/hmdevio.cpp (modified) (10 diffs)

trunk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk

trunk/src/kernel32/hmdevio.cpp

@@ -25 +25 @@
 #include <win32api.h>
 #include <misc.h>
-#include <win\winioctl.h>
+#include <win/winioctl.h>
 #include "hmdevio.h"
 #include "exceptutil.h"
@@ -47 +47 @@
  DWORD rc;
 
-    for(int i=0;i<nrKnownDrivers;i++) 
+    for(int i=0;i<nrKnownDrivers;i++)
     {
             driver = new HMDeviceDriver(knownDriver[i].szWin32Name,
@@ -101 +101 @@
                         if (rc != NO_ERROR)                                  /* check for errors */
                           dprintf(("KERNEL32:RegisterDevices: registering %s failed with %u.\n", szDrvName, rc));
-                      
+
                         // @@@PH
                         // there should be an symbolic link:
@@ -109 +109 @@
                 rc = 0;
             }
-        }   
+        }
         RegCloseKey(hkDrivers);
     }
@@ -117 +117 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API RegisterCustomDriver(PFNDRVOPEN pfnDriverOpen, PFNDRVCLOSE pfnDriverClose, 
+BOOL WIN32API RegisterCustomDriver(PFNDRVOPEN pfnDriverOpen, PFNDRVCLOSE pfnDriverClose,
                                    PFNDRVIOCTL pfnDriverIOCtl, PFNDRVREAD pfnDriverRead,
                                    PFNDRVWRITE pfnDriverWrite, PFNDRVCANCELIO pfnDriverCancelIo,
@@ -141 +141 @@
 //******************************************************************************
 //******************************************************************************
-HMDeviceDriver::HMDeviceDriver(LPCSTR lpDeviceName, LPSTR lpOS2DevName, BOOL fCreate, 
+HMDeviceDriver::HMDeviceDriver(LPCSTR lpDeviceName, LPSTR lpOS2DevName, BOOL fCreate,
                                WINIOCTL pDevIOCtl)
                 : HMDeviceHandler(lpDeviceName)
@@ -215 +215 @@
   dprintf(("DosOpen %s returned %d\n", szOS2Name, rc));
 
-  if(rc == NO_ERROR) 
+  if(rc == NO_ERROR)
   {
     pHMHandleData->hHMHandle = hfFileHandle;
     return (NO_ERROR);
   }
-  else  
+  else
     return(error2WinError(rc));
 }
@@ -259 +259 @@
 //******************************************************************************
 //******************************************************************************
-HMCustomDriver::HMCustomDriver(PFNDRVOPEN pfnDriverOpen, PFNDRVCLOSE pfnDriverClose, 
+HMCustomDriver::HMCustomDriver(PFNDRVOPEN pfnDriverOpen, PFNDRVCLOSE pfnDriverClose,
                                PFNDRVIOCTL pfnDriverIOCtl, PFNDRVREAD pfnDriverRead,
                                PFNDRVWRITE pfnDriverWrite, PFNDRVCANCELIO pfnDriverCancelIo,
@@ -461 +461 @@
         return FALSE;
     }
-    return pfnDriverGetOverlappedResult(lpDriverData, pHMHandleData->hHMHandle, pHMHandleData->dwFlags, 
+    return pfnDriverGetOverlappedResult(lpDriverData, pHMHandleData->hHMHandle, pHMHandleData->dwFlags,
                                         lpOverlapped, lpcbTransfer, fWait, (LPVOID)pHMHandleData->dwUserData);
 }
+
+extern "C" {
+
 //******************************************************************************
 //******************************************************************************
@@ -507 +510 @@
 //******************************************************************************
 //******************************************************************************
+
+} // extern "C"
+

@@ -1 @@
-bin
-Makefile.inc
+env.cmd
+LocalConfig.kmk