Ros-diffs

ros-diffs@reactos.org

81390 discussions

[gedmurphy] 35409: add xml generator code for future reference
by gedmurphy＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: gedmurphy Date: Sun Aug 17 10:49:13 2008 New Revision: 35409 URL: http://svn.reactos.org/svn/reactos?rev=35409&view=rev Log: add xml generator code for future reference Added: trunk/tools/Message Translator/GUI/Resources/xmlgen.cs (with props) Added: trunk/tools/Message Translator/GUI/Resources/xmlgen.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Res… ============================================================================== --- trunk/tools/Message Translator/GUI/Resources/xmlgen.cs (added) +++ trunk/tools/Message Translator/GUI/Resources/xmlgen.cs [iso-8859-1] Sun Aug 17 10:49:13 2008 @@ -1,0 +1,51 @@ +ï»¿using System; +using System.IO; +using System.Text.RegularExpressions; + +namespace bugcheck +{ + class Program + { + const string header = "<?xml version=\"1.0\" ?>\r\n<BugCheckList>"; + const string open = "\t<BugCheck text=\""; + const string value = "\" value=\""; + const string close = "\" />"; + const string footer = "</BugCheckList>"; + const string path = @"C:\WinDDK\6000\inc\api\bugcodes.h"; + const string outpath = @"C:\Users\Ged\MyFiles\ReactOS\Source\tools\Message Translator\GUI\Resources\bugcheck.xml"; + + static void Main(string[] args) + { + try + { + StreamReader sr = new StreamReader(path); + StreamWriter sw = new StreamWriter(outpath); + + string s = sr.ReadToEnd(); + + Regex regex = new Regex(@"#define (?<def>[A-Z_\d]+)\s+\(\(ULONG\)0x(?<num>[\dA-F]+)L?\)"); + MatchCollection list = regex.Matches(s); + + if (list.Count > 0) + { + sw.WriteLine(header); + + foreach (Match match in list) + { + string line = open + match.Groups["def"].ToString() + value + match.Groups["num"].ToString() + close; + sw.WriteLine(line); + + Console.WriteLine("{0} - {1}", match.Groups["def"].ToString(), match.Groups["num"].ToString()); + } + + sw.WriteLine(footer); + sw.Flush(); + } + } + catch (Exception) + { + Console.WriteLine("doh"); + } + } + } +} Propchange: trunk/tools/Message Translator/GUI/Resources/xmlgen.cs ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[gedmurphy] 35408: Add bug check codes to the translation utility
by gedmurphy＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: gedmurphy Date: Sun Aug 17 10:37:54 2008 New Revision: 35408 URL: http://svn.reactos.org/svn/reactos?rev=35408&view=rev Log: Add bug check codes to the translation utility Added: trunk/tools/Message Translator/GUI/Resources/bugcheck.xml (with props) trunk/tools/Message Translator/MsgTrans.Library/bugcheck.cs Modified: trunk/tools/Message Translator/GUI/App.config trunk/tools/Message Translator/GUI/GUI.csproj trunk/tools/Message Translator/GUI/MainForm.cs trunk/tools/Message Translator/MsgTrans.Library/ErrorCommand.cs trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.Library.csproj trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.cs Modified: trunk/tools/Message Translator/GUI/App.config URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/App… ============================================================================== --- trunk/tools/Message Translator/GUI/App.config [iso-8859-1] (original) +++ trunk/tools/Message Translator/GUI/App.config [iso-8859-1] Sun Aug 17 10:37:54 2008 @@ -4,6 +4,7 @@ <add key="NtstatusXml" value="Resources\ntstatus.xml" /> <add key="WinerrorXml" value="Resources\winerror.xml" /> <add key="HresultXml" value="Resources\hresult.xml" /> + <add key="BugcheckXml" value="Resources\bugcheck.xml" /> <add key="WmXml" value="Resources\wm.xml" /> <add key="BugUrl" value="http://www.reactos.org/bugzilla/show_bug.cgi?id={0}" /> <add key="BugHomepage" value="http://www.reactos.org/bugzilla"/> Modified: trunk/tools/Message Translator/GUI/GUI.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/GUI… ============================================================================== --- trunk/tools/Message Translator/GUI/GUI.csproj [iso-8859-1] (original) +++ trunk/tools/Message Translator/GUI/GUI.csproj [iso-8859-1] Sun Aug 17 10:37:54 2008 @@ -77,6 +77,9 @@ </ItemGroup> <ItemGroup> <Content Include="icon.ico" /> + <Content Include="Resources\bugcheck.xml"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </Content> <Content Include="Resources\hresult.xml"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </Content> Modified: trunk/tools/Message Translator/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Mai… ============================================================================== --- trunk/tools/Message Translator/GUI/MainForm.cs [iso-8859-1] (original) +++ trunk/tools/Message Translator/GUI/MainForm.cs [iso-8859-1] Sun Aug 17 10:37:54 2008 @@ -114,6 +114,18 @@ get { string optionName = "WmXml"; + string s = ConfigurationSettings.AppSettings[optionName]; + VerifyRequiredOption(optionName, + s); + s = PrependWorkingDirectory(s); + return s; + } + } + private static string BugCheckXml + { + get + { + string optionName = "BugcheckXml"; string s = ConfigurationSettings.AppSettings[optionName]; VerifyRequiredOption(optionName, s); @@ -224,6 +236,7 @@ NtstatusXml, WinerrorXml, HresultXml, + BugCheckXml, WmXml, BugUrl); string message = msgType + " " + mainErrTxtBox.Text; @@ -242,6 +255,7 @@ if (cmd.MsgType == MessageType.WinError || cmd.MsgType == MessageType.HRESULT || cmd.MsgType == MessageType.NTSTATUS || + cmd.MsgType == MessageType.BugCheck || cmd.MsgType == MessageType.Custom) { if (errMessages != null) Added: trunk/tools/Message Translator/GUI/Resources/bugcheck.xml URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/GUI/Res… ============================================================================== --- trunk/tools/Message Translator/GUI/Resources/bugcheck.xml (added) +++ trunk/tools/Message Translator/GUI/Resources/bugcheck.xml [iso-8859-1] Sun Aug 17 10:37:54 2008 @@ -1,0 +1,312 @@ +<?xml version="1.0" ?> +<BugCheckList> + <BugCheck text="HARDWARE_PROFILE_UNDOCKED_STRING" value="40010001" /> + <BugCheck text="HARDWARE_PROFILE_DOCKED_STRING" value="40010002" /> + <BugCheck text="HARDWARE_PROFILE_UNKNOWN_STRING" value="40010003" /> + <BugCheck text="WINDOWS_NT_BANNER" value="4000007E" /> + <BugCheck text="BUGCHECK_MESSAGE_INTRO" value="4000007F" /> + <BugCheck text="BUGCODE_ID_DRIVER" value="40000080" /> + <BugCheck text="PSS_MESSAGE_INTRO" value="40000081" /> + <BugCheck text="BUGCODE_PSS_MESSAGE" value="40000082" /> + <BugCheck text="BUGCHECK_TECH_INFO" value="40000083" /> + <BugCheck text="WINDOWS_NT_CSD_STRING" value="40000087" /> + <BugCheck text="WINDOWS_NT_INFO_STRING" value="40000088" /> + <BugCheck text="WINDOWS_NT_MP_STRING" value="40000089" /> + <BugCheck text="THREAD_TERMINATE_HELD_MUTEX" value="4000008A" /> + <BugCheck text="BUGCODE_PSS_CRASH_INIT" value="4000008B" /> + <BugCheck text="BUGCODE_PSS_CRASH_PROGRESS" value="4000008C" /> + <BugCheck text="BUGCODE_PSS_CRASH_DONE" value="4000008D" /> + <BugCheck text="WINDOWS_NT_INFO_STRING_PLURAL" value="4000009D" /> + <BugCheck text="WINDOWS_NT_RC_STRING" value="4000009E" /> + <BugCheck text="APC_INDEX_MISMATCH" value="00000001" /> + <BugCheck text="DEVICE_QUEUE_NOT_BUSY" value="00000002" /> + <BugCheck text="INVALID_AFFINITY_SET" value="00000003" /> + <BugCheck text="INVALID_DATA_ACCESS_TRAP" value="00000004" /> + <BugCheck text="INVALID_PROCESS_ATTACH_ATTEMPT" value="00000005" /> + <BugCheck text="INVALID_PROCESS_DETACH_ATTEMPT" value="00000006" /> + <BugCheck text="INVALID_SOFTWARE_INTERRUPT" value="00000007" /> + <BugCheck text="IRQL_NOT_DISPATCH_LEVEL" value="00000008" /> + <BugCheck text="IRQL_NOT_GREATER_OR_EQUAL" value="00000009" /> + <BugCheck text="IRQL_NOT_LESS_OR_EQUAL" value="0000000A" /> + <BugCheck text="NO_EXCEPTION_HANDLING_SUPPORT" value="0000000B" /> + <BugCheck text="MAXIMUM_WAIT_OBJECTS_EXCEEDED" value="0000000C" /> + <BugCheck text="MUTEX_LEVEL_NUMBER_VIOLATION" value="0000000D" /> + <BugCheck text="NO_USER_MODE_CONTEXT" value="0000000E" /> + <BugCheck text="SPIN_LOCK_ALREADY_OWNED" value="0000000F" /> + <BugCheck text="SPIN_LOCK_NOT_OWNED" value="00000010" /> + <BugCheck text="THREAD_NOT_MUTEX_OWNER" value="00000011" /> + <BugCheck text="TRAP_CAUSE_UNKNOWN" value="00000012" /> + <BugCheck text="EMPTY_THREAD_REAPER_LIST" value="00000013" /> + <BugCheck text="CREATE_DELETE_LOCK_NOT_LOCKED" value="00000014" /> + <BugCheck text="LAST_CHANCE_CALLED_FROM_KMODE" value="00000015" /> + <BugCheck text="CID_HANDLE_CREATION" value="00000016" /> + <BugCheck text="CID_HANDLE_DELETION" value="00000017" /> + <BugCheck text="REFERENCE_BY_POINTER" value="00000018" /> + <BugCheck text="BAD_POOL_HEADER" value="00000019" /> + <BugCheck text="MEMORY_MANAGEMENT" value="0000001A" /> + <BugCheck text="PFN_SHARE_COUNT" value="0000001B" /> + <BugCheck text="PFN_REFERENCE_COUNT" value="0000001C" /> + <BugCheck text="NO_SPIN_LOCK_AVAILABLE" value="0000001D" /> + <BugCheck text="KMODE_EXCEPTION_NOT_HANDLED" value="0000001E" /> + <BugCheck text="SHARED_RESOURCE_CONV_ERROR" value="0000001F" /> + <BugCheck text="KERNEL_APC_PENDING_DURING_EXIT" value="00000020" /> + <BugCheck text="QUOTA_UNDERFLOW" value="00000021" /> + <BugCheck text="FILE_SYSTEM" value="00000022" /> + <BugCheck text="FAT_FILE_SYSTEM" value="00000023" /> + <BugCheck text="NTFS_FILE_SYSTEM" value="00000024" /> + <BugCheck text="NPFS_FILE_SYSTEM" value="00000025" /> + <BugCheck text="CDFS_FILE_SYSTEM" value="00000026" /> + <BugCheck text="RDR_FILE_SYSTEM" value="00000027" /> + <BugCheck text="CORRUPT_ACCESS_TOKEN" value="00000028" /> + <BugCheck text="SECURITY_SYSTEM" value="00000029" /> + <BugCheck text="INCONSISTENT_IRP" value="0000002A" /> + <BugCheck text="PANIC_STACK_SWITCH" value="0000002B" /> + <BugCheck text="PORT_DRIVER_INTERNAL" value="0000002C" /> + <BugCheck text="SCSI_DISK_DRIVER_INTERNAL" value="0000002D" /> + <BugCheck text="DATA_BUS_ERROR" value="0000002E" /> + <BugCheck text="INSTRUCTION_BUS_ERROR" value="0000002F" /> + <BugCheck text="SET_OF_INVALID_CONTEXT" value="00000030" /> + <BugCheck text="PHASE0_INITIALIZATION_FAILED" value="00000031" /> + <BugCheck text="PHASE1_INITIALIZATION_FAILED" value="00000032" /> + <BugCheck text="UNEXPECTED_INITIALIZATION_CALL" value="00000033" /> + <BugCheck text="CACHE_MANAGER" value="00000034" /> + <BugCheck text="NO_MORE_IRP_STACK_LOCATIONS" value="00000035" /> + <BugCheck text="DEVICE_REFERENCE_COUNT_NOT_ZERO" value="00000036" /> + <BugCheck text="FLOPPY_INTERNAL_ERROR" value="00000037" /> + <BugCheck text="SERIAL_DRIVER_INTERNAL" value="00000038" /> + <BugCheck text="SYSTEM_EXIT_OWNED_MUTEX" value="00000039" /> + <BugCheck text="SYSTEM_UNWIND_PREVIOUS_USER" value="0000003A" /> + <BugCheck text="SYSTEM_SERVICE_EXCEPTION" value="0000003B" /> + <BugCheck text="INTERRUPT_UNWIND_ATTEMPTED" value="0000003C" /> + <BugCheck text="INTERRUPT_EXCEPTION_NOT_HANDLED" value="0000003D" /> + <BugCheck text="MULTIPROCESSOR_CONFIGURATION_NOT_SUPPORTED" value="0000003E" /> + <BugCheck text="NO_MORE_SYSTEM_PTES" value="0000003F" /> + <BugCheck text="TARGET_MDL_TOO_SMALL" value="00000040" /> + <BugCheck text="MUST_SUCCEED_POOL_EMPTY" value="00000041" /> + <BugCheck text="ATDISK_DRIVER_INTERNAL" value="00000042" /> + <BugCheck text="NO_SUCH_PARTITION" value="00000043" /> + <BugCheck text="MULTIPLE_IRP_COMPLETE_REQUESTS" value="00000044" /> + <BugCheck text="INSUFFICIENT_SYSTEM_MAP_REGS" value="00000045" /> + <BugCheck text="DEREF_UNKNOWN_LOGON_SESSION" value="00000046" /> + <BugCheck text="REF_UNKNOWN_LOGON_SESSION" value="00000047" /> + <BugCheck text="CANCEL_STATE_IN_COMPLETED_IRP" value="00000048" /> + <BugCheck text="PAGE_FAULT_WITH_INTERRUPTS_OFF" value="00000049" /> + <BugCheck text="IRQL_GT_ZERO_AT_SYSTEM_SERVICE" value="0000004A" /> + <BugCheck text="STREAMS_INTERNAL_ERROR" value="0000004B" /> + <BugCheck text="FATAL_UNHANDLED_HARD_ERROR" value="0000004C" /> + <BugCheck text="NO_PAGES_AVAILABLE" value="0000004D" /> + <BugCheck text="PFN_LIST_CORRUPT" value="0000004E" /> + <BugCheck text="NDIS_INTERNAL_ERROR" value="0000004F" /> + <BugCheck text="PAGE_FAULT_IN_NONPAGED_AREA" value="00000050" /> + <BugCheck text="PAGE_FAULT_IN_NONPAGED_AREA_M" value="10000050" /> + <BugCheck text="REGISTRY_ERROR" value="00000051" /> + <BugCheck text="MAILSLOT_FILE_SYSTEM" value="00000052" /> + <BugCheck text="NO_BOOT_DEVICE" value="00000053" /> + <BugCheck text="LM_SERVER_INTERNAL_ERROR" value="00000054" /> + <BugCheck text="DATA_COHERENCY_EXCEPTION" value="00000055" /> + <BugCheck text="INSTRUCTION_COHERENCY_EXCEPTION" value="00000056" /> + <BugCheck text="XNS_INTERNAL_ERROR" value="00000057" /> + <BugCheck text="FTDISK_INTERNAL_ERROR" value="00000058" /> + <BugCheck text="PINBALL_FILE_SYSTEM" value="00000059" /> + <BugCheck text="CRITICAL_SERVICE_FAILED" value="0000005A" /> + <BugCheck text="SET_ENV_VAR_FAILED" value="0000005B" /> + <BugCheck text="HAL_INITIALIZATION_FAILED" value="0000005C" /> + <BugCheck text="UNSUPPORTED_PROCESSOR" value="0000005D" /> + <BugCheck text="OBJECT_INITIALIZATION_FAILED" value="0000005E" /> + <BugCheck text="SECURITY_INITIALIZATION_FAILED" value="0000005F" /> + <BugCheck text="PROCESS_INITIALIZATION_FAILED" value="00000060" /> + <BugCheck text="HAL1_INITIALIZATION_FAILED" value="00000061" /> + <BugCheck text="OBJECT1_INITIALIZATION_FAILED" value="00000062" /> + <BugCheck text="SECURITY1_INITIALIZATION_FAILED" value="00000063" /> + <BugCheck text="SYMBOLIC_INITIALIZATION_FAILED" value="00000064" /> + <BugCheck text="MEMORY1_INITIALIZATION_FAILED" value="00000065" /> + <BugCheck text="CACHE_INITIALIZATION_FAILED" value="00000066" /> + <BugCheck text="CONFIG_INITIALIZATION_FAILED" value="00000067" /> + <BugCheck text="FILE_INITIALIZATION_FAILED" value="00000068" /> + <BugCheck text="IO1_INITIALIZATION_FAILED" value="00000069" /> + <BugCheck text="LPC_INITIALIZATION_FAILED" value="0000006A" /> + <BugCheck text="PROCESS1_INITIALIZATION_FAILED" value="0000006B" /> + <BugCheck text="REFMON_INITIALIZATION_FAILED" value="0000006C" /> + <BugCheck text="SESSION1_INITIALIZATION_FAILED" value="0000006D" /> + <BugCheck text="SESSION2_INITIALIZATION_FAILED" value="0000006E" /> + <BugCheck text="SESSION3_INITIALIZATION_FAILED" value="0000006F" /> + <BugCheck text="SESSION4_INITIALIZATION_FAILED" value="00000070" /> + <BugCheck text="SESSION5_INITIALIZATION_FAILED" value="00000071" /> + <BugCheck text="ASSIGN_DRIVE_LETTERS_FAILED" value="00000072" /> + <BugCheck text="CONFIG_LIST_FAILED" value="00000073" /> + <BugCheck text="BAD_SYSTEM_CONFIG_INFO" value="00000074" /> + <BugCheck text="CANNOT_WRITE_CONFIGURATION" value="00000075" /> + <BugCheck text="PROCESS_HAS_LOCKED_PAGES" value="00000076" /> + <BugCheck text="KERNEL_STACK_INPAGE_ERROR" value="00000077" /> + <BugCheck text="PHASE0_EXCEPTION" value="00000078" /> + <BugCheck text="MISMATCHED_HAL" value="00000079" /> + <BugCheck text="KERNEL_DATA_INPAGE_ERROR" value="0000007A" /> + <BugCheck text="INACCESSIBLE_BOOT_DEVICE" value="0000007B" /> + <BugCheck text="BUGCODE_NDIS_DRIVER" value="0000007C" /> + <BugCheck text="INSTALL_MORE_MEMORY" value="0000007D" /> + <BugCheck text="SYSTEM_THREAD_EXCEPTION_NOT_HANDLED" value="0000007E" /> + <BugCheck text="SYSTEM_THREAD_EXCEPTION_NOT_HANDLED_M" value="1000007E" /> + <BugCheck text="UNEXPECTED_KERNEL_MODE_TRAP" value="0000007F" /> + <BugCheck text="UNEXPECTED_KERNEL_MODE_TRAP_M" value="1000007F" /> + <BugCheck text="NMI_HARDWARE_FAILURE" value="00000080" /> + <BugCheck text="SPIN_LOCK_INIT_FAILURE" value="00000081" /> + <BugCheck text="DFS_FILE_SYSTEM" value="00000082" /> + <BugCheck text="OFS_FILE_SYSTEM" value="00000083" /> + <BugCheck text="RECOM_DRIVER" value="00000084" /> + <BugCheck text="SETUP_FAILURE" value="00000085" /> + <BugCheck text="AUDIT_FAILURE" value="00000086" /> + <BugCheck text="MBR_CHECKSUM_MISMATCH" value="0000008B" /> + <BugCheck text="KERNEL_MODE_EXCEPTION_NOT_HANDLED" value="0000008E" /> + <BugCheck text="KERNEL_MODE_EXCEPTION_NOT_HANDLED_M" value="1000008E" /> + <BugCheck text="PP0_INITIALIZATION_FAILED" value="0000008F" /> + <BugCheck text="PP1_INITIALIZATION_FAILED" value="00000090" /> + <BugCheck text="WIN32K_INIT_OR_RIT_FAILURE" value="00000091" /> + <BugCheck text="UP_DRIVER_ON_MP_SYSTEM" value="00000092" /> + <BugCheck text="INVALID_KERNEL_HANDLE" value="00000093" /> + <BugCheck text="KERNEL_STACK_LOCKED_AT_EXIT" value="00000094" /> + <BugCheck text="PNP_INTERNAL_ERROR" value="00000095" /> + <BugCheck text="INVALID_WORK_QUEUE_ITEM" value="00000096" /> + <BugCheck text="BOUND_IMAGE_UNSUPPORTED" value="00000097" /> + <BugCheck text="END_OF_NT_EVALUATION_PERIOD" value="00000098" /> + <BugCheck text="INVALID_REGION_OR_SEGMENT" value="00000099" /> + <BugCheck text="SYSTEM_LICENSE_VIOLATION" value="0000009A" /> + <BugCheck text="UDFS_FILE_SYSTEM" value="0000009B" /> + <BugCheck text="MACHINE_CHECK_EXCEPTION" value="0000009C" /> + <BugCheck text="USER_MODE_HEALTH_MONITOR" value="0000009E" /> + <BugCheck text="DRIVER_POWER_STATE_FAILURE" value="0000009F" /> + <BugCheck text="INTERNAL_POWER_ERROR" value="000000A0" /> + <BugCheck text="PCI_BUS_DRIVER_INTERNAL" value="000000A1" /> + <BugCheck text="MEMORY_IMAGE_CORRUPT" value="000000A2" /> + <BugCheck text="ACPI_DRIVER_INTERNAL" value="000000A3" /> + <BugCheck text="CNSS_FILE_SYSTEM_FILTER" value="000000A4" /> + <BugCheck text="ACPI_BIOS_ERROR" value="000000A5" /> + <BugCheck text="FP_EMULATION_ERROR" value="000000A6" /> + <BugCheck text="BAD_EXHANDLE" value="000000A7" /> + <BugCheck text="BOOTING_IN_SAFEMODE_MINIMAL" value="000000A8" /> + <BugCheck text="BOOTING_IN_SAFEMODE_NETWORK" value="000000A9" /> + <BugCheck text="BOOTING_IN_SAFEMODE_DSREPAIR" value="000000AA" /> + <BugCheck text="SESSION_HAS_VALID_POOL_ON_EXIT" value="000000AB" /> + <BugCheck text="HAL_MEMORY_ALLOCATION" value="000000AC" /> + <BugCheck text="VIDEO_DRIVER_DEBUG_REPORT_REQUEST" value="400000AD" /> + <BugCheck text="VIDEO_DRIVER_INIT_FAILURE" value="000000B4" /> + <BugCheck text="BOOTLOG_LOADED" value="000000B5" /> + <BugCheck text="BOOTLOG_NOT_LOADED" value="000000B6" /> + <BugCheck text="BOOTLOG_ENABLED" value="000000B7" /> + <BugCheck text="ATTEMPTED_SWITCH_FROM_DPC" value="000000B8" /> + <BugCheck text="CHIPSET_DETECTED_ERROR" value="000000B9" /> + <BugCheck text="SESSION_HAS_VALID_VIEWS_ON_EXIT" value="000000BA" /> + <BugCheck text="NETWORK_BOOT_INITIALIZATION_FAILED" value="000000BB" /> + <BugCheck text="NETWORK_BOOT_DUPLICATE_ADDRESS" value="000000BC" /> + <BugCheck text="INVALID_HIBERNATED_STATE" value="000000BD" /> + <BugCheck text="ATTEMPTED_WRITE_TO_READONLY_MEMORY" value="000000BE" /> + <BugCheck text="MUTEX_ALREADY_OWNED" value="000000BF" /> + <BugCheck text="PCI_CONFIG_SPACE_ACCESS_FAILURE" value="000000C0" /> + <BugCheck text="SPECIAL_POOL_DETECTED_MEMORY_CORRUPTION" value="000000C1" /> + <BugCheck text="BAD_POOL_CALLER" value="000000C2" /> + <BugCheck text="BUGCODE_PSS_MESSAGE_SIGNATURE" value="000000C3" /> + <BugCheck text="DRIVER_VERIFIER_DETECTED_VIOLATION" value="000000C4" /> + <BugCheck text="DRIVER_CORRUPTED_EXPOOL" value="000000C5" /> + <BugCheck text="DRIVER_CAUGHT_MODIFYING_FREED_POOL" value="000000C6" /> + <BugCheck text="TIMER_OR_DPC_INVALID" value="000000C7" /> + <BugCheck text="IRQL_UNEXPECTED_VALUE" value="000000C8" /> + <BugCheck text="DRIVER_VERIFIER_IOMANAGER_VIOLATION" value="000000C9" /> + <BugCheck text="PNP_DETECTED_FATAL_ERROR" value="000000CA" /> + <BugCheck text="DRIVER_LEFT_LOCKED_PAGES_IN_PROCESS" value="000000CB" /> + <BugCheck text="PAGE_FAULT_IN_FREED_SPECIAL_POOL" value="000000CC" /> + <BugCheck text="PAGE_FAULT_BEYOND_END_OF_ALLOCATION" value="000000CD" /> + <BugCheck text="DRIVER_UNLOADED_WITHOUT_CANCELLING_PENDING_OPERATIONS" value="000000CE" /> + <BugCheck text="TERMINAL_SERVER_DRIVER_MADE_INCORRECT_MEMORY_REFERENCE" value="000000CF" /> + <BugCheck text="DRIVER_CORRUPTED_MMPOOL" value="000000D0" /> + <BugCheck text="DRIVER_IRQL_NOT_LESS_OR_EQUAL" value="000000D1" /> + <BugCheck text="DRIVER_PORTION_MUST_BE_NONPAGED" value="000000D3" /> + <BugCheck text="SYSTEM_SCAN_AT_RAISED_IRQL_CAUGHT_IMPROPER_DRIVER_UNLOAD" value="000000D4" /> + <BugCheck text="DRIVER_PAGE_FAULT_IN_FREED_SPECIAL_POOL" value="000000D5" /> + <BugCheck text="DRIVER_PAGE_FAULT_BEYOND_END_OF_ALLOCATION" value="000000D6" /> + <BugCheck text="DRIVER_PAGE_FAULT_BEYOND_END_OF_ALLOCATION_M" value="100000D6" /> + <BugCheck text="DRIVER_UNMAPPING_INVALID_VIEW" value="000000D7" /> + <BugCheck text="DRIVER_USED_EXCESSIVE_PTES" value="000000D8" /> + <BugCheck text="LOCKED_PAGES_TRACKER_CORRUPTION" value="000000D9" /> + <BugCheck text="SYSTEM_PTE_MISUSE" value="000000DA" /> + <BugCheck text="DRIVER_CORRUPTED_SYSPTES" value="000000DB" /> + <BugCheck text="DRIVER_INVALID_STACK_ACCESS" value="000000DC" /> + <BugCheck text="POOL_CORRUPTION_IN_FILE_AREA" value="000000DE" /> + <BugCheck text="IMPERSONATING_WORKER_THREAD" value="000000DF" /> + <BugCheck text="ACPI_BIOS_FATAL_ERROR" value="000000E0" /> + <BugCheck text="WORKER_THREAD_RETURNED_AT_BAD_IRQL" value="000000E1" /> + <BugCheck text="MANUALLY_INITIATED_CRASH" value="000000E2" /> + <BugCheck text="RESOURCE_NOT_OWNED" value="000000E3" /> + <BugCheck text="WORKER_INVALID" value="000000E4" /> + <BugCheck text="POWER_FAILURE_SIMULATE" value="000000E5" /> + <BugCheck text="DRIVER_VERIFIER_DMA_VIOLATION" value="000000E6" /> + <BugCheck text="INVALID_FLOATING_POINT_STATE" value="000000E7" /> + <BugCheck text="INVALID_CANCEL_OF_FILE_OPEN" value="000000E8" /> + <BugCheck text="ACTIVE_EX_WORKER_THREAD_TERMINATION" value="000000E9" /> + <BugCheck text="THREAD_STUCK_IN_DEVICE_DRIVER" value="000000EA" /> + <BugCheck text="THREAD_STUCK_IN_DEVICE_DRIVER_M" value="100000EA" /> + <BugCheck text="DIRTY_MAPPED_PAGES_CONGESTION" value="000000EB" /> + <BugCheck text="SESSION_HAS_VALID_SPECIAL_POOL_ON_EXIT" value="000000EC" /> + <BugCheck text="UNMOUNTABLE_BOOT_VOLUME" value="000000ED" /> + <BugCheck text="CRITICAL_PROCESS_DIED" value="000000EF" /> + <BugCheck text="SCSI_VERIFIER_DETECTED_VIOLATION" value="000000F1" /> + <BugCheck text="HARDWARE_INTERRUPT_STORM" value="000000F2" /> + <BugCheck text="DISORDERLY_SHUTDOWN" value="000000F3" /> + <BugCheck text="CRITICAL_OBJECT_TERMINATION" value="000000F4" /> + <BugCheck text="FLTMGR_FILE_SYSTEM" value="000000F5" /> + <BugCheck text="PCI_VERIFIER_DETECTED_VIOLATION" value="000000F6" /> + <BugCheck text="DRIVER_OVERRAN_STACK_BUFFER" value="000000F7" /> + <BugCheck text="RAMDISK_BOOT_INITIALIZATION_FAILED" value="000000F8" /> + <BugCheck text="DRIVER_RETURNED_STATUS_REPARSE_FOR_VOLUME_OPEN" value="000000F9" /> + <BugCheck text="HTTP_DRIVER_CORRUPTED" value="000000FA" /> + <BugCheck text="RECURSIVE_MACHINE_CHECK" value="000000FB" /> + <BugCheck text="ATTEMPTED_EXECUTE_OF_NOEXECUTE_MEMORY" value="000000FC" /> + <BugCheck text="DIRTY_NOWRITE_PAGES_CONGESTION" value="000000FD" /> + <BugCheck text="BUGCODE_USB_DRIVER" value="000000FE" /> + <BugCheck text="BC_BLUETOOTH_VERIFIER_FAULT" value="00000BFE" /> + <BugCheck text="RESERVE_QUEUE_OVERFLOW" value="000000FF" /> + <BugCheck text="LOADER_BLOCK_MISMATCH" value="00000100" /> + <BugCheck text="CLOCK_WATCHDOG_TIMEOUT" value="00000101" /> + <BugCheck text="DPC_WATCHDOG_TIMEOUT" value="00000102" /> + <BugCheck text="MUP_FILE_SYSTEM" value="00000103" /> + <BugCheck text="AGP_INVALID_ACCESS" value="00000104" /> + <BugCheck text="AGP_GART_CORRUPTION" value="00000105" /> + <BugCheck text="AGP_ILLEGALLY_REPROGRAMMED" value="00000106" /> + <BugCheck text="KERNEL_EXPAND_STACK_ACTIVE" value="00000107" /> + <BugCheck text="THIRD_PARTY_FILE_SYSTEM_FAILURE" value="00000108" /> + <BugCheck text="CRITICAL_STRUCTURE_CORRUPTION" value="00000109" /> + <BugCheck text="APP_TAGGING_INITIALIZATION_FAILED" value="0000010A" /> + <BugCheck text="DFSC_FILE_SYSTEM" value="0000010B" /> + <BugCheck text="FSRTL_EXTRA_CREATE_PARAMETER_VIOLATION" value="0000010C" /> + <BugCheck text="WDF_VIOLATION" value="0000010D" /> + <BugCheck text="VIDEO_MEMORY_MANAGEMENT_INTERNAL" value="0000010E" /> + <BugCheck text="RESOURCE_MANAGER_EXCEPTION_NOT_HANDLED" value="0000010F" /> + <BugCheck text="DRIVER_INVALID_CRUNTIME_PARAMETER" value="00000110" /> + <BugCheck text="RECURSIVE_NMI" value="00000111" /> + <BugCheck text="MSRPC_STATE_VIOLATION" value="00000112" /> + <BugCheck text="VIDEO_DXGKRNL_FATAL_ERROR" value="00000113" /> + <BugCheck text="VIDEO_SHADOW_DRIVER_FATAL_ERROR" value="00000114" /> + <BugCheck text="AGP_INTERNAL" value="00000115" /> + <BugCheck text="VIDEO_TDR_FAILURE" value="00000116" /> + <BugCheck text="VIDEO_TDR_TIMEOUT_DETECTED" value="00000117" /> + <BugCheck text="NTHV_GUEST_ERROR" value="00000118" /> + <BugCheck text="VIDEO_SCHEDULER_INTERNAL_ERROR" value="00000119" /> + <BugCheck text="EM_INITIALIZATION_ERROR" value="0000011A" /> + <BugCheck text="DRIVER_RETURNED_HOLDING_CANCEL_LOCK" value="0000011B" /> + <BugCheck text="ATTEMPTED_WRITE_TO_CM_PROTECTED_STORAGE" value="0000011C" /> + <BugCheck text="EVENT_TRACING_FATAL_ERROR" value="0000011D" /> + <BugCheck text="TOO_MANY_RECURSIVE_FAULTS" value="0000011E" /> + <BugCheck text="INVALID_DRIVER_HANDLE" value="0000011F" /> + <BugCheck text="BITLOCKER_FATAL_ERROR" value="00000120" /> + <BugCheck text="DRIVER_VIOLATION" value="00000121" /> + <BugCheck text="WHEA_INTERNAL_ERROR" value="00000122" /> + <BugCheck text="CRYPTO_SELF_TEST_FAILURE" value="00000123" /> + <BugCheck text="WHEA_UNCORRECTABLE_ERROR" value="00000124" /> + <BugCheck text="NMR_INVALID_STATE" value="00000125" /> + <BugCheck text="NETIO_INVALID_POOL_CALLER" value="00000126" /> + <BugCheck text="PAGE_NOT_ZERO" value="00000127" /> + <BugCheck text="WORKER_THREAD_RETURNED_WITH_BAD_IO_PRIORITY" value="00000128" /> + <BugCheck text="WORKER_THREAD_RETURNED_WITH_BAD_PAGING_IO_PRIORITY" value="00000129" /> + <BugCheck text="MUI_NO_VALID_SYSTEM_LANGUAGE" value="0000012A" /> + <BugCheck text="FAULTY_HARDWARE_CORRUPTED_PAGE" value="0000012B" /> + <BugCheck text="WINLOGON_FATAL_ERROR" value="C000021A" /> + <BugCheck text="MANUALLY_INITIATED_CRASH1" value="DEADDEAD" /> +</BugCheckList> Propchange: trunk/tools/Message Translator/GUI/Resources/bugcheck.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/Message Translator/MsgTrans.Library/ErrorCommand.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… ============================================================================== --- trunk/tools/Message Translator/MsgTrans.Library/ErrorCommand.cs [iso-8859-1] (original) +++ trunk/tools/Message Translator/MsgTrans.Library/ErrorCommand.cs [iso-8859-1] Sun Aug 17 10:37:54 2008 @@ -12,12 +12,14 @@ public ErrorCommand(MessageTranslator msgTrans, string ntstatusXml, string winerrorXml, - string hresultXml) + string hresultXml, + string bugcheckXml) : base(msgTrans) { errorCommands.Add(new WinerrorCommand(msgTrans, winerrorXml)); errorCommands.Add(new NtStatusCommand(msgTrans, ntstatusXml)); errorCommands.Add(new HResultCommand(msgTrans, hresultXml)); + errorCommands.Add(new BugCheckCommand(msgTrans, bugcheckXml)); errorCommands.Add(new CustomCommand(msgTrans)); } Modified: trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.Library.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… ============================================================================== --- trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.Library.csproj [iso-8859-1] (original) +++ trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.Library.csproj [iso-8859-1] Sun Aug 17 10:37:54 2008 @@ -44,6 +44,7 @@ </Target> --> <ItemGroup> + <Compile Include="bugcheck.cs" /> <Compile Include="BugCommand.cs" /> <Compile Include="CustomCommand.cs" /> <Compile Include="XmlCommand.cs" /> Modified: trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… ============================================================================== --- trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.cs [iso-8859-1] (original) +++ trunk/tools/Message Translator/MsgTrans.Library/MsgTrans.cs [iso-8859-1] Sun Aug 17 10:37:54 2008 @@ -68,6 +68,7 @@ string ntstatusXml, string winerrorXml, string hresultXml, + string bugcheckXml, string wmXml, string bugUrl) { @@ -76,7 +77,8 @@ commands.Add(new ErrorCommand(this, ntstatusXml, winerrorXml, - hresultXml)); + hresultXml, + bugcheckXml)); commands.Add(new WMCommand(this, wmXml)); commands.Add(new BugCommand(this, bugUrl)); } Added: trunk/tools/Message Translator/MsgTrans.Library/bugcheck.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/Message%20Translator/MsgTran… ============================================================================== --- trunk/tools/Message Translator/MsgTrans.Library/bugcheck.cs (added) +++ trunk/tools/Message Translator/MsgTrans.Library/bugcheck.cs [iso-8859-1] Sun Aug 17 10:37:54 2008 @@ -1,0 +1,71 @@ +ï»¿using System; +using System.Xml; + +namespace MsgTrans.Library +{ + public class BugCheckCommand : XmlCommand + { + public BugCheckCommand(MessageTranslator msgTrans, + string bugcheckXml) + : base(msgTrans, bugcheckXml) + { + } + + public override string[] AvailableCommands + { + get { return new string[] { "bugcheck" }; } + } + + public override bool Handle(MessageContext context, + string commandName, + string parameters) + { + string bugcheckText = parameters; + if (bugcheckText.Equals(String.Empty)) + { + return false; + } + + NumberParser np = new NumberParser(); + if (!np.Parse(bugcheckText)) + { + return false; + } + + string description = GetBugCheckDescription(np.Decimal); + if (description != null) + { + AddMessage(MessageType.BugCheck, + np.Decimal, + np.Hex, + description, + null); + + return true; + } + + return false; + } + + public override string Help() + { + return "ntstatus <value>"; + } + + public string GetBugCheckDescription(long stopcode) + { + XmlElement root = base.m_XmlDocument.DocumentElement; + XmlNode node = root.SelectSingleNode(String.Format("BugCheck[@value='{0}']", + stopcode.ToString("X8"))); + if (node != null) + { + XmlAttribute text = node.Attributes["text"]; + if (text == null) + throw new Exception("Node has no text attribute."); + return text.Value; + } + else + return null; + } + } +}

