[tfaber] 53466: [NTDLL/LDR] - Improve DPRINTs - Fix some MSVC warnings [NTOSKRNL] - Fix missing exports
Author: tfaber Date: Sat Aug 27 10:38:30 2011 New Revision: 53466
URL: http://svn.reactos.org/svn/reactos?rev=53466&view=rev Log: [NTDLL/LDR] - Improve DPRINTs - Fix some MSVC warnings [NTOSKRNL] - Fix missing exports
Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c trunk/reactos/ntoskrnl/ntoskrnl.pspec
Modified: trunk/reactos/dll/ntdll/ldr/ldrinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/ldr/ldrinit.c?rev... ============================================================================== --- trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/ldr/ldrinit.c [iso-8859-1] Sat Aug 27 10:38:30 2011 @@ -294,9 +294,9 @@ { /* OK, we know what you want... */ IntegerString.Buffer = (PWSTR)KeyValueInformation->Data; - IntegerString.Length = KeyValueInformation->DataLength - + IntegerString.Length = (USHORT)KeyValueInformation->DataLength - sizeof(WCHAR); - IntegerString.MaximumLength = KeyValueInformation->DataLength; + IntegerString.MaximumLength = (USHORT)KeyValueInformation->DataLength; Status = RtlUnicodeStringToInteger(&IntegerString, 0, (PULONG)Buffer); } } @@ -499,8 +499,10 @@ NTSTATUS Status; PVOID EntryPoint;
- DPRINT("LdrpInitializeThread() called for %wZ\n", - &LdrpImageEntry->BaseDllName); + DPRINT("LdrpInitializeThread() called for %wZ (%lx/%lx)\n", + &LdrpImageEntry->BaseDllName, + NtCurrentTeb()->RealClientId.UniqueProcess, + NtCurrentTeb()->RealClientId.UniqueThread);
/* Allocate an Activation Context Stack */ /* FIXME: This is a hack for Wine's actctx stuff */ @@ -570,8 +572,10 @@ if (!LdrpShutdownInProgress) { /* Call the Entrypoint */ - DPRINT("%wZ - Calling entry point at %x for thread attaching\n", - &LdrEntry->BaseDllName, LdrEntry->EntryPoint); + DPRINT("%wZ - Calling entry point at %p for thread attaching, %lx/%lx\n", + &LdrEntry->BaseDllName, LdrEntry->EntryPoint, + NtCurrentTeb()->RealClientId.UniqueProcess, + NtCurrentTeb()->RealClientId.UniqueThread); LdrpCallInitRoutine(LdrEntry->EntryPoint, LdrEntry->DllBase, DLL_THREAD_ATTACH, @@ -628,7 +632,10 @@ PTEB OldTldTeb; 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 */ LdrpEnsureLoaderLockIsHeld(); @@ -2151,7 +2158,9 @@ MEMORY_BASIC_INFORMATION MemoryBasicInfo; PPEB Peb = NtCurrentPeb();
- DPRINT("LdrpInit()\n"); + DPRINT("LdrpInit() %lx/%lx\n", + NtCurrentTeb()->RealClientId.UniqueProcess, + NtCurrentTeb()->RealClientId.UniqueThread);
/* Check if we have a deallocation stack */ if (!Teb->DeallocationStack)
Modified: trunk/reactos/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.pspec?rev... ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] Sat Aug 27 10:38:30 2011 @@ -112,7 +112,7 @@ @ FASTCALL ExInterlockedAddLargeStatistic(ptr long) #endif @ stdcall ExInterlockedAddUlong(ptr long ptr) -#ifdef __x86__ +#ifdef _M_IX86 @ FASTCALL ExInterlockedCompareExchange64(ptr ptr ptr ptr) @ stdcall ExInterlockedDecrementLong(ptr ptr) @ stdcall ExInterlockedExchangeUlong(ptr long ptr)
-
tfaber＠svn.reactos.org