Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[pschweitzer] 34991: Updated French translation for shell32. Also fixed typo, even if I thought I already did it!?

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Fri Aug 1 04:14:56 2008 New Revision: 34991 URL: http://svn.reactos.org/svn/reactos?rev=34991&view=rev Log: Updated French translation for shell32. Also fixed typo, even if I thought I already did it!? Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Fri Aug 1 04:14:56 2008 @@ -101,7 +101,7 @@ BEGIN LTEXT "", IDD_TITLE, 10, 8, 198, 24 LTEXT "", IDD_STATUS, 10, 25, 198, 12 - LTEXT "Dossier:", IDD_FOLDER, 10, 152, 40, 12 + LTEXT "Dossier :", IDD_FOLDER, 10, 152, 40, 12 CONTROL "", IDD_TREEVIEW, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | WS_BORDER | WS_TABSTOP, 12, 38, 194, 105 EDITTEXT IDD_FOLDERTEXT, 46, 150, 160, 14, WS_BORDER | WS_GROUP | WS_TABSTOP PUSHBUTTON "Créer un nouveau dossier", IDD_MAKENEWFOLDER, 12, 174, 77, 14, WS_GROUP | WS_TABSTOP @@ -171,19 +171,19 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN ICON "", 14000, 10, 4, 30, 30, WS_VISIBLE - LTEXT "Type de la cible:", 14004, 8, 38, 64, 10 + LTEXT "Type de la cible :", 14004, 8, 38, 64, 10 LTEXT "", 14005, 78, 38, 142, 10 - LTEXT "Localisation de la cible:", 14006, 8, 58, 64, 10 + LTEXT "Localisation de la cible :", 14006, 8, 58, 64, 10 LTEXT "", 14007, 79, 58, 141, 10 - LTEXT "Cible:", 14008, 8, 77, 45, 10 + LTEXT "Cible :", 14008, 8, 77, 45, 10 EDITTEXT 14009, 79, 75, 150, 14, ES_AUTOHSCROLL - LTEXT "Démarrer dans:", 14010, 8, 96, 57, 10 + LTEXT "Démarrer dans :", 14010, 8, 96, 57, 10 EDITTEXT 14011, 79, 94, 150, 14, ES_AUTOHSCROLL - LTEXT "Touche de raccourci:", 14014, 8, 115, 57, 10 + LTEXT "Touche de raccourci :", 14014, 8, 115, 57, 10 EDITTEXT 14015, 79, 112, 150, 14, ES_LEFT - LTEXT "Exécuter:", 14016, 8, 134, 57, 10 + LTEXT "Exécuter :", 14016, 8, 134, 57, 10 EDITTEXT 14017, 79, 131, 150, 14, ES_AUTOHSCROLL - LTEXT "C&ommentaire:", 14018, 8, 152, 57, 10 + LTEXT "C&ommentaire :", 14018, 8, 152, 57, 10 EDITTEXT 14019, 79, 149, 150, 14, ES_AUTOHSCROLL PUSHBUTTON "Trouver la cible...", 14020, 9, 172, 70, 14, ES_LEFT PUSHBUTTON "&Changer d'icône...", 14021, 84, 172, 70, 14, ES_LEFT @@ -210,18 +210,18 @@ BEGIN ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY - LTEXT "Type of file:", 14004, 8, 35, 50, 10 - LTEXT "Folder", 14005, 68, 35, 160, 10 - LTEXT "Location:", 14006, 8, 53, 50, 10 + LTEXT "Type de fichier :", 14004, 8, 35, 50, 10 + LTEXT "Dossier", 14005, 68, 35, 160, 10 + LTEXT "Localisation :", 14006, 8, 53, 50, 10 LTEXT "", 14007, 68, 53, 315, 10 - LTEXT "Size:", 14008, 8, 72, 45, 10 + LTEXT "Taille :", 14008, 8, 72, 45, 10 LTEXT "", 14009, 68, 72, 315, 10 - LTEXT "Contains:", 14010, 8, 93, 45, 10 + LTEXT "Contient :", 14010, 8, 93, 45, 10 LTEXT "", 14011, 68, 93, 160, 10 - LTEXT "Created:", 14014, 8, 118, 45, 10 + LTEXT "Créé :", 14014, 8, 118, 45, 10 LTEXT "", 14015, 68, 118, 160, 10 - AUTOCHECKBOX "&Read-only", 14021, 45, 150, 67, 10 - AUTOCHECKBOX "&Hidden", 14022, 126, 150, 50, 10 + AUTOCHECKBOX "Lectu&re-seule", 14021, 45, 150, 67, 10 + AUTOCHECKBOX "Cac&hé", 14022, 126, 150, 50, 10 END SHELL_FILE_GENERAL_DLG DIALOGEX 0, 0, 240, 205 @@ -231,21 +231,21 @@ BEGIN ICON "", 14000, 10, 3, 30, 30, WS_VISIBLE EDITTEXT 14001, 70, 9, 158, 14, ES_LEFT | ES_READONLY - LTEXT "Type de fichier:", 14004, 8, 35, 50, 10 + LTEXT "Type de fichier :", 14004, 8, 35, 50, 10 LTEXT "Fichier", 14005, 68, 35, 160, 10 - LTEXT "Ouvrir avec:", 14006, 8, 53, 50, 10 + LTEXT "Ouvrir avec :", 14006, 8, 53, 50, 10 LTEXT "", 14007, 68, 53, 160, 10 - LTEXT "Localisation:", 14008, 8, 72, 45, 10 + LTEXT "Localisation :", 14008, 8, 72, 45, 10 LTEXT "", 14009, 68, 72, 315, 10 - LTEXT "Taille:", 14010, 8, 93, 45, 10 + LTEXT "Taille :", 14010, 8, 93, 45, 10 LTEXT "", 14011, 68, 93, 160, 10 - LTEXT "Créé:", 14014, 8, 118, 45, 10 + LTEXT "Créé :", 14014, 8, 118, 45, 10 LTEXT "", 14015, 68, 118, 160, 10 - LTEXT "Modifié:", 14016, 8, 140, 45, 10 + LTEXT "Modifié :", 14016, 8, 140, 45, 10 LTEXT "", 14017, 68, 140, 160, 10 - LTEXT "Accédé:", 14018, 8, 160, 45, 10 + LTEXT "Accédé :", 14018, 8, 160, 45, 10 LTEXT "", 14019, 68, 160, 160, 10 - LTEXT "Attributs:", 14020, 8, 189, 45, 10 + LTEXT "Attributs :", 14020, 8, 189, 45, 10 CHECKBOX "Lectu&re-seule", 14021, 58, 189, 67, 10 CHECKBOX "Cac&hé", 14022, 126, 189, 50, 10 CHECKBOX "&Archive", 14023, 181, 189, 49, 10 @@ -256,15 +256,15 @@ CAPTION "Version" FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN - LTEXT "Version du fichier: ", 14000, 10, 10, 55, 10 + LTEXT "Version du fichier : ", 14000, 10, 10, 55, 10 LTEXT "", 14001, 77, 10, 152, 10 - LTEXT "Description: ", 14002, 10, 27, 45, 10 + LTEXT "Description : ", 14002, 10, 27, 45, 10 LTEXT "", 14003, 77, 27, 152, 10 - LTEXT "Copyright: ", 14004, 10, 46, 66, 10 + LTEXT "Copyright : ", 14004, 10, 46, 66, 10 LTEXT "", 14005, 77, 46, 152, 10 - GROUPBOX "Autres informations de version: ", 14006, 6, 70, 222, 115 - LTEXT "Nom de l'élément: ", 14007, 13, 82, 50, 10 - LTEXT "Valeur: ", 14008, 112, 82, 45, 10 + GROUPBOX "Autres informations de version : ", 14006, 6, 70, 222, 115 + LTEXT "Nom de l'élément : ", 14007, 13, 82, 50, 10 + LTEXT "Valeur : ", 14008, 112, 82, 45, 10 LISTBOX 14009, 12, 94, 94, 83, LBS_STANDARD | WS_TABSTOP | LBS_NOTIFY EDITTEXT 14010, 112, 93, 109, 83, ES_LEFT | WS_BORDER | WS_VSCROLL | WS_GROUP | ES_MULTILINE | ES_READONLY END @@ -275,23 +275,23 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN EDITTEXT 14001, 40, 20, 190, 14, ES_LEFT|WS_BORDER|WS_GROUP - LTEXT "Type:", -1, 15, 55, 40, 10 + LTEXT "Type :", -1, 15, 55, 40, 10 LTEXT "", 14002, 110, 55, 100, 10 - LTEXT "Système de fichier:", -1, 15, 70, 100, 10 + LTEXT "Système de fichier :", -1, 15, 70, 100, 10 LTEXT "", 14003, 110, 70, 100, 10 CONTROL "", 14013, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 90, 10, 10 - LTEXT "Espace utilisé:", -1, 25, 90, 120, 10 + LTEXT "Espace utilisé :", -1, 25, 90, 120, 10 LTEXT "", 14004, 110, 90, 120, 10 LTEXT "", 14005, 200, 90, 40, 10 CONTROL "", 14014, "Static", SS_NOTIFY | SS_SUNKEN | SS_OWNERDRAW, 5, 105, 10, 10 - LTEXT "Espace libre:", -1, 25, 105, 70, 10 + LTEXT "Espace libre :", -1, 25, 105, 70, 10 LTEXT "", 14006, 110, 105, 120, 10 LTEXT "", 14007, 200, 105, 40, 10 - LTEXT "Capacité:", -1, 25, 125, 80, 10 + LTEXT "Capacité :", -1, 25, 125, 80, 10 LTEXT "", 14008, 110, 125, 120, 10 LTEXT "", 14009, 200, 125, 40, 10 @@ -335,12 +335,12 @@ CHECKBOX "Utilisateur actuel %s", 14000, 10, 45, 150, 10 LTEXT "Protéger mon ordinateur et mes données de l'activé de programme non autorisés", -1, 25, 57, 200, 10, WS_DISABLED CHECKBOX "Cette option peut empêcher les virus d'ordinateur d'endommager votre ordinateur ou vos données personnelles, néanmoins sélectionner cette option pourrait empêcher le programme de fonctionner correctement.", 14001, 25, 68, 200, 30, WS_DISABLED | BS_MULTILINE - CHECKBOX "L'utilisateur suivant:", 14002, 10, 100, 90, 10 - LTEXT "Nom d'utilisateur:", -1, 20, 118, 54, 10 + CHECKBOX "L'utilisateur suivant :", 14002, 10, 100, 90, 10 + LTEXT "Nom d'utilisateur :", -1, 20, 118, 54, 10 COMBOBOX 14003, 75, 115, 100, 15, CBS_DROPDOWNLIST | WS_VSCROLL | WS_VISIBLE | WS_TABSTOP PUSHBUTTON "...", 14004, 180, 115, 30, 14, WS_TABSTOP - LTEXT "Mot de passe:", -1, 20, 143, 53, 10 + LTEXT "Mot de passe :", -1, 20, 143, 53, 10 EDITTEXT 14005, 74, 140, 100, 14, ES_LEFT | WS_BORDER | WS_GROUP PUSHBUTTON "...", 14006, 180, 140, 30, 14, WS_TABSTOP PUSHBUTTON "OK", 14007, 57, 170, 60, 14, WS_TABSTOP @@ -617,14 +617,14 @@ IDS_CREATEFOLDER_CAPTION "Erreur lors de la création du nouveau dossier" IDS_DELETEITEM_CAPTION "Confirmer la suppression du fichier" IDS_DELETEFOLDER_CAPTION "Confirmer la suppression du dossier" - IDS_DELETEITEM_TEXT "Êtes-vous sûr de vouloir supprimer '%1'?" + IDS_DELETEITEM_TEXT "Êtes-vous sûr de vouloir supprimer '%1' ?" IDS_DELETEMULTIPLE_TEXT "Êtes-vous sûr de vouloir supprimer ces %1 éléments ?" - IDS_DELETESELECTED_TEXT "Êtes-vous sûr de vouloir supprimer l(es) élement(s) sélectionné(s)?" - IDS_TRASHITEM_TEXT "Êtes-vous sûr de vouloir envoyer '%1' à la Corbeille?" - IDS_TRASHFOLDER_TEXT "Êtes-vous sûr de vouloir envoyer '%1' et tout ce qu'il contient à la Corbeille?" - IDS_TRASHMULTIPLE_TEXT "Êtes-vous sûr de vouloir envoyer ces %1 éléments à la Corbeille?" - IDS_CANTTRASH_TEXT "L'élément '%1' ne peut être envoyé à la Corbeille. Voulez-vous le supprimer?" - IDS_OVERWRITEFILE_TEXT "Ce dossier contient déjà un fichier nommé '%1'.\n\nVoulez-vous le remplacer?" + IDS_DELETESELECTED_TEXT "Êtes-vous sûr de vouloir supprimer l(es) élement(s) sélectionné(s) ?" + IDS_TRASHITEM_TEXT "Êtes-vous sûr de vouloir envoyer '%1' à la Corbeille ?" + IDS_TRASHFOLDER_TEXT "Êtes-vous sûr de vouloir envoyer '%1' et tout ce qu'il contient à la Corbeille ?" + IDS_TRASHMULTIPLE_TEXT "Êtes-vous sûr de vouloir envoyer ces %1 éléments à la Corbeille ?" + IDS_CANTTRASH_TEXT "L'élément '%1' ne peut être envoyé à la Corbeille. Voulez-vous le supprimer ?" + IDS_OVERWRITEFILE_TEXT "Ce dossier contient déjà un fichier nommé '%1'.\n\nVoulez-vous le remplacer ?" IDS_OVERWRITEFILE_CAPTION "Confirmer l'écrasement du fichier" IDS_OVERWRITEFOLDER_TEXT "Ce dossier contient déjà un dossier nommé '%1'.\n\n"\ "Si les fichiers dans le dossier de destination ont les mêmes noms que ceux dans le\n"\ @@ -633,9 +633,9 @@ /* message box strings */ IDS_RESTART_TITLE "Redémarrer" - IDS_RESTART_PROMPT "Voulez-vous redémarrer votre ordinateur?" + IDS_RESTART_PROMPT "Voulez-vous redémarrer votre ordinateur ?" IDS_SHUTDOWN_TITLE "Arrêter" - IDS_SHUTDOWN_PROMPT "Voulez-vous fermer la session ReactOS?" + IDS_SHUTDOWN_PROMPT "Voulez-vous fermer la session ReactOS ?" /* shell folder path default values */ IDS_PROGRAMS "Menu Démarrer\\Programmes"