1 0

[sginsberg] 35407: - Remove two more files by moving their tiny contents (one stub, one 2 line function) to mm.c
by sginsberg＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: sginsberg Date: Sun Aug 17 07:17:08 2008 New Revision: 35407 URL: http://svn.reactos.org/svn/reactos?rev=35407&view=rev Log: - Remove two more files by moving their tiny contents (one stub, one 2 line function) to mm.c Removed: trunk/reactos/ntoskrnl/mm/pagfault.c trunk/reactos/ntoskrnl/mm/paging.c Modified: trunk/reactos/ntoskrnl/mm/mm.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mm.c?rev=35407… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mm.c [iso-8859-1] Sun Aug 17 07:17:08 2008 @@ -367,6 +367,31 @@ /* Miscellanea functions: they may fit somewhere else */ /* + * @implemented + */ +BOOLEAN +NTAPI +MmIsRecursiveIoFault (VOID) +{ + PETHREAD Thread = PsGetCurrentThread(); + + return (Thread->DisablePageFaultClustering | Thread->ForwardClusterOnly); +} + +/* + * @unimplemented + */ +NTSTATUS +NTAPI +MmMapUserAddressesToPage(IN PVOID BaseAddress, + IN SIZE_T NumberOfBytes, + IN PVOID PageAddress) +{ + UNIMPLEMENTED; + return STATUS_NOT_IMPLEMENTED; +} + +/* * @unimplemented */ ULONG NTAPI Removed: trunk/reactos/ntoskrnl/mm/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagfault.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pagfault.c (removed) @@ -1,30 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/pagfault.c - * PURPOSE: No purpose listed. - * - * PROGRAMMERS: No programmer listed. - */ - - -#include <ntoskrnl.h> - -/* - * @implemented - */ -BOOLEAN -STDCALL -MmIsRecursiveIoFault ( - VOID -) -{ - PETHREAD Thread = PsGetCurrentThread (); - - return ( Thread->DisablePageFaultClustering - | Thread->ForwardClusterOnly - ); -} - - -/* EOF */ Removed: trunk/reactos/ntoskrnl/mm/paging.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/paging.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/paging.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/paging.c (removed) @@ -1,31 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/paging.c - * PURPOSE: Paging file functions - * - * PROGRAMMERS: David Welch (welch(a)mcmail.com) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#include <internal/debug.h> - - -/* FUNCTIONS *****************************************************************/ - -/* - * @unimplemented - */ -NTSTATUS -STDCALL -MmMapUserAddressesToPage ( - IN PVOID BaseAddress, - IN SIZE_T NumberOfBytes, - IN PVOID PageAddress - ) -{ - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; -} Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Aug 17 07:17:08 2008 @@ -379,8 +379,6 @@ <file>npool.c</file> <file>pagefile.c</file> <file>pageop.c</file> - <file>pagfault.c</file> - <file>paging.c</file> <file>pe.c</file> <file>physical.c</file> <file>pool.c</file>

