Ros-diffs

ros-diffs@reactos.org

81390 discussions

[dgorbachev] 26894: Borrow Japanese NLS file from WINE project.
by dgorbachev＠svn.reactos.org 25 May '07

25 May '07

Author: dgorbachev Date: Fri May 25 22:24:55 2007 New Revision: 26894 URL: http://svn.reactos.org/svn/reactos?rev=26894&view=rev Log: Borrow Japanese NLS file from WINE project. Added: trunk/reactos/dll/win32/kernel32/nls/jpn.nls Modified: trunk/reactos/dll/win32/kernel32/locale_rc.rc Modified: trunk/reactos/dll/win32/kernel32/locale_rc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/locale_… ============================================================================== --- trunk/reactos/dll/win32/kernel32/locale_rc.rc (original) +++ trunk/reactos/dll/win32/kernel32/locale_rc.rc Fri May 25 22:24:55 2007 @@ -121,7 +121,7 @@ #include "nls/ita.nls" /* 0x0410 LANG_ITALIAN, SUBLANG_ITALIAN */ #include "nls/its.nls" /* 0x0810 LANG_ITALIAN, SUBLANG_ITALIAN_SWISS */ -//#include "nls/jpn.nls" /* 0x0411 LANG_JAPANESE, SUBLANG_NEUTRAL */ +#include "nls/jpn.nls" /* 0x0411 LANG_JAPANESE, SUBLANG_NEUTRAL */ //#include "nls/kor.nls" /* 0x0412 LANG_KOREAN, SUBLANG_KOREAN */ Added: trunk/reactos/dll/win32/kernel32/nls/jpn.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/nls/jpn… ============================================================================== --- trunk/reactos/dll/win32/kernel32/nls/jpn.nls (added) +++ trunk/reactos/dll/win32/kernel32/nls/jpn.nls Fri May 25 22:24:55 2007 @@ -1,0 +1,155 @@ +/* + * Locale definitions for Japanese + * + * Copyright 2002 Alexandre Julliard for CodeWeavers + * + * 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 + */ + +#pragma code_page(932) + +STRINGTABLE LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT +{ + LOCALE_FONTSIGNATURE L"\x0283\x8000\x6cf8\x38c7\x0010\x0000\x0000\x0000\x0000\x0002\x0000\x0000\x0000\x0002\x0000\x0000" + LOCALE_ICALENDARTYPE "1" + LOCALE_ICENTURY "1" + LOCALE_ICOUNTRY "81" + LOCALE_ICURRDIGITS "0" + LOCALE_ICURRENCY "0" + LOCALE_IDATE "2" + LOCALE_IDAYLZERO "1" + LOCALE_IDEFAULTANSICODEPAGE "932" + LOCALE_IDEFAULTCODEPAGE "932" + LOCALE_IDEFAULTCOUNTRY "81" + LOCALE_IDEFAULTEBCDICCODEPAGE "20290" + LOCALE_IDEFAULTLANGUAGE "0411" + LOCALE_IDEFAULTMACCODEPAGE "10001" +//FIXME LOCALE_IDEFAULTUNIXCODEPAGE "20932" + LOCALE_IDIGITS "2" + LOCALE_IDIGITSUBSTITUTION "1" + LOCALE_IFIRSTDAYOFWEEK "6" + LOCALE_IFIRSTWEEKOFYEAR "0" + LOCALE_IINTLCURRDIGITS "2" + LOCALE_ILANGUAGE "0411" + LOCALE_ILDATE "2" + LOCALE_ILZERO "1" + LOCALE_IMEASURE "0" + LOCALE_IMONLZERO "1" + LOCALE_INEGCURR "1" + LOCALE_INEGNUMBER "1" + LOCALE_INEGSEPBYSPACE "0" + LOCALE_INEGSIGNPOSN "3" + LOCALE_INEGSYMPRECEDES "1" + LOCALE_IOPTIONALCALENDAR "3" + LOCALE_IPAPERSIZE "9" + LOCALE_IPOSSEPBYSPACE "0" + LOCALE_IPOSSIGNPOSN "3" + LOCALE_IPOSSYMPRECEDES "1" + LOCALE_ITIME "1" + LOCALE_ITIMEMARKPOSN "0" + LOCALE_ITLZERO "0" + LOCALE_S1159 "ßO" + LOCALE_S2359 "ßã" + LOCALE_SABBREVCTRYNAME "JPN" + LOCALE_SABBREVDAYNAME1 "" + LOCALE_SABBREVDAYNAME2 "Î" + LOCALE_SABBREVDAYNAME3 "" + LOCALE_SABBREVDAYNAME4 "Ø" + LOCALE_SABBREVDAYNAME5 "à" + LOCALE_SABBREVDAYNAME6 "y" + LOCALE_SABBREVDAYNAME7 "ú" + LOCALE_SABBREVLANGNAME "JPN" + LOCALE_SABBREVMONTHNAME1 "1" + LOCALE_SABBREVMONTHNAME2 "2" + LOCALE_SABBREVMONTHNAME3 "3" + LOCALE_SABBREVMONTHNAME4 "4" + LOCALE_SABBREVMONTHNAME5 "5" + LOCALE_SABBREVMONTHNAME6 "6" + LOCALE_SABBREVMONTHNAME7 "7" + LOCALE_SABBREVMONTHNAME8 "8" + LOCALE_SABBREVMONTHNAME9 "9" + LOCALE_SABBREVMONTHNAME10 "10" + LOCALE_SABBREVMONTHNAME11 "11" + LOCALE_SABBREVMONTHNAME12 "12" + LOCALE_SABBREVMONTHNAME13 "" + LOCALE_SCOUNTRY "Japan" + LOCALE_SCURRENCY L"\x00a5" + LOCALE_SDATE "/" + LOCALE_SDAYNAME1 "jú" + LOCALE_SDAYNAME2 "Îjú" + LOCALE_SDAYNAME3 "jú" + LOCALE_SDAYNAME4 "Øjú" + LOCALE_SDAYNAME5 "àjú" + LOCALE_SDAYNAME6 "yjú" + LOCALE_SDAYNAME7 "újú" + LOCALE_SDECIMAL "." + LOCALE_SENGCOUNTRY "Japan" + LOCALE_SENGCURRNAME "Japanese Yen" + LOCALE_SENGLANGUAGE "Japanese" + LOCALE_SGROUPING "3;0" + LOCALE_SINTLSYMBOL "JPY" + LOCALE_SISO3166CTRYNAME "JP" + LOCALE_SISO639LANGNAME "ja" + LOCALE_SLANGUAGE "Japanese" + LOCALE_SLIST "," + LOCALE_SLONGDATE "yyyy'N'M''d'ú'" + LOCALE_SMONDECIMALSEP "." + LOCALE_SMONGROUPING "3;0" + LOCALE_SMONTHNAME1 "1" + LOCALE_SMONTHNAME2 "2" + LOCALE_SMONTHNAME3 "3" + LOCALE_SMONTHNAME4 "4" + LOCALE_SMONTHNAME5 "5" + LOCALE_SMONTHNAME6 "6" + LOCALE_SMONTHNAME7 "7" + LOCALE_SMONTHNAME8 "8" + LOCALE_SMONTHNAME9 "9" + LOCALE_SMONTHNAME10 "10" + LOCALE_SMONTHNAME11 "11" + LOCALE_SMONTHNAME12 "12" + LOCALE_SMONTHNAME13 "" + LOCALE_SMONTHOUSANDSEP "," +// LOCALE_SNAME "ja-JP" + LOCALE_SNATIVECTRYNAME "ú{" + LOCALE_SNATIVECURRNAME "~" + LOCALE_SNATIVEDIGITS "0123456789" + LOCALE_SNATIVELANGNAME "ú{ê" + LOCALE_SNEGATIVESIGN "-" + LOCALE_SPOSITIVESIGN "" + LOCALE_SSHORTDATE "yyyy/MM/dd" + LOCALE_SSORTNAME "XJIS" + LOCALE_STHOUSAND "," + LOCALE_STIME ":" + LOCALE_STIMEFORMAT "H:mm:ss" + LOCALE_SYEARMONTH "yyyy'N'M''" + + LGRPID_WESTERN_EUROPE+LGRPID_RES_BASE "Western Europe and United States" + LGRPID_CENTRAL_EUROPE+LGRPID_RES_BASE "Central Europe" + LGRPID_BALTIC+LGRPID_RES_BASE "Baltic" + LGRPID_GREEK+LGRPID_RES_BASE "Greek" + LGRPID_CYRILLIC+LGRPID_RES_BASE "Cyrillic" + LGRPID_TURKISH+LGRPID_RES_BASE "Turkic" + LGRPID_JAPANESE+LGRPID_RES_BASE "Japanese" + LGRPID_KOREAN+LGRPID_RES_BASE "Korean" + LGRPID_TRADITIONAL_CHINESE+LGRPID_RES_BASE "Traditional Chinese" + LGRPID_SIMPLIFIED_CHINESE+LGRPID_RES_BASE "Simplified Chinese" + LGRPID_THAI+LGRPID_RES_BASE "Thai" + LGRPID_HEBREW+LGRPID_RES_BASE "Hebrew" + LGRPID_ARABIC+LGRPID_RES_BASE "Arabic" + LGRPID_VIETNAMESE+LGRPID_RES_BASE "Vietnamese" + LGRPID_INDIC+LGRPID_RES_BASE "Indic" + LGRPID_GEORGIAN+LGRPID_RES_BASE "Georgian" + LGRPID_ARMENIAN+LGRPID_RES_BASE "Armenian" +}

1 0

[dgorbachev] 26893: Do not free the string twice.
by dgorbachev＠svn.reactos.org 25 May '07

25 May '07

Author: dgorbachev Date: Fri May 25 21:10:11 2007 New Revision: 26893 URL: http://svn.reactos.org/svn/reactos?rev=26893&view=rev Log: Do not free the string twice. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Fri May 25 21:10:11 2007 @@ -79,12 +79,14 @@ ExFreePool(DriverObject->DriverName.Buffer); } +#if 0 /* See a bit of hack in IopCreateDriver */ /* Check if it has a service key name */ if (DriverObject->DriverExtension->ServiceKeyName.Buffer) { /* Free it */ ExFreePool(DriverObject->DriverExtension->ServiceKeyName.Buffer); } +#endif } NTSTATUS FASTCALL

1 0

