Changeset 2984 for trunk/src/kernel32/conout.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/conout.cpp (modified) (4 diffs)

trunk/src/kernel32/conout.cpp

@@ -1 @@
-/* $Id: conout.cpp,v 1.6 2000-02-16 14:25:32 sandervl Exp $ */
+/* $Id: conout.cpp,v 1.7 2000-03-03 11:15:57 sandervl Exp $ */
 
 /*
@@ -63 +63 @@
 
 #include <win32type.h>
+#include <win32api.h>
 #include <misc.h>
 
@@ -76 +77 @@
 #define DBG_LOCALLOG    DBG_conout
 #include "dbglocal.h"
-
-
-/***********************************
- * Open32 support for SetLastError *
- ***********************************/
-#include <os2sel.h>
-
-extern "C"
-{
-  void   _System _O32_SetLastError(DWORD  dwError);
-  int    _System _O32_GetLastError(void);
-}
-
-inline void SetLastError(DWORD a)
-{
- USHORT sel = GetFS();
-
-    _O32_SetLastError(a);
-    SetFS(sel);
-}
-
-inline int GetLastError(void)
-{
-  USHORT sel = GetFS();
-  int    rc;
-
-  rc = _O32_GetLastError();
-  SetFS(sel);
-  return rc;
-}
-
 
 /*****************************************************************************
@@ -234 +204 @@
 #endif
 
-  SetLastError(ERROR_ACCESS_DENIED);
+  SetLastError(ERROR_ACCESS_DENIED_W);
   return FALSE;
 }