Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 35348: NDK: update KPRCB based on win2003 and vista symbol files
by tkreuzer＠svn.reactos.org 15 Aug '08

15 Aug '08

Author: tkreuzer Date: Thu Aug 14 20:00:03 2008 New Revision: 35348 URL: http://svn.reactos.org/svn/reactos?rev=35348&view=rev Log: NDK: update KPRCB based on win2003 and vista symbol files Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/ketypes.h [iso-8859-1] Thu Aug 14 20:00:03 2008 @@ -385,6 +385,7 @@ CONTEXT ContextFrame; } KPROCESSOR_STATE, *PKPROCESSOR_STATE; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) typedef struct _GENERAL_LOOKASIDE_POOL { union @@ -428,6 +429,9 @@ }; ULONG Future[2]; } GENERAL_LOOKASIDE_POOL, *PGENERAL_LOOKASIDE_POOL; +#else +#define GENERAL_LOOKASIDE_POOL PP_LOOKASIDE_LIST +#endif typedef struct _KREQUEST_PACKET { @@ -449,39 +453,72 @@ typedef struct _KPRCB { ULONG MxCsr; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) USHORT Number; +#else + UCHAR Number; + UCHAR NestingLevel; +#endif UCHAR InterruptRequest; UCHAR IdleHalt; struct _KTHREAD *CurrentThread; struct _KTHREAD *NextThread; struct _KTHREAD *IdleThread; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) UCHAR NestingLevel; UCHAR Group; UCHAR PrcbPad00[6]; +#else + UINT64 UserRsp; +#endif UINT64 RspBase; UINT64 PrcbLock; UINT64 SetMember; KPROCESSOR_STATE ProcessorState; - UCHAR CpuType; - UCHAR CpuID; + CHAR CpuType; + CHAR CpuID; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + union + { + USHORT CpuStep; + struct + { + UCHAR CpuStepping; + UCHAR CpuModel; + }; + }; +#else USHORT CpuStep; - UCHAR CpuStepping; - UCHAR CpuModel; +#endif ULONG MHz; UINT64 HalReserved[8]; USHORT MinorVersion; USHORT MajorVersion; UCHAR BuildType; UCHAR CpuVendor; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) UCHAR CoresPerPhysicalProcessor; UCHAR LogicalProcessorsPerCore; +#else + UCHAR InitialApicId; + UCHAR LogicalProcessorsPerPhysicalProcessor; +#endif ULONG ApicMask; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) ULONG CFlushSize; +#else + UCHAR CFlushSize; + UCHAR PrcbPad0x[3]; +#endif PVOID AcpiReserved; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) ULONG InitialApicId; ULONG Stride; UINT64 PrcbPad01[3]; - KSPIN_LOCK_QUEUE LockQueue[LockQueueMaximumLock]; +#else + UINT64 PrcbPad00[4]; +#endif + KSPIN_LOCK_QUEUE LockQueue[LockQueueMaximumLock]; // 2003: 33, vista:49 PP_LOOKASIDE_LIST PPLookasideList[16]; GENERAL_LOOKASIDE_POOL PPNPagedLookasideList[32]; GENERAL_LOOKASIDE_POOL PPPagedLookasideList[32]; @@ -490,13 +527,21 @@ LONG MmPageFaultCount; LONG MmCopyOnWriteCount; LONG MmTransitionCount; +#if (NTDDI_VERSION < NTDDI_LONGHORN) + LONG MmCacheTransitionCount; +#endif LONG MmDemandZeroCount; LONG MmPageReadCount; LONG MmPageReadIoCount; +#if (NTDDI_VERSION < NTDDI_LONGHORN) + LONG MmCacheReadCount; + LONG MmCacheIoCount; +#endif LONG MmDirtyPagesWriteCount; LONG MmDirtyWriteIoCount; LONG MmMappedPagesWriteCount; LONG MmMappedWriteIoCount; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) ULONG KeSystemCalls; ULONG KeContextSwitches; ULONG CcFastReadNoWait; @@ -506,12 +551,20 @@ ULONG CcCopyReadWait; ULONG CcCopyReadNoWaitMiss; LONG LookasideIrpFloat; +#else + LONG LookasideIrpFloat; + ULONG KeSystemCalls; +#endif LONG IoReadOperationCount; LONG IoWriteOperationCount; LONG IoOtherOperationCount; LARGE_INTEGER IoReadTransferCount; LARGE_INTEGER IoWriteTransferCount; LARGE_INTEGER IoOtherTransferCount; +#if (NTDDI_VERSION < NTDDI_LONGHORN) + ULONG KeContextSwitches; + UCHAR PrcbPad2[12]; +#endif UINT64 TargetSet; ULONG IpiFrozen; UCHAR PrcbPad3[116]; @@ -520,7 +573,11 @@ UCHAR PrcbPad4[120]; KDPC_DATA DpcData[2]; PVOID DpcStack; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) PVOID SparePtr0; +#else + PVOID SavedRsp; +#endif LONG MaximumDpcQueueDepth; ULONG DpcRequestRate; ULONG MinimumDpcRate; @@ -538,10 +595,18 @@ UCHAR PrcbPad50; UCHAR IdleSchedule; LONG DpcSetEventRequest; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) ULONG KeExceptionDispatchCount; +#else + LONG PrcbPad40; + PVOID DpcThread; +#endif KEVENT DpcEvent; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) PVOID PrcbPad51; +#endif KDPC CallDpc; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) LONG ClockKeepAlive; UCHAR ClockCheckSlot; UCHAR ClockPollCycle; @@ -549,11 +614,18 @@ LONG DpcWatchdogPeriod; LONG DpcWatchdogCount; UINT64 PrcbPad70[2]; +#else + UINT64 PrcbPad7[4]; +#endif LIST_ENTRY WaitListHead; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) UINT64 WaitLock; +#endif ULONG ReadySummary; ULONG QueueIndex; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) UINT64 PrcbPad71[12]; +#endif LIST_ENTRY DispatcherReadyListHead[32]; ULONG InterruptCount; ULONG KernelTime; @@ -564,22 +636,29 @@ UCHAR SkipTick; UCHAR DebuggerSavedIRQL; UCHAR PollSlot; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) UCHAR PrcbPad80[5]; ULONG DpcTimeCount; ULONG DpcTimeLimit; ULONG PeriodicCount; ULONG PeriodicBias; UINT64 PrcbPad81[2]; +#else + UCHAR PrcbPad8[13]; +#endif struct _KNODE *ParentNode; UINT64 MultiThreadProcessorSet; struct _KPRCB *MultiThreadSetMaster; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) UINT64 StartCycles; LONG MmSpinLockOrdering; ULONG PageColor; ULONG NodeColor; ULONG NodeShiftedColor; ULONG SecondaryColorMask; +#endif LONG Sleeping; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) UINT64 CycleTime; ULONG CcFastMdlReadNoWait; ULONG CcFastMdlReadWait; @@ -635,6 +714,35 @@ UINT64 CacheProcessorMask[5]; UINT64 PackageProcessorSet; UINT64 CoreProcessorSet; +#else + ULONG PrcbPad90[1]; + ULONG DebugDpcTime; + ULONG PageColor; + ULONG NodeColor; + ULONG NodeShiftedColor; + ULONG SecondaryColorMask; + UCHAR PrcbPad9[12]; + ULONG CcFastReadNoWait; + ULONG CcFastReadWait; + ULONG CcFastReadNotPossible; + ULONG CcCopyReadNoWait; + ULONG CcCopyReadWait; + ULONG CcCopyReadNoWaitMiss; + ULONG KeAlignmentFixupCount; + ULONG KeDcacheFlushCount; + ULONG KeExceptionDispatchCount; + ULONG KeFirstLevelTbFills; + ULONG KeFloatingEmulationCount; + ULONG KeIcacheFlushCount; + ULONG KeSecondLevelTbFills; + UCHAR VendorString[13]; + UCHAR PrcbPad10[2]; + ULONG FeatureBits; + LARGE_INTEGER UpdateSignature; + PROCESSOR_POWER_STATE PowerState; + CACHE_DESCRIPTOR Cache[5]; + ULONG CacheCount; +#endif } KPRCB, *PKPRCB;

1 0

[tkreuzer] 35347: NDK: update 64bit mm structures, based on win2003 and vista symbol files
by tkreuzer＠svn.reactos.org 14 Aug '08

14 Aug '08

