[ros-diffs] [ion] 52595: [NTDLL]: Multiple fixes and cleanups to several loader functions in ldrutils. [NTDLL]: Use original symbolic function names instead of modified ones. [NTDLL]: Fixup some incorrect flag...

Author: ion
Date: Sun Jul 10 01:34:19 2011
New Revision: 52595

URL: http://svn.reactos.org/svn/reactos?rev=52595&view=rev
Log:
[NTDLL]: Multiple fixes and cleanups to several loader functions in ldrutils.
[NTDLL]: Use original symbolic function names instead of modified ones.
[NTDLL]: Fixup some incorrect flag and typedef definitions with correct ones.
[NTDLL]: Tag functions which seem broken/lacking in functionality/very different from the
rest of the code the LDR rewrite was based on.

Modified:
    trunk/reactos/dll/ntdll/include/ntdllp.h
    trunk/reactos/dll/ntdll/ldr/ldrapi.c
    trunk/reactos/dll/ntdll/ldr/ldrinit.c
    trunk/reactos/dll/ntdll/ldr/ldrutils.c
    trunk/reactos/include/ndk/ldrtypes.h

Modified: trunk/reactos/dll/ntdll/include/ntdllp.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/include/ntdllp.h…
==============================================================================
--- trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/include/ntdllp.h [iso-8859-1] Sun Jul 10 01:34:19 2011
@@ -25,11 +25,6 @@
     IMAGE_TLS_DIRECTORY TlsDirectory;
 } LDRP_TLS_DATA, *PLDRP_TLS_DATA;
 
-typedef BOOL
-(NTAPI *PDLLMAIN_FUNC)(HANDLE hInst,
-                       ULONG ul_reason_for_call,
-                       LPVOID lpReserved);
-
 /* Global data */
 extern RTL_CRITICAL_SECTION LdrpLoaderLock;
 extern BOOLEAN LdrpInLdrInit;
@@ -54,8 +49,8 @@
 NTSTATUS NTAPI LdrpInitializeTls(VOID);
 NTSTATUS NTAPI LdrpAllocateTls(VOID);
 VOID NTAPI LdrpFreeTls(VOID);
-VOID NTAPI LdrpTlsCallback(PVOID BaseAddress, ULONG Reason);
-BOOLEAN NTAPI LdrpCallDllEntry(PDLLMAIN_FUNC EntryPoint, PVOID BaseAddress, ULONG Reason,
PVOID Context);
+VOID NTAPI LdrpCallTlsInitializers(PVOID BaseAddress, ULONG Reason);
+BOOLEAN NTAPI LdrpCallInitRoutine(PDLL_INIT_ROUTINE EntryPoint, PVOID BaseAddress, ULONG
Reason, PVOID Context);
 NTSTATUS NTAPI LdrpInitializeProcess(PCONTEXT Context, PVOID SystemArgument1);
 VOID NTAPI LdrpInitFailure(NTSTATUS Status);
 VOID NTAPI LdrpValidateImageForMp(IN PLDR_DATA_TABLE_ENTRY LdrDataTableEntry);
@@ -135,7 +130,7 @@
 PVOID NTAPI
 LdrpFetchAddressOfEntryPoint(PVOID ImageBase);
 
-BOOLEAN NTAPI
+VOID NTAPI
 LdrpFreeUnicodeString(PUNICODE_STRING String);
 
 

Modified: trunk/reactos/dll/ntdll/ldr/ldrapi.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrapi.c?rev…
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/ldr/ldrapi.c [iso-8859-1] Sun Jul 10 01:34:19 2011
@@ -1159,6 +1159,91 @@
 /*
  * @implemented
  */
