Ros-diffs June 2007

ros-diffs@reactos.org

21 participants
420 discussions

[greatlrd] 27329: fixing another comping issue

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 29 19:35:16 2007 New Revision: 27329 URL: http://svn.reactos.org/svn/reactos?rev=27329&view=rev Log: fixing another comping issue Modified: branches/ddk2003/include/ddk2003/cderr.h branches/ddk2003/include/ddk2003/readme.txt Modified: branches/ddk2003/include/ddk2003/cderr.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/cderr.h… ============================================================================== --- branches/ddk2003/include/ddk2003/cderr.h (original) +++ branches/ddk2003/include/ddk2003/cderr.h Fri Jun 29 19:35:16 2007 @@ -44,6 +44,7 @@ /* for Windows 2000/XP/ReactOS this is not in windows 2003 ddk */ #define FNERR_BUFFERTOOSMALL 0x3003 +#define FRERR_BUFFERLENGTHZERO 0x4001 #endif Modified: branches/ddk2003/include/ddk2003/readme.txt URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/readme.… ============================================================================== --- branches/ddk2003/include/ddk2003/readme.txt (original) +++ branches/ddk2003/include/ddk2003/readme.txt Fri Jun 29 19:35:16 2007 @@ -15,9 +15,9 @@ ------------------------------------------------------------ cderr.h -Contain one change that does not exists in windows 2003sp1 +Contain change that does not exists in windows 2003sp1 But it does exists in ddk for windows 2000/XP, -Regedit need it, it is FNERR_BUFFERTOOSMALL +it is FNERR_BUFFERTOOSMALL, FRERR_BUFFERLENGTHZERO warning.h / rpc.h Contain one change, we do not use ms seh

17 years, 5 months

[greatlrd] 27328: hack for some rc comping syntax error, need checking trunk later see if it exists

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 29 19:23:26 2007 New Revision: 27328 URL: http://svn.reactos.org/svn/reactos?rev=27328&view=rev Log: hack for some rc comping syntax error, need checking trunk later see if it exists Modified: branches/ddk2003/dll/cpl/main/lang/de-DE.rc branches/ddk2003/dll/cpl/main/lang/en-US.rc branches/ddk2003/dll/cpl/main/main.rc Modified: branches/ddk2003/dll/cpl/main/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/cpl/main/lang/de-DE… ============================================================================== --- branches/ddk2003/dll/cpl/main/lang/de-DE.rc (original) +++ branches/ddk2003/dll/cpl/main/lang/de-DE.rc Fri Jun 29 19:23:26 2007 @@ -132,12 +132,12 @@ FONT 8, "MS Shell Dlg" BEGIN GROUPBOX "Bildlauf", -1, 5, 5, 230, 80 - ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 +// ICON -1, IDC_ICON_WHEEL, 20, 35, 15, 15 LTEXT "Durch Drehen des Rades um eine Einbuchtung wird ein Bildlauf durchgeführt um:", -1, 60, 11, 150, 16 RADIOBUTTON "&Folgende Anzahl Zeilen:", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&Eine Bildschirmseite", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 +// CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 END Modified: branches/ddk2003/dll/cpl/main/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/cpl/main/lang/en-US… ============================================================================== --- branches/ddk2003/dll/cpl/main/lang/en-US.rc (original) +++ branches/ddk2003/dll/cpl/main/lang/en-US.rc Fri Jun 29 19:23:26 2007 @@ -136,7 +136,7 @@ RADIOBUTTON "The following &number of lines at a time", IDC_RADIO_WHEEL_SCROLL_LINES, 60, 30, 150, 10, WS_VISIBLE | WS_GROUP | WS_TABSTOP RADIOBUTTON "&One screen at a time", IDC_RADIO_WHEEL_SCROLL_PAGE, 60, 65, 90, 10 EDITTEXT IDC_EDIT_WHEEL_SCROLL_LINES, 70, 45, 60, 15, ES_RIGHT | WS_VISIBLE | WS_GROUP | WS_TABSTOP - CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 +// CONTROL "", IDC_UPDOWN_WHEEL_SCROLL_LINES, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER, 125, 45, 12, 12 END STRINGTABLE Modified: branches/ddk2003/dll/cpl/main/main.rc URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/cpl/main/main.rc?re… ============================================================================== --- branches/ddk2003/dll/cpl/main/main.rc (original) +++ branches/ddk2003/dll/cpl/main/main.rc Fri Jun 29 19:23:26 2007 @@ -24,16 +24,5 @@ /* include localised resources */ -#include "lang/cs-CZ.rc" #include "lang/de-DE.rc" #include "lang/en-US.rc" -#include "lang/es-ES.rc" -#include "lang/fr-FR.rc" -#include "lang/hu-HU.rc" -#include "lang/id-ID.rc" -#include "lang/it-IT.rc" -#include "lang/ja-JP.rc" -#include "lang/nl-NL.rc" -#include "lang/pl-PL.rc" -#include "lang/ru-RU.rc" -#include "lang/uk-UA.rc"

17 years, 5 months

[gedmurphy] 27327: - ensure the paths given are valid before closing the dialog - sync dialog info back to the database on close

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Jun 29 19:15:15 2007 New Revision: 27327 URL: http://svn.reactos.org/svn/reactos?rev=27327&view=rev Log: - ensure the paths given are valid before closing the dialog - sync dialog info back to the database on close Modified: trunk/tools/RosTE/GUI/ConsoleSettings.Designer.cs trunk/tools/RosTE/GUI/ConsoleSettings.cs trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/VirtualMachine.cs Modified: trunk/tools/RosTE/GUI/ConsoleSettings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/ConsoleSettings.De… ============================================================================== --- trunk/tools/RosTE/GUI/ConsoleSettings.Designer.cs (original) +++ trunk/tools/RosTE/GUI/ConsoleSettings.Designer.cs Fri Jun 29 19:15:15 2007 @@ -30,32 +30,32 @@ { this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.conUpdateNow = new System.Windows.Forms.Button(); + this.conUpdateCombo = new System.Windows.Forms.ComboBox(); this.tabPage2 = new System.Windows.Forms.TabPage(); - this.button1 = new System.Windows.Forms.Button(); - this.button2 = new System.Windows.Forms.Button(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.button5 = new System.Windows.Forms.Button(); + this.conDefVmLoc = new System.Windows.Forms.TextBox(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.button4 = new System.Windows.Forms.Button(); + this.conVdkLoc = new System.Windows.Forms.TextBox(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.button3 = new System.Windows.Forms.Button(); + this.conQemuLoc = new System.Windows.Forms.TextBox(); this.tabPage3 = new System.Windows.Forms.TabPage(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.groupBox2 = new System.Windows.Forms.GroupBox(); - this.groupBox3 = new System.Windows.Forms.GroupBox(); - this.conQemuLoc = new System.Windows.Forms.TextBox(); - this.conVdkLoc = new System.Windows.Forms.TextBox(); - this.conDefVmLoc = new System.Windows.Forms.TextBox(); - this.button3 = new System.Windows.Forms.Button(); - this.button4 = new System.Windows.Forms.Button(); - this.button5 = new System.Windows.Forms.Button(); this.conAppDebug = new System.Windows.Forms.CheckBox(); - this.groupBox4 = new System.Windows.Forms.GroupBox(); - this.conUpdateCombo = new System.Windows.Forms.ComboBox(); - this.conUpdateNow = new System.Windows.Forms.Button(); + this.conDialogOK = new System.Windows.Forms.Button(); + this.conDialogCancel = new System.Windows.Forms.Button(); this.folderBrowserDialog = new System.Windows.Forms.FolderBrowserDialog(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); + this.groupBox4.SuspendLayout(); this.tabPage2.SuspendLayout(); + this.groupBox3.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.groupBox1.SuspendLayout(); this.tabPage3.SuspendLayout(); - this.groupBox1.SuspendLayout(); - this.groupBox2.SuspendLayout(); - this.groupBox3.SuspendLayout(); - this.groupBox4.SuspendLayout(); this.SuspendLayout(); // // tabControl1 @@ -79,6 +79,39 @@ this.tabPage1.TabIndex = 0; this.tabPage1.Text = "General"; this.tabPage1.UseVisualStyleBackColor = true; + // + // groupBox4 + // + this.groupBox4.Controls.Add(this.conUpdateNow); + this.groupBox4.Controls.Add(this.conUpdateCombo); + this.groupBox4.Location = new System.Drawing.Point(6, 153); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(283, 80); + this.groupBox4.TabIndex = 0; + this.groupBox4.TabStop = false; + this.groupBox4.Text = "Check for updates"; + // + // conUpdateNow + // + this.conUpdateNow.Location = new System.Drawing.Point(202, 33); + this.conUpdateNow.Name = "conUpdateNow"; + this.conUpdateNow.Size = new System.Drawing.Size(75, 23); + this.conUpdateNow.TabIndex = 1; + this.conUpdateNow.Text = "Check now"; + this.conUpdateNow.UseVisualStyleBackColor = true; + // + // conUpdateCombo + // + this.conUpdateCombo.FormattingEnabled = true; + this.conUpdateCombo.Items.AddRange(new object[] { + "On startup", + "Daily", + "Weekly", + "Monthly"}); + this.conUpdateCombo.Location = new System.Drawing.Point(6, 33); + this.conUpdateCombo.Name = "conUpdateCombo"; + this.conUpdateCombo.Size = new System.Drawing.Size(190, 21); + this.conUpdateCombo.TabIndex = 0; // // tabPage2 // @@ -93,35 +126,61 @@ this.tabPage2.Text = "Paths"; this.tabPage2.UseVisualStyleBackColor = true; // - // button1 - // - this.button1.DialogResult = System.Windows.Forms.DialogResult.OK; - this.button1.Location = new System.Drawing.Point(159, 305); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(75, 23); - this.button1.TabIndex = 1; - this.button1.Text = "OK"; - this.button1.UseVisualStyleBackColor = true; - // - // button2 - // - this.button2.DialogResult = System.Windows.Forms.DialogResult.Cancel; - this.button2.Location = new System.Drawing.Point(240, 305); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(75, 23); - this.button2.TabIndex = 2; - this.button2.Text = "Cancel"; - this.button2.UseVisualStyleBackColor = true; - // - // tabPage3 - // - this.tabPage3.Controls.Add(this.conAppDebug); - this.tabPage3.Location = new System.Drawing.Point(4, 22); - this.tabPage3.Name = "tabPage3"; - this.tabPage3.Size = new System.Drawing.Size(295, 261); - this.tabPage3.TabIndex = 2; - this.tabPage3.Text = "Advanced"; - this.tabPage3.UseVisualStyleBackColor = true; + // groupBox3 + // + this.groupBox3.Controls.Add(this.button5); + this.groupBox3.Controls.Add(this.conDefVmLoc); + this.groupBox3.Location = new System.Drawing.Point(6, 170); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(283, 65); + this.groupBox3.TabIndex = 2; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "Default location for virtual machines"; + // + // button5 + // + this.button5.Location = new System.Drawing.Point(202, 28); + this.button5.Name = "button5"; + this.button5.Size = new System.Drawing.Size(75, 23); + this.button5.TabIndex = 1; + this.button5.Text = "Browse..."; + this.button5.UseVisualStyleBackColor = true; + this.button5.Click += new System.EventHandler(this.button5_Click); + // + // conDefVmLoc + // + this.conDefVmLoc.Location = new System.Drawing.Point(6, 30); + this.conDefVmLoc.Name = "conDefVmLoc"; + this.conDefVmLoc.Size = new System.Drawing.Size(190, 20); + this.conDefVmLoc.TabIndex = 0; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.button4); + this.groupBox2.Controls.Add(this.conVdkLoc); + this.groupBox2.Location = new System.Drawing.Point(6, 88); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(283, 65); + this.groupBox2.TabIndex = 1; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Location of VDK"; + // + // button4 + // + this.button4.Location = new System.Drawing.Point(202, 27); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(75, 23); + this.button4.TabIndex = 1; + this.button4.Text = "Browse..."; + this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.button4_Click); + // + // conVdkLoc + // + this.conVdkLoc.Location = new System.Drawing.Point(6, 29); + this.conVdkLoc.Name = "conVdkLoc"; + this.conVdkLoc.Size = new System.Drawing.Size(190, 20); + this.conVdkLoc.TabIndex = 0; // // groupBox1 // @@ -134,49 +193,6 @@ this.groupBox1.TabStop = false; this.groupBox1.Text = "Location of QEmu"; // - // groupBox2 - // - this.groupBox2.Controls.Add(this.button4); - this.groupBox2.Controls.Add(this.conVdkLoc); - this.groupBox2.Location = new System.Drawing.Point(6, 88); - this.groupBox2.Name = "groupBox2"; - this.groupBox2.Size = new System.Drawing.Size(283, 65); - this.groupBox2.TabIndex = 1; - this.groupBox2.TabStop = false; - this.groupBox2.Text = "Location of VDK"; - // - // groupBox3 - // - this.groupBox3.Controls.Add(this.button5); - this.groupBox3.Controls.Add(this.conDefVmLoc); - this.groupBox3.Location = new System.Drawing.Point(6, 170); - this.groupBox3.Name = "groupBox3"; - this.groupBox3.Size = new System.Drawing.Size(283, 65); - this.groupBox3.TabIndex = 2; - this.groupBox3.TabStop = false; - this.groupBox3.Text = "Default location for virtual machines"; - // - // conQemuLoc - // - this.conQemuLoc.Location = new System.Drawing.Point(6, 28); - this.conQemuLoc.Name = "conQemuLoc"; - this.conQemuLoc.Size = new System.Drawing.Size(190, 20); - this.conQemuLoc.TabIndex = 0; - // - // conVdkLoc - // - this.conVdkLoc.Location = new System.Drawing.Point(6, 29); - this.conVdkLoc.Name = "conVdkLoc"; - this.conVdkLoc.Size = new System.Drawing.Size(190, 20); - this.conVdkLoc.TabIndex = 0; - // - // conDefVmLoc - // - this.conDefVmLoc.Location = new System.Drawing.Point(6, 30); - this.conDefVmLoc.Name = "conDefVmLoc"; - this.conDefVmLoc.Size = new System.Drawing.Size(190, 20); - this.conDefVmLoc.TabIndex = 0; - // // button3 // this.button3.Location = new System.Drawing.Point(202, 26); @@ -187,25 +203,22 @@ this.button3.UseVisualStyleBackColor = true; this.button3.Click += new System.EventHandler(this.button3_Click); // - // button4 - // - this.button4.Location = new System.Drawing.Point(202, 27); - this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(75, 23); - this.button4.TabIndex = 1; - this.button4.Text = "Browse..."; - this.button4.UseVisualStyleBackColor = true; - this.button4.Click += new System.EventHandler(this.button4_Click); - // - // button5 - // - this.button5.Location = new System.Drawing.Point(202, 28); - this.button5.Name = "button5"; - this.button5.Size = new System.Drawing.Size(75, 23); - this.button5.TabIndex = 1; - this.button5.Text = "Browse..."; - this.button5.UseVisualStyleBackColor = true; - this.button5.Click += new System.EventHandler(this.button5_Click); + // conQemuLoc + // + this.conQemuLoc.Location = new System.Drawing.Point(6, 28); + this.conQemuLoc.Name = "conQemuLoc"; + this.conQemuLoc.Size = new System.Drawing.Size(190, 20); + this.conQemuLoc.TabIndex = 0; + // + // tabPage3 + // + this.tabPage3.Controls.Add(this.conAppDebug); + this.tabPage3.Location = new System.Drawing.Point(4, 22); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Size = new System.Drawing.Size(295, 261); + this.tabPage3.TabIndex = 2; + this.tabPage3.Text = "Advanced"; + this.tabPage3.UseVisualStyleBackColor = true; // // conAppDebug // @@ -217,46 +230,33 @@ this.conAppDebug.Text = "Turn on application debugging"; this.conAppDebug.UseVisualStyleBackColor = true; // - // groupBox4 - // - this.groupBox4.Controls.Add(this.conUpdateNow); - this.groupBox4.Controls.Add(this.conUpdateCombo); - this.groupBox4.Location = new System.Drawing.Point(6, 153); - this.groupBox4.Name = "groupBox4"; - this.groupBox4.Size = new System.Drawing.Size(283, 80); - this.groupBox4.TabIndex = 0; - this.groupBox4.TabStop = false; - this.groupBox4.Text = "Check for updates"; - // - // conUpdateCombo - // - this.conUpdateCombo.FormattingEnabled = true; - this.conUpdateCombo.Items.AddRange(new object[] { - "On startup", - "Daily", - "Weekly", - "Monthly"}); - this.conUpdateCombo.Location = new System.Drawing.Point(6, 33); - this.conUpdateCombo.Name = "conUpdateCombo"; - this.conUpdateCombo.Size = new System.Drawing.Size(190, 21); - this.conUpdateCombo.TabIndex = 0; - // - // conUpdateNow - // - this.conUpdateNow.Location = new System.Drawing.Point(202, 33); - this.conUpdateNow.Name = "conUpdateNow"; - this.conUpdateNow.Size = new System.Drawing.Size(75, 23); - this.conUpdateNow.TabIndex = 1; - this.conUpdateNow.Text = "Check now"; - this.conUpdateNow.UseVisualStyleBackColor = true; + // conDialogOK + // + this.conDialogOK.Location = new System.Drawing.Point(159, 305); + this.conDialogOK.Name = "conDialogOK"; + this.conDialogOK.Size = new System.Drawing.Size(75, 23); + this.conDialogOK.TabIndex = 1; + this.conDialogOK.Text = "OK"; + this.conDialogOK.UseVisualStyleBackColor = true; + this.conDialogOK.Click += new System.EventHandler(this.conDialogOK_Click); + // + // conDialogCancel + // + this.conDialogCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.conDialogCancel.Location = new System.Drawing.Point(240, 305); + this.conDialogCancel.Name = "conDialogCancel"; + this.conDialogCancel.Size = new System.Drawing.Size(75, 23); + this.conDialogCancel.TabIndex = 2; + this.conDialogCancel.Text = "Cancel"; + this.conDialogCancel.UseVisualStyleBackColor = true; // // ConsoleSettings // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(327, 340); - this.Controls.Add(this.button2); - this.Controls.Add(this.button1); + this.Controls.Add(this.conDialogCancel); + this.Controls.Add(this.conDialogOK); this.Controls.Add(this.tabControl1); this.MaximizeBox = false; this.MinimizeBox = false; @@ -266,16 +266,16 @@ this.Text = "Settings"; this.tabControl1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); + this.groupBox4.ResumeLayout(false); this.tabPage2.ResumeLayout(false); + this.groupBox3.ResumeLayout(false); + this.groupBox3.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); this.tabPage3.ResumeLayout(false); this.tabPage3.PerformLayout(); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.groupBox2.ResumeLayout(false); - this.groupBox2.PerformLayout(); - this.groupBox3.ResumeLayout(false); - this.groupBox3.PerformLayout(); - this.groupBox4.ResumeLayout(false); this.ResumeLayout(false); } @@ -285,8 +285,8 @@ private System.Windows.Forms.TabControl tabControl1; private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.TabPage tabPage2; - private System.Windows.Forms.Button button1; - private System.Windows.Forms.Button button2; + private System.Windows.Forms.Button conDialogOK; + private System.Windows.Forms.Button conDialogCancel; private System.Windows.Forms.GroupBox groupBox3; private System.Windows.Forms.Button button5; private System.Windows.Forms.TextBox conDefVmLoc; Modified: trunk/tools/RosTE/GUI/ConsoleSettings.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/ConsoleSettings.cs… ============================================================================== --- trunk/tools/RosTE/GUI/ConsoleSettings.cs (original) +++ trunk/tools/RosTE/GUI/ConsoleSettings.cs Fri Jun 29 19:15:15 2007 @@ -5,11 +5,37 @@ using System.Drawing; using System.Text; using System.Windows.Forms; +using System.IO; namespace RosTEGUI { public partial class ConsoleSettings : Form { + public string QemuPath + { + get { return conQemuLoc.Text; } + } + + public string VdkPath + { + get { return conVdkLoc.Text; } + } + + public string DefVmPath + { + get { return conDefVmLoc.Text; } + } + + public int UpdateSched + { + get { return conUpdateCombo.SelectedIndex; } + } + + public bool AppDebug + { + get { return conAppDebug.Checked; } + } + private string GetFolderLocation() { folderBrowserDialog.ShowDialog(); @@ -46,5 +72,29 @@ { conDefVmLoc.Text = GetFolderLocation(); } + + private void conDialogOK_Click(object sender, EventArgs e) + { + if (!File.Exists(conQemuLoc.Text + "\\qemu.exe")) + { + MessageBox.Show("Cannot find qemu.exe in " + conQemuLoc.Text); + return; + } + + if (!File.Exists(conVdkLoc.Text + "\\vdk.exe")) + { + MessageBox.Show("Cannot find vdk.exe in " + conVdkLoc.Text); + return; + } + + if (!Directory.Exists(conDefVmLoc.Text)) + { + MessageBox.Show(conDefVmLoc.Text + " does not exist"); + return; + } + + this.DialogResult = DialogResult.OK; + } + } } Modified: trunk/tools/RosTE/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=27… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.cs Fri Jun 29 19:15:15 2007 @@ -190,7 +190,14 @@ { ConsoleSettings cs = new ConsoleSettings(mainConf); cs.StartPosition = FormStartPosition.CenterParent; - cs.ShowDialog(); + if (cs.ShowDialog() == DialogResult.OK) + { + mainConf.UpdateSched = cs.UpdateSched; + mainConf.QemuPath = cs.QemuPath; + mainConf.VdkPath = cs.VdkPath; + mainConf.DefVmPath = cs.DefVmPath; + mainConf.AppDebug = cs.AppDebug; + } } } } Modified: trunk/tools/RosTE/GUI/VirtualMachine.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VirtualMachine.cs?… ============================================================================== --- trunk/tools/RosTE/GUI/VirtualMachine.cs (original) +++ trunk/tools/RosTE/GUI/VirtualMachine.cs Fri Jun 29 19:15:15 2007 @@ -13,6 +13,8 @@ private Data data; private DataRow hdDataRow; + #region properties + public int DiskID { get { return (int)hdDataRow["DiskID"]; } @@ -50,6 +52,8 @@ { data = dataIn; } + + #endregion public override string ToString() {

17 years, 5 months

