Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 07:32:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTDLL/LDR]

Browse source 
- Fix CMake build
- Minor improvements
Path by Thomas Faber

svn path=/trunk/; revision=52606
This commit is contained in:
Rafal Harabien 2011-07-10 13:44:19 +00:00
parent ef65e8cc09
commit 12bc8ad634
3 changed files with 6 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

1
reactos/dll/ntdll/CMakeLists.txt
View file

@ -15,7 +15,6 @@ list(APPEND SOURCE
csr/capture.c csr/capture.c
csr/connect.c csr/connect.c
dbg/dbgui.c dbg/dbgui.c
ldr/actctx.c
ldr/ldrapi.c ldr/ldrapi.c
ldr/ldrinit.c ldr/ldrinit.c
ldr/ldrpe.c ldr/ldrpe.c

4
reactos/dll/ntdll/ldr/ldrpe.c
View file

@ -561,7 +561,6 @@ LdrpHandleOneOldFormatImportDescriptor(IN LPWSTR DllPath OPTIONAL,
} }
/* Return */ /* Return */
*ImportEntry = *ImportEntry;
return Status; return Status;
} }
@ -595,13 +594,12 @@ LdrpHandleOneOldFormatImportDescriptor(IN LPWSTR DllPath OPTIONAL,
} }
/* Return */ /* Return */
*ImportEntry = *ImportEntry;
return Status; return Status;
} }
SkipEntry: SkipEntry:
/* Move on */ /* Move on */
*ImportEntry = (*ImportEntry)++; (*ImportEntry)++;
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }

5
reactos/dll/ntdll/ldr/ldrutils.c
View file

@ -38,8 +38,6 @@ LdrpUpdateLoadCount3(IN PLDR_DATA_TABLE_ENTRY LdrEntry,
OUT PUNICODE_STRING UpdateString) OUT PUNICODE_STRING UpdateString)
{ {
PIMAGE_BOUND_FORWARDER_REF NewImportForwarder; PIMAGE_BOUND_FORWARDER_REF NewImportForwarder;
PIMAGE_BOUND_IMPORT_DESCRIPTOR BoundEntry; PIMAGE_BOUND_IMPORT_DESCRIPTOR BoundEntry;
PIMAGE_IMPORT_DESCRIPTOR ImportEntry; PIMAGE_IMPORT_DESCRIPTOR ImportEntry;
PIMAGE_THUNK_DATA FirstThunk; PIMAGE_THUNK_DATA FirstThunk;
@ -1283,10 +1281,11 @@ LdrpAllocateDataTableEntry(IN PVOID BaseAddress)
{ {
PLDR_DATA_TABLE_ENTRY LdrEntry = NULL; PLDR_DATA_TABLE_ENTRY LdrEntry = NULL;
PIMAGE_NT_HEADERS NtHeader; PIMAGE_NT_HEADERS NtHeader;
DPRINT("LdrpAllocateDataTableEntry(%p), NtHeader %p\n", BaseAddress, NtHeader);
/* Make sure the header is valid */ /* Make sure the header is valid */
NtHeader = RtlImageNtHeader(BaseAddress); NtHeader = RtlImageNtHeader(BaseAddress);
DPRINT("LdrpAllocateDataTableEntry(%p), NtHeader %p\n", BaseAddress, NtHeader);
if (NtHeader) if (NtHeader)
{ {
/* Allocate an entry */ /* Allocate an entry */