Changeset 117 for trunk/kLdr/kLdrModNative.c

Timestamp:

Mar 15, 2020, 4:23:36 PM (5 years ago)

Author:

bird

Message:

kLdrModNative: Added KLDRMOD_OPEN_FLAGS_NATIVE_ALLOW_INIT_TERM to allow kWorker to re-init mspdb100.dll when _MSPDBSRV_ENDPOINT_ changes.

File:

• trunk/kLdr/kLdrModNative.c (modified) (10 diffs)

trunk/kLdr/kLdrModNative.c

@@ -165 +165 @@
                                KLDRFOFF offNewHdr, PPKLDRMOD ppMod)
 {
-    int rc = kLdrModOpenNative(kRdrName(pRdr), ppMod);
+    int rc = kLdrModOpenNative(kRdrName(pRdr), fFlags, ppMod);
     if (rc)
         return rc;
@@ -180 +180 @@
  * @returns non-zero native or kLdr status code on failure.
  * @param   pszFilename         The filename or module name to be loaded.
+ * @param   fFlags              Module open flags, KLDRMOD_OPEN_FLAGS_XXX.
  * @param   ppMod               Where to store the module interpreter instance pointer.
  */
-int kLdrModOpenNative(const char *pszFilename, PPKLDRMOD ppMod)
+int kLdrModOpenNative(const char *pszFilename, KU32 fFlags, PPKLDRMOD ppMod)
 {
     int rc;
@@ -191 +192 @@
 #if K_OS == K_OS_OS2
     HMODULE hmod;
+    kHlpAssertReturn(!(fFlags & ~KLDRMOD_OPEN_FLAGS_VALID_MASK), KERR_INVALID_PARAMETER);
 
     rc = DosLoadModule(NULL, 0, (PCSZ)pszFilename, &hmod);
     if (rc)
         return rc;
-    rc = kLdrModOpenNativeByHandle((KUPTR)hmod, ppMod);
+    rc = kLdrModOpenNativeByHandle((KUPTR)hmod, fFlags, ppMod);
     if (rc)
         DosFreeModule(hmod);
@@ -201 +203 @@
 #elif K_OS == K_OS_WINDOWS
     HMODULE hmod;
+    kHlpAssertReturn(!(fFlags & ~KLDRMOD_OPEN_FLAGS_VALID_MASK), KERR_INVALID_PARAMETER);
 
     hmod = LoadLibrary(pszFilename);
     if (!hmod)
         return GetLastError();
-    rc = kLdrModOpenNativeByHandle((KUPTR)hmod, ppMod);
+    rc = kLdrModOpenNativeByHandle((KUPTR)hmod, fFlags, ppMod);
     if (rc)
         FreeLibrary(hmod);
@@ -211 +214 @@
 #elif K_OS == K_OS_DARWIN
     void *pvMod;
+    kHlpAssertReturn(!(fFlags & ~KLDRMOD_OPEN_FLAGS_VALID_MASK), KERR_INVALID_PARAMETER);
 
     pvMod = dlopen(pszFilename, 0);
     if (!pvMod)
         return ENOENT;
-    rc = kLdrModOpenNativeByHandle((KUPTR)pvMod, ppMod);
+    rc = kLdrModOpenNativeByHandle((KUPTR)pvMod, fFlags, ppMod);
     if (rc)
         dlclose(pvMod);
@@ -233 +237 @@
  * @returns non-zero native or kLdr status code on failure.
  * @param   pszFilename         The filename or module name to be loaded.
+ * @param   fFlags              Module open flags, KLDRMOD_OPEN_FLAGS_XXX.
  * @param   ppMod               Where to store the module interpreter instance pointer.
  * @remark  This will not make the native loader increment the load count.
  */
-int kLdrModOpenNativeByHandle(KUPTR uHandle, PPKLDRMOD ppMod)
+int kLdrModOpenNativeByHandle(KUPTR uHandle, KU32 fFlags, PPKLDRMOD ppMod)
 {
     KSIZE cb;
@@ -305 +310 @@
 # error "Port me"
 #endif
+
+    kHlpAssertReturn(!(fFlags & ~KLDRMOD_OPEN_FLAGS_VALID_MASK), KERR_INVALID_PARAMETER);
 
     /*
@@ -328 +335 @@
     pMod->pszName = kHlpGetFilename(pMod->pszFilename); /** @todo get soname */
     pMod->cchName = cchFilename - (KU32)(pMod->pszName - pMod->pszFilename);
-    pMod->fFlags = 0;
+    pMod->fFlags = fFlags;
 #if defined(__i386__) || defined(__X86__) || defined(_M_IX86)
     pMod->enmCpu = KCPU_I386;
@@ -1050 +1057 @@
 
 
+#if K_OS == K_OS_OS2 || K_OS == K_OS_WINDOWS || defined(__NT__)
+/** Common worker on platforms where there is one entrypoint which does both. */
+static int kLdrModNativeCallInitTerm(PKLDRMODNATIVE pModNative, KUPTR uHandle, KBOOL fInit)
+{
+# if K_OS == K_OS_WINDOWS || defined(__NT__)
+    /* No TLS init/term for now. */
+    KU32 const uRvaEntrypoint = pModNative->pNtHdrs->OptionalHeader.AddressOfEntryPoint;
+    if (   uRvaEntrypoint != 0
+        && uRvaEntrypoint < pModNative->pNtHdrs->OptionalHeader.SizeOfCode
+        && (pModNative->pNtHdrs->FileHeader.Characteristics & IMAGE_FILE_DLL))
+    {
+        KI32 rc = kldrModPEDoCall(uRvaEntrypoint + (KUPTR)pModNative->hmod, uHandle,
+                                  fInit ? DLL_PROCESS_ATTACH : DLL_PROCESS_DETACH, NULL /*pvReserved*/);
+        if (rc)
+            return 0;
+        return fInit ? KLDR_ERR_MODULE_INIT_FAILED : KLDR_ERR_THREAD_ATTACH_FAILED;
+    }
+# elif K_OS == K_OS_OS2
+    //KI32 kldrModLXDoCall(KUPTR uEntrypoint, KUPTR uHandle, KU32 uOp, void *pvReserved)
+# endif
+    return 0;
+}
+#endif
+
 /** @copydoc kLdrModCallInit */
 static int kldrModNativeCallInit(PKLDRMOD pMod, void *pvMapping, KUPTR uHandle)
 {
+#if K_OS == K_OS_OS2 || K_OS == K_OS_WINDOWS || defined(__NT__)
+    if (pMod->fFlags & KLDRMOD_OPEN_FLAGS_NATIVE_ALLOW_INIT_TERM)
+        return kLdrModNativeCallInitTerm((PKLDRMODNATIVE)pMod->pvData, uHandle, K_TRUE /*fInit*/);
+#endif
     return 0;
 }
@@ -1060 +1095 @@
 static int kldrModNativeCallTerm(PKLDRMOD pMod, void *pvMapping, KUPTR uHandle)
 {
+#if K_OS == K_OS_OS2 || K_OS == K_OS_WINDOWS || defined(__NT__)
+    if (pMod->fFlags & KLDRMOD_OPEN_FLAGS_NATIVE_ALLOW_INIT_TERM)
+        return kLdrModNativeCallInitTerm((PKLDRMODNATIVE)pMod->pvData, uHandle, K_FALSE /*fInit*/);
+#endif
     return 0;
 }