[greatlrd] 27326: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible 1. copy thuse header that are same in ddk2003sp1 to psdk 2. remove some hacks in current psdk header files. 3. tempary fixed some headers.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 29 19:11:42 2007 New Revision: 27326 URL: http://svn.reactos.org/svn/reactos?rev=27326&view=rev Log: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible 1. copy thuse header that are same in ddk2003sp1 to psdk 2. remove some hacks in current psdk header files. 3. tempary fixed some headers. Modified: branches/ddk2003/include/psdk/cderr.h branches/ddk2003/include/psdk/initguid.h branches/ddk2003/include/psdk/isguids.h branches/ddk2003/include/psdk/lzexpand.h branches/ddk2003/include/psdk/newdev.h branches/ddk2003/include/psdk/poppack.h branches/ddk2003/include/psdk/pshpack1.h branches/ddk2003/include/psdk/pshpack2.h branches/ddk2003/include/psdk/pshpack4.h branches/ddk2003/include/psdk/pshpack8.h branches/ddk2003/include/psdk/pshpck16.h branches/ddk2003/include/psdk/rpc.h branches/ddk2003/include/psdk/rpcdce.h branches/ddk2003/include/psdk/rpcnsip.h branches/ddk2003/include/psdk/rpcnterr.h branches/ddk2003/include/psdk/servprov.idl branches/ddk2003/include/psdk/winnls32.h branches/ddk2003/include/psdk/winresrc.h branches/ddk2003/include/psdk/xmldso.idl Modified: branches/ddk2003/include/psdk/cderr.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/cderr.h?re… ============================================================================== --- branches/ddk2003/include/psdk/cderr.h (original) +++ branches/ddk2003/include/psdk/cderr.h Fri Jun 29 19:11:42 2007 @@ -1,44 +1,49 @@ -#ifndef _CDERR_H -#define _CDERR_H -#if __GNUC__ >=3 -#pragma GCC system_header + +#ifndef _INC_CDERR +#define _INC_CDERR + +#if _MSC_VER > 1000 +#pragma once #endif -#define CDERR_DIALOGFAILURE 0xFFFF -#define CDERR_GENERALCODES 0x0000 -#define CDERR_STRUCTSIZE 0x0001 -#define CDERR_INITIALIZATION 0x0002 -#define CDERR_NOTEMPLATE 0x0003 -#define CDERR_NOHINSTANCE 0x0004 -#define CDERR_LOADSTRFAILURE 0x0005 -#define CDERR_FINDRESFAILURE 0x0006 -#define CDERR_LOADRESFAILURE 0x0007 -#define CDERR_LOCKRESFAILURE 0x0008 -#define CDERR_MEMALLOCFAILURE 0x0009 -#define CDERR_MEMLOCKFAILURE 0x000A -#define CDERR_NOHOOK 0x000B -#define CDERR_REGISTERMSGFAIL 0x000C -#define PDERR_PRINTERCODES 0x1000 -#define PDERR_SETUPFAILURE 0x1001 -#define PDERR_PARSEFAILURE 0x1002 -#define PDERR_RETDEFFAILURE 0x1003 -#define PDERR_LOADDRVFAILURE 0x1004 -#define PDERR_GETDEVMODEFAIL 0x1005 -#define PDERR_INITFAILURE 0x1006 -#define PDERR_NODEVICES 0x1007 -#define PDERR_NODEFAULTPRN 0x1008 -#define PDERR_DNDMMISMATCH 0x1009 -#define PDERR_CREATEICFAILURE 0x100A -#define PDERR_PRINTERNOTFOUND 0x100B -#define PDERR_DEFAULTDIFFERENT 0x100C -#define CFERR_CHOOSEFONTCODES 0x2000 -#define CFERR_NOFONTS 0x2001 -#define CFERR_MAXLESSTHANMIN 0x2002 -#define FNERR_FILENAMECODES 0x3000 -#define FNERR_SUBCLASSFAILURE 0x3001 -#define FNERR_INVALIDFILENAME 0x3002 -#define FNERR_BUFFERTOOSMALL 0x3003 -#define FRERR_FINDREPLACECODES 0x4000 -#define FRERR_BUFFERLENGTHZERO 0x4001 -#define CCERR_CHOOSECOLORCODES 0x5000 +#define CCERR_CHOOSECOLORCODES 0x5000 +#define CDERR_DIALOGFAILURE 0xFFFF +#define CDERR_FINDRESFAILURE 0x0006 +#define CDERR_GENERALCODES 0x0000 +#define CDERR_INITIALIZATION 0x0002 +#define CDERR_LOADSTRFAILURE 0x0005 +#define CDERR_LOADRESFAILURE 0x0007 +#define CDERR_LOCKRESFAILURE 0x0008 +#define CDERR_MEMALLOCFAILURE 0x0009 +#define CDERR_MEMLOCKFAILURE 0x000A +#define CDERR_NOTEMPLATE 0x0003 +#define CDERR_NOHINSTANCE 0x0004 +#define CDERR_NOHOOK 0x000B +#define CDERR_REGISTERMSGFAIL 0x000C +#define CDERR_STRUCTSIZE 0x0001 +#define CFERR_CHOOSEFONTCODES 0x2000 +#define CFERR_MAXLESSTHANMIN 0x2002 +#define CFERR_NOFONTS 0x2001 +#define PDERR_CREATEICFAILURE 0x100A +#define PDERR_DEFAULTDIFFERENT 0x100C +#define PDERR_DNDMMISMATCH 0x1009 +#define PDERR_GETDEVMODEFAIL 0x1005 +#define PDERR_INITFAILURE 0x1006 +#define PDERR_LOADDRVFAILURE 0x1004 +#define PDERR_NODEVICES 0x1007 +#define PDERR_NODEFAULTPRN 0x1008 +#define PDERR_PARSEFAILURE 0x1002 +#define PDERR_PRINTERCODES 0x1000 +#define PDERR_PRINTERNOTFOUND 0x100B +#define PDERR_RETDEFFAILURE 0x1003 +#define PDERR_SETUPFAILURE 0x1001 +#define FRERR_FINDREPLACECODES 0x4000 +#define FNERR_FILENAMECODES 0x3000 +#define FNERR_INVALIDFILENAME 0x3002 +#define FNERR_SUBCLASSFAILURE 0x3001 + +/* for Windows 2000/XP/ReactOS this is not in windows 2003 ddk */ +#define FNERR_BUFFERTOOSMALL 0x3003 + #endif + Modified: branches/ddk2003/include/psdk/initguid.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/initguid.h… ============================================================================== --- branches/ddk2003/include/psdk/initguid.h (original) +++ branches/ddk2003/include/psdk/initguid.h Fri Jun 29 19:11:42 2007 @@ -1,26 +1,8 @@ -/* - * Defines a minimum set of macros create GUID's to keep the size - * small - * - * This file should be included into "only GUID definition *.h" like - * shlguid.h - * - * Copyright (C) 1999 Juergen Schmied - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ + +#if _MSC_VER > 1000 +#pragma once +#endif #define INITGUID #include <guiddef.h> + Modified: branches/ddk2003/include/psdk/isguids.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/isguids.h?… ============================================================================== --- branches/ddk2003/include/psdk/isguids.h (original) +++ branches/ddk2003/include/psdk/isguids.h Fri Jun 29 19:11:42 2007 @@ -1,15 +1,17 @@ -#ifndef _ISGUID_H -#define _ISGUID_H -#if __GNUC__ >=3 -#pragma GCC system_header + + +#ifndef _ISGUIDS_H_ +#define _ISGUIDS_H_ + +DEFINE_GUID(CLSID_InternetShortcut, 0xFBF23B40L, 0xE3F0, 0x101B, 0x84, 0x88, 0x00, 0xAA, 0x00, 0x3E, 0x56, 0xF8); +DEFINE_GUID(IID_IUniformResourceLocatorA, 0xFBF23B80L, 0xE3F0, 0x101B, 0x84, 0x88, 0x00, 0xAA, 0x00, 0x3E, 0x56, 0xF8); +DEFINE_GUID(IID_IUniformResourceLocatorW, 0xCABB0DA0L, 0xDA57, 0x11CF, 0x99, 0x74, 0x00, 0x20, 0xAF, 0xD7, 0x97, 0x62); + +#ifdef UNICODE + #define IID_IUniformResourceLocator IID_IUniformResourceLocatorW +#else + #define IID_IUniformResourceLocator IID_IUniformResourceLocatorA #endif -#ifdef __cplusplus -extern "C" { #endif -extern const GUID CLSID_InternetShortcut; -extern const GUID IID_IUniformResourceLocator; -#ifdef __cplusplus -} -#endif -#endif + Modified: branches/ddk2003/include/psdk/lzexpand.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/lzexpand.h… ============================================================================== --- branches/ddk2003/include/psdk/lzexpand.h (original) +++ branches/ddk2003/include/psdk/lzexpand.h Fri Jun 29 19:11:42 2007 @@ -1,40 +1,102 @@ -#ifndef _LZEXPAND_H -#define _LZEXPAND_H -#if __GNUC__ >=3 -#pragma GCC system_header -#endif + +#ifndef _LZEXPAND_ +#define _LZEXPAND_ #ifdef __cplusplus extern "C" { #endif -#define LZERROR_BADINHANDLE (-1) -#define LZERROR_BADOUTHANDLE (-2) -#define LZERROR_READ (-3) -#define LZERROR_WRITE (-4) -#define LZERROR_GLOBALLOC (-5) -#define LZERROR_GLOBLOCK (-6) -#define LZERROR_BADVALUE (-7) -#define LZERROR_UNKNOWNALG (-8) -LONG WINAPI CopyLZFile(INT,INT); -INT WINAPI GetExpandedNameA(LPSTR,LPSTR); -INT WINAPI GetExpandedNameW(LPWSTR,LPWSTR); -VOID APIENTRY LZClose(INT); -LONG APIENTRY LZCopy(INT,INT); -VOID WINAPI LZDone(VOID); -INT WINAPI LZInit(INT); -INT WINAPI LZOpenFileA(LPSTR,LPOFSTRUCT,WORD); -INT WINAPI LZOpenFileW(LPWSTR,LPOFSTRUCT,WORD); -INT WINAPI LZRead(INT,LPSTR,INT); -LONG WINAPI LZSeek(INT,LONG,INT); -INT WINAPI LZStart(VOID); + +#define LZERROR_BADINHANDLE (-1) +#define LZERROR_BADOUTHANDLE (-2) +#define LZERROR_READ (-3) +#define LZERROR_WRITE (-4) +#define LZERROR_GLOBALLOC (-5) +#define LZERROR_GLOBLOCK (-6) +#define LZERROR_BADVALUE (-7) +#define LZERROR_UNKNOWNALG (-8) + + +LONG +APIENTRY +LZCopy( + INT, + INT); + +LONG +APIENTRY +CopyLZFile( + INT, + INT); + +INT +APIENTRY +GetExpandedNameA( + LPSTR, + LPSTR); + +INT +APIENTRY +GetExpandedNameW( + LPWSTR, + LPWSTR); + +VOID +APIENTRY +LZClose(INT); + +INT +APIENTRY +LZInit(INT); + +INT +APIENTRY +LZStart(VOID); + +VOID +APIENTRY +LZDone(VOID); + + +INT +APIENTRY +LZOpenFileA( + LPSTR, + LPOFSTRUCT, + WORD); + +INT +APIENTRY +LZOpenFileW( + LPWSTR, + LPOFSTRUCT, + WORD); + +INT +APIENTRY +LZRead( + INT, + LPSTR, + INT); + +LONG +APIENTRY +LZSeek( + INT, + LONG, + INT); + #ifdef UNICODE -#define GetExpandedName GetExpandedNameW +#define GetExpandedName GetExpandedNameW #define LZOpenFile LZOpenFileW #else -#define GetExpandedName GetExpandedNameA +#define GetExpandedName GetExpandedNameA #define LZOpenFile LZOpenFileA #endif + #ifdef __cplusplus } #endif + + #endif + Modified: branches/ddk2003/include/psdk/newdev.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/newdev.h?r… ============================================================================== --- branches/ddk2003/include/psdk/newdev.h (original) +++ branches/ddk2003/include/psdk/newdev.h Fri Jun 29 19:11:42 2007 @@ -1,70 +1,49 @@ -/* - * newdev.h - * - * Driver installation DLL interface - * - * This file is part of the w32api package. - * - * Contributors: - * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> - * - * THIS SOFTWARE IS NOT COPYRIGHTED - * - * This source code is offered for use in the public domain. You may - * use, modify or distribute it freely. - * - * This code is distributed in the hope that it will be useful but - * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY - * DISCLAIMED. This includes but is not limited to warranties of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - */ -#ifndef __NEWDEV_H -#define __NEWDEV_H +#ifndef _INC_NEWDEV +#define _INC_NEWDEV -#if __GNUC__ >=3 -#pragma GCC system_header -#endif +#include <pshpack1.h> #ifdef __cplusplus extern "C" { #endif -#pragma pack(push,4) -/* UpdateDriverForPlugAndPlayDevices.InstallFlags constants */ -#define INSTALLFLAG_FORCE 0x00000001 -#define INSTALLFLAG_READONLY 0x00000002 -#define INSTALLFLAG_NONINTERACTIVE 0x00000004 -#define INSTALLFLAG_BITS 0x00000007 +#define INSTALLFLAG_FORCE 0x00000001 +#define INSTALLFLAG_READONLY 0x00000002 +#define INSTALLFLAG_NONINTERACTIVE 0x00000004 +#define INSTALLFLAG_BITS 0x00000007 -BOOL WINAPI +BOOL +WINAPI UpdateDriverForPlugAndPlayDevicesA( - HWND hwndParent, - LPCSTR HardwareId, - LPCSTR FullInfPath, - DWORD InstallFlags, - PBOOL bRebootRequired OPTIONAL); + HWND hwndParent, + LPCSTR HardwareId, + LPCSTR FullInfPath, + DWORD InstallFlags, + PBOOL bRebootRequired OPTIONAL); -BOOL WINAPI +BOOL +WINAPI UpdateDriverForPlugAndPlayDevicesW( - HWND hwndParent, - LPCWSTR HardwareId, - LPCWSTR FullInfPath, - DWORD InstallFlags, - PBOOL bRebootRequired OPTIONAL); + HWND hwndParent, + LPCWSTR HardwareId, + LPCWSTR FullInfPath, + DWORD InstallFlags, + PBOOL bRebootRequired OPTIONAL); #ifdef UNICODE #define UpdateDriverForPlugAndPlayDevices UpdateDriverForPlugAndPlayDevicesW #else #define UpdateDriverForPlugAndPlayDevices UpdateDriverForPlugAndPlayDevicesA -#endif /* UNICODE */ - -#pragma pack(pop) +#endif #ifdef __cplusplus } #endif -#endif /* __NEWDEV_H */ +#include <poppack.h> + +#endif + + Modified: branches/ddk2003/include/psdk/poppack.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/poppack.h?… ============================================================================== --- branches/ddk2003/include/psdk/poppack.h (original) +++ branches/ddk2003/include/psdk/poppack.h Fri Jun 29 19:11:42 2007 @@ -1,10 +1,14 @@ -#ifndef RC_INVOKED -#if ( _MSC_VER >= 800 ) -#pragma warning(disable:4103) -#endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) -# pragma pack(4) -# else -# pragma pack(pop) -# endif // __FreeBSD__ -#endif // RC_INVOKED + +#if ! (defined(lint) || defined(RC_INVOKED)) + #if ( _MSC_VER >= 800 && !defined(_M_I86)) || defined(_PUSHPOP_SUPPORTED) + #pragma warning(disable:4103) + #if !(defined( MIDL_PASS )) || defined( __midl ) + #pragma pack(pop) + #else + #pragma pack() + #endif + #else + #pragma pack() + #endif +#endif + Modified: branches/ddk2003/include/psdk/pshpack1.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/pshpack1.h… ============================================================================== --- branches/ddk2003/include/psdk/pshpack1.h (original) +++ branches/ddk2003/include/psdk/pshpack1.h Fri Jun 29 19:11:42 2007 @@ -1,10 +1,14 @@ -#ifndef RC_INVOKED -#if ( _MSC_VER >= 800 ) -#pragma warning(disable:4103) -#endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) -# pragma pack(1) -# else -# pragma pack(push,1) -# endif // __FreeBSD__ -#endif // RC_INVOKED + +#if ! (defined(lint) || defined(RC_INVOKED)) + #if ( _MSC_VER >= 800 && !defined(_M_I86)) || defined(_PUSHPOP_SUPPORTED) + #pragma warning(disable:4103) + #if !(defined( MIDL_PASS )) || defined( __midl ) + #pragma pack(push,1) + #else + #pragma pack(1) + #endif + #else + #pragma pack(1) + #endif +#endif + Modified: branches/ddk2003/include/psdk/pshpack2.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/pshpack2.h… ============================================================================== --- branches/ddk2003/include/psdk/pshpack2.h (original) +++ branches/ddk2003/include/psdk/pshpack2.h Fri Jun 29 19:11:42 2007 @@ -1,10 +1,15 @@ -#ifndef RC_INVOKED -#if ( _MSC_VER >= 800 ) -#pragma warning(disable:4103) -#endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) -# pragma pack(2) -# else -# pragma pack(push,2) -# endif // __FreeBSD__ -#endif // RC_INVOKED + +#if ! (defined(lint) || defined(RC_INVOKED)) + #if ( _MSC_VER >= 800 && !defined(_M_I86)) || defined(_PUSHPOP_SUPPORTED) + #pragma warning(disable:4103) + #if !(defined( MIDL_PASS )) || defined( __midl ) + #pragma pack(push,2) + #else + #pragma pack(2) + #endif + #else + #pragma pack(2) +#endif +#endif + + Modified: branches/ddk2003/include/psdk/pshpack4.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/pshpack4.h… ============================================================================== --- branches/ddk2003/include/psdk/pshpack4.h (original) +++ branches/ddk2003/include/psdk/pshpack4.h Fri Jun 29 19:11:42 2007 @@ -1,10 +1,14 @@ -#ifndef RC_INVOKED -#if ( _MSC_VER >= 800 ) -#pragma warning(disable:4103) -#endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) -# pragma pack(4) -# else -# pragma pack(push,4) -# endif // __FreeBSD__ -#endif // RC_INVOKED + +#if ! (defined(lint) || defined(RC_INVOKED)) + #if ( _MSC_VER >= 800 && !defined(_M_I86)) || defined(_PUSHPOP_SUPPORTED) + #pragma warning(disable:4103) + #if !(defined( MIDL_PASS )) || defined( __midl ) + #pragma pack(push,4) + #else + #pragma pack(4) + #endif + #else + #pragma pack(4) + #endif +#endif + Modified: branches/ddk2003/include/psdk/pshpack8.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/pshpack8.h… ============================================================================== --- branches/ddk2003/include/psdk/pshpack8.h (original) +++ branches/ddk2003/include/psdk/pshpack8.h Fri Jun 29 19:11:42 2007 @@ -1,10 +1,14 @@ -#ifndef RC_INVOKED -#if ( _MSC_VER >= 800 ) -#pragma warning(disable:4103) -#endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) -# pragma pack(8) -# else -# pragma pack(push,8) -# endif // __FreeBSD__ -#endif // RC_INVOKED + +#if ! (defined(lint) || defined(RC_INVOKED)) + #if ( _MSC_VER >= 800 && !defined(_M_I86)) || defined(_PUSHPOP_SUPPORTED) + #pragma warning(disable:4103) + #if !(defined( MIDL_PASS )) || defined( __midl ) + #pragma pack(push,8) + #else + #pragma pack(8) + #endif + #else + #pragma pack(8) + #endif +#endif + Modified: branches/ddk2003/include/psdk/pshpck16.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/pshpck16.h… ============================================================================== --- branches/ddk2003/include/psdk/pshpck16.h (original) +++ branches/ddk2003/include/psdk/pshpck16.h Fri Jun 29 19:11:42 2007 @@ -1,10 +1,14 @@ -#ifndef RC_INVOKED -#if ( _MSC_VER >= 800 ) -#pragma warning(disable:4103) -#endif // _MSC_VER -# if ( __FreeBSD__ == 5 ) -# pragma pack(16) -# else -# pragma pack(push,16) -# endif // __FreeBSD__ -#endif // RC_INVOKED + +#if ! (defined(lint) || defined(RC_INVOKED)) + #if ( _MSC_VER >= 800 ) || defined(_PUSHPOP_SUPPORTED) + #pragma warning(disable:4103) + #if !(defined( MIDL_PASS )) || defined( __midl ) + #pragma pack(push,16) + #else + #pragma pack(16) + #endif + #else + #pragma pack(16) + #endif +#endif + Modified: branches/ddk2003/include/psdk/rpc.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/rpc.h?rev=… ============================================================================== --- branches/ddk2003/include/psdk/rpc.h (original) +++ branches/ddk2003/include/psdk/rpc.h Fri Jun 29 19:11:42 2007 @@ -1,74 +1,155 @@ -/* - * RPC interface - * - * Copyright (C) the Wine project - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ -#ifndef RPC_NO_WINDOWS_H -# ifdef __WINESRC__ -# include <windef.h> -# else -# include <windows.h> -# endif +#if !defined( RPC_NO_WINDOWS_H ) && !defined( MAC ) && !defined( _MAC ) +#include <windows.h> #endif -#ifndef __WINE_RPC_H -#define __WINE_RPC_H -#if defined(__powerpc__) || defined(_MAC) /* ? */ -# define __RPC_MAC__ - /* Also define __RPC_WIN32__ to ensure compatibility */ -# define __RPC_WIN32__ -#elif defined(_WIN64) -# define __RPC_WIN64__ -#else -# define __RPC_WIN32__ +#ifndef __RPC_H__ +#define __RPC_H__ + +#if _MSC_VER > 1000 +#pragma once +#endif + + +#ifdef __cplusplus +extern "C" { +#endif + +#if defined( MAC ) || defined( _MAC ) || defined(__powerpc__) + #define __RPC_MAC__ + #define __RPC_WIN32__ + #include <pshpack2.h> + +#else + #if defined(_M_IA64) || defined(_M_AMD64) || defined(_WIN64) + #define __RPC_WIN64__ + #else + #define __RPC_WIN32__ + #endif #endif #include <basetsd.h> +#if defined(__RPC_WIN64__) + #include <pshpack8.h> +#endif + +#ifndef __MIDL_USER_DEFINED + #define midl_user_allocate MIDL_user_allocate + #define midl_user_free MIDL_user_free + #define __MIDL_USER_DEFINED +#endif + + +typedef void * I_RPC_HANDLE; +typedef long RPC_STATUS; #define __RPC_FAR -#define __RPC_API __stdcall -#define __RPC_USER __stdcall -#define __RPC_STUB __stdcall -#define RPC_ENTRY __stdcall -#define RPCRTAPI -typedef long RPC_STATUS; -typedef void* I_RPC_HANDLE; +#if defined(__RPC_WIN32__) || defined(__RPC_WIN64__) + #define RPC_UNICODE_SUPPORTED +#endif -#include <rpcdce.h> -/* #include <rpcnsi.h> */ -#include <rpcnterr.h> -#include <excpt.h> -#include <winerror.h> -/* ignore exception handling for now */ -#define RpcTryExcept if (1) { -#define RpcExcept(expr) } else { -#define RpcEndExcept } -#define RpcTryFinally -#define RpcFinally -#define RpcEndFinally -#define RpcExceptionCode() 0 -/* #define RpcAbnormalTermination() abort() */ +#if !defined(__RPC_MAC__) + #define __RPC_API __stdcall + #define __RPC_USER __stdcall + #define __RPC_STUB __stdcall + #define RPC_ENTRY __stdcall +#else + #define __RPC_API + #define __RPC_USER + #define __RPC_STUB + #define RPC_ENTRY +#endif -RPC_STATUS RPC_ENTRY RpcImpersonateClient(RPC_BINDING_HANDLE); -RPC_STATUS RPC_ENTRY RpcRevertToSelf(void); -DWORD WINAPI I_RpcMapWin32Status(RPC_STATUS status); +#if !defined(DECLSPEC_IMPORT) + #if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_AMD64)) && !defined(MIDL_PASS) + #define DECLSPEC_IMPORT __declspec(dllimport) + #else + #define DECLSPEC_IMPORT + #endif +#endif -#endif /*__WINE_RPC_H */ +#if !defined(DECLSPEC_EXPORT) + #if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_AMD64)) && !defined(MIDL_PASS) + #define DECLSPEC_EXPORT __declspec(dllexport) + #else + #define DECLSPEC_EXPORT + #endif +#endif + +#if !defined(_RPCRT4_) + #define RPCRTAPI DECLSPEC_IMPORT +#else + #define RPCRTAPI DECLSPEC_EXPORT +#endif + +#if !defined(_RPCNS4_) + #define RPCNSAPI DECLSPEC_IMPORT +#else + #define RPCNSAPI DECLSPEC_EXPORT +#endif + + +#ifdef __RPC_MAC__ + #include <setjmp.h> + #define RPCXCWORD (sizeof(jmp_buf)/sizeof(int)) + + #pragma warning(push) + #pragma warning( disable: 4005 ) + #include <rpcdce.h> + #include <rpcnsi.h> + #include <rpcerr.h> + #include <rpcmac.h> + #pragma warning(pop) + + typedef void (RPC_ENTRY *MACYIELDCALLBACK)(short *) ; + RPC_STATUS RPC_ENTRY + RpcMacSetYieldInfo(MACYIELDCALLBACK pfnCallback) ; + + #if !defined(UNALIGNED) + #define UNALIGNED + #endif + + #include <poppack.h> +#else + #include <rpcdce.h> + #include <rpcnsi.h> + #include <rpcnterr.h> + #include <excpt.h> + #include <winerror.h> + + #ifndef __GNUC__ + #define RpcTryExcept __try { + #define RpcExcept(expr) } __except (expr) { + #define RpcEndExcept } + #define RpcTryFinally __try { + #define RpcFinally } __finally { + #define RpcEndFinally } + #define RpcExceptionCode() GetExceptionCode() + #define RpcAbnormalTermination() AbnormalTermination() + #else + /* FIXME ReactOS SEH support, we need remove this when gcc support native seh */ + + #define RpcTryExcept if (1) { + #define RpcExcept(expr) } else { + #define RpcEndExcept } + #define RpcTryFinally + #define RpcFinally + #define RpcEndFinally + #define RpcExceptionCode() 0 + /* #define RpcAbnormalTermination() abort() */ + #endif +#endif + +#if defined(__RPC_WIN64__) + #include <poppack.h> +#endif + +#ifdef __cplusplus +} +#endif + +#endif + Modified: branches/ddk2003/include/psdk/rpcdce.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/rpcdce.h?r… ============================================================================== --- branches/ddk2003/include/psdk/rpcdce.h (original) +++ branches/ddk2003/include/psdk/rpcdce.h Fri Jun 29 19:11:42 2007 @@ -504,6 +504,13 @@ RPCRTAPI int RPC_ENTRY UuidIsNil( UUID* Uuid, RPC_STATUS* Status_ ); + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcImpersonateClient (IN RPC_BINDING_HANDLE BindingHandle OPTIONAL); + +RPCRTAPI RPC_STATUS RPC_ENTRY +RpcRevertToSelf (); + #ifdef __cplusplus } #endif Modified: branches/ddk2003/include/psdk/rpcnsip.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/rpcnsip.h?… ============================================================================== --- branches/ddk2003/include/psdk/rpcnsip.h (original) +++ branches/ddk2003/include/psdk/rpcnsip.h Fri Jun 29 19:11:42 2007 @@ -1,25 +1,65 @@ -#ifndef _RPCNSIP_H -#define _RPCNSIP_H -#if __GNUC__ >=3 -#pragma GCC system_header + +#ifndef __RPCNSIP_H__ +#define __RPCNSIP_H__ + +#if _MSC_VER > 1000 +#pragma once #endif #ifdef __cplusplus extern "C" { #endif -typedef struct { - RPC_NS_HANDLE LookupContext; - RPC_BINDING_HANDLE ProposedHandle; - RPC_BINDING_VECTOR *Bindings; -} RPC_IMPORT_CONTEXT_P,*PRPC_IMPORT_CONTEXT_P; -RPC_STATUS RPC_ENTRY I_RpcNsGetBuffer(IN PRPC_MESSAGE); -RPC_STATUS RPC_ENTRY I_RpcNsSendReceive(IN PRPC_MESSAGE,OUT RPC_BINDING_HANDLE*); -void RPC_ENTRY I_RpcNsRaiseException(IN PRPC_MESSAGE,IN RPC_STATUS); -RPC_STATUS RPC_ENTRY I_RpcReBindBuffer(IN PRPC_MESSAGE); -RPC_STATUS RPC_ENTRY I_NsServerBindSearch(void); -RPC_STATUS RPC_ENTRY I_NsClientBindSearch(void); -void RPC_ENTRY I_NsClientBindDone(void); + +typedef struct +{ + RPC_NS_HANDLE LookupContext; + RPC_BINDING_HANDLE ProposedHandle; + RPC_BINDING_VECTOR *Bindings; +} RPC_IMPORT_CONTEXT_P, *PRPC_IMPORT_CONTEXT_P; + +RPCNSAPI +RPC_STATUS +RPC_ENTRY +I_RpcNsGetBuffer(IN PRPC_MESSAGE Message); + + +RPCNSAPI +void +RPC_ENTRY +I_RpcNsRaiseException( + IN PRPC_MESSAGE Message, + IN RPC_STATUS Status); + +RPCNSAPI +RPC_STATUS +RPC_ENTRY +I_NsServerBindSearch(); + +RPCNSAPI +RPC_STATUS +RPC_ENTRY +I_RpcReBindBuffer(IN PRPC_MESSAGE Message); + +RPCNSAPI +void +RPC_ENTRY +I_NsClientBindDone(); + +RPCNSAPI +RPC_STATUS +RPC_ENTRY +I_NsClientBindSearch(); + +RPCNSAPI +RPC_STATUS +RPC_ENTRY +I_RpcNsSendReceive( + IN PRPC_MESSAGE Message, + OUT RPC_BINDING_HANDLE __RPC_FAR * Handle); + #ifdef __cplusplus } #endif + #endif + Modified: branches/ddk2003/include/psdk/rpcnterr.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/rpcnterr.h… ============================================================================== --- branches/ddk2003/include/psdk/rpcnterr.h (original) +++ branches/ddk2003/include/psdk/rpcnterr.h Fri Jun 29 19:11:42 2007 @@ -1,44 +1,33 @@ -/* - * Copyright (C) 2001 Peter Hunnisett - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ #ifndef __RPCNTERR_H__ #define __RPCNTERR_H__ -#define RPC_S_OK ERROR_SUCCESS -#define RPC_S_INVALID_ARG ERROR_INVALID_PARAMETER -#define RPC_S_OUT_OF_MEMORY ERROR_OUTOFMEMORY -#define RPC_S_OUT_OF_THREADS ERROR_MAX_THRDS_REACHED -#define RPC_S_INVALID_LEVEL ERROR_INVALID_PARAMETER -#define RPC_S_BUFFER_TOO_SMALL ERROR_INSUFFICIENT_BUFFER -#define RPC_S_INVALID_SECURITY_DESC ERROR_INVALID_SECURITY_DESCR -#define RPC_S_ACCESS_DENIED ERROR_ACCESS_DENIED -#define RPC_S_SERVER_OUT_OF_MEMORY ERROR_NOT_ENOUGH_SERVER_MEMORY -#define RPC_S_ASYNC_CALL_PENDING ERROR_IO_PENDING -#define RPC_S_UNKNOWN_PRINCIPAL ERROR_NONE_MAPPED -#define RPC_S_TIMEOUT ERROR_TIMEOUT +#if _MSC_VER > 1000 +#pragma once +#endif -#define RPC_X_NO_MEMORY RPC_S_OUT_OF_MEMORY -#define RPC_X_INVALID_BOUND RPC_S_INVALID_BOUND -#define RPC_X_INVALID_TAG RPC_S_INVALID_TAG -#define RPC_X_ENUM_VALUE_TOO_LARGE RPC_X_ENUM_VALUE_OUT_OF_RANGE -#define RPC_X_SS_CONTEXT_MISMATCH ERROR_INVALID_HANDLE -#define RPC_X_INVALID_BUFFER ERROR_INVALID_USER_BUFFER -#define RPC_X_PIPE_APP_MEMORY ERROR_OUTOFMEMORY -#define RPC_X_INVALID_PIPE_OPERATION RPC_X_WRONG_PIPE_ORDER +#define RPC_S_ACCESS_DENIED ERROR_ACCESS_DENIED +#define RPC_S_ASYNC_CALL_PENDING ERROR_IO_PENDING +#define RPC_S_BUFFER_TOO_SMALL ERROR_INSUFFICIENT_BUFFER +#define RPC_S_INVALID_ARG ERROR_INVALID_PARAMETER +#define RPC_S_INVALID_LEVEL ERROR_INVALID_PARAMETER +#define RPC_S_INVALID_SECURITY_DESC ERROR_INVALID_SECURITY_DESCR +#define RPC_S_OUT_OF_MEMORY ERROR_OUTOFMEMORY +#define RPC_S_OUT_OF_THREADS ERROR_MAX_THRDS_REACHED +#define RPC_S_OK ERROR_SUCCESS +#define RPC_S_SERVER_OUT_OF_MEMORY ERROR_NOT_ENOUGH_SERVER_MEMORY +#define RPC_S_TIMEOUT ERROR_TIMEOUT +#define RPC_S_UNKNOWN_PRINCIPAL ERROR_NONE_MAPPED -#endif /* __RPCNTERR_H__ */ +#define RPC_X_INVALID_BOUND RPC_S_INVALID_BOUND +#define RPC_X_INVALID_BUFFER ERROR_INVALID_USER_BUFFER +#define RPC_X_INVALID_PIPE_OPERATION RPC_X_WRONG_PIPE_ORDER +#define RPC_X_INVALID_TAG RPC_S_INVALID_TAG +#define RPC_X_ENUM_VALUE_TOO_LARGE RPC_X_ENUM_VALUE_OUT_OF_RANGE +#define RPC_X_NO_MEMORY RPC_S_OUT_OF_MEMORY +#define RPC_X_PIPE_APP_MEMORY ERROR_OUTOFMEMORY +#define RPC_X_SS_CONTEXT_MISMATCH ERROR_INVALID_HANDLE + + +#endif + Modified: branches/ddk2003/include/psdk/servprov.idl URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/servprov.i… ============================================================================== --- branches/ddk2003/include/psdk/servprov.idl (original) +++ branches/ddk2003/include/psdk/servprov.idl Fri Jun 29 19:11:42 2007 @@ -1,37 +1,55 @@ -/* - * Copyright (C) 1999 Francois Gouget - * Copyright (C) 2003 Alexandre Julliard - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ + + +cpp_quote("") import "objidl.idl"; - -/***************************************************************************** - * IServiceProvider interface - */ +interface IServiceProvider; [ object, uuid(6d5140c1-7436-11ce-8034-00aa006009fa), pointer_default(unique) ] + + interface IServiceProvider : IUnknown { typedef [unique] IServiceProvider *LPSERVICEPROVIDER; +cpp_quote("#if (_MSC_VER >= 1100) && defined(__cplusplus) && !defined(CINTERFACE)") +cpp_quote(" EXTERN_C const IID IID_IServiceProvider;") +cpp_quote(" extern \"C++\"") +cpp_quote(" {") +cpp_quote(" MIDL_INTERFACE(\"6d5140c1-7436-11ce-8034-00aa006009fa\")") +cpp_quote(" IServiceProvider : public IUnknown") +cpp_quote(" {") +cpp_quote(" public:") +cpp_quote(" virtual /* [local] */ HRESULT STDMETHODCALLTYPE QueryService( ") +cpp_quote(" /* [in] */ REFGUID guidService,") +cpp_quote(" /* [in] */ REFIID riid,") +cpp_quote(" /* [out] */ void __RPC_FAR *__RPC_FAR *ppvObject) = 0;") +cpp_quote(" ") +cpp_quote(" template <class Q>") +cpp_quote(" HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, Q** pp)") +cpp_quote(" {") +cpp_quote(" return QueryService(guidService, __uuidof(Q), (void **)pp);") +cpp_quote(" }") +cpp_quote(" };") +cpp_quote(" }") +cpp_quote("") +cpp_quote(" /* [call_as] */ HRESULT STDMETHODCALLTYPE IServiceProvider_RemoteQueryService_Proxy( ") +cpp_quote(" IServiceProvider __RPC_FAR * This,") +cpp_quote(" /* [in] */ REFGUID guidService,") +cpp_quote(" /* [in] */ REFIID riid,") +cpp_quote(" /* [iid_is][out] */ IUnknown __RPC_FAR *__RPC_FAR *ppvObject);") +cpp_quote("") +cpp_quote(" void __RPC_STUB IServiceProvider_RemoteQueryService_Stub(") +cpp_quote(" IRpcStubBuffer *This,") +cpp_quote(" IRpcChannelBuffer *_pRpcChannelBuffer,") +cpp_quote(" PRPC_MESSAGE _pRpcMessage,") +cpp_quote(" DWORD *_pdwStubPhase);") +cpp_quote("") +cpp_quote("#else") [local] HRESULT QueryService( [in] REFGUID guidService, @@ -42,5 +60,8 @@ HRESULT RemoteQueryService( [in] REFGUID guidService, [in] REFIID riid, - [out, iid_is(riid)] IUnknown ** ppvObject); + [out, iid_is(riid)] IUnknown ** ppvObject); } +cpp_quote("#endif") + + Modified: branches/ddk2003/include/psdk/winnls32.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/winnls32.h… ============================================================================== --- branches/ddk2003/include/psdk/winnls32.h (original) +++ branches/ddk2003/include/psdk/winnls32.h Fri Jun 29 19:11:42 2007 @@ -1,9 +1,7 @@ + + #ifndef _WINNLS32_ #define _WINNLS32_ - -#if __GNUC__ >=3 -#pragma GCC system_header -#endif #ifdef __cplusplus extern "C" { @@ -39,36 +37,40 @@ WCHAR szOptions[30]; } IMEPROW,*PIMEPROW,NEAR *NPIMEPROW,FAR *LPIMEPROW; +BOOL WINAPI IMPGetIMEA( IN HWND, OUT LPIMEPROA); +BOOL WINAPI IMPQueryIMEA( IN OUT LPIMEPROA); +BOOL WINAPI IMPSetIMEA( IN HWND, IN LPIMEPROA); + +BOOL WINAPI IMPGetIMEW( IN HWND, OUT LPIMEPROW); +BOOL WINAPI IMPQueryIMEW( IN OUT LPIMEPROW); +BOOL WINAPI IMPSetIMEW( IN HWND, IN LPIMEPROW); + +UINT WINAPI WINNLSGetIMEHotkey( IN HWND); +BOOL WINAPI WINNLSEnableIME( IN HWND, IN BOOL); +BOOL WINAPI WINNLSGetEnableStatus( IN HWND); + #ifdef UNICODE typedef IMEPROW IMEPRO; typedef PIMEPROW PIMEPRO; typedef NPIMEPROW NPIMEPRO; typedef LPIMEPROW LPIMEPRO; -#define IMPGetIME IMPGetIMEW -#define IMPQueryIME IMPQueryIMEW -#define IMPSetIME IMPSetIMEW +#define IMPGetIME IMPGetIMEW +#define IMPQueryIME IMPQueryIMEW +#define IMPSetIME IMPSetIMEW #else typedef IMEPROA IMEPRO; typedef PIMEPROA PIMEPRO; typedef NPIMEPROA NPIMEPRO; typedef LPIMEPROA LPIMEPRO; -#define IMPGetIME IMPGetIMEA -#define IMPQueryIME IMPQueryIMEA -#define IMPSetIME IMPSetIMEA +#define IMPGetIME IMPGetIMEA +#define IMPQueryIME IMPQueryIMEA +#define IMPSetIME IMPSetIMEA #endif - -BOOL WINAPI IMPGetIMEA(HWND, LPIMEPROA); -BOOL WINAPI IMPGetIMEW(HWND, LPIMEPROW); -BOOL WINAPI IMPQueryIMEA(LPIMEPROA); -BOOL WINAPI IMPQueryIMEW(LPIMEPROW); -BOOL WINAPI IMPSetIMEA(HWND, LPIMEPROA); -BOOL WINAPI IMPSetIMEW(HWND, LPIMEPROW); -UINT WINAPI WINNLSGetIMEHotkey(HWND); -BOOL WINAPI WINNLSEnableIME(HWND, BOOL); -BOOL WINAPI WINNLSGetEnableStatus(HWND); #ifdef __cplusplus } #endif -#endif /* _USERENV_H */ +#endif + + Modified: branches/ddk2003/include/psdk/winresrc.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/winresrc.h… ============================================================================== --- branches/ddk2003/include/psdk/winresrc.h (original) +++ branches/ddk2003/include/psdk/winresrc.h Fri Jun 29 19:11:42 2007 @@ -1,14 +1,29 @@ -#ifndef _WINRESRC_H -#define _WINRESRC_H -#if __GNUC__ >=3 -#pragma GCC system_header + +#ifndef _WINRESRC_ +#define _WINRESRC_ + +#ifndef WINVER +#define WINVER 0x0500 #endif -#define WIN32_LEAN_AND_MEAN -#include <winuser.h> -#include <winnt.h> +#ifndef _WIN32_IE +#define _WIN32_IE 0x0501 +#endif + +#ifndef _WIN32_WINDOWS +#define _WIN32_WINDOWS 0x0410 +#endif + +#ifndef _WIN32_WINNT +#define _WIN32_WINNT 0x0500 +#endif + +#include <winuser.rh> +#include <commctrl.rh> +#include <dde.rh> +#include <winnt.rh> +#include <dlgs.h> #include <winver.h> -#include <dde.h> -#include <dlgs.h> -#include <commctrl.h> -#endif + +#endif + Modified: branches/ddk2003/include/psdk/xmldso.idl URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/psdk/xmldso.idl… ============================================================================== --- branches/ddk2003/include/psdk/xmldso.idl (original) +++ branches/ddk2003/include/psdk/xmldso.idl Fri Jun 29 19:11:42 2007 @@ -1,60 +1,40 @@ -/* - * Copyright (C) 2005 Vijay Kiran Kamuju - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ +#ifdef UNIX import "wtypes.idl"; import "ocidl.idl"; +#endif #include <idispids.h> -#include <xmldsodid.h> +#include "xmldsodid.h" interface IXMLDOMDocument; [ -local, -object, -odl, -dual, -oleautomation, -uuid(310afa62-0575-11d2-9ca9-0060b0ec3d39), -pointer_default(unique) + local, object, + uuid(310afa62-0575-11d2-9ca9-0060b0ec3d39), + odl, + dual, + oleautomation, + nonextensible, + hidden, + pointer_default(unique) ] interface IXMLDSOControl : IDispatch { - [propget,id(DISPID_XMLDSO_DOCUMENT)] - HRESULT XMLDocument([out, retval] IXMLDOMDocument** ppDoc); - - [propput,id(DISPID_XMLDSO_DOCUMENT)] - HRESULT XMLDocument([in] IXMLDOMDocument* ppDoc); - - [propget,id(DISPID_XMLDSO_JAVADSOCOMPATIBLE)] - HRESULT JavaDSOCompatible([out, retval] BOOL* fJavaDSOCompatible); - - [propput,id(DISPID_XMLDSO_JAVADSOCOMPATIBLE)] - HRESULT JavaDSOCompatible([in] BOOL fJavaDSOCompatible); - - [propget, id(DISPID_READYSTATE)] - HRESULT readyState([out, retval] long *state); -} + [propget,id(DISPID_XMLDSO_DOCUMENT)] HRESULT XMLDocument([out, retval] IXMLDOMDocument** ppDoc); + [propput,id(DISPID_XMLDSO_DOCUMENT)] HRESULT XMLDocument([in] IXMLDOMDocument* ppDoc); + [propget,id(DISPID_XMLDSO_JAVADSOCOMPATIBLE)] HRESULT JavaDSOCompatible([out, retval] BOOL* fJavaDSOCompatible); + [propput,id(DISPID_XMLDSO_JAVADSOCOMPATIBLE)] HRESULT JavaDSOCompatible([in] BOOL fJavaDSOCompatible); + [propget, id(DISPID_READYSTATE)] HRESULT readyState([out, retval] long *state); +}; [ -uuid(550dda30-0541-11d2-9ca9-0060b0ec3d39) + uuid(550dda30-0541-11d2-9ca9-0060b0ec3d39) ] coclass XMLDSOControl { - [default] interface IXMLDSOControl; -} + [default] interface IXMLDSOControl; +}; + + +

