mirror of
https://github.com/reactos/reactos.git
synced 2024-06-30 18:01:07 +00:00
[NTDLL/LDR]
- Improve DPRINTs - Fix some MSVC warnings [NTOSKRNL] - Fix missing exports svn path=/trunk/; revision=53466
This commit is contained in:
parent
3f6b691d08
commit
a0213bada8
|
@ -294,9 +294,9 @@ LdrQueryImageFileKeyOption(IN HKEY KeyHandle,
|
||||||
{
|
{
|
||||||
/* OK, we know what you want... */
|
/* OK, we know what you want... */
|
||||||
IntegerString.Buffer = (PWSTR)KeyValueInformation->Data;
|
IntegerString.Buffer = (PWSTR)KeyValueInformation->Data;
|
||||||
IntegerString.Length = KeyValueInformation->DataLength -
|
IntegerString.Length = (USHORT)KeyValueInformation->DataLength -
|
||||||
sizeof(WCHAR);
|
sizeof(WCHAR);
|
||||||
IntegerString.MaximumLength = KeyValueInformation->DataLength;
|
IntegerString.MaximumLength = (USHORT)KeyValueInformation->DataLength;
|
||||||
Status = RtlUnicodeStringToInteger(&IntegerString, 0, (PULONG)Buffer);
|
Status = RtlUnicodeStringToInteger(&IntegerString, 0, (PULONG)Buffer);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -499,8 +499,10 @@ LdrpInitializeThread(IN PCONTEXT Context)
|
||||||
NTSTATUS Status;
|
NTSTATUS Status;
|
||||||
PVOID EntryPoint;
|
PVOID EntryPoint;
|
||||||
|
|
||||||
DPRINT("LdrpInitializeThread() called for %wZ\n",
|
DPRINT("LdrpInitializeThread() called for %wZ (%lx/%lx)\n",
|
||||||
&LdrpImageEntry->BaseDllName);
|
&LdrpImageEntry->BaseDllName,
|
||||||
|
NtCurrentTeb()->RealClientId.UniqueProcess,
|
||||||
|
NtCurrentTeb()->RealClientId.UniqueThread);
|
||||||
|
|
||||||
/* Allocate an Activation Context Stack */
|
/* Allocate an Activation Context Stack */
|
||||||
/* FIXME: This is a hack for Wine's actctx stuff */
|
/* FIXME: This is a hack for Wine's actctx stuff */
|
||||||
|
@ -570,8 +572,10 @@ LdrpInitializeThread(IN PCONTEXT Context)
|
||||||
if (!LdrpShutdownInProgress)
|
if (!LdrpShutdownInProgress)
|
||||||
{
|
{
|
||||||
/* Call the Entrypoint */
|
/* Call the Entrypoint */
|
||||||
DPRINT("%wZ - Calling entry point at %x for thread attaching\n",
|
DPRINT("%wZ - Calling entry point at %p for thread attaching, %lx/%lx\n",
|
||||||
&LdrEntry->BaseDllName, LdrEntry->EntryPoint);
|
&LdrEntry->BaseDllName, LdrEntry->EntryPoint,
|
||||||
|
NtCurrentTeb()->RealClientId.UniqueProcess,
|
||||||
|
NtCurrentTeb()->RealClientId.UniqueThread);
|
||||||
LdrpCallInitRoutine(LdrEntry->EntryPoint,
|
LdrpCallInitRoutine(LdrEntry->EntryPoint,
|
||||||
LdrEntry->DllBase,
|
LdrEntry->DllBase,
|
||||||
DLL_THREAD_ATTACH,
|
DLL_THREAD_ATTACH,
|
||||||
|
@ -628,7 +632,10 @@ LdrpRunInitializeRoutines(IN PCONTEXT Context OPTIONAL)
|
||||||
PTEB OldTldTeb;
|
PTEB OldTldTeb;
|
||||||
BOOLEAN DllStatus;
|
BOOLEAN DllStatus;
|
||||||
|
|
||||||
DPRINT("LdrpRunInitializeRoutines() called for %wZ\n", &LdrpImageEntry->BaseDllName);
|
DPRINT("LdrpRunInitializeRoutines() called for %wZ (%lx/%lx)\n",
|
||||||
|
&LdrpImageEntry->BaseDllName,
|
||||||
|
NtCurrentTeb()->RealClientId.UniqueProcess,
|
||||||
|
NtCurrentTeb()->RealClientId.UniqueThread);
|
||||||
|
|
||||||
/* Check the Loader Lock */
|
/* Check the Loader Lock */
|
||||||
LdrpEnsureLoaderLockIsHeld();
|
LdrpEnsureLoaderLockIsHeld();
|
||||||
|
@ -2151,7 +2158,9 @@ LdrpInit(PCONTEXT Context,
|
||||||
MEMORY_BASIC_INFORMATION MemoryBasicInfo;
|
MEMORY_BASIC_INFORMATION MemoryBasicInfo;
|
||||||
PPEB Peb = NtCurrentPeb();
|
PPEB Peb = NtCurrentPeb();
|
||||||
|
|
||||||
DPRINT("LdrpInit()\n");
|
DPRINT("LdrpInit() %lx/%lx\n",
|
||||||
|
NtCurrentTeb()->RealClientId.UniqueProcess,
|
||||||
|
NtCurrentTeb()->RealClientId.UniqueThread);
|
||||||
|
|
||||||
/* Check if we have a deallocation stack */
|
/* Check if we have a deallocation stack */
|
||||||
if (!Teb->DeallocationStack)
|
if (!Teb->DeallocationStack)
|
||||||
|
|
|
@ -112,7 +112,7 @@
|
||||||
@ FASTCALL ExInterlockedAddLargeStatistic(ptr long)
|
@ FASTCALL ExInterlockedAddLargeStatistic(ptr long)
|
||||||
#endif
|
#endif
|
||||||
@ stdcall ExInterlockedAddUlong(ptr long ptr)
|
@ stdcall ExInterlockedAddUlong(ptr long ptr)
|
||||||
#ifdef __x86__
|
#ifdef _M_IX86
|
||||||
@ FASTCALL ExInterlockedCompareExchange64(ptr ptr ptr ptr)
|
@ FASTCALL ExInterlockedCompareExchange64(ptr ptr ptr ptr)
|
||||||
@ stdcall ExInterlockedDecrementLong(ptr ptr)
|
@ stdcall ExInterlockedDecrementLong(ptr ptr)
|
||||||
@ stdcall ExInterlockedExchangeUlong(ptr long ptr)
|
@ stdcall ExInterlockedExchangeUlong(ptr long ptr)
|
||||||
|
|
Loading…
Reference in a new issue