Ros-diffs June 2007

ros-diffs@reactos.org

21 participants
420 discussions

[greatlrd] 27064: patch from Pierre Schweitzer <heis_spiter at hotmail dot com> comment from Pierre Schweitzer In rev 27054, ekohl reduced access right when creating partition list (when opening "disk"). To work, usetup needs more rights (like reading contents). So this patch adds the missing right See issue #2293 for more details.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 8 01:33:17 2007 New Revision: 27064 URL: http://svn.reactos.org/svn/reactos?rev=27064&view=rev Log: patch from Pierre Schweitzer <heis_spiter at hotmail dot com> comment from Pierre Schweitzer In rev 27054, ekohl reduced access right when creating partition list (when opening "disk"). To work, usetup needs more rights (like reading contents). So this patch adds the missing right See issue #2293 for more details. Modified: trunk/reactos/base/setup/usetup/partlist.c Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… ============================================================================== --- trunk/reactos/base/setup/usetup/partlist.c (original) +++ trunk/reactos/base/setup/usetup/partlist.c Fri Jun 8 01:33:17 2007 @@ -949,7 +949,7 @@ NULL); Status = NtOpenFile (&FileHandle, - FILE_READ_ATTRIBUTES | SYNCHRONIZE, + FILE_READ_DATA | FILE_READ_ATTRIBUTES | SYNCHRONIZE, &ObjectAttributes, &Iosb, FILE_SHARE_READ,

17 years, 6 months

[greatlrd] 27065: revert my commit to this filem sorry breaking the build it is fix 1 / 2 next commit fixing the build again

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 8 02:09:47 2007 New Revision: 27065 URL: http://svn.reactos.org/svn/reactos?rev=27065&view=rev Log: revert my commit to this filem sorry breaking the build it is fix 1 / 2 next commit fixing the build again Modified: trunk/reactos/hal/hal/hal.def Modified: trunk/reactos/hal/hal/hal.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/hal/hal.def?rev=27065&… ============================================================================== --- trunk/reactos/hal/hal/hal.def (original) +++ trunk/reactos/hal/hal/hal.def Fri Jun 8 02:09:47 2007 @@ -47,7 +47,6 @@ HalInitSystem@8 HalInitializeProcessor@8 HalMakeBeep@4 -HalPutDmaAdapter@4 HalProcessorIdle@0 HalQueryDisplayParameters@16 HalQueryRealTimeClock@4

17 years, 6 months

[greatlrd] 27066: remove VideoPortPutDmaAdapter implement sorry breaking the build it is fix 2 / 2 next commit fixing the build again

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 8 02:12:10 2007 New Revision: 27066 URL: http://svn.reactos.org/svn/reactos?rev=27066&view=rev Log: remove VideoPortPutDmaAdapter implement sorry breaking the build it is fix 2 / 2 next commit fixing the build again Modified: trunk/reactos/drivers/video/videoprt/dma.c Modified: trunk/reactos/drivers/video/videoprt/dma.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/dma… ============================================================================== --- trunk/reactos/drivers/video/videoprt/dma.c (original) +++ trunk/reactos/drivers/video/videoprt/dma.c Fri Jun 8 02:12:10 2007 @@ -75,7 +75,7 @@ IN PVOID HwDeviceExtension, IN PVP_DMA_ADAPTER VpDmaAdapter) { - HalPutDmaAdapter((PADAPTER_OBJECT)VpDmaAdapter); + DPRINT1("unimplemented VideoPortPutDmaAdapter\n"); } /*

17 years, 6 months