17 years, 5 months

[greatlrd] 27325: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible fixing the comping issue, not tetsed whole way, but fixing smaller fualt

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 29 19:02:32 2007 New Revision: 27325 URL: http://svn.reactos.org/svn/reactos?rev=27325&view=rev Log: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible fixing the comping issue, not tetsed whole way, but fixing smaller fualt Modified: branches/ddk2003/include/ddk2003/rpc.h branches/ddk2003/include/ddk2003/servprov.idl Modified: branches/ddk2003/include/ddk2003/rpc.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/rpc.h?r… ============================================================================== --- branches/ddk2003/include/ddk2003/rpc.h (original) +++ branches/ddk2003/include/ddk2003/rpc.h Fri Jun 29 19:02:32 2007 @@ -115,7 +115,7 @@ #include <poppack.h> #else #include <rpcdce.h> - /* #include <rpcnsi.h> */ + #include <rpcnsi.h> #include <rpcnterr.h> #include <excpt.h> #include <winerror.h> Modified: branches/ddk2003/include/ddk2003/servprov.idl URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/servpro… ============================================================================== --- branches/ddk2003/include/ddk2003/servprov.idl (original) +++ branches/ddk2003/include/ddk2003/servprov.idl Fri Jun 29 19:02:32 2007 @@ -1,5 +1,5 @@ -cpp_quote("#pragma comment(lib,\"uuid.lib\")") + cpp_quote("") import "objidl.idl";

17 years, 5 months

