Changeset 7549 for trunk/src/kernel32/conout.cpp

Timestamp:

Dec 5, 2001, 3:16:38 PM (24 years ago)

Author:

sandervl

Message:

preliminary changes for new overlapped io framework

File:

• trunk/src/kernel32/conout.cpp (modified) (11 diffs)

trunk/src/kernel32/conout.cpp

@@ -1 @@
-/* $Id: conout.cpp,v 1.12 2001-11-29 00:20:46 phaller Exp $ */
+/* $Id: conout.cpp,v 1.13 2001-12-05 14:15:58 sandervl Exp $ */
 
 /*
@@ -94 +94 @@
  *****************************************************************************/
 
-DWORD HMDeviceConsoleOutClass::CreateFile (HANDLE        hHandle,
-                                           LPCSTR        lpFileName,
+DWORD HMDeviceConsoleOutClass::CreateFile (LPCSTR        lpFileName,
                                            PHMHANDLEDATA pHMHandleData,
                                            PVOID         lpSecurityAttributes,
@@ -103 +102 @@
   HANDLE hConsole;
 
-#ifdef DEBUG_LOCAL2
-  WriteLog("KERNEL32/CONSOLE:HMDeviceConsoleOutClass %s(%s,%08x,%08x,%08x)\n",
+  dprintf(("KERNEL32/CONSOLE:HMDeviceConsoleOutClass %s(%s,%08x,%08x,%08x)\n",
            lpHMDeviceName,
            lpFileName,
            pHMHandleData->hHMHandle,
            lpSecurityAttributes,
-           pHMHandleDataTemplate);
-#endif
-
-  pHMHandleData->dwType = FILE_TYPE_CHAR;        /* we're a character device */
-
-
-                 /* if no default buffer is available, then do default setup */
+           pHMHandleDataTemplate));
+
+
+  /* if no default buffer is available, then do default setup */
   if (pConsoleGlobals->hConsoleBuffer == INVALID_HANDLE_VALUE)
   {
@@ -126 +121 @@
     if (hConsole == INVALID_HANDLE_VALUE)
     {
-#ifdef DEBUG_LOCAL
-      WriteLog("KERNEL32/CONSOLE:OS2CreateConsoleScreenBuffer = %u.\n",
-               GetLastError());
-#endif
+      dprintf(("KERNEL32/CONSOLE:OS2CreateConsoleScreenBuffer = %u.\n",
+               GetLastError()));
       return INVALID_HANDLE_VALUE;   /* abort further processing immediately */
     }
@@ -145 +138 @@
     if (fResult == FALSE)
     {
-#ifdef DEBUG_LOCAL
-      WriteLog("KERNEL32/CONSOLE:OS2SetConsoleScreenBufferSize=%u.\n",
-               GetLastError());
-#endif
+      dprintf(("KERNEL32/CONSOLE:OS2SetConsoleScreenBufferSize=%u.\n",
+               GetLastError()));
       HMCloseHandle(hConsole);                          /* free handle again */
       return (INVALID_HANDLE_VALUE);            /* abort further processing */
@@ -156 +147 @@
     if (fResult == FALSE)
     {
-#ifdef DEBUG_LOCAL
-      WriteLog("KERNEL32/CONSOLE:OS2SetConsoleActiveScreenBuffer=%u.\n",
-               GetLastError());
-#endif
+      dprintf(("KERNEL32/CONSOLE:OS2SetConsoleActiveScreenBuffer=%u.\n",
+               GetLastError()));
       HMCloseHandle(hConsole);                          /* free handle again */
       return (INVALID_HANDLE_VALUE);            /* abort further processing */
@@ -173 +162 @@
 }
 
+/*****************************************************************************
+ * Name      : DWORD HMDeviceConsoleOutClass::GetFileType
+ * Purpose   : determine the handle type
+ * Parameters: PHMHANDLEDATA pHMHandleData
+ * Variables :
+ * Result    : API returncode
+ * Remark    :
+ * Status    :
+ *
+ * Author    : Patrick Haller [Wed, 1998/02/11 20:44]
+ *****************************************************************************/
+
+DWORD HMDeviceConsoleOutClass::GetFileType(PHMHANDLEDATA pHMHandleData)
+{
+  dprintf(("KERNEL32: HMDeviceConsoleOutClass::GetFileType %s(%08x)\n",
+           lpHMDeviceName,
+           pHMHandleData));
+
+  return FILE_TYPE_CHAR;
+}
 
 /*****************************************************************************
@@ -190 +199 @@
                                        DWORD         nNumberOfBytesToRead,
                                        LPDWORD       lpNumberOfBytesRead,
-                                       LPOVERLAPPED  lpOverlapped)
+                                       LPOVERLAPPED  lpOverlapped,
+                                       LPOVERLAPPED_COMPLETION_ROUTINE  lpCompletionRoutine)
 {
 
@@ -224 +234 @@
                                          DWORD         nNumberOfBytesToWrite,
                                          LPDWORD       lpNumberOfBytesWritten,
-                                         LPOVERLAPPED  lpOverlapped)
+                                         LPOVERLAPPED  lpOverlapped,
+                                         LPOVERLAPPED_COMPLETION_ROUTINE  lpCompletionRoutine)
 {
   BOOL dwResult;                        /* result from subsequent WriteFile */
@@ -246 +257 @@
                            nNumberOfBytesToWrite,
                            lpNumberOfBytesWritten,
-                           lpOverlapped);
+                           lpOverlapped, lpCompletionRoutine);
 
     return (dwResult);                                 /* return result code */
@@ -300 +311 @@
 
 
-DWORD HMDeviceConsoleOutClass::GetFileType (PHMHANDLEDATA pHMHandleData)
-{
-   return FILE_TYPE_CHAR;
-}