Sync to trunk (r44371)

[reactos.git] / reactos / dll / ntdll / ldr / utils.c

diff --git a/reactos/dll/ntdll/ldr/utils.c b/reactos/dll/ntdll/ldr/utils.c
index 16c7c75..dd92cab 100644 (file)
--- a/reactos/dll/ntdll/ldr/utils.c
+++ b/reactos/dll/ntdll/ldr/utils.c
@@ -61,6 +61,9 @@ static NTSTATUS LdrpLoadModule(IN PWSTR SearchPath OPTIONAL,
 static NTSTATUS LdrpAttachProcess(VOID);
 static VOID LdrpDetachProcess(BOOLEAN UnloadAll);
 
+NTSTATUS find_actctx_dll( LPCWSTR libname, WCHAR *fulldosname );
+NTSTATUS create_module_activation_context( LDR_DATA_TABLE_ENTRY *module );
+
 /* FUNCTIONS *****************************************************************/
 
 BOOLEAN
@@ -699,13 +702,23 @@ LdrpMapDllImageFile(IN PWSTR SearchPath OPTIONAL,
                           MAX_PATH,
                           DosName,
                           NULL) == 0)
+  {
+      /* try to find active context dll */
+    Status = find_actctx_dll(DllName->Buffer, DosName);
+    if(Status == STATUS_SUCCESS)
+        DPRINT("found %S for %S\n", DosName,DllName->Buffer);
+    else
     return STATUS_DLL_NOT_FOUND;
+  }
 
   if (!RtlDosPathNameToNtPathName_U (DosName,
                                      &FullNtFileName,
                                      NULL,
                                      NULL))
+  {
+    DPRINT("Dll %wZ not found!\n", DllName);
     return STATUS_DLL_NOT_FOUND;
+  }
 
   DPRINT("FullNtFileName %wZ\n", &FullNtFileName);
 
@@ -1441,6 +1454,7 @@ LdrpGetOrLoadModule(PWCHAR SearchPath,
            ULONG_PTR ErrorParameter = (ULONG_PTR)&DllName;
 
            DPRINT1("failed to load %wZ\n", &DllName);
+
            NtRaiseHardError(STATUS_DLL_NOT_FOUND,
                             1,
                             1,
@@ -1762,6 +1776,7 @@ LdrFixupImports(IN PWSTR SearchPath OPTIONAL,
    PCHAR ImportedName;
    PWSTR ModulePath;
    ULONG Size;
+   ULONG_PTR cookie;
 
    DPRINT("LdrFixupImports(SearchPath %S, Module %p)\n", SearchPath, Module);
 
@@ -1785,6 +1800,16 @@ LdrFixupImports(IN PWSTR SearchPath OPTIONAL,
          }
      }
 
+       if (!create_module_activation_context( Module ))
+         {
+           if (Module->EntryPointActivationContext == NULL)
+             {
+               DPRINT("EntryPointActivationContext has not be allocated\n");
+               DPRINT("Module->DllBaseName %wZ\n", Module->BaseDllName);
+             }
+           RtlActivateActivationContext( 0, Module->EntryPointActivationContext, &cookie );
+         }
+
    /*
     * Process each import module.
     */
@@ -1978,6 +2003,8 @@ Success:
        LdrpAcquireTlsSlot(Module, TlsSize, FALSE);
      }
 
+    if (Module->EntryPointActivationContext) RtlDeactivateActivationContext( 0, cookie );
+
    return STATUS_SUCCESS;
 }
 
@@ -2020,6 +2047,7 @@ PEPFUNC LdrPEStartup (PVOID  ImageBase,
    PIMAGE_DOS_HEADER    DosHeader;
    PIMAGE_NT_HEADERS    NTHeaders;
    PLDR_DATA_TABLE_ENTRY tmpModule;
+   PVOID ActivationContextStack;
 
    DPRINT("LdrPEStartup(ImageBase %p SectionHandle %p)\n",
            ImageBase, SectionHandle);
@@ -2067,6 +2095,19 @@ PEPFUNC LdrPEStartup (PVOID  ImageBase,
        (*Module)->Flags |= LDRP_IMAGE_NOT_AT_BASE;
      }
 
+   /* Allocate memory for the ActivationContextStack */
+   /* FIXME: Verify RtlAllocateActivationContextStack behavior */
+   Status = RtlAllocateActivationContextStack(&ActivationContextStack);
+   if (NT_SUCCESS(Status))
+   {
+      DPRINT("ActivationContextStack %x\n",ActivationContextStack);
+      DPRINT("ActiveFrame %x\n", ((PACTIVATION_CONTEXT_STACK)ActivationContextStack)->ActiveFrame);
+      NtCurrentTeb()->ActivationContextStackPointer = ActivationContextStack;
+      NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame = NULL;
+   }
+   else
+      DPRINT1("Warning: Unable to allocate ActivationContextStack\n");
+
    /*
     * If the DLL's imports symbols from other
     * modules, fixup the imported calls entry points.
@@ -3389,8 +3430,55 @@ LdrLockLoaderLock(IN ULONG Flags,
                   OUT PULONG Disposition OPTIONAL,
                   OUT PULONG Cookie OPTIONAL)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    NTSTATUS Status;
+    BOOLEAN Ret;
+    BOOLEAN CookieSet = FALSE;
+
+    if ((Flags != 0x01) && (Flags != 0x02))
+        return STATUS_INVALID_PARAMETER_1;
+
+    if (!Cookie) return STATUS_INVALID_PARAMETER_3;
+
+    /* Set some defaults for failure while verifying params */
+    _SEH2_TRY
+    {
+        *Cookie = 0;
+        CookieSet = TRUE;
+        if (Disposition) *Disposition = 0;
+}
+    _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
+    {
+        if (CookieSet)
+            Status = STATUS_INVALID_PARAMETER_3;
+        else
+            Status =  STATUS_INVALID_PARAMETER_2;
+    }
+    _SEH2_END;
+
+    if (Flags == 0x01)
+    {
+        DPRINT1("Warning: Reporting errors with exception not supported yet!\n");
+        RtlEnterCriticalSection(NtCurrentPeb()->LoaderLock);
+        Status = STATUS_SUCCESS;
+
+    }
+    else
+    {
+        if (!Disposition) return STATUS_INVALID_PARAMETER_2;
+
+        Ret = RtlTryEnterCriticalSection(NtCurrentPeb()->LoaderLock);
+
+        if (Ret)
+            *Disposition = 0x01;
+        else
+            *Disposition = 0x02;
+
+        Status = STATUS_SUCCESS;
+    }
+
+    /* FIXME: Cookie is based on part of the thread id */
+    *Cookie = (ULONG)NtCurrentTeb()->RealClientId.UniqueThread;
+    return Status;
 }
 
 NTSTATUS
@@ -3398,8 +3486,15 @@ NTAPI
 LdrUnlockLoaderLock(IN ULONG Flags,
                     IN ULONG Cookie OPTIONAL)
 {
-    UNIMPLEMENTED;
-    return STATUS_NOT_IMPLEMENTED;
+    if (Flags != 0x01)
+        return STATUS_INVALID_PARAMETER_1;
+
+    if (Cookie != (ULONG)NtCurrentTeb()->RealClientId.UniqueThread)
+        return STATUS_INVALID_PARAMETER_2;
+
+    RtlLeaveCriticalSection(NtCurrentPeb()->LoaderLock);
+
+    return STATUS_SUCCESS;
 }
 
 BOOLEAN