[greatlrd] 27324: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible fixing the comping issue, not tetsed whole way, but fixing smaller fualt in rpc.h it works now. and it is compatible with mac, ppc, win64 and win32 :)

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 29 18:47:04 2007 New Revision: 27324 URL: http://svn.reactos.org/svn/reactos?rev=27324&view=rev Log: cleaning up ddk header file, I am aming for ddk2003sp1 3790.1830 compatible fixing the comping issue, not tetsed whole way, but fixing smaller fualt in rpc.h it works now. and it is compatible with mac, ppc, win64 and win32 :) Modified: branches/ddk2003/include/ddk2003/cderr.h branches/ddk2003/include/ddk2003/readme.txt branches/ddk2003/include/ddk2003/rpc.h branches/ddk2003/include/ddk2003/warning.h Modified: branches/ddk2003/include/ddk2003/cderr.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/cderr.h… ============================================================================== --- branches/ddk2003/include/ddk2003/cderr.h (original) +++ branches/ddk2003/include/ddk2003/cderr.h Fri Jun 29 18:47:04 2007 @@ -42,5 +42,8 @@ #define FNERR_INVALIDFILENAME 0x3002 #define FNERR_SUBCLASSFAILURE 0x3001 +/* for Windows 2000/XP/ReactOS this is not in windows 2003 ddk */ +#define FNERR_BUFFERTOOSMALL 0x3003 + #endif Modified: branches/ddk2003/include/ddk2003/readme.txt URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/readme.… ============================================================================== --- branches/ddk2003/include/ddk2003/readme.txt (original) +++ branches/ddk2003/include/ddk2003/readme.txt Fri Jun 29 18:47:04 2007 @@ -11,3 +11,16 @@ add ros hack to upssvc.h so it works again + + +------------------------------------------------------------ +cderr.h +Contain one change that does not exists in windows 2003sp1 +But it does exists in ddk for windows 2000/XP, +Regedit need it, it is FNERR_BUFFERTOOSMALL + +warning.h / rpc.h +Contain one change, we do not use ms seh +so we need disable the keywords for now +until gcc support it + Modified: branches/ddk2003/include/ddk2003/rpc.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/rpc.h?r… ============================================================================== --- branches/ddk2003/include/ddk2003/rpc.h (original) +++ branches/ddk2003/include/ddk2003/rpc.h Fri Jun 29 18:47:04 2007 @@ -1,8 +1,8 @@ - #if !defined( RPC_NO_WINDOWS_H ) && !defined( MAC ) && !defined( _MAC ) #include <windows.h> #endif + #ifndef __RPC_H__ #define __RPC_H__ @@ -11,26 +11,25 @@ #pragma once #endif + #ifdef __cplusplus extern "C" { #endif - -#if defined( MAC ) || defined( _MAC ) - +#if defined( MAC ) || defined( _MAC ) || defined(__powerpc__) #define __RPC_MAC__ + #define __RPC_WIN32__ #include <pshpack2.h> #else - - #include <basetsd.h> - - #if defined(_M_IA64) || defined(_M_AMD64) + #if defined(_M_IA64) || defined(_M_AMD64) || defined(_WIN64) #define __RPC_WIN64__ #else #define __RPC_WIN32__ #endif #endif + +#include <basetsd.h> #if defined(__RPC_WIN64__) #include <pshpack8.h> @@ -42,14 +41,17 @@ #define __MIDL_USER_DEFINED #endif + typedef void * I_RPC_HANDLE; typedef long RPC_STATUS; +#define __RPC_FAR #if defined(__RPC_WIN32__) || defined(__RPC_WIN64__) #define RPC_UNICODE_SUPPORTED #endif -#if !defined(__RPC_MAC__) && ( (_MSC_VER >= 800) || defined(_STDCALL_SUPPORTED) ) + +#if !defined(__RPC_MAC__) #define __RPC_API __stdcall #define __RPC_USER __stdcall #define __RPC_STUB __stdcall @@ -61,51 +63,48 @@ #define RPC_ENTRY #endif -#define __RPC_FAR +#if !defined(DECLSPEC_IMPORT) + #if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_AMD64)) && !defined(MIDL_PASS) + #define DECLSPEC_IMPORT __declspec(dllimport) + #else + #define DECLSPEC_IMPORT + #endif +#endif - -#if !defined(DECLSPEC_IMPORT) -#if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_AMD64)) && !defined(MIDL_PASS) - #define DECLSPEC_IMPORT __declspec(dllimport) -#else - #define DECLSPEC_IMPORT -#endif +#if !defined(DECLSPEC_EXPORT) + #if (defined(_M_MRX000) || defined(_M_IX86) || defined(_M_IA64) || defined(_M_AMD64)) && !defined(MIDL_PASS) + #define DECLSPEC_EXPORT __declspec(dllexport) + #else + #define DECLSPEC_EXPORT + #endif #endif #if !defined(_RPCRT4_) #define RPCRTAPI DECLSPEC_IMPORT #else - #define RPCRTAPI + #define RPCRTAPI DECLSPEC_EXPORT #endif #if !defined(_RPCNS4_) #define RPCNSAPI DECLSPEC_IMPORT #else - #define RPCNSAPI + #define RPCNSAPI DECLSPEC_EXPORT #endif + #ifdef __RPC_MAC__ - #include <setjmp.h> - #define RPCXCWORD (sizeof(jmp_buf)/sizeof(int)) - #if _MSC_VER >= 1200 - #pragma warning(push) - #endif - + #pragma warning(push) #pragma warning( disable: 4005 ) #include <rpcdce.h> #include <rpcnsi.h> #include <rpcerr.h> #include <rpcmac.h> - #if _MSC_VER >= 1200 - #pragma warning(pop) - #else - #pragma warning( default : 4005 ) - #endif + #pragma warning(pop) - typedef void (RPC_ENTRY *MACYIELDCALLBACK)(/*OSErr*/ short *) ; + typedef void (RPC_ENTRY *MACYIELDCALLBACK)(short *) ; RPC_STATUS RPC_ENTRY RpcMacSetYieldInfo(MACYIELDCALLBACK pfnCallback) ; @@ -114,27 +113,34 @@ #endif #include <poppack.h> -#else +#else #include <rpcdce.h> - #include <rpcnsi.h> + /* #include <rpcnsi.h> */ #include <rpcnterr.h> #include <excpt.h> #include <winerror.h> - #define RpcTryExcept __try { - #define RpcExcept(expr) } __except (expr) { - #define RpcEndExcept } - #define RpcTryFinally __try { - #define RpcFinally } __finally { - #define RpcEndFinally } + #ifndef __GNUC__ + #define RpcTryExcept __try { + #define RpcExcept(expr) } __except (expr) { + #define RpcEndExcept } + #define RpcTryFinally __try { + #define RpcFinally } __finally { + #define RpcEndFinally } + #define RpcExceptionCode() GetExceptionCode() + #define RpcAbnormalTermination() AbnormalTermination() + #else + /* FIXME ReactOS SEH support, we need remove this when gcc support native seh */ - #define RpcExceptionCode() GetExceptionCode() - #define RpcAbnormalTermination() AbnormalTermination() -#endif - - -#if !defined( RPC_NO_WINDOWS_H ) && !defined(__RPC_MAC__) - #include <rpcasync.h> + #define RpcTryExcept if (1) { + #define RpcExcept(expr) } else { + #define RpcEndExcept } + #define RpcTryFinally + #define RpcFinally + #define RpcEndFinally + #define RpcExceptionCode() 0 + /* #define RpcAbnormalTermination() abort() */ + #endif #endif #if defined(__RPC_WIN64__) @@ -147,4 +153,3 @@ #endif - Modified: branches/ddk2003/include/ddk2003/warning.h URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/include/ddk2003/warning… ============================================================================== --- branches/ddk2003/include/ddk2003/warning.h (original) +++ branches/ddk2003/include/ddk2003/warning.h Fri Jun 29 18:47:04 2007 @@ -53,16 +53,19 @@ #endif - -#ifndef __cplusplus - #undef try - #undef except - #undef finally - #undef leave - #define try __try - #define except __except - #define finally __finally - #define leave __leave +#ifndef __GNUC__ + #ifndef __cplusplus + #undef try + #undef except + #undef finally + #undef leave + #define try __try + #define except __except + #define finally __finally + #define leave __leave + #endif +#else + /* FIXME when gcc support ms seh remove #ifndef __REACTOS__ */ #endif #if _MSC_VER <= 1400

17 years, 5 months