[greatlrd] 27067: update with some new info

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 8 15:36:38 2007 New Revision: 27067 URL: http://svn.reactos.org/svn/reactos?rev=27067&view=rev Log: update with some new info Modified: trunk/reactos/dll/directx/ddraw/ddraw_structures.txt Modified: trunk/reactos/dll/directx/ddraw/ddraw_structures.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw_st… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw_structures.txt (original) +++ trunk/reactos/dll/directx/ddraw/ddraw_structures.txt Fri Jun 8 15:36:38 2007 @@ -325,3 +325,32 @@ LPVOID lpLink; DWORD dwIntRefCnt; } DDRAWI_DDCOLORCONTROL_INT, *LPDDRAWI_DDCOLORCONTROL_INT + + + +Undocument behvoirs + +typedef struct _DDHAL_GETAVAILDRIVERMEMORYDATA +{ + LPDDRAWI_DIRECTDRAW_GBL lpDD; + DDSCAPS DDSCaps; + DWORD dwTotal; + DWORD dwFree; + HRESULT ddRVal; + LPDDHAL_GETAVAILDRIVERMEMORY GetAvailDriverMemory; + DDSCAPSEX ddsCapsEx; + +} DDHAL_GETAVAILDRIVERMEMORYDATA; + + +DDHAL_GETAVAILDRIVERMEMORYDATA->GetAvailDriverMemory + in msdn say this is private use for ddraw, I found out + this will set current COM object pointer memory address + and send it down (the Ddraw->iface pointer being set) + + but the fun thing this member do not need be set + ReactOS ddraw will not copy this behoir. + + + +

17 years, 6 months

[greatlrd] 27068: my last commit was wrong, more testing show me diffen

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 8 15:43:16 2007 New Revision: 27068 URL: http://svn.reactos.org/svn/reactos?rev=27068&view=rev Log: my last commit was wrong, more testing show me diffen Modified: trunk/reactos/dll/directx/ddraw/ddraw_structures.txt Modified: trunk/reactos/dll/directx/ddraw/ddraw_structures.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/ddraw_st… ============================================================================== --- trunk/reactos/dll/directx/ddraw/ddraw_structures.txt (original) +++ trunk/reactos/dll/directx/ddraw/ddraw_structures.txt Fri Jun 8 15:43:16 2007 @@ -328,29 +328,8 @@ -Undocument behvoirs - -typedef struct _DDHAL_GETAVAILDRIVERMEMORYDATA -{ - LPDDRAWI_DIRECTDRAW_GBL lpDD; - DDSCAPS DDSCaps; - DWORD dwTotal; - DWORD dwFree; - HRESULT ddRVal; - LPDDHAL_GETAVAILDRIVERMEMORY GetAvailDriverMemory; - DDSCAPSEX ddsCapsEx; - -} DDHAL_GETAVAILDRIVERMEMORYDATA; - - -DDHAL_GETAVAILDRIVERMEMORYDATA->GetAvailDriverMemory - in msdn say this is private use for ddraw, I found out - this will set current COM object pointer memory address - and send it down (the Ddraw->iface pointer being set) - - but the fun thing this member do not need be set - ReactOS ddraw will not copy this behoir. - - - - + + + + +

17 years, 6 months

[janderwald] 27069: - check if window was created successfully...

by janderwald＠svn.reactos.org

Author: janderwald Date: Fri Jun 8 15:58:04 2007 New Revision: 27069 URL: http://svn.reactos.org/svn/reactos?rev=27069&view=rev Log: - check if window was created successfully... Modified: trunk/reactos/dll/win32/user32/windows/window.c Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c (original) +++ trunk/reactos/dll/win32/user32/windows/window.c Fri Jun 8 15:58:04 2007 @@ -317,7 +317,7 @@ DbgPrint("[window] NtUserCreateWindowEx() == %d\n", Handle); #endif - if ((dwStyle & WS_VISIBLE) && (dwExStyle & WS_EX_MDICHILD)) + if ((dwStyle & WS_VISIBLE) && (dwExStyle & WS_EX_MDICHILD) && Handle != (HWND)0) { SendMessageW(hWndParent, WM_MDIREFRESHMENU, 0, 0); SetWindowPos(Handle, HWND_TOP, 0, 0, 0, 0, SWP_SHOWWINDOW |

17 years, 6 months