1 0

[sginsberg] 35406: - Remove dead pager.c - Remove empty aspace.c - Move MmKernelAddressSpace to a header
by sginsberg＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: sginsberg Date: Sun Aug 17 07:05:28 2008 New Revision: 35406 URL: http://svn.reactos.org/svn/reactos?rev=35406&view=rev Log: - Remove dead pager.c - Remove empty aspace.c - Move MmKernelAddressSpace to a header Removed: trunk/reactos/ntoskrnl/mm/aspace.c trunk/reactos/ntoskrnl/mm/pager.c Modified: trunk/reactos/ntoskrnl/include/internal/mm.h trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Sun Aug 17 07:05:28 2008 @@ -388,6 +388,8 @@ BOOLEAN Dirty ); +PMM_AVL_TABLE MmKernelAddressSpace; + /* marea.c *******************************************************************/ NTSTATUS Removed: trunk/reactos/ntoskrnl/mm/aspace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/aspace.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/mm/aspace.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/aspace.c (removed) @@ -1,27 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/aspace.c - * PURPOSE: Manages address spaces - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - */ - -/* INCLUDES *****************************************************************/ - -#include <ntoskrnl.h> -#include <internal/debug.h> - -#if defined (ALLOC_PRAGMA) -#pragma alloc_text(INIT, MmInitializeKernelAddressSpace) -#endif - - -/* GLOBALS ******************************************************************/ - -PMM_AVL_TABLE MmKernelAddressSpace; - -/* FUNCTIONS *****************************************************************/ - - -/* EOF */ Removed: trunk/reactos/ntoskrnl/mm/pager.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pager.c?rev=35… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pager.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pager.c (removed) @@ -1,109 +1,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/pager.c - * PURPOSE: Moves infrequently used data out of memory - * - * PROGRAMMERS: David Welch (welch(a)cwcom.net) - */ - -/* INCLUDES ****************************************************************/ - -#include <ntoskrnl.h> -#define NDEBUG -#include <internal/debug.h> - -/* GLOBALS *******************************************************************/ - -#if 0 -static HANDLE PagerThreadHandle; -static CLIENT_ID PagerThreadId; -static KEVENT PagerThreadEvent; -static BOOLEAN PagerThreadShouldTerminate; -static ULONG PagerThreadWorkCount; -#endif - -/* FUNCTIONS *****************************************************************/ - -#if 0 -BOOLEAN -MiIsPagerThread(VOID) -{ - return(PsGetCurrentThreadId() == PagerThreadId.UniqueThread); -} - -VOID -MiStartPagerThread(VOID) -{ - ULONG WasWorking; - - WasWorking = InterlockedIncrement(&PagerThreadWorkCount); - if (WasWorking == 1) - { - KeSetEvent(&PagerThreadEvent, IO_NO_INCREMENT, FALSE); - } -} - -VOID -MiStopPagerThread(VOID) -{ - (VOID)InterlockedDecrement(&PagerThreadWorkCount); -} - -static NTSTATUS STDCALL -MmPagerThreadMain(PVOID Ignored) -{ - NTSTATUS Status; - - for(;;) - { - /* Wake for a low memory situation or a terminate request. */ - Status = KeWaitForSingleObject(&PagerThreadEvent, - 0, - KernelMode, - FALSE, - NULL); - if (!NT_SUCCESS(Status)) - { - DbgPrint("PagerThread: Wait failed\n"); - KEBUGCHECK(0); - } - if (PagerThreadShouldTerminate) - { - DbgPrint("PagerThread: Terminating\n"); - return(STATUS_SUCCESS); - } - do - { - /* Try and make some memory available to the system. */ - MmRebalanceMemoryConsumers(); - } - while(PagerThreadWorkCount > 0); - } -} - -NTSTATUS MmInitPagerThread(VOID) -{ - NTSTATUS Status; - - PagerThreadShouldTerminate = FALSE; - PagerThreadWorkCount = 0; - KeInitializeEvent(&PagerThreadEvent, - SynchronizationEvent, - FALSE); - - Status = PsCreateSystemThread(&PagerThreadHandle, - THREAD_ALL_ACCESS, - NULL, - NULL, - &PagerThreadId, - (PKSTART_ROUTINE) MmPagerThreadMain, - NULL); - if (!NT_SUCCESS(Status)) - { - return(Status); - } - - return(STATUS_SUCCESS); -} -#endif Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Sun Aug 17 07:05:28 2008 @@ -364,7 +364,6 @@ </directory> </if> <file>anonmem.c</file> - <file>aspace.c</file> <file>balance.c</file> <file>cont.c</file> <file>drvlck.c</file> @@ -380,7 +379,6 @@ <file>npool.c</file> <file>pagefile.c</file> <file>pageop.c</file> - <file>pager.c</file> <file>pagfault.c</file> <file>paging.c</file> <file>pe.c</file>

