Changeset 95887 in vbox for trunk/src/VBox

Timestamp:

Jul 28, 2022 1:40:23 AM (3 years ago)

Author:

vboxsync

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

152618

Message:

IPRT/nocrt: Use r3/stream.cpp instead of the minimalistic one (nocrt-streams-win.cpp). Cred provider needs it. bugref:10261

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (2 diffs)
• r3/win/nocrt-startup-dll-win.cpp (modified) (2 diffs)
• r3/win/nocrt-startup-exe-win.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/Makefile.kmk ¶

@@ -2257 +2257 @@
         r3/alloc.cpp \
         r3/alloc-ef.cpp \
-        r3/stream.cpp \
         common/misc/json.cpp \
         generic/RTLogWriteStdErr-generic.cpp \
@@ -2314 +2313 @@
         r3/win/nocrt-startup-common-win.cpp \
         r3/win/nocrt-alloc-win.cpp \
-        r3/win/nocrt-streams-win.cpp \
        generic/new-delete-generic.cpp
 endif

trunk/src/VBox/Runtime/r3/win/nocrt-startup-dll-win.cpp ¶

@@ -58 +58 @@
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
-extern DECLHIDDEN(void) InitStdHandles(PRTL_USER_PROCESS_PARAMETERS pParams); /* nocrt-streams-win.cpp */ /** @todo put in header */
-
 extern "C" BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID pvReserved);
 
@@ -77 +75 @@
     if (g_cAttached == 0)
     {
-        PPEB pPeb = RTNtCurrentPeb();
-        InitStdHandles(pPeb->ProcessParameters);
         rtVccWinInitProcExecPath();
 

trunk/src/VBox/Runtime/r3/win/nocrt-startup-exe-win.cpp ¶

@@ -47 +47 @@
 *   External Symbols                                                                                                             *
 *********************************************************************************************************************************/
+extern int main(int argc, char **argv, char **envp);    /* in program */
+#ifdef IPRT_NO_CRT
 extern DECLHIDDEN(void) InitStdHandles(PRTL_USER_PROCESS_PARAMETERS pParams); /* nocrt-streams-win.cpp */ /** @todo put in header */
-
-extern int main(int argc, char **argv, char **envp);    /* in program */
+#endif
 
 
@@ -82 +83 @@
 #ifdef IPRT_NO_CRT
     rtVccInitSecurityCookie();
+#else
+    InitStdHandles(pPeb->ProcessParameters);
 #endif
-    InitStdHandles(pPeb->ProcessParameters);
     rtVccWinInitProcExecPath();