Author: tkreuzer Date: Thu Aug 14 17:58:22 2008 New Revision: 35347 URL: http://svn.reactos.org/svn/reactos?rev=35347&view=rev Log: NDK: update 64bit mm structures, based on win2003 and vista symbol files Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/mmtypes.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/mmtypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/mmtypes.h [iso-8859-1] Thu Aug 14 17:58:22 2008 @@ -14,7 +14,7 @@ Author: Alex Ionescu (alex.ionescu(a)reactos.com) 06-Oct-2004 - Timo Kreuzer (timo.kreuzer(a)reactos.com) 29-Jul-2008 + Timo Kreuzer (timo.kreuzer(a)reactos.com) 15-Aug-2008 --*/ @@ -47,109 +47,169 @@ // // Page Table Entry Definitions // -typedef struct _HARDWARE_PTE_AMD64 -{ - ULONGLONG Valid:1; - ULONGLONG Write:1; - ULONGLONG Owner:1; - ULONGLONG WriteThrough:1; - ULONGLONG CacheDisable:1; - ULONGLONG Accessed:1; - ULONGLONG Dirty:1; - ULONGLONG LargePage:1; - ULONGLONG Global:1; - ULONGLONG CopyOnWrite:1; - ULONGLONG Prototype: 1; - ULONGLONG reserved1: 1; - ULONGLONG PageFrameNumber:40; - ULONGLONG reserved2:11; - ULONGLONG NoExecute:1; -} HARDWARE_PTE_AMD64, *PHARDWARE_PTE_AMD64; +typedef struct _HARDWARE_PTE +{ + ULONG64 Valid:1; + ULONG64 Write:1; + ULONG64 Owner:1; + ULONG64 WriteThrough:1; + ULONG64 CacheDisable:1; + ULONG64 Accessed:1; + ULONG64 Dirty:1; + ULONG64 LargePage:1; + ULONG64 Global:1; + ULONG64 CopyOnWrite:1; + ULONG64 Prototype:1; + ULONG64 reserved0:1; + ULONG64 PageFrameNumber:28; + ULONG64 reserved1:12; + ULONG64 SoftwareWsIndex:11; + ULONG64 NoExecute:1; +} HARDWARE_PTE, *PHARDWARE_PTE; typedef struct _MMPTE_SOFTWARE { - ULONG Valid:1; - ULONG PageFileLow:4; - ULONG Protection:5; - ULONG Prototype:1; - ULONG Transition:1; - ULONG PageFileHigh:20; -} MMPTE_SOFTWARE; + ULONG64 Valid:1; + ULONG64 PageFileLow:4; + ULONG64 Protection:5; + ULONG64 Prototype:1; + ULONG64 Transition:1; + ULONG64 UsedPageTableEntries:10; + ULONG64 Reserved:10; + ULONG64 PageFileHigh:32; +} MMPTE_SOFTWARE, *PMMPTE_SOFTWARE; typedef struct _MMPTE_TRANSITION { - ULONG Valid:1; - ULONG Write:1; - ULONG Owner:1; - ULONG WriteThrough:1; - ULONG CacheDisable:1; - ULONG Protection:5; - ULONG Prototype:1; - ULONG Transition:1; - ULONG PageFrameNumber:20; + ULONG64 Valid:1; + ULONG64 Write:1; + ULONG64 Owner:1; + ULONG64 WriteThrough:1; + ULONG64 CacheDisable:1; + ULONG64 Protection:5; + ULONG64 Prototype:1; + ULONG64 Transition:1; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG64 PageFrameNumber:36; + ULONG64 Unused:16; +#else + ULONG64 PageFrameNumber:28; + ULONG64 Unused:24; +#endif } MMPTE_TRANSITION; typedef struct _MMPTE_PROTOTYPE { - ULONG Valid:1; - ULONG ProtoAddressLow:7; - ULONG ReadOnly:1; - ULONG WhichPool:1; - ULONG Prototype:1; - ULONG ProtoAddressHigh:21; + ULONG64 Valid:1; + ULONG64 Unused0:7; + ULONG64 ReadOnly:1; + ULONG64 Unused1:1; + ULONG64 Prototype:1; + ULONG64 Protection:5; + LONG64 ProtoAddress:48; } MMPTE_PROTOTYPE; typedef struct _MMPTE_SUBSECTION { - ULONG Valid:1; - ULONG SubsectionAddressLow:4; - ULONG Protection:5; - ULONG Prototype:1; - ULONG SubsectionAddressHigh:20; - ULONG WhichPool:1; + ULONG64 Valid:1; + ULONG64 Unused0:4; + ULONG64 Protection:5; + ULONG64 Prototype:1; + ULONG64 Unused1:5; + LONG64 SubsectionAddress:48; } MMPTE_SUBSECTION; typedef struct _MMPTE_LIST { - ULONG Valid:1; - ULONG OneEntry:1; - ULONG filler0:8; - ULONG NextEntry:20; - ULONG Prototype:1; - ULONG filler1:1; + ULONG64 Valid:1; + ULONG64 OneEntry:1; + ULONG64 filler0:3; + ULONG64 Protection:5; + ULONG64 Prototype:1; + ULONG64 Transition:1; + ULONG64 filler1:20; + ULONG64 NextEntry:32; } MMPTE_LIST; #ifndef CONFIG_SMP typedef struct _MMPTE_HARDWARE { - ULONGLONG Valid:1; - ULONGLONG Write:1; - ULONGLONG Owner:1; - ULONGLONG WriteThrough:1; - ULONGLONG CacheDisable:1; - ULONGLONG Accessed:1; - ULONGLONG Dirty:1; - ULONGLONG LargePage:1; - ULONGLONG Global:1; - ULONGLONG CopyOnWrite:1; - ULONGLONG Prototype: 1; - ULONGLONG reserved1: 1; - ULONGLONG PageFrameNumber:40; - ULONGLONG reserved2:11; - ULONGLONG NoExecute:1; + ULONG64 Valid:1; + ULONG64 Write:1; + ULONG64 Owner:1; + ULONG64 WriteThrough:1; + ULONG64 CacheDisable:1; + ULONG64 Accessed:1; + ULONG64 Dirty:1; + ULONG64 LargePage:1; + ULONG64 Global:1; + ULONG64 CopyOnWrite:1; + ULONG64 Prototype:1; + ULONG64 reserved0:1; + ULONG64 PageFrameNumber:28; + ULONG64 reserved1:12; + ULONG64 SoftwareWsIndex:11; + ULONG64 NoExecute:1; } MMPTE_HARDWARE, *PMMPTE_HARDWARE; #else -#error MMPTE_HARDWARE undeclared - -#endif - -// -// Use the right PTE structure -// -#define HARDWARE_PTE HARDWARE_PTE_AMD64 -#define PHARDWARE_PTE PHARDWARE_PTE_AMD64 - -#endif +typedef struct _MMPTE_HARDWARE +{ + ULONG64 Valid:1; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG64 Dirty1:1; +#else + ULONG64 Writable:1; +#endif + ULONG64 Owner:1; + ULONG64 WriteThrough:1; + ULONG64 CacheDisable:1; + ULONG64 Accessed:1; + ULONG64 Dirty:1; + ULONG64 LargePage:1; + ULONG64 Global:1; + ULONG64 CopyOnWrite:1; + ULONG64 Prototype:1; + ULONG64 Write:1; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG64 PageFrameNumber:36; + ULONG64 reserved1:4; +#else + ULONG64 PageFrameNumber:28; + ULONG64 reserved1:12; +#endif + ULONG64 SoftwareWsIndex:11; + ULONG64 NoExecute:1; +} MMPTE_HARDWARE, *PMMPTE_HARDWARE; + +#endif + +typedef struct _MMPTE_HARDWARE_LARGEPAGE +{ + ULONG64 Valid:1; + ULONG64 Write:1; + ULONG64 Owner:1; + ULONG64 WriteThrough:1; + ULONG64 CacheDisable:1; + ULONG64 Accessed:1; + ULONG64 Dirty:1; + ULONG64 LargePage:1; + ULONG64 Global:1; + ULONG64 CopyOnWrite:1; + ULONG64 Prototype:1; + ULONG64 reserved0:1; + ULONG64 PAT:1; + ULONG64 reserved1:8; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + ULONG64 PageFrameNumber:27; + ULONG64 reserved2:16; +#else + ULONG64 PageFrameNumber:19; + ULONG64 reserved2:24; +#endif +} MMPTE_HARDWARE_LARGEPAGE, *PMMPTE_HARDWARE_LARGEPAGE; + + +#endif // !AMD64_MMTYPES_H

1 0

[tkreuzer] 35346: PE symbol dumper. It's not finished, functions don't work and the type output doesn't always look 100% correct. But it does it's job. You need dbghelp.dll and symsrv.dll from windbg.
by tkreuzer＠svn.reactos.org 14 Aug '08

14 Aug '08