1 0

[arty] 35405: Add per-thread EIP and EIP decoding.
by arty＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: arty Date: Sun Aug 17 06:44:03 2008 New Revision: 35405 URL: http://svn.reactos.org/svn/reactos?rev=35405&view=rev Log: Add per-thread EIP and EIP decoding. Modified: trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs trunk/tools/reactosdbg/DebugProtocol/IDebugProtocol.cs trunk/tools/reactosdbg/DebugProtocol/KDBG.cs trunk/tools/reactosdbg/RosDBG/ProcThread.cs Modified: trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/Deb… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/DebugConnection.cs [iso-8859-1] Sun Aug 17 06:44:03 2008 @@ -72,7 +72,11 @@ public bool Current { get { return mCurrent; } set { mCurrent = value; } } ulong mTid; public ulong ThreadId { get { return mTid; } set { mTid = value; } } - public ThreadElement(ulong tid, bool current) { mTid = tid; mCurrent = current; } + ulong mEip; + public ulong Eip { get { return mEip; } set { mEip = value; } } + string mDescription; + public string Description { get { return mDescription; } set { mDescription = value; } } + public ThreadElement(ulong tid, bool current, ulong eip) { mTid = tid; mCurrent = current; mEip = eip; } } public class ProcessElement @@ -288,7 +292,7 @@ } else { - mAccumulateProcesses[mNewCurrentProcess].Threads[args.Tid] = new ThreadElement(args.Tid, args.Current); + mAccumulateProcesses[mNewCurrentProcess].Threads[args.Tid] = new ThreadElement(args.Tid, args.Current, args.Eip); } if (args.Current) Modified: trunk/tools/reactosdbg/DebugProtocol/IDebugProtocol.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/IDe… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/IDebugProtocol.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/IDebugProtocol.cs [iso-8859-1] Sun Aug 17 06:44:03 2008 @@ -84,10 +84,10 @@ public class ThreadListEventArgs : EventArgs { public readonly bool Reset, Current, End; - public readonly ulong Tid; + public readonly ulong Tid, Eip; public ThreadListEventArgs() { Reset = true; } public ThreadListEventArgs(bool end) { End = true; } - public ThreadListEventArgs(ulong tid, bool current) { Current = current; Tid = tid; } + public ThreadListEventArgs(ulong tid, bool current, ulong eip) { Current = current; Tid = tid; Eip = eip; } } public delegate void ThreadListEventHandler(object sender, ThreadListEventArgs args); Modified: trunk/tools/reactosdbg/DebugProtocol/KDBG.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/KDB… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/KDBG.cs [iso-8859-1] Sun Aug 17 06:44:03 2008 @@ -41,7 +41,7 @@ static Regex mProcListHeading = new Regex("PID[ \\t]+State[ \\t]+Filename.*"); static Regex mThreadListHeading = new Regex("TID[ \\t]+State[ \\t]+Prio.*"); static Regex mProcListEntry = new Regex("^(?<cur>([*]|))0x(?<pid>[0-9a-fA-F]+)[ \\t]+(?<state>.*)"); - static Regex mThreadListEntry = new Regex("^(?<cur>([*]|))0x(?<tid>[0-9a-fA-F]+)[ \\t]+(?<state>.*)"); + static Regex mThreadListEntry = new Regex("^(?<cur>([*]|))0x(?<tid>[0-9a-fA-F]+)[ \\t]+(?<state>.*)0x(?<eip>[0-9a-fA-F]*)"); bool mFirstModuleUpdate = false; bool mReceivingProcs = false; @@ -278,7 +278,7 @@ if (tidEntryMatch.Success && mReceivingThreads) { if (ThreadListEvent != null) - ThreadListEvent(this, new ThreadListEventArgs(ulong.Parse(tidEntryMatch.Groups["tid"].ToString(), NumberStyles.HexNumber), tidEntryMatch.Groups["cur"].Length > 0)); + ThreadListEvent(this, new ThreadListEventArgs(ulong.Parse(tidEntryMatch.Groups["tid"].ToString(), NumberStyles.HexNumber), tidEntryMatch.Groups["cur"].Length > 0, ulong.Parse(tidEntryMatch.Groups["eip"].ToString(), NumberStyles.HexNumber))); } else { Modified: trunk/tools/reactosdbg/RosDBG/ProcThread.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/ProcThread… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/ProcThread.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/ProcThread.cs [iso-8859-1] Sun Aug 17 06:44:03 2008 @@ -7,13 +7,15 @@ using System.Text; using System.Windows.Forms; using DebugProtocol; +using DbgHelpAPI; namespace RosDBG { [DebugControl, BuildAtStartup] - public partial class ProcThread : UserControl, IUseDebugConnection + public partial class ProcThread : UserControl, IUseDebugConnection, IUseSymbols { DebugConnection mConnection; + SymbolContext mSymcon; Dictionary<ulong, ProcessElement> mProcesses = new Dictionary<ulong,ProcessElement>(); public ProcThread() @@ -25,6 +27,11 @@ { mConnection = conn; mConnection.DebugProcessThreadChangeEvent += DebugProcessThreadChangeEvent; + } + + public void SetSymbolProvider(SymbolContext symcon) + { + mSymcon = symcon; } void DebugProcessThreadChangeEvent(object sender, DebugProcessThreadChangeEventArgs args) @@ -40,7 +47,13 @@ { if (pe.Current) { - Threads.DataSource = new List<ThreadElement>(mProcesses[pe.ProcessId].Threads.Values); + List<ThreadElement> telist = new List<ThreadElement>(mProcesses[pe.ProcessId].Threads.Values); + foreach (ThreadElement te in telist) + { + KeyValuePair<string, int> fileLine = mSymcon.GetFileAndLine(te.Eip); + te.Description = fileLine.Key + ":" + fileLine.Value; + } + Threads.DataSource = telist; } } }