[gedmurphy] 27323: - add an application settings dialog - add a new table to the database plus corresponding code for storing/reading application related data

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Jun 29 18:25:30 2007 New Revision: 27323 URL: http://svn.reactos.org/svn/reactos?rev=27323&view=rev Log: - add an application settings dialog - add a new table to the database plus corresponding code for storing/reading application related data Added: trunk/tools/RosTE/GUI/ConsoleSettings.Designer.cs trunk/tools/RosTE/GUI/ConsoleSettings.cs trunk/tools/RosTE/GUI/ConsoleSettings.resx trunk/tools/RosTE/GUI/qemu.cs Modified: trunk/tools/RosTE/GUI/MainConfig.cs trunk/tools/RosTE/GUI/MainConfig.xsd trunk/tools/RosTE/GUI/MainConfig.xsx trunk/tools/RosTE/GUI/MainForm.Designer.cs trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/MainForm.resx trunk/tools/RosTE/GUI/RosTEGUI.csproj Added: trunk/tools/RosTE/GUI/ConsoleSettings.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/ConsoleSettings.De… ============================================================================== --- trunk/tools/RosTE/GUI/ConsoleSettings.Designer.cs (added) +++ trunk/tools/RosTE/GUI/ConsoleSettings.Designer.cs Fri Jun 29 18:25:30 2007 @@ -1,0 +1,306 @@ +namespace RosTEGUI +{ + partial class ConsoleSettings + { + /// <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.tabControl1 = new System.Windows.Forms.TabControl(); + this.tabPage1 = new System.Windows.Forms.TabPage(); + this.tabPage2 = new System.Windows.Forms.TabPage(); + this.button1 = new System.Windows.Forms.Button(); + this.button2 = new System.Windows.Forms.Button(); + this.tabPage3 = new System.Windows.Forms.TabPage(); + this.groupBox1 = new System.Windows.Forms.GroupBox(); + this.groupBox2 = new System.Windows.Forms.GroupBox(); + this.groupBox3 = new System.Windows.Forms.GroupBox(); + this.conQemuLoc = new System.Windows.Forms.TextBox(); + this.conVdkLoc = new System.Windows.Forms.TextBox(); + this.conDefVmLoc = new System.Windows.Forms.TextBox(); + this.button3 = new System.Windows.Forms.Button(); + this.button4 = new System.Windows.Forms.Button(); + this.button5 = new System.Windows.Forms.Button(); + this.conAppDebug = new System.Windows.Forms.CheckBox(); + this.groupBox4 = new System.Windows.Forms.GroupBox(); + this.conUpdateCombo = new System.Windows.Forms.ComboBox(); + this.conUpdateNow = new System.Windows.Forms.Button(); + this.folderBrowserDialog = new System.Windows.Forms.FolderBrowserDialog(); + this.tabControl1.SuspendLayout(); + this.tabPage1.SuspendLayout(); + this.tabPage2.SuspendLayout(); + this.tabPage3.SuspendLayout(); + this.groupBox1.SuspendLayout(); + this.groupBox2.SuspendLayout(); + this.groupBox3.SuspendLayout(); + this.groupBox4.SuspendLayout(); + this.SuspendLayout(); + // + // tabControl1 + // + this.tabControl1.Controls.Add(this.tabPage1); + this.tabControl1.Controls.Add(this.tabPage2); + this.tabControl1.Controls.Add(this.tabPage3); + this.tabControl1.Location = new System.Drawing.Point(12, 12); + this.tabControl1.Name = "tabControl1"; + this.tabControl1.SelectedIndex = 0; + this.tabControl1.Size = new System.Drawing.Size(303, 287); + this.tabControl1.TabIndex = 0; + // + // tabPage1 + // + this.tabPage1.Controls.Add(this.groupBox4); + this.tabPage1.Location = new System.Drawing.Point(4, 22); + this.tabPage1.Name = "tabPage1"; + this.tabPage1.Padding = new System.Windows.Forms.Padding(3); + this.tabPage1.Size = new System.Drawing.Size(295, 261); + this.tabPage1.TabIndex = 0; + this.tabPage1.Text = "General"; + this.tabPage1.UseVisualStyleBackColor = true; + // + // tabPage2 + // + this.tabPage2.Controls.Add(this.groupBox3); + this.tabPage2.Controls.Add(this.groupBox2); + this.tabPage2.Controls.Add(this.groupBox1); + this.tabPage2.Location = new System.Drawing.Point(4, 22); + this.tabPage2.Name = "tabPage2"; + this.tabPage2.Padding = new System.Windows.Forms.Padding(3); + this.tabPage2.Size = new System.Drawing.Size(295, 261); + this.tabPage2.TabIndex = 1; + this.tabPage2.Text = "Paths"; + this.tabPage2.UseVisualStyleBackColor = true; + // + // button1 + // + this.button1.DialogResult = System.Windows.Forms.DialogResult.OK; + this.button1.Location = new System.Drawing.Point(159, 305); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.TabIndex = 1; + this.button1.Text = "OK"; + this.button1.UseVisualStyleBackColor = true; + // + // button2 + // + this.button2.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.button2.Location = new System.Drawing.Point(240, 305); + this.button2.Name = "button2"; + this.button2.Size = new System.Drawing.Size(75, 23); + this.button2.TabIndex = 2; + this.button2.Text = "Cancel"; + this.button2.UseVisualStyleBackColor = true; + // + // tabPage3 + // + this.tabPage3.Controls.Add(this.conAppDebug); + this.tabPage3.Location = new System.Drawing.Point(4, 22); + this.tabPage3.Name = "tabPage3"; + this.tabPage3.Size = new System.Drawing.Size(295, 261); + this.tabPage3.TabIndex = 2; + this.tabPage3.Text = "Advanced"; + this.tabPage3.UseVisualStyleBackColor = true; + // + // groupBox1 + // + this.groupBox1.Controls.Add(this.button3); + this.groupBox1.Controls.Add(this.conQemuLoc); + this.groupBox1.Location = new System.Drawing.Point(6, 6); + this.groupBox1.Name = "groupBox1"; + this.groupBox1.Size = new System.Drawing.Size(283, 65); + this.groupBox1.TabIndex = 0; + this.groupBox1.TabStop = false; + this.groupBox1.Text = "Location of QEmu"; + // + // groupBox2 + // + this.groupBox2.Controls.Add(this.button4); + this.groupBox2.Controls.Add(this.conVdkLoc); + this.groupBox2.Location = new System.Drawing.Point(6, 88); + this.groupBox2.Name = "groupBox2"; + this.groupBox2.Size = new System.Drawing.Size(283, 65); + this.groupBox2.TabIndex = 1; + this.groupBox2.TabStop = false; + this.groupBox2.Text = "Location of VDK"; + // + // groupBox3 + // + this.groupBox3.Controls.Add(this.button5); + this.groupBox3.Controls.Add(this.conDefVmLoc); + this.groupBox3.Location = new System.Drawing.Point(6, 170); + this.groupBox3.Name = "groupBox3"; + this.groupBox3.Size = new System.Drawing.Size(283, 65); + this.groupBox3.TabIndex = 2; + this.groupBox3.TabStop = false; + this.groupBox3.Text = "Default location for virtual machines"; + // + // conQemuLoc + // + this.conQemuLoc.Location = new System.Drawing.Point(6, 28); + this.conQemuLoc.Name = "conQemuLoc"; + this.conQemuLoc.Size = new System.Drawing.Size(190, 20); + this.conQemuLoc.TabIndex = 0; + // + // conVdkLoc + // + this.conVdkLoc.Location = new System.Drawing.Point(6, 29); + this.conVdkLoc.Name = "conVdkLoc"; + this.conVdkLoc.Size = new System.Drawing.Size(190, 20); + this.conVdkLoc.TabIndex = 0; + // + // conDefVmLoc + // + this.conDefVmLoc.Location = new System.Drawing.Point(6, 30); + this.conDefVmLoc.Name = "conDefVmLoc"; + this.conDefVmLoc.Size = new System.Drawing.Size(190, 20); + this.conDefVmLoc.TabIndex = 0; + // + // button3 + // + this.button3.Location = new System.Drawing.Point(202, 26); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(75, 23); + this.button3.TabIndex = 1; + this.button3.Text = "Browse..."; + this.button3.UseVisualStyleBackColor = true; + this.button3.Click += new System.EventHandler(this.button3_Click); + // + // button4 + // + this.button4.Location = new System.Drawing.Point(202, 27); + this.button4.Name = "button4"; + this.button4.Size = new System.Drawing.Size(75, 23); + this.button4.TabIndex = 1; + this.button4.Text = "Browse..."; + this.button4.UseVisualStyleBackColor = true; + this.button4.Click += new System.EventHandler(this.button4_Click); + // + // button5 + // + this.button5.Location = new System.Drawing.Point(202, 28); + this.button5.Name = "button5"; + this.button5.Size = new System.Drawing.Size(75, 23); + this.button5.TabIndex = 1; + this.button5.Text = "Browse..."; + this.button5.UseVisualStyleBackColor = true; + this.button5.Click += new System.EventHandler(this.button5_Click); + // + // conAppDebug + // + this.conAppDebug.AutoSize = true; + this.conAppDebug.Location = new System.Drawing.Point(21, 33); + this.conAppDebug.Name = "conAppDebug"; + this.conAppDebug.Size = new System.Drawing.Size(170, 17); + this.conAppDebug.TabIndex = 0; + this.conAppDebug.Text = "Turn on application debugging"; + this.conAppDebug.UseVisualStyleBackColor = true; + // + // groupBox4 + // + this.groupBox4.Controls.Add(this.conUpdateNow); + this.groupBox4.Controls.Add(this.conUpdateCombo); + this.groupBox4.Location = new System.Drawing.Point(6, 153); + this.groupBox4.Name = "groupBox4"; + this.groupBox4.Size = new System.Drawing.Size(283, 80); + this.groupBox4.TabIndex = 0; + this.groupBox4.TabStop = false; + this.groupBox4.Text = "Check for updates"; + // + // conUpdateCombo + // + this.conUpdateCombo.FormattingEnabled = true; + this.conUpdateCombo.Items.AddRange(new object[] { + "On startup", + "Daily", + "Weekly", + "Monthly"}); + this.conUpdateCombo.Location = new System.Drawing.Point(6, 33); + this.conUpdateCombo.Name = "conUpdateCombo"; + this.conUpdateCombo.Size = new System.Drawing.Size(190, 21); + this.conUpdateCombo.TabIndex = 0; + // + // conUpdateNow + // + this.conUpdateNow.Location = new System.Drawing.Point(202, 33); + this.conUpdateNow.Name = "conUpdateNow"; + this.conUpdateNow.Size = new System.Drawing.Size(75, 23); + this.conUpdateNow.TabIndex = 1; + this.conUpdateNow.Text = "Check now"; + this.conUpdateNow.UseVisualStyleBackColor = true; + // + // ConsoleSettings + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(327, 340); + this.Controls.Add(this.button2); + this.Controls.Add(this.button1); + this.Controls.Add(this.tabControl1); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "ConsoleSettings"; + this.ShowIcon = false; + this.ShowInTaskbar = false; + this.Text = "Settings"; + this.tabControl1.ResumeLayout(false); + this.tabPage1.ResumeLayout(false); + this.tabPage2.ResumeLayout(false); + this.tabPage3.ResumeLayout(false); + this.tabPage3.PerformLayout(); + this.groupBox1.ResumeLayout(false); + this.groupBox1.PerformLayout(); + this.groupBox2.ResumeLayout(false); + this.groupBox2.PerformLayout(); + this.groupBox3.ResumeLayout(false); + this.groupBox3.PerformLayout(); + this.groupBox4.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.TabControl tabControl1; + private System.Windows.Forms.TabPage tabPage1; + private System.Windows.Forms.TabPage tabPage2; + private System.Windows.Forms.Button button1; + private System.Windows.Forms.Button button2; + private System.Windows.Forms.GroupBox groupBox3; + private System.Windows.Forms.Button button5; + private System.Windows.Forms.TextBox conDefVmLoc; + private System.Windows.Forms.GroupBox groupBox2; + private System.Windows.Forms.Button button4; + private System.Windows.Forms.TextBox conVdkLoc; + private System.Windows.Forms.GroupBox groupBox1; + private System.Windows.Forms.Button button3; + private System.Windows.Forms.TextBox conQemuLoc; + private System.Windows.Forms.TabPage tabPage3; + private System.Windows.Forms.GroupBox groupBox4; + private System.Windows.Forms.CheckBox conAppDebug; + private System.Windows.Forms.Button conUpdateNow; + private System.Windows.Forms.ComboBox conUpdateCombo; + private System.Windows.Forms.FolderBrowserDialog folderBrowserDialog; + } +} Added: trunk/tools/RosTE/GUI/ConsoleSettings.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/ConsoleSettings.cs… ============================================================================== --- trunk/tools/RosTE/GUI/ConsoleSettings.cs (added) +++ trunk/tools/RosTE/GUI/ConsoleSettings.cs Fri Jun 29 18:25:30 2007 @@ -1,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; +using System.Windows.Forms; + +namespace RosTEGUI +{ + public partial class ConsoleSettings : Form + { + private string GetFolderLocation() + { + folderBrowserDialog.ShowDialog(); + return folderBrowserDialog.SelectedPath; + } + + public ConsoleSettings(MainConfig mainConf) + { + InitializeComponent(); + + // set general tab + conUpdateCombo.SelectedIndex = mainConf.UpdateSched; + + // set paths tab + conQemuLoc.Text = mainConf.QemuPath; + conVdkLoc.Text = mainConf.VdkPath; + conDefVmLoc.Text = mainConf.DefVmPath; + + // set advanced tab + conAppDebug.Checked = mainConf.AppDebug; + } + + private void button3_Click(object sender, EventArgs e) + { + conQemuLoc.Text = GetFolderLocation(); + } + + private void button4_Click(object sender, EventArgs e) + { + conVdkLoc.Text = GetFolderLocation(); + } + + private void button5_Click(object sender, EventArgs e) + { + conDefVmLoc.Text = GetFolderLocation(); + } + } +} Added: trunk/tools/RosTE/GUI/ConsoleSettings.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/ConsoleSettings.re… ============================================================================== --- trunk/tools/RosTE/GUI/ConsoleSettings.resx (added) +++ trunk/tools/RosTE/GUI/ConsoleSettings.resx Fri Jun 29 18:25:30 2007 @@ -1,0 +1,123 @@ +<?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> + <metadata name="folderBrowserDialog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>17, 17</value> + </metadata> +</root> Modified: trunk/tools/RosTE/GUI/MainConfig.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainConfig.cs?rev=… ============================================================================== --- trunk/tools/RosTE/GUI/MainConfig.cs (original) +++ trunk/tools/RosTE/GUI/MainConfig.cs Fri Jun 29 18:25:30 2007 @@ -8,15 +8,101 @@ public class MainConfig { private Data data = null; + private DataRow drSettings; - private static void PrintRows(DataTable dt) + #region properties + + public string QemuPath { - for (int i = 0; i < dt.Rows.Count; i++) - { - string str = "row: " + i + ", VMConfigID: " + dt.Rows[i]["VMConfigID"] + ", Path " + dt.Rows[i]["Path"]; - MessageBox.Show(str); - } + get { return (string)drSettings["QemuPath"]; } + set { drSettings["QemuPath"] = value; } } + + public string VdkPath + { + get { return (string)drSettings["VdkPath"]; } + set { drSettings["VdkPath"] = value; } + } + + public string DefVmPath + { + get { return (string)drSettings["DefVmPath"]; } + set { drSettings["DefVmPath"] = value; } + } + + public int UpdateSched + { + get { return (int)drSettings["UpdateSched"]; } + set { drSettings["UpdateSched"] = value; } + } + + public bool AppDebug + { + get { return (bool)drSettings["AppDebug"]; } + set { drSettings["AppDebug"] = value; } + } + + #endregion + + #region VM Image functions + + public string GetExistingImage(int index) + { + DataTable dt = data.DataSet.Tables["VirtMach"]; + DataRow dr = dt.Rows[index]; + + return (string)dr["Path"]; + } + + public int AddVirtMach(string Path) + { + int i; + DataRow dr; + DataTable dt = data.DataSet.Tables["VirtMach"]; + i = dt.Rows.Count + 1; + dr = dt.NewRow(); + dr["VMConfigID"] = i; + dr["Path"] = Path; + dt.Rows.Add(dr); + return i; + } + + public void DeleteVirtMach(int index) + { + DataTable dt = data.DataSet.Tables["VirtMach"]; + dt.Rows.RemoveAt(index); + } + + public int GetNumberOfVms() + { + DataTable dt = data.DataSet.Tables["VirtMach"]; + return dt.Rows.Count; + } + + #endregion + + #region Settings functions + + public void CreateSettings() + { + DataTable dt = data.DataSet.Tables["Settings"]; + drSettings = dt.NewRow(); + // FIXME: these should be assigned by the installer + drSettings["QemuPath"] = @"C:\Program Files\RosTE\QEmu"; + drSettings["VdkPath"] = @"C:\Program Files\RosTE\VDK"; + drSettings["DefVmPath"] = @"C:\Program Files\RosTE\Images"; + drSettings["UpdateSched"] = 3; + drSettings["AppDebug"] = false; + dt.Rows.Add(drSettings); + } + + public void LoadSettings() + { + DataTable dt = data.DataSet.Tables["Settings"]; + drSettings = dt.Rows[0]; + } + + #endregion public MainConfig(Data dataIn) { @@ -52,38 +138,5 @@ data.DataSet.WriteXml(xtw, System.Data.XmlWriteMode.WriteSchema); xtw.Close(); } - - public string GetExistingImage(int index) - { - DataTable dt = data.DataSet.Tables["MainConfig"]; - DataRow dr = dt.Rows[index]; - - return (string)dr["Path"]; - } - - public int AddVirtMach(string Path) - { - int i; - DataRow dr; - DataTable dt = data.DataSet.Tables["MainConfig"]; - i = dt.Rows.Count + 1; - dr = dt.NewRow(); - dr["VMConfigID"] = i; - dr["Path"] = Path; - dt.Rows.Add(dr); - return i; - } - - public void DeleteVirtMach(int index) - { - DataTable dt = data.DataSet.Tables["MainConfig"]; - dt.Rows.RemoveAt(index); - } - - public int GetNumberOfVms() - { - DataTable dt = data.DataSet.Tables["MainConfig"]; - return dt.Rows.Count; - } } } Modified: trunk/tools/RosTE/GUI/MainConfig.xsd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainConfig.xsd?rev… ============================================================================== --- trunk/tools/RosTE/GUI/MainConfig.xsd (original) +++ trunk/tools/RosTE/GUI/MainConfig.xsd Fri Jun 29 18:25:30 2007 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <xs:schema id="MainDB" targetNamespace="http://tempuri.org/MainDB.xsd" elementFormDefault="qualified" xmlns="http://tempuri.org/MainDB.xsd" xmlns:mstns="http://tempuri.org/MainDB.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <xs:element name="MainConfig"> + <xs:element name="VirtMach"> <xs:complexType> <xs:sequence> <xs:element name="VMConfigID" type="xs:int" /> @@ -8,4 +8,15 @@ </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="Settings"> + <xs:complexType> + <xs:sequence> + <xs:element name="QemuPath" type="xs:string" /> + <xs:element name="VdkPath" type="xs:string" /> + <xs:element name="DefVmPath" type="xs:string" /> + <xs:element name="UpdateSched" type="xs:int" /> + <xs:element name="AppDebug" type="xs:boolean" /> + </xs:sequence> + </xs:complexType> + </xs:element> </xs:schema> Modified: trunk/tools/RosTE/GUI/MainConfig.xsx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainConfig.xsx?rev… ============================================================================== --- trunk/tools/RosTE/GUI/MainConfig.xsx (original) +++ trunk/tools/RosTE/GUI/MainConfig.xsx Fri Jun 29 18:25:30 2007 @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?>  <XSDDesignerLayout Style="LeftRight" layoutVersion="2" viewPortLeft="0" viewPortTop="-4677" zoom="100"> - <MainConfig_XmlElement left="8863" top="-3071" width="4842" height="3678" selected="0" zOrder="0" index="0" expanded="1" /> + <VirtMach_XmlElement left="8520" top="-3095" width="4842" height="1984" selected="0" zOrder="0" index="0" expanded="1" /> + <Settings_XmlElement left="2461" top="-3148" width="5291" height="3254" selected="0" zOrder="1" index="1" expanded="1" /> </XSDDesignerLayout> Modified: trunk/tools/RosTE/GUI/MainForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.Designer.… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.Designer.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.Designer.cs Fri Jun 29 18:25:30 2007 @@ -35,18 +35,10 @@ this.columnAudio = new System.Windows.Forms.ColumnHeader(); this.columnDebug = new System.Windows.Forms.ColumnHeader(); this.mainImageList = new System.Windows.Forms.ImageList(this.components); - this.toolbarLaunch = new System.Windows.Forms.ToolStripButton(); - this.toolbarStop = new System.Windows.Forms.ToolStripButton(); this.toolbarSep1 = new System.Windows.Forms.ToolStripSeparator(); - this.toolbarImageAdd = new System.Windows.Forms.ToolStripButton(); - this.toolbarImageDel = new System.Windows.Forms.ToolStripButton(); this.toolbarSep2 = new System.Windows.Forms.ToolStripSeparator(); - this.toolbarHelpContents = new System.Windows.Forms.ToolStripButton(); this.toolbarSep4 = new System.Windows.Forms.ToolStripSeparator(); - this.toolbarExit = new System.Windows.Forms.ToolStripButton(); this.mainToolbar = new System.Windows.Forms.ToolStrip(); - this.toolbarSnapShot = new System.Windows.Forms.ToolStripButton(); - this.toolbarScreenShot = new System.Windows.Forms.ToolStripButton(); this.toolbarSep3 = new System.Windows.Forms.ToolStripSeparator(); this.mainMenu = new System.Windows.Forms.MenuStrip(); this.mainmenuFile = new System.Windows.Forms.ToolStripMenuItem(); @@ -58,7 +50,21 @@ this.mainmenuHelpContent = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); this.MainMenuHelpAbout = new System.Windows.Forms.ToolStripMenuItem(); - this.changeSettingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.settingsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolbarLaunch = new System.Windows.Forms.ToolStripButton(); + this.toolbarStop = new System.Windows.Forms.ToolStripButton(); + this.toolbarImageAdd = new System.Windows.Forms.ToolStripButton(); + this.toolbarImageDel = new System.Windows.Forms.ToolStripButton(); + this.toolbarSnapShot = new System.Windows.Forms.ToolStripButton(); + this.toolbarScreenShot = new System.Windows.Forms.ToolStripButton(); + this.toolbarHelpContents = new System.Windows.Forms.ToolStripButton(); + this.toolbarExit = new System.Windows.Forms.ToolStripButton(); + this.snapshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.takeSnapshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.loadSnapshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); + this.deleteSnapshotToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.mainToolbar.SuspendLayout(); this.mainMenu.SuspendLayout(); this.SuspendLayout(); @@ -121,77 +127,20 @@ this.mainImageList.TransparentColor = System.Drawing.Color.Transparent; this.mainImageList.Images.SetKeyName(0, "images.png"); // - // toolbarLaunch - // - this.toolbarLaunch.Image = ((System.Drawing.Image)(resources.GetObject("toolbarLaunch.Image"))); - this.toolbarLaunch.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarLaunch.Name = "toolbarLaunch"; - this.toolbarLaunch.Size = new System.Drawing.Size(61, 22); - this.toolbarLaunch.Text = "Launch"; - this.toolbarLaunch.ToolTipText = "Starts the virtual machine"; - // - // toolbarStop - // - this.toolbarStop.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolbarStop.Image = ((System.Drawing.Image)(resources.GetObject("toolbarStop.Image"))); - this.toolbarStop.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarStop.Name = "toolbarStop"; - this.toolbarStop.Size = new System.Drawing.Size(23, 22); - this.toolbarStop.ToolTipText = "Stops the virtual machine"; - // // toolbarSep1 // this.toolbarSep1.Name = "toolbarSep1"; this.toolbarSep1.Size = new System.Drawing.Size(6, 25); // - // toolbarImageAdd - // - this.toolbarImageAdd.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolbarImageAdd.Image = ((System.Drawing.Image)(resources.GetObject("toolbarImageAdd.Image"))); - this.toolbarImageAdd.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarImageAdd.Name = "toolbarImageAdd"; - this.toolbarImageAdd.Size = new System.Drawing.Size(23, 22); - this.toolbarImageAdd.ToolTipText = "Adds a new image"; - this.toolbarImageAdd.Click += new System.EventHandler(this.CreateNewVirtMach); - // - // toolbarImageDel - // - this.toolbarImageDel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolbarImageDel.Image = ((System.Drawing.Image)(resources.GetObject("toolbarImageDel.Image"))); - this.toolbarImageDel.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarImageDel.Name = "toolbarImageDel"; - this.toolbarImageDel.Size = new System.Drawing.Size(23, 22); - this.toolbarImageDel.ToolTipText = "Deletes an existing image"; - this.toolbarImageDel.Click += new System.EventHandler(this.DeleteVirtMach); - // // toolbarSep2 // this.toolbarSep2.Name = "toolbarSep2"; this.toolbarSep2.Size = new System.Drawing.Size(6, 25); // - // toolbarHelpContents - // - this.toolbarHelpContents.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolbarHelpContents.Image = ((System.Drawing.Image)(resources.GetObject("toolbarHelpContents.Image"))); - this.toolbarHelpContents.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarHelpContents.Name = "toolbarHelpContents"; - this.toolbarHelpContents.Size = new System.Drawing.Size(23, 22); - this.toolbarHelpContents.ToolTipText = "Opens help file"; - // // toolbarSep4 // this.toolbarSep4.Name = "toolbarSep4"; this.toolbarSep4.Size = new System.Drawing.Size(6, 25); - // - // toolbarExit - // - this.toolbarExit.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.toolbarExit.Image = ((System.Drawing.Image)(resources.GetObject("toolbarExit.Image"))); - this.toolbarExit.ImageTransparentColor = System.Drawing.Color.Magenta; - this.toolbarExit.Name = "toolbarExit"; - this.toolbarExit.Size = new System.Drawing.Size(23, 22); - this.toolbarExit.ToolTipText = "Exits application"; - this.toolbarExit.Click += new System.EventHandler(this.toolbarExit_Click); // // mainToolbar // @@ -213,6 +162,141 @@ this.mainToolbar.Size = new System.Drawing.Size(540, 25); this.mainToolbar.TabIndex = 10; // + // toolbarSep3 + // + this.toolbarSep3.Name = "toolbarSep3"; + this.toolbarSep3.Size = new System.Drawing.Size(6, 25); + // + // mainMenu + // + this.mainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mainmenuFile, + this.mainmenuOptions, + this.snapshotToolStripMenuItem, + this.mainmenuHelp}); + this.mainMenu.Location = new System.Drawing.Point(0, 0); + this.mainMenu.Name = "mainMenu"; + this.mainMenu.Size = new System.Drawing.Size(540, 24); + this.mainMenu.TabIndex = 11; + // + // mainmenuFile + // + this.mainmenuFile.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.newToolStripMenuItem, + this.mainmenuFileExit}); + this.mainmenuFile.Name = "mainmenuFile"; + this.mainmenuFile.Size = new System.Drawing.Size(35, 20); + this.mainmenuFile.Text = "File"; + // + // newToolStripMenuItem + // + this.newToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.virtualMachineToolStripMenuItem}); + this.newToolStripMenuItem.Name = "newToolStripMenuItem"; + this.newToolStripMenuItem.Size = new System.Drawing.Size(106, 22); + this.newToolStripMenuItem.Text = "New"; + // + // virtualMachineToolStripMenuItem + // + this.virtualMachineToolStripMenuItem.Name = "virtualMachineToolStripMenuItem"; + this.virtualMachineToolStripMenuItem.Size = new System.Drawing.Size(157, 22); + this.virtualMachineToolStripMenuItem.Text = "Virtual Machine"; + this.virtualMachineToolStripMenuItem.Click += new System.EventHandler(this.CreateNewVirtMach); + // + // mainmenuFileExit + // + this.mainmenuFileExit.Name = "mainmenuFileExit"; + this.mainmenuFileExit.Size = new System.Drawing.Size(106, 22); + this.mainmenuFileExit.Text = "Exit"; + this.mainmenuFileExit.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); + // + // mainmenuOptions + // + this.mainmenuOptions.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.toolStripSeparator2, + this.settingsToolStripMenuItem}); + this.mainmenuOptions.Name = "mainmenuOptions"; + this.mainmenuOptions.Size = new System.Drawing.Size(56, 20); + this.mainmenuOptions.Text = "Options"; + // + // mainmenuHelp + // + this.mainmenuHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mainmenuHelpContent, + this.toolStripSeparator1, + this.MainMenuHelpAbout}); + this.mainmenuHelp.Name = "mainmenuHelp"; + this.mainmenuHelp.Size = new System.Drawing.Size(40, 20); + this.mainmenuHelp.Text = "Help"; + // + // mainmenuHelpContent + // + this.mainmenuHelpContent.Name = "mainmenuHelpContent"; + this.mainmenuHelpContent.Size = new System.Drawing.Size(124, 22); + this.mainmenuHelpContent.Text = "Content"; + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(121, 6); + // + // MainMenuHelpAbout + // + this.MainMenuHelpAbout.Name = "MainMenuHelpAbout"; + this.MainMenuHelpAbout.Size = new System.Drawing.Size(124, 22); + this.MainMenuHelpAbout.Text = "About"; + this.MainMenuHelpAbout.Click += new System.EventHandler(this.MainMenuHelpAbout_Click); + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(149, 6); + // + // settingsToolStripMenuItem + // + this.settingsToolStripMenuItem.Name = "settingsToolStripMenuItem"; + this.settingsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.settingsToolStripMenuItem.Text = "Settings"; + this.settingsToolStripMenuItem.Click += new System.EventHandler(this.settingsToolStripMenuItem_Click); + // + // toolbarLaunch + // + this.toolbarLaunch.Image = ((System.Drawing.Image)(resources.GetObject("toolbarLaunch.Image"))); + this.toolbarLaunch.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarLaunch.Name = "toolbarLaunch"; + this.toolbarLaunch.Size = new System.Drawing.Size(61, 22); + this.toolbarLaunch.Text = "Launch"; + this.toolbarLaunch.ToolTipText = "Starts the virtual machine"; + // + // toolbarStop + // + this.toolbarStop.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarStop.Image = ((System.Drawing.Image)(resources.GetObject("toolbarStop.Image"))); + this.toolbarStop.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarStop.Name = "toolbarStop"; + this.toolbarStop.Size = new System.Drawing.Size(23, 22); + this.toolbarStop.ToolTipText = "Stops the virtual machine"; + // + // toolbarImageAdd + // + this.toolbarImageAdd.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarImageAdd.Image = ((System.Drawing.Image)(resources.GetObject("toolbarImageAdd.Image"))); + this.toolbarImageAdd.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarImageAdd.Name = "toolbarImageAdd"; + this.toolbarImageAdd.Size = new System.Drawing.Size(23, 22); + this.toolbarImageAdd.ToolTipText = "Adds a new image"; + this.toolbarImageAdd.Click += new System.EventHandler(this.CreateNewVirtMach); + // + // toolbarImageDel + // + this.toolbarImageDel.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarImageDel.Image = ((System.Drawing.Image)(resources.GetObject("toolbarImageDel.Image"))); + this.toolbarImageDel.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarImageDel.Name = "toolbarImageDel"; + this.toolbarImageDel.Size = new System.Drawing.Size(23, 22); + this.toolbarImageDel.ToolTipText = "Deletes an existing image"; + this.toolbarImageDel.Click += new System.EventHandler(this.DeleteVirtMach); + // // toolbarSnapShot // this.toolbarSnapShot.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; @@ -233,95 +317,58 @@ this.toolbarScreenShot.Text = "toolStripButton2"; this.toolbarScreenShot.ToolTipText = "Grab a screenshot of the display"; // - // toolbarSep3 - // - this.toolbarSep3.Name = "toolbarSep3"; - this.toolbarSep3.Size = new System.Drawing.Size(6, 25); - // - // mainMenu - // - this.mainMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mainmenuFile, - this.mainmenuOptions, - this.mainmenuHelp}); - this.mainMenu.Location = new System.Drawing.Point(0, 0); - this.mainMenu.Name = "mainMenu"; - this.mainMenu.Size = new System.Drawing.Size(540, 24); - this.mainMenu.TabIndex = 11; - // - // mainmenuFile - // - this.mainmenuFile.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.newToolStripMenuItem, - this.mainmenuFileExit}); - this.mainmenuFile.Name = "mainmenuFile"; - this.mainmenuFile.Size = new System.Drawing.Size(35, 20); - this.mainmenuFile.Text = "File"; - // - // newToolStripMenuItem - // - this.newToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.virtualMachineToolStripMenuItem}); - this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.Size = new System.Drawing.Size(106, 22); - this.newToolStripMenuItem.Text = "New"; - // - // virtualMachineToolStripMenuItem - // - this.virtualMachineToolStripMenuItem.Name = "virtualMachineToolStripMenuItem"; - this.virtualMachineToolStripMenuItem.Size = new System.Drawing.Size(157, 22); - this.virtualMachineToolStripMenuItem.Text = "Virtual Machine"; - this.virtualMachineToolStripMenuItem.Click += new System.EventHandler(this.CreateNewVirtMach); - // - // mainmenuFileExit - // - this.mainmenuFileExit.Name = "mainmenuFileExit"; - this.mainmenuFileExit.Size = new System.Drawing.Size(106, 22); - this.mainmenuFileExit.Text = "Exit"; - this.mainmenuFileExit.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); - // - // mainmenuOptions - // - this.mainmenuOptions.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.changeSettingsToolStripMenuItem}); - this.mainmenuOptions.Name = "mainmenuOptions"; - this.mainmenuOptions.Size = new System.Drawing.Size(56, 20); - this.mainmenuOptions.Text = "Options"; - // - // mainmenuHelp - // - this.mainmenuHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mainmenuHelpContent, - this.toolStripSeparator1, - this.MainMenuHelpAbout}); - this.mainmenuHelp.Name = "mainmenuHelp"; - this.mainmenuHelp.Size = new System.Drawing.Size(40, 20); - this.mainmenuHelp.Text = "Help"; - // - // mainmenuHelpContent - // - this.mainmenuHelpContent.Name = "mainmenuHelpContent"; - this.mainmenuHelpContent.Size = new System.Drawing.Size(124, 22); - this.mainmenuHelpContent.Text = "Content"; - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(121, 6); - // - // MainMenuHelpAbout - // - this.MainMenuHelpAbout.Name = "MainMenuHelpAbout"; - this.MainMenuHelpAbout.Size = new System.Drawing.Size(124, 22); - this.MainMenuHelpAbout.Text = "About"; - this.MainMenuHelpAbout.Click += new System.EventHandler(this.MainMenuHelpAbout_Click); - // - // changeSettingsToolStripMenuItem - // - this.changeSettingsToolStripMenuItem.Name = "changeSettingsToolStripMenuItem"; - this.changeSettingsToolStripMenuItem.Size = new System.Drawing.Size(163, 22); - this.changeSettingsToolStripMenuItem.Text = "Change settings"; - this.changeSettingsToolStripMenuItem.Click += new System.EventHandler(this.changeSettingsToolStripMenuItem_Click); + // toolbarHelpContents + // + this.toolbarHelpContents.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarHelpContents.Image = ((System.Drawing.Image)(resources.GetObject("toolbarHelpContents.Image"))); + this.toolbarHelpContents.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarHelpContents.Name = "toolbarHelpContents"; + this.toolbarHelpContents.Size = new System.Drawing.Size(23, 22); + this.toolbarHelpContents.ToolTipText = "Opens help file"; + // + // toolbarExit + // + this.toolbarExit.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.toolbarExit.Image = ((System.Drawing.Image)(resources.GetObject("toolbarExit.Image"))); + this.toolbarExit.ImageTransparentColor = System.Drawing.Color.Magenta; + this.toolbarExit.Name = "toolbarExit"; + this.toolbarExit.Size = new System.Drawing.Size(23, 22); + this.toolbarExit.ToolTipText = "Exits application"; + this.toolbarExit.Click += new System.EventHandler(this.toolbarExit_Click); + // + // snapshotToolStripMenuItem + // + this.snapshotToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.takeSnapshotToolStripMenuItem, + this.loadSnapshotToolStripMenuItem, + this.toolStripSeparator3, + this.deleteSnapshotToolStripMenuItem}); + this.snapshotToolStripMenuItem.Name = "snapshotToolStripMenuItem"; + this.snapshotToolStripMenuItem.Size = new System.Drawing.Size(64, 20); + this.snapshotToolStripMenuItem.Text = "Snapshot"; + // + // takeSnapshotToolStripMenuItem + // + this.takeSnapshotToolStripMenuItem.Name = "takeSnapshotToolStripMenuItem"; + this.takeSnapshotToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.takeSnapshotToolStripMenuItem.Text = "Take snapshot"; + // + // loadSnapshotToolStripMenuItem + // + this.loadSnapshotToolStripMenuItem.Name = "loadSnapshotToolStripMenuItem"; + this.loadSnapshotToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.loadSnapshotToolStripMenuItem.Text = "Load snapshot"; + // + // toolStripSeparator3 + // + this.toolStripSeparator3.Name = "toolStripSeparator3"; + this.toolStripSeparator3.Size = new System.Drawing.Size(160, 6); + // + // deleteSnapshotToolStripMenuItem + // + this.deleteSnapshotToolStripMenuItem.Name = "deleteSnapshotToolStripMenuItem"; + this.deleteSnapshotToolStripMenuItem.Size = new System.Drawing.Size(163, 22); + this.deleteSnapshotToolStripMenuItem.Text = "Delete snapshot"; // // MainForm // @@ -340,7 +387,7 @@ this.Name = "MainForm"; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "QEmu Manager"; + this.Text = "ReactOS Testing Environment - VM Manager"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); this.Load += new System.EventHandler(this.MainForm_Load); this.mainToolbar.ResumeLayout(false); @@ -386,7 +433,13 @@ private System.Windows.Forms.ToolStripMenuItem mainmenuOptions; private System.Windows.Forms.ToolStripMenuItem newToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem virtualMachineToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem changeSettingsToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator2; + private System.Windows.Forms.ToolStripMenuItem settingsToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem snapshotToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem takeSnapshotToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem loadSnapshotToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripSeparator3; + private System.Windows.Forms.ToolStripMenuItem deleteSnapshotToolStripMenuItem; } } Modified: trunk/tools/RosTE/GUI/MainForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.cs?rev=27… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.cs (original) +++ trunk/tools/RosTE/GUI/MainForm.cs Fri Jun 29 18:25:30 2007 @@ -35,29 +35,43 @@ Close(); } + private void LoadVirtualMachines(MainConfig mainConf) + { + int num = mainConf.GetNumberOfVms(); + for (int i = 0; i < num; i++) + { + string image = mainConf.GetExistingImage(i); + VirtualMachine vm = new VirtualMachine(); + if (vm.LoadVMConfig(image)) + { + ListViewItem lvi = VirtMachListView.Items.Add(vm.ToString(), 0); + lvi.SubItems.Add(vm.MemSize.ToString() + " MB"); + lvi.Tag = vm; + } + } + } + private void MainForm_Load(object sender, EventArgs e) { mainData = new Data(); if (!mainData.LoadMainData()) MessageBox.Show("Failed to load Main Schema"); - // read config and load any existing vm's mainConf = new MainConfig(mainData); + // load config and load any existing vm's if (mainConf.LoadMainConfig()) { - int num = mainConf.GetNumberOfVms(); - for (int i = 0; i < num; i++) - { - string image = mainConf.GetExistingImage(i); - VirtualMachine vm = new VirtualMachine(); - if (vm.LoadVMConfig(image)) - { - ListViewItem lvi = VirtMachListView.Items.Add(vm.ToString(), 0); - lvi.Tag = vm; - } - } + mainConf.LoadSettings(); + LoadVirtualMachines(mainConf); } + else // create settings for first run + { + mainConf.CreateSettings(); + } + + string str = mainConf.QemuPath; + } private void MainMenuHelpAbout_Click(object sender, EventArgs e) @@ -171,5 +185,12 @@ { LoadSettingsDialog(); } + + private void settingsToolStripMenuItem_Click(object sender, EventArgs e) + { + ConsoleSettings cs = new ConsoleSettings(mainConf); + cs.StartPosition = FormStartPosition.CenterParent; + cs.ShowDialog(); + } } } Modified: trunk/tools/RosTE/GUI/MainForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/MainForm.resx?rev=… ============================================================================== --- trunk/tools/RosTE/GUI/MainForm.resx (original) +++ trunk/tools/RosTE/GUI/MainForm.resx Fri Jun 29 18:25:30 2007 @@ -161,6 +161,12 @@ XgAC/wYACw== </value> </data> + <metadata name="mainToolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>358, 23</value> + </metadata> + <metadata name="mainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>242, 22</value> + </metadata> <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <data name="toolbarLaunch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> @@ -184,12 +190,12 @@ <data name="toolbarImageAdd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAPxJREFUOE9jYKAV - 8PDwYE9LS2Otr69nIscOxtDw4P8OTvZ/gfQ/EDs+Pp6DJIPCIuz+3L5z6/+u3Tv/h0WE/Pbx8eEiyQCQ - 7Xfu3v6/e8+u/0DNv0JDQ3kIGgDyr729PQtQMRvI6TADIqLCfkZHR/PhNQDkTyj+B7Ldxc3p7917d8Au - iIwO/4MkD1aHYRhI8M7dW0B8+z9II4gG4QMH96Pgg4cO4DYAFGhHjh7+f/jIIbwYpwvQnXnm7On/IOzk - 4gCKTpgXsbsA3U8gDVeuXgbj8Ej7PySnA5AB129cA2OyDbh85dJ/ECbLAFDiCY8M/Q3CIDYobxBMSAOi - AAB7J98zlsMqwgAAAABJRU5ErkJggg== + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAPtJREFUOE9jYKAV + 8PDwYE9LS2Otr69nIscOxtDw4P/2DvZ/gfQ/EDs+Pp6DJIPCImz+3L5z6/+u3Tv/h0WE/Pbx8eEiyQCQ + 7Xfu3v6/e8+u/0DNv0JDQ3kIGgDyr729PQtQMRvI6TADIqLCfkZHR/PhNQDkTyj+B7LdycXh7917d8Au + iIwO/4MkD1aHYRhI8M7dW0B8+z9II4gG4QMH96Pgg4cO4DYAFGhHjh7+f/jIIbwYpwvQnXnm7On/IOzg + BI5OmBexuwDdTyANV65eBuPwSNs/JKcDkAHXb1wDY7INuHzl0n8QJssAUOIJjwz9DcIgNihvEExIA6IA + ADzE3xfN6Q2vAAAAAElFTkSuQmCC </value> </data> <data name="toolbarImageDel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> @@ -200,40 +206,6 @@ qFMYAMrCeub6SDuqAAAAAElFTkSuQmCC </value> </data> - <data name="toolbarHelpContents.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value> - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAtlJREFUOE+FU11I - U2EYXllBF3VjW91JklGUmCnCliUqSuaSfgjMm4FKpgRezFwQdKISKddM259LaJA/oNCF/WhRrQsnM8Ib - saBAspmbytz5m2fn7Jy9nfczJddFBx7Od873vO/3vM/7fls0KY/jQlWxlHusWtm563RSI+/D7a2abeE0 - gRvb/uXrs2uDw+OpMeSboqgdnlP6wODhQ4rf51N4ngNJkkAURaDpKPjejikDB7MU5CB3U5KhoaE0T05O - 6IPluiyFQiBMBoBhaIhGIwQME4WYfxxWp6dhrOGKjFyM2UjiOWn42G8yJaTZWWDq64EuKgIm9IskYVka - mPAC0KWlwFhaQZiaAq/KxRiSwHmxKteWuV8WZmaAMZmAKSmBSHU1DJw1JlSpccTAuapEtK4O2MpKYMxm - 4Cf8YMvIkN3njcc1trbbjjdPPEn+1UugCwthpaYGnDpt0lVR5qS6qN0Ij7p27tUlo01NRAk3+hp8z4cV - 652bLk1np/VHJLKsGrUCbDgEI0aj5C4tepTqtLO8+OH7EwaZX14k3LBaFsai+/FYjCdm4ZvIVk9NTUDU - qHuCsPrHWJpwSQJsGbZKEGL/TSCKccJFg0kClLG0tKi6zYLAsfDiaoPorijrSFXgLi+xjZrNcVFVwLIM - LCzMr5WARvj6+xS+txfYxkag372DvsxMxV1R7lg30XWm3N6fdUDhvn8Dtu0ecPbH4HM5FWyABlvh0mqT - vMUCtF4PPEUB4/fDyA2L1G2n4ogRipJiP+cg5vUCXVAAbG0tONPTkzgCRKlXXzAeyM+HWEsL0AYDcK2t - gFJlOaFChoQkAtfdRYI5dR4msrMBYzbKxLF8evTIciAvD7jmZuB63KROnMI1MMA57ORkDEbuplFev0xe - vf6zS6dLfrrfLs/PB4nbiGAwCJPtbbJLuyeJnH8u09+O2y9fKuy8e6vHau2Ye2BtFxG4xn941VO78xtK - 1i8alKXmewAAAABJRU5ErkJggg== -</value> - </data> - <data name="toolbarExit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> - <value> - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAVxJREFUOE9jYKAF - 0DMx+08Mxmk3SPOjRw/+X7584f+BA3v/r127GswHibPzM/wX1mAAszEMWMLA8B+E0Q3Yvn0r3ABeGYb/ - EsZ4DPjd1AQ25N69O2AXHDy47//OndvhBkjosv1XdGRDuABmK4wGGQAz5MKFsxgGKNlx/NfyZ0c1AKYJ - Rp8BugBmyN69u/8vWbII7gJtP97/+mG8mAaANKFjmCGVleX/o6OjwJqMIgX+W6TxoRrwXlPz/xagAegY - JA7yWk5OFtwFZtES/21yhDENACmGYZBBMM3ogWgZJ/nfvkAUdyDCDAHZfOXKRYxAtEoS/++YJ4mUDv4z - MDJAMUgTzGZQwoEZAGLDEpJ1qsR/l1I8BsAS0oMH98CaQLissgpso12K3H+3EuX/3nXy2FMiMGmyATEj - LCXCNDrnyf/3rlL671en+j+gTut/QL02TgPAyZuYjIQ1L5CTswFNRoUxygqSMgAAAABJRU5ErkJggg== -</value> - </data> - <metadata name="mainToolbar.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>358, 23</value> - </metadata> <data name="toolbarSnapShot.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -266,9 +238,37 @@ YPFAUCD3JItsvn6MXDsv/L6Jf/1tv/Xhnx/zLz/3rRNK6BfzAAAAAElFTkSuQmCC </value> </data> - <metadata name="mainMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>242, 22</value> - </metadata> + <data name="toolbarHelpContents.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAthJREFUOE+FU11I + U2EYXllBF3VjW91JklGUmCnSxBIVR+aSfgjMm0FKpgRezFwQdCIbQi5N259DcOBMUOjCfpSwFuRkRngj + FhRIprmpzJ2/eXbOztnbeT9Tcl104OF853zP+37P+7zvt0OT8jiuVJVIuaeqlb37zic18iHc3qnZFU4T + uLHdX7723x4cnkiNId8URe3xnNMHB48fUz76/QrPcyBJEoiiCDQdBf/bMeX50SwFOcjdlmRoaCjNk5MT + em+5I0uhEAhTQWAYGqLRCAHDRCEWmID1mRkYq78pIxdjtpJ4zhZ+6DeZEtLcHDB1dUAXFwMT+kWSsCwN + THgJ6LIyYCwtIExPQ5/KxRiSwHm1KteWeVgWZmeBMZmAKS2FSHU1+C4aE6rUOMJ3qSoRra0FtrISGLMZ + +MkA2DIyZPdl42lNh/WBY7THneRfvwK6qAjWamrArtMmXRXlTqqL2o/wqGv7QV0y2thIlHCjb8D/Ylix + Pbzn0nR22n5EIquqUWvAhkMwYjRK7rLip6lOOw0lT97pz8j86jLhhtWyMBbdj8diPDEL30S2empqAqJG + 3ROE9T/G0oRLEmDLsFWCEPtvAlGMEy4aTBKgjJWVZdVtFgSOhZe36kV3RXl7qgK3obRj1GyOi6oClmVg + aWlxowQ0wj/gU/jeXmAbGoAeHwdfZqbirjA4Nk10XTDYB7KOKNz3b8BaHwFnfwZ+l1PBBmiwFQ6tNslb + LEDr9cBTFDCBAIzctUjddiqOGKEoKfZzHmJeL9AFBcDeuAH29PQkjgBR6tUXTATz8yHW3Ax0YSFwLS2A + UmU5oUKGhCQC191Fgjl1HiazswFjtsrEsew7eWI1mJcHXFMTcD1uUidO4QYY4Bx2cjIGI3fbKG9eJq9e + /9mh0yU/tVnlxcUF4jZiYWEBpqytskN7IImcfy7T347br18r6my932Oztc8/trWJCFzjP7zqqd35DfRf + Lu+Mc2gnAAAAAElFTkSuQmCC +</value> + </data> + <data name="toolbarExit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAVxJREFUOE9jYKAF + 0DMx+08Mxmk3SPOjRw/+X7584f+BA3v/r127GswHibPzM/wX1mAAszEMWMLA8B+E0Q3Yvn0r3ABeGYb/ + EsZ4DPjd1AQ25N69O2AXHDy47//OndvhBkjosv1XdGRDuABmK4wGGQAz5MKFsxgGKNlx/NfyZ0c1AKYJ + Rp8BugBmyN69u/8vWbII7gJtP97/+mG8mAaANKFjmCGVleX/o6OjwJqMIgX+W6TxoRrwXlPz/xagAegY + JA7yWk5OFtwFZtES/21yhDENACmGYZBBMM3ogWgZJ/nfvkAUdyDCDAHZfOXKRYxAtEoS/++YJ4mUDv4z + MDJAMUgTzGZQwoEZAGLDEpJ1qsR/l1I8BsAS0oMH98CaQLissgpso12K3H+3EuX/3nXy2FMiMGmyATEj + LCXCNDrnyf/3rlL671en+j+gTut/QL02TgPAyZuYjIQ1L5CTswFNRoUxygqSMgAAAABJRU5ErkJggg== +</value> + </data> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> AAABAAkAEBAAAAEACABoBQAAlgAAACAgAAABAAgAqAgAAP4FAAAwMAAAAQAIAKgOAACmDgAAEBAAAAEA Modified: trunk/tools/RosTE/GUI/RosTEGUI.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/RosTEGUI.csproj?re… ============================================================================== --- trunk/tools/RosTE/GUI/RosTEGUI.csproj (original) +++ trunk/tools/RosTE/GUI/RosTEGUI.csproj Fri Jun 29 18:25:30 2007 @@ -120,6 +120,12 @@ <Compile Include="AboutForm.Designer.cs"> <DependentUpon>AboutForm.cs</DependentUpon> </Compile> + <Compile Include="ConsoleSettings.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="ConsoleSettings.Designer.cs"> + <DependentUpon>ConsoleSettings.cs</DependentUpon> + </Compile> <Compile Include="DeleteVM.cs"> <SubType>Form</SubType> </Compile> @@ -163,6 +169,8 @@ <DesignTime>True</DesignTime> <DependentUpon>Resources.resx</DependentUpon> </Compile> + <Compile Include="qemu.cs"> + </Compile> <Compile Include="SettingsForm.cs"> <SubType>Form</SubType> </Compile> @@ -215,6 +223,10 @@ <EmbeddedResource Include="AboutForm.resx"> <SubType>Designer</SubType> <DependentUpon>AboutForm.cs</DependentUpon> + </EmbeddedResource> + <EmbeddedResource Include="ConsoleSettings.resx"> + <SubType>Designer</SubType> + <DependentUpon>ConsoleSettings.cs</DependentUpon> </EmbeddedResource> <EmbeddedResource Include="DeleteVM.resx"> <SubType>Designer</SubType> Added: trunk/tools/RosTE/GUI/qemu.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/qemu.cs?rev=27323&… ============================================================================== --- trunk/tools/RosTE/GUI/qemu.cs (added) +++ trunk/tools/RosTE/GUI/qemu.cs Fri Jun 29 18:25:30 2007 @@ -1,0 +1,19 @@ +using System; +using System.Collections; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Text; +using System.Windows.Forms; +using System.Management; +using System.IO; +using System.Diagnostics; + + +namespace RosTEGUI +{ + public class qemu + { + + } +}

