Changeset 40304 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Feb 29, 2012 8:02:14 PM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

76552

Message:

IPRT: fixed OS/2 'bitrot'.

Location:

trunk/src/VBox/Runtime/r3

Files:

• init.cpp (modified) (2 diffs)
• os2/filelock-os2.cpp (modified) (2 diffs)
• os2/sems-os2.cpp (modified) (1 diff)
• os2/thread-os2.cpp (modified) (2 diffs)
• stream.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r3/init.cpp

@@ -46 +46 @@
 #ifdef RT_OS_OS2
 # include <InnoTekLIBC/fork.h>
+# define INCL_DOSMISC
+# include <os2.h>
 #endif
 #include <locale.h>
@@ -334 +336 @@
     SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX | fOldErrMode);
 #elif defined(RT_OS_OS2)
-# error "FIXME"
+    DosError(FERR_DISABLEHARDERR);
 #endif
 

trunk/src/VBox/Runtime/r3/os2/filelock-os2.cpp

@@ -83 +83 @@
 
     Assert(RTFILE_LOCK_WAIT);
-    if (fcntl(File, (fLock & RTFILE_LOCK_WAIT) ? F_SETLKW : F_SETLK, &fl) >= 0)
+    if (fcntl(RTFileToNative(File), (fLock & RTFILE_LOCK_WAIT) ? F_SETLKW : F_SETLK, &fl) >= 0)
         return VINF_SUCCESS;
 
@@ -163 +163 @@
     fl.l_pid    = 0;
 
-    if (fcntl(File, F_SETLK, &fl) >= 0)
+    if (fcntl(RTFileToNative(File), F_SETLK, &fl) >= 0)
         return VINF_SUCCESS;
 

trunk/src/VBox/Runtime/r3/os2/sems-os2.cpp

@@ -52 +52 @@
 RTDECL(int)  RTSemEventCreateEx(PRTSEMEVENT phEventSem, uint32_t fFlags, RTLOCKVALCLASS hClass, const char *pszNameFmt, ...)
 {
-    AssertReturn(!(fFlags & ~(RTSEMEVENT_FLAGS_NO_LOCK_VAL | RTSEMEVENT_FLAGS_BOOTSTRAP_HACK), VERR_INVALID_PARAMETER);
+    AssertReturn(!(fFlags & ~(RTSEMEVENT_FLAGS_NO_LOCK_VAL | RTSEMEVENT_FLAGS_BOOTSTRAP_HACK)), VERR_INVALID_PARAMETER);
     Assert(!(fFlags & RTSEMEVENT_FLAGS_BOOTSTRAP_HACK) || (fFlags & RTSEMEVENT_FLAGS_NO_LOCK_VAL));
 

trunk/src/VBox/Runtime/r3/os2/thread-os2.cpp

@@ -46 +46 @@
 #include <iprt/alloc.h>
 #include <iprt/asm-amd64-x86.h>
+#include <iprt/cpuset.h>
 #include <iprt/string.h>
 #include <iprt/err.h>
@@ -208 +209 @@
 RTR3DECL(int) RTThreadGetAffinity(PRTCPUSET pCpuSet)
 {
-    return VINF_SUCCESS;
-}
-
-RTR3DECL(int) RTThreadGetAffinity(PRTCPUSET pCpuSet)
-{
     union
     {

trunk/src/VBox/Runtime/r3/stream.cpp

@@ -53 +53 @@
 #include <stdio.h>
 #include <errno.h>
-#ifdef RT_OS_WINDOWS
+#if defined(RT_OS_WINDOWS) || defined(RT_OS_OS2)
 # include <io.h>
 # include <fcntl.h>
+#endif
+#ifdef RT_OS_WINDOWS
 # include <Windows.h>
+#endif
+
+#ifdef RT_OS_OS2
+# define _O_TEXT   O_TEXT
+# define _O_BINARY O_BINARY
 #endif