+NTSTATUS
+NTAPI
+LdrAddRefDll(IN ULONG Flags,
+             IN PVOID BaseAddress)
+{
+    PLDR_DATA_TABLE_ENTRY LdrEntry;
+    NTSTATUS Status = STATUS_SUCCESS;
+    ULONG Cookie;
+    BOOLEAN Locked = FALSE;
+
+    /* Check for invalid flags */
+    if (Flags & ~(LDR_ADDREF_DLL_PIN))
+    {
+        /* Fail with invalid parameter status if so */
+        Status = STATUS_INVALID_PARAMETER;
+        goto quickie;
+    }
+
+    /* Acquire the loader lock if not in init phase */
+    if (!LdrpInLdrInit)
+    {
+        /* Acquire the lock */
+        Status = LdrLockLoaderLock(0, NULL, &Cookie);
+        if (!NT_SUCCESS(Status)) goto quickie;
+        Locked = TRUE;
+    }
+
+    /* Get this module's data table entry */
+    if (LdrpCheckForLoadedDllHandle(BaseAddress, &LdrEntry))
+    {
+        if (!LdrEntry)
+        {
+            /* Shouldn't happen */
+            Status = STATUS_INTERNAL_ERROR;
+            goto quickie;
+        }
+
+        /* If this is not a pinned module */
+        if (LdrEntry->LoadCount != 0xFFFF)
+        {
+            /* Update its load count */
+            if (Flags & LDR_ADDREF_DLL_PIN)
+            {
+                /* Pin it by setting load count to -1 */
+                LdrEntry->LoadCount = 0xFFFF;
+                LdrpUpdateLoadCount2(LdrEntry, LDRP_UPDATE_PIN);
+            }
+            else
+            {
+                /* Increase its load count by one */
+                LdrEntry->LoadCount++;
+                LdrpUpdateLoadCount2(LdrEntry, LDRP_UPDATE_REFCOUNT);
+            }
+
+            /* Clear load in progress */
+            LdrpClearLoadInProgress();
+        }
+    }
+    else
+    {
+        /* There was an error getting this module's handle, return invalid param
status */
+        Status = STATUS_INVALID_PARAMETER;
+    }
+
+quickie:
+    /* Check for error case */
+    if (!NT_SUCCESS(Status))
+    {
+        /* Print debug information */
+        if ((ShowSnaps) || ((Status != STATUS_NO_SUCH_FILE) &&
+                            (Status != STATUS_DLL_NOT_FOUND) &&
+                            (Status != STATUS_OBJECT_NAME_NOT_FOUND)))
+        {
+            DPRINT1("LDR: LdrAddRefDll(%p) 0x%08lx\n", BaseAddress);
+        }
+    }
+
+    /* Release the lock if needed */
+    if (Locked) LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie);
+    return Status;
+}
+
+/*
+ * @implemented
+ */
 BOOLEAN
 NTAPI
 RtlDllShutdownInProgress(VOID)

Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?re…
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Sun Jul 10 01:34:19 2011
@@ -561,7 +561,7 @@
                         if (!LdrpShutdownInProgress)
                         {
                             /* Call TLS */
-                            LdrpTlsCallback(LdrEntry->DllBase, DLL_THREAD_ATTACH);
+                            LdrpCallTlsInitializers(LdrEntry->DllBase,
DLL_THREAD_ATTACH);
                         }
                     }
 
@@ -571,7 +571,7 @@
                         /* Call the Entrypoint */
                         DPRINT("%wZ - Calling entry point at %x for thread
attaching\n",
                                 &LdrEntry->BaseDllName, LdrEntry->EntryPoint);
-                        LdrpCallDllEntry(LdrEntry->EntryPoint,
+                        LdrpCallInitRoutine(LdrEntry->EntryPoint,
                                          LdrEntry->DllBase,
                                          DLL_THREAD_ATTACH,
                                          NULL);
@@ -600,7 +600,7 @@
                                               
LdrpImageEntry->EntryPointActivationContext);
 
         /* Do TLS callbacks */
-        LdrpTlsCallback(Peb->ImageBaseAddress, DLL_THREAD_ATTACH);
+        LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_THREAD_ATTACH);
 
         /* Deactivate the ActCtx */
         RtlDeactivateActivationContextUnsafeFast(&ActCtx);
@@ -796,7 +796,7 @@
             if (LdrEntry->TlsIndex && Context)
             {
                 /* Call TLS */
-                LdrpTlsCallback(LdrEntry->DllBase, DLL_PROCESS_ATTACH);
+                LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_PROCESS_ATTACH);
             }
 
             /* Call the Entrypoint */