[gedmurphy] 26892: - only flash the task bar, and only for 1 second (it's really annoying otherwise) - add it to the build script
by gedmurphy＠svn.reactos.org 25 May '07

25 May '07

Author: gedmurphy Date: Fri May 25 18:16:21 2007 New Revision: 26892 URL: http://svn.reactos.org/svn/reactos?rev=26892&view=rev Log: - only flash the task bar, and only for 1 second (it's really annoying otherwise) - add it to the build script Modified: trunk/tools/RosBE-Windows/Build.cmd trunk/tools/RosBE-Windows/Tools/flash.c Modified: trunk/tools/RosBE-Windows/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Build.cmd?rev=… ============================================================================== --- trunk/tools/RosBE-Windows/Build.cmd (original) +++ trunk/tools/RosBE-Windows/Build.cmd Fri May 25 18:16:21 2007 @@ -33,4 +33,9 @@ "%ROSBEBASEDIR%\Tools\buildtime.exe" "%_MINGWMAKE%" 2>&1 | "%ROSBEBASEDIR%\Tools\tee.exe" "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" ) else ( "%ROSBEBASEDIR%\Tools\buildtime.exe" "%_MINGWMAKE%" %* 2>&1 | "%ROSBEBASEDIR%\Tools\tee.exe" "%_ROSBELOGDIR%\BuildLog-%_MINGWVERSION%-%DATENAME%-%TIMENAME%.txt" -) +) + +:: +:: highlight the fact that building has ended +:: +call "%ROSBEBASEDIR%\Tools\flash.exe" Modified: trunk/tools/RosBE-Windows/Tools/flash.c URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Tools/flash.c?… ============================================================================== --- trunk/tools/RosBE-Windows/Tools/flash.c (original) +++ trunk/tools/RosBE-Windows/Tools/flash.c Fri May 25 18:16:21 2007 @@ -37,8 +37,8 @@ { fwi.cbSize = sizeof(FLASHWINFO); fwi.hwnd = hwnd; - fwi.dwFlags = FLASHW_ALL | FLASHW_TIMERNOFG; - fwi.uCount = 20; + fwi.dwFlags = FLASHW_TRAY | FLASHW_TIMERNOFG; + fwi.uCount = 1; FlashWindowEx(&fwi); }

1 0

[fireball] 26891: - Remove a hack from IopCreateDriver(), no boot hang happens in VMWare without it anymore. - Uncomment a ExFreePool() in a Delete routine for Driver object type, should prevent a possible memory leak (was commented due to the previous hack). - Added a small piece of a new logic into IopCreateDriver(). In ReactOS it's being called two times almost immediately, which results in a non-unique driver object name, since KeTickCount is the same. In order to prevent this situation a lo
by fireball＠svn.reactos.org 25 May '07

25 May '07

Author: fireball Date: Fri May 25 17:52:58 2007 New Revision: 26891 URL: http://svn.reactos.org/svn/reactos?rev=26891&view=rev Log: - Remove a hack from IopCreateDriver(), no boot hang happens in VMWare without it anymore. - Uncomment a ExFreePool() in a Delete routine for Driver object type, should prevent a possible memory leak (was commented due to the previous hack). - Added a small piece of a new logic into IopCreateDriver(). In ReactOS it's being called two times almost immediately, which results in a non-unique driver object name, since KeTickCount is the same. In order to prevent this situation a loop is added, having 100 iterations as max. Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Fri May 25 17:52:58 2007 @@ -83,7 +83,7 @@ if (DriverObject->DriverExtension->ServiceKeyName.Buffer) { /* Free it */ - //ExFreePool(DriverObject->DriverExtension->ServiceKeyName.Buffer); + ExFreePool(DriverObject->DriverExtension->ServiceKeyName.Buffer); } } @@ -443,6 +443,7 @@ if (!NT_SUCCESS(Status)) { + DPRINT1("DriverEntry() returned Status=0x%08X\n", Status); ObMakeTemporaryObject(Driver); ObDereferenceObject(Driver); return Status; @@ -1119,8 +1120,9 @@ PDRIVER_OBJECT DriverObject; UNICODE_STRING ServiceKeyName; HANDLE hDriver; - ULONG i; - + ULONG i, RetryCount = 0; + +try_again: /* First, create a unique name for the driver if we don't have one */ if (!DriverName) { @@ -1201,21 +1203,22 @@ &ServiceKeyName, sizeof(UNICODE_STRING)); - if (!DriverName) - { - /* HACK: Something goes wrong in next lines in this case. - * Just leave to prevent a freeze */ - *pDriverObject = DriverObject; - return Status; - } - /* Add the Object and get its handle */ Status = ObInsertObject(DriverObject, NULL, FILE_READ_DATA, - 0, + OBJ_KERNEL_HANDLE, NULL, &hDriver); + + /* Eliminate small possibility when this function is called more than + once in a row, and KeTickCount doesn't get enough time to change */ + if (!DriverName && (Status == STATUS_OBJECT_NAME_COLLISION) && (RetryCount < 100)) + { + RetryCount++; + goto try_again; + } + if (!NT_SUCCESS(Status)) return Status; /* Now reference it */

1 0

[gedmurphy] 26890: add a few more bits to the GUI
by gedmurphy＠svn.reactos.org 25 May '07

25 May '07

Author: gedmurphy Date: Fri May 25 16:31:14 2007 New Revision: 26890 URL: http://svn.reactos.org/svn/reactos?rev=26890&view=rev Log: add a few more bits to the GUI Modified: trunk/tools/RosTE/GUI/SettingsForm.Designer.cs trunk/tools/RosTE/GUI/SettingsForm.cs Modified: trunk/tools/RosTE/GUI/SettingsForm.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.Desig… ============================================================================== --- trunk/tools/RosTE/GUI/SettingsForm.Designer.cs (original) +++ trunk/tools/RosTE/GUI/SettingsForm.Designer.cs Fri May 25 16:31:14 2007 @@ -34,20 +34,58 @@ this.tabPage1 = new System.Windows.Forms.TabPage(); this.memoryPanel = new System.Windows.Forms.Panel(); this.memoryGrpBox = new System.Windows.Forms.GroupBox(); + this.memoryLabel = new System.Windows.Forms.Label(); this.memoryUpDwn = new System.Windows.Forms.NumericUpDown(); this.memoryTrkBar = new System.Windows.Forms.TrackBar(); this.tabPage2 = new System.Windows.Forms.TabPage(); this.cdromPanel = new System.Windows.Forms.Panel(); this.cdromGrpBox = new System.Windows.Forms.GroupBox(); + this.cdromConGrpBox = new System.Windows.Forms.GroupBox(); + this.cdromIsoBrwse = new System.Windows.Forms.Button(); + this.cdromIsoTxtBox = new System.Windows.Forms.TextBox(); + this.cdromPhyDrvCombo = new System.Windows.Forms.ComboBox(); + this.cdromIsoRadio = new System.Windows.Forms.RadioButton(); + this.cdromPhyDrvRadio = new System.Windows.Forms.RadioButton(); + this.cdromConStatusLbl = new System.Windows.Forms.Label(); + this.cdromLabel = new System.Windows.Forms.Label(); + this.cdromEnableChkBox = new System.Windows.Forms.CheckBox(); this.tabPage3 = new System.Windows.Forms.TabPage(); this.harddiskPanel = new System.Windows.Forms.Panel(); this.harddiskGrpBox = new System.Windows.Forms.GroupBox(); + this.harddiskRemoveBtn = new System.Windows.Forms.Button(); + this.harddiskFreeSpcLbl = new System.Windows.Forms.Label(); + this.harddiskLabel4 = new System.Windows.Forms.Label(); + this.harddiskDetailsGrpBox = new System.Windows.Forms.GroupBox(); + this.harddiskSizeLbl = new System.Windows.Forms.Label(); + this.harddiskLabel3 = new System.Windows.Forms.Label(); + this.harddiskLabel2 = new System.Windows.Forms.Label(); + this.harddiskFileNameTxtBox = new System.Windows.Forms.TextBox(); + this.harddiskLabel1 = new System.Windows.Forms.Label(); + this.harddiskEditBtn = new System.Windows.Forms.Button(); + this.harddiskAddBtn = new System.Windows.Forms.Button(); + this.harddiskLstBox = new System.Windows.Forms.ListBox(); this.tabPage4 = new System.Windows.Forms.TabPage(); this.networkPanel = new System.Windows.Forms.Panel(); this.floppyGrpBox = new System.Windows.Forms.GroupBox(); + this.floppyConnGrpBox = new System.Windows.Forms.GroupBox(); + this.floppyImgBrwse = new System.Windows.Forms.Button(); + this.floppyImgTxtBox = new System.Windows.Forms.TextBox(); + this.floppyPhyDrvCombo = new System.Windows.Forms.ComboBox(); + this.floppyImgRadio = new System.Windows.Forms.RadioButton(); + this.floppyPhyDrvRadio = new System.Windows.Forms.RadioButton(); + this.floppyConnLbl = new System.Windows.Forms.Label(); + this.floppyLabel = new System.Windows.Forms.Label(); + this.floppyEnableChkBox = new System.Windows.Forms.CheckBox(); this.tabPage5 = new System.Windows.Forms.TabPage(); this.ethernetPanel = new System.Windows.Forms.Panel(); this.ethernetGrpBox = new System.Windows.Forms.GroupBox(); + this.ethRemoveBtn = new System.Windows.Forms.Button(); + this.ethDetailsGrpBox = new System.Windows.Forms.GroupBox(); + this.ethLabel2 = new System.Windows.Forms.Label(); + this.ethEditBtn = new System.Windows.Forms.Button(); + this.ethAddBtn = new System.Windows.Forms.Button(); + this.ethLstBox = new System.Windows.Forms.ListBox(); + this.ethLabel1 = new System.Windows.Forms.Label(); this.tabPage6 = new System.Windows.Forms.TabPage(); this.audioPanel = new System.Windows.Forms.Panel(); this.audioGrpBox = new System.Windows.Forms.GroupBox(); @@ -66,6 +104,14 @@ this.tabPage8 = new System.Windows.Forms.TabPage(); this.generalPanel = new System.Windows.Forms.Panel(); this.generalGrpBox = new System.Windows.Forms.GroupBox(); + this.generalSetClockHost = new System.Windows.Forms.CheckBox(); + this.generalWorkDirBrows = new System.Windows.Forms.Button(); + this.generalWorkDir = new System.Windows.Forms.TextBox(); + this.generalLabel3 = new System.Windows.Forms.Label(); + this.generalMachine = new System.Windows.Forms.ComboBox(); + this.generalLabel2 = new System.Windows.Forms.Label(); + this.generalLabel1 = new System.Windows.Forms.Label(); + this.generalVMName = new System.Windows.Forms.TextBox(); this.tabPage9 = new System.Windows.Forms.TabPage(); this.powerPanel = new System.Windows.Forms.Panel(); this.powerGrpBox = new System.Windows.Forms.GroupBox(); @@ -76,37 +122,12 @@ this.advancedPanel = new System.Windows.Forms.Panel(); this.advancedGrpBox = new System.Windows.Forms.GroupBox(); this.optionsSelLstBox = new System.Windows.Forms.ListBox(); - this.memoryLabel = new System.Windows.Forms.Label(); - this.cdromEnableChkBox = new System.Windows.Forms.CheckBox(); - this.cdromLabel = new System.Windows.Forms.Label(); - this.cdromConStatusLbl = new System.Windows.Forms.Label(); - this.cdromConGrpBox = new System.Windows.Forms.GroupBox(); - this.cdromPhyDrvRadio = new System.Windows.Forms.RadioButton(); - this.cdromIsoRadio = new System.Windows.Forms.RadioButton(); - this.cdromPhyDrvCombo = new System.Windows.Forms.ComboBox(); this.browseDlg = new System.Windows.Forms.FolderBrowserDialog(); - this.cdromIsoTxtBox = new System.Windows.Forms.TextBox(); - this.cdromIsoBrwse = new System.Windows.Forms.Button(); - this.harddiskLstBox = new System.Windows.Forms.ListBox(); - this.harddiskAddBtn = new System.Windows.Forms.Button(); - this.harddiskRemoveBtn = new System.Windows.Forms.Button(); - this.harddiskLabel1 = new System.Windows.Forms.Label(); - this.harddiskDetailsGrpBox = new System.Windows.Forms.GroupBox(); - this.harddiskFileNameTxtBox = new System.Windows.Forms.TextBox(); - this.harddiskLabel2 = new System.Windows.Forms.Label(); - this.harddiskLabel3 = new System.Windows.Forms.Label(); - this.harddiskSizeLbl = new System.Windows.Forms.Label(); - this.harddiskLabel4 = new System.Windows.Forms.Label(); - this.harddiskFreeSpcLbl = new System.Windows.Forms.Label(); - this.floppyConnGrpBox = new System.Windows.Forms.GroupBox(); - this.floppyImgBrwse = new System.Windows.Forms.Button(); - this.floppyImgTxtBox = new System.Windows.Forms.TextBox(); - this.floppyPhyDrvCombo = new System.Windows.Forms.ComboBox(); - this.floppyImgRadio = new System.Windows.Forms.RadioButton(); - this.floppyPhyDrvRadio = new System.Windows.Forms.RadioButton(); - this.floppyConnLbl = new System.Windows.Forms.Label(); - this.floppyLabel = new System.Windows.Forms.Label(); - this.floppyEnableChkBox = new System.Windows.Forms.CheckBox(); + this.ethLabel3 = new System.Windows.Forms.Label(); + this.ethLabel4 = new System.Windows.Forms.Label(); + this.ethVlanTxtBox = new System.Windows.Forms.TextBox(); + this.ethNetTypeTxtBox = new System.Windows.Forms.TextBox(); + this.ethMacAddrTxtBox = new System.Windows.Forms.TextBox(); this.hardwareContainerPanel.SuspendLayout(); this.hardwareTempDesignSheetTab.SuspendLayout(); this.tabPage1.SuspendLayout(); @@ -117,14 +138,19 @@ this.tabPage2.SuspendLayout(); this.cdromPanel.SuspendLayout(); this.cdromGrpBox.SuspendLayout(); + this.cdromConGrpBox.SuspendLayout(); this.tabPage3.SuspendLayout(); this.harddiskPanel.SuspendLayout(); this.harddiskGrpBox.SuspendLayout(); + this.harddiskDetailsGrpBox.SuspendLayout(); this.tabPage4.SuspendLayout(); this.networkPanel.SuspendLayout(); this.floppyGrpBox.SuspendLayout(); + this.floppyConnGrpBox.SuspendLayout(); this.tabPage5.SuspendLayout(); this.ethernetPanel.SuspendLayout(); + this.ethernetGrpBox.SuspendLayout(); + this.ethDetailsGrpBox.SuspendLayout(); this.tabPage6.SuspendLayout(); this.audioPanel.SuspendLayout(); this.tabPage7.SuspendLayout(); @@ -136,15 +162,13 @@ this.optionsTempDesignSheetTab.SuspendLayout(); this.tabPage8.SuspendLayout(); this.generalPanel.SuspendLayout(); + this.generalGrpBox.SuspendLayout(); this.tabPage9.SuspendLayout(); this.powerPanel.SuspendLayout(); this.tabPage10.SuspendLayout(); this.snapshotsPanel.SuspendLayout(); this.tabPage11.SuspendLayout(); this.advancedPanel.SuspendLayout(); - this.cdromConGrpBox.SuspendLayout(); - this.harddiskDetailsGrpBox.SuspendLayout(); - this.floppyConnGrpBox.SuspendLayout(); this.SuspendLayout(); // // hardwareSelLstBox @@ -224,6 +248,16 @@ this.memoryGrpBox.TabStop = false; this.memoryGrpBox.Text = "Memory"; // + // memoryLabel + // + this.memoryLabel.AutoSize = true; + this.memoryLabel.Location = new System.Drawing.Point(6, 32); + this.memoryLabel.Name = "memoryLabel"; + this.memoryLabel.Size = new System.Drawing.Size(229, 26); + this.memoryLabel.TabIndex = 2; + this.memoryLabel.Text = "Select how much virtual memory you would like\r\nto make available for this virtual" + + " machine"; + // // memoryUpDwn // this.memoryUpDwn.Location = new System.Drawing.Point(216, 85); @@ -271,6 +305,94 @@ this.cdromGrpBox.TabStop = false; this.cdromGrpBox.Text = "CD-ROM"; // + // cdromConGrpBox + // + this.cdromConGrpBox.Controls.Add(this.cdromIsoBrwse); + this.cdromConGrpBox.Controls.Add(this.cdromIsoTxtBox); + this.cdromConGrpBox.Controls.Add(this.cdromPhyDrvCombo); + this.cdromConGrpBox.Controls.Add(this.cdromIsoRadio); + this.cdromConGrpBox.Controls.Add(this.cdromPhyDrvRadio); + this.cdromConGrpBox.Location = new System.Drawing.Point(6, 96); + this.cdromConGrpBox.Name = "cdromConGrpBox"; + this.cdromConGrpBox.Size = new System.Drawing.Size(268, 192); + this.cdromConGrpBox.TabIndex = 3; + this.cdromConGrpBox.TabStop = false; + this.cdromConGrpBox.Text = "Connection"; + // + // cdromIsoBrwse + // + this.cdromIsoBrwse.Location = new System.Drawing.Point(194, 128); + this.cdromIsoBrwse.Name = "cdromIsoBrwse"; + this.cdromIsoBrwse.Size = new System.Drawing.Size(68, 23); + this.cdromIsoBrwse.TabIndex = 4; + this.cdromIsoBrwse.Text = "Browse..."; + this.cdromIsoBrwse.UseVisualStyleBackColor = true; + // + // cdromIsoTxtBox + // + this.cdromIsoTxtBox.Location = new System.Drawing.Point(26, 130); + this.cdromIsoTxtBox.Name = "cdromIsoTxtBox"; + this.cdromIsoTxtBox.Size = new System.Drawing.Size(162, 20); + this.cdromIsoTxtBox.TabIndex = 3; + // + // cdromPhyDrvCombo + // + this.cdromPhyDrvCombo.FormattingEnabled = true; + this.cdromPhyDrvCombo.Location = new System.Drawing.Point(26, 51); + this.cdromPhyDrvCombo.Name = "cdromPhyDrvCombo"; + this.cdromPhyDrvCombo.Size = new System.Drawing.Size(121, 21); + this.cdromPhyDrvCombo.TabIndex = 2; + // + // cdromIsoRadio + // + this.cdromIsoRadio.AutoSize = true; + this.cdromIsoRadio.Location = new System.Drawing.Point(6, 107); + this.cdromIsoRadio.Name = "cdromIsoRadio"; + this.cdromIsoRadio.Size = new System.Drawing.Size(96, 17); + this.cdromIsoRadio.TabIndex = 1; + this.cdromIsoRadio.TabStop = true; + this.cdromIsoRadio.Text = "Use ISO image"; + this.cdromIsoRadio.UseVisualStyleBackColor = true; + // + // cdromPhyDrvRadio + // + this.cdromPhyDrvRadio.AutoSize = true; + this.cdromPhyDrvRadio.Location = new System.Drawing.Point(6, 28); + this.cdromPhyDrvRadio.Name = "cdromPhyDrvRadio"; + this.cdromPhyDrvRadio.Size = new System.Drawing.Size(111, 17); + this.cdromPhyDrvRadio.TabIndex = 0; + this.cdromPhyDrvRadio.TabStop = true; + this.cdromPhyDrvRadio.Text = "Use physical drive"; + this.cdromPhyDrvRadio.UseVisualStyleBackColor = true; + // + // cdromConStatusLbl + // + this.cdromConStatusLbl.AutoSize = true; + this.cdromConStatusLbl.Location = new System.Drawing.Point(56, 26); + this.cdromConStatusLbl.Name = "cdromConStatusLbl"; + this.cdromConStatusLbl.Size = new System.Drawing.Size(79, 13); + this.cdromConStatusLbl.TabIndex = 2; + this.cdromConStatusLbl.Text = "Not Connected"; + // + // cdromLabel + // + this.cdromLabel.AutoSize = true; + this.cdromLabel.Location = new System.Drawing.Point(7, 26); + this.cdromLabel.Name = "cdromLabel"; + this.cdromLabel.Size = new System.Drawing.Size(43, 13); + this.cdromLabel.TabIndex = 1; + this.cdromLabel.Text = "Status :"; + // + // cdromEnableChkBox + // + this.cdromEnableChkBox.AutoSize = true; + this.cdromEnableChkBox.Location = new System.Drawing.Point(15, 51); + this.cdromEnableChkBox.Name = "cdromEnableChkBox"; + this.cdromEnableChkBox.Size = new System.Drawing.Size(105, 17); + this.cdromEnableChkBox.TabIndex = 0; + this.cdromEnableChkBox.Text = "Enable CD-ROM"; + this.cdromEnableChkBox.UseVisualStyleBackColor = true; + // // tabPage3 // this.tabPage3.Controls.Add(this.harddiskPanel); @@ -293,11 +415,12 @@ // // harddiskGrpBox // + this.harddiskGrpBox.Controls.Add(this.harddiskRemoveBtn); this.harddiskGrpBox.Controls.Add(this.harddiskFreeSpcLbl); this.harddiskGrpBox.Controls.Add(this.harddiskLabel4); this.harddiskGrpBox.Controls.Add(this.harddiskDetailsGrpBox); this.harddiskGrpBox.Controls.Add(this.harddiskLabel1); - this.harddiskGrpBox.Controls.Add(this.harddiskRemoveBtn); + this.harddiskGrpBox.Controls.Add(this.harddiskEditBtn); this.harddiskGrpBox.Controls.Add(this.harddiskAddBtn); this.harddiskGrpBox.Controls.Add(this.harddiskLstBox); this.harddiskGrpBox.Location = new System.Drawing.Point(3, 3); @@ -306,6 +429,116 @@ this.harddiskGrpBox.TabIndex = 0; this.harddiskGrpBox.TabStop = false; this.harddiskGrpBox.Text = "Hard Disk"; + // + // harddiskRemoveBtn + // + this.harddiskRemoveBtn.Location = new System.Drawing.Point(175, 99); + this.harddiskRemoveBtn.Name = "harddiskRemoveBtn"; + this.harddiskRemoveBtn.Size = new System.Drawing.Size(75, 23); + this.harddiskRemoveBtn.TabIndex = 7; + this.harddiskRemoveBtn.Text = "Remove"; + this.harddiskRemoveBtn.UseVisualStyleBackColor = true; + // + // harddiskFreeSpcLbl + // + this.harddiskFreeSpcLbl.AutoSize = true; + this.harddiskFreeSpcLbl.Location = new System.Drawing.Point(129, 275); + this.harddiskFreeSpcLbl.Name = "harddiskFreeSpcLbl"; + this.harddiskFreeSpcLbl.Size = new System.Drawing.Size(69, 13); + this.harddiskFreeSpcLbl.TabIndex = 6; + this.harddiskFreeSpcLbl.Text = "<free space>"; + // + // harddiskLabel4 + // + this.harddiskLabel4.AutoSize = true; + this.harddiskLabel4.Location = new System.Drawing.Point(18, 275); + this.harddiskLabel4.Name = "harddiskLabel4"; + this.harddiskLabel4.Size = new System.Drawing.Size(105, 13); + this.harddiskLabel4.TabIndex = 5; + this.harddiskLabel4.Text = "Free space available"; + // + // harddiskDetailsGrpBox + // + this.harddiskDetailsGrpBox.Controls.Add(this.harddiskSizeLbl); + this.harddiskDetailsGrpBox.Controls.Add(this.harddiskLabel3); + this.harddiskDetailsGrpBox.Controls.Add(this.harddiskLabel2); + this.harddiskDetailsGrpBox.Controls.Add(this.harddiskFileNameTxtBox); + this.harddiskDetailsGrpBox.Location = new System.Drawing.Point(13, 147); + this.harddiskDetailsGrpBox.Name = "harddiskDetailsGrpBox"; + this.harddiskDetailsGrpBox.Size = new System.Drawing.Size(261, 96); + this.harddiskDetailsGrpBox.TabIndex = 4; + this.harddiskDetailsGrpBox.TabStop = false; + this.harddiskDetailsGrpBox.Text = "Details"; + // + // harddiskSizeLbl + // + this.harddiskSizeLbl.AutoSize = true; + this.harddiskSizeLbl.Location = new System.Drawing.Point(53, 66); + this.harddiskSizeLbl.Name = "harddiskSizeLbl"; + this.harddiskSizeLbl.Size = new System.Drawing.Size(37, 13); + this.harddiskSizeLbl.TabIndex = 3; + this.harddiskSizeLbl.Text = "<size>"; + // + // harddiskLabel3 + // + this.harddiskLabel3.AutoSize = true; + this.harddiskLabel3.Location = new System.Drawing.Point(6, 66); + this.harddiskLabel3.Name = "harddiskLabel3"; + this.harddiskLabel3.Size = new System.Drawing.Size(27, 13); + this.harddiskLabel3.TabIndex = 2; + this.harddiskLabel3.Text = "Size"; + // + // harddiskLabel2 + // + this.harddiskLabel2.AutoSize = true; + this.harddiskLabel2.Location = new System.Drawing.Point(6, 29); + this.harddiskLabel2.Name = "harddiskLabel2"; + this.harddiskLabel2.Size = new System.Drawing.Size(44, 13); + this.harddiskLabel2.TabIndex = 1; + this.harddiskLabel2.Text = "Disk file"; + // + // harddiskFileNameTxtBox + // + this.harddiskFileNameTxtBox.Location = new System.Drawing.Point(56, 26); + this.harddiskFileNameTxtBox.Name = "harddiskFileNameTxtBox"; + this.harddiskFileNameTxtBox.ReadOnly = true; + this.harddiskFileNameTxtBox.Size = new System.Drawing.Size(199, 20); + this.harddiskFileNameTxtBox.TabIndex = 0; + // + // harddiskLabel1 + // + this.harddiskLabel1.AutoSize = true; + this.harddiskLabel1.Location = new System.Drawing.Point(10, 21); + this.harddiskLabel1.Name = "harddiskLabel1"; + this.harddiskLabel1.Size = new System.Drawing.Size(101, 13); + this.harddiskLabel1.TabIndex = 3; + this.harddiskLabel1.Text = "Available hard disks"; + // + // harddiskEditBtn + // + this.harddiskEditBtn.Location = new System.Drawing.Point(94, 99); + this.harddiskEditBtn.Name = "harddiskEditBtn"; + this.harddiskEditBtn.Size = new System.Drawing.Size(75, 23); + this.harddiskEditBtn.TabIndex = 2; + this.harddiskEditBtn.Text = "Edit"; + this.harddiskEditBtn.UseVisualStyleBackColor = true; + // + // harddiskAddBtn + // + this.harddiskAddBtn.Location = new System.Drawing.Point(13, 99); + this.harddiskAddBtn.Name = "harddiskAddBtn"; + this.harddiskAddBtn.Size = new System.Drawing.Size(75, 23); + this.harddiskAddBtn.TabIndex = 1; + this.harddiskAddBtn.Text = "Add"; + this.harddiskAddBtn.UseVisualStyleBackColor = true; + // + // harddiskLstBox + // + this.harddiskLstBox.FormattingEnabled = true; + this.harddiskLstBox.Location = new System.Drawing.Point(13, 37); + this.harddiskLstBox.Name = "harddiskLstBox"; + this.harddiskLstBox.Size = new System.Drawing.Size(237, 56); + this.harddiskLstBox.TabIndex = 0; // // tabPage4 // @@ -340,6 +573,94 @@ this.floppyGrpBox.TabStop = false; this.floppyGrpBox.Text = "Floppy"; // + // floppyConnGrpBox + // + this.floppyConnGrpBox.Controls.Add(this.floppyImgBrwse); + this.floppyConnGrpBox.Controls.Add(this.floppyImgTxtBox); + this.floppyConnGrpBox.Controls.Add(this.floppyPhyDrvCombo); + this.floppyConnGrpBox.Controls.Add(this.floppyImgRadio); + this.floppyConnGrpBox.Controls.Add(this.floppyPhyDrvRadio); + this.floppyConnGrpBox.Location = new System.Drawing.Point(6, 96); + this.floppyConnGrpBox.Name = "floppyConnGrpBox"; + this.floppyConnGrpBox.Size = new System.Drawing.Size(268, 192); + this.floppyConnGrpBox.TabIndex = 7; + this.floppyConnGrpBox.TabStop = false; + this.floppyConnGrpBox.Text = "Connection"; + // + // floppyImgBrwse + // + this.floppyImgBrwse.Location = new System.Drawing.Point(194, 128); + this.floppyImgBrwse.Name = "floppyImgBrwse"; + this.floppyImgBrwse.Size = new System.Drawing.Size(68, 23); + this.floppyImgBrwse.TabIndex = 4; + this.floppyImgBrwse.Text = "Browse..."; + this.floppyImgBrwse.UseVisualStyleBackColor = true; + // + // floppyImgTxtBox + // + this.floppyImgTxtBox.Location = new System.Drawing.Point(26, 130); + this.floppyImgTxtBox.Name = "floppyImgTxtBox"; + this.floppyImgTxtBox.Size = new System.Drawing.Size(162, 20); + this.floppyImgTxtBox.TabIndex = 3; + // + // floppyPhyDrvCombo + // + this.floppyPhyDrvCombo.FormattingEnabled = true; + this.floppyPhyDrvCombo.Location = new System.Drawing.Point(26, 51); + this.floppyPhyDrvCombo.Name = "floppyPhyDrvCombo"; + this.floppyPhyDrvCombo.Size = new System.Drawing.Size(121, 21); + this.floppyPhyDrvCombo.TabIndex = 2; + // + // floppyImgRadio + // + this.floppyImgRadio.AutoSize = true; + this.floppyImgRadio.Location = new System.Drawing.Point(6, 107); + this.floppyImgRadio.Name = "floppyImgRadio"; + this.floppyImgRadio.Size = new System.Drawing.Size(106, 17); + this.floppyImgRadio.TabIndex = 1; + this.floppyImgRadio.TabStop = true; + this.floppyImgRadio.Text = "Use floppy image"; + this.floppyImgRadio.UseVisualStyleBackColor = true; + // + // floppyPhyDrvRadio + // + this.floppyPhyDrvRadio.AutoSize = true; + this.floppyPhyDrvRadio.Location = new System.Drawing.Point(6, 28); + this.floppyPhyDrvRadio.Name = "floppyPhyDrvRadio"; + this.floppyPhyDrvRadio.Size = new System.Drawing.Size(111, 17); + this.floppyPhyDrvRadio.TabIndex = 0; + this.floppyPhyDrvRadio.TabStop = true; + this.floppyPhyDrvRadio.Text = "Use physical drive"; + this.floppyPhyDrvRadio.UseVisualStyleBackColor = true; + // + // floppyConnLbl + // + this.floppyConnLbl.AutoSize = true; + this.floppyConnLbl.Location = new System.Drawing.Point(56, 26); + this.floppyConnLbl.Name = "floppyConnLbl"; + this.floppyConnLbl.Size = new System.Drawing.Size(70, 13); + this.floppyConnLbl.TabIndex = 6; + this.floppyConnLbl.Text = "<connected>"; + // + // floppyLabel + // + this.floppyLabel.AutoSize = true; + this.floppyLabel.Location = new System.Drawing.Point(7, 26); + this.floppyLabel.Name = "floppyLabel"; + this.floppyLabel.Size = new System.Drawing.Size(43, 13); + this.floppyLabel.TabIndex = 5; + this.floppyLabel.Text = "Status :"; + // + // floppyEnableChkBox + // + this.floppyEnableChkBox.AutoSize = true; + this.floppyEnableChkBox.Location = new System.Drawing.Point(15, 51); + this.floppyEnableChkBox.Name = "floppyEnableChkBox"; + this.floppyEnableChkBox.Size = new System.Drawing.Size(90, 17); + this.floppyEnableChkBox.TabIndex = 4; + this.floppyEnableChkBox.Text = "Enable floppy"; + this.floppyEnableChkBox.UseVisualStyleBackColor = true; + // // tabPage5 // this.tabPage5.Controls.Add(this.ethernetPanel); @@ -362,12 +683,87 @@ // // ethernetGrpBox // + this.ethernetGrpBox.Controls.Add(this.ethRemoveBtn); + this.ethernetGrpBox.Controls.Add(this.ethDetailsGrpBox); + this.ethernetGrpBox.Controls.Add(this.ethAddBtn); + this.ethernetGrpBox.Controls.Add(this.ethLstBox); + this.ethernetGrpBox.Controls.Add(this.ethLabel1); this.ethernetGrpBox.Location = new System.Drawing.Point(3, 3); this.ethernetGrpBox.Name = "ethernetGrpBox"; this.ethernetGrpBox.Size = new System.Drawing.Size(283, 364); this.ethernetGrpBox.TabIndex = 0; this.ethernetGrpBox.TabStop = false; this.ethernetGrpBox.Text = "Ethernet"; + // + // ethRemoveBtn + // + this.ethRemoveBtn.Location = new System.Drawing.Point(102, 99); + this.ethRemoveBtn.Name = "ethRemoveBtn"; + this.ethRemoveBtn.Size = new System.Drawing.Size(75, 23); + this.ethRemoveBtn.TabIndex = 9; + this.ethRemoveBtn.Text = "Remove"; + this.ethRemoveBtn.UseVisualStyleBackColor = true; + // + // ethDetailsGrpBox + // + this.ethDetailsGrpBox.Controls.Add(this.ethMacAddrTxtBox); + this.ethDetailsGrpBox.Controls.Add(this.ethNetTypeTxtBox); + this.ethDetailsGrpBox.Controls.Add(this.ethVlanTxtBox); + this.ethDetailsGrpBox.Controls.Add(this.ethLabel4); + this.ethDetailsGrpBox.Controls.Add(this.ethEditBtn); + this.ethDetailsGrpBox.Controls.Add(this.ethLabel3); + this.ethDetailsGrpBox.Controls.Add(this.ethLabel2); + this.ethDetailsGrpBox.Location = new System.Drawing.Point(13, 147); + this.ethDetailsGrpBox.Name = "ethDetailsGrpBox"; + this.ethDetailsGrpBox.Size = new System.Drawing.Size(253, 145); + this.ethDetailsGrpBox.TabIndex = 8; + this.ethDetailsGrpBox.TabStop = false; + this.ethDetailsGrpBox.Text = "Details"; + // + // ethLabel2 + // + this.ethLabel2.AutoSize = true; + this.ethLabel2.Location = new System.Drawing.Point(6, 27); + this.ethLabel2.Name = "ethLabel2"; + this.ethLabel2.Size = new System.Drawing.Size(52, 13); + this.ethLabel2.TabIndex = 2; + this.ethLabel2.Text = "VLAN No"; + // + // ethEditBtn + // + this.ethEditBtn.Location = new System.Drawing.Point(172, 112); + this.ethEditBtn.Name = "ethEditBtn"; + this.ethEditBtn.Size = new System.Drawing.Size(75, 23); + this.ethEditBtn.TabIndex = 7; + this.ethEditBtn.Text = "Edit"; + this.ethEditBtn.UseVisualStyleBackColor = true; + this.ethEditBtn.Click += new System.EventHandler(this.ethEditBtn_Click); + // + // ethAddBtn + // + this.ethAddBtn.Location = new System.Drawing.Point(13, 99); + this.ethAddBtn.Name = "ethAddBtn"; + this.ethAddBtn.Size = new System.Drawing.Size(75, 23); + this.ethAddBtn.TabIndex = 6; + this.ethAddBtn.Text = "Add"; + this.ethAddBtn.UseVisualStyleBackColor = true; + // + // ethLstBox + // + this.ethLstBox.FormattingEnabled = true; + this.ethLstBox.Location = new System.Drawing.Point(13, 37); + this.ethLstBox.Name = "ethLstBox"; + this.ethLstBox.Size = new System.Drawing.Size(164, 56); + this.ethLstBox.TabIndex = 5; + // + // ethLabel1 + // + this.ethLabel1.AutoSize = true; + this.ethLabel1.Location = new System.Drawing.Point(10, 21); + this.ethLabel1.Name = "ethLabel1"; + this.ethLabel1.Size = new System.Drawing.Size(100, 13); + this.ethLabel1.TabIndex = 4; + this.ethLabel1.Text = "Available Net Cards"; // // tabPage6 // @@ -540,12 +936,91 @@ // // generalGrpBox // + this.generalGrpBox.Controls.Add(this.generalSetClockHost); + this.generalGrpBox.Controls.Add(this.generalWorkDirBrows); + this.generalGrpBox.Controls.Add(this.generalWorkDir); + this.generalGrpBox.Controls.Add(this.generalLabel3); + this.generalGrpBox.Controls.Add(this.generalMachine); + this.generalGrpBox.Controls.Add(this.generalLabel2); + this.generalGrpBox.Controls.Add(this.generalLabel1); + this.generalGrpBox.Controls.Add(this.generalVMName); this.generalGrpBox.Location = new System.Drawing.Point(3, 3); this.generalGrpBox.Name = "generalGrpBox"; this.generalGrpBox.Size = new System.Drawing.Size(283, 364); this.generalGrpBox.TabIndex = 0; this.generalGrpBox.TabStop = false; this.generalGrpBox.Text = "General"; + // + // generalSetClockHost + // + this.generalSetClockHost.AutoSize = true; + this.generalSetClockHost.Location = new System.Drawing.Point(17, 201); + this.generalSetClockHost.Name = "generalSetClockHost"; + this.generalSetClockHost.Size = new System.Drawing.Size(128, 17); + this.generalSetClockHost.TabIndex = 7; + this.generalSetClockHost.Text = "Set clock to host time"; + this.generalSetClockHost.UseVisualStyleBackColor = true; + // + // generalWorkDirBrows + // + this.generalWorkDirBrows.Location = new System.Drawing.Point(199, 148); + this.generalWorkDirBrows.Name = "generalWorkDirBrows"; + this.generalWorkDirBrows.Size = new System.Drawing.Size(75, 23); + this.generalWorkDirBrows.TabIndex = 6; + this.generalWorkDirBrows.Text = "Browse..."; + this.generalWorkDirBrows.UseVisualStyleBackColor = true; + // + // generalWorkDir + // + this.generalWorkDir.Location = new System.Drawing.Point(9, 150); + this.generalWorkDir.Name = "generalWorkDir"; + this.generalWorkDir.Size = new System.Drawing.Size(184, 20); + this.generalWorkDir.TabIndex = 5; + // + // generalLabel3 + // + this.generalLabel3.AutoSize = true; + this.generalLabel3.Location = new System.Drawing.Point(6, 134); + this.generalLabel3.Name = "generalLabel3"; + this.generalLabel3.Size = new System.Drawing.Size(90, 13); + this.generalLabel3.TabIndex = 4; + this.generalLabel3.Text = "Working directory"; + // + // generalMachine + // + this.generalMachine.FormattingEnabled = true; + this.generalMachine.Items.AddRange(new object[] { + "Standard PC (default)", + "ISA-only PC"}); + this.generalMachine.Location = new System.Drawing.Point(6, 93); + this.generalMachine.Name = "generalMachine"; + this.generalMachine.Size = new System.Drawing.Size(268, 21); + this.generalMachine.TabIndex = 3; + // + // generalLabel2 + // + this.generalLabel2.AutoSize = true; + this.generalLabel2.Location = new System.Drawing.Point(3, 77); + this.generalLabel2.Name = "generalLabel2"; + this.generalLabel2.Size = new System.Drawing.Size(48, 13); + this.generalLabel2.TabIndex = 2; + this.generalLabel2.Text = "Machine"; + // + // generalLabel1 + // + this.generalLabel1.AutoSize = true; + this.generalLabel1.Location = new System.Drawing.Point(6, 26); + this.generalLabel1.Name = "generalLabel1"; + this.generalLabel1.Size = new System.Drawing.Size(109, 13); + this.generalLabel1.TabIndex = 1; + this.generalLabel1.Text = "Virtual Machine name"; + // + // generalVMName + // + this.generalVMName.Location = new System.Drawing.Point(6, 42); + this.generalVMName.Name = "generalVMName"; + this.generalVMName.Size = new System.Drawing.Size(268, 20); + this.generalVMName.TabIndex = 0; // // tabPage9 // @@ -653,292 +1128,50 @@ this.optionsSelLstBox.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.listboxSelection_DrawItem); this.optionsSelLstBox.SelectedIndexChanged += new System.EventHandler(this.listboxSelection_SelectedIndexChanged); // - // memoryLabel - // - this.memoryLabel.AutoSize = true; - this.memoryLabel.Location = new System.Drawing.Point(6, 32); - this.memoryLabel.Name = "memoryLabel"; - this.memoryLabel.Size = new System.Drawing.Size(229, 26); - this.memoryLabel.TabIndex = 2; - this.memoryLabel.Text = "Select how much virtual memory you would like\r\nto make available for this virtual" + - " machine"; - // - // cdromEnableChkBox - // - this.cdromEnableChkBox.AutoSize = true; - this.cdromEnableChkBox.Location = new System.Drawing.Point(15, 51); - this.cdromEnableChkBox.Name = "cdromEnableChkBox"; - this.cdromEnableChkBox.Size = new System.Drawing.Size(105, 17); - this.cdromEnableChkBox.TabIndex = 0; - this.cdromEnableChkBox.Text = "Enable CD-ROM"; - this.cdromEnableChkBox.UseVisualStyleBackColor = true; - // - // cdromLabel - // - this.cdromLabel.AutoSize = true; - this.cdromLabel.Location = new System.Drawing.Point(7, 26); - this.cdromLabel.Name = "cdromLabel"; - this.cdromLabel.Size = new System.Drawing.Size(43, 13); - this.cdromLabel.TabIndex = 1; - this.cdromLabel.Text = "Status :"; - // - // cdromConStatusLbl - // - this.cdromConStatusLbl.AutoSize = true; - this.cdromConStatusLbl.Location = new System.Drawing.Point(56, 26); - this.cdromConStatusLbl.Name = "cdromConStatusLbl"; - this.cdromConStatusLbl.Size = new System.Drawing.Size(79, 13); - this.cdromConStatusLbl.TabIndex = 2; - this.cdromConStatusLbl.Text = "Not Connected"; - // - // cdromConGrpBox - // - this.cdromConGrpBox.Controls.Add(this.cdromIsoBrwse); - this.cdromConGrpBox.Controls.Add(this.cdromIsoTxtBox); - this.cdromConGrpBox.Controls.Add(this.cdromPhyDrvCombo); - this.cdromConGrpBox.Controls.Add(this.cdromIsoRadio); - this.cdromConGrpBox.Controls.Add(this.cdromPhyDrvRadio); - this.cdromConGrpBox.Location = new System.Drawing.Point(6, 96); - this.cdromConGrpBox.Name = "cdromConGrpBox"; - this.cdromConGrpBox.Size = new System.Drawing.Size(268, 192); - this.cdromConGrpBox.TabIndex = 3; - this.cdromConGrpBox.TabStop = false; - this.cdromConGrpBox.Text = "Connection"; - // - // cdromPhyDrvRadio - // - this.cdromPhyDrvRadio.AutoSize = true; - this.cdromPhyDrvRadio.Location = new System.Drawing.Point(6, 28); - this.cdromPhyDrvRadio.Name = "cdromPhyDrvRadio"; - this.cdromPhyDrvRadio.Size = new System.Drawing.Size(111, 17); - this.cdromPhyDrvRadio.TabIndex = 0; - this.cdromPhyDrvRadio.TabStop = true; - this.cdromPhyDrvRadio.Text = "Use physical drive"; - this.cdromPhyDrvRadio.UseVisualStyleBackColor = true; - // - // cdromIsoRadio - // - this.cdromIsoRadio.AutoSize = true; - this.cdromIsoRadio.Location = new System.Drawing.Point(6, 107); - this.cdromIsoRadio.Name = "cdromIsoRadio"; - this.cdromIsoRadio.Size = new System.Drawing.Size(96, 17); - this.cdromIsoRadio.TabIndex = 1; - this.cdromIsoRadio.TabStop = true; - this.cdromIsoRadio.Text = "Use ISO image"; - this.cdromIsoRadio.UseVisualStyleBackColor = true; - // - // cdromPhyDrvCombo - // - this.cdromPhyDrvCombo.FormattingEnabled = true; - this.cdromPhyDrvCombo.Location = new System.Drawing.Point(26, 51); - this.cdromPhyDrvCombo.Name = "cdromPhyDrvCombo"; - this.cdromPhyDrvCombo.Size = new System.Drawing.Size(121, 21); - this.cdromPhyDrvCombo.TabIndex = 2; - // - // cdromIsoTxtBox - // - this.cdromIsoTxtBox.Location = new System.Drawing.Point(26, 130); - this.cdromIsoTxtBox.Name = "cdromIsoTxtBox"; - this.cdromIsoTxtBox.Size = new System.Drawing.Size(162, 20); - this.cdromIsoTxtBox.TabIndex = 3; - // - // cdromIsoBrwse - // - this.cdromIsoBrwse.Location = new System.Drawing.Point(194, 128); - this.cdromIsoBrwse.Name = "cdromIsoBrwse"; - this.cdromIsoBrwse.Size = new System.Drawing.Size(68, 23); - this.cdromIsoBrwse.TabIndex = 4; - this.cdromIsoBrwse.Text = "Browse..."; - this.cdromIsoBrwse.UseVisualStyleBackColor = true; - // - // harddiskLstBox - // - this.harddiskLstBox.FormattingEnabled = true; - this.harddiskLstBox.Location = new System.Drawing.Point(13, 37); - this.harddiskLstBox.Name = "harddiskLstBox"; - this.harddiskLstBox.Size = new System.Drawing.Size(202, 56); - this.harddiskLstBox.TabIndex = 0; - // - // harddiskAddBtn - // - this.harddiskAddBtn.Location = new System.Drawing.Point(13, 99); - this.harddiskAddBtn.Name = "harddiskAddBtn"; - this.harddiskAddBtn.Size = new System.Drawing.Size(75, 23); - this.harddiskAddBtn.TabIndex = 1; - this.harddiskAddBtn.Text = "Add"; - this.harddiskAddBtn.UseVisualStyleBackColor = true; - // - // harddiskRemoveBtn - // - this.harddiskRemoveBtn.Location = new System.Drawing.Point(94, 99); - this.harddiskRemoveBtn.Name = "harddiskRemoveBtn"; - this.harddiskRemoveBtn.Size = new System.Drawing.Size(75, 23); - this.harddiskRemoveBtn.TabIndex = 2; - this.harddiskRemoveBtn.Text = "Remove"; - this.harddiskRemoveBtn.UseVisualStyleBackColor = true; - // - // harddiskLabel1 - // - this.harddiskLabel1.AutoSize = true; - this.harddiskLabel1.Location = new System.Drawing.Point(10, 21); - this.harddiskLabel1.Name = "harddiskLabel1"; - this.harddiskLabel1.Size = new System.Drawing.Size(101, 13); - this.harddiskLabel1.TabIndex = 3; - this.harddiskLabel1.Text = "Available hard disks"; - // - // harddiskDetailsGrpBox - // - this.harddiskDetailsGrpBox.Controls.Add(this.harddiskSizeLbl); - this.harddiskDetailsGrpBox.Controls.Add(this.harddiskLabel3); - this.harddiskDetailsGrpBox.Controls.Add(this.harddiskLabel2); - this.harddiskDetailsGrpBox.Controls.Add(this.harddiskFileNameTxtBox); - this.harddiskDetailsGrpBox.Location = new System.Drawing.Point(13, 147); - this.harddiskDetailsGrpBox.Name = "harddiskDetailsGrpBox"; - this.harddiskDetailsGrpBox.Size = new System.Drawing.Size(261, 96); - this.harddiskDetailsGrpBox.TabIndex = 4; - this.harddiskDetailsGrpBox.TabStop = false; - this.harddiskDetailsGrpBox.Text = "Details"; - // - // harddiskFileNameTxtBox - // - this.harddiskFileNameTxtBox.Location = new System.Drawing.Point(56, 26); - this.harddiskFileNameTxtBox.Name = "harddiskFileNameTxtBox"; - this.harddiskFileNameTxtBox.ReadOnly = true; - this.harddiskFileNameTxtBox.Size = new System.Drawing.Size(199, 20); - this.harddiskFileNameTxtBox.TabIndex = 0; - // - // harddiskLabel2 - // - this.harddiskLabel2.AutoSize = true; - this.harddiskLabel2.Location = new System.Drawing.Point(6, 29); - this.harddiskLabel2.Name = "harddiskLabel2"; - this.harddiskLabel2.Size = new System.Drawing.Size(44, 13); - this.harddiskLabel2.TabIndex = 1; - this.harddiskLabel2.Text = "Disk file"; - // - // harddiskLabel3 - // - this.harddiskLabel3.AutoSize = true; - this.harddiskLabel3.Location = new System.Drawing.Point(6, 66); - this.harddiskLabel3.Name = "harddiskLabel3"; - this.harddiskLabel3.Size = new System.Drawing.Size(27, 13); - this.harddiskLabel3.TabIndex = 2; - this.harddiskLabel3.Text = "Size"; - // - // harddiskSizeLbl - // - this.harddiskSizeLbl.AutoSize = true; - this.harddiskSizeLbl.Location = new System.Drawing.Point(53, 66); - this.harddiskSizeLbl.Name = "harddiskSizeLbl"; - this.harddiskSizeLbl.Size = new System.Drawing.Size(37, 13); - this.harddiskSizeLbl.TabIndex = 3; - this.harddiskSizeLbl.Text = "<size>"; - // - // harddiskLabel4 - // - this.harddiskLabel4.AutoSize = true; - this.harddiskLabel4.Location = new System.Drawing.Point(18, 275); - this.harddiskLabel4.Name = "harddiskLabel4"; - this.harddiskLabel4.Size = new System.Drawing.Size(105, 13); - this.harddiskLabel4.TabIndex = 5; - this.harddiskLabel4.Text = "Free space available"; - // - // harddiskFreeSpcLbl - // - this.harddiskFreeSpcLbl.AutoSize = true; - this.harddiskFreeSpcLbl.Location = new System.Drawing.Point(129, 275); - this.harddiskFreeSpcLbl.Name = "harddiskFreeSpcLbl"; - this.harddiskFreeSpcLbl.Size = new System.Drawing.Size(69, 13); - this.harddiskFreeSpcLbl.TabIndex = 6; - this.harddiskFreeSpcLbl.Text = "<free space>"; - // - // floppyConnGrpBox - // - this.floppyConnGrpBox.Controls.Add(this.floppyImgBrwse); - this.floppyConnGrpBox.Controls.Add(this.floppyImgTxtBox); - this.floppyConnGrpBox.Controls.Add(this.floppyPhyDrvCombo); - this.floppyConnGrpBox.Controls.Add(this.floppyImgRadio); - this.floppyConnGrpBox.Controls.Add(this.floppyPhyDrvRadio); - this.floppyConnGrpBox.Location = new System.Drawing.Point(6, 96); - this.floppyConnGrpBox.Name = "floppyConnGrpBox"; - this.floppyConnGrpBox.Size = new System.Drawing.Size(268, 192); - this.floppyConnGrpBox.TabIndex = 7; - this.floppyConnGrpBox.TabStop = false; - this.floppyConnGrpBox.Text = "Connection"; - // - // floppyImgBrwse - // - this.floppyImgBrwse.Location = new System.Drawing.Point(194, 128); - this.floppyImgBrwse.Name = "floppyImgBrwse"; - this.floppyImgBrwse.Size = new System.Drawing.Size(68, 23); - this.floppyImgBrwse.TabIndex = 4; - this.floppyImgBrwse.Text = "Browse..."; - this.floppyImgBrwse.UseVisualStyleBackColor = true; - // - // floppyImgTxtBox - // - this.floppyImgTxtBox.Location = new System.Drawing.Point(26, 130); - this.floppyImgTxtBox.Name = "floppyImgTxtBox"; - this.floppyImgTxtBox.Size = new System.Drawing.Size(162, 20); - this.floppyImgTxtBox.TabIndex = 3; - // - // floppyPhyDrvCombo - // - this.floppyPhyDrvCombo.FormattingEnabled = true; - this.floppyPhyDrvCombo.Location = new System.Drawing.Point(26, 51); - this.floppyPhyDrvCombo.Name = "floppyPhyDrvCombo"; - this.floppyPhyDrvCombo.Size = new System.Drawing.Size(121, 21); - this.floppyPhyDrvCombo.TabIndex = 2; - // - // floppyImgRadio - // - this.floppyImgRadio.AutoSize = true; - this.floppyImgRadio.Location = new System.Drawing.Point(6, 107); - this.floppyImgRadio.Name = "floppyImgRadio"; - this.floppyImgRadio.Size = new System.Drawing.Size(106, 17); - this.floppyImgRadio.TabIndex = 1; - this.floppyImgRadio.TabStop = true; - this.floppyImgRadio.Text = "Use floppy image"; - this.floppyImgRadio.UseVisualStyleBackColor = true; - // - // floppyPhyDrvRadio - // - this.floppyPhyDrvRadio.AutoSize = true; - this.floppyPhyDrvRadio.Location = new System.Drawing.Point(6, 28); - this.floppyPhyDrvRadio.Name = "floppyPhyDrvRadio"; - this.floppyPhyDrvRadio.Size = new System.Drawing.Size(111, 17); - this.floppyPhyDrvRadio.TabIndex = 0; - this.floppyPhyDrvRadio.TabStop = true; - this.floppyPhyDrvRadio.Text = "Use physical drive"; - this.floppyPhyDrvRadio.UseVisualStyleBackColor = true; - // - // floppyConnLbl - // - this.floppyConnLbl.AutoSize = true; - this.floppyConnLbl.Location = new System.Drawing.Point(56, 26); - this.floppyConnLbl.Name = "floppyConnLbl"; - this.floppyConnLbl.Size = new System.Drawing.Size(70, 13); - this.floppyConnLbl.TabIndex = 6; - this.floppyConnLbl.Text = "<connected>"; - // - // floppyLabel - // - this.floppyLabel.AutoSize = true; - this.floppyLabel.Location = new System.Drawing.Point(7, 26); - this.floppyLabel.Name = "floppyLabel"; - this.floppyLabel.Size = new System.Drawing.Size(43, 13); - this.floppyLabel.TabIndex = 5; - this.floppyLabel.Text = "Status :"; - // - // floppyEnableChkBox - // - this.floppyEnableChkBox.AutoSize = true; - this.floppyEnableChkBox.Location = new System.Drawing.Point(15, 51); - this.floppyEnableChkBox.Name = "floppyEnableChkBox"; - this.floppyEnableChkBox.Size = new System.Drawing.Size(90, 17); - this.floppyEnableChkBox.TabIndex = 4; - this.floppyEnableChkBox.Text = "Enable floppy"; - this.floppyEnableChkBox.UseVisualStyleBackColor = true; + // ethLabel3 + // + this.ethLabel3.AutoSize = true; + this.ethLabel3.Location = new System.Drawing.Point(6, 53); + this.ethLabel3.Name = "ethLabel3"; + this.ethLabel3.Size = new System.Drawing.Size(74, 13); + this.ethLabel3.TabIndex = 4; + this.ethLabel3.Text = "Network Type"; + // + // ethLabel4 + // + this.ethLabel4.AutoSize = true; + this.ethLabel4.Location = new System.Drawing.Point(6, 79); + this.ethLabel4.Name = "ethLabel4"; + this.ethLabel4.Size = new System.Drawing.Size(69, 13); + this.ethLabel4.TabIndex = 6; + this.ethLabel4.Text = "Mac Address"; + // + // ethVlanTxtBox + // + this.ethVlanTxtBox.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.ethVlanTxtBox.Enabled = false; + this.ethVlanTxtBox.Location = new System.Drawing.Point(89, 24); + this.ethVlanTxtBox.Name = "ethVlanTxtBox"; + this.ethVlanTxtBox.Size = new System.Drawing.Size(100, 13); + this.ethVlanTxtBox.TabIndex = 8; + // + // ethNetTypeTxtBox + // + this.ethNetTypeTxtBox.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.ethNetTypeTxtBox.Enabled = false; + this.ethNetTypeTxtBox.Location = new System.Drawing.Point(89, 50); + this.ethNetTypeTxtBox.Name = "ethNetTypeTxtBox"; + this.ethNetTypeTxtBox.Size = new System.Drawing.Size(100, 13); + this.ethNetTypeTxtBox.TabIndex = 9; + // + // ethMacAddrTxtBox + // + this.ethMacAddrTxtBox.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.ethMacAddrTxtBox.Enabled = false; + this.ethMacAddrTxtBox.Location = new System.Drawing.Point(89, 76); + this.ethMacAddrTxtBox.Name = "ethMacAddrTxtBox"; + this.ethMacAddrTxtBox.Size = new System.Drawing.Size(100, 13); + this.ethMacAddrTxtBox.TabIndex = 10; // // SettingsForm // @@ -966,16 +1199,26 @@ this.cdromPanel.ResumeLayout(false); this.cdromGrpBox.ResumeLayout(false); this.cdromGrpBox.PerformLayout(); + this.cdromConGrpBox.ResumeLayout(false); + this.cdromConGrpBox.PerformLayout(); this.tabPage3.ResumeLayout(false); this.harddiskPanel.ResumeLayout(false); this.harddiskGrpBox.ResumeLayout(false); this.harddiskGrpBox.PerformLayout(); + this.harddiskDetailsGrpBox.ResumeLayout(false); + this.harddiskDetailsGrpBox.PerformLayout(); this.tabPage4.ResumeLayout(false); this.networkPanel.ResumeLayout(false); this.floppyGrpBox.ResumeLayout(false); this.floppyGrpBox.PerformLayout(); + this.floppyConnGrpBox.ResumeLayout(false); + this.floppyConnGrpBox.PerformLayout(); this.tabPage5.ResumeLayout(false); this.ethernetPanel.ResumeLayout(false); + this.ethernetGrpBox.ResumeLayout(false); + this.ethernetGrpBox.PerformLayout(); + this.ethDetailsGrpBox.ResumeLayout(false); + this.ethDetailsGrpBox.PerformLayout(); this.tabPage6.ResumeLayout(false); this.audioPanel.ResumeLayout(false); this.tabPage7.ResumeLayout(false); @@ -987,18 +1230,14 @@ this.optionsTempDesignSheetTab.ResumeLayout(false); this.tabPage8.ResumeLayout(false); this.generalPanel.ResumeLayout(false); + this.generalGrpBox.ResumeLayout(false); + this.generalGrpBox.PerformLayout(); this.tabPage9.ResumeLayout(false); this.powerPanel.ResumeLayout(false); this.tabPage10.ResumeLayout(false); this.snapshotsPanel.ResumeLayout(false); this.tabPage11.ResumeLayout(false); this.advancedPanel.ResumeLayout(false); - this.cdromConGrpBox.ResumeLayout(false); - this.cdromConGrpBox.PerformLayout(); - this.harddiskDetailsGrpBox.ResumeLayout(false); - this.harddiskDetailsGrpBox.PerformLayout(); - this.floppyConnGrpBox.ResumeLayout(false); - this.floppyConnGrpBox.PerformLayout(); this.ResumeLayout(false); } @@ -1065,7 +1304,7 @@ private System.Windows.Forms.Button cdromIsoBrwse; private System.Windows.Forms.TextBox cdromIsoTxtBox; private System.Windows.Forms.Label harddiskLabel1; - private System.Windows.Forms.Button harddiskRemoveBtn; + private System.Windows.Forms.Button harddiskEditBtn; private System.Windows.Forms.Button harddiskAddBtn; private System.Windows.Forms.ListBox harddiskLstBox; private System.Windows.Forms.Label harddiskLabel4; @@ -1084,5 +1323,26 @@ private System.Windows.Forms.Label floppyConnLbl; private System.Windows.Forms.Label floppyLabel; private System.Windows.Forms.CheckBox floppyEnableChkBox; + private System.Windows.Forms.Label generalLabel2; + private System.Windows.Forms.Label generalLabel1; + private System.Windows.Forms.TextBox generalVMName; + private System.Windows.Forms.CheckBox generalSetClockHost; + private System.Windows.Forms.Button generalWorkDirBrows; + private System.Windows.Forms.TextBox generalWorkDir; + private System.Windows.Forms.Label generalLabel3; + private System.Windows.Forms.ComboBox generalMachine; + private System.Windows.Forms.GroupBox ethDetailsGrpBox; + private System.Windows.Forms.Label ethLabel2; + private System.Windows.Forms.Button ethEditBtn; + private System.Windows.Forms.Button ethAddBtn; + private System.Windows.Forms.ListBox ethLstBox; + private System.Windows.Forms.Label ethLabel1; + private System.Windows.Forms.Button ethRemoveBtn; + private System.Windows.Forms.Button harddiskRemoveBtn; + private System.Windows.Forms.Label ethLabel3; + private System.Windows.Forms.Label ethLabel4; + private System.Windows.Forms.TextBox ethMacAddrTxtBox; + private System.Windows.Forms.TextBox ethNetTypeTxtBox; + private System.Windows.Forms.TextBox ethVlanTxtBox; } } Modified: trunk/tools/RosTE/GUI/SettingsForm.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/SettingsForm.cs?re… ============================================================================== --- trunk/tools/RosTE/GUI/SettingsForm.cs (original) +++ trunk/tools/RosTE/GUI/SettingsForm.cs Fri May 25 16:31:14 2007 @@ -107,5 +107,31 @@ { Close(); } + + private void ethEditBtn_Click(object sender, EventArgs e) + { + if (ethEditBtn.Text == "Edit") + { + ethVlanTxtBox.BorderStyle = BorderStyle.Fixed3D; + ethVlanTxtBox.Enabled = true; + ethNetTypeTxtBox.BorderStyle = BorderStyle.Fixed3D; + ethNetTypeTxtBox.Enabled = true; + ethMacAddrTxtBox.BorderStyle = BorderStyle.Fixed3D; + ethMacAddrTxtBox.Enabled = true; + ethEditBtn.Text = "OK"; + } + else if (ethEditBtn.Text == "OK") + { + ethVlanTxtBox.BorderStyle = BorderStyle.None; + ethVlanTxtBox.Enabled = false; + ethNetTypeTxtBox.BorderStyle = BorderStyle.None; + ethNetTypeTxtBox.Enabled = false; + ethMacAddrTxtBox.BorderStyle = BorderStyle.None; + ethMacAddrTxtBox.Enabled = false; + ethEditBtn.Text = "Edit"; + + // set values + } + } } }

1 0

[greatlrd] 26889: switch to dxsdk 2 of 2 step This commit fix the build again
by greatlrd＠svn.reactos.org 25 May '07

25 May '07

Author: greatlrd Date: Fri May 25 15:19:11 2007 New Revision: 26889 URL: http://svn.reactos.org/svn/reactos?rev=26889&view=rev Log: switch to dxsdk 2 of 2 step This commit fix the build again Modified: trunk/reactos/ReactOS.rbuild Modified: trunk/reactos/ReactOS.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS.rbuild?rev=26889&r… ============================================================================== --- trunk/reactos/ReactOS.rbuild (original) +++ trunk/reactos/ReactOS.rbuild Fri May 25 15:19:11 2007 @@ -62,6 +62,7 @@ <include>.</include> <include>include</include> <include>include/psdk</include> + <include>include/dxsdk</include> <include>include/crt</include> <include>include/ddk</include> <include>include/GL</include>

1 0

[greatlrd] 26888: switch to dxsdk 1 of 2 step This commit break the build
by greatlrd＠svn.reactos.org 25 May '07

25 May '07

Author: greatlrd Date: Fri May 25 15:18:13 2007 New Revision: 26888 URL: http://svn.reactos.org/svn/reactos?rev=26888&view=rev Log: switch to dxsdk 1 of 2 step This commit break the build Removed: trunk/reactos/include/psdk/DShow.h trunk/reactos/include/psdk/activecf.h trunk/reactos/include/psdk/amaudio.h trunk/reactos/include/psdk/amparse.h trunk/reactos/include/psdk/amvideo.h trunk/reactos/include/psdk/audevcod.h trunk/reactos/include/psdk/d3d8caps.h trunk/reactos/include/psdk/d3d9caps.h trunk/reactos/include/psdk/d3dcaps.h trunk/reactos/include/psdk/d3dvec.inl trunk/reactos/include/psdk/ddraw.h trunk/reactos/include/psdk/dv.h trunk/reactos/include/psdk/dxdiag.h trunk/reactos/include/psdk/dxerr8.h trunk/reactos/include/psdk/dxerr9.h trunk/reactos/include/psdk/dxsdkver.h trunk/reactos/include/psdk/errors.h trunk/reactos/include/psdk/evcode.h trunk/reactos/include/psdk/ksguid.h trunk/reactos/include/psdk/ksuuids.h trunk/reactos/include/psdk/mediaerr.h trunk/reactos/include/psdk/uuids.h [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/include/psdk/DShow.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/DShow.h?rev=2… Removed: trunk/reactos/include/psdk/activecf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/activecf.h?re… Removed: trunk/reactos/include/psdk/amaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/amaudio.h?rev… Removed: trunk/reactos/include/psdk/amparse.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/amparse.h?rev… Removed: trunk/reactos/include/psdk/amvideo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/amvideo.h?rev… Removed: trunk/reactos/include/psdk/audevcod.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/audevcod.h?re… Removed: trunk/reactos/include/psdk/d3d8caps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d8caps.h?re… Removed: trunk/reactos/include/psdk/d3d9caps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3d9caps.h?re… Removed: trunk/reactos/include/psdk/d3dcaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3dcaps.h?rev… Removed: trunk/reactos/include/psdk/d3dvec.inl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/d3dvec.inl?re… Removed: trunk/reactos/include/psdk/ddraw.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ddraw.h?rev=2… Removed: trunk/reactos/include/psdk/dv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dv.h?rev=2688… Removed: trunk/reactos/include/psdk/dxdiag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dxdiag.h?rev=… Removed: trunk/reactos/include/psdk/dxerr8.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dxerr8.h?rev=… Removed: trunk/reactos/include/psdk/dxerr9.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dxerr9.h?rev=… Removed: trunk/reactos/include/psdk/dxsdkver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/dxsdkver.h?re… Removed: trunk/reactos/include/psdk/errors.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/errors.h?rev=… Removed: trunk/reactos/include/psdk/evcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/evcode.h?rev=… Removed: trunk/reactos/include/psdk/ksguid.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksguid.h?rev=… Removed: trunk/reactos/include/psdk/ksuuids.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksuuids.h?rev… Removed: trunk/reactos/include/psdk/mediaerr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/mediaerr.h?re… Removed: trunk/reactos/include/psdk/uuids.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/uuids.h?rev=2…

1 0

[greatlrd] 26887: fixing two typo
by greatlrd＠svn.reactos.org 25 May '07

25 May '07

Author: greatlrd Date: Fri May 25 14:51:26 2007 New Revision: 26887 URL: http://svn.reactos.org/svn/reactos?rev=26887&view=rev Log: fixing two typo Modified: trunk/reactos/include/dxsdk/d3dcaps.h trunk/reactos/include/dxsdk/dxdiag.h Modified: trunk/reactos/include/dxsdk/d3dcaps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/d3dcaps.h?re… ============================================================================== --- trunk/reactos/include/dxsdk/d3dcaps.h (original) +++ trunk/reactos/include/dxsdk/d3dcaps.h Fri May 25 14:51:26 2007 @@ -278,7 +278,7 @@ typedef struct _D3DDeviceDesc { DWORD dwSize; - DWORD dwFlags + DWORD dwFlags; D3DCOLORMODEL dcmColorModel; DWORD dwDevCaps; D3DTRANSFORMCAPS dtcTransformCaps; Modified: trunk/reactos/include/dxsdk/dxdiag.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/dxdiag.h?rev… ============================================================================== --- trunk/reactos/include/dxsdk/dxdiag.h (original) +++ trunk/reactos/include/dxsdk/dxdiag.h Fri May 25 14:51:26 2007 @@ -14,17 +14,15 @@ DEFINE_GUID(IID_IDxDiagProvider, 0x9C6B4CB0, 0x23F8, 0x49CC, 0xA3, 0xED, 0x45, 0xA5, 0x50, 0x00, 0xA6, 0xD2); DEFINE_GUID(IID_IDxDiagContainer, 0x7D0F462F, 0x4064, 0x4862, 0xBC, 0x7F, 0x93, 0x3E, 0x50, 0x58, 0xC1, 0x0F); -typedef struct IDxDiagProvider *LPDXDIAGPROVIDER, *PDXDIAGPROVIDER; -#undef INTERFACE -#define INTERFACE IDxDiagProvider -DECLARE_INTERFACE_(IDxDiagProvider,IUnknown) +typedef struct _DXDIAG_INIT_PARAMS { - STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID *ppvObj) PURE; - STDMETHOD_(ULONG,AddRef) (THIS) PURE; - STDMETHOD_(ULONG,Release) (THIS) PURE; - STDMETHOD(Initialize) (THIS_ DXDIAG_INIT_PARAMS* pParams) PURE; - STDMETHOD(GetRootContainer) (THIS_ IDxDiagContainer **ppInstance) PURE; -}; + DWORD dwSize; + DWORD dwDxDiagHeaderVersion; + BOOL bAllowWHQLChecks; + VOID* pReserved; +} DXDIAG_INIT_PARAMS; + + typedef struct IDxDiagContainer *LPDXDIAGCONTAINER, *PDXDIAGCONTAINER; #undef INTERFACE @@ -43,13 +41,17 @@ STDMETHOD(GetProp) (THIS_ LPCWSTR pwszPropName, VARIANT *pvarProp) PURE; }; -typedef struct _DXDIAG_INIT_PARAMS + typedef struct IDxDiagProvider *LPDXDIAGPROVIDER, *PDXDIAGPROVIDER; +#undef INTERFACE +#define INTERFACE IDxDiagProvider +DECLARE_INTERFACE_(IDxDiagProvider,IUnknown) { - DWORD dwSize; - DWORD dwDxDiagHeaderVersion; - BOOL bAllowWHQLChecks; - VOID* pReserved; -} DXDIAG_INIT_PARAMS; + STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID *ppvObj) PURE; + STDMETHOD_(ULONG,AddRef) (THIS) PURE; + STDMETHOD_(ULONG,Release) (THIS) PURE; + STDMETHOD(Initialize) (THIS_ DXDIAG_INIT_PARAMS* pParams) PURE; + STDMETHOD(GetRootContainer) (THIS_ IDxDiagContainer **ppInstance) PURE; +}; #define DXDIAG_E_INSUFFICIENT_BUFFER ((HRESULT)0x8007007AL) #if !defined(__cplusplus) || defined(CINTERFACE)

1 0

[greatlrd] 26886: remove a dprint that is not lonnger need it
by greatlrd＠svn.reactos.org 25 May '07

25 May '07

Author: greatlrd Date: Fri May 25 14:07:18 2007 New Revision: 26886 URL: http://svn.reactos.org/svn/reactos?rev=26886&view=rev Log: remove a dprint that is not lonnger need it Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Fri May 25 14:07:18 2007 @@ -80,7 +80,6 @@ */ if (pDirectDraw->DrvGetDirectDrawInfo) { - DPRINT1("if u are using vmware driver and see this msg, please repot this\n"); success = pDirectDraw->DrvGetDirectDrawInfo( pDirectDraw->Global.dhpdev, &HalInfo, &pDirectDraw->dwNumHeaps,

1 0

[greatlrd] 26885: Wrote one new header this morning compatible with dxsdk 2004 dec release.
by greatlrd＠svn.reactos.org 25 May '07

25 May '07

Author: greatlrd Date: Fri May 25 14:02:08 2007 New Revision: 26885 URL: http://svn.reactos.org/svn/reactos?rev=26885&view=rev Log: Wrote one new header this morning compatible with dxsdk 2004 dec release. Added: trunk/reactos/include/dxsdk/evcode.h (with props) Added: trunk/reactos/include/dxsdk/evcode.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/dxsdk/evcode.h?rev… ============================================================================== --- trunk/reactos/include/dxsdk/evcode.h (added) +++ trunk/reactos/include/dxsdk/evcode.h Fri May 25 14:02:08 2007 @@ -1,0 +1,62 @@ + + +#ifndef AM_WMT_EVENT_DATA_DEFINED + #define AM_WMT_EVENT_DATA_DEFINED + typedef struct + { + HRESULT hrStatus; + void * pData; + } AM_WMT_EVENT_DATA; +#endif + +#define EC_ACTIVATE 0x13 +#define EC_BUFFERING_DATA 0x11 +#define EC_BUILT 0x300 +#define EC_CLOCK_CHANGED 0x0D +#define EC_CLOCK_UNSET 0x51 +#define EC_COMPLETE 0x01 +#define EC_CODECAPI_EVENT 0x57 +#define EC_DISPLAY_CHANGED 0x16 +#define EC_DEVICE_LOST 0x1f +#define EC_ERROR_STILLPLAYING 0x08 +#define EC_ERRORABORT 0x03 +#define EC_END_OF_SEGMENT 0x1C +#define EC_EXTDEVICE_MODE_CHANGE 0x31 +#define EC_FULLSCREEN_LOST 0x12 +#define EC_GRAPH_CHANGED 0x50 +#define EC_LENGTH_CHANGED 0x1E +#define EC_NOTIFY_WINDOW 0x19 +#define EC_NEED_RESTART 0x14 +#define EC_OLE_EVENT 0x18 +#define EC_PAUSED 0x0E +#define EC_PALETTE_CHANGED 0x09 +#define EC_PREPROCESS_COMPLETE 0x56 +#define EC_OPENING_FILE 0x10 +#define EC_QUALITY_CHANGE 0x0B +#define EC_REPAINT 0x05 +#define EC_STREAM_ERROR_STOPPED 0x06 +#define EC_STREAM_ERROR_STILLPLAYING 0x07 +#define EC_SYSTEMBASE 0x00 +#define EC_SHUTTING_DOWN 0x0C +#define EC_STEP_COMPLETE 0x24 +#define EC_STREAM_CONTROL_STOPPED 0x1A +#define EC_STREAM_CONTROL_STARTED 0x1B +#define EC_SEGMENT_STARTED 0x1D +#define EC_STARVATION 0x17 +#define EC_STATE_CHANGE 0x32 +#define EC_TIME 0x04 +#define EC_TIMECODE_AVAILABLE 0x30 +#define EC_USER 0x8000 +#define EC_USERABORT 0x02 +#define EC_UNBUILT 0x301 +#define EC_VMR_SURFACE_FLIPPED 0x54 +#define EC_VMR_RENDERDEVICE_SET 0x53 +#define EC_VMR_RECONNECTION_FAILED 0x55 +#define EC_VIDEO_SIZE_CHANGED 0x0A +#define EC_WINDOW_DESTROYED 0x15 +#define EC_WMT_EVENT_BASE 0x0251 +#define EC_WMT_INDEX_EVENT EC_WMT_EVENT_BASE +#define EC_WMT_EVENT EC_WMT_EVENT_BASE+1 +#define VMR_RENDER_DEVICE_OVERLAY 0x01 +#define VMR_RENDER_DEVICE_VIDMEM 0x02 +#define VMR_RENDER_DEVICE_SYSMEM 0x04 Propchange: trunk/reactos/include/dxsdk/evcode.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs