Changeset 95844 in vbox

Timestamp:

Jul 26, 2022 9:43:10 PM (2 years ago)

Author:

vboxsync

Message:

IPRT/nocrt-streams-win.cpp: Fake a little so VBoxService might be happy with us. bugref:10261

File:

• trunk/src/VBox/Runtime/r3/win/nocrt-streams-win.cpp (modified) (9 diffs)

trunk/src/VBox/Runtime/r3/win/nocrt-streams-win.cpp

@@ -35 +35 @@
 
 #include <iprt/ctype.h>
+#include <iprt/file.h>
 #include <iprt/string.h>
 
@@ -44 +45 @@
 typedef struct PRINTFBUF
 {
-    HANDLE  hHandle;
+    HANDLE  hNative;
     size_t  offBuf;
     char    szBuf[128];
@@ -52 +53 @@
 {
     int     iStream;
-    HANDLE  hHandle;
+    HANDLE  hNative;
+    RTFILE  hFile;
 };
 
@@ -59 +61 @@
 *   Defined Constants And Macros                                                                                                 *
 *********************************************************************************************************************************/
+#define MAKE_SURE_WE_HAVE_HFILE_RETURN(a_pStream) do { \
+        if ((a_pStream)->hFile != NIL_RTFILE) \
+            break; \
+        int rc = RTFileFromNative(&(a_pStream)->hFile, (uintptr_t)(a_pStream)->hNative); \
+        AssertRCReturn(rc, rc); \
+    } while (0)
+
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
 RTSTREAM g_aStdStreams[3] =
 {
-    { 0, NULL },
-    { 1, NULL },
-    { 2, NULL },
+    { 0, NULL, NIL_RTFILE },
+    { 1, NULL, NIL_RTFILE },
+    { 2, NULL, NIL_RTFILE },
 };
 
@@ -76 +89 @@
     if (pParams)
     {
-        g_pStdIn->hHandle  = pParams->StandardInput;
-        g_pStdOut->hHandle = pParams->StandardOutput;
-        g_pStdErr->hHandle = pParams->StandardError;
+        g_pStdIn->hNative  = pParams->StandardInput;
+        g_pStdOut->hNative = pParams->StandardOutput;
+        g_pStdErr->hNative = pParams->StandardError;
     }
 }
@@ -88 +101 @@
     {
         DWORD cbWritten = 0;
-        WriteFile(pBuf->hHandle, pBuf->szBuf, (DWORD)pBuf->offBuf, &cbWritten, NULL);
+        WriteFile(pBuf->hNative, pBuf->szBuf, (DWORD)pBuf->offBuf, &cbWritten, NULL);
         pBuf->offBuf   = 0;
         pBuf->szBuf[0] = '\0';
@@ -127 +140 @@
 {
     PRINTFBUF Buf;
-    Buf.hHandle  = pStream->hHandle;
+    Buf.hNative  = pStream->hNative;
     Buf.offBuf   = 0;
     Buf.szBuf[0] = '\0';
@@ -148 +161 @@
 {
     PRINTFBUF Buf;
-    Buf.hHandle  = g_pStdOut->hHandle;
+    Buf.hNative  = g_pStdOut->hNative;
     Buf.offBuf   = 0;
     Buf.szBuf[0] = '\0';
@@ -165 +178 @@
 }
 
+
+#if 0
+RTR3DECL(int) RTStrmReadEx(PRTSTREAM pStream, void *pvBuf, size_t cbToRead, size_t *pcbRead)
+{
+    MAKE_SURE_WE_HAVE_HFILE_RETURN(pStream);
+    return RTFileRead(pStream->hFile, pvBuf, cbToRead, pcbRead);
+}
+#endif
+
+
+RTR3DECL(int) RTStrmWriteEx(PRTSTREAM pStream, const void *pvBuf, size_t cbToWrite, size_t *pcbWritten)
+{
+    MAKE_SURE_WE_HAVE_HFILE_RETURN(pStream);
+    return RTFileWrite(pStream->hFile, pvBuf, cbToWrite, pcbWritten);
+}
+
+
+RTR3DECL(int) RTStrmFlush(PRTSTREAM pStream)
+{
+    MAKE_SURE_WE_HAVE_HFILE_RETURN(pStream);
+    return RTFileFlush(pStream->hFile);
+}
+
+
+RTR3DECL(int) RTStrmSetMode(PRTSTREAM pStream, int fBinary, int fCurrentCodeSet)
+{
+    AssertReturn(fBinary != (int)false, VERR_NOT_IMPLEMENTED);
+    AssertReturn(fCurrentCodeSet <= (int)false, VERR_NOT_IMPLEMENTED);
+    RT_NOREF(pStream);
+    return VINF_SUCCESS;
+}
+