@@ -805,7 +805,7 @@
                 DPRINT1("%wZ - Calling entry point at %p for
DLL_PROCESS_ATTACH\n",
                         &LdrEntry->BaseDllName, EntryPoint);
             }
-            DllStatus = LdrpCallDllEntry(EntryPoint,
+            DllStatus = LdrpCallInitRoutine(EntryPoint,
                                          LdrEntry->DllBase,
                                          DLL_PROCESS_ATTACH,
                                          Context);
@@ -859,7 +859,7 @@
                                               
LdrpImageEntry->EntryPointActivationContext);
 
         /* Do TLS callbacks */
-        LdrpTlsCallback(Peb->ImageBaseAddress, DLL_PROCESS_ATTACH);
+        LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_PROCESS_ATTACH);
 
         /* Deactivate the ActCtx */
         RtlDeactivateActivationContextUnsafeFast(&ActCtx);
@@ -956,13 +956,13 @@
                 if (LdrEntry->TlsIndex)
                 {
                     /* Call TLS */
-                    LdrpTlsCallback(LdrEntry->DllBase, DLL_PROCESS_DETACH);
+                    LdrpCallTlsInitializers(LdrEntry->DllBase, DLL_PROCESS_DETACH);
                 }
 
                 /* Call the Entrypoint */
                 DPRINT("%wZ - Calling entry point at %x for thread
detaching\n",
                         &LdrEntry->BaseDllName, LdrEntry->EntryPoint);
-                LdrpCallDllEntry(EntryPoint,
+                LdrpCallInitRoutine(EntryPoint,
                                  LdrEntry->DllBase,
                                  DLL_PROCESS_DETACH,
                                  (PVOID)1);
@@ -986,7 +986,7 @@
                                               
LdrpImageEntry->EntryPointActivationContext);
 
         /* Do TLS callbacks */
-        LdrpTlsCallback(Peb->ImageBaseAddress, DLL_PROCESS_DETACH);
+        LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_PROCESS_DETACH);
 
         /* Deactivate the ActCtx */
         RtlDeactivateActivationContextUnsafeFast(&ActCtx);
@@ -1067,7 +1067,7 @@
                         if (!LdrpShutdownInProgress)
                         {
                             /* Call TLS */
-                            LdrpTlsCallback(LdrEntry->DllBase, DLL_THREAD_DETACH);
+                            LdrpCallTlsInitializers(LdrEntry->DllBase,
DLL_THREAD_DETACH);
                         }
                     }
 
@@ -1077,7 +1077,7 @@
                         /* Call the Entrypoint */
                         DPRINT("%wZ - Calling entry point at %x for thread
detaching\n",
                                 &LdrEntry->BaseDllName, LdrEntry->EntryPoint);
-                        LdrpCallDllEntry(EntryPoint,
+                        LdrpCallInitRoutine(EntryPoint,
                                          LdrEntry->DllBase,
                                          DLL_THREAD_DETACH,
                                          NULL);
@@ -1103,7 +1103,7 @@
                                               
LdrpImageEntry->EntryPointActivationContext);
 
         /* Do TLS callbacks */
-        LdrpTlsCallback(Peb->ImageBaseAddress, DLL_THREAD_DETACH);
+        LdrpCallTlsInitializers(Peb->ImageBaseAddress, DLL_THREAD_DETACH);
 
         /* Deactivate the ActCtx */
         RtlDeactivateActivationContextUnsafeFast(&ActCtx);

Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?r…
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Sun Jul 10 01:34:19 2011
@@ -14,11 +14,9 @@
 #include <debug.h>
 
 /* GLOBALS *******************************************************************/
-#define IMAGE_DLLCHARACTERISTICS_WX86_DLL 0x1000
 
 LIST_ENTRY LdrpUnloadHead;