17 years, 5 months

[greatlrd] 27322: fixing comping issue, wrong protypes thx to the new headers

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 29 15:43:18 2007 New Revision: 27322 URL: http://svn.reactos.org/svn/reactos?rev=27322&view=rev Log: fixing comping issue, wrong protypes thx to the new headers Modified: branches/ddk2003/dll/win32/rpcrt4/ndr_contexth.c branches/ddk2003/dll/win32/rpcrt4/ndr_marshall.c branches/ddk2003/dll/win32/rpcrt4/ndr_midl.c branches/ddk2003/dll/win32/rpcrt4/ndr_ole.c branches/ddk2003/dll/win32/rpcrt4/ndr_stubless.c branches/ddk2003/dll/win32/rpcrt4/rpc_binding.c branches/ddk2003/dll/win32/rpcrt4/rpc_epmap.c branches/ddk2003/dll/win32/rpcrt4/rpc_message.c branches/ddk2003/dll/win32/rpcrt4/rpc_server.c branches/ddk2003/dll/win32/rpcrt4/rpcrt4_main.c Modified: branches/ddk2003/dll/win32/rpcrt4/ndr_contexth.c URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/ndr_co… ============================================================================== --- branches/ddk2003/dll/win32/rpcrt4/ndr_contexth.c (original) +++ branches/ddk2003/dll/win32/rpcrt4/ndr_contexth.c Fri Jun 29 15:43:18 2007 @@ -133,7 +133,7 @@ /*********************************************************************** * NDRCContextBinding */ -RPC_BINDING_HANDLE WINAPI NDRCContextBinding(NDR_CCONTEXT CContext) +RPC_BINDING_HANDLE RPC_ENTRY NDRCContextBinding(NDR_CCONTEXT CContext) { if(!CContext) RpcRaiseException(ERROR_INVALID_HANDLE); @@ -144,7 +144,7 @@ /*********************************************************************** * NDRCContextMarshall */ -void WINAPI NDRCContextMarshall(NDR_CCONTEXT CContext, void *pBuff ) +void RPC_ENTRY NDRCContextMarshall(NDR_CCONTEXT CContext, void *pBuff ) { CContextHandle *ctx = (CContextHandle*)CContext; memcpy(pBuff, &ctx->Ndr, sizeof(ContextHandleNdr)); @@ -153,7 +153,7 @@ /*********************************************************************** * NdrClientContextMarshall */ -void WINAPI NdrClientContextMarshall(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrClientContextMarshall(PMIDL_STUB_MESSAGE pStubMsg, NDR_CCONTEXT ContextHandle, int fCheck) { @@ -169,7 +169,7 @@ /*********************************************************************** * NDRCContextUnmarshall */ -void WINAPI NDRCContextUnmarshall(NDR_CCONTEXT *pCContext, +void RPC_ENTRY NDRCContextUnmarshall(NDR_CCONTEXT *pCContext, RPC_BINDING_HANDLE hBinding, void *pBuff, unsigned long DataRepresentation ) @@ -203,7 +203,7 @@ /*********************************************************************** * NdrClientContextUnmarshall */ -void WINAPI NdrClientContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrClientContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, NDR_CCONTEXT * pContextHandle, RPC_BINDING_HANDLE BindHandle) { @@ -222,7 +222,7 @@ /*********************************************************************** * RpcSmDestroyClientContext */ -RPC_STATUS WINAPI RpcSmDestroyClientContext(void** ContextHandle) +RPC_STATUS RPC_ENTRY RpcSmDestroyClientContext(void** ContextHandle) { CContextHandle *ctx = (CContextHandle*)ContextHandle; @@ -239,7 +239,7 @@ /*********************************************************************** * RpcSsDestroyClientContext */ -void WINAPI RpcSsDestroyClientContext(void** ContextHandle) +void RPC_ENTRY RpcSsDestroyClientContext(void** ContextHandle) { RPC_STATUS status; @@ -252,7 +252,7 @@ /*********************************************************************** * NdrContextHandleSize */ -void WINAPI NdrContextHandleSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrContextHandleSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, PFORMAT_STRING pFormat) { @@ -262,7 +262,7 @@ /*********************************************************************** * NdrContextHandleInitialize */ -NDR_SCONTEXT WINAPI NdrContextHandleInitialize(PMIDL_STUB_MESSAGE pStubMsg, +NDR_SCONTEXT RPC_ENTRY NdrContextHandleInitialize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("(%p, %p): stub\n", pStubMsg, pFormat); @@ -272,7 +272,7 @@ /*********************************************************************** * NdrServerContextMarshall */ -void WINAPI NdrServerContextMarshall(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrServerContextMarshall(PMIDL_STUB_MESSAGE pStubMsg, NDR_SCONTEXT ContextHandle, NDR_RUNDOWN RundownRoutine) { @@ -293,7 +293,7 @@ /*********************************************************************** * NdrServerContextUnmarshall */ -NDR_SCONTEXT WINAPI NdrServerContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg) +NDR_SCONTEXT RPC_ENTRY NdrServerContextUnmarshall(PMIDL_STUB_MESSAGE pStubMsg) { SContextHandle *Hdl; @@ -304,7 +304,7 @@ /*********************************************************************** * NdrServerContextNewMarshall */ -void WINAPI NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrServerContextNewMarshall(PMIDL_STUB_MESSAGE pStubMsg, NDR_SCONTEXT ContextHandle, NDR_RUNDOWN RundownRoutine, PFORMAT_STRING pFormat) @@ -315,7 +315,7 @@ /*********************************************************************** * NdrServerContextNewUnmarshall */ -NDR_SCONTEXT WINAPI NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +NDR_SCONTEXT RPC_ENTRY NdrServerContextNewUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("(%p, %p): stub\n", pStubMsg, pFormat); @@ -325,7 +325,7 @@ /*********************************************************************** * NDRSContextMarshall */ -void WINAPI NDRSContextMarshall(IN NDR_SCONTEXT CContext, +void RPC_ENTRY NDRSContextMarshall(IN NDR_SCONTEXT CContext, OUT void *pBuff, IN NDR_RUNDOWN userRunDownIn) { @@ -342,7 +342,7 @@ /*********************************************************************** * NDRSContextUnmarshall */ -NDR_SCONTEXT WINAPI NDRSContextUnmarshall(IN void *pBuff, +NDR_SCONTEXT RPC_ENTRY NDRSContextUnmarshall(IN void *pBuff, IN unsigned long DataRepresentation) { return (NDR_SCONTEXT) RPCRT4_SrvUnmarshallCtxHdl((ContextHandleNdr*)pBuff); @@ -351,7 +351,7 @@ /*********************************************************************** * NDRSContextMarshallEx */ -void WINAPI NDRSContextMarshallEx(IN RPC_BINDING_HANDLE BindingHandle, +void RPC_ENTRY NDRSContextMarshallEx(IN RPC_BINDING_HANDLE BindingHandle, IN NDR_SCONTEXT CContext, OUT void *pBuff, IN NDR_RUNDOWN userRunDownIn) @@ -362,7 +362,7 @@ /*********************************************************************** * NDRSContextUnmarshallEx */ -NDR_SCONTEXT WINAPI NDRSContextUnmarshallEx(IN RPC_BINDING_HANDLE BindingHandle, +NDR_SCONTEXT RPC_ENTRY NDRSContextUnmarshallEx(IN RPC_BINDING_HANDLE BindingHandle, IN void *pBuff, IN unsigned long DataRepresentation) { Modified: branches/ddk2003/dll/win32/rpcrt4/ndr_marshall.c URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/ndr_ma… ============================================================================== --- branches/ddk2003/dll/win32/rpcrt4/ndr_marshall.c (original) +++ branches/ddk2003/dll/win32/rpcrt4/ndr_marshall.c Fri Jun 29 15:43:18 2007 @@ -292,7 +292,7 @@ NdrUserMarshalFree }; -void * WINAPI NdrAllocate(MIDL_STUB_MESSAGE *pStubMsg, size_t len) +void * RPC_ENTRY NdrAllocate(MIDL_STUB_MESSAGE *pStubMsg, size_t len) { /* hmm, this is probably supposed to do more? */ return pStubMsg->pfnAllocate(len); @@ -480,7 +480,7 @@ /*********************************************************************** * NdrConformantStringMarshall [RPCRT4.@] */ -unsigned char *WINAPI NdrConformantStringMarshall(MIDL_STUB_MESSAGE *pStubMsg, +unsigned char *RPC_ENTRY NdrConformantStringMarshall(MIDL_STUB_MESSAGE *pStubMsg, unsigned char *pszMessage, PFORMAT_STRING pFormat) { unsigned long len, esize; @@ -490,13 +490,13 @@ assert(pFormat); if (pszMessage == NULL) { - TRACE("string=%s\n", debugstr_a(pszMessage)); + len = 0; esize = 0; } else if (*pFormat == RPC_FC_C_CSTRING) { - TRACE("string=%s\n", debugstr_a(pszMessage)); - len = strlen(pszMessage)+1; + + len = (unsigned long ) strlen((char *)pszMessage)+1; esize = 1; } else if (*pFormat == RPC_FC_C_WSTRING) { @@ -537,7 +537,7 @@ /*********************************************************************** * NdrConformantStringBufferSize [RPCRT4.@] */ -void WINAPI NdrConformantStringBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrConformantStringBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, PFORMAT_STRING pFormat) { TRACE("(pStubMsg == ^%p, pMemory == ^%p, pFormat == ^%p)\n", pStubMsg, pMemory, pFormat); @@ -571,7 +571,7 @@ /************************************************************************ * NdrConformantStringMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrConformantStringMemorySize( PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrConformantStringMemorySize( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat ) { unsigned long rslt = 0; @@ -602,7 +602,7 @@ /************************************************************************ * NdrConformantStringUnmarshall [RPCRT4.@] */ -unsigned char *WINAPI NdrConformantStringUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, +unsigned char *RPC_ENTRY NdrConformantStringUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char** ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc ) { unsigned long len, esize, ofs; @@ -650,7 +650,7 @@ /*********************************************************************** * NdrNonConformantStringMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrNonConformantStringMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrNonConformantStringMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -661,7 +661,7 @@ /*********************************************************************** * NdrNonConformantStringUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrNonConformantStringUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrNonConformantStringUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -673,7 +673,7 @@ /*********************************************************************** * NdrNonConformantStringBufferSize [RPCRT4.@] */ -void WINAPI NdrNonConformantStringBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrNonConformantStringBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -683,7 +683,7 @@ /*********************************************************************** * NdrNonConformantStringMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrNonConformantStringMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrNonConformantStringMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("stub\n"); @@ -1253,7 +1253,7 @@ /*********************************************************************** * NdrPointerMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1270,7 +1270,7 @@ /*********************************************************************** * NdrPointerUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -1286,7 +1286,7 @@ /*********************************************************************** * NdrPointerBufferSize [RPCRT4.@] */ -void WINAPI NdrPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1297,7 +1297,7 @@ /*********************************************************************** * NdrPointerMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { /* unsigned size = *(LPWORD)(pFormat+2); */ @@ -1309,7 +1309,7 @@ /*********************************************************************** * NdrPointerFree [RPCRT4.@] */ -void WINAPI NdrPointerFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrPointerFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1320,7 +1320,7 @@ /*********************************************************************** * NdrSimpleStructMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrSimpleStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrSimpleStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1350,7 +1350,7 @@ /*********************************************************************** * NdrSimpleStructUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrSimpleStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrSimpleStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -1384,7 +1384,7 @@ /*********************************************************************** * NdrSimpleTypeUnmarshall [RPCRT4.@] */ -void WINAPI NdrSimpleTypeMarshall(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrSimpleTypeMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, unsigned char FormatChar) { @@ -1395,7 +1395,7 @@ /*********************************************************************** * NdrSimpleTypeUnmarshall [RPCRT4.@] */ -void WINAPI NdrSimpleTypeUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrSimpleTypeUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, unsigned char FormatChar) { @@ -1406,7 +1406,7 @@ /*********************************************************************** * NdrSimpleStructBufferSize [RPCRT4.@] */ -void WINAPI NdrSimpleStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrSimpleStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1420,7 +1420,7 @@ /*********************************************************************** * NdrSimpleStructMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrSimpleStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrSimpleStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { /* unsigned size = *(LPWORD)(pFormat+2); */ @@ -1433,7 +1433,7 @@ /*********************************************************************** * NdrSimpleStructFree [RPCRT4.@] */ -void WINAPI NdrSimpleStructFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrSimpleStructFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1443,7 +1443,7 @@ } -unsigned long WINAPI EmbeddedComplexSize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY EmbeddedComplexSize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { switch (*pFormat) { @@ -1461,7 +1461,7 @@ } -unsigned char * WINAPI ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, PFORMAT_STRING pPointer) @@ -1525,7 +1525,7 @@ return pMemory; } -unsigned char * WINAPI ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, PFORMAT_STRING pPointer, @@ -1592,7 +1592,7 @@ return pMemory; } -unsigned char * WINAPI ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, PFORMAT_STRING pPointer) @@ -1650,7 +1650,7 @@ return pMemory; } -unsigned char * WINAPI ComplexFree(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY ComplexFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat, PFORMAT_STRING pPointer) @@ -1706,7 +1706,7 @@ return pMemory; } -unsigned long WINAPI ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY ComplexStructSize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { PFORMAT_STRING desc; @@ -1755,7 +1755,7 @@ /*********************************************************************** * NdrComplexStructMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrComplexStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrComplexStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1788,7 +1788,7 @@ /*********************************************************************** * NdrComplexStructUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrComplexStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrComplexStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -1823,7 +1823,7 @@ /*********************************************************************** * NdrComplexStructBufferSize [RPCRT4.@] */ -void WINAPI NdrComplexStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrComplexStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1852,7 +1852,7 @@ /*********************************************************************** * NdrComplexStructMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrComplexStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { /* unsigned size = *(LPWORD)(pFormat+2); */ @@ -1873,7 +1873,7 @@ /*********************************************************************** * NdrComplexStructFree [RPCRT4.@] */ -void WINAPI NdrComplexStructFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrComplexStructFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1902,7 +1902,7 @@ /*********************************************************************** * NdrConformantArrayMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrConformantArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrConformantArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1930,7 +1930,7 @@ /*********************************************************************** * NdrConformantArrayUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrConformantArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrConformantArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -1958,7 +1958,7 @@ /*********************************************************************** * NdrConformantArrayBufferSize [RPCRT4.@] */ -void WINAPI NdrConformantArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrConformantArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -1978,7 +1978,7 @@ /*********************************************************************** * NdrConformantArrayMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrConformantArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrConformantArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { DWORD size = 0, esize = *(const WORD*)(pFormat+2); @@ -1998,7 +1998,7 @@ /*********************************************************************** * NdrConformantArrayFree [RPCRT4.@] */ -void WINAPI NdrConformantArrayFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrConformantArrayFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2012,7 +2012,7 @@ /*********************************************************************** * NdrConformantVaryingArrayMarshall [RPCRT4.@] */ -unsigned char* WINAPI NdrConformantVaryingArrayMarshall( PMIDL_STUB_MESSAGE pStubMsg, +unsigned char* RPC_ENTRY NdrConformantVaryingArrayMarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, PFORMAT_STRING pFormat ) { @@ -2052,7 +2052,7 @@ /*********************************************************************** * NdrConformantVaryingArrayUnmarshall [RPCRT4.@] */ -unsigned char* WINAPI NdrConformantVaryingArrayUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, +unsigned char* RPC_ENTRY NdrConformantVaryingArrayUnmarshall( PMIDL_STUB_MESSAGE pStubMsg, unsigned char** ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc ) @@ -2084,7 +2084,7 @@ /*********************************************************************** * NdrConformantVaryingArrayFree [RPCRT4.@] */ -void WINAPI NdrConformantVaryingArrayFree( PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrConformantVaryingArrayFree( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, PFORMAT_STRING pFormat ) { @@ -2095,7 +2095,7 @@ /*********************************************************************** * NdrConformantVaryingArrayBufferSize [RPCRT4.@] */ -void WINAPI NdrConformantVaryingArrayBufferSize( PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrConformantVaryingArrayBufferSize( PMIDL_STUB_MESSAGE pStubMsg, unsigned char* pMemory, PFORMAT_STRING pFormat ) { DWORD esize = *(const WORD*)(pFormat+2); @@ -2124,7 +2124,7 @@ /*********************************************************************** * NdrConformantVaryingArrayMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrConformantVaryingArrayMemorySize( PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrConformantVaryingArrayMemorySize( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat ) { FIXME( "stub\n" ); @@ -2135,7 +2135,7 @@ /*********************************************************************** * NdrComplexArrayMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrComplexArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrComplexArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2182,7 +2182,7 @@ /*********************************************************************** * NdrComplexArrayUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrComplexArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -2222,7 +2222,7 @@ /*********************************************************************** * NdrComplexArrayBufferSize [RPCRT4.@] */ -void WINAPI NdrComplexArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrComplexArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2259,7 +2259,7 @@ /*********************************************************************** * NdrComplexArrayMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrComplexArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrComplexArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { DWORD size = 0; @@ -2286,7 +2286,7 @@ /*********************************************************************** * NdrComplexArrayFree [RPCRT4.@] */ -void WINAPI NdrComplexArrayFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrComplexArrayFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2323,7 +2323,7 @@ /*********************************************************************** * NdrUserMarshalMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrUserMarshalMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrUserMarshalMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2345,7 +2345,7 @@ /*********************************************************************** * NdrUserMarshalUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrUserMarshalUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrUserMarshalUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -2370,7 +2370,7 @@ /*********************************************************************** * NdrUserMarshalBufferSize [RPCRT4.@] */ -void WINAPI NdrUserMarshalBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrUserMarshalBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2395,7 +2395,7 @@ /*********************************************************************** * NdrUserMarshalMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrUserMarshalMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrUserMarshalMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { unsigned index = *(const WORD*)&pFormat[2]; @@ -2409,7 +2409,7 @@ /*********************************************************************** * NdrUserMarshalFree [RPCRT4.@] */ -void WINAPI NdrUserMarshalFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrUserMarshalFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2426,7 +2426,7 @@ /*********************************************************************** * NdrClearOutParameters [RPCRT4.@] */ -void WINAPI NdrClearOutParameters(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrClearOutParameters(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, void *ArgAddr) { @@ -2436,7 +2436,7 @@ /*********************************************************************** * NdrConvert [RPCRT4.@] */ -void WINAPI NdrConvert( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat ) +void RPC_ENTRY NdrConvert( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat ) { FIXME("(pStubMsg == ^%p, pFormat == ^%p): stub.\n", pStubMsg, pFormat); /* FIXME: since this stub doesn't do any converting, the proper behavior @@ -2446,7 +2446,7 @@ /*********************************************************************** * NdrConvert2 [RPCRT4.@] */ -void WINAPI NdrConvert2( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, long NumberParams ) +void RPC_ENTRY NdrConvert2( PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, long NumberParams ) { FIXME("(pStubMsg == ^%p, pFormat == ^%p, NumberParams == %ld): stub.\n", pStubMsg, pFormat, NumberParams); @@ -2465,7 +2465,7 @@ /*********************************************************************** * NdrConformantStructMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrConformantStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrConformantStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2501,7 +2501,7 @@ /*********************************************************************** * NdrConformantStructUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrConformantStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrConformantStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -2558,7 +2558,7 @@ /*********************************************************************** * NdrConformantStructBufferSize [RPCRT4.@] */ -void WINAPI NdrConformantStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrConformantStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2591,7 +2591,7 @@ /*********************************************************************** * NdrConformantStructMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrConformantStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrConformantStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("stub\n"); @@ -2601,7 +2601,7 @@ /*********************************************************************** * NdrConformantStructFree [RPCRT4.@] */ -void WINAPI NdrConformantStructFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrConformantStructFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2611,7 +2611,7 @@ /*********************************************************************** * NdrConformantVaryingStructMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrConformantVaryingStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrConformantVaryingStructMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2622,7 +2622,7 @@ /*********************************************************************** * NdrConformantVaryingStructUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrConformantVaryingStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrConformantVaryingStructUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -2634,7 +2634,7 @@ /*********************************************************************** * NdrConformantVaryingStructBufferSize [RPCRT4.@] */ -void WINAPI NdrConformantVaryingStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrConformantVaryingStructBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2644,7 +2644,7 @@ /*********************************************************************** * NdrConformantVaryingStructMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrConformantVaryingStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrConformantVaryingStructMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("stub\n"); @@ -2654,7 +2654,7 @@ /*********************************************************************** * NdrConformantVaryingStructFree [RPCRT4.@] */ -void WINAPI NdrConformantVaryingStructFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrConformantVaryingStructFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2664,7 +2664,7 @@ /*********************************************************************** * NdrFixedArrayMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrFixedArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrFixedArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2675,7 +2675,7 @@ /*********************************************************************** * NdrFixedArrayUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrFixedArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrFixedArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -2687,7 +2687,7 @@ /*********************************************************************** * NdrFixedArrayBufferSize [RPCRT4.@] */ -void WINAPI NdrFixedArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrFixedArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2697,7 +2697,7 @@ /*********************************************************************** * NdrFixedArrayMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrFixedArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrFixedArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("stub\n"); @@ -2707,7 +2707,7 @@ /*********************************************************************** * NdrFixedArrayFree [RPCRT4.@] */ -void WINAPI NdrFixedArrayFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrFixedArrayFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2717,7 +2717,7 @@ /*********************************************************************** * NdrVaryingArrayMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrVaryingArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrVaryingArrayMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2728,7 +2728,7 @@ /*********************************************************************** * NdrVaryingArrayUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrVaryingArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrVaryingArrayUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -2740,7 +2740,7 @@ /*********************************************************************** * NdrVaryingArrayBufferSize [RPCRT4.@] */ -void WINAPI NdrVaryingArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrVaryingArrayBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2750,7 +2750,7 @@ /*********************************************************************** * NdrVaryingArrayMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrVaryingArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrVaryingArrayMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("stub\n"); @@ -2760,7 +2760,7 @@ /*********************************************************************** * NdrVaryingArrayFree [RPCRT4.@] */ -void WINAPI NdrVaryingArrayFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrVaryingArrayFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2770,7 +2770,7 @@ /*********************************************************************** * NdrEncapsulatedUnionMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrEncapsulatedUnionMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrEncapsulatedUnionMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2781,7 +2781,7 @@ /*********************************************************************** * NdrEncapsulatedUnionUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -2793,7 +2793,7 @@ /*********************************************************************** * NdrEncapsulatedUnionBufferSize [RPCRT4.@] */ -void WINAPI NdrEncapsulatedUnionBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrEncapsulatedUnionBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2803,7 +2803,7 @@ /*********************************************************************** * NdrEncapsulatedUnionMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("stub\n"); @@ -2813,7 +2813,7 @@ /*********************************************************************** * NdrEncapsulatedUnionFree [RPCRT4.@] */ -void WINAPI NdrEncapsulatedUnionFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrEncapsulatedUnionFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2823,7 +2823,7 @@ /*********************************************************************** * NdrNonEncapsulatedUnionMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrNonEncapsulatedUnionMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrNonEncapsulatedUnionMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2834,7 +2834,7 @@ /*********************************************************************** * NdrNonEncapsulatedUnionUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrNonEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrNonEncapsulatedUnionUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -2846,7 +2846,7 @@ /*********************************************************************** * NdrNonEncapsulatedUnionBufferSize [RPCRT4.@] */ -void WINAPI NdrNonEncapsulatedUnionBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrNonEncapsulatedUnionBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2856,7 +2856,7 @@ /*********************************************************************** * NdrNonEncapsulatedUnionMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrNonEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrNonEncapsulatedUnionMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("stub\n"); @@ -2866,7 +2866,7 @@ /*********************************************************************** * NdrNonEncapsulatedUnionFree [RPCRT4.@] */ -void WINAPI NdrNonEncapsulatedUnionFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrNonEncapsulatedUnionFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2876,7 +2876,7 @@ /*********************************************************************** * NdrByteCountPointerMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrByteCountPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrByteCountPointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2887,7 +2887,7 @@ /*********************************************************************** * NdrByteCountPointerUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrByteCountPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrByteCountPointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -2899,7 +2899,7 @@ /*********************************************************************** * NdrByteCountPointerBufferSize [RPCRT4.@] */ -void WINAPI NdrByteCountPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrByteCountPointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2909,7 +2909,7 @@ /*********************************************************************** * NdrByteCountPointerMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrByteCountPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrByteCountPointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("stub\n"); @@ -2919,7 +2919,7 @@ /*********************************************************************** * NdrByteCountPointerFree [RPCRT4.@] */ -void WINAPI NdrByteCountPointerFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrByteCountPointerFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2929,7 +2929,7 @@ /*********************************************************************** * NdrXmitOrRepAsMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrXmitOrRepAsMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrXmitOrRepAsMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2940,7 +2940,7 @@ /*********************************************************************** * NdrXmitOrRepAsUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrXmitOrRepAsUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrXmitOrRepAsUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -2952,7 +2952,7 @@ /*********************************************************************** * NdrXmitOrRepAsBufferSize [RPCRT4.@] */ -void WINAPI NdrXmitOrRepAsBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrXmitOrRepAsBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -2962,7 +2962,7 @@ /*********************************************************************** * NdrXmitOrRepAsMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrXmitOrRepAsMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrXmitOrRepAsMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("stub\n"); @@ -2972,7 +2972,7 @@ /*********************************************************************** * NdrXmitOrRepAsFree [RPCRT4.@] */ -void WINAPI NdrXmitOrRepAsFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrXmitOrRepAsFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { Modified: branches/ddk2003/dll/win32/rpcrt4/ndr_midl.c URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/ndr_mi… ============================================================================== --- branches/ddk2003/dll/win32/rpcrt4/ndr_midl.c (original) +++ branches/ddk2003/dll/win32/rpcrt4/ndr_midl.c Fri Jun 29 15:43:18 2007 @@ -49,7 +49,7 @@ /*********************************************************************** * NdrProxyInitialize [RPCRT4.@] */ -void WINAPI NdrProxyInitialize(void *This, +void RPC_ENTRY NdrProxyInitialize(void *This, PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDescriptor, @@ -71,7 +71,7 @@ /*********************************************************************** * NdrProxyGetBuffer [RPCRT4.@] */ -void WINAPI NdrProxyGetBuffer(void *This, +void RPC_ENTRY NdrProxyGetBuffer(void *This, PMIDL_STUB_MESSAGE pStubMsg) { HRESULT hr; @@ -93,7 +93,7 @@ /*********************************************************************** * NdrProxySendReceive [RPCRT4.@] */ -void WINAPI NdrProxySendReceive(void *This, +void RPC_ENTRY NdrProxySendReceive(void *This, PMIDL_STUB_MESSAGE pStubMsg) { ULONG Status = 0; @@ -125,7 +125,7 @@ /*********************************************************************** * NdrProxyFreeBuffer [RPCRT4.@] */ -void WINAPI NdrProxyFreeBuffer(void *This, +void RPC_ENTRY NdrProxyFreeBuffer(void *This, PMIDL_STUB_MESSAGE pStubMsg) { HRESULT hr; @@ -138,7 +138,7 @@ /*********************************************************************** * NdrProxyErrorHandler [RPCRT4.@] */ -HRESULT WINAPI NdrProxyErrorHandler(DWORD dwExceptionCode) +HRESULT RPC_ENTRY NdrProxyErrorHandler(DWORD dwExceptionCode) { WARN("(0x%08lx): a proxy call failed\n", dwExceptionCode); @@ -151,7 +151,7 @@ /*********************************************************************** * NdrStubInitialize [RPCRT4.@] */ -void WINAPI NdrStubInitialize(PRPC_MESSAGE pRpcMsg, +void RPC_ENTRY NdrStubInitialize(PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDescriptor, LPRPCCHANNELBUFFER pRpcChannelBuffer) @@ -164,7 +164,7 @@ /*********************************************************************** * NdrStubGetBuffer [RPCRT4.@] */ -void WINAPI NdrStubGetBuffer(LPRPCSTUBBUFFER This, +void RPC_ENTRY NdrStubGetBuffer(LPRPCSTUBBUFFER This, LPRPCCHANNELBUFFER pRpcChannelBuffer, PMIDL_STUB_MESSAGE pStubMsg) { @@ -180,7 +180,7 @@ /************************************************************************ * NdrClientInitializeNew [RPCRT4.@] */ -void WINAPI NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrClientInitializeNew( PRPC_MESSAGE pRpcMessage, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc, unsigned int ProcNum ) { TRACE("(pRpcMessage == ^%p, pStubMsg == ^%p, pStubDesc == ^%p, ProcNum == %d)\n", @@ -208,7 +208,7 @@ /*********************************************************************** * NdrServerInitializeNew [RPCRT4.@] */ -unsigned char* WINAPI NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, +unsigned char* RPC_ENTRY NdrServerInitializeNew( PRPC_MESSAGE pRpcMsg, PMIDL_STUB_MESSAGE pStubMsg, PMIDL_STUB_DESC pStubDesc ) { TRACE("(pRpcMsg == ^%p, pStubMsg == ^%p, pStubDesc == ^%p)\n", pRpcMsg, pStubMsg, pStubDesc); @@ -235,7 +235,7 @@ /*********************************************************************** * NdrGetBuffer [RPCRT4.@] */ -unsigned char *WINAPI NdrGetBuffer(MIDL_STUB_MESSAGE *stubmsg, unsigned long buflen, RPC_BINDING_HANDLE handle) +unsigned char *RPC_ENTRY NdrGetBuffer(MIDL_STUB_MESSAGE *stubmsg, unsigned long buflen, RPC_BINDING_HANDLE handle) { TRACE("(stubmsg == ^%p, buflen == %lu, handle == %p): wild guess.\n", stubmsg, buflen, handle); @@ -256,7 +256,7 @@ /*********************************************************************** * NdrFreeBuffer [RPCRT4.@] */ -void WINAPI NdrFreeBuffer(MIDL_STUB_MESSAGE *pStubMsg) +void RPC_ENTRY NdrFreeBuffer(MIDL_STUB_MESSAGE *pStubMsg) { TRACE("(pStubMsg == ^%p): wild guess.\n", pStubMsg); I_RpcFreeBuffer(pStubMsg->RpcMsg); @@ -267,7 +267,7 @@ /************************************************************************ * NdrSendReceive [RPCRT4.@] */ -unsigned char *WINAPI NdrSendReceive( MIDL_STUB_MESSAGE *stubmsg, unsigned char *buffer ) +unsigned char *RPC_ENTRY NdrSendReceive( MIDL_STUB_MESSAGE *stubmsg, unsigned char *buffer ) { RPC_STATUS status; Modified: branches/ddk2003/dll/win32/rpcrt4/ndr_ole.c URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/ndr_ol… ============================================================================== --- branches/ddk2003/dll/win32/rpcrt4/ndr_ole.c (original) +++ branches/ddk2003/dll/win32/rpcrt4/ndr_ole.c Fri Jun 29 15:43:18 2007 @@ -243,7 +243,7 @@ /*********************************************************************** * NdrInterfacePointerMarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrInterfacePointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrInterfacePointerMarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -275,7 +275,7 @@ /*********************************************************************** * NdrInterfacePointerUnmarshall [RPCRT4.@] */ -unsigned char * WINAPI NdrInterfacePointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, +unsigned char * RPC_ENTRY NdrInterfacePointerUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned char **ppMemory, PFORMAT_STRING pFormat, unsigned char fMustAlloc) @@ -301,7 +301,7 @@ /*********************************************************************** * NdrInterfacePointerBufferSize [RPCRT4.@] */ -void WINAPI NdrInterfacePointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrInterfacePointerBufferSize(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -321,7 +321,7 @@ /*********************************************************************** * NdrInterfacePointerMemorySize [RPCRT4.@] */ -unsigned long WINAPI NdrInterfacePointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, +unsigned long RPC_ENTRY NdrInterfacePointerMemorySize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat) { FIXME("(%p,%p): stub\n", pStubMsg, pFormat); @@ -331,7 +331,7 @@ /*********************************************************************** * NdrInterfacePointerFree [RPCRT4.@] */ -void WINAPI NdrInterfacePointerFree(PMIDL_STUB_MESSAGE pStubMsg, +void RPC_ENTRY NdrInterfacePointerFree(PMIDL_STUB_MESSAGE pStubMsg, unsigned char *pMemory, PFORMAT_STRING pFormat) { @@ -343,7 +343,7 @@ /*********************************************************************** * NdrOleAllocate [RPCRT4.@] */ -void * WINAPI NdrOleAllocate(size_t Size) +void * RPC_ENTRY NdrOleAllocate(size_t Size) { if (!LoadCOM()) return NULL; return COM_MemAlloc(Size); @@ -352,7 +352,7 @@ /*********************************************************************** * NdrOleFree [RPCRT4.@] */ -void WINAPI NdrOleFree(void *NodeToFree) +void RPC_ENTRY NdrOleFree(void *NodeToFree) { if (!LoadCOM()) return; COM_MemFree(NodeToFree); Modified: branches/ddk2003/dll/win32/rpcrt4/ndr_stubless.c URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/ndr_st… ============================================================================== --- branches/ddk2003/dll/win32/rpcrt4/ndr_stubless.c (original) +++ branches/ddk2003/dll/win32/rpcrt4/ndr_stubless.c Fri Jun 29 15:43:18 2007 @@ -382,7 +382,7 @@ #include "poppack.h" -void WINAPI NdrRpcSmSetClientToOsf(PMIDL_STUB_MESSAGE pMessage) +void RPC_ENTRY NdrRpcSmSetClientToOsf(PMIDL_STUB_MESSAGE pMessage) { #if 0 /* these functions are not defined yet */ pMessage->pfnAllocate = NdrRpcSmClientAllocate; @@ -974,7 +974,7 @@ #endif /* FIXME: need to free some stuff in here too */ -long WINAPI NdrStubCall2( +long RPC_ENTRY NdrStubCall2( struct IRpcStubBuffer * pThis, struct IRpcChannelBuffer * pChannel, PRPC_MESSAGE pRpcMsg, @@ -1471,7 +1471,7 @@ return S_OK; } -void WINAPI NdrServerCall2(PRPC_MESSAGE pRpcMsg) +void RPC_ENTRY NdrServerCall2(PRPC_MESSAGE pRpcMsg) { DWORD dwPhase; NdrStubCall2(NULL, NULL, pRpcMsg, &dwPhase); Modified: branches/ddk2003/dll/win32/rpcrt4/rpc_binding.c URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/rpc_bi… ============================================================================== --- branches/ddk2003/dll/win32/rpcrt4/rpc_binding.c (original) +++ branches/ddk2003/dll/win32/rpcrt4/rpc_binding.c Fri Jun 29 15:43:18 2007 @@ -632,7 +632,7 @@ /*********************************************************************** * RpcStringBindingComposeA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcStringBindingComposeA(unsigned char *ObjUuid, unsigned char *Protseq, +RPC_STATUS RPC_ENTRY RpcStringBindingComposeA(unsigned char *ObjUuid, unsigned char *Protseq, unsigned char *NetworkAddr, unsigned char *Endpoint, unsigned char *Options, unsigned char** StringBinding ) { @@ -684,7 +684,7 @@ /*********************************************************************** * RpcStringBindingComposeW (RPCRT4.@) */ -RPC_STATUS WINAPI RpcStringBindingComposeW( LPWSTR ObjUuid, LPWSTR Protseq, +RPC_STATUS RPC_ENTRY RpcStringBindingComposeW( LPWSTR ObjUuid, LPWSTR Protseq, LPWSTR NetworkAddr, LPWSTR Endpoint, LPWSTR Options, LPWSTR* StringBinding ) { @@ -737,7 +737,7 @@ /*********************************************************************** * RpcStringBindingParseA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcStringBindingParseA( unsigned char *StringBinding, unsigned char **ObjUuid, +RPC_STATUS RPC_ENTRY RpcStringBindingParseA( unsigned char *StringBinding, unsigned char **ObjUuid, unsigned char **Protseq, unsigned char **NetworkAddr, unsigned char **Endpoint, unsigned char **Options) { @@ -828,7 +828,7 @@ /*********************************************************************** * RpcStringBindingParseW (RPCRT4.@) */ -RPC_STATUS WINAPI RpcStringBindingParseW( LPWSTR StringBinding, LPWSTR *ObjUuid, +RPC_STATUS RPC_ENTRY RpcStringBindingParseW( LPWSTR StringBinding, LPWSTR *ObjUuid, LPWSTR *Protseq, LPWSTR *NetworkAddr, LPWSTR *Endpoint, LPWSTR *Options) { @@ -918,7 +918,7 @@ /*********************************************************************** * RpcBindingFree (RPCRT4.@) */ -RPC_STATUS WINAPI RpcBindingFree( RPC_BINDING_HANDLE* Binding ) +RPC_STATUS RPC_ENTRY RpcBindingFree( RPC_BINDING_HANDLE* Binding ) { RPC_STATUS status; TRACE("(%p) = %p\n", Binding, *Binding); @@ -930,7 +930,7 @@ /*********************************************************************** * RpcBindingVectorFree (RPCRT4.@) */ -RPC_STATUS WINAPI RpcBindingVectorFree( RPC_BINDING_VECTOR** BindingVector ) +RPC_STATUS RPC_ENTRY RpcBindingVectorFree( RPC_BINDING_VECTOR** BindingVector ) { RPC_STATUS status; unsigned long c; @@ -947,7 +947,7 @@ /*********************************************************************** * RpcBindingInqObject (RPCRT4.@) */ -RPC_STATUS WINAPI RpcBindingInqObject( RPC_BINDING_HANDLE Binding, UUID* ObjectUuid ) +RPC_STATUS RPC_ENTRY RpcBindingInqObject( RPC_BINDING_HANDLE Binding, UUID* ObjectUuid ) { RpcBinding* bind = (RpcBinding*)Binding; @@ -959,7 +959,7 @@ /*********************************************************************** * RpcBindingSetObject (RPCRT4.@) */ -RPC_STATUS WINAPI RpcBindingSetObject( RPC_BINDING_HANDLE Binding, UUID* ObjectUuid ) +RPC_STATUS RPC_ENTRY RpcBindingSetObject( RPC_BINDING_HANDLE Binding, UUID* ObjectUuid ) { RpcBinding* bind = (RpcBinding*)Binding; @@ -971,7 +971,7 @@ /*********************************************************************** * RpcBindingFromStringBindingA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcBindingFromStringBindingA( unsigned char *StringBinding, RPC_BINDING_HANDLE* Binding ) +RPC_STATUS RPC_ENTRY RpcBindingFromStringBindingA( unsigned char *StringBinding, RPC_BINDING_HANDLE* Binding ) { RPC_STATUS ret; RpcBinding* bind = NULL; @@ -1010,7 +1010,7 @@ /*********************************************************************** * RpcBindingFromStringBindingW (RPCRT4.@) */ -RPC_STATUS WINAPI RpcBindingFromStringBindingW( LPWSTR StringBinding, RPC_BINDING_HANDLE* Binding ) +RPC_STATUS RPC_ENTRY RpcBindingFromStringBindingW( LPWSTR StringBinding, RPC_BINDING_HANDLE* Binding ) { RPC_STATUS ret; RpcBinding* bind = NULL; @@ -1049,7 +1049,7 @@ /*********************************************************************** * RpcBindingToStringBindingA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcBindingToStringBindingA( RPC_BINDING_HANDLE Binding, unsigned char** StringBinding ) +RPC_STATUS RPC_ENTRY RpcBindingToStringBindingA( RPC_BINDING_HANDLE Binding, unsigned char** StringBinding ) { RPC_STATUS ret; RpcBinding* bind = (RpcBinding*)Binding; @@ -1071,7 +1071,7 @@ /*********************************************************************** * RpcBindingToStringBindingW (RPCRT4.@) */ -RPC_STATUS WINAPI RpcBindingToStringBindingW( RPC_BINDING_HANDLE Binding, unsigned short** StringBinding ) +RPC_STATUS RPC_ENTRY RpcBindingToStringBindingW( RPC_BINDING_HANDLE Binding, unsigned short** StringBinding ) { RPC_STATUS ret; unsigned char *str = NULL; @@ -1088,7 +1088,7 @@ * Exists in win9x and winNT, but with different number of arguments * (9x version has 3 arguments, NT has 2). */ -RPC_STATUS WINAPI I_RpcBindingSetAsync( RPC_BINDING_HANDLE Binding, RPC_BLOCKING_FN BlockingFn) +RPC_STATUS RPC_ENTRY I_RpcBindingSetAsync( RPC_BINDING_HANDLE Binding, RPC_BLOCKING_FN BlockingFn) { RpcBinding* bind = (RpcBinding*)Binding; @@ -1102,7 +1102,7 @@ /*********************************************************************** * RpcNetworkIsProtseqValidA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcNetworkIsProtseqValidA(unsigned char *protseq) { +RPC_STATUS RPC_ENTRY RpcNetworkIsProtseqValidA(unsigned char *protseq) { UNICODE_STRING protseqW; if (!protseq) return RPC_S_INVALID_RPC_PROTSEQ; /* ? */ @@ -1124,7 +1124,7 @@ * ncalrpc local-only rpc over LPC (LPC is not really used) * ncacn_np rpc over named pipes */ -RPC_STATUS WINAPI RpcNetworkIsProtseqValidW(LPWSTR protseq) { +RPC_STATUS RPC_ENTRY RpcNetworkIsProtseqValidW(LPWSTR protseq) { static const WCHAR protseqsW[][15] = { {'n','c','a','l','r','p','c',0}, {'n','c','a','c','n','_','n','p',0} Modified: branches/ddk2003/dll/win32/rpcrt4/rpc_epmap.c URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/rpc_ep… ============================================================================== --- branches/ddk2003/dll/win32/rpcrt4/rpc_epmap.c (original) +++ branches/ddk2003/dll/win32/rpcrt4/rpc_epmap.c Fri Jun 29 15:43:18 2007 @@ -66,7 +66,7 @@ /*********************************************************************** * RpcEpRegisterA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcEpRegisterA( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *BindingVector, +RPC_STATUS RPC_ENTRY RpcEpRegisterA( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *BindingVector, UUID_VECTOR *UuidVector, unsigned char *Annotation ) { RPCSS_NP_MESSAGE msg; @@ -139,7 +139,7 @@ /*********************************************************************** * RpcEpUnregister (RPCRT4.@) */ -RPC_STATUS WINAPI RpcEpUnregister( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *BindingVector, +RPC_STATUS RPC_ENTRY RpcEpUnregister( RPC_IF_HANDLE IfSpec, RPC_BINDING_VECTOR *BindingVector, UUID_VECTOR *UuidVector ) { RPCSS_NP_MESSAGE msg; @@ -209,7 +209,7 @@ /*********************************************************************** * RpcEpResolveBinding (RPCRT4.@) */ -RPC_STATUS WINAPI RpcEpResolveBinding( RPC_BINDING_HANDLE Binding, RPC_IF_HANDLE IfSpec ) +RPC_STATUS RPC_ENTRY RpcEpResolveBinding( RPC_BINDING_HANDLE Binding, RPC_IF_HANDLE IfSpec ) { RPCSS_NP_MESSAGE msg; RPCSS_NP_REPLY reply; Modified: branches/ddk2003/dll/win32/rpcrt4/rpc_message.c URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/rpc_me… ============================================================================== --- branches/ddk2003/dll/win32/rpcrt4/rpc_message.c (original) +++ branches/ddk2003/dll/win32/rpcrt4/rpc_message.c Fri Jun 29 15:43:18 2007 @@ -481,7 +481,7 @@ /*********************************************************************** * I_RpcGetBuffer [RPCRT4.@] */ -RPC_STATUS WINAPI I_RpcGetBuffer(PRPC_MESSAGE pMsg) +RPC_STATUS RPC_ENTRY I_RpcGetBuffer(PRPC_MESSAGE pMsg) { TRACE("(%p): BufferLength=%d\n", pMsg, pMsg->BufferLength); /* FIXME: pfnAllocate? */ @@ -495,7 +495,7 @@ /*********************************************************************** * I_RpcFreeBuffer [RPCRT4.@] */ -RPC_STATUS WINAPI I_RpcFreeBuffer(PRPC_MESSAGE pMsg) +RPC_STATUS RPC_ENTRY I_RpcFreeBuffer(PRPC_MESSAGE pMsg) { TRACE("(%p) Buffer=%p\n", pMsg, pMsg->Buffer); /* FIXME: pfnFree? */ @@ -507,7 +507,7 @@ /*********************************************************************** * I_RpcSend [RPCRT4.@] */ -RPC_STATUS WINAPI I_RpcSend(PRPC_MESSAGE pMsg) +RPC_STATUS RPC_ENTRY I_RpcSend(PRPC_MESSAGE pMsg) { RpcBinding* bind = (RpcBinding*)pMsg->Handle; RpcConnection* conn; @@ -566,7 +566,7 @@ /*********************************************************************** * I_RpcReceive [RPCRT4.@] */ -RPC_STATUS WINAPI I_RpcReceive(PRPC_MESSAGE pMsg) +RPC_STATUS RPC_ENTRY I_RpcReceive(PRPC_MESSAGE pMsg) { RpcBinding* bind = (RpcBinding*)pMsg->Handle; RpcConnection* conn; @@ -635,7 +635,7 @@ /*********************************************************************** * I_RpcSendReceive [RPCRT4.@] */ -RPC_STATUS WINAPI I_RpcSendReceive(PRPC_MESSAGE pMsg) +RPC_STATUS RPC_ENTRY I_RpcSendReceive(PRPC_MESSAGE pMsg) { RPC_STATUS status; Modified: branches/ddk2003/dll/win32/rpcrt4/rpc_server.c URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/rpc_se… ============================================================================== --- branches/ddk2003/dll/win32/rpcrt4/rpc_server.c (original) +++ branches/ddk2003/dll/win32/rpcrt4/rpc_server.c Fri Jun 29 15:43:18 2007 @@ -645,7 +645,7 @@ /*********************************************************************** * RpcServerInqBindings (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerInqBindings( RPC_BINDING_VECTOR** BindingVector ) +RPC_STATUS RPC_ENTRY RpcServerInqBindings( RPC_BINDING_VECTOR** BindingVector ) { RPC_STATUS status; DWORD count; @@ -699,7 +699,7 @@ /*********************************************************************** * RpcServerUseProtseqEpA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerUseProtseqEpA( unsigned char *Protseq, UINT MaxCalls, unsigned char *Endpoint, LPVOID SecurityDescriptor ) +RPC_STATUS RPC_ENTRY RpcServerUseProtseqEpA( unsigned char *Protseq, UINT MaxCalls, unsigned char *Endpoint, LPVOID SecurityDescriptor ) { RPC_POLICY policy; @@ -716,7 +716,7 @@ /*********************************************************************** * RpcServerUseProtseqEpW (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerUseProtseqEpW( LPWSTR Protseq, UINT MaxCalls, LPWSTR Endpoint, LPVOID SecurityDescriptor ) +RPC_STATUS RPC_ENTRY RpcServerUseProtseqEpW( LPWSTR Protseq, UINT MaxCalls, LPWSTR Endpoint, LPVOID SecurityDescriptor ) { RPC_POLICY policy; @@ -733,7 +733,7 @@ /*********************************************************************** * RpcServerUseProtseqEpExA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerUseProtseqEpExA( unsigned char *Protseq, UINT MaxCalls, unsigned char *Endpoint, LPVOID SecurityDescriptor, +RPC_STATUS RPC_ENTRY RpcServerUseProtseqEpExA( unsigned char *Protseq, UINT MaxCalls, unsigned char *Endpoint, LPVOID SecurityDescriptor, PRPC_POLICY lpPolicy ) { RpcServerProtseq* ps; @@ -753,7 +753,7 @@ /*********************************************************************** * RpcServerUseProtseqEpExW (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerUseProtseqEpExW( LPWSTR Protseq, UINT MaxCalls, LPWSTR Endpoint, LPVOID SecurityDescriptor, +RPC_STATUS RPC_ENTRY RpcServerUseProtseqEpExW( LPWSTR Protseq, UINT MaxCalls, LPWSTR Endpoint, LPVOID SecurityDescriptor, PRPC_POLICY lpPolicy ) { RpcServerProtseq* ps; @@ -773,7 +773,7 @@ /*********************************************************************** * RpcServerUseProtseqA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerUseProtseqA(unsigned char *Protseq, unsigned int MaxCalls, void *SecurityDescriptor) +RPC_STATUS RPC_ENTRY RpcServerUseProtseqA(unsigned char *Protseq, unsigned int MaxCalls, void *SecurityDescriptor) { TRACE("(Protseq == %s, MaxCalls == %d, SecurityDescriptor == ^%p)\n", debugstr_a((char*)Protseq), MaxCalls, SecurityDescriptor); return RpcServerUseProtseqEpA(Protseq, MaxCalls, NULL, SecurityDescriptor); @@ -782,7 +782,7 @@ /*********************************************************************** * RpcServerUseProtseqW (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerUseProtseqW(LPWSTR Protseq, unsigned int MaxCalls, void *SecurityDescriptor) +RPC_STATUS RPC_ENTRY RpcServerUseProtseqW(LPWSTR Protseq, unsigned int MaxCalls, void *SecurityDescriptor) { TRACE("Protseq == %s, MaxCalls == %d, SecurityDescriptor == ^%p)\n", debugstr_w(Protseq), MaxCalls, SecurityDescriptor); return RpcServerUseProtseqEpW(Protseq, MaxCalls, NULL, SecurityDescriptor); @@ -791,7 +791,7 @@ /*********************************************************************** * RpcServerRegisterIf (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerRegisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv ) +RPC_STATUS RPC_ENTRY RpcServerRegisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv ) { TRACE("(%p,%s,%p)\n", IfSpec, debugstr_guid(MgrTypeUuid), MgrEpv); return RpcServerRegisterIf2( IfSpec, MgrTypeUuid, MgrEpv, 0, RPC_C_LISTEN_MAX_CALLS_DEFAULT, (UINT)-1, NULL ); @@ -800,7 +800,7 @@ /*********************************************************************** * RpcServerRegisterIfEx (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerRegisterIfEx( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv, +RPC_STATUS RPC_ENTRY RpcServerRegisterIfEx( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv, UINT Flags, UINT MaxCalls, RPC_IF_CALLBACK_FN* IfCallbackFn ) { TRACE("(%p,%s,%p,%u,%u,%p)\n", IfSpec, debugstr_guid(MgrTypeUuid), MgrEpv, Flags, MaxCalls, IfCallbackFn); @@ -810,7 +810,7 @@ /*********************************************************************** * RpcServerRegisterIf2 (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerRegisterIf2( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv, +RPC_STATUS RPC_ENTRY RpcServerRegisterIf2( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, RPC_MGR_EPV* MgrEpv, UINT Flags, UINT MaxCalls, UINT MaxRpcSize, RPC_IF_CALLBACK_FN* IfCallbackFn ) { PRPC_SERVER_INTERFACE If = (PRPC_SERVER_INTERFACE)IfSpec; @@ -870,7 +870,7 @@ /*********************************************************************** * RpcServerUnregisterIf (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerUnregisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, UINT WaitForCallsToComplete ) +RPC_STATUS RPC_ENTRY RpcServerUnregisterIf( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, UINT WaitForCallsToComplete ) { FIXME("(IfSpec == (RPC_IF_HANDLE)^%p, MgrTypeUuid == %s, WaitForCallsToComplete == %u): stub\n", IfSpec, debugstr_guid(MgrTypeUuid), WaitForCallsToComplete); @@ -881,7 +881,7 @@ /*********************************************************************** * RpcServerUnregisterIfEx (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerUnregisterIfEx( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, int RundownContextHandles ) +RPC_STATUS RPC_ENTRY RpcServerUnregisterIfEx( RPC_IF_HANDLE IfSpec, UUID* MgrTypeUuid, int RundownContextHandles ) { FIXME("(IfSpec == (RPC_IF_HANDLE)^%p, MgrTypeUuid == %s, RundownContextHandles == %d): stub\n", IfSpec, debugstr_guid(MgrTypeUuid), RundownContextHandles); @@ -909,7 +909,7 @@ * types. There's no need to call this if a server only supports the nil * type, as is typical. */ -RPC_STATUS WINAPI RpcObjectSetType( UUID* ObjUuid, UUID* TypeUuid ) +RPC_STATUS RPC_ENTRY RpcObjectSetType( UUID* ObjUuid, UUID* TypeUuid ) { RpcObjTypeMap *map = RpcObjTypeMaps, *prev = NULL; RPC_STATUS dummy; @@ -956,7 +956,7 @@ /*********************************************************************** * RpcServerRegisterAuthInfoA (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerRegisterAuthInfoA( unsigned char *ServerPrincName, unsigned long AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn, +RPC_STATUS RPC_ENTRY RpcServerRegisterAuthInfoA( unsigned char *ServerPrincName, unsigned long AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn, LPVOID Arg ) { FIXME( "(%s,%lu,%p,%p): stub\n", ServerPrincName, AuthnSvc, GetKeyFn, Arg ); @@ -967,7 +967,7 @@ /*********************************************************************** * RpcServerRegisterAuthInfoW (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerRegisterAuthInfoW( LPWSTR ServerPrincName, unsigned long AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn, +RPC_STATUS RPC_ENTRY RpcServerRegisterAuthInfoW( LPWSTR ServerPrincName, unsigned long AuthnSvc, RPC_AUTH_KEY_RETRIEVAL_FN GetKeyFn, LPVOID Arg ) { FIXME( "(%s,%lu,%p,%p): stub\n", debugstr_w( ServerPrincName ), AuthnSvc, GetKeyFn, Arg ); @@ -978,7 +978,7 @@ /*********************************************************************** * RpcServerListen (RPCRT4.@) */ -RPC_STATUS WINAPI RpcServerListen( UINT MinimumCallThreads, UINT MaxCalls, UINT DontWait ) +RPC_STATUS RPC_ENTRY RpcServerListen( UINT MinimumCallThreads, UINT MaxCalls, UINT DontWait ) { RPC_STATUS status; @@ -1000,7 +1000,7 @@ /*********************************************************************** * RpcMgmtServerWaitListen (RPCRT4.@) */ -RPC_STATUS WINAPI RpcMgmtWaitServerListen( void ) +RPC_STATUS RPC_ENTRY RpcMgmtWaitServerListen( void ) { TRACE("()\n"); @@ -1019,7 +1019,7 @@ /*********************************************************************** * RpcMgmtStopServerListening (RPCRT4.@) */ -RPC_STATUS WINAPI RpcMgmtStopServerListening ( RPC_BINDING_HANDLE Binding ) +RPC_STATUS RPC_ENTRY RpcMgmtStopServerListening ( RPC_BINDING_HANDLE Binding ) { TRACE("(Binding == (RPC_BINDING_HANDLE)^%p)\n", Binding); @@ -1036,7 +1036,7 @@ /*********************************************************************** * I_RpcServerStartListening (RPCRT4.@) */ -RPC_STATUS WINAPI I_RpcServerStartListening( HWND hWnd ) +RPC_STATUS RPC_ENTRY I_RpcServerStartListening( HWND hWnd ) { FIXME( "(%p): stub\n", hWnd ); @@ -1046,7 +1046,7 @@ /*********************************************************************** * I_RpcServerStopListening (RPCRT4.@) */ -RPC_STATUS WINAPI I_RpcServerStopListening( void ) +RPC_STATUS RPC_ENTRY I_RpcServerStopListening( void ) { FIXME( "(): stub\n" ); @@ -1056,7 +1056,7 @@ /*********************************************************************** * I_RpcWindowProc (RPCRT4.@) */ -UINT WINAPI I_RpcWindowProc( void *hWnd, UINT Message, UINT wParam, ULONG lParam ) +UINT RPC_ENTRY I_RpcWindowProc( void *hWnd, UINT Message, UINT wParam, ULONG lParam ) { FIXME( "(%p,%08x,%08x,%08lx): stub\n", hWnd, Message, wParam, lParam ); Modified: branches/ddk2003/dll/win32/rpcrt4/rpcrt4_main.c URL: http://svn.reactos.org/svn/reactos/branches/ddk2003/dll/win32/rpcrt4/rpcrt4… ============================================================================== --- branches/ddk2003/dll/win32/rpcrt4/rpcrt4_main.c (original) +++ branches/ddk2003/dll/win32/rpcrt4/rpcrt4_main.c Fri Jun 29 15:43:18 2007 @@ -172,7 +172,7 @@ * * S_OK if successful. */ -RPC_STATUS WINAPI RpcStringFreeA(unsigned char** String) +RPC_STATUS RPC_ENTRY RpcStringFreeA(unsigned char** String) { HeapFree( GetProcessHeap(), 0, *String); @@ -188,7 +188,7 @@ * * S_OK if successful. */ -RPC_STATUS WINAPI RpcStringFreeW(unsigned short** String) +RPC_STATUS RPC_ENTRY RpcStringFreeW(unsigned short** String) { HeapFree( GetProcessHeap(), 0, *String); @@ -200,7 +200,7 @@ * * Raises an exception. */ -void WINAPI RpcRaiseException(RPC_STATUS exception) +void RPC_ENTRY RpcRaiseException(RPC_STATUS exception) { /* FIXME: translate exception? */ RaiseException(exception, 0, 0, NULL); @@ -219,7 +219,7 @@ * 0 if Uuid1 and Uuid2 are equal * 1 if Uuid1 is greater than Uuid2 */ -int WINAPI UuidCompare(UUID *Uuid1, UUID *Uuid2, RPC_STATUS *Status) +int RPC_ENTRY UuidCompare(UUID *Uuid1, UUID *Uuid2, RPC_STATUS *Status) { int i; @@ -262,7 +262,7 @@ * RETURNS * TRUE/FALSE */ -int WINAPI UuidEqual(UUID *Uuid1, UUID *Uuid2, RPC_STATUS *Status) +int RPC_ENTRY UuidEqual(UUID *Uuid1, UUID *Uuid2, RPC_STATUS *Status) { TRACE("(%s,%s)\n", debugstr_guid(Uuid1), debugstr_guid(Uuid2)); return !UuidCompare(Uuid1, Uuid2, Status); @@ -278,7 +278,7 @@ * RETURNS * TRUE/FALSE */ -int WINAPI UuidIsNil(UUID *Uuid, RPC_STATUS *Status) +int RPC_ENTRY UuidIsNil(UUID *Uuid, RPC_STATUS *Status) { TRACE("(%s)\n", debugstr_guid(Uuid)); if (!Uuid) return TRUE; @@ -294,7 +294,7 @@ * RETURNS * RPC_S_OK */ -RPC_STATUS WINAPI UuidCreateNil(UUID *Uuid) +RPC_STATUS RPC_ENTRY UuidCreateNil(UUID *Uuid) { *Uuid = uuid_nil; return RPC_S_OK; @@ -391,7 +391,7 @@ * suggests using NVRAM for storing persistent * values. */ -RPC_STATUS WINAPI UuidCreate(UUID *Uuid) +RPC_STATUS RPC_ENTRY UuidCreate(UUID *Uuid) { static int initialised, count; @@ -475,7 +475,7 @@ * RPC_S_UUID_LOCAL_ONLY if UUID is only locally unique. * */ -RPC_STATUS WINAPI UuidCreateSequential(UUID *Uuid) +RPC_STATUS RPC_ENTRY UuidCreateSequential(UUID *Uuid) { return UuidCreate(Uuid); } @@ -489,7 +489,7 @@ * Code based on FreeDCE implementation * */ -unsigned short WINAPI UuidHash(UUID *uuid, RPC_STATUS *Status) +unsigned short RPC_ENTRY UuidHash(UUID *uuid, RPC_STATUS *Status) { BYTE *data = (BYTE*)uuid; short c0 = 0, c1 = 0, x, y; @@ -527,7 +527,7 @@ * S_OK if successful. * S_OUT_OF_MEMORY if unsucessful. */ -RPC_STATUS WINAPI UuidToStringA(UUID *Uuid, unsigned char** StringUuid) +RPC_STATUS RPC_ENTRY UuidToStringA(UUID *Uuid, unsigned char** StringUuid) { *StringUuid = HeapAlloc( GetProcessHeap(), 0, sizeof(char) * 37); @@ -553,7 +553,7 @@ * S_OK if successful. * S_OUT_OF_MEMORY if unsucessful. */ -RPC_STATUS WINAPI UuidToStringW(UUID *Uuid, unsigned short** StringUuid) +RPC_STATUS RPC_ENTRY UuidToStringW(UUID *Uuid, unsigned short** StringUuid) { char buf[37]; @@ -587,7 +587,7 @@ /*********************************************************************** * UuidFromStringA (RPCRT4.@) */ -RPC_STATUS WINAPI UuidFromStringA(unsigned char* s, UUID *uuid) +RPC_STATUS RPC_ENTRY UuidFromStringA(unsigned char* s, UUID *uuid) { int i; @@ -627,7 +627,7 @@ /*********************************************************************** * UuidFromStringW (RPCRT4.@) */ -RPC_STATUS WINAPI UuidFromStringW(unsigned short* s, UUID *uuid) +RPC_STATUS RPC_ENTRY UuidFromStringW(unsigned short* s, UUID *uuid) { int i;