16 years, 4 months

[arty] 34990: Simple settings window with directory chooser. Avoids some embarassment.

by arty＠svn.reactos.org

Author: arty Date: Fri Aug 1 02:19:49 2008 New Revision: 34990 URL: http://svn.reactos.org/svn/reactos?rev=34990&view=rev Log: Simple settings window with directory chooser. Avoids some embarassment. Added: trunk/tools/reactosdbg/RosDBG/DirectoryChooser.Designer.cs trunk/tools/reactosdbg/RosDBG/DirectoryChooser.cs trunk/tools/reactosdbg/RosDBG/DirectoryChooser.resx trunk/tools/reactosdbg/RosDBG/Settings.Designer.cs trunk/tools/reactosdbg/RosDBG/Settings.cs trunk/tools/reactosdbg/RosDBG/Settings.resx Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/RosDBG.csproj Added: trunk/tools/reactosdbg/RosDBG/DirectoryChooser.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/DirectoryC… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/DirectoryChooser.Designer.cs (added) +++ trunk/tools/reactosdbg/RosDBG/DirectoryChooser.Designer.cs [iso-8859-1] Fri Aug 1 02:19:49 2008 @@ -1,0 +1,115 @@ +ï»¿namespace RosDBG +{ + partial class DirectoryChooser + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.DirectoryTree = new System.Windows.Forms.TreeView(); + this.OKButton = new System.Windows.Forms.Button(); + this.CancelButton = new System.Windows.Forms.Button(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.SuspendLayout(); + // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer1.IsSplitterFixed = true; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.DirectoryTree); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.OKButton); + this.splitContainer1.Panel2.Controls.Add(this.CancelButton); + this.splitContainer1.Size = new System.Drawing.Size(292, 269); + this.splitContainer1.SplitterDistance = 235; + this.splitContainer1.TabIndex = 0; + // + // DirectoryTree + // + this.DirectoryTree.Dock = System.Windows.Forms.DockStyle.Fill; + this.DirectoryTree.Location = new System.Drawing.Point(0, 0); + this.DirectoryTree.Name = "DirectoryTree"; + this.DirectoryTree.Size = new System.Drawing.Size(292, 235); + this.DirectoryTree.TabIndex = 0; + this.DirectoryTree.AfterCollapse += new System.Windows.Forms.TreeViewEventHandler(this.DirectoryTree_AfterCollapse); + this.DirectoryTree.AfterExpand += new System.Windows.Forms.TreeViewEventHandler(this.DirectoryTree_AfterExpand); + // + // OKButton + // + this.OKButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.OKButton.Location = new System.Drawing.Point(133, 3); + this.OKButton.Name = "OKButton"; + this.OKButton.Size = new System.Drawing.Size(75, 23); + this.OKButton.TabIndex = 1; + this.OKButton.Text = "OK"; + this.OKButton.UseVisualStyleBackColor = true; + this.OKButton.Click += new System.EventHandler(this.OKButton_Click); + // + // CancelButton + // + this.CancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.CancelButton.Location = new System.Drawing.Point(214, 3); + this.CancelButton.Name = "CancelButton"; + this.CancelButton.Size = new System.Drawing.Size(75, 23); + this.CancelButton.TabIndex = 0; + this.CancelButton.Text = "Cancel"; + this.CancelButton.UseVisualStyleBackColor = true; + this.CancelButton.Click += new System.EventHandler(this.CancelButton_Click); + // + // DirectoryChooser + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(292, 269); + this.Controls.Add(this.splitContainer1); + this.Name = "DirectoryChooser"; + this.Text = "DirectoryChooser"; + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + this.splitContainer1.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.SplitContainer splitContainer1; + private System.Windows.Forms.TreeView DirectoryTree; + private System.Windows.Forms.Button OKButton; + private System.Windows.Forms.Button CancelButton; + } +} Added: trunk/tools/reactosdbg/RosDBG/DirectoryChooser.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/DirectoryC… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/DirectoryChooser.cs (added) +++ trunk/tools/reactosdbg/RosDBG/DirectoryChooser.cs [iso-8859-1] Fri Aug 1 02:19:49 2008 @@ -1,0 +1,139 @@ +ï»¿using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.ComponentModel.Design; +using System.Drawing.Design; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; +using System.IO; + +namespace RosDBG +{ + public partial class DirectoryChooser : Form + { + Dictionary<string, TreeNode> mDirectories = new Dictionary<string, TreeNode>(); + + public string Value + { + get + { + TreeNode selected = DirectoryTree.SelectedNode; + if (selected == null) + return Path.GetDirectoryName(Application.ExecutablePath); + else + return (string)selected.Tag; + } + set + { + TreeNode tn = ShowNode(value); + DirectoryTree.SelectedNode = tn; + tn.EnsureVisible(); + } + } + + public DirectoryChooser() + { + InitializeComponent(); + DirectoryTree.Nodes.Clear(); + foreach (DriveInfo drive in DriveInfo.GetDrives()) + { + ShowNode(drive.RootDirectory.FullName); + } + } + + private void OKButton_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.OK; + Close(); + } + + private void CancelButton_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + + void ExpandNode(TreeNode node, string dir) + { + try + { + if (node.Nodes.Count == 1 && node.Nodes[0].Text == "...") + { + node.Nodes.Clear(); + + foreach (string subdir in Directory.GetDirectories(dir)) + { + TreeNode newNode = new TreeNode(Path.GetFileName(subdir)); + newNode.Tag = subdir; + newNode.Nodes.Add("..."); + mDirectories[subdir.ToLower()] = newNode; + node.Nodes.Add(newNode); + } + } + } + catch (IOException) + { + } + } + + TreeNode ShowNode(string dir) + { + string parentDir = Path.GetDirectoryName(dir); + TreeNode theNode; + // We reached a root + if (mDirectories.TryGetValue(dir.ToLower(), out theNode)) + { + return theNode; + } + else if (parentDir == null) + { + theNode = new TreeNode(dir); + theNode.Tag = dir; + theNode.Nodes.Add("..."); + mDirectories[dir.ToLower()] = theNode; + DirectoryTree.Nodes.Add(theNode); + return theNode; + } + else + { + theNode = ShowNode(parentDir); + ExpandNode(theNode, parentDir); + } + return ShowNode(dir); + } + + private void DirectoryTree_AfterExpand(object sender, TreeViewEventArgs e) + { + string dir = (string)e.Node.Tag; + ExpandNode(e.Node, dir); + } + + private void DirectoryTree_AfterCollapse(object sender, TreeViewEventArgs e) + { + e.Node.Nodes.Clear(); + e.Node.Nodes.Add("..."); + } + } + + public class DirectoryEditor : UITypeEditor + { + public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context) + { + return UITypeEditorEditStyle.Modal; + } + + public override object EditValue(ITypeDescriptorContext typedesc, IServiceProvider provider, object value) + { + DirectoryChooser chooser = new DirectoryChooser(); + chooser.Value = (string)value; + if (chooser.ShowDialog() == DialogResult.OK) + return chooser.Value; + else + return value; + } + } + +} Added: trunk/tools/reactosdbg/RosDBG/DirectoryChooser.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/DirectoryC… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/DirectoryChooser.resx (added) +++ trunk/tools/reactosdbg/RosDBG/DirectoryChooser.resx [iso-8859-1] Fri Aug 1 02:19:49 2008 @@ -1,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> +  + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root> Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] Fri Aug 1 02:19:49 2008 @@ -32,7 +32,6 @@ this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.fileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.openSourceFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.addSymbolFileToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.symbolDirectoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.connectSerialToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.connectPipeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -105,7 +104,6 @@ // this.fileToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.openSourceFileToolStripMenuItem, - this.addSymbolFileToolStripMenuItem, this.symbolDirectoryToolStripMenuItem, this.connectSerialToolStripMenuItem, this.connectPipeToolStripMenuItem, @@ -121,17 +119,12 @@ this.openSourceFileToolStripMenuItem.Size = new System.Drawing.Size(175, 22); this.openSourceFileToolStripMenuItem.Text = "Open Source File ..."; // - // addSymbolFileToolStripMenuItem - // - this.addSymbolFileToolStripMenuItem.Name = "addSymbolFileToolStripMenuItem"; - this.addSymbolFileToolStripMenuItem.Size = new System.Drawing.Size(175, 22); - this.addSymbolFileToolStripMenuItem.Text = "Add Symbol File ..."; - // // symbolDirectoryToolStripMenuItem // this.symbolDirectoryToolStripMenuItem.Name = "symbolDirectoryToolStripMenuItem"; this.symbolDirectoryToolStripMenuItem.Size = new System.Drawing.Size(175, 22); - this.symbolDirectoryToolStripMenuItem.Text = "Symbol Path ..."; + this.symbolDirectoryToolStripMenuItem.Text = "Settings ..."; + this.symbolDirectoryToolStripMenuItem.Click += new System.EventHandler(this.symbolDirectoryToolStripMenuItem_Click); // // connectSerialToolStripMenuItem // @@ -360,7 +353,6 @@ private System.Windows.Forms.ToolStripMenuItem continueToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem bugcheckToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem openSourceFileToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem addSymbolFileToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem symbolDirectoryToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem connectSerialToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem connectPipeToolStripMenuItem; Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Fri Aug 1 02:19:49 2008 @@ -21,7 +21,7 @@ bool mRunning; DebugConnection.Mode mConnectionMode; ulong mCurrentEip; - string mSourceRoot = ".", mCurrentFile; + string mSourceRoot = Settings.SourceDirectory, mCurrentFile; int mCurrentLine; DebugConnection mConnection = new DebugConnection(); SymbolContext mSymbolContext; @@ -90,7 +90,7 @@ mConnection.DebugRegisterChangeEvent += DebugRegisterChangeEvent; mConnection.DebugModuleChangedEvent += DebugModuleChangedEvent; ComposeTitleString(); - mSymbolContext.ReactosOutputPath = ".\\output-i386"; + mSymbolContext.ReactosOutputPath = Settings.OutputDirectory; } void DebugModuleChangedEvent(object sender, DebugModuleChangedEventArgs args) @@ -244,6 +244,13 @@ { mConnection.Go(); } + + private void symbolDirectoryToolStripMenuItem_Click(object sender, EventArgs e) + { + Settings.ShowSettings(); + mSourceRoot = Settings.SourceDirectory; + mSymbolContext.ReactosOutputPath = Settings.OutputDirectory; + } } public class InteractiveInputEventArgs : EventArgs Modified: trunk/tools/reactosdbg/RosDBG/RosDBG.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RosDBG.csp… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] Fri Aug 1 02:19:49 2008 @@ -73,6 +73,12 @@ <SubType>Code</SubType> </Compile> <Compile Include="DebugInfoFile.cs" /> + <Compile Include="DirectoryChooser.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="DirectoryChooser.Designer.cs"> + <DependentUpon>DirectoryChooser.cs</DependentUpon> + </Compile> <Compile Include="HighLevelInteraction.cs" /> <Compile Include="HostWindow.cs"> <SubType>Form</SubType> @@ -115,6 +121,10 @@ <DependentUpon>BackTrace.cs</DependentUpon> <SubType>Designer</SubType> </EmbeddedResource> + <EmbeddedResource Include="DirectoryChooser.resx"> + <DependentUpon>DirectoryChooser.cs</DependentUpon> + <SubType>Designer</SubType> + </EmbeddedResource> <EmbeddedResource Include="HostWindow.resx"> <DependentUpon>HostWindow.cs</DependentUpon> <SubType>Designer</SubType> @@ -150,6 +160,10 @@ </EmbeddedResource> <EmbeddedResource Include="RegisterView.resx"> <DependentUpon>RegisterView.cs</DependentUpon> + <SubType>Designer</SubType> + </EmbeddedResource> + <EmbeddedResource Include="Settings.resx"> + <DependentUpon>Settings.cs</DependentUpon> <SubType>Designer</SubType> </EmbeddedResource> <EmbeddedResource Include="SourceView.resx"> @@ -191,6 +205,12 @@ </Compile> <Compile Include="RegisterView.Designer.cs"> <DependentUpon>RegisterView.cs</DependentUpon> + </Compile> + <Compile Include="Settings.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="Settings.Designer.cs"> + <DependentUpon>Settings.cs</DependentUpon> </Compile> <Compile Include="SourceView.cs"> <SubType>UserControl</SubType> Added: trunk/tools/reactosdbg/RosDBG/Settings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Settings.D… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Settings.Designer.cs (added) +++ trunk/tools/reactosdbg/RosDBG/Settings.Designer.cs [iso-8859-1] Fri Aug 1 02:19:49 2008 @@ -1,0 +1,114 @@ +ï»¿namespace RosDBG +{ + partial class Settings + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.SettingsGrid = new System.Windows.Forms.PropertyGrid(); + this.OKButton = new System.Windows.Forms.Button(); + this.CancelButton = new System.Windows.Forms.Button(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.SuspendLayout(); + // + // splitContainer1 + // + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer1.IsSplitterFixed = true; + this.splitContainer1.Location = new System.Drawing.Point(0, 0); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.SettingsGrid); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.OKButton); + this.splitContainer1.Panel2.Controls.Add(this.CancelButton); + this.splitContainer1.Size = new System.Drawing.Size(415, 317); + this.splitContainer1.SplitterDistance = 284; + this.splitContainer1.TabIndex = 0; + // + // SettingsGrid + // + this.SettingsGrid.Dock = System.Windows.Forms.DockStyle.Fill; + this.SettingsGrid.Location = new System.Drawing.Point(0, 0); + this.SettingsGrid.Name = "SettingsGrid"; + this.SettingsGrid.Size = new System.Drawing.Size(415, 284); + this.SettingsGrid.TabIndex = 0; + // + // OKButton + // + this.OKButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.OKButton.Location = new System.Drawing.Point(256, 3); + this.OKButton.Name = "OKButton"; + this.OKButton.Size = new System.Drawing.Size(75, 23); + this.OKButton.TabIndex = 1; + this.OKButton.Text = "OK"; + this.OKButton.UseVisualStyleBackColor = true; + this.OKButton.Click += new System.EventHandler(this.OKButton_Click); + // + // CancelButton + // + this.CancelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.CancelButton.Location = new System.Drawing.Point(337, 3); + this.CancelButton.Name = "CancelButton"; + this.CancelButton.Size = new System.Drawing.Size(75, 23); + this.CancelButton.TabIndex = 0; + this.CancelButton.Text = "Cancel"; + this.CancelButton.UseVisualStyleBackColor = true; + this.CancelButton.Click += new System.EventHandler(this.CancelButton_Click); + // + // Settings + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(415, 317); + this.Controls.Add(this.splitContainer1); + this.Name = "Settings"; + this.Text = "Settings"; + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + this.splitContainer1.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.SplitContainer splitContainer1; + private System.Windows.Forms.PropertyGrid SettingsGrid; + private System.Windows.Forms.Button OKButton; + private System.Windows.Forms.Button CancelButton; + + } +} Added: trunk/tools/reactosdbg/RosDBG/Settings.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Settings.c… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Settings.cs (added) +++ trunk/tools/reactosdbg/RosDBG/Settings.cs [iso-8859-1] Fri Aug 1 02:19:49 2008 @@ -1,0 +1,72 @@ +ï»¿using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Configuration; +using System.Windows.Forms; +using System.ComponentModel; +using System.Drawing.Design; + +namespace RosDBG +{ + public partial class Settings : Form + { + public class SettingsPropertyValues : ApplicationSettingsBase + { + [UserScopedSetting, DefaultSettingValue("."), Editor(typeof(DirectoryEditor), typeof(UITypeEditor))] + public string SourceDirectory + { + get { return this["SourceDirectory"].ToString(); } + set { this["SourceDirectory"] = value; } + } + + [UserScopedSetting,DefaultSettingValue(".\\output-i386"),Editor(typeof(DirectoryEditor), typeof(UITypeEditor))] + public string OutputDirectory + { + get { return this["OutputDirectory"].ToString(); } + set { this["OutputDirectory"] = value; } + } + + public SettingsPropertyValues() + { + Reload(); + } + } + + static SettingsPropertyValues mProperties = new SettingsPropertyValues(); + + public static string SourceDirectory { get { return mProperties.SourceDirectory; } } + public static string OutputDirectory { get { return mProperties.OutputDirectory; } } + + Settings() + { + InitializeComponent(); + mProperties.Reload(); + SettingsGrid.SelectedObject = mProperties; + } + + public static void ShowSettings() + { + Settings s = new Settings(); + if (s.ShowDialog() == DialogResult.OK) + { + mProperties.Save(); + } + } + + private void OKButton_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.OK; + Close(); + } + + private void CancelButton_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + } +} Added: trunk/tools/reactosdbg/RosDBG/Settings.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Settings.r… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Settings.resx (added) +++ trunk/tools/reactosdbg/RosDBG/Settings.resx [iso-8859-1] Fri Aug 1 02:19:49 2008 @@ -1,0 +1,120 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> +  + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> +</root>