Author: tkreuzer Date: Thu Aug 14 16:35:52 2008 New Revision: 35346 URL: http://svn.reactos.org/svn/reactos?rev=35346&view=rev Log: PE symbol dumper. It's not finished, functions don't work and the type output doesn't always look 100% correct. But it does it's job. You need dbghelp.dll and symsrv.dll from windbg. Added: trunk/rosapps/applications/devutils/symdump/ trunk/rosapps/applications/devutils/symdump/symdump.c (with props) trunk/rosapps/applications/devutils/symdump/symdump.rbuild (with props) Modified: trunk/rosapps/applications/devutils/directory.rbuild Modified: trunk/rosapps/applications/devutils/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/dire… ============================================================================== --- trunk/rosapps/applications/devutils/directory.rbuild [iso-8859-1] (original) +++ trunk/rosapps/applications/devutils/directory.rbuild [iso-8859-1] Thu Aug 14 16:35:52 2008 @@ -20,6 +20,10 @@ <xi:include href="syscalldump/syscalldump.rbuild" /> </directory> + <directory name="symdump"> + <xi:include href="symdump/symdump.rbuild" /> + </directory> + <directory name="vgafontedit"> <xi:include href="vgafontedit/vgafontedit.rbuild" /> </directory> Added: trunk/rosapps/applications/devutils/symdump/symdump.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/symd… ============================================================================== --- trunk/rosapps/applications/devutils/symdump/symdump.c (added) +++ trunk/rosapps/applications/devutils/symdump/symdump.c [iso-8859-1] Thu Aug 14 16:35:52 2008 @@ -1,0 +1,985 @@ +/* + * PE symbol dumper + * + * symdump.c + * + * Copyright (c) 2008 Timo Kreuzer <timo <dot> kreuzer <at> reactos <dot> org> + * + * This program is released under the terms of the GNU GPL. + * + * TODO: + * - fix GDILoObjType + * - fix UDTKind1 + * - include the correct headers for some stuff + * - fix unions like LARGE_INTEGER + */ + +#include <stdio.h> +#define _WINVER 0x501 +#include <windows.h> +#include <shlwapi.h> +#include <dbghelp.h> + +HANDLE hCurrentProcess; +BOOL g_bShowPos = 0; + +#define MAX_SYMBOL_NAME 1024 + +#define CV_CALL_NEAR_C 0x00 +#define CV_CALL_FAR_C 0x01 +#define CV_CALL_NEAR_PASCAL 0x02 +#define CV_CALL_FAR_PASCAL 0x03 +#define CV_CALL_NEAR_FAST 0x04 +#define CV_CALL_FAR_FAST 0x05 +#define CV_CALL_SKIPPED 0x06 +#define CV_CALL_NEAR_STD 0x07 +#define CV_CALL_FAR_STD 0x08 +#define CV_CALL_NEAR_SYS 0x09 +#define CV_CALL_FAR_SYS 0x0a +#define CV_CALL_THISCALL 0x0b +#define CV_CALL_MIPSCALL 0x0c +#define CV_CALL_GENERIC 0x0d +#define CV_CALL_ALPHACALL 0x0e +#define CV_CALL_PPCCALL 0x0f +#define CV_CALL_SHCALL 0x10 +#define CV_CALL_ARMCALL 0x11 +#define CV_CALL_AM33CALL 0x12 +#define CV_CALL_TRICALL 0x13 +#define CV_CALL_SH5CALL 0x14 +#define CV_CALL_M32RCALL 0x15 + +enum SymTagEnum +{ + SymTagNull, + SymTagExe, + SymTagCompiland, + SymTagCompilandDetails, + SymTagCompilandEnv, + SymTagFunction, + SymTagBlock, + SymTagData, + SymTagAnnotation, + SymTagLabel, + SymTagPublicSymbol, + SymTagUDT, + SymTagEnum, + SymTagFunctionType, + SymTagPointerType, + SymTagArrayType, + SymTagBaseType, + SymTagTypedef, + SymTagBaseClass, + SymTagFriend, + SymTagFunctionArgType, + SymTagFuncDebugStart, + SymTagFuncDebugEnd, + SymTagUsingNamespace, + SymTagVTableShape, + SymTagVTable, + SymTagCustom, + SymTagThunk, + SymTagCustomType, + SymTagManagedType, + SymTagDimension, + SymTagMax +}; + +enum +{ + UDTKind_Struct = 0, + UDTKind_Class = 1, /* ? */ + UDTKind_Union = 2, +}; + +enum BasicType +{ + btNoType = 0, + btVoid = 1, + btChar = 2, + btWChar = 3, + btInt = 6, + btUInt = 7, + btFloat = 8, + btBCD = 9, + btBool = 10, + btLong = 13, + btULong = 14, + btCurrency = 25, + btDate = 26, + btVariant = 27, + btComplex = 28, + btBit = 29, + btBSTR = 30, + btHresult = 31 +}; + +typedef struct +{ + HANDLE hProcess; + DWORD64 dwModuleBase; + LPSTR pszSymbolName; + BOOL bType; +} ENUMINFO, *PENUMINFO; + +VOID DumpType(DWORD dwTypeIndex, PENUMINFO pei, INT indent, BOOL bMembers); + +CHAR *SymTagString[] = +{ + "SymTagNull", + "SymTagExe", + "SymTagCompiland", + "SymTagCompilandDetails", + "SymTagCompilandEnv", + "SymTagFunction", + "SymTagBlock", + "SymTagData", + "SymTagAnnotation", + "SymTagLabel", + "SymTagPublicSymbol", + "SymTagUDT", + "SymTagEnum", + "SymTagFunctionType", + "SymTagPointerType", + "SymTagArrayType", + "SymTagBaseType", + "SymTagTypedef", + "SymTagBaseClass", + "SymTagFriend", + "SymTagFunctionArgType", + "SymTagFuncDebugStart", + "SymTagFuncDebugEnd", + "SymTagUsingNamespace", + "SymTagVTableShape", + "SymTagVTable", + "SymTagCustom", + "SymTagThunk", + "SymTagCustomType", + "SymTagManagedType", + "SymTagDimension", + "SymTagMax" +}; + +void +IndentPrint(INT ind) +{ + INT i; + for (i = 0; i < ind; i++) + { + printf(" "); + } +} + +#define printfi \ + IndentPrint(indent); printf + +VOID +PrintUsage() +{ + printf("Syntax:\n\n"); + printf("dumpsym <file> [-sp=<symbolpath>] [-p] [<symname>]\n\n"); + printf("<file> The PE file you want to dump the symbols of\n"); + printf("-sp=<symbolpath> Path to your symbol files.\n"); + printf(" Default is MS symbol server.\n"); + printf("-p Enable struct positions.\n"); + printf("<symname> A name of a Symbol, you want to dump\n"); + printf(" Default is all symbols.\n"); + printf("\n"); +} + +BOOL InitDbgHelp(HANDLE hProcess, LPSTR pszSymbolPath) +{ + if (!SymInitialize(hProcess, 0, FALSE)) + return FALSE; + + SymSetOptions(SymGetOptions() | SYMOPT_ALLOW_ABSOLUTE_SYMBOLS); + SymSetOptions(SymGetOptions() & (~SYMOPT_DEFERRED_LOADS)); + SymSetSearchPath(hProcess, pszSymbolPath); + return TRUE; +} + +VOID +DumpBaseType(DWORD dwTypeIndex, PENUMINFO pei, INT indent) +{ + ULONG64 ulSize; + DWORD dwBaseType; + + SymGetTypeInfo(pei->hProcess, pei->dwModuleBase, dwTypeIndex, TI_GET_LENGTH, &ulSize); + SymGetTypeInfo(pei->hProcess, pei->dwModuleBase, dwTypeIndex, TI_GET_BASETYPE, &dwBaseType); + + switch (dwBaseType) + { + case btVoid: + printfi("VOID"); + return; + case btChar: + printfi("CHAR"); + return; + case btWChar: + printfi("WCHAR"); + return; + case btInt: + switch (ulSize) + { + case 1: + printfi("CHAR"); + return; + case 2: + printfi("SHORT"); + return; + case 4: + printfi("INT"); + return; + case 8: + printfi("INT64"); + return; + default: + printfi("INT%ld", (ULONG)ulSize * 8); + return; + } + case btUInt: + switch (ulSize) + { + case 1: + printfi("UCHAR"); + return; + case 2: + printfi("USHORT"); + return; + case 4: + printfi("UINT"); + return; + case 8: + printfi("UINT64"); + return; + default: + printfi("UINT%ld", (ULONG)ulSize * 8); + return; + } + case btFloat: + switch (ulSize) + { + case 4: + printfi("FLOAT"); + return; + case 8: + printfi("DOUBLE"); + return; + default: + printfi("FLOAT%ld", (ULONG)ulSize * 8); + return; + } + case btBCD: + printfi("BCD%ld", (ULONG)ulSize * 8); + return; + case btBool: + switch (ulSize) + { + case 1: + printfi("BOOLEAN"); + return; + case 4: + printfi("BOOL"); + return; + default: + printfi("BOOL%ld", (ULONG)ulSize * 8); + return; + } + case btLong: + switch (ulSize) + { + case 1: + printfi("CHAR"); + return; + case 2: + printfi("SHORT"); + return; + case 4: + printfi("LONG"); + return; + case 8: + printfi("LONGLONG"); + return; + default: + printfi("LONG%ld", (ULONG)ulSize * 8); + return; + } + case btULong: + switch (ulSize) + { + case 1: + printfi("UCHAR"); + return; + case 2: + printfi("USHORT"); + return; + case 4: + printfi("ULONG"); + return; + case 8: + printfi("ULONGLONG"); + return; + default: + printfi("ULONG%ld", (ULONG)ulSize * 8); + return; + } + case btCurrency: + case btDate: + case btVariant: + case btComplex: + case btBit: + case btBSTR: + printfi("UNSUP_%ld_%ld", dwBaseType, (ULONG)ulSize); + return; + case btHresult: + if (ulSize == 4) + { + printfi("HRESULT"); + return; + } + printfi("HRESULT%ld", (ULONG)ulSize); + return; + } + + printfi("UNKNBASETYPE"); +} + +VOID +DumpArray(DWORD dwTypeIndex, PENUMINFO pei, INT indent) +{ + DWORD dwTypeId; + + SymGetTypeInfo(pei->hProcess, pei->dwModuleBase, dwTypeIndex, TI_GET_TYPE, &dwTypeId); + DumpType(dwTypeId, pei, indent, FALSE); +} + +VOID +DumpPointer(DWORD dwTypeIndex, PENUMINFO pei, INT indent) +{ + DWORD dwRefTypeId; + DWORD dwTag = 0; + ULONG64 ulSize; + DWORD dwBaseType; + + SymGetTypeInfo(pei->hProcess, pei->dwModuleBase, dwTypeIndex, TI_GET_TYPE, &dwRefTypeId); + SymGetTypeInfo(pei->hProcess, pei->dwModuleBase, dwRefTypeId, TI_GET_BASETYPE, &dwBaseType); + SymGetTypeInfo(pei->hProcess, pei->dwModuleBase, dwRefTypeId, TI_GET_LENGTH, &ulSize); + SymGetTypeInfo(pei->hProcess, pei->dwModuleBase, dwRefTypeId, TI_GET_SYMTAG, &dwTag); + + if (dwTag == SymTagFunctionType) + { + printfi("PPROC"); + return; + } + + switch (dwBaseType) + { + case btVoid: + switch (ulSize) + { + case 0: + printfi("PVOID"); + return; + } + break; + + case btChar: + switch (ulSize) + { + case 1: + printfi("PCHAR"); + return; + } + break; + case btWChar: + switch (ulSize) + { + case 2: + printfi("PWCHAR"); + return; + } + break; + case btInt: + switch (ulSize) + { + case 4: + printfi("PINT"); + return; + } + break; + case btUInt: + switch (ulSize) + { + case 4: + printfi("PUINT"); + return; + } + break; + case btFloat: + switch (ulSize) + { + case 4: + printfi("PFLOAT"); + return; + case 8: + printfi("PDOUBLE"); + return; + } + break; + case btBCD: + break; + case btBool: + switch (ulSize) + { + case 1: + printfi("PBOOLEAN"); + return; + case 4: + printfi("PBOOL"); + return; + } + break; + case btLong: + switch (ulSize) + { + case 4: + printfi("PLONG"); + return; + case 8: + printfi("PLONGLONG"); + return; + } + break; + case btULong: + switch (ulSize) + { + case 4: + printfi("PULONG"); + return; + case 8: + printfi("PULONGLONG"); + return; + } + break; + case btCurrency: + case btDate: + case btVariant: + case btComplex: + case btBit: + case btBSTR: + case btHresult: + break; + } + + DumpType(dwRefTypeId, pei, indent, FALSE); + printf("*"); +} + +VOID +PrintVariant(VARIANT *v) +{ +// printf("<vt%d>", v->n1.n2.vt); + switch (v->n1.n2.vt) + { + case VT_I1: + printf("%d", (INT)v->n1.n2.n3.cVal); + break; + case VT_UI1: + printf("0x%x", (UINT)v->n1.n2.n3.cVal); + break; + case VT_I2: + printf("%d", (UINT)v->n1.n2.n3.iVal); + break; + case VT_UI2: + printf("0x%x", (UINT)v->n1.n2.n3.iVal); + break; + case VT_INT: + case VT_I4: + printf("%d", (UINT)v->n1.n2.n3.lVal); + break; + case VT_UINT: + case VT_UI4: + printf("0x%x", (UINT)v->n1.n2.n3.lVal); + break; + } +} + +BOOL +IsUnnamed(WCHAR *pszName) +{ + if ((StrStrW(pszName, L"__unnamed") != NULL) || + (StrStrW(pszName, L"<unnamed-tag>") != NULL)) + { + return TRUE; + } + return FALSE; +} + +VOID +DumpEnum(DWORD dwTypeIndex, PENUMINFO pei, INT indent, BOOL bMembers) +{ + DWORD64 dwModuleBase = pei->dwModuleBase; + HANDLE hProcess = pei->hProcess; + INT i; + DWORD dwUDTKind; + WCHAR *pszName, *pszNameX; + struct + { + TI_FINDCHILDREN_PARAMS tfp; + ULONG TypeIds[200]; + } tfpex; + VARIANT v; + + SymGetTypeInfo(hProcess, dwModuleBase, dwTypeIndex, TI_GET_SYMNAME, &pszNameX); + SymGetTypeInfo(hProcess, dwModuleBase, dwTypeIndex, TI_GET_UDTKIND, &dwUDTKind); + pszName = pszNameX; + if (IsUnnamed(pszName)) + { + if (bMembers) + { + LocalFree(pszNameX); + return; + } + bMembers = TRUE; + pszName = L""; + } + printfi("enum %ls", pszName); + LocalFree(pszNameX); + + if (bMembers) + { + printf(" /* %03x */", 0); + printfi("\n{\n"); + + /* Get the children */ + SymGetTypeInfo(hProcess, dwModuleBase, dwTypeIndex, TI_GET_CHILDRENCOUNT, &tfpex.tfp.Count); + + tfpex.tfp.Start = 0; + SymGetTypeInfo(hProcess, dwModuleBase, dwTypeIndex, TI_FINDCHILDREN, &tfpex.tfp); + + for (i = 0; i < tfpex.tfp.Count; i++) + { + pszName = L""; + + SymGetTypeInfo(hProcess, dwModuleBase, tfpex.tfp.ChildId[i], TI_GET_SYMNAME, &pszName); + SymGetTypeInfo(hProcess, dwModuleBase, tfpex.tfp.ChildId[i], TI_GET_VALUE, &v); + + indent++; + printfi("%ls = ", pszName); + PrintVariant(&v); + printf(",\n"); + indent--; + + LocalFree(pszName); + } + printfi("}"); + } +} + +VOID +DumpUDT(DWORD dwTypeIndex, PENUMINFO pei, INT indent, BOOL bMembers) +{ + DWORD64 dwModuleBase = pei->dwModuleBase; + HANDLE hProcess = pei->hProcess; + INT i; + DWORD dwUDTKind; + WCHAR *pszName, *pszNameX; + struct + { + TI_FINDCHILDREN_PARAMS tfp; + ULONG TypeIds[200]; + } tfpex; + + DWORD dwDataKind; + DWORD dwTypeId; + DWORD dwCount; + WCHAR *pszTypeName; + + SymGetTypeInfo(hProcess, dwModuleBase, dwTypeIndex, TI_GET_SYMNAME, &pszNameX); + SymGetTypeInfo(hProcess, dwModuleBase, dwTypeIndex, TI_GET_UDTKIND, &dwUDTKind); + + pszName = pszNameX; + if (IsUnnamed(pszName)) + { + if (bMembers) + { + LocalFree(pszNameX); + return; + } + bMembers = TRUE; + pszName = L""; + } + if (dwUDTKind == UDTKind_Struct) + { + printfi("struct %ls", pszName); + } + else if (dwUDTKind == UDTKind_Union) + { + printfi("union %ls", pszName); + } + else + { + printfi("UTDKind%ld %ls", dwUDTKind, pszName); + } + LocalFree(pszNameX); + + if (bMembers) + { + ULONG64 ulLength; + + printf("\n"); + printfi("{\n"); + + /* Get the children */ + SymGetTypeInfo(hProcess, dwModuleBase, dwTypeIndex, TI_GET_CHILDRENCOUNT, &tfpex.tfp.Count); + + tfpex.tfp.Start = 0; + SymGetTypeInfo(hProcess, dwModuleBase, dwTypeIndex, TI_FINDCHILDREN, &tfpex.tfp); + + for (i = 0; i < tfpex.tfp.Count; i++) + { + DWORD dwChildTag; + DWORD dwOffset; + + pszName = L""; + pszTypeName = L""; + + SymGetTypeInfo(hProcess, dwModuleBase, tfpex.tfp.ChildId[i], TI_GET_SYMNAME, &pszName); + SymGetTypeInfo(hProcess, dwModuleBase, tfpex.tfp.ChildId[i], TI_GET_DATAKIND, &dwDataKind); + SymGetTypeInfo(hProcess, dwModuleBase, tfpex.tfp.ChildId[i], TI_GET_TYPE, &dwTypeId); + SymGetTypeInfo(hProcess, dwModuleBase, tfpex.tfp.ChildId[i], TI_GET_OFFSET, &dwOffset); + SymGetTypeInfo(hProcess, dwModuleBase, dwTypeId, TI_GET_SYMTAG, &dwChildTag); + SymGetTypeInfo(hProcess, dwModuleBase, dwTypeId, TI_GET_LENGTH, &ulLength); + + printf(" /* %03lx */", dwOffset); + DumpType(dwTypeId, pei, indent + 1, FALSE); + printf(" %ls", pszName); + if (dwChildTag == SymTagArrayType) + { + SymGetTypeInfo(hProcess, dwModuleBase, dwTypeId, TI_GET_COUNT, &dwCount); + printf("[%ld]", dwCount); + } + else + { + DWORD dwCurrentBitPos; + DWORD dwNextBitPos; + + SymGetTypeInfo(hProcess, dwModuleBase, tfpex.tfp.ChildId[i], TI_GET_BITPOSITION, &dwCurrentBitPos); + if (i < tfpex.tfp.Count - 1) + { + SymGetTypeInfo(hProcess, dwModuleBase, tfpex.tfp.ChildId[i+1], TI_GET_BITPOSITION, &dwNextBitPos); + } + else + { + dwNextBitPos = 0; + } + + if (dwNextBitPos == 0 && dwCurrentBitPos != 0) + { + dwNextBitPos = ulLength * 8; + } + + if (dwNextBitPos != dwCurrentBitPos) + { + printf(":%ld", dwNextBitPos - dwCurrentBitPos); + } + } + printf(";\n"); + LocalFree(pszName); + } + printfi("}"); + } +} + +VOID +DumpType(DWORD dwTypeIndex, PENUMINFO pei, INT indent, BOOL bMembers) +{ + HANDLE hProcess = pei->hProcess; + DWORD64 dwModuleBase = pei->dwModuleBase; + DWORD dwTag = 0; + + SymGetTypeInfo(hProcess, dwModuleBase, dwTypeIndex, TI_GET_SYMTAG, &dwTag); + + switch (dwTag) + { + case SymTagEnum: + DumpEnum(dwTypeIndex, pei, indent, bMembers); + break; + + case SymTagUDT: + DumpUDT(dwTypeIndex, pei, indent, bMembers); + break; + + case SymTagPointerType: + DumpPointer(dwTypeIndex, pei, indent); + break; + + case SymTagBaseType: + DumpBaseType(dwTypeIndex, pei, indent); + break; + + case SymTagArrayType: + DumpArray(dwTypeIndex, pei, indent); + break; + + case SymTagFunctionType: + printfi("function"); + break; + + default: + printfi("typeTag%ld", dwTag); + break; + } + +} + + +VOID +DumpCV(DWORD dwTypeIndex, PENUMINFO pei) +{ + DWORD cv = 0x20; + + SymGetTypeInfo(pei->hProcess, pei->dwModuleBase, dwTypeIndex, TI_GET_CALLING_CONVENTION, &cv); + switch (cv) + { + case CV_CALL_NEAR_C: + printf("CDECL"); + return; + case CV_CALL_FAR_C: + printf("FAR CDECL"); + return; + case CV_CALL_NEAR_PASCAL: + printf("PASCAL"); + return; + case CV_CALL_FAR_PASCAL: + printf("FAR PASCAL"); + return; + case CV_CALL_NEAR_FAST: + printf("FASTCALL"); + return; + case CV_CALL_FAR_FAST: + printf("FAR FASTCALL"); + return; + case CV_CALL_SKIPPED: + printf("SKIPPED"); + return; + case CV_CALL_NEAR_STD: + printf("STDCALL"); + return; + case CV_CALL_FAR_STD: + printf("FAR STDCALL"); + return; + case CV_CALL_NEAR_SYS: + case CV_CALL_FAR_SYS: + case CV_CALL_THISCALL: + printf("THISCALL"); + return; + case CV_CALL_MIPSCALL: + printf("MIPSCALL"); + return; + case CV_CALL_GENERIC: + case CV_CALL_ALPHACALL: + case CV_CALL_PPCCALL: + case CV_CALL_SHCALL: + case CV_CALL_ARMCALL: + case CV_CALL_AM33CALL: + case CV_CALL_TRICALL: + case CV_CALL_SH5CALL: + case CV_CALL_M32RCALL: + default: + printf("UNKNOWNCV"); + } + +} + +BOOL CALLBACK +EnumParamsProc( + PSYMBOL_INFO pSymInfo, + ULONG SymbolSize, + PVOID UserContext) +{ + printf("x, "); + (*(INT*)UserContext)++; + return TRUE; +} + +VOID +DumpParams(PSYMBOL_INFO pSymInfo, PENUMINFO pei) +{ + IMAGEHLP_STACK_FRAME sf; + BOOL bRet; + + sf.InstructionOffset = pSymInfo->Address; + + printf("("); + bRet = SymSetContext(pei->hProcess, &sf, 0); + + if (!bRet) + { + printf("\nError: SymSetContext() failed. Error code: %lu \n", GetLastError()); + return; + } + printf("Address == 0x%x, ReturnOffset = 0x%x", (UINT)pSymInfo->Address, (UINT)sf.ReturnOffset); + + // Enumerate local variables + + INT NumLocals = 0; // the number of local variables found + + bRet = SymEnumSymbols(pei->hProcess, 0, 0, EnumParamsProc, &NumLocals); + + if (!bRet) + { +// printf("Error: SymEnumSymbols() failed. Error code: %lu \n", GetLastError()); + printf("?)"); + return; + } + + if (NumLocals == 0) + { +// printf("The function does not have parameters and local variables.\n"); + printf("void)"); + } + + printf(")"); +} + +VOID +DumpFunction(PSYMBOL_INFO pSymInfo, PENUMINFO pei) +{ + DWORD dwTypeId; + +//printf("Name=%s, Size=%ld, TypeId=0x%ld\n", pSymInfo->Name, pSymInfo->Size, pSymInfo->TypeIndex); + + SymGetTypeInfo(pei->hProcess, pei->dwModuleBase, pSymInfo->TypeIndex, TI_GET_TYPEID, &dwTypeId); + +// DumpCV(pSymInfo->TypeIndex, pei); +// printf("\n"); +// DumpType(pSymInfo->TypeIndex, pei, 0, FALSE); + printf("%s", pSymInfo->Name); + DumpParams(pSymInfo, pei); +} + +BOOL CALLBACK +EnumSymbolsProc( + PSYMBOL_INFO pSymInfo, + ULONG SymbolSize, + PVOID UserContext) +{ + PENUMINFO pei = (PENUMINFO)UserContext; + + if ((pei->pszSymbolName == NULL) || + (strstr(pSymInfo->Name, pei->pszSymbolName) != 0)) + { + if (pei->bType) + { + DumpType(pSymInfo->TypeIndex, pei, 0, TRUE); + printf("\n\n"); + } + else + { + //if (pSymInfo->Flags & SYMFLAG_FUNCTION) + { +// DumpFunction(pSymInfo, pei); +// printf("\n\n"); + } + } + } + return TRUE; +} + +int main(int argc, char* argv[]) +{ + HANDLE hProcess; + CHAR szFullFileName[MAX_PATH+1]; + DWORD64 dwModuleBase; + BOOL bRet; + LPSTR pszSymbolPath, pszSymbolName; + INT i; + ENUMINFO enuminfo; + + printf("PE symbol dumper\n"); + printf("Copyright (c) Timo Kreuzer 2008\n\n"); + + if (argc < 2) + { + PrintUsage(); + return 0; + } + + /* Get the full path name of the PE file from first argument */ + GetFullPathName(argv[1], MAX_PATH, szFullFileName, NULL); + + /* Default Symbol Name (all) */ + pszSymbolName = NULL; + + /* Default to ms symbol server */ + pszSymbolPath = "srv**symbols*http://msdl.microsoft.com/download/symbols"; + + /* Check other command line arguments */ + for (i = 2; i < argc; i++) + { + if (*argv[i] == '-') + { + if (strncmp(argv[i], "-sp=", 4) == 0) + { + pszSymbolPath = argv[i] + 4; + } + else if (strcmp(argv[i], "-p") == 0) + { + g_bShowPos = 1; + } + else + { + printf("Invalid argument: %s\n", argv[i]); + PrintUsage(); + return 0; + } + } + else + { + pszSymbolName = argv[i]; + } + } + + hProcess = GetCurrentProcess(); + + printf("Trying to get symbols from: %s\n", pszSymbolPath); + + if (!InitDbgHelp(hProcess, pszSymbolPath)) + { + printf("SymInitialize() failed\n"); + goto cleanup; + } + + printf("Loading symbols for %s, please wait...\n", szFullFileName); + dwModuleBase = SymLoadModule64(hProcess, 0, szFullFileName, 0, 0, 0); + if (dwModuleBase == 0) + { + printf("SymLoadModule64() failed: %ld\n", GetLastError()); + goto cleanup; + } + + printf("\nSymbols:\n"); + enuminfo.hProcess = hProcess; + enuminfo.pszSymbolName = pszSymbolName; + enuminfo.bType = FALSE; + SetLastError(ERROR_SUCCESS); + bRet = SymEnumSymbols(hProcess, dwModuleBase, NULL, EnumSymbolsProc, &enuminfo); + if (!bRet) + { + printf("SymEnumSymbols failed: %ld\n", GetLastError()); + } + + printf("\nTypes:\n"); + enuminfo.bType = TRUE; + enuminfo.dwModuleBase = dwModuleBase; + SetLastError(ERROR_SUCCESS); + bRet = SymEnumTypes(hProcess, dwModuleBase, EnumSymbolsProc, &enuminfo); + if (!bRet) + { + printf("SymEnumTypes failed: %ld\n", GetLastError()); + } + +cleanup: + + return 0; +} Propchange: trunk/rosapps/applications/devutils/symdump/symdump.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/applications/devutils/symdump/symdump.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/devutils/symd… ============================================================================== --- trunk/rosapps/applications/devutils/symdump/symdump.rbuild (added) +++ trunk/rosapps/applications/devutils/symdump/symdump.rbuild [iso-8859-1] Thu Aug 14 16:35:52 2008 @@ -1,0 +1,9 @@ +<module name="symdump" type="win32cui" installbase="system32" installname="symdump.exe"> + <include base="gdihv">.</include> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>dbghelp</library> + <library>shlwapi</library> + <library>kernel32</library> + <file>symdump.c</file> +</module> Propchange: trunk/rosapps/applications/devutils/symdump/symdump.rbuild ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[sginsberg] 35345: - Header cleanup - Rename ObInit to ObInitSystem - Add missing KPCR_PRCB_PRCB_LOCK offset to the NDK
by sginsberg＠svn.reactos.org 14 Aug '08