17 years, 5 months

[gedmurphy] 27321: - remove the object from the list - fixes a bug when deleting a drive, then adding a new one directly after

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Jun 29 03:14:37 2007 New Revision: 27321 URL: http://svn.reactos.org/svn/reactos?rev=27321&view=rev Log: - remove the object from the list - fixes a bug when deleting a drive, then adding a new one directly after Modified: trunk/tools/RosTE/GUI/VirtualMachine.cs Modified: trunk/tools/RosTE/GUI/VirtualMachine.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VirtualMachine.cs?… ============================================================================== --- trunk/tools/RosTE/GUI/VirtualMachine.cs (original) +++ trunk/tools/RosTE/GUI/VirtualMachine.cs Fri Jun 29 03:14:37 2007 @@ -506,6 +506,7 @@ public void DeleteHardDisk(VMHardDrive vmhd) { + hardDrives.Remove(vmhd); vmhd.DeleteHardDrive(vmhd.DiskID); }

17 years, 5 months

[gedmurphy] 27320: - allow both adding existing images and creating new image options - make the dialog pretty - ask the user whether they want to delete the image or not

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Jun 29 02:49:21 2007 New Revision: 27320 URL: http://svn.reactos.org/svn/reactos?rev=27320&view=rev Log: - allow both adding existing images and creating new image options - make the dialog pretty - ask the user whether they want to delete the image or not Modified: trunk/tools/RosTE/GUI/NewHardDiskForm.Designer.cs trunk/tools/RosTE/GUI/NewHardDiskForm.cs trunk/tools/RosTE/GUI/SettingsForm.Designer.cs trunk/tools/RosTE/GUI/SettingsForm.cs trunk/tools/RosTE/GUI/SettingsForm.resx [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/tools/RosTE/GUI/NewHardDiskForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/NewHardDiskForm.De… Modified: trunk/tools/RosTE/GUI/NewHardDiskForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/NewHardDiskForm.cs… Modified: trunk/tools/RosTE/GUI/SettingsForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.Desig… Modified: trunk/tools/RosTE/GUI/SettingsForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.cs?re… Modified: trunk/tools/RosTE/GUI/SettingsForm.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.resx?…

17 years, 5 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 June 2007