16 years, 4 months

[tkreuzer] 34989: Fix macros that didn't have brackets around the argument. Add FrLdrDbgPrint for debugprints. Use ULONG_PTR instead of ULONG for memory offsets and pointer values. Use RosLoaderBlock->KernelBase instead of hardcoded value for the beginning of the kernel. Now we reach KiSystemStartupReal.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jul 31 20:08:53 2008 New Revision: 34989 URL: http://svn.reactos.org/svn/reactos?rev=34989&view=rev Log: Fix macros that didn't have brackets around the argument. Add FrLdrDbgPrint for debugprints. Use ULONG_PTR instead of ULONG for memory offsets and pointer values. Use RosLoaderBlock->KernelBase instead of hardcoded value for the beginning of the kernel. Now we reach KiSystemStartupReal. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/freeldr.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/freeldr.c [iso-8859-1] Thu Jul 31 20:08:53 2008 @@ -15,10 +15,10 @@ #ifdef _M_PPC #include <ppcmmu/mmu.h> #define KERNEL_RVA(x) RVA(x,0x80800000) -#define KERNEL_DESCRIPTOR_PAGE(x) (((ULONG_PTR)x + KernelBase) >> PAGE_SHIFT) +#define KERNEL_DESCRIPTOR_PAGE(x) (((ULONG_PTR)(x) + KernelBase) >> PAGE_SHIFT) #else #define KERNEL_RVA(x) RVA(x,KSEG0_BASE) -#define KERNEL_DESCRIPTOR_PAGE(x) (((ULONG_PTR)x &~ KSEG0_BASE) >> PAGE_SHIFT) +#define KERNEL_DESCRIPTOR_PAGE(x) (((ULONG_PTR)(x) & ~KSEG0_BASE) >> PAGE_SHIFT) #endif typedef struct _BIOS_MEMORY_DESCRIPTOR @@ -28,6 +28,9 @@ } BIOS_MEMORY_DESCRIPTOR, *PBIOS_MEMORY_DESCRIPTOR; /* GLOBALS *******************************************************************/ + +/* Function pointer for early debug prints */ +ULONG (*FrLdrDbgPrint)(const char *Format, ...); /* FreeLDR Loader Data */ PROS_LOADER_PARAMETER_BLOCK KeRosLoaderBlock; @@ -869,7 +872,7 @@ VOID NTAPI KiRosFixupComponentTree(IN PCONFIGURATION_COMPONENT_DATA p, - IN ULONG i) + IN ULONG_PTR i) { PCONFIGURATION_COMPONENT pp; @@ -1144,7 +1147,7 @@ /* Now mark the remainder of the FreeLDR 6MB area as "in use" */ KiRosAllocateNtDescriptor(LoaderMemoryData, KERNEL_DESCRIPTOR_PAGE(RosEntry->ModEnd), - KERNEL_DESCRIPTOR_PAGE((0x80800000 + 0x600000)) - + KERNEL_DESCRIPTOR_PAGE((RosLoaderBlock->KernelBase + 0x600000)) - KERNEL_DESCRIPTOR_PAGE(RosEntry->ModEnd), 0, &Base); @@ -1297,12 +1300,15 @@ /* Save pointer to ROS Block */ KeRosLoaderBlock = LoaderBlock; + /* Get debugging function */ + FrLdrDbgPrint = LoaderBlock->FrLdrDbgPrint; + /* Save memory manager data */ KeMemoryMapRangeCount = 0; if (LoaderBlock->Flags & MB_FLAGS_MMAP_INFO) { /* We have a memory map from the nice BIOS */ - ent = ((PULONG)(LoaderBlock->MmapAddr - sizeof(ULONG))); + ent = ((PULONG)(LoaderBlock->MmapAddr - sizeof(ULONG))); // FIXME: this is ugly size = *ent; i = 0; @@ -1323,13 +1329,13 @@ /* Save data */ LoaderBlock->MmapLength = KeMemoryMapRangeCount * sizeof(ADDRESS_RANGE); - LoaderBlock->MmapAddr = (ULONG)KeMemoryMap; + LoaderBlock->MmapAddr = (ULONG_PTR)KeMemoryMap; } else { /* Nothing from BIOS */ LoaderBlock->MmapLength = 0; - LoaderBlock->MmapAddr = (ULONG)KeMemoryMap; + LoaderBlock->MmapAddr = (ULONG_PTR)KeMemoryMap; } #if defined(_M_IX86)

16 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2008