Changeset 74654 in vbox for trunk/src

Timestamp:

Oct 7, 2018 1:00:04 PM (6 years ago)

Author:

vboxsync

Message:

IPRT: More kStuff cleanup. bugref:9232

Location:

trunk/src/VBox/Runtime

Files:

• Makefile.kmk (modified) (1 diff)
• VBox/VBoxRTImp.def (modified) (1 diff)
• common/ldr/ldrEx.cpp (modified) (4 diffs)
• common/ldr/ldrFile.cpp (modified) (1 diff)
• common/ldr/ldrVfsFile.cpp (modified) (1 diff)
• common/ldr/ldrkStuff.cpp (deleted)
• testcase/tstLdr-4.cpp (modified) (2 diffs)
• testcase/tstLdr.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/Makefile.kmk

@@ -1967 +1967 @@
 ## @todo change this to EXTEND the RuntimeR3 target.
 RuntimeGuestR3_SDKS.win                 := $(RuntimeR3_SDKS.win)
-RuntimeGuestR3_DEFS                     := $(filter-out RTCRITSECT_STRICT RT_NO_GIP IPRT_WITH_OPENSSL LDR_WITH_KLDR, $(RuntimeR3_DEFS))
-RuntimeGuestR3_DEFS                     := $(filter-out IN_SUP_R3, $(RuntimeGuestR3_DEFS)) ## @todo r=andy Needed to make cross-building with RTLdr API work.
+RuntimeGuestR3_DEFS                     := $(filter-out RTCRITSECT_STRICT RT_NO_GIP IPRT_WITH_OPENSSL, $(RuntimeR3_DEFS))
+RuntimeGuestR3_DEFS                     := $(filter-out IN_SUP_R3, $(RuntimeGuestR3_DEFS))
 RuntimeGuestR3_DEFS.$(KBUILD_TARGET)    := $(RuntimeR3_DEFS.$(KBUILD_TARGET))
 RuntimeGuestR3_DEFS.$(KBUILD_HOST)      := $(RuntimeR3_DEFS.$(KBUILD_HOST))

trunk/src/VBox/Runtime/VBox/VBoxRTImp.def

@@ -1166 +1166 @@
     RTLdrLoadAppPriv
     RTLdrOpen
-    RTLdrOpenkLdr
     RTLdrRelocate
     RTLdrSize

trunk/src/VBox/Runtime/common/ldr/ldrEx.cpp

@@ -47 +47 @@
 #ifdef LDR_ONLY_PE
 # undef LDR_WITH_PE
-# undef LDR_WITH_KLDR
 # undef LDR_WITH_ELF
 # undef LDR_WITH_LX
 # undef LDR_WITH_LE
+# undef LDR_WITH_MACHO
 # undef LDR_WITH_NE
 # undef LDR_WITH_MZ
@@ -78 +78 @@
     if (RT_FAILURE(rc))
         return rc;
-#ifndef LDR_WITH_KLDR
     if (    uSign.au16[0] != IMAGE_DOS_SIGNATURE
         &&  uSign.u32     != IMAGE_NT_SIGNATURE
@@ -93 +92 @@
         return VERR_INVALID_EXE_SIGNATURE;
     }
-#endif
     uint32_t offHdr = 0;
     if (uSign.au16[0] == IMAGE_DOS_SIGNATURE)
@@ -184 +182 @@
     else
     {
-#ifndef LDR_WITH_KLDR
         Log(("rtldrOpenWithReader: %s: the format isn't implemented %#x / '%.4s\n", pReader->pfnLogName(pReader), uSign.u32, &uSign.ach[0]));
-#endif
         rc = VERR_INVALID_EXE_SIGNATURE;
     }
-
-#ifdef LDR_WITH_KLDR
-    /* Try kLdr if it's a format we don't recognize. */
-    if (rc <= VERR_INVALID_EXE_SIGNATURE && rc > VERR_BAD_EXE_FORMAT)
-    {
-        int rc2 = rtldrkLdrOpen(pReader, fFlags, enmArch, phMod, pErrInfo);
-        if (   RT_SUCCESS(rc2)
-            || (rc == VERR_INVALID_EXE_SIGNATURE && rc2 != VERR_MZ_EXE_NOT_SUPPORTED /* Quick fix for bad return code. */)
-            || rc2 >  VERR_INVALID_EXE_SIGNATURE
-            || rc2 <= VERR_BAD_EXE_FORMAT)
-            rc = rc2;
-    }
-#endif
 
     LogFlow(("rtldrOpenWithReader: %s: returns %Rrc *phMod=%p\n", pReader->pfnLogName(pReader), rc, *phMod));

trunk/src/VBox/Runtime/common/ldr/ldrFile.cpp

@@ -296 +296 @@
 RT_EXPORT_SYMBOL(RTLdrOpenEx);
 