[greatlrd] 27070: fixing a smaller bug extream hard to find, if we got two or more directdraw object we choice always the lates hDD not the object own hDD use This->lpLcl->lpGbl->hDD = This->lpLcl->hDD; to set the object own hDD before call any dxhal api

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Fri Jun 8 16:57:00 2007 New Revision: 27070 URL: http://svn.reactos.org/svn/reactos?rev=27070&view=rev Log: fixing a smaller bug extream hard to find, if we got two or more directdraw object we choice always the lates hDD not the object own hDD use This->lpLcl->lpGbl->hDD = This->lpLcl->hDD; to set the object own hDD before call any dxhal api Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_displaymode.c Fri Jun 8 16:57:00 2007 @@ -177,6 +177,7 @@ { // Update Interals BOOL ModeChanged; + This->lpLcl->lpGbl->hDD = This->lpLcl->hDD; DdReenableDirectDrawObject(This->lpLcl->lpGbl, &ModeChanged); StartDirectDraw((LPDIRECTDRAW)iface, 0, TRUE); } @@ -203,6 +204,8 @@ // Update Interals BOOL ModeChanged; + + This->lpLcl->lpGbl->hDD = This->lpLcl->hDD; DdReenableDirectDrawObject(This->lpLcl->lpGbl, &ModeChanged); StartDirectDraw((LPDIRECTDRAW)iface, 0, TRUE); } Modified: trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/ddraw/Ddraw/dd… ============================================================================== --- trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c (original) +++ trunk/reactos/dll/directx/ddraw/Ddraw/ddraw_main.c Fri Jun 8 16:57:00 2007 @@ -201,6 +201,8 @@ memdata.lpDD = This->lpLcl->lpGbl; memdata.ddRVal = DDERR_INVALIDPARAMS; memcpy(&memdata.DDSCaps, ddscaps, sizeof(DDSCAPS2)); + + This->lpLcl->lpGbl->hDD = This->lpLcl->hDD; if (This->lpLcl->lpDDCB->HALDDMiscellaneous.GetAvailDriverMemory(&memdata) == DDHAL_DRIVER_NOTHANDLED) {

17 years, 6 months

[dreimer] 27071: - Move "title" command under @echo off. - Fix a disturbing "File not Found" in Clean.cmd, thx to Colin Finck for help

by dreimer＠svn.reactos.org