1 0

[cgutman] 35404: - Add debug prints for failure statuses
by cgutman＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: cgutman Date: Sun Aug 17 03:17:03 2008 New Revision: 35404 URL: http://svn.reactos.org/svn/reactos?rev=35404&view=rev Log: - Add debug prints for failure statuses Modified: branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c Modified: branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/dll/win32/m… ============================================================================== --- branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sun Aug 17 03:17:03 2008 @@ -286,11 +286,11 @@ case STATUS_END_OF_FILE: *Errno = WSAESHUTDOWN; break; case STATUS_PENDING: *Errno = WSA_IO_PENDING; break; case STATUS_BUFFER_TOO_SMALL: /* Fall through to STATUS_BUFFER_OVERFLOW */ - case STATUS_BUFFER_OVERFLOW: *Errno = WSAEMSGSIZE; break; + case STATUS_BUFFER_OVERFLOW: DbgPrint("MSAFD: STATUS_BUFFER_TOO_SMALL/STATUS_BUFFER_OVERFLOW\n"); *Errno = WSAEMSGSIZE; break; case STATUS_NO_MEMORY: /* Fall through to STATUS_INSUFFICIENT_RESOURCES */ - case STATUS_INSUFFICIENT_RESOURCES: *Errno = WSA_NOT_ENOUGH_MEMORY; break; - case STATUS_INVALID_CONNECTION: *Errno = WSAEAFNOSUPPORT; break; - case STATUS_REMOTE_NOT_LISTENING: *Errno = WSAECONNRESET; break; + case STATUS_INSUFFICIENT_RESOURCES: DbgPrint("MSAFD: STATUS_NO_MEMORY/STATUS_INSUFFICIENT_RESOURCES\n"); *Errno = WSA_NOT_ENOUGH_MEMORY; break; + case STATUS_INVALID_CONNECTION: DbgPrint("MSAFD: STATUS_INVALID_CONNECTION\n"); *Errno = WSAEAFNOSUPPORT; break; + case STATUS_REMOTE_NOT_LISTENING: DbgPrint("MSAFD: STATUS_REMOTE_NOT_LISTENING\n"); *Errno = WSAECONNRESET; break; default: DbgPrint("MSAFD: Error %x is unknown\n", Status); *Errno = WSAEINVAL; break;