-
-/**
- * Opens a binary image file using kLdr.
- *
- * @returns iprt status code.
- * @param   pszFilename Image filename.
- * @param   fFlags      Reserved, MBZ.
- * @param   enmArch     CPU architecture specifier for the image to be loaded.
- * @param   phLdrMod    Where to store the handle to the loaded module.
- * @remark  Primarily for testing the loader.
- */
-RTDECL(int) RTLdrOpenkLdr(const char *pszFilename, uint32_t fFlags, RTLDRARCH enmArch, PRTLDRMOD phLdrMod)
-{
-#ifdef LDR_WITH_KLDR
-    LogFlow(("RTLdrOpenkLdr: pszFilename=%p:{%s} fFlags=%#x enmArch=%d phLdrMod=%p\n",
-             pszFilename, pszFilename, fFlags, enmArch, phLdrMod));
-    AssertMsgReturn(!(fFlags & ~RTLDR_O_VALID_MASK), ("%#x\n", fFlags), VERR_INVALID_PARAMETER);
-
-    /*
-     * Create file reader & invoke worker which identifies and calls the image interpreter.
-     */
-    PRTLDRREADER pReader;
-    int rc = rtldrFileCreate(&pReader, pszFilename);
-    if (RT_SUCCESS(rc))
-    {
-        rc = rtldrkLdrOpen(pReader, fFlags, enmArch, phLdrMod, NULL);
-        if (RT_SUCCESS(rc))
-        {
-            LogFlow(("RTLdrOpenkLdr: return %Rrc *phLdrMod=%p\n", rc, *phLdrMod));
-            return rc;
-        }
-        pReader->pfnDestroy(pReader);
-    }
-    *phLdrMod = NIL_RTLDRMOD;
-    LogFlow(("RTLdrOpenkLdr: return %Rrc\n", rc));
-    return rc;
-
-#else
-    return RTLdrOpen(pszFilename, fFlags, enmArch, phLdrMod);
-#endif
-}
-RT_EXPORT_SYMBOL(RTLdrOpenkLdr);
-

trunk/src/VBox/Runtime/common/ldr/ldrVfsFile.cpp

@@ -278 +278 @@
                                   PRTLDRMOD phLdrMod, uint32_t *poffError, PRTERRINFO pErrInfo)
 {
-#ifdef LDR_WITH_KLDR
-    LogFlow(("RTLdrOpenVfsChainkLdr: pszFilename=%p:{%s} fFlags=%#x enmArch=%d phLdrMod=%p\n",
-             pszFilename, pszFilename, fFlags, enmArch, phLdrMod));
-    AssertMsgReturn(!(fFlags & ~RTLDR_O_VALID_MASK), ("%#x\n", fFlags), VERR_INVALID_PARAMETER);
-
-    /*
-     * Create file reader & invoke worker which identifies and calls the image interpreter.
-     */
-    PRTLDRREADER pReader;
-    int rc = rtldrVfsFileCreate(pszFilename, &pReader, poffError, pErrInfo);
-    if (RT_SUCCESS(rc))
-    {
-        if (poffError)
-            *poffError = 0;
-        rc = rtldrkLdrOpen(pReader, fFlags, enmArch, phLdrMod, pErrInfo);
-        if (RT_SUCCESS(rc))
-        {
-            LogFlow(("RTLdrOpenkLdr: return %Rrc *phLdrMod=%p\n", rc, *phLdrMod));
-            return rc;
-        }
-        pReader->pfnDestroy(pReader);
-    }
-    *phLdrMod = NIL_RTLDRMOD;
-    LogFlow(("RTLdrOpenVfsChainkLdr: return %Rrc\n", rc));
-    return rc;
-
-#else
     return RTLdrOpenVfsChain(pszFilename, fFlags, enmArch, phLdrMod, poffError, pErrInfo);
-#endif
 }
 RT_EXPORT_SYMBOL(RTLdrOpenVfsChainkLdr);

trunk/src/VBox/Runtime/testcase/tstLdr-4.cpp

@@ -117 +117 @@
         { NULL, NULL, 0, "bar" },
         { NULL, NULL, 0, "foobar" },
-        { NULL, NULL, 0, "kLdr-foo" },
-        { NULL, NULL, 0, "kLdr-bar" },
-        { NULL, NULL, 0, "kLdr-foobar" }
     };
     unsigned i;
@@ -129 +126 @@
     for (i = 0; i < RT_ELEMENTS(aLoads); i++)
     {
-        if (!strncmp(aLoads[i].pszName, RT_STR_TUPLE("kLdr-")))
-        {
-            rc = RTLdrOpenkLdr(pszFilename, 0, RTLDRARCH_WHATEVER, &aLoads[i].hLdrMod);
-            if (rc == VERR_ELF_EXE_NOT_SUPPORTED)
-                continue;
-        }
-        else
-            rc = RTLdrOpen(pszFilename, 0, RTLDRARCH_WHATEVER, &aLoads[i].hLdrMod);
+        rc = RTLdrOpen(pszFilename, 0, RTLDRARCH_WHATEVER, &aLoads[i].hLdrMod);
         if (RT_FAILURE(rc))
         {

trunk/src/VBox/Runtime/testcase/tstLdr.cpp

@@ -106 +106 @@
         { NULL, NULL, (RTUINTPTR)0x40404040, "bar" },
         { NULL, NULL, (RTUINTPTR)0xefefef00, "foobar" },
-        { NULL, NULL, (RTUINTPTR)0xefefef00, "kLdr-foo" },
-        { NULL, NULL, (RTUINTPTR)0x40404040, "kLdr-bar" },
-        { NULL, NULL, (RTUINTPTR)0xefefef00, "kLdr-foobar" }
     };
     unsigned i;
@@ -123 +120 @@
 
         /* open it */
-        int rc;
-        if (!strncmp(aLoads[i].pszName, RT_STR_TUPLE("kLdr-")))
-            rc = RTLdrOpenkLdr(pszFilename, 0, RTLDRARCH_WHATEVER, &aLoads[i].hLdrMod);
-        else
-            rc = RTLdrOpen(pszFilename, 0, RTLDRARCH_WHATEVER, &aLoads[i].hLdrMod);
+        int rc = RTLdrOpen(pszFilename, 0, RTLDRARCH_WHATEVER, &aLoads[i].hLdrMod);
         if (RT_FAILURE(rc))
         {