Author: dreimer Date: Fri Jun 8 17:21:22 2007 New Revision: 27071 URL: http://svn.reactos.org/svn/reactos?rev=27071&view=rev Log: - Move "title" command under @echo off. - Fix a disturbing "File not Found" in Clean.cmd, thx to Colin Finck for help Modified: trunk/tools/RosBE-Windows/Root/Build-Multi.cmd trunk/tools/RosBE-Windows/Root/Build-Shared.cmd trunk/tools/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE-Windows/Root/RosBE.cmd Modified: trunk/tools/RosBE-Windows/Root/Build-Multi.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Mul… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Multi.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Multi.cmd Fri Jun 8 17:21:22 2007 @@ -1,10 +1,11 @@ -:: Copyright (c) Peter Ward. All rights reserved. -:: (Inspired by Dazzle from TinyKRNL) +:: Copyright (c) Peter Ward, Colin Finck and Daniel Reimer. All rights reserved. :: -:: Perform the build of ReactOS, but use the -j option -:: with the appropriate number for the number of CPUs -:: in the system. +:: Perform the build of ReactOS, but use the -j option +:: with the appropriate number for the number of CPUs +:: in the system. @echo off + +title Building... :: :: Clear variables before use. Modified: trunk/tools/RosBE-Windows/Root/Build-Shared.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build-Sha… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build-Shared.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build-Shared.cmd Fri Jun 8 17:21:22 2007 @@ -1,4 +1,10 @@ +:: Copyright (c) Peter Ward, Colin Finck and Daniel Reimer. All rights reserved. +:: :: Shared actions for "Build.cmd" and "Build-Multi.cmd" +:: +@echo off + +title Building... :: :: Check if config.template.rbuild is newer than config.rbuild, Modified: trunk/tools/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Build.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Build.cmd Fri Jun 8 17:21:22 2007 @@ -1,8 +1,9 @@ -:: Copyright (c) Peter Ward. All rights reserved. -:: (Inspired by Dazzle from TinyKRNL) +:: Copyright (c) Peter Ward, Colin Finck and Daniel Reimer. All rights reserved. :: :: Perform the build of ReactOS. @echo off + +title Building... :: :: Set the build command Modified: trunk/tools/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Clean.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Clean.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Clean.cmd Fri Jun 8 17:21:22 2007 @@ -2,19 +2,19 @@ :: :: Clean the ReactOS source directory. :: +@echo off + title Cleaning... - -@echo off if "%1" == "" ( :: - :: Check if we have something to clean, if so, clean it. + : Check if we have something to clean, if so, clean it. :: if exist "%_ROSSOURCEDIR%\obj-i386\." ( echo Cleaning ReactOS source directory... :: - :: Run ReactOS's make clean. + : Run ReactOS's make clean. :: if exist "%_ROSSOURCEDIR%\makefile.auto" ( if not "%CD%" == "%_ROSSOURCEDIR%" ( @@ -27,7 +27,7 @@ ) :: - :: Remove directories/makefile.auto created by the build. + : Remove directories/makefile.auto created by the build. :: if exist "%_ROSSOURCEDIR%\obj-i386\." ( rd /s /q "%_ROSSOURCEDIR%\obj-i386" 1> NUL 2> NUL @@ -43,7 +43,7 @@ ) :: - :: Now delete auto-generated/copied files not removed by make clean. + : Now delete auto-generated/copied files not removed by make clean. :: del /f "%_ROSSOURCEDIR%\media\inf\syssetup.inf" 1> NUL 2> NUL del /f "%_ROSSOURCEDIR%\include\roscfg.h" 1> NUL 2> NUL @@ -90,7 +90,7 @@ ) if "%1" == "logs" ( :: - :: Check if we have any logs to clean, if so, clean them. + : Check if we have any logs to clean, if so, clean them. :: if exist "%_ROSBELOGDIR%\*.txt" ( echo Cleaning build logs... Modified: trunk/tools/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/Help.cmd?… ============================================================================== --- trunk/tools/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE-Windows/Root/Help.cmd Fri Jun 8 17:21:22 2007 @@ -2,9 +2,9 @@ :: :: Display help for the commands included with the ReactOS Build Environment. :: +@echo off + title ReactOS Build Environment 0.3.6 - -@echo off if "%1" == "" ( echo. Modified: trunk/tools/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE-Windows/Root/RosBE.cmd… ============================================================================== --- trunk/tools/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE-Windows/Root/RosBE.cmd Fri Jun 8 17:21:22 2007 @@ -3,9 +3,9 @@ :: This script provides/sets up various build environments for :: ReactOS. Currently it provides GCC 4.1.3 build environments. :: +@echo off + title ReactOS Build Environment 0.3.6 - -@echo off if "%1" == "" ( color 0A

17 years, 6 months

[dgorbachev] 27072: Fix failed assertion in MM code.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Fri Jun 8 18:42:36 2007 New Revision: 27072 URL: http://svn.reactos.org/svn/reactos?rev=27072&view=rev Log: Fix failed assertion in MM code. Modified: trunk/reactos/ntoskrnl/lpc/connect.c Modified: trunk/reactos/ntoskrnl/lpc/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/lpc/connect.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/lpc/connect.c (original) +++ trunk/reactos/ntoskrnl/lpc/connect.c Fri Jun 8 18:42:36 2007 @@ -273,7 +273,7 @@ /* Map it */ Status = MmMapViewOfSection(SectionToMap, PsGetCurrentProcess(), - &Port->ClientSectionBase, + &ClientPort->ClientSectionBase, 0, 0, &SectionOffset,

17 years, 6 months