1 0

[arty] 35403: Don't attempt to mount a partition that starts with a fat bootblock.
by arty＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: arty Date: Sun Aug 17 00:23:10 2008 New Revision: 35403 URL: http://svn.reactos.org/svn/reactos?rev=35403&view=rev Log: Don't attempt to mount a partition that starts with a fat bootblock. Modified: trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c Modified: trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/ext2/s… ============================================================================== --- trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/ext2/src/fsctrl.c [iso-8859-1] Sun Aug 17 00:23:10 2008 @@ -252,6 +252,14 @@ Ext2PerformVerifyDiskRead ( TargetDeviceObject, BootSector, StartingOffset, NumberOfBytesToRead ); + // Reject a volume that contains fat artifacts + + DebugTrace(DEBUG_TRACE_MOUNT, "OEM[%s]", BootSector->Oem); + if (BootSector->Oem[0]) + { + try_return (STATUS_WRONG_VOLUME); + } + // Allocating memory for reading in Super Block... SuperBlock = Ext2AllocatePool( PagedPool, NumberOfBytesToRead );

1 0

[ros-arm-bringup] 35402: Make RAM disk support work on x86 as well (it is now generic): 1) Don't assert if loaded from setup. On NT this means special things, but we don't care about that for now. 2) Add to txtsetup.sif along with the other core FS drivers. This will eventually allow installing from ramdisk as well (and later, over the network) 3) Add to hivesys_i386.inf so that the driver is initialized. RAM disk now works flawlessly on x86 -- just make sure to follow the previous instructions,
by ros-arm-bringup＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: ros-arm-bringup Date: Sat Aug 16 21:35:30 2008 New Revision: 35402 URL: http://svn.reactos.org/svn/reactos?rev=35402&view=rev Log: Make RAM disk support work on x86 as well (it is now generic): 1) Don't assert if loaded from setup. On NT this means special things, but we don't care about that for now. 2) Add to txtsetup.sif along with the other core FS drivers. This will eventually allow installing from ramdisk as well (and later, over the network) 3) Add to hivesys_i386.inf so that the driver is initialized. RAM disk now works flawlessly on x86 -- just make sure to follow the previous instructions, and add <size of your RAM disk> to your total memory available to ReactOS. Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Sat Aug 16 21:35:30 2008 @@ -24,6 +24,10 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E975-E325-11CE-BFC1-08002BE10318}","Installer32",0x00000000,"NetCfgx.dll,NetClassInstaller" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E975-E325-11CE-BFC1-08002BE10318}","NoDisplayClass",0x00000000,"1" HKLM,"SYSTEM\CurrentControlSet\Control\Class\{4D36E975-E325-11CE-BFC1-08002BE10318}","NoInstallClass",0x00000000,"1" + +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{9D6D66A6-0B0C-4563-9077-A0E9A7955AE4}",,0x00000000,"Ramdisk" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{9D6D66A6-0B0C-4563-9077-A0E9A7955AE4}","Class",0x00000000,"Ramdisk" +HKLM,"SYSTEM\CurrentControlSet\Control\Class\{9D6D66A6-0B0C-4563-9077-A0E9A7955AE4}","Icon",0x00000000,"-5" ; Default computer name settings HKLM,"SYSTEM\CurrentControlSet\Control\ComputerName",,0x00000012 @@ -1025,6 +1029,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Start",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\fastfat","Type",0x00010001,0x00000002 +; RAM Disk class driver +HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","Group",0x00000000,"Boot File System" +HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","ImagePath",0x00020000,"system32\drivers\ramdisk.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\RamDisk","Type",0x00010001,0x00000002 + ; EXT2 Filesystem driver HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","ErrorControl",0x00010001,0x00000000 HKLM,"SYSTEM\CurrentControlSet\Services\Ext2fs","Group",0x00000000,"Boot File System" Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Sat Aug 16 21:35:30 2008 @@ -33,6 +33,7 @@ scsiport.sys=,,,,,,x,,,,,,4 uniata.sys=,,,,,,,,,,,,4 fastfat.sys=,,,,,,x,,,,,,4 +ramdisk.sys=,,,,,,x,,,,,,4 ext2.sys=,,,,,,x,,,,,,4 [HardwareIdsDatabase] Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sat Aug 16 21:35:30 2008 @@ -2284,7 +2284,7 @@ // // Are we being booted from setup? Not yet supported // - ASSERT (!KeLoaderBlock->SetupLdrBlock); + //ASSERT(!KeLoaderBlock->SetupLdrBlock); } // @@ -2308,6 +2308,7 @@ PCHAR BootDeviceName, CommandLine; PDEVICE_OBJECT PhysicalDeviceObject = NULL; NTSTATUS Status; + DPRINT1("RAM Disk Driver Initialized\n"); // // Query ramdisk parameters @@ -2399,7 +2400,7 @@ // // Installing from Ramdisk isn't supported yet // - ASSERT(!KeLoaderBlock->SetupLdrBlock); + //ASSERT(!KeLoaderBlock->SetupLdrBlock); // // Are we reporting the device