14 Aug '08

Author: sginsberg Date: Thu Aug 14 14:30:32 2008 New Revision: 35345 URL: http://svn.reactos.org/svn/reactos?rev=35345&view=rev Log: - Header cleanup - Rename ObInit to ObInitSystem - Add missing KPCR_PRCB_PRCB_LOCK offset to the NDK Modified: trunk/reactos/include/ndk/asm.h trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/include/internal/cm.h trunk/reactos/ntoskrnl/include/internal/kd.h trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h trunk/reactos/ntoskrnl/ob/obinit.c Modified: trunk/reactos/include/ndk/asm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/asm.h?rev=3534… ============================================================================== --- trunk/reactos/include/ndk/asm.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/asm.h [iso-8859-1] Thu Aug 14 14:30:32 2008 @@ -191,6 +191,7 @@ #define KPCR_PROCESSOR_NUMBER 0x130 #define KPCR_PRCB_SET_MEMBER 0x134 #define KPCR_PRCB_CPU_TYPE 0x138 +#define KPCR_PRCB_PRCB_LOCK 0xA7C #define KPCR_NPX_THREAD 0x640 #define KPCR_DR6 0x428 #define KPCR_DR7 0x42C Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=353… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Thu Aug 14 14:30:32 2008 @@ -1203,7 +1203,7 @@ #endif /* Create the Basic Object Manager Types to allow new Object Types */ - if (!ObInit()) KEBUGCHECK(OBJECT_INITIALIZATION_FAILED); + if (!ObInitSystem()) KEBUGCHECK(OBJECT_INITIALIZATION_FAILED); /* Load basic Security for other Managers */ if (!SeInit()) KEBUGCHECK(SECURITY_INITIALIZATION_FAILED); @@ -1516,7 +1516,7 @@ InbvUpdateProgressBar(5); /* Call OB initialization again */ - if (!ObInit()) KeBugCheck(OBJECT1_INITIALIZATION_FAILED); + if (!ObInitSystem()) KeBugCheck(OBJECT1_INITIALIZATION_FAILED); /* Initialize Basic System Objects and Worker Threads */ if (!ExInitSystem()) KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, 0, 0, 1, 0); Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Thu Aug 14 14:30:32 2008 @@ -519,6 +519,21 @@ // NTSTATUS CmiCallRegisteredCallbacks(IN REG_NOTIFY_CLASS Argument1, IN PVOID Argument2); /////////////////////////////////////////////////////////////////////////////// + +// +// Startup and Shutdown Functions +// +BOOLEAN +NTAPI +CmInitSystem1( + VOID +); + +VOID +NTAPI +CmShutdownSystem( + VOID +); // // Mapped View Hive Functions Modified: trunk/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/kd.h [iso-8859-1] Thu Aug 14 14:30:32 2008 @@ -182,6 +182,13 @@ ); /* INIT ROUTINES *************************************************************/ + +BOOLEAN +NTAPI +KdInitSystem( + ULONG Reserved, + PLOADER_PARAMETER_BLOCK LoaderBlock +); VOID STDCALL Modified: trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/ntoskrnl.h [iso-8859-1] Thu Aug 14 14:30:32 2008 @@ -37,6 +37,8 @@ #define InterlockedCompareExchange64 _InterlockedCompareExchange64 #define InterlockedExchange _InterlockedExchange #define InterlockedExchangeAdd _InterlockedExchangeAdd +#define InterlockedOr _InterlockedOr +#define InterlockedAnd _InterlockedAnd #include "ke.h" #include "i386/mm.h" @@ -71,84 +73,6 @@ #include "hal.h" #include "arch/intrin_i.h" -#include <pshpack1.h> -/* - * Defines a descriptor as it appears in the processor tables - */ -typedef struct __DESCRIPTOR -{ - ULONG a; - ULONG b; -} IDT_DESCRIPTOR, GDT_DESCRIPTOR; - -#include <poppack.h> -//extern GDT_DESCRIPTOR KiGdt[256]; - -/* - * Initalization functions (called once by main()) - */ -BOOLEAN NTAPI ObInit(VOID); -BOOLEAN NTAPI CmInitSystem1(VOID); -VOID NTAPI CmShutdownSystem(VOID); -BOOLEAN NTAPI KdInitSystem(ULONG Reserved, PLOADER_PARAMETER_BLOCK LoaderBlock); - -/* FIXME - RtlpCreateUnicodeString is obsolete and should be removed ASAP! */ -BOOLEAN FASTCALL -RtlpCreateUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PCWSTR Source, - IN POOL_TYPE PoolType); - -VOID -NTAPI -RtlpLogException(IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT ContextRecord, - IN PVOID ContextData, - IN ULONG Size); - -/* FIXME: Interlocked functions that need to be made into a public header */ -#ifdef __GNUC__ -FORCEINLINE -LONG -InterlockedAnd(IN OUT LONG volatile *Target, - IN LONG Set) -{ - LONG i; - LONG j; - - j = *Target; - do { - i = j; - j = InterlockedCompareExchange((PLONG)Target, - i & Set, - i); - - } while (i != j); - - return j; -} - -FORCEINLINE -LONG -InterlockedOr(IN OUT LONG volatile *Target, - IN LONG Set) -{ - LONG i; - LONG j; - - j = *Target; - do { - i = j; - j = InterlockedCompareExchange((PLONG)Target, - i | Set, - i); - - } while (i != j); - - return j; -} -#endif - /* * generic information class probing code */ @@ -324,8 +248,8 @@ C_ASSERT(FIELD_OFFSET(KTHREAD, CallbackStack) == KTHREAD_CALLBACK_STACK); C_ASSERT(FIELD_OFFSET(KTHREAD, ApcState.Process) == KTHREAD_APCSTATE_PROCESS); C_ASSERT(FIELD_OFFSET(KPROCESS, DirectoryTableBase) == KPROCESS_DIRECTORY_TABLE_BASE); -//C_ASSERT(FIELD_OFFSET(KPCR, Tib.ExceptionList) == KPCR_EXCEPTION_LIST); -//C_ASSERT(FIELD_OFFSET(KPCR, Self) == KPCR_SELF); +C_ASSERT(FIELD_OFFSET(KPCR, Tib.ExceptionList) == KPCR_EXCEPTION_LIST); +C_ASSERT(FIELD_OFFSET(KPCR, Self) == KPCR_SELF); #ifdef _M_IX86 C_ASSERT(FIELD_OFFSET(KPCR, IRR) == KPCR_IRR); C_ASSERT(FIELD_OFFSET(KPCR, IDR) == KPCR_IDR); @@ -335,7 +259,7 @@ C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, NpxThread) == KPCR_NPX_THREAD); C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) == KPCR_PRCB_DATA); C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, KeSystemCalls) == KPCR_SYSTEM_CALLS); -C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, DpcData) + /*FIELD_OFFSET(KDPC_DATA, DpcQueuDepth)*/12 == KPCR_PRCB_DPC_QUEUE_DEPTH); +C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, DpcData) + FIELD_OFFSET(KDPC_DATA, DpcQueueDepth) == KPCR_PRCB_DPC_QUEUE_DEPTH); C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, DpcData) + 16 == KPCR_PRCB_DPC_COUNT); C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, DpcStack) == KPCR_PRCB_DPC_STACK); C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, TimerRequest) == KPCR_PRCB_TIMER_REQUEST); @@ -348,7 +272,7 @@ C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, QuantumEnd) == KPCR_PRCB_QUANTUM_END); C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, DeferredReadyListHead) == KPCR_PRCB_DEFERRED_READY_LIST_HEAD); C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, PowerState) == KPCR_PRCB_POWER_STATE_IDLE_FUNCTION); -//C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, PrcbLock) == KPCR_PRCB_PRCB_LOCK); +C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, PrcbLock) == KPCR_PRCB_PRCB_LOCK); C_ASSERT(FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, DpcStack) == KPCR_PRCB_DPC_STACK); C_ASSERT(sizeof(FX_SAVE_AREA) == SIZEOF_FX_SAVE_AREA); Modified: trunk/reactos/ntoskrnl/ob/obinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obinit.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obinit.c [iso-8859-1] Thu Aug 14 14:30:32 2008 @@ -124,7 +124,7 @@ BOOLEAN INIT_FUNCTION NTAPI -ObInit(VOID) +ObInitSystem(VOID) { OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING Name;