[gedmurphy] 27073: - Add some public properties to feed wizard data back to the main form - Add some experimental code for the introduction of an ADO data object

by gedmurphy＠svn.reactos.org

Author: gedmurphy Date: Fri Jun 8 19:06:47 2007 New Revision: 27073 URL: http://svn.reactos.org/svn/reactos?rev=27073&view=rev Log: - Add some public properties to feed wizard data back to the main form - Add some experimental code for the introduction of an ADO data object Modified: trunk/tools/RosTE/GUI/Config.xsd trunk/tools/RosTE/GUI/MainForm.Designer.cs trunk/tools/RosTE/GUI/MainForm.cs trunk/tools/RosTE/GUI/MainForm.resx trunk/tools/RosTE/GUI/NewVMWizard.cs trunk/tools/RosTE/GUI/VMDataBase.cs Modified: trunk/tools/RosTE/GUI/Config.xsd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/Config.xsd?rev=270… ============================================================================== --- trunk/tools/RosTE/GUI/Config.xsd (original) +++ trunk/tools/RosTE/GUI/Config.xsd Fri Jun 8 19:06:47 2007 @@ -4,8 +4,7 @@ <xs:complexType> <xs:sequence> <xs:element name="ID" type="xs:int" /> - <xs:element name="Name" type="xs:string" /> - <xs:element name="ConfPath" type="xs:string" /> + <xs:element name="Path" type="xs:string" /> </xs:sequence> </xs:complexType> </xs:element> 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 8 19:06:47 2007 @@ -25,7 +25,7 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.ListViewItem listViewItem2 = new System.Windows.Forms.ListViewItem("ReactOS", 0); + System.Windows.Forms.ListViewItem listViewItem1 = new System.Windows.Forms.ListViewItem("ReactOS", 0); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); this.ImageListView = new System.Windows.Forms.ListView(); this.columnName = new System.Windows.Forms.ColumnHeader(); @@ -75,7 +75,7 @@ this.columnDebug}); this.ImageListView.FullRowSelect = true; this.ImageListView.Items.AddRange(new System.Windows.Forms.ListViewItem[] { - listViewItem2}); + listViewItem1}); this.ImageListView.Location = new System.Drawing.Point(12, 52); this.ImageListView.Name = "ImageListView"; this.ImageListView.Size = new System.Drawing.Size(516, 237); @@ -154,7 +154,7 @@ 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.startNewVMWizard); + this.toolbarImageAdd.Click += new System.EventHandler(this.CreateNewVirtMach); // // toolbarImageDel // @@ -264,7 +264,7 @@ this.newToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.virtualMachineToolStripMenuItem}); this.newToolStripMenuItem.Name = "newToolStripMenuItem"; - this.newToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.newToolStripMenuItem.Size = new System.Drawing.Size(106, 22); this.newToolStripMenuItem.Text = "New"; // // virtualMachineToolStripMenuItem @@ -272,12 +272,12 @@ 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.startNewVMWizard); + this.virtualMachineToolStripMenuItem.Click += new System.EventHandler(this.CreateNewVirtMach); // // mainmenuFileExit // this.mainmenuFileExit.Name = "mainmenuFileExit"; - this.mainmenuFileExit.Size = new System.Drawing.Size(152, 22); + this.mainmenuFileExit.Size = new System.Drawing.Size(106, 22); this.mainmenuFileExit.Text = "Exit"; this.mainmenuFileExit.Click += new System.EventHandler(this.exitToolStripMenuItem_Click); // @@ -332,7 +332,8 @@ this.Name = "MainForm"; this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "ReactOS Test Environment"; + this.Text = "QEmu Manager"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); this.Load += new System.EventHandler(this.MainForm_Load); this.mainToolbar.ResumeLayout(false); this.mainToolbar.PerformLayout(); 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 8 19:06:47 2007 @@ -13,7 +13,8 @@ { public partial class MainForm : Form { - ArrayList VirtualMachines = new ArrayList(); + private ArrayList VirtualMachines; + private MainConfig mainConf; public MainForm() { @@ -28,7 +29,10 @@ private void MainForm_Load(object sender, EventArgs e) { // read config and load any existing vm's - MainConfig mainConf = new MainConfig(this); + mainConf = new MainConfig(); + + if (mainConf.LoadMainConfig()) + mainConf.LoadExistingImages(ImageListView); } private void MainMenuHelpAbout_Click(object sender, EventArgs e) @@ -50,11 +54,21 @@ Close(); } - private void startNewVMWizard(object sender, EventArgs e) + private void CreateNewVirtMach(object sender, EventArgs e) { NewVMWizard wizFrm = new NewVMWizard(); wizFrm.StartPosition = FormStartPosition.CenterScreen; - wizFrm.Show(); + if (wizFrm.ShowDialog() == DialogResult.OK) + { + mainConf.AddVirtMach(wizFrm.VMName); + mainConf.LoadNewImage(ImageListView); + } + + } + + private void MainForm_FormClosing(object sender, FormClosingEventArgs e) + { + mainConf.SaveMainConfig(); } } } 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 8 19:06:47 2007 @@ -184,12 +184,12 @@ <data name="toolbarImageAdd.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAPdJREFUOE/Fk8sK - gkAUhiu6EdEruakYwl2Nl1y48zV8rizovqo23UntPSrr5C8F3UMhEj5mcM75z3/GYyz2q4cxljEMI2Wa - ZiJKjTiXq1RmxaO/nrDXdT0bSkhSip7tbMhqNkhSagdRFHOhBFDdcW1qtizyk/ec8/xXAfQrCELSD07D - +lVAqUs7TdMKHwXQ54UTqldEdnS3TuBA1WTv5jyIexLDS8fd+NiERKyg023f0e113gvg0gbDPvUHvY+8 - dfBoczwZEWCVMj7ntcXXDh57QsJ8MQuQ1ZIXeg4gsFovAyILzOZTApEEMDyyyg8Ae/wbXwfpLwFngenf - oo2+XqwAAAAASUVORK5CYII= + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAPxJREFUOE9jYKAV + 8PDwYE9LS2Otr69nIscOxtDw4P8ubk5/gfQ/EDs+Pp6DJIPCIpz+3L5z6/+u3Tv/h0WE/Pbx8eEiyQCQ + 7Xfu3v6/e8+u/0DNv0JDQ3kIGgDyr729PQtQMRvI6TADIqLCfkZHR/PhNQDkTyj+B7Ldw8vt7917d8Au + iIwO/4MkD1aHYRhI8M7dW0B8+z9II4gG4QMH96Pgg4cO4DYAFGhHjh7+f/jIIbwYpwvQnXnm7On/IOzm + 4QKKTpgXsbsA3U8gDVeuXgbj8EjnPySnA5AB129cA2OyDbh85dJ/ECbLAFDiCY8M/Q3CIDYobxBMSAOi + AAAnZ998TXTN7AAAAABJRU5ErkJggg== </value> </data> <data name="toolbarImageDel.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> @@ -203,20 +203,20 @@ <data name="toolbarHelpContents.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAt9JREFUOE99U11I - U2EYXllBF3VjW91JklGUmCnCxDIVR6ZJPwTmzUglUwIvZi4IOlJJkNOVzW3KpEX+gEoX9qOEtSCVWeGN - WFAg2cxNZe78zbNzds7ezvuZkgs68HC+c77nfb/nfd7326KJe9ovlOZJ6cfKlJ27Tsc08j7c3qrZFkgQ - uJHtX74+u943MBYfQ74pitrReVLv7Tt8SPnk8Sg8z4EkSSCKItB0CD68GVF6D6YoyEHupiT9/f0JnWlp - /nfmG7Lk94Mw6QWGoSEUChIwTAjC42OwOj0NI9VXZeRizEaSzhPZ7wcqr0Sl2VlgqqqAzs0Fxv+LJGFZ - GpjAAtAFBcCYG0CYmoJeozGKMSSB/WJpui15vyzMzABjNAKTnw/BsjIYPFsSVaVGEIPnSqOhykpgi4uB - MZmAnxgHW1KS7DxfclzT2tTY7nnqjvGvXgKdkwMr5eXg0mljjqJCO/WI2o3oVNeuvbpYqLaWKOGGX4Pn - +YBiuXPLobFaLT+CwWXVqBVgA34YKimRnAW5D+OdthvyWt7mnZL55UXCDahlYSy6HwmHeWIWvols9dT4 - BESNuicIq3+MpQmXJMCWYasEIfz/BI1URBQjhIsGkwQoY2lpUXWbBYFj4cW1atFZVNgcr8BpyG8dNpki - oqqAZRlYWJhfKwGN8PR0K7zLBWxNDdCjo9CdnKw4iwzt6yY6zhhsPSkHFO77N2Cb7gFnewweh13BBmiw - FV1abYw3m4HW64GnKGDGx2HopllqszVGEEMUJYV/zkHY7QY6KwvYigpwJSbGcASIUrc+a8ybmQnh+nqg - s7OBa2gAlCrLURUyRCURuLZHJJhT52EiNRUwZqNMHMsnR48sezMygKurA67DSerEKVwDA1y7jZyMwcjd - NMrrl8mt13/u0uliH60t8vy8j7iN8Pl8MNnSLHdp98SQ889l+ttx2+VLOda7tzsslua5B5b7IgLX+A+v - enx3fgN9ry+rjwk39gAAAABJRU5ErkJggg== + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAtxJREFUOE+FU11I + U2EYXllBF3VjW91JklGUmCnCxBwqjswl/RCYNyOVTAm8mLkg6EQlUZuaa39OyUGaNKEL+1FCW4GTGeGN + WFAg2cxNZe78zbNzds55O99nSq6LDjyc75zved/veZ/3/bapUh7HhaoSIfdEtbR7z2lZJR5A29tVOyJp + HDO688vXZ9cHhyZSY/A3QRC7PMXa4ODRI9KU3y+xLAOCIADP80CSMfj4blR6fjhLQhzE3ZLE5/OleXJy + wu/NN0QhHAZuKggURUIsFsWgqBjEAxOwNjMDow1XRcRFMZtJPKcKP7y4YkwKc3NA1dcDqdMBFf6Fk9A0 + CVRkEciyMqDMrcBNT0O/0ZhEMTiB82JVri3zoMjNzgJlNAJVWgrR6mrwnTUkFakJBN+5qmSsrg7oykqg + TCZgJwNgy8gQ3ecNJ1UdbXcc431PZfbNayCLimC1pgY8GrXsqih3El3EXgSPsvbs18ixpiashBl5C/6X + Q5L17i2XqrPT+iMaXVGMWgU6EoZhg0Fwl+kepzrt1Je0j+uKRXZlCXMjSlkoFrmfiMdZbBZ6Y9nKqakJ + sBplj+PW/hhLYi5OgFqGWsVx8f8m4PkE5iKDcQIkY3l5SXGbBo6h4dW1Bt5dUW5JVeDWl3aMmEwJXlFA + 0xQsLi6sl4CM8A/0S2xvL9CNjUCOjUF/ZqbkrtA7Nkx0ndHbB7IOScz3b0C33QfG/gT8LqeEGqBCrehR + q2XWbAZSqwWWIIAKBGD4plmw2YkEwjBBCPGf8xD3eoEsKAC6thY86ekyGgGs1KstmAjm50O8pQXIwkJg + WlsBSRXFpAIRkgIPjK0LBzPKPExmZwOK2SwTjWXf8WMrwbw8YJqbgel24zrRFK6DAsZhxyejYMTdMsob + l8mr1X7u0WjkT+0WcWEhhN1GCIVCMGV5KPao98mI889l+ttx++VLRZ33bndbrZb5R9YHPAJao3/oqqd2 + 5zcLty92UZRhWQAAAABJRU5ErkJggg== </value> </data> <data name="toolbarExit.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> Modified: trunk/tools/RosTE/GUI/NewVMWizard.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/NewVMWizard.cs?rev… ============================================================================== --- trunk/tools/RosTE/GUI/NewVMWizard.cs (original) +++ trunk/tools/RosTE/GUI/NewVMWizard.cs Fri Jun 8 19:06:47 2007 @@ -11,6 +11,27 @@ { public partial class NewVMWizard : Form { + public string VMName + { + get { return nameTxtBox.Text; } + } + public string DefDir + { + get { return defaultDirTxtBox.Text; } + } + public int DiskSizeGB + { + get { return (int)harddiskUpDwn.Value; } + } + public string ExistImg + { + get { return imageLocTxtBox.Text; } + } + public int MemSizeMB + { + get { return (int)memoryUpDwn.Value; } + } + public NewVMWizard() { InitializeComponent(); Modified: trunk/tools/RosTE/GUI/VMDataBase.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosTE/GUI/VMDataBase.cs?rev=… ============================================================================== --- trunk/tools/RosTE/GUI/VMDataBase.cs (original) +++ trunk/tools/RosTE/GUI/VMDataBase.cs Fri Jun 8 19:06:47 2007 @@ -1,32 +1,99 @@ using System.Data; using System.IO; using System.Xml; +using System.Windows.Forms; namespace RosTEGUI { public class MainConfig { - private DataSet mainConfig; + private DataSet data; - public MainConfig(MainForm mf) + private int GetNumberOfVms() + { + DataTable dt = data.Tables["MainConfig"]; + return dt.Rows.Count; + } + + public MainConfig() { string filename = "Config.xsd"; - mainConfig = new DataSet(); + data = new DataSet(); if (File.Exists(filename)) { FileStream fs = new FileStream(filename, FileMode.Open, FileAccess.Read); XmlTextReader xtr = new XmlTextReader(fs); - mainConfig.ReadXmlSchema(xtr); + data.ReadXmlSchema(xtr); xtr.Close(); + + // FIXME: unfortunatley, .NET doesn't support binding of + // listview controls, we'll need to implement this manually + // and remove the need for LoadNewImage / LoadExistingImages + } + } + + public void LoadExistingImages(ListView lv) + { + DataTable dt = data.Tables["MainConfig"]; + + int num = GetNumberOfVms(); + for (int i = 0; i < num; i++) + { + DataRow dr = dt.Rows[i]; + lv.Items.Add((string)dr["Path"], 0); + } + } + + public void LoadNewImage(ListView lv) + { + DataTable dt = data.Tables["MainConfig"]; + + int num = GetNumberOfVms(); + + DataRow dr = dt.Rows[num - 1]; + lv.Items.Add((string)dr["Path"], 0); + + } + + public void AddVirtMach(string Path) + { + int i; + DataRow dr; + DataTable dt = data.Tables["MainConfig"]; + i = dt.Rows.Count + 1; + dr = dt.NewRow(); + dr["ID"] = i; + dr["Path"] = Path; + dt.Rows.Add(dr); + } + + public void SaveMainConfig() + { + string fileName = "Config.xml"; + FileStream fs = new FileStream(fileName, FileMode.OpenOrCreate, FileAccess.Write); + XmlTextWriter xtw = new XmlTextWriter(fs, System.Text.Encoding.Unicode); + data.WriteXml(xtw, System.Data.XmlWriteMode.WriteSchema); + xtw.Close(); + } + + public bool LoadMainConfig() + { + bool ret = false; + string fileName = "Config.xml"; + + if (File.Exists(fileName)) + { + FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read); + XmlTextReader xtr = new XmlTextReader(fs); + data.ReadXml(xtr, System.Data.XmlReadMode.ReadSchema); + xtr.Close(); + ret = true; } - // Add the data bindings - DataTable dt = mainConfig.Tables["MainConfig"]; - - //mf.im - + return ret; } } + public class VMConfig {

17 years, 6 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