-PLDR_DATA_TABLE_ENTRY LdrpLoadedDllHandleCache;
-PLDR_DATA_TABLE_ENTRY LdrpGetModuleHandleCache;
+PLDR_DATA_TABLE_ENTRY LdrpLoadedDllHandleCache, LdrpGetModuleHandleCache;
 
 #define LDR_GET_HASH_ENTRY(x) (RtlUpcaseUnicodeChar((x)) & (LDR_HASH_TABLE_ENTRIES -
1))
 
@@ -26,15 +24,16 @@
 
 BOOLEAN
 NTAPI
-LdrpCallDllEntry(PDLLMAIN_FUNC EntryPoint,
-                 PVOID BaseAddress,
-                 ULONG Reason,
-                 PVOID Context)
+LdrpCallInitRoutine(IN PDLL_INIT_ROUTINE EntryPoint,
+                    IN PVOID BaseAddress,
+                    IN ULONG Reason,
+                    IN PVOID Context)
 {
     /* Call the entry */
     return EntryPoint(BaseAddress, Reason, Context);
 }
 
+/* NOTE: This function is broken */
 VOID
 NTAPI
 LdrpUpdateLoadCount3(IN PLDR_DATA_TABLE_ENTRY LdrEntry,
@@ -261,18 +260,15 @@
     WCHAR Buffer[MAX_PATH];
     UNICODE_STRING UpdateString;
 
-    /* Setup the string */
-    UpdateString.Buffer = Buffer;
-    UpdateString.Length = 0;
-    UpdateString.MaximumLength = sizeof(Buffer);
-
-    /* Call the extended API */
+    /* Setup the string and call the extended API */
+    RtlInitEmptyUnicodeString(&UpdateString, Buffer, sizeof(Buffer));
     LdrpUpdateLoadCount3(LdrEntry, Flags, &UpdateString);
 }
 
 VOID
 NTAPI
-LdrpTlsCallback(PVOID BaseAddress, ULONG Reason)
+LdrpCallTlsInitializers(IN PVOID BaseAddress,
+                        IN ULONG Reason)
 {
     PIMAGE_TLS_DIRECTORY TlsDirectory;
     PIMAGE_TLS_CALLBACK *Array, Callback;
@@ -288,7 +284,8 @@
     _SEH2_TRY
     {
         /* Make sure it's valid and we have an array */
-        if (TlsDirectory && (Array = (PIMAGE_TLS_CALLBACK
*)TlsDirectory->AddressOfCallBacks))
+        Array = (PIMAGE_TLS_CALLBACK *)TlsDirectory->AddressOfCallBacks;
+        if ((TlsDirectory) && (Array))
         {
             /* Display debug */
             if (ShowSnaps)
@@ -311,7 +308,10 @@
                 }
 
                 /* Call it */
-                LdrpCallDllEntry((PDLLMAIN_FUNC)Callback, BaseAddress, Reason, NULL);
+                LdrpCallInitRoutine((PDLL_INIT_ROUTINE)Callback,
+                                    BaseAddress,
+                                    Reason,
+                                    NULL);
             }
         }
     }
@@ -324,9 +324,10 @@
 
 NTSTATUS
 NTAPI
-LdrpCodeAuthzCheckDllAllowed(PUNICODE_STRING FullName,
-                             HANDLE DllHandle)
+LdrpCodeAuthzCheckDllAllowed(IN PUNICODE_STRING FullName,
+                             IN HANDLE DllHandle)
 {
+    /* Not implemented */
     return STATUS_SUCCESS;
 }
 
@@ -481,6 +482,7 @@
     return Status;
 }
 
