Changeset 2984 for trunk/src/kernel32/conin.cpp

Timestamp:

Mar 3, 2000, 12:16:00 PM (25 years ago)

Author:

sandervl

Message:

moved registry apis into kernel32 + cleanup

File:

• trunk/src/kernel32/conin.cpp (modified) (5 diffs)

trunk/src/kernel32/conin.cpp

@@ -1 @@
-/* $Id: conin.cpp,v 1.8 2000-02-16 14:25:31 sandervl Exp $ */
+/* $Id: conin.cpp,v 1.9 2000-03-03 11:15:57 sandervl Exp $ */
 
 /*
@@ -34 +34 @@
 #include <os2wrap.h>    //Odin32 OS/2 api wrappers
 
+#include <win32api.h>
 #include <misc.h>
 #include <string.h>
@@ -46 +47 @@
 #define DBG_LOCALLOG    DBG_conin
 #include "dbglocal.h"
-
-/***********************************
- * Open32 support for SetLastError *
- ***********************************/
-#include <os2sel.h>
-
-extern "C"
-{
-  void   _System _O32_SetLastError(DWORD  dwError);
-}
-
-inline void SetLastError(DWORD a)
-{
- USHORT sel = GetFS();
-
-    _O32_SetLastError(a);
-    SetFS(sel);
-}
 
 
@@ -284 +267 @@
 #endif
 
-  SetLastError(ERROR_ACCESS_DENIED);
+  SetLastError(ERROR_ACCESS_DENIED_W);
   return FALSE;
 }
@@ -401 +384 @@
 #endif
 
-  SetLastError(ERROR_INVALID_FUNCTION);           /* request not implemented */
+  SetLastError(ERROR_INVALID_FUNCTION_W);           /* request not implemented */
   return(FALSE);                 /* we assume this indicates API call failed */
 }