[rharabien] 52606: [NTDLL/LDR] - Fix CMake build - Minor improvements Path by Thomas Faber

Author: rharabien
Date: Sun Jul 10 13:44:19 2011
New Revision: 52606

URL: http://svn.reactos.org/svn/reactos?rev=52606&view=rev
Log:
[NTDLL/LDR]
- Fix CMake build
- Minor improvements
Path by Thomas Faber

Modified:
    trunk/reactos/dll/ntdll/CMakeLists.txt
    trunk/reactos/dll/ntdll/ldr/ldrpe.c
    trunk/reactos/dll/ntdll/ldr/ldrutils.c

Modified: trunk/reactos/dll/ntdll/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/CMakeLists.txt?re...
==============================================================================
--- trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/CMakeLists.txt [iso-8859-1] Sun Jul 10 13:44:19 2011
@@ -15,7 +15,6 @@
     csr/capture.c
     csr/connect.c
     dbg/dbgui.c
-	ldr/actctx.c
    ldr/ldrapi.c
    ldr/ldrinit.c
    ldr/ldrpe.c

Modified: trunk/reactos/dll/ntdll/ldr/ldrpe.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrpe.c?rev=5...
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/ldr/ldrpe.c [iso-8859-1] Sun Jul 10 13:44:19 2011
@@ -561,7 +561,6 @@
         }

/* Return */
-        *ImportEntry = *ImportEntry;
         return Status;
     }

@@ -595,13 +594,12 @@
         }

/* Return */
-        *ImportEntry = *ImportEntry;
         return Status;
     }

SkipEntry:
     /* Move on */
-    *ImportEntry = (*ImportEntry)++;
+    (*ImportEntry)++;
     return STATUS_SUCCESS;
 }

Modified: trunk/reactos/dll/ntdll/ldr/ldrutils.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrutils.c?re...
==============================================================================
--- trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] (original)
+++ trunk/reactos/dll/ntdll/ldr/ldrutils.c [iso-8859-1] Sun Jul 10 13:44:19 2011
@@ -38,8 +38,6 @@
                      OUT PUNICODE_STRING UpdateString)
 {
     PIMAGE_BOUND_FORWARDER_REF NewImportForwarder;
-    
-
     PIMAGE_BOUND_IMPORT_DESCRIPTOR BoundEntry;
     PIMAGE_IMPORT_DESCRIPTOR ImportEntry;
     PIMAGE_THUNK_DATA FirstThunk;
@@ -461,7 +459,7 @@
                         DPRINT1("LDR: Loading of (%wZ) blocked by Winsafer\n",
                                 &FullName);
                     }
-                    
+
                     /* Failure case, close section handle */
                     NtClose(*SectionHandle);
                     *SectionHandle = NULL;
@@ -885,7 +883,7 @@
             /* We couldn't resolve the name, is this a static load? */
             if (Static)
             {
-                /* 
+                /*
                  * This is BAD! Static loads are CRITICAL. Bugcheck!
                  * Initialize the strings for the error
                  */
@@ -1283,10 +1281,11 @@
 {
     PLDR_DATA_TABLE_ENTRY LdrEntry = NULL;
     PIMAGE_NT_HEADERS NtHeader;
-    DPRINT("LdrpAllocateDataTableEntry(%p), NtHeader %p\n", BaseAddress, NtHeader);

/* Make sure the header is valid */
     NtHeader = RtlImageNtHeader(BaseAddress);
+    DPRINT("LdrpAllocateDataTableEntry(%p), NtHeader %p\n", BaseAddress, NtHeader);
+
     if (NtHeader)
     {
         /* Allocate an entry */
@@ -1319,7 +1318,7 @@
     /* 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);