Changeset 9828 for trunk/src/kernel32/wprocess.cpp

Timestamp:

Feb 20, 2003, 10:47:01 AM (23 years ago)

Author:

sandervl

Message:

Added custombuild API for registering a callback for LX Dll loading thru LoadLibrary*()

File:

• trunk/src/kernel32/wprocess.cpp (modified) (11 diffs)

trunk/src/kernel32/wprocess.cpp

@@ -1 @@
-/* $Id: wprocess.cpp,v 1.180 2003-02-13 17:16:50 sandervl Exp $ */
+/* $Id: wprocess.cpp,v 1.181 2003-02-20 09:47:01 sandervl Exp $ */
 
 /*
@@ -51 +51 @@
 #include <win\ntddk.h>
 
+#include <custombuild.h>
+
 #define DBG_LOCALLOG    DBG_wprocess
 #include "dbglocal.h"
@@ -88 +90 @@
 static TEB      *threadList = 0;
 static VMutex    threadListMutex;
+
+/**
+ * LoadLibraryExA callback for LX Dlls, it's call only on the initial load.
+ * Maintained by ODIN_SetLxDllLoadCallback().
+ * Note! Because of some hacks it may also be called from Win32LxDll::Release().
+ */
+PFNLXDLLLOAD pfnLxDllLoadCallback = NULL;
 
 
@@ -451 +460 @@
 //******************************************************************************
 // ODIN_SetTIBSwitch: override TIB switching
-// 
+//
 // Parameters:
 //      BOOL fSwitchTIB
@@ -743 +752 @@
     fDisableLXDllLoading = TRUE;
 }
+
+
+/**
+ * Custombuild API for registering a callback for LX Dll loading thru LoadLibrary*().
+ * @returns Success indicator.
+ * @param   pfn     Pointer to callback.
+ *                  NULL if callback is deregistered.
+ */
+BOOL WIN32API ODIN_SetLxDllLoadCallback(PFNLXDLLLOAD pfn)
+{
+    pfnLxDllLoadCallback = pfn;
+    return TRUE;
+}
+
 
 /**
@@ -942 +965 @@
      *      Try load the executable using LoadLibrary
      *      IF successfully loaded THEN
-     *          IF LX dll and is using the PE Loader THEN
-     *              Set Load library.
-     *              Inc reference count.
+     *          Try find registered/pe2lx object.
+     *          IF callback Then
+     *              If callback give green light Then
+     *                  Find registered lx object.
+     *              Else
+     *                  Unload it if loaded.
+     *              Endif
      *          Endif
-     *          Inc dynamic reference count.
-     *          RETURN successfully.
+     *          IF module object found Then
+     *              IF LX dll and is using the PE Loader THEN
+     *                  Set Load library.
+     *                  Inc reference count.
+     *              Endif
+     *              Inc dynamic reference count.
+     *              RETURN successfully.
+     *          Else
+     *              fail.
+     *          Endif
      *      Endif
      *  Endif
@@ -959 +994 @@
             /* OS/2 dll, system dll, converted dll or win32k took care of it. */
             pModule = Win32DllBase::findModuleByOS2Handle(hDll);
+            /* Custombuild customizing may take care of it too. */
+            if (pfnLxDllLoadCallback)
+            {
+                /* If callback says yes, continue load it, else fail. */
+                if (pfnLxDllLoadCallback(hDll, pModule ? pModule->getInstanceHandle() : NULL))
+                    pModule = Win32DllBase::findModuleByOS2Handle(hDll);
+                else if (pModule)
+                {
+                    pModule->Release();
+                    pModule = NULL;
+                }
+            }
             if (pModule)
             {
@@ -1835 +1882 @@
 #endif
 
-    if(bInheritHandles && lpStartupInfo->dwFlags & STARTF_USESTDHANDLES) 
+    if(bInheritHandles && lpStartupInfo->dwFlags & STARTF_USESTDHANDLES)
     {
         //Translate standard handles if the child needs to inherit them
@@ -1845 +1892 @@
         retcode |= HMHandleTranslateToOS2(lpStartupInfo->hStdError, &startinfo.hStdError);
 
-        if(retcode) {  
+        if(retcode) {
             SetLastError(ERROR_INVALID_HANDLE);
             return FALSE;
@@ -2321 +2368 @@
 //******************************************************************************
 // ODIN_SetProcAddress: Override a dll export
-// 
+//
 // Parameters:
 //      HMODULE hModule         Module handle
@@ -2331 +2378 @@
 //
 //******************************************************************************
-FARPROC WIN32API ODIN_SetProcAddress(HMODULE hModule, LPCSTR lpszProc, 
+FARPROC WIN32API ODIN_SetProcAddress(HMODULE hModule, LPCSTR lpszProc,
                                      FARPROC pfnNewProc)
 {