1 0

[dchapyshev] 35344: - Update Russian translation
by dchapyshev＠svn.reactos.org 14 Aug '08

14 Aug '08

Author: dchapyshev Date: Thu Aug 14 12:57:50 2008 New Revision: 35344 URL: http://svn.reactos.org/svn/reactos?rev=35344&view=rev Log: - Update Russian translation Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Thu Aug 14 12:57:50 2008 @@ -373,59 +373,59 @@ PUSHBUTTON "Îòìåíà", 14006, 206, 236, 50, 14 END -FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 256 +FOLDER_OPTIONS_GENERAL_DLG DIALOGEX 0, 0, 264, 238 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Îáùèå" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Çàäà÷è", -1, 7, 10, 249, 45 //ICON -AUTORADIOBUTTON "Îòîáðà&æåíèå ñïèñêà òèïè÷íûõ çàäà÷ â ïàïêàõ", 14001, 40, 25, 120, 10, WS_TABSTOP -AUTORADIOBUTTON "Èñïîëüçîâàòü îáû&÷íûå ïàïêè ReactOS", 14002, 40, 37, 120, 10, WS_TABSTOP +AUTORADIOBUTTON "Îòîáðà&æåíèå ñïèñêà òèïè÷íûõ çàäà÷ â ïàïêàõ", 14001, 40, 24, 185, 10, WS_TABSTOP +AUTORADIOBUTTON "Èñïîëüçîâàòü îáû&÷íûå ïàïêè ReactOS", 14002, 40, 36, 185, 10, WS_TABSTOP GROUPBOX "Îáçîð ïàïîê", -1, 7, 60, 249, 45, WS_TABSTOP //ICON -AUTORADIOBUTTON "&Îòêðûâàòü ïàïêè â îäíîì è òîì æå îêíå", 14004, 40, 70, 140, 10, WS_TABSTOP -AUTORADIOBUTTON "Î&òêðûâàòü êàæäóþ ïàïêó â îòäåëüíîì îêíå", 14005, 40, 82, 140, 10, WS_TABSTOP +AUTORADIOBUTTON "&Îòêðûâàòü ïàïêè â îäíîì è òîì æå îêíå", 14004, 40, 75, 185, 10, WS_TABSTOP +AUTORADIOBUTTON "Î&òêðûâàòü êàæäóþ ïàïêó â îòäåëüíîì îêíå", 14005, 40, 87, 185, 10, WS_TABSTOP GROUPBOX "Ùåë÷êè ìûøüþ", -1, 7, 110, 249, 60 //ICON -AUTORADIOBUTTON "Îò&êðûâàòü îäíèì ùåë÷êîì, âûäåëÿòü óêàçàòåëåì", 14007, 40, 120, 170, 10, WS_TABSTOP +AUTORADIOBUTTON "Îò&êðûâàòü îäíèì ùåë÷êîì, âûäåëÿòü óêàçàòåëåì", 14007, 40, 120, 200, 10, WS_TABSTOP AUTORADIOBUTTON "Ïîä÷åðêèâ&àòü ïîäïèñè çíà÷êîâ", 14008, 50, 132, 170, 10, WS_TABSTOP -AUTORADIOBUTTON "Ïîä÷åðêèâàòü ïîäïèñè ç&íà÷êîâ ïðè íàâåäåíèè", 14009, 50, 144, 170, 10, WS_TABSTOP -AUTORADIOBUTTON "Îòêð&ûâàòü äâîéíûì, à âûäåëÿòü îäíèì ùåë÷êîì", 14010, 40, 156, 170, 10, WS_TABSTOP -PUSHBUTTON "&Âîññòàíîâèòü óìîë÷àíèÿ", 14011, 180, 180, 60, 14, WS_TABSTOP -END - -FOLDER_OPTIONS_VIEW_DLG DIALOGEX 0, 0, 264, 256 +AUTORADIOBUTTON "Ïîä÷åðêèâàòü ïîäïèñè ç&íà÷êîâ ïðè íàâåäåíèè", 14009, 50, 144, 185, 10, WS_TABSTOP +AUTORADIOBUTTON "Îòêð&ûâàòü äâîéíûì, à âûäåëÿòü îäíèì ùåë÷êîì", 14010, 40, 156, 195, 10, WS_TABSTOP +PUSHBUTTON "&Âîññòàíîâèòü óìîë÷àíèÿ", 14011, 148, 180, 104, 14, WS_TABSTOP +END + +FOLDER_OPTIONS_VIEW_DLG DIALOGEX 0, 0, 264, 238 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Âèä" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN GROUPBOX "Ïðåäñòàâëåíèå ïàïîê", -1, 7, 10, 249, 60 //ICON -LTEXT "Ìîæíî ïðèìåíèòü âèä, âûáðàííûé äëÿ ýòîé ïàïêè, íàïðèìåð, ""Òàáëèöà"" èëè ""Ïëèòêà"", êî âñåì ïàïêàì.", -1, 60, 20, 180, 20 -PUSHBUTTON "&Ïðèìåíèòü êî âñåì ïàïêàì", 14001, 60, 50, 80, 14, WS_TABSTOP -PUSHBUTTON "&Ñáðîñ äëÿ âñåõ ïàïîê", 14002, 150, 50, 80, 14, WS_TABSTOP -LTEXT "Äîïîëíèòåëüíûå ïàðàìåòðû:", -1, 7, 80, 100, 10 +LTEXT "Ìîæíî ïðèìåíèòü âèä, âûáðàííûé äëÿ ýòîé ïàïêè, íàïðèìåð, ""Òàáëèöà"" èëè ""Ïëèòêà"", êî âñåì ïàïêàì.", -1, 60, 24, 180, 20 +PUSHBUTTON "&Ïðèìåíèòü êî âñåì ïàïêàì", 14001, 60, 50, 100, 14, WS_TABSTOP +PUSHBUTTON "&Ñáðîñ äëÿ âñåõ ïàïîê", 14002, 164, 50, 80, 14, WS_TABSTOP +LTEXT "Äîïîëíèòåëüíûå ïàðàìåòðû:", -1, 9, 78, 120, 10 CONTROL "", 14003, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 90, 249, 120 -PUSHBUTTON "&Âîññòàíîâèòü óìîë÷àíèÿ", 14004, 180, 210, 80, 14, WS_TABSTOP -END - -FOLDER_OPTIONS_FILETYPES_DLG DIALOGEX 0, 0, 264, 256 +PUSHBUTTON "&Âîññòàíîâèòü óìîë÷àíèÿ", 14004, 156, 216, 101, 14, WS_TABSTOP +END + +FOLDER_OPTIONS_FILETYPES_DLG DIALOGEX 0, 0, 264, 238 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION CAPTION "Òèïû ôàéëîâ" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN -LTEXT "&Çàðåãèñòðèðîâàííûå òèïû ôàéëîâ:", -1, 7, 10, 70, 10 +LTEXT "&Çàðåãèñòðèðîâàííûå òèïû ôàéëîâ:", -1, 9, 7, 133, 10 CONTROL "", 14000, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHAREIMAGELISTS | WS_BORDER | WS_TABSTOP, 7, 20, 249, 80 -PUSHBUTTON "&Ñîçäàòü", 14001, 120, 110, 50, 14, WS_TABSTOP -PUSHBUTTON "&Óäàëèòü", 14002, 180, 110, 50, 14, WS_TABSTOP +PUSHBUTTON "&Ñîçäàòü", 14001, 147, 110, 50, 14, WS_TABSTOP +PUSHBUTTON "&Óäàëèòü", 14002, 202, 110, 50, 14, WS_TABSTOP GROUPBOX "Îïèñàíèå ðàñøèðåíèÿ '%s'", 14003, 7, 130, 249, 70 -LTEXT "Îòêðûâàòü â:", -1, 12, 140, 40, 10 +LTEXT "Îòêðûâàòü â:", -1, 12, 142, 54, 10 //ICON -LTEXT "Ïðèëîæåíèå:", 14005, 100, 140, 40, 10 -PUSHBUTTON "&Èçìåíèòü...", 14006, 180, 140, 50, 14, WS_TABSTOP -LTEXT "Ôàéëû ñ ðàñøèðåíèåì '%s' èìåþò òèï '%s'. Äëÿ\nèçìåíåíèÿ ïàðàìåòðîâ âñåõ ôàéëîâ '%s', íàæìèòå\n""Äîïîëíèòåëüíî"".", 14007, 12, 155, 160, 30 -PUSHBUTTON "Äî&ïîëíèòåëüíî", 14008, 180, 175, 50, 14, WS_TABSTOP +LTEXT "Ïðèëîæåíèå:", 14005, 100, 142, 54, 10 +PUSHBUTTON "&Èçìåíèòü...", 14006, 180, 140, 63, 14, WS_TABSTOP +LTEXT "Ôàéëû ñ ðàñøèðåíèåì '%s' èìåþò òèï '%s'. Äëÿ èçìåíåíèÿ ïàðàìåòðîâ âñåõ ôàéëîâ '%s', íàæìèòå ""Äîïîëíèòåëüíî"".", 14007, 12, 155, 162, 36 +PUSHBUTTON "Äî&ïîëíèòåëüíî", 14008, 180, 175, 63, 14, WS_TABSTOP END CONFIRM_FILE_REPLACE_DLG DIALOGEX 0, 0, 282, 143 @@ -563,18 +563,18 @@ AUTOCHECKBOX "&Èñïîëüçîâàòü ñæàòèå", 28675, 16, 152, 155, 10 END -CHKDSK_DLG DIALOGEX 50, 50, 194, 120 +CHKDSK_DLG DIALOGEX 50, 50, 232, 111 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION -CAPTION "Check Disk" -FONT 8, "MS Shell Dlg" -BEGIN - DEFPUSHBUTTON "Start", IDOK, 53, 100, 60, 14 - GROUPBOX "Check disk options", -1, 7, 6, 179, 50 - PUSHBUTTON "Cancel", IDCANCEL, 118, 100, 60, 14 - AUTOCHECKBOX "Automatically fix file system errors", 14000, 16, 15, 155, 10 - AUTOCHECKBOX "&Scan for and attempt recovery of bad sectors", 14001, 16, 30, 165, 10 - CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 170, 8 - LTEXT "", 14003, 60, 80, 170, 10 +CAPTION "Ïðîâåðêà äèñêà" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "Çàïóñê", IDOK, 101, 91, 60, 14 + GROUPBOX "Ïàðàìåòðû ïðîâåðêè äèñêà", -1, 7, 5, 218, 50 + PUSHBUTTON "Îòìåíà", IDCANCEL, 165, 91, 60, 14 + AUTOCHECKBOX "&Àâòîìàòè÷åñêè èñïðàâëÿòü ñèñòåìíûå îøèáêè", 14000, 16, 19, 178, 10 + AUTOCHECKBOX "&Ïðîâåðÿòü è âîñòàíàâëèâàòü ïîâðåæäåííûå ñåêòîðà", 14001, 16, 35, 200, 10 + CONTROL "", 14002, "MSCTLS_PROGRESS32", 16, 7, 60, 218, 8 + LTEXT "", 14003, 7, 75, 218, 10 END IDD_PICK_ICON_DIALOG DIALOGEX 0, 0, 237, 204 @@ -623,7 +623,7 @@ IDS_MYCOMPUTER "Ìîé êîìïüþòåð" IDS_RECYCLEBIN_FOLDER_NAME "Êîðçèíà" IDS_CONTROLPANEL "Ïàíåëü óïðàâëåíèÿ" - IDS_ADMINISTRATIVETOOLS "Administrative Tools" + IDS_ADMINISTRATIVETOOLS "Àäìèíèñòðèðîâàíèå" /* context menus */ IDS_VIEW_LARGE "&Áîëüøèå çíà÷êè" @@ -743,5 +743,5 @@ IDS_FONTS "Øðèôòû" IDS_INSTALLNEWFONT "Óñòàíîâèòü íîâûé øðèôò..." - IDS_DEFAULT_CLUSTER_SIZE "Default allocation size" -END + IDS_DEFAULT_CLUSTER_SIZE "Âûäåëÿåìûé ïî óìîë÷àíèþ ðàçìåð" +END