+/* NOTE: This function is totally b0rked and doesn't handle the
parameters/functionality it should */
 BOOLEAN
 NTAPI
 LdrpResolveDllName(PWSTR DllPath,
@@ -577,25 +579,25 @@
 
 PVOID
 NTAPI
-LdrpFetchAddressOfEntryPoint(PVOID ImageBase)
+LdrpFetchAddressOfEntryPoint(IN PVOID ImageBase)
 {
     PIMAGE_NT_HEADERS NtHeaders;
-    ULONG_PTR EntryPoint;
+    ULONG_PTR EntryPoint = 0;
 
     /* Get entry point offset from NT headers */
     NtHeaders = RtlImageNtHeader(ImageBase);
-    EntryPoint = NtHeaders->OptionalHeader.AddressOfEntryPoint;
-
-    /* If it's 0 - return so */
-    if (!EntryPoint) return NULL;
-
-    /* Add image base */
-    EntryPoint += (ULONG_PTR)ImageBase;
-
-    /* Return calculated pointer */
+    if (NtHeaders)
+    {
+        /* Add image base */
+        EntryPoint = NtHeaders->OptionalHeader.AddressOfEntryPoint;
+        if (EntryPoint) EntryPoint += (ULONG_PTR)ImageBase;
+    }
+
+    /* Return calculated pointer (or zero in case of failure) */
     return (PVOID)EntryPoint;
 }
 
+/* NOTE: This function is broken, wrong number of parameters, no SxS, etc */
 HANDLE
 NTAPI
 LdrpCheckForKnownDll(PWSTR DllName,
@@ -702,31 +704,36 @@
 
     /* Get the NT headers */
     NtHeaders = RtlImageNtHeader(ViewBase);
+    if (!NtHeaders) return STATUS_INVALID_IMAGE_FORMAT;
 
     /* Compute address of the first section header */
-    Section = (PIMAGE_SECTION_HEADER)(
-        (ULONG_PTR)NtHeaders + sizeof(ULONG) + sizeof(IMAGE_FILE_HEADER) +
-        NtHeaders->FileHeader.SizeOfOptionalHeader);
+    Section = IMAGE_FIRST_SECTION(NtHeaders);
 
     /* Go through all sections */
     for (i = 0; i < NtHeaders->FileHeader.NumberOfSections; i++)
     {
-        if (Section->SizeOfRawData &&
+        /* Check for read-only non-zero section */
+        if ((Section->SizeOfRawData) &&
             !(Section->Characteristics & IMAGE_SCN_MEM_WRITE))
         {
-            /* This section is not writable and has some size, so we need to change
-               its protection */
+            /* Check if we are setting or restoring protection */
             if (Restore)
             {
                 /* Set it to either EXECUTE or READONLY */
                 if (Section->Characteristics & IMAGE_SCN_MEM_EXECUTE)
+                {
                     NewProtection = PAGE_EXECUTE;
+                }
                 else
+                {
                     NewProtection = PAGE_READONLY;
+                }
 
                 /* Add PAGE_NOCACHE if needed */
                 if (Section->Characteristics & IMAGE_SCN_MEM_NOT_CACHED)
+                {
                     NewProtection |= PAGE_NOCACHE;
+                }
             }
             else
             {
@@ -734,9 +741,9 @@
                 NewProtection = PAGE_READWRITE;
             }
 
+            /* Get the section VA */
             SectionBase = (PVOID)((ULONG_PTR)ViewBase + Section->VirtualAddress);
             SectionSize = Section->SizeOfRawData;
-
             if (SectionSize)
             {
                 /* Set protection */
@@ -745,7 +752,6 @@
                                                 &SectionSize,
                                                 NewProtection,
                                                 &OldProtection);
-
                 if (!NT_SUCCESS(Status)) return Status;
             }
         }
@@ -756,10 +762,10 @@
 
     /* Flush instruction cache if necessary */
     if (Restore) ZwFlushInstructionCache(NtCurrentProcess(), NULL, 0);
-
     return STATUS_SUCCESS;
 }
 
+/* NOTE: Not yet reviewed */
 NTSTATUS
 NTAPI
 LdrpMapDll(IN PWSTR SearchPath OPTIONAL,
@@ -1275,11 +1281,11 @@
 LdrpAllocateDataTableEntry(IN PVOID BaseAddress)
 {
     PLDR_DATA_TABLE_ENTRY LdrEntry = NULL;
-    PIMAGE_NT_HEADERS NtHeader = RtlImageNtHeader(BaseAddress);
-
+    PIMAGE_NT_HEADERS NtHeader;
     DPRINT("LdrpAllocateDataTableEntry(%p), NtHeader %p\n", BaseAddress,
NtHeader);
 
     /* Make sure the header is valid */
+    NtHeader = RtlImageNtHeader(BaseAddress);
     if (NtHeader)
     {
         /* Allocate an entry */
@@ -1294,6 +1300,7 @@
             LdrEntry->DllBase = BaseAddress;
             LdrEntry->SizeOfImage = NtHeader->OptionalHeader.SizeOfImage;
             LdrEntry->TimeDateStamp = NtHeader->FileHeader.TimeDateStamp;
+            LdrEntry->PatchInformation = NULL;
         }
     }
 
@@ -1308,36 +1315,33 @@
     PPEB_LDR_DATA PebData = NtCurrentPeb()->Ldr;
     ULONG i;
 
-    /* Get the Hash entry */
+    /* Insert into hash table */
     i = LDR_GET_HASH_ENTRY(LdrEntry->BaseDllName.Buffer[0]);
-
     InsertTailList(&LdrpHashTable[i], &LdrEntry->HashLinks);
+    
+    /* Insert into other lists */
     InsertTailList(&PebData->InLoadOrderModuleList,
&LdrEntry->InLoadOrderLinks);
     InsertTailList(&PebData->InMemoryOrderModuleList,
&LdrEntry->InMemoryOrderModuleList);
 }
 
 VOID
 NTAPI
-LdrpFinalizeAndDeallocateDataTableEntry(PLDR_DATA_TABLE_ENTRY Entry)
+LdrpFinalizeAndDeallocateDataTableEntry(IN PLDR_DATA_TABLE_ENTRY Entry)
 {
+    /* Sanity check */
     ASSERT(Entry != NULL);
 
-    /* Release the activation context if it exists */
-    if (Entry->EntryPointActivationContext)
-    {
-        /* Check if it wasn't already released */
-        if ((HANDLE)Entry->EntryPointActivationContext != INVALID_HANDLE_VALUE)
-        {
-            RtlReleaseActivationContext(Entry->EntryPointActivationContext);
-
-            /* Mark it as invalid */
-            Entry->EntryPointActivationContext = INVALID_HANDLE_VALUE;
-        }
+    /* Release the activation context if it exists and wasn't already released */
+    if ((Entry->EntryPointActivationContext) &&
+        (Entry->EntryPointActivationContext != INVALID_HANDLE_VALUE))
+    {
+        /* Mark it as invalid */
+        RtlReleaseActivationContext(Entry->EntryPointActivationContext);
+        Entry->EntryPointActivationContext = INVALID_HANDLE_VALUE;
     }
 
     /* Release the full dll name string */
-    if (Entry->FullDllName.Buffer)
-        LdrpFreeUnicodeString(&Entry->FullDllName);
+    if (Entry->FullDllName.Buffer) LdrpFreeUnicodeString(&Entry->FullDllName);
 
     /* Finally free the entry's memory */
     RtlFreeHeap(RtlGetProcessHeap(), 0, Entry);
@@ -1352,7 +1356,8 @@
     PLIST_ENTRY ListHead, Next;
 
     /* Check the cache first */
-    if (LdrpLoadedDllHandleCache && LdrpLoadedDllHandleCache->DllBase ==
Base)
+    if ((LdrpLoadedDllHandleCache) &&
+        (LdrpLoadedDllHandleCache->DllBase == Base))
     {
         /* We got lucky, return the cached entry */
         *LdrEntry = LdrpLoadedDllHandleCache;
@@ -1362,12 +1367,12 @@
     /* Time for a lookup */
     ListHead = &NtCurrentPeb()->Ldr->InLoadOrderModuleList;
     Next = ListHead->Flink;
-    while(Next != ListHead)
+    while (Next != ListHead)
     {
         /* Get the current entry */
-        Current =  CONTAINING_RECORD(Next,
-                                     LDR_DATA_TABLE_ENTRY,
-                                     InLoadOrderLinks);
+        Current = CONTAINING_RECORD(Next,
+                                    LDR_DATA_TABLE_ENTRY,
+                                    InLoadOrderLinks);
 
         /* Make sure it's not unloading and check for a match */
         if ((Current->InMemoryOrderModuleList.Flink) && (Base ==
Current->DllBase))
@@ -2223,10 +2228,10 @@
                                                   
LdrEntry->EntryPointActivationContext);
 
             /* Call the entrypoint */
-            LdrpCallDllEntry(LdrEntry->EntryPoint,
-                             LdrEntry->DllBase,
-                             DLL_PROCESS_DETACH,
-                             NULL);
+            LdrpCallInitRoutine(LdrEntry->EntryPoint,
+                                LdrEntry->DllBase,
+                                DLL_PROCESS_DETACH,
+                                NULL);
 
             /* Release the context */
             RtlDeactivateActivationContextUnsafeFast(&ActCtx);
@@ -2313,139 +2318,55 @@
 
 ULONG
 NTAPI
-LdrpClearLoadInProgress()
+LdrpClearLoadInProgress(VOID)
 {
-    PLIST_ENTRY ListHead;
-    PLIST_ENTRY Entry;
-    PLDR_DATA_TABLE_ENTRY Module;
+    PLIST_ENTRY ListHead, Entry;
+    PLDR_DATA_TABLE_ENTRY LdrEntry;
     ULONG ModulesCount = 0;
 
     /* Traverse the init list */
     ListHead = &NtCurrentPeb()->Ldr->InInitializationOrderModuleList;
     Entry = ListHead->Flink;
-
     while (Entry != ListHead)
     {
-        Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY,
InInitializationOrderModuleList);
+        /* Get the loader entry */
+        LdrEntry = CONTAINING_RECORD(Entry,
+                                     LDR_DATA_TABLE_ENTRY,
+                                     InInitializationOrderModuleList);
 
         /* Clear load in progress flag */
-        Module->Flags &= ~LDRP_LOAD_IN_PROGRESS;
-
-        /* Increase counter for modules with entry point count but not processed yet */
-        if (Module->EntryPoint &&
-            !(Module->Flags & LDRP_ENTRY_PROCESSED)) ModulesCount++;
+        LdrEntry->Flags &= ~LDRP_LOAD_IN_PROGRESS;
+
+        /* Check for modules with entry point count but not processed yet */
+        if ((LdrEntry->EntryPoint) &&
+            !(LdrEntry->Flags & LDRP_ENTRY_PROCESSED))
+        {
+            /* Increase counter */
+            ModulesCount++;
+        }
 
         /* Advance to the next entry */
         Entry = Entry->Flink;
     }
 
+    /* Return final count */
     return ModulesCount;
 }
 
-/*
- * @implemented
- */
-NTSTATUS NTAPI
-LdrAddRefDll(IN ULONG Flags,
-             IN PVOID BaseAddress)
+VOID
+NTAPI
+LdrpFreeUnicodeString(IN PUNICODE_STRING StringIn)
 {
-    PLDR_DATA_TABLE_ENTRY LdrEntry;
-    NTSTATUS Status = STATUS_SUCCESS;
-	ULONG Cookie;
-	BOOLEAN Locked = FALSE;
-
-	/* Check for invalid flags */
-    if (Flags & ~(LDR_PIN_MODULE))
-    {
-		/* Fail with invalid parameter status if so */
-		Status = STATUS_INVALID_PARAMETER;
-		goto quickie;
-    }
-
-	/* Acquire the loader lock if not in init phase */
-    if (!LdrpInLdrInit)
-    {
-        /* Acquire the lock */
-        Status = LdrLockLoaderLock(0, NULL, &Cookie);
-        if (!NT_SUCCESS(Status)) goto quickie;
-        Locked = TRUE;
-    }
-
-	/* Get this module's data table entry */
-	if (LdrpCheckForLoadedDllHandle(BaseAddress, &LdrEntry))
-	{
-		if (!LdrEntry)
-		{
-			/* Shouldn't happen */
-			Status = STATUS_INTERNAL_ERROR;
-			goto quickie;
-		}
-
-		/* If this is not a pinned module */
-		if (LdrEntry->LoadCount != -1)
-		{
-			/* Update its load count */
-			if (Flags & LDR_PIN_MODULE)
-			{
-				/* Pin it by setting load count to -1 */
-				LdrEntry->LoadCount = -1;
-				LdrpUpdateLoadCount2(LdrEntry, LDRP_UPDATE_PIN);
-			}
-			else
-			{
-				/* Increase its load count by one */
-				LdrEntry->LoadCount++;
-				LdrpUpdateLoadCount2(LdrEntry, LDRP_UPDATE_REFCOUNT);
-			}
-
-			/* Clear load in progress */
-			LdrpClearLoadInProgress();
-		}
-	}
-	else
-	{
-		/* There was an error getting this module's handle, return invalid param status */
-		Status = STATUS_INVALID_PARAMETER;
-		goto quickie;
-	}
-
-quickie:
-	if (!NT_SUCCESS(Status))
-	{
-		if (ShowSnaps ||
-			(Status != STATUS_NO_SUCH_FILE &&
-			 Status != STATUS_DLL_NOT_FOUND &&
-			 Status != STATUS_OBJECT_NAME_NOT_FOUND))
-		{
-			DPRINT1("LDR: LdrAddRefDll(%p) 0x%08lx\n", BaseAddress);
-		}
-	}
-
-	/* Release the lock if needed */
-	if (Locked) LdrUnlockLoaderLock(LDR_LOCK_LOADER_LOCK_FLAG_RAISE_ON_ERRORS, Cookie);
-
-    return Status;
+    ASSERT(StringIn != NULL);
+
+    /* If Buffer is not NULL - free it */
+    if (StringIn->Buffer)
+    {
+        RtlFreeHeap(RtlGetProcessHeap(), 0, StringIn->Buffer);
+    }
+
+    /* Zero it out */
+    RtlInitEmptyUnicodeString(StringIn, NULL, 0);
 }
 
-
-BOOLEAN
-NTAPI
-LdrpFreeUnicodeString(PUNICODE_STRING String)
-{
-    BOOLEAN Result = FALSE;
-
-    ASSERT(String != NULL);
-
-    /* If Buffer is not NULL - free it */
-    if (String->Buffer)
-        Result = RtlFreeHeap(RtlGetProcessHeap(), 0, String->Buffer);
-
-    /* Zero it out */
-    String->Length = 0;
-    String->MaximumLength = 0;
-    String->Buffer = NULL;
-
-    return Result;
-}
-
 /* EOF */

Modified: trunk/reactos/include/ndk/ldrtypes.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrtypes.h?rev…
==============================================================================
--- trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] Sun Jul 10 01:34:19 2011
@@ -66,7 +66,7 @@
 //
 // LdrAddRef Flags
 //
-#define LDR_PIN_MODULE                              0x00000001
+#define LDR_ADDREF_DLL_PIN                          0x00000001
 
 //
 // LdrLockLoaderLock Flags
@@ -84,6 +84,7 @@
 //
 #define LDR_GET_DLL_HANDLE_EX_UNCHANGED_REFCOUNT    0x00000001
 #define LDR_GET_DLL_HANDLE_EX_PIN                   0x00000002
+
 
 #define LDR_LOCK_LOADER_LOCK_DISPOSITION_INVALID           0
 #define LDR_LOCK_LOADER_LOCK_DISPOSITION_LOCK_ACQUIRED     1
@@ -216,4 +217,14 @@
 typedef VOID (NTAPI LDR_ENUM_CALLBACK)(IN PLDR_DATA_TABLE_ENTRY ModuleInformation, IN
PVOID Parameter, OUT BOOLEAN *Stop);
 typedef LDR_ENUM_CALLBACK *PLDR_ENUM_CALLBACK;
 
+//
+// DLL Main Routine
+//
+typedef BOOLEAN
+(NTAPI *PDLL_INIT_ROUTINE)(
+    IN PVOID DllHandle,
+    IN ULONG Reason,
+    IN PCONTEXT Context OPTIONAL
+);
+
 #endif