1 0

[ros-arm-bringup] 35401: FreeLDR-side of RAM Disk support for x86 based on actual NT implementation (instead of ARM-only hacks): 1) First, remove the hack in bootmgr.c that looked for a reactos.img. 2) Instead, read the command line to the kernel, and check for /RDIMAGEPATH. If found, load the ramdisk in the loader. 3) This uses the same routine as the previous hack, but enhances it with actual status and progress printouts. 4) Finally, update usetup to generate a ReactOS (RAM Disk) entry on DBG
by ros-arm-bringup＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: ros-arm-bringup Date: Sat Aug 16 21:01:30 2008 New Revision: 35401 URL: http://svn.reactos.org/svn/reactos?rev=35401&view=rev Log: FreeLDR-side of RAM Disk support for x86 based on actual NT implementation (instead of ARM-only hacks): 1) First, remove the hack in bootmgr.c that looked for a reactos.img. 2) Instead, read the command line to the kernel, and check for /RDIMAGEPATH. If found, load the ramdisk in the loader. 3) This uses the same routine as the previous hack, but enhances it with actual status and progress printouts. 4) Finally, update usetup to generate a ReactOS (RAM Disk) entry on DBG builds, under the WinLDR one. Also fixed a bug where, on MiniTUI, the text sent to UiDrawProgressBarCenter would be ignored. This patch does not result in working RAM disk support yet. To test the FreeLDR side of things, you need to create a ramdisk file: this is easy. Preferred way right now is to use qemu-img to create a standard QEMU image. Then install ReactOS on it and configure it. This is now your ramdisk. Make your image about 100MB; this is how much ReactOS requires to install right now. Now on your "official" QEMU image, you can delete everything except freeldr.sys and freeldr.ini. Or don't, if it's large enough. Now add the reactos.img to your official image. You should have at least 100MB free space. Now when you boot the ReactOS (RAM disk) entry, it should boot up until the kernel, which will panic since there's no ramdisk support yet. Note that you can't just create a QEMU image and drop files in it -- it must be properly formatted and have the ReactOS boot sector: The RAM disk isn't just a collection of files, it's an entire virtual drive, so that's why you must first officially install ReactOS on it. Modified: trunk/reactos/base/setup/usetup/bootsup.c trunk/reactos/boot/freeldr/freeldr/bootmgr.c trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c trunk/reactos/boot/freeldr/freeldr/ui/minitui.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Sat Aug 16 21:01:30 2008 @@ -387,6 +387,13 @@ INSERT_LAST, L"ReactOS_WinLdr", L"\"ReactOS (WinLdr)\""); + + /* ReactOS_Ram="ReactOS (RAM Disk)" */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"ReactOS_Ram", + L"\"ReactOS (RAM Disk)\""); #endif /* Create "ReactOS" section */ @@ -444,7 +451,7 @@ IniSection = IniCacheAppendSection(IniCache, L"ReactOS_WinLdr"); - /* BootType=ReactOS */ + /* BootType=Windows2003 */ IniCacheInsertKey(IniSection, NULL, INSERT_LAST, @@ -464,6 +471,31 @@ INSERT_LAST, L"Options", L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS"); + + /* Create "ReactOS_WinLdr" section */ + IniSection = IniCacheAppendSection(IniCache, + L"ReactOS_Ram"); + + /* BootType=ReactOS */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"BootType", + L"ReactOS"); + + /* SystemPath=ramdisk(0)\\ReactOS */ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"SystemPath", + L"ramdisk(0)\\ReactOS"); + + /* Options=/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /RDIMAGEPATH=reactos.img /RDIMAGEOFFSET=32256*/ + IniCacheInsertKey(IniSection, + NULL, + INSERT_LAST, + L"Options", + L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /RDIMAGEPATH=reactos.img /RDIMAGEOFFSET=32256"); #endif /* Save the ini file */ Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootm… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Sat Aug 16 21:01:30 2008 @@ -37,14 +37,6 @@ return; } - // - // Check if we have a virtual RAM disk - // This is for x86 emulation -- on real hardware, the RAM disk will be - // located in one of the hardware memory descriptors as well as on the - // freeldr command-line - // - RamDiskCheckForVirtualFile(); - if (!IniFileInitialize()) { UiMessageBoxCritical("Error initializing .ini file"); Modified: trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/disk/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/disk/ramdisk.c [iso-8859-1] Sat Aug 16 21:01:30 2008 @@ -27,7 +27,7 @@ // // Return data from our RAM Disk // - assert(((ULONG_PTR)gRamDiskBase + (ULONG_PTR)Offset) < + ASSERT(((ULONG_PTR)gRamDiskBase + (ULONG_PTR)Offset) < ((ULONG_PTR)gRamDiskBase + (ULONG_PTR)gRamDiskSize)); return (PVOID)((ULONG_PTR)gRamDiskBase + (ULONG_PTR)(Offset)); } @@ -83,35 +83,41 @@ VOID NTAPI -RamDiskCheckForVirtualFile(VOID) +RamDiskLoadVirtualFile(IN PCHAR FileName) { PFILE RamFile; ULONG TotalRead, ChunkSize; - + PCHAR MsgBuffer = "Loading ramdisk..."; + ULONG PercentPerChunk, Percent; + + // + // Display progress + // + UiDrawProgressBarCenter(1, 100, MsgBuffer); + // // Try opening the ramdisk file (this assumes the boot volume was opened) - // - RamFile = FsOpenFile("reactos.img"); + // + RamFile = FsOpenFile(FileName); if (RamFile) { // // Get the file size // gRamDiskSize = FsGetFileSize(RamFile); - TuiPrintf("Found virtual ramdisk (%dKB)\n", gRamDiskSize / 1024); if (!gRamDiskSize) return; // // Allocate memory for it // ChunkSize = 8 * 1024 * 1024; + Percent = PercentPerChunk = 100 / (gRamDiskSize / ChunkSize); gRamDiskBase = MmAllocateMemory(gRamDiskSize); if (!gRamDiskBase) return; - + // // Read it in chunks // - TuiPrintf("Loading ramdisk @ 0x%x...", gRamDiskBase); for (TotalRead = 0; TotalRead < gRamDiskSize; TotalRead += ChunkSize) { // @@ -124,11 +130,17 @@ // ChunkSize = gRamDiskSize - TotalRead; } - + + // + // Draw progress + // + UiDrawProgressBarCenter(Percent, 100, MsgBuffer); + Percent += PercentPerChunk; + // // Copy the contents // - TuiPrintf("."); + if (!FsReadFile(RamFile, ChunkSize, NULL, @@ -137,10 +149,9 @@ // // Fail // - TuiPrintf("Failed to read ramdisk\n"); + UiMessageBox("Failed to read ramdisk\n"); } } - TuiPrintf("\n"); } } Modified: trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/ramdisk.h [iso-8859-1] Sat Aug 16 21:01:30 2008 @@ -20,8 +20,8 @@ VOID NTAPI -RamDiskCheckForVirtualFile( - VOID +RamDiskLoadVirtualFile( + IN PCHAR FileName ); extern PVOID gRamDiskBase; Modified: trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/reactos/reactos.c [iso-8859-1] Sat Aug 16 21:01:30 2008 @@ -40,7 +40,7 @@ CHAR szHalName[255]; CHAR szBootPath[255]; CHAR SystemRoot[255]; -static CHAR szLoadingMsg[] = "Loading ReactOS..."; +static CHAR szLoadingMsg[] = "ReactOS is loading files..."; BOOLEAN FrLdrBootType; ULONG_PTR KernelBase; ROS_KERNEL_ENTRY_POINT KernelEntryPoint; @@ -576,6 +576,11 @@ PVOID LoadBase; ULONG_PTR Base; ULONG Size; + + // + // Backdrop + // + UiDrawBackdrop(); // // Open the operating system section @@ -588,13 +593,40 @@ return; } - UiDrawBackdrop(); + // + // Read the command line + // + if (IniReadSettingByName(SectionId, "Options", value, sizeof(value))) + { + // + // Check if a ramdisk file was given + // + PCHAR File; + File = strstr(value, "/RDIMAGEPATH="); + if (File) + { + // + // Copy the file name and everything else after it + // + strcpy(szFileName, File + 13); + + // + // Null-terminate + // + *strstr(szFileName, " ") = ANSI_NULL; + + // + // Load the ramdisk + // + RamDiskLoadVirtualFile(szFileName); + } + } + + /* + * Setup multiboot information structure + */ + UiDrawProgressBarCenter(1, 100, szLoadingMsg); UiDrawStatusText("Detecting Hardware..."); - UiDrawProgressBarCenter(1, 100, szLoadingMsg); - - /* - * Setup multiboot information structure - */ LoaderBlock.CommandLine = reactos_kernel_cmdline; LoaderBlock.PageDirectoryStart = (ULONG)&PageDirectoryStart; LoaderBlock.PageDirectoryEnd = (ULONG)&PageDirectoryEnd; Modified: trunk/reactos/boot/freeldr/freeldr/ui/minitui.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/mi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/ui/minitui.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/ui/minitui.c [iso-8859-1] Sat Aug 16 21:01:30 2008 @@ -65,7 +65,7 @@ // // Draw the "Loading..." text // - TuiDrawCenteredText(Left + 2, Top + 1, Right - 2, Top + 1, "ReactOS is loading files...", ATTR(7, 0)); + TuiDrawCenteredText(Left + 2, Top + 1, Right - 2, Top + 1, ProgressText, ATTR(7, 0)); // Draw the percent complete for (i=0; i<(Position*ProgressBarWidth)/Range; i++)

1 0

[jimtabor] 35400: - Add timer handle type.
by jimtabor＠svn.reactos.org 17 Aug '08

17 Aug '08

Author: jimtabor Date: Sat Aug 16 19:46:51 2008 New Revision: 35400 URL: http://svn.reactos.org/svn/reactos?rev=35400&view=rev Log: - Add timer handle type. Modified: trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/subsystems/win32/win32k/include/object.h Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Sat Aug 16 19:46:51 2008 @@ -187,6 +187,7 @@ #define VALIDATE_TYPE_ACCEL 8 #define VALIDATE_TYPE_MONITOR 12 #define VALIDATE_TYPE_EVENT 15 +#define VALIDATE_TYPE_TIMER 16 #define FIRST_USER_HANDLE 0x0020 /* first possible value for low word of user handle */ #define LAST_USER_HANDLE 0xffef /* last possible value for low word of user handle */ Modified: trunk/reactos/subsystems/win32/win32k/include/object.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/include/object.h [iso-8859-1] Sat Aug 16 19:46:51 2008 @@ -51,7 +51,8 @@ otCallProc = 7, otAccel, otMonitor = 12, - otEvent = 15 + otEvent = 15, + otTimer } USER_OBJECT_TYPE;

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