1 0

[cgutman] 35343: - Fix a possible crash - Fix 2 memory leaks
by cgutman＠svn.reactos.org 14 Aug '08

14 Aug '08

Author: cgutman Date: Thu Aug 14 12:13:11 2008 New Revision: 35343 URL: http://svn.reactos.org/svn/reactos?rev=35343&view=rev Log: - Fix a possible crash - Fix 2 memory leaks Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] Thu Aug 14 12:13:11 2008 @@ -210,8 +210,12 @@ ExFreePool( FCB->LocalAddress ); if( FCB->RemoteAddress ) ExFreePool( FCB->RemoteAddress ); - - ExFreePool(FCB->TdiDeviceName.Buffer); + if( FCB->ListenIrp.ConnectionReturnInfo ) + ExFreePool( FCB->ListenIrp.ConnectionReturnInfo ); + if( FCB->ListenIrp.ConnectionCallInfo ) + ExFreePool( FCB->ListenIrp.ConnectionCallInfo ); + if( FCB->TdiDeviceName.Buffer ) + ExFreePool(FCB->TdiDeviceName.Buffer); ExFreePool(FCB); AFD_DbgPrint(MIN_TRACE,("Deleted (%x)\n", FCB));

1 0

[sginsberg] 35342: - Fix MiSyncThreadProcessViews to hack-sync the next thread's ETHREAD too (spotted by Alex)
by sginsberg＠svn.reactos.org 14 Aug '08

14 Aug '08

Author: sginsberg Date: Thu Aug 14 11:43:52 2008 New Revision: 35342 URL: http://svn.reactos.org/svn/reactos?rev=35342&view=rev Log: - Fix MiSyncThreadProcessViews to hack-sync the next thread's ETHREAD too (spotted by Alex) Modified: trunk/reactos/ntoskrnl/mm/mm.c Modified: trunk/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev=35342… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] Thu Aug 14 11:43:52 2008 @@ -28,12 +28,14 @@ FASTCALL MiSyncThreadProcessViews(IN PKTHREAD NextThread) { + PVOID Process = PsGetCurrentProcess(); + PETHREAD Thread = CONTAINING_RECORD(NextThread, ETHREAD, Tcb); + /* Hack Sync because Mm is broken */ - MmUpdatePageDir(PsGetCurrentProcess(), - ((PETHREAD)NextThread)->ThreadsProcess, - sizeof(EPROCESS)); - MmUpdatePageDir(PsGetCurrentProcess(), - (PVOID)((PETHREAD)NextThread)->Tcb.StackLimit, + MmUpdatePageDir(Process, Thread, sizeof(ETHREAD)); + MmUpdatePageDir(Process, Thread->ThreadsProcess, sizeof(EPROCESS)); + MmUpdatePageDir(Process, + (PVOID)Thread->Tcb.StackLimit, NextThread->LargeStack ? KERNEL_LARGE_STACK_SIZE : KERNEL_STACK_SIZE); }

1 0

[spetreolle] 35341: update french translations : solitaire, msconfig, desk.cpl, win32csr patches by Amine Khaldi (amine48rz)
by spetreolle＠svn.reactos.org 14 Aug '08

14 Aug '08

Author: spetreolle Date: Thu Aug 14 11:17:22 2008 New Revision: 35341 URL: http://svn.reactos.org/svn/reactos?rev=35341&view=rev Log: update french translations : solitaire, msconfig, desk.cpl, win32csr patches by Amine Khaldi (amine48rz) Modified: trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc trunk/reactos/base/applications/msconfig/lang/fr-FR.rc trunk/reactos/dll/cpl/desk/lang/fr-FR.rc trunk/reactos/subsystems/win32/csrss/win32csr/lang/fr-FR.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/fr-FR.rc [iso-8859-1] Thu Aug 14 11:17:22 2008 @@ -22,7 +22,7 @@ AUTORADIOBUTTON "En tirer trois", IDC_OPT_DRAWTHREE, 14, 32, 52, 10 AUTOCHECKBOX "Afficher le temp&s", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP | WS_DISABLED - AUTOCHECKBOX "Barre de s&tatus", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP + AUTOCHECKBOX "Barre de s&tatut", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 35, 97, 50, 14 PUSHBUTTON "Annuler", IDCANCEL, 101, 97, 50, 14 Modified: trunk/reactos/base/applications/msconfig/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/lang/fr-FR.rc [iso-8859-1] Thu Aug 14 11:17:22 2008 @@ -36,7 +36,7 @@ PUSHBUTTON "Rechercher", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14 PUSHBUTTON "&Nouveau", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14 - PUSHBUTTON "Édi&ter", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14 + PUSHBUTTON "M&odifier", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14 PUSHBUTTON "Activer tout", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14 PUSHBUTTON "Désactiver tout",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14 @@ -64,11 +64,11 @@ STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Sélection du Démarrage ", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT - CONTROL "Démarrage &Normal - charge tous les drivers et services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 185, 10 - CONTROL "Démarrage &Diagnostic - charge les périphériques de base et services seulement", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 - CONTROL "Démarrage &Sélectif", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 75, 10 - AUTOCHECKBOX "T&raiter le fichier SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 100, 10 + GROUPBOX "Sélection du mode de démarrage ", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT + CONTROL "Démarrage &normal - charge tous les pilotes et tous les services", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 185, 10 + CONTROL "Démarrage en mode &diagnostic - charge les périphériques de base et les services seulement", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 260, 10 + CONTROL "Démarrage &sélectif", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 75, 10 + AUTOCHECKBOX "T&raiter le fichier System.ini", IDC_CBX_SYSTEM_INI, 30, 80, 100, 10 AUTOCHECKBOX "&Charger les Services Système", IDC_CBX_SYSTEM_SERVICE, 30, 95, 105, 10 AUTOCHECKBOX "Charger les éléments de démarrage", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 END @@ -78,7 +78,7 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200 - PUSHBUTTON "&Cocher tous les chemins de démarrage", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12 + PUSHBUTTON "&Vérifier les chemins de démarrage", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12 PUSHBUTTON "&Par Défaut", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 PUSHBUTTON "&Monter", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 PUSHBUTTON "&Descendre", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 @@ -91,7 +91,7 @@ PUSHBUTTON "Options A&vancées...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 LTEXT "&Délai:", -1, 280, 91, 30, 10 EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT - LTEXT "sec.", -1, 340, 91, 15, 10 + LTEXT "secondes", -1, 340, 91, 15, 10 END IDD_FREELDR_ADVANCED_PAGE DIALOGEX DISCARDABLE 0, 0, 175, 175 @@ -133,7 +133,7 @@ STRINGTABLE DISCARDABLE BEGIN IDS_SERVICES_COLUMN_SERVICE "Service" - IDS_SERVICES_COLUMN_REQ "Requis" + IDS_SERVICES_COLUMN_REQ "Essentiel" IDS_SERVICES_COLUMN_VENDOR "Fabricant" IDS_SERVICES_COLUMN_STATUS "État" END @@ -144,15 +144,15 @@ IDS_TOOLS_COLUMN_DESCR "Description" IDS_TOOLS_CMD_NAME "Console" - IDS_TOOLS_CMD_DESCR "" + IDS_TOOLS_CMD_DESCR "Ouvre la console." IDS_TOOLS_CMD_CMD "cmd.exe" IDS_TOOLS_INFO_NAME "Version" - IDS_TOOLS_INFO_DESCR "Affiche les informations de version." + IDS_TOOLS_INFO_DESCR "Affiche la version de ReactOS." IDS_TOOLS_INFO_CMD "winver.exe" - IDS_TOOLS_REGEDIT_NAME "Editeur de Registre" - IDS_TOOLS_REGEDIT_DESCR "Ouvre l'éditeur de Registre" + IDS_TOOLS_REGEDIT_NAME "Editeur du Registre" + IDS_TOOLS_REGEDIT_DESCR "Ouvre l'éditeur du Registre" IDS_TOOLS_REGEDIT_CMD "regedit.exe" IDS_TOOLS_SYSDM_NAME "Propriétés système" @@ -160,14 +160,14 @@ IDS_TOOLS_SYSDM_CMD "control.exe" IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" - IDS_STARTUP_COLUMN_ELEMENT "Elément" + IDS_STARTUP_COLUMN_ELEMENT "Élément" IDS_STARTUP_COLUMN_CMD "Commande" IDS_STARTUP_COLUMN_PATH "Chemin" END STRINGTABLE DISCARDABLE BEGIN - IDS_SERVICES_STATUS_RUNNING "En cours" + IDS_SERVICES_STATUS_RUNNING "En cours d'exécution" IDS_SERVICES_STATUS_STOPPED "Arrêté" IDS_SERVICES_YES "Oui" IDS_SERVICES_UNKNOWN "Inconnu" Modified: trunk/reactos/dll/cpl/desk/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/fr-FR.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/lang/fr-FR.rc [iso-8859-1] Thu Aug 14 11:17:22 2008 @@ -54,7 +54,7 @@ BEGIN CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 - LTEXT "Colorscheme", IDC_STATIC, 7, 140, 64, 7 + LTEXT "Modèle de couleurs", IDC_STATIC, 7, 140, 64, 7 COMBOBOX IDC_APPEARANCE_UI_ITEM, 7, 169, 120, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Avancé", IDC_APPEARANCE_ADVANCED, 182, 150, 56, 15 END @@ -81,7 +81,7 @@ LTEXT "&2ème Couleur :", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP - LTEXT "Fonte :", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 + LTEXT "Police :", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 8 COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP LTEXT "Taille :", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 8 Modified: trunk/reactos/subsystems/win32/csrss/win32csr/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/lang/fr-FR.rc [iso-8859-1] Thu Aug 14 11:17:22 2008 @@ -47,7 +47,7 @@ IDS_SCROLL "Défiler" IDS_FIND "Trouver..." IDS_DEFAULTS "Défauts" - IDS_PROPERTIES "Proprietés" + IDS_PROPERTIES "Propriétés" IDS_SCROLLHERE "Défiler ici" IDS_SCROLLTOP "Défiler tout en haut" IDS_SCROLLBOTTOM "Défiler tout en bas"

1 0

[cgutman] 35340: - Always set Irp->IoStatus.Status - Clear the cancel routine only when completing
by cgutman＠svn.reactos.org 14 Aug '08

14 Aug '08

Author: cgutman Date: Thu Aug 14 10:14:32 2008 New Revision: 35340 URL: http://svn.reactos.org/svn/reactos?rev=35340&view=rev Log: - Always set Irp->IoStatus.Status - Clear the cancel routine only when completing Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/irp.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/irp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/irp.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/irp.c [iso-8859-1] Thu Aug 14 10:14:32 2008 @@ -27,14 +27,14 @@ UntrackFL( __FILE__, __LINE__, Irp ); #endif - (void)IoSetCancelRoutine( Irp, NULL ); + Irp->IoStatus.Status = Status; if( Status == STATUS_PENDING ) IoMarkIrpPending( Irp ); else { - Irp->IoStatus.Status = Status; Irql = KeGetCurrentIrql(); + (void)IoSetCancelRoutine( Irp, NULL ); IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); if (KeGetCurrentIrql() != Irql) { DbgPrint("WARNING: IO COMPLETION RETURNED AT WRONG IRQL:\n");

1 0

[janderwald] 35339: * Store the paths of ntbackup and defrag.msc in the registry
by janderwald＠svn.reactos.org 14 Aug '08

14 Aug '08

Author: janderwald Date: Thu Aug 14 10:03:37 2008 New Revision: 35339 URL: http://svn.reactos.org/svn/reactos?rev=35339&view=rev Log: * Store the paths of ntbackup and defrag.msc in the registry Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf Modified: trunk/reactos/boot/bootdata/hivesft_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesft_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesft_i386.inf [iso-8859-1] Thu Aug 14 10:03:37 2008 @@ -28,6 +28,11 @@ ; Common shell folders HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders",,0x00000012 HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\User Shell Folders",,0x00000012 +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\DefragPath",,0x00000012 +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\DefragPath","",0x00020000,"%systemroot%\system32\dfrg.msc %c:" +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\BackupPath",,0x00000012 +HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\MyComputer\BackupPath","",0x00020000,"%SystemRoot%\system32\ntbackup.exe" + HKLM,"SOFTWARE\Microsoft\Windows\CurrentVersion\RunOnce",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons",,0x00000012 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HideDesktopIcons\ClassicStartMenu",,0x00000012

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs