Ros-diffs May 2009

ros-diffs@reactos.org

27 participants
504 discussions

[fireball] 41176: - Add missing c_424.nls.

by fireball＠svn.reactos.org

Author: fireball Date: Thu May 28 16:50:52 2009 New Revision: 41176 URL: http://svn.reactos.org/svn/reactos?rev=41176&view=rev Log: - Add missing c_424.nls. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff [iso-8859-1] Thu May 28 16:50:52 2009 @@ -553,6 +553,7 @@ media\fonts\tahomabd.ttf 3 media\nls\c_037.nls 1 +media\nls\c_424.nls 1 media\nls\c_500.nls 1 media\nls\c_737.nls 1 media\nls\c_775.nls 1

15 years, 3 months

[fireball] 41175: - Switch to using UniATA as a default storage driver. Makes it possible to use some SerialATA controllers/harddisks and overcome 8Gb HDD limitation. See issue #1262 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Thu May 28 16:48:22 2009 New Revision: 41175 URL: http://svn.reactos.org/svn/reactos?rev=41175&view=rev Log: - Switch to using UniATA as a default storage driver. Makes it possible to use some SerialATA controllers/harddisks and overcome 8Gb HDD limitation. See issue #1262 for more details. Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf trunk/reactos/boot/bootdata/txtsetup.sif trunk/reactos/media/inf/hdc.inf Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Thu May 28 16:48:22 2009 @@ -813,13 +813,13 @@ HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Start",0x00010001,0x00000001 HKLM,"SYSTEM\CurrentControlSet\Services\Afd","Type",0x00010001,0x00000001 -; Atapi miniport driver -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","ErrorControl",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Group",0x00000000,"SCSI Miniport" -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","ImagePath",0x00020000,"system32\drivers\atapi.sys" -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Start",0x00010001,0x00000000 -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Type",0x00010001,0x00000001 -HKLM,"SYSTEM\CurrentControlSet\Services\Atapi","Tag",0x00010001,0x00000010 +; UniATA/Atapi miniport driver +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ErrorControl",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Group",0x00000000,"System Bus Extender" +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","ImagePath",0x00020000,"system32\drivers\uniata.sys" +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Start",0x00010001,0x00000000 +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Type",0x00010001,0x00000001 +HKLM,"SYSTEM\CurrentControlSet\Services\UniATA","Tag",0x00010001,0x00000010 ; Audio Service HKLM,"SYSTEM\CurrentControlSet\Services\RosAudioSrv","DisplayName",0x00000000,"Audio Service" Modified: trunk/reactos/boot/bootdata/txtsetup.sif URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/txtsetup.sif… ============================================================================== --- trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/txtsetup.sif [iso-8859-1] Thu May 28 16:48:22 2009 @@ -13,7 +13,7 @@ [SourceDisksFiles] acpi.sys=,,,,,,,,,,,,4 -atapi.sys=,,,,,,x,,,,,,4 +uniata.sys=,,,,,,x,,,,,,4 buslogic.sys=,,,,,,x,,,,,,4 blue.sys=,,,,,,x,,,,,,4 bootvid.dll=,,,,,,,,,,,,4 @@ -31,7 +31,6 @@ ntfs.sys=,,,,,,,,,,,,4 pci.sys=,,,,,,,,,,,,4 scsiport.sys=,,,,,,x,,,,,,4 -uniata.sys=,,,,,,,,,,,,4 fastfat.sys=,,,,,,x,,,,,,4 ramdisk.sys=,,,,,,x,,,,,,4 ext2.sys=,,,,,,x,,,,,,4 Modified: trunk/reactos/media/inf/hdc.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/hdc.inf?rev=4117… ============================================================================== Binary files - no diff available.

15 years, 3 months

[fireball] 41174: - Report 5.2 as a version in UniATA rather than 4.1. It doesn't seem to introduce incompatibility, but is more realistic for the rest of the driver.

by fireball＠svn.reactos.org

Author: fireball Date: Thu May 28 16:26:10 2009 New Revision: 41174 URL: http://svn.reactos.org/svn/reactos?rev=41174&view=rev Log: - Report 5.2 as a version in UniATA rather than 4.1. It doesn't seem to introduce incompatibility, but is more realistic for the rest of the driver. Modified: trunk/reactos/drivers/storage/ide/uniata/ros_glue/ros_glue.cpp Modified: trunk/reactos/drivers/storage/ide/uniata/ros_glue/ros_glue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/ros_glue/ros_glue.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/ros_glue/ros_glue.cpp [iso-8859-1] Thu May 28 16:26:10 2009 @@ -1,7 +1,7 @@ #include "stdafx.h" extern "C" { -ULONG MajorVersion = 0x04; -ULONG MinorVersion = 0x01; +ULONG MajorVersion = 0x05; +ULONG MinorVersion = 0x02; ULONG BuildNumber = 0x0; }

15 years, 3 months

[fireball] 41173: - Increase waiting time for DRQ removal inside AtapiInterrupt twice. - Don't disable/enable IDE controller interrupts in AtapiSendCommand. This confuses Virtual Box's controller (it consumes one interrupt without ever emitting it) and thus sending any ATAPI command fails. - Turn off ATAPI DMA raw read support by default. It seems to be incompatible with (at least) Virtual Box IDE controller. See issue #3645 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Thu May 28 16:13:17 2009 New Revision: 41173 URL: http://svn.reactos.org/svn/reactos?rev=41173&view=rev Log: - Increase waiting time for DRQ removal inside AtapiInterrupt twice. - Don't disable/enable IDE controller interrupts in AtapiSendCommand. This confuses Virtual Box's controller (it consumes one interrupt without ever emitting it) and thus sending any ATAPI command fails. - Turn off ATAPI DMA raw read support by default. It seems to be incompatible with (at least) Virtual Box IDE controller. See issue #3645 for more details. Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp [iso-8859-1] Thu May 28 16:13:17 2009 @@ -4305,7 +4305,7 @@ for (k = atapiDev ? 0 : 200; k; k--) { GetStatus(chan, statusByte); if (!(statusByte & IDE_STATUS_DRQ)) { - AtapiStallExecution(50); + AtapiStallExecution(100); } else { break; } @@ -6365,7 +6365,7 @@ InterlockedExchange(&(chan->CheckIntr), CHECK_INTR_IDLE); - AtapiDisableInterrupts(deviceExtension, lChannel); + //AtapiDisableInterrupts(deviceExtension, lChannel); // Write ATAPI packet command. AtapiWritePort1(chan, IDX_IO1_o_Command, IDE_COMMAND_ATAPI_PACKET); @@ -6400,7 +6400,7 @@ GetBaseStatus(chan, statusByte); - AtapiEnableInterrupts(deviceExtension, lChannel); + //AtapiEnableInterrupts(deviceExtension, lChannel); WriteBuffer(chan, (PUSHORT)Srb->Cdb, Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/id_init.cpp [iso-8859-1] Thu May 28 16:13:17 2009 @@ -1279,7 +1279,7 @@ } deviceExtension->opt_AtapiDmaZeroTransfer = FALSE; deviceExtension->opt_AtapiDmaControlCmd = FALSE; - deviceExtension->opt_AtapiDmaRawRead = TRUE; + deviceExtension->opt_AtapiDmaRawRead = FALSE;//TRUE; // Disabling that for VirtualBox deviceExtension->opt_AtapiDmaReadWrite = TRUE; }

15 years, 3 months

[cwittich] 41172: build x86 only as we only have a 32bit dbghelp

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu May 28 15:22:02 2009 New Revision: 41172 URL: http://svn.reactos.org/svn/reactos?rev=41172&view=rev Log: build x86 only as we only have a 32bit dbghelp Modified: trunk/tools/reactosdbg/DbgHelp/DbgHelp.csproj trunk/tools/reactosdbg/DebugProtocol/DebugProtocol.csproj trunk/tools/reactosdbg/Pipe/Pipe.csproj trunk/tools/reactosdbg/ReactosDBG.sln trunk/tools/reactosdbg/RosDBG/RosDBG.csproj trunk/tools/reactosdbg/WinFormsUI/WinFormsUI.csproj Modified: trunk/tools/reactosdbg/DbgHelp/DbgHelp.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DbgHelp/DbgHelp.c… ============================================================================== --- trunk/tools/reactosdbg/DbgHelp/DbgHelp.csproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DbgHelp/DbgHelp.csproj [iso-8859-1] Thu May 28 15:22:02 2009 @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>9.0.30729</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}</ProjectGuid> <OutputType>Library</OutputType> @@ -12,6 +12,7 @@ <AssemblyName>DbgHelp.NET</AssemblyName> <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> + <SignAssembly>false</SignAssembly> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> @@ -29,6 +30,23 @@ <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + <PlatformTarget>AnyCPU</PlatformTarget> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\x86\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <DebugType>full</DebugType> + <PlatformTarget>x86</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> + <OutputPath>bin\x86\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <Optimize>true</Optimize> + <DebugType>pdbonly</DebugType> + <PlatformTarget>x86</PlatformTarget> + <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/tools/reactosdbg/DebugProtocol/DebugProtocol.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/DebugProtocol/Deb… ============================================================================== --- trunk/tools/reactosdbg/DebugProtocol/DebugProtocol.csproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/DebugProtocol/DebugProtocol.csproj [iso-8859-1] Thu May 28 15:22:02 2009 @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>9.0.30729</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{76A02C1D-4B11-4D43-966E-E5C053870D65}</ProjectGuid> <OutputType>Library</OutputType> @@ -29,6 +29,23 @@ <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + <PlatformTarget>x86</PlatformTarget> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\x86\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <DebugType>full</DebugType> + <PlatformTarget>x86</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> + <OutputPath>bin\x86\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <Optimize>true</Optimize> + <DebugType>pdbonly</DebugType> + <PlatformTarget>x86</PlatformTarget> + <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/tools/reactosdbg/Pipe/Pipe.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/Pipe/Pipe.csproj?… ============================================================================== --- trunk/tools/reactosdbg/Pipe/Pipe.csproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/Pipe/Pipe.csproj [iso-8859-1] Thu May 28 15:22:02 2009 @@ -3,7 +3,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>9.0.21022</ProductVersion> + <ProductVersion>9.0.30729</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{F943218A-0A5E-436E-A7A4-475F37F45FA8}</ProjectGuid> <OutputType>Library</OutputType> @@ -29,6 +29,23 @@ <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + <PlatformTarget>AnyCPU</PlatformTarget> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\x86\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <DebugType>full</DebugType> + <PlatformTarget>x86</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> + <OutputPath>bin\x86\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <Optimize>true</Optimize> + <DebugType>pdbonly</DebugType> + <PlatformTarget>x86</PlatformTarget> + <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> <Reference Include="System" /> Modified: trunk/tools/reactosdbg/ReactosDBG.sln URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/ReactosDBG.sln?re… ============================================================================== --- trunk/tools/reactosdbg/ReactosDBG.sln [iso-8859-1] (original) +++ trunk/tools/reactosdbg/ReactosDBG.sln [iso-8859-1] Thu May 28 15:22:02 2009 @@ -32,7 +32,8 @@ {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|Any CPU.Build.0 = Release|Any CPU {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|x86.ActiveCfg = Release|Any CPU + {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|x86.ActiveCfg = Release|x86 + {FB776BFE-D2C2-465E-B713-6AD82CAE1A39}.Release|x86.Build.0 = Release|x86 {76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|Any CPU.Build.0 = Debug|Any CPU {76A02C1D-4B11-4D43-966E-E5C053870D65}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -42,7 +43,8 @@ {76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|Any CPU.Build.0 = Release|Any CPU {76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|x86.ActiveCfg = Release|Any CPU + {76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|x86.ActiveCfg = Release|x86 + {76A02C1D-4B11-4D43-966E-E5C053870D65}.Release|x86.Build.0 = Release|x86 {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|Any CPU.Build.0 = Debug|Any CPU {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -52,7 +54,8 @@ {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|Any CPU.Build.0 = Release|Any CPU {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|x86.ActiveCfg = Release|Any CPU + {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|x86.ActiveCfg = Release|x86 + {F943218A-0A5E-436E-A7A4-475F37F45FA8}.Release|x86.Build.0 = Release|x86 {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|Any CPU.Build.0 = Debug|Any CPU {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -62,7 +65,8 @@ {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|Any CPU.Build.0 = Release|Any CPU {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|x86.ActiveCfg = Release|Any CPU + {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|x86.ActiveCfg = Release|x86 + {3442437A-CB9C-4C73-B35B-3F6E4F60F3B2}.Release|x86.Build.0 = Release|x86 {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Debug|Any CPU.ActiveCfg = Debug|x86 {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 {B2C4FEDE-C383-49A2-B871-D17DA238BB47}.Debug|Mixed Platforms.Build.0 = Debug|x86 @@ -82,7 +86,8 @@ {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Any CPU.Build.0 = Release|Any CPU {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|x86.ActiveCfg = Release|Any CPU + {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|x86.ActiveCfg = Release|x86 + {C75532C4-765B-418E-B09B-46D36B2ABDB1}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE Modified: trunk/tools/reactosdbg/RosDBG/RosDBG.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RosDBG.csp… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] Thu May 28 15:22:02 2009 @@ -45,6 +45,23 @@ <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + <PlatformTarget>AnyCPU</PlatformTarget> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\x86\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <DebugType>full</DebugType> + <PlatformTarget>x86</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> + <OutputPath>bin\x86\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <Optimize>true</Optimize> + <DebugType>pdbonly</DebugType> + <PlatformTarget>x86</PlatformTarget> + <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> <Reference Include="Microsoft.mshtml, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> Modified: trunk/tools/reactosdbg/WinFormsUI/WinFormsUI.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/WinFormsUI/WinFor… ============================================================================== --- trunk/tools/reactosdbg/WinFormsUI/WinFormsUI.csproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/WinFormsUI/WinFormsUI.csproj [iso-8859-1] Thu May 28 15:22:02 2009 @@ -2,7 +2,7 @@ <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProductVersion>8.0.50727</ProductVersion> + <ProductVersion>9.0.30729</ProductVersion> <SchemaVersion>2.0</SchemaVersion> <ProjectGuid>{C75532C4-765B-418E-B09B-46D36B2ABDB1}</ProjectGuid> <OutputType>Library</OutputType> @@ -34,6 +34,22 @@ <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> + <DebugSymbols>true</DebugSymbols> + <OutputPath>bin\x86\Debug\</OutputPath> + <DefineConstants>TRACE;DEBUG</DefineConstants> + <DebugType>full</DebugType> + <PlatformTarget>x86</PlatformTarget> + <ErrorReport>prompt</ErrorReport> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> + <OutputPath>bin\x86\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <Optimize>true</Optimize> + <DebugType>pdbonly</DebugType> + <PlatformTarget>x86</PlatformTarget> + <ErrorReport>prompt</ErrorReport> </PropertyGroup> <ItemGroup> <Reference Include="System" />

15 years, 3 months

[cwittich] 41171: -remove obsolete code

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu May 28 14:10:08 2009 New Revision: 41171 URL: http://svn.reactos.org/svn/reactos?rev=41171&view=rev Log: -remove obsolete code Removed: trunk/tools/reactosdbg/RosDBG/HostWindow.Designer.cs trunk/tools/reactosdbg/RosDBG/HostWindow.cs trunk/tools/reactosdbg/RosDBG/HostWindow.resx Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/BackTrace.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/RegisterView.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.cs trunk/tools/reactosdbg/RosDBG/RosDBG.csproj Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/BackTrace.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/BackTrace.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/BackTrace.cs [iso-8859-1] Thu May 28 14:10:08 2009 @@ -29,7 +29,6 @@ public BackTrace() { InitializeComponent(); - this.Tag = "Backtrace"; } public void SetShell(IShell shell) Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] Thu May 28 14:10:08 2009 @@ -65,7 +65,6 @@ public RawTraffic() { InitializeComponent(); - this.Tag = "Raw Traffic"; InputLabel.Location = new Point(2, 2); } Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.cs [iso-8859-1] Thu May 28 14:10:08 2009 @@ -17,7 +17,6 @@ public ReactOSWeb() { InitializeComponent(); - this.Tag = "Web"; BrowserView.CanGoBackChanged += BrowserView_CanGoBackChanged; BrowserView.CanGoForwardChanged += BrowserView_CanGoForwardChanged; BrowserView.GoHome(); @@ -26,7 +25,7 @@ public ReactOSWeb(string Title, string URL) { InitializeComponent(); - this.Tag = Title; + this.Text = Title; BrowserView.CanGoBackChanged += BrowserView_CanGoBackChanged; BrowserView.CanGoForwardChanged += BrowserView_CanGoForwardChanged; BrowserView.Navigate(URL); Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RegisterView.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RegisterView.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RegisterView.cs [iso-8859-1] Thu May 28 14:10:08 2009 @@ -22,7 +22,6 @@ { InitializeComponent(); RegisterGrid.SelectedObject = new Registers(); - this.Tag = "Registers"; } public void SetDebugConnection(DebugConnection conn) Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.cs [iso-8859-1] Thu May 28 14:10:08 2009 @@ -67,7 +67,6 @@ public SourceView(string FileName) { InitializeComponent(); - this.Tag = FileName; this.Text = FileName; } Removed: trunk/tools/reactosdbg/RosDBG/HostWindow.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/HostWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/HostWindow.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/HostWindow.Designer.cs (removed) @@ -1,116 +1,0 @@ -ï»¿namespace RosDBG -{ - partial class HostWindow - { - /// <summary> - /// Required designer variable. - /// </summary> - private System.ComponentModel.IContainer components = null; - - /// <summary> - /// Clean up any resources being used. - /// </summary> - /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// <summary> - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// </summary> - private void InitializeComponent() - { - this.ContentSplitter = new System.Windows.Forms.SplitContainer(); - this.menuStrip1 = new System.Windows.Forms.MenuStrip(); - this.windowToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.redockToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.closeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ContentSplitter.Panel1.SuspendLayout(); - this.ContentSplitter.SuspendLayout(); - this.menuStrip1.SuspendLayout(); - this.SuspendLayout(); - // - // ContentSplitter - // - this.ContentSplitter.Dock = System.Windows.Forms.DockStyle.Fill; - this.ContentSplitter.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.ContentSplitter.IsSplitterFixed = true; - this.ContentSplitter.Location = new System.Drawing.Point(0, 0); - this.ContentSplitter.Name = "ContentSplitter"; - this.ContentSplitter.Orientation = System.Windows.Forms.Orientation.Horizontal; - // - // ContentSplitter.Panel1 - // - this.ContentSplitter.Panel1.Controls.Add(this.menuStrip1); - this.ContentSplitter.Size = new System.Drawing.Size(292, 273); - this.ContentSplitter.SplitterDistance = 25; - this.ContentSplitter.TabIndex = 0; - // - // menuStrip1 - // - this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.windowToolStripMenuItem}); - this.menuStrip1.Location = new System.Drawing.Point(0, 0); - this.menuStrip1.Name = "menuStrip1"; - this.menuStrip1.Size = new System.Drawing.Size(292, 24); - this.menuStrip1.TabIndex = 0; - this.menuStrip1.Text = "menuStrip1"; - // - // windowToolStripMenuItem - // - this.windowToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.redockToolStripMenuItem, - this.closeToolStripMenuItem}); - this.windowToolStripMenuItem.Name = "windowToolStripMenuItem"; - this.windowToolStripMenuItem.Size = new System.Drawing.Size(57, 20); - this.windowToolStripMenuItem.Text = "Window"; - // - // redockToolStripMenuItem - // - this.redockToolStripMenuItem.Name = "redockToolStripMenuItem"; - this.redockToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.redockToolStripMenuItem.Text = "Redock"; - this.redockToolStripMenuItem.Click += new System.EventHandler(this.redockToolStripMenuItem_Click); - // - // closeToolStripMenuItem - // - this.closeToolStripMenuItem.Name = "closeToolStripMenuItem"; - this.closeToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.closeToolStripMenuItem.Text = "Close"; - this.closeToolStripMenuItem.Click += new System.EventHandler(this.closeToolStripMenuItem_Click); - // - // HostWindow - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(292, 273); - this.Controls.Add(this.ContentSplitter); - this.MainMenuStrip = this.menuStrip1; - this.Name = "HostWindow"; - this.Text = "HostWindow"; - this.ContentSplitter.Panel1.ResumeLayout(false); - this.ContentSplitter.Panel1.PerformLayout(); - this.ContentSplitter.ResumeLayout(false); - this.menuStrip1.ResumeLayout(false); - this.menuStrip1.PerformLayout(); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.SplitContainer ContentSplitter; - private System.Windows.Forms.MenuStrip menuStrip1; - private System.Windows.Forms.ToolStripMenuItem windowToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem redockToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem closeToolStripMenuItem; - } -} Removed: trunk/tools/reactosdbg/RosDBG/HostWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/HostWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/HostWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/HostWindow.cs (removed) @@ -1,60 +1,0 @@ -ï»¿using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace RosDBG -{ - public partial class HostWindow : Form - { - public HostWindow() - { - InitializeComponent(); - } - - public delegate void RedockControlEventHandler(object sender, RedockControlEventArgs args); - public event RedockControlEventHandler RedockControlEvent; - - public Control Content - { - get - { - if (ContentSplitter.Panel2.Controls.Count > 0) - return ContentSplitter.Panel2.Controls[0]; - else - return null; - } - set - { - ContentSplitter.Panel2.Controls.Clear(); - if (value != null) - ContentSplitter.Panel2.Controls.Add(value); - } - } - - private void redockToolStripMenuItem_Click(object sender, EventArgs e) - { - RedockControlEventArgs args = new RedockControlEventArgs(Content); - Content = null; - if (RedockControlEvent != null) - RedockControlEvent(this, args); - Close(); - } - - private void closeToolStripMenuItem_Click(object sender, EventArgs e) - { - Close(); - } - } - - public class RedockControlEventArgs : EventArgs - { - Control mControl; - public Control Control { get { return mControl; } } - public RedockControlEventArgs(Control ctrl) { mControl = ctrl; } - } -} Removed: trunk/tools/reactosdbg/RosDBG/HostWindow.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/HostWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/HostWindow.resx [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/HostWindow.resx (removed) @@ -1,123 +1,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<root> -  - <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> - <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> - <xsd:element name="root" msdata:IsDataSet="true"> - <xsd:complexType> - <xsd:choice maxOccurs="unbounded"> - <xsd:element name="metadata"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="value" type="xsd:string" minOccurs="0" /> - </xsd:sequence> - <xsd:attribute name="name" use="required" type="xsd:string" /> - <xsd:attribute name="type" type="xsd:string" /> - <xsd:attribute name="mimetype" type="xsd:string" /> - <xsd:attribute ref="xml:space" /> - </xsd:complexType> - </xsd:element> - <xsd:element name="assembly"> - <xsd:complexType> - <xsd:attribute name="alias" type="xsd:string" /> - <xsd:attribute name="name" type="xsd:string" /> - </xsd:complexType> - </xsd:element> - <xsd:element name="data"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> - <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> - <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> - <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> - <xsd:attribute ref="xml:space" /> - </xsd:complexType> - </xsd:element> - <xsd:element name="resheader"> - <xsd:complexType> - <xsd:sequence> - <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> - </xsd:sequence> - <xsd:attribute name="name" type="xsd:string" use="required" /> - </xsd:complexType> - </xsd:element> - </xsd:choice> - </xsd:complexType> - </xsd:element> - </xsd:schema> - <resheader name="resmimetype"> - <value>text/microsoft-resx</value> - </resheader> - <resheader name="version"> - <value>2.0</value> - </resheader> - <resheader name="reader"> - <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </resheader> - <resheader name="writer"> - <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> - </resheader> - <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> - <value>17, 17</value> - </metadata> -</root> Modified: trunk/tools/reactosdbg/RosDBG/RosDBG.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RosDBG.csp… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] Thu May 28 14:10:08 2009 @@ -99,12 +99,6 @@ <DependentUpon>ToolWindow.cs</DependentUpon> </Compile> <Compile Include="HighLevelInteraction.cs" /> - <Compile Include="HostWindow.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Include="HostWindow.Designer.cs"> - <DependentUpon>HostWindow.cs</DependentUpon> - </Compile> <Compile Include="IShell.cs" /> <Compile Include="IUseDebugConnection.cs" /> <Compile Include="IUseSymbols.cs" /> @@ -150,10 +144,6 @@ </EmbeddedResource> <EmbeddedResource Include="Dockable Objects\BackTrace.resx"> <DependentUpon>BackTrace.cs</DependentUpon> - <SubType>Designer</SubType> - </EmbeddedResource> - <EmbeddedResource Include="HostWindow.resx"> - <DependentUpon>HostWindow.cs</DependentUpon> <SubType>Designer</SubType> </EmbeddedResource> <EmbeddedResource Include="Dockable Objects\Locals.resx">

15 years, 3 months

[cwittich] 41170: remove debug messagebox

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu May 28 14:01:35 2009 New Revision: 41170 URL: http://svn.reactos.org/svn/reactos?rev=41170&view=rev Log: remove debug messagebox Modified: trunk/tools/reactosdbg/RosDBG/Settings.cs Modified: trunk/tools/reactosdbg/RosDBG/Settings.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Settings.c… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Settings.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Settings.cs [iso-8859-1] Thu May 28 14:01:35 2009 @@ -216,10 +216,7 @@ public static string Baudrate { get { return mProperties.Baudrate; } } public static Connect.ConnectionType SelectedConnType { get { return mProperties.SelectedConnType; } - set - { - MessageBox.Show(value.ToString()); - mProperties.SelectedConnType = value; } + set { mProperties.SelectedConnType = value; } } public Settings()

15 years, 3 months

[cwittich] 41169: -don't set the menu text to disconnect when the connect dialog was canceled -save the last connection method and preselect it on the next connection attempt -add an (unfinished) AboutDlg

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu May 28 13:59:51 2009 New Revision: 41169 URL: http://svn.reactos.org/svn/reactos?rev=41169&view=rev Log: -don't set the menu text to disconnect when the connect dialog was canceled -save the last connection method and preselect it on the next connection attempt -add an (unfinished) AboutDlg Added: trunk/tools/reactosdbg/RosDBG/AboutDlg.Designer.cs (with props) trunk/tools/reactosdbg/RosDBG/AboutDlg.cs (with props) trunk/tools/reactosdbg/RosDBG/AboutDlg.resx (with props) Modified: trunk/tools/reactosdbg/RosDBG/Connect.cs trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/RosDBG.csproj trunk/tools/reactosdbg/RosDBG/Settings.cs Added: trunk/tools/reactosdbg/RosDBG/AboutDlg.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/AboutDlg.D… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/AboutDlg.Designer.cs (added) +++ trunk/tools/reactosdbg/RosDBG/AboutDlg.Designer.cs [iso-8859-1] Thu May 28 13:59:51 2009 @@ -1,0 +1,81 @@ +ï»¿namespace RosDBG +{ + partial class AboutDlg + { + /// <summary> + /// Required designer variable. + /// </summary> + private System.ComponentModel.IContainer components = null; + + /// <summary> + /// Clean up any resources being used. + /// </summary> + /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param> + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// <summary> + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// </summary> + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutDlg)); + this.btnOK = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // btnOK + // + this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK; + this.btnOK.Location = new System.Drawing.Point(180, 224); + this.btnOK.Name = "btnOK"; + this.btnOK.Size = new System.Drawing.Size(92, 28); + this.btnOK.TabIndex = 0; + this.btnOK.Text = "&OK"; + this.btnOK.UseVisualStyleBackColor = true; + this.btnOK.Click += new System.EventHandler(this.btnOK_Click); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(37, 30); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(141, 13); + this.label1.TabIndex = 1; + this.label1.Text = "ReactOS Remote Debugger"; + // + // AboutDlg + // + this.AcceptButton = this.btnOK; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(284, 264); + this.Controls.Add(this.label1); + this.Controls.Add(this.btnOK); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MaximizeBox = false; + this.MinimizeBox = false; + this.Name = "AboutDlg"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "About ReactOS Remote Debugger"; + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button btnOK; + private System.Windows.Forms.Label label1; + } +} Propchange: trunk/tools/reactosdbg/RosDBG/AboutDlg.Designer.cs ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/reactosdbg/RosDBG/AboutDlg.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/AboutDlg.c… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/AboutDlg.cs (added) +++ trunk/tools/reactosdbg/RosDBG/AboutDlg.cs [iso-8859-1] Thu May 28 13:59:51 2009 @@ -1,0 +1,24 @@ +ï»¿using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace RosDBG +{ + public partial class AboutDlg : Form + { + public AboutDlg() + { + InitializeComponent(); + } + + private void btnOK_Click(object sender, EventArgs e) + { + Close(); + } + } +} Propchange: trunk/tools/reactosdbg/RosDBG/AboutDlg.cs ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/tools/reactosdbg/RosDBG/AboutDlg.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/AboutDlg.r… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/AboutDlg.resx (added) +++ trunk/tools/reactosdbg/RosDBG/AboutDlg.resx [iso-8859-1] Thu May 28 13:59:51 2009 @@ -1,0 +1,447 @@ +<?xml version="1.0" encoding="utf-8"?> +<root> +  + <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> + <xsd:import namespace="http://www.w3.org/XML/1998/namespace" /> + <xsd:element name="root" msdata:IsDataSet="true"> + <xsd:complexType> + <xsd:choice maxOccurs="unbounded"> + <xsd:element name="metadata"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" /> + </xsd:sequence> + <xsd:attribute name="name" use="required" type="xsd:string" /> + <xsd:attribute name="type" type="xsd:string" /> + <xsd:attribute name="mimetype" type="xsd:string" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="assembly"> + <xsd:complexType> + <xsd:attribute name="alias" type="xsd:string" /> + <xsd:attribute name="name" type="xsd:string" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="data"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" /> + <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" /> + <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" /> + <xsd:attribute ref="xml:space" /> + </xsd:complexType> + </xsd:element> + <xsd:element name="resheader"> + <xsd:complexType> + <xsd:sequence> + <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> + </xsd:sequence> + <xsd:attribute name="name" type="xsd:string" use="required" /> + </xsd:complexType> + </xsd:element> + </xsd:choice> + </xsd:complexType> + </xsd:element> + </xsd:schema> + <resheader name="resmimetype"> + <value>text/microsoft-resx</value> + </resheader> + <resheader name="version"> + <value>2.0</value> + </resheader> + <resheader name="reader"> + <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <resheader name="writer"> + <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> + </resheader> + <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> + <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> + <value> + AAABAAkAICAAAAEACACoCAAAlgAAABgYAAABAAgAyAYAAD4JAAAQEAAAAQAIAGgFAAAGEAAAICAAAAEA + GACoDAAAbhUAABgYAAABABgASAcAABYiAAAQEAAAAQAYAGgDAABeKQAAICAAAAEAIACoEAAAxiwAABgY + AAABACAAiAkAAG49AAAQEAAAAQAgAGgEAAD2RgAAKAAAACAAAABAAAAAAQAIAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAFRcAAR8kAAcjKAAKKyoADjQtAAEmMgACLjEACy4yAAAlPgAJJTgACzY1AAk6 + NwANPzkAEDU3AA5BOQATSD0AAx1JAAYSXwAHGF4ADiBFAA0iSwAVNEMAFTVOABQ4WQAgOkoABAhlAAoa + cAAPF3kAFjVmABImcQAYI3IAFih2ABoqeQAbMnQAKChjACIiewAcRUYAF05AABhQQQAdWEQAJkdFAC5L + WAArUVAAJ19UACVZWQArXV4AMFhWACJhSQAoak8AKWpQAC5zWQAsRGcAKllqADtdYQA1dWYANHxmADNr + dgBcVEoARl9eAFdXVwBpW0oAZVxQAHtrVwBYXWoARUV4AE1XdQBBWnIAUWBjAFllbgBcZHoARHd2AFh3 + cwBjY2MAaWRkAGtrawB1cGsAZ2N5AG9vfQBlcHEAcnRyAH54cABzc38Afn19AIZzWwCJd2IAkn9mAIN5 + dQA4gm0AO4N2AD2HeQA9ingAloVuAJ2MdgCfkHwAopJ8AAMKiQALDIoADRuFABAUjQAGBpkAAwqdAAkJ + ngAQGpMAGCiEABs3hAAkJIwAJDeIADE1jgACAqMACQqjAAMIqAALD6gAFhehABAapAAZGaIAHByrAAMF + sQAECLQABQm7AAkNvAAUFLsAGBi4ACQqqwAoLL4AOTu0ACFCiQAkRZUAKUOVAC5hgABNTYsAWFaIAFpa + kwBSUpkAc2+GAHR4hQB5f4AAWFekAFxcuABqaqQAcG+qAAUGwwAFCcEACgzEAAQFywAECcwADRLAAAsU + yAAQEMoACAnbABgY1QAqKsUAKCjMAAID5AAFCeQAAgLrAAAB8wAAAPsAQkLRAE9P1ABRUe0Adnb6AIV9 + lQBBi4QAXZOPAEmckQBXlZAAbI6JAGKXlwBRpZ4AZqCdAFWrpQBbqKMAV62oAF+xrABloqUAZrKuAGy3 + tAB2u7gAesC9AIODggCHjI0AiomIAJeNgACBkIwAlZGNAJuZjwCTk5MAmpqaAKmahwCin5sAsqKNALGk + kwC2qZoAvq+cAJOUogCDgrIAmJW0AKOjowCpp6QAo6CtAKioqAC2rqQAprCrALewpQC8sKEAtLOuAL62 + rQCmprcAs7O0AL26tgC+vbwAxrelAMC2qQDCuKsAzL+tAMC8twDLwbYAxsC6AMvEuQDUyboAn53LAIuL + 2wCSktcAr6/CAKem1QCPj+IAk5PnAIjHxQCVzs0AmtDQAMPDwwDIxMAAzMrHAMvLywDRysEA0czIAN7S + wwDV0coA2NLLANXU0wDc2dQA3NvaAOfdzwDg29UA4d7bAOTh3QDw59kA5OPjAOzp5wDr6+oA9u3hAPHw + 7QDz8/MA+/v7AP///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAtAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAABJAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADy6UvnAAAAAAAAAAAAAPL4 + AAAAAAD4AP0AAAAA/fj4AAAASdHy6gAAAAAAAAD5AAAAAPjy+Pr28NrPzL7D4EJGyOq8UwD/8gAAAAAA + +v4AAAAAAOry8uz0zlCHbI+QjXZxhVJLAAD88AAAAAD6+gAAAADoSrn2/fVFE5CbjmUaYG9vZCMAAOfp + AAAAAAD4AAAA/M+5TNP66hyZdx4WAwECCRFgbYIAxksAAAAAAAAAAADZ6+i2SvLEm5x2FCklAgQLBwYS + bYQAUwAAAAAAAAAA79b0+NFL0JiRYpx2Ki8EBScPBwZhZk5KAAAAAPUAAP3A2fby8MlqnR0yaZt4NCUF + MSgPBxRvJAAAAAAAAAAA78Hb8em2yXSZLFijf5ySGQRYMicMCm5zAAAAAAAA+ADVwNvy8jxTl3o4pa2u + gJp4FVs4MBAIY3kAAAAAAAAA/M3B7u/uSbaefUetsLGva5x3OVsyJw5olAAAAAAAAAD4wdrNz/XHUIqf + T6yy5OSoH5qTgTMoDnCWAAAAAAAAAADY217s6+7SjKFApLPk5uU2IZyTLSgWlJgAAAAAAAAAAPFdzNW/ + 1uvI44REsuTm5KorIJqTGBubiwAAAAAAAAAA717oXl/AzcrF4oans+SzskcufpyOkY8AAAAAAAAAAP0A + 2sBdX129v7fh301IsbGwrVk4Yp2VQVAAAAAAAAAAAADuXl9dX71fX1fd4oRDR6mjNWmVmYvRS0sAAAAA + APgA+QDBXV/X3Ny/Vj+i3qGgfJWdm3IXTwDGtgAAAAAA+gAAAABcvfP789RWVFRKg4l9e2ciqKa1AAC7 + AAAAAAD8AAAAAADN3Pftv1VUVT46P0iqO4i4APIAAAAAAAAAAPoAAAAAAADbwr9dVFQ/Oj1UussAAAAA + AAAAAAAAAAAAAPUAAAAAAAD528G/vb1MUdP9AAAAAAAA+gAAAAAAAAAA6v8AAAAAAAAAAPgA9uq0AAAA + AAAAAPoAAAAAAAAAAAAA8PkAAAAAAAAAAAAAAAAAAAAAAPj5AAAAAAAAAAAAAAAAAPX4AAAAAAAAAAAA + AAAAAPjyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAA//////////////9/////f////D/z68cP7wAAJ8+AADPPAAAz7gAAE/4A + AAv8AAAD2AAAB/gAAAfoAAAH8AAAB/AAAAf4AAAH+AAAB/gAAA/0AAAH/AAAA+oAABPvAAAb74AAX+/A + A//34Afv8/0f3/n//z/+f/z///////////8oAAAAGAAAADAAAAABAAgAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAYGgAFIyQAAycuAAEpMAABLDEABDEzAAY0NAANPzkAEzc4ABw7OwANQDkAEkU8ABZJ + OgAEClEABBVdAAkYXQAGF2YAFiZqAB0lbQAZKmsAFid5ABkmeQAYN3UAHDl+ACMwbAArK3cAJDV2ABlA + QQAcVkMAIFNBACBdRwAoU1IAIVhRADFYVwAmZ00AKmxRACxwVgAxeF8APU55ADR5ZwBTTkcAY1tPAGJg + XgB2ZlEAdGdWAHxtXABLb24ASXRyAFZxcABRd3MAVHxxAGxsbABjYXwAc3NzAHR0dAB6eXkAhnJZAId0 + XACJdVoAjHhdAIF3dwA+jHsAP419AJaEbQCChH8AmohwAJ2MdgCejnkAnI99AKCQegCik34ABQ+GAAcR + hQAMEIIAARCMAAkNkwADB5gABgaYAAECngAODpsACgqdAA8VkAAIEJcAChSWAAsVnwAUJI4AGjiCABw6 + igAlOIwAIyeZAAcJrAAZGagACAqyAAQJuwAJE7MAEhi4ABkZuQAXMKcAIiKjACRLjAAiRZAAKEidADNg + mgA9TKMATEyHAFdXlgBmZoAAa2iEAGdkiwB8fIMAenyLAGVlngBTVaYAXVy4AGJirwBlZL0AbGy+AAwM + xQAHDMgAGhrLAAMF2QAGBt4AJyfEADc7xAA8PN0AAgLiAAQE6AABAe4AAAD9AGBgxwBYh44AW46LAEeW + jQBUnZgAbpyYAE+kmwBRqKAAX7GtAHOppwBrsq4AZbWwAGu4tABxu7cAdr67AH3CvwCBgIAAhISEAIiH + hwCBgYkAiYmJAIiNjwCOjY0AkZCOAJyTiQCSjJEAl5aSAJuamQCklYEAqJaBAKeYhAComIEAq5yJAK2i + lQCwo5EAtKeXALqqlgC3q5sAvrCdAI6OrgCPjr4Ao6alAKWlpQCtpaAArq6uAL2xowC+s6YAv7SnALm0 + rgCpqb4ArrW1ALa2tgC7u7oAw7qsAMq9qwDHvbEAycC1AMXAuQDIwbkAzca9ANbJuQCZmOQAnZ3pAKKh + 6ACDxcIAhcbEAInIxgCVzs0AzMjDAM7OzgDRysAA1s3DANPOyADX0ssA3NbPANLS0gDW1dIA1tbWANjV + 0QDf29MA2djVANnZ2ADd29oA393aAN3d3QDh1ccA4N3XAOLf3ADq4NIA5eHbAOHg3gDl4d0A8+ndAOLh + 4QDl5eUA6OflAOnp6QDv7OoA7e3tAPLw7QDy8vEA9vb2APr6+gCmMf8AtFH/AMJx/wDPkf8A3LH/AOvR + /wD///8AAAAAAAgALwAOAFAAFQBwABsAkAAhALAAJgDPACwA8AA+Ef8AWDH/AHFR/wCMcf8AppH/AL+x + /wDa0f8A////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAADcAAAAAAAAAAAAAAAAAAAAAAAAAAADczzjTAAAAAAAAAOIA4AAA6NzVAADT + 07QAADfH4QAAAAAA5wAAAADU0MrVQW9aXVtMcG4AAOYAAADgAAAAALIr0OWrEX5eSA5LTU5rAK4AAAAA + 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 + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADigoKJIHBwcbAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////Af///wH///8BAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKKiogIaGhobMTExwAwMDCgAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABmZmYKgICAP7CwsG7Ly8txycnJdMTExHWpqalnuLi4NLi4 + uCDr6+sN8/PzF4uLiyP9/f0t/f39Lv7+/iP///8X8fHxEdLS0jCtra1XvLy8iKKiopVXV1fhlZWVmaOj + o3GGhoYxAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAkpKSAXl5eUS9vb2SyMjIiMXFxXS4uLhlyMjIM/Pz + 8znf399l0NDQisvLy37s7OyF2NbSdpiPgjmHgHYxxcXFdOzs7IrOzs6K0tLSnNfX13LPz89AlJSUY05O + TuSRkZGuycnJoqioqJNmZmYrAAAAAAAAAAAAAAAAAAAAAGVlZQaMjIxf3d3dpv///23///9R////Ufj4 + +GzS0tKLv7+/ls/Pzo3h392k2tXOpcnFwLy1rKK/raGSwaGXicGJhX/HfX6P0ouLp646RWbmO0Vg1H+A + kL2trbCcYWFhpVdXV8La2tpW/v7+lMLCwpZ1dXVAAAAAAAAAAAAAAAAAcHBwLOLi4pb09PSY////Bv// + /wGgoKABlZWVB8XFxWiysrGz08/LutLQzLzAu7W/1tDIv6Khm81aYV3dYGRz3icsifMGCML9BQbM/gQF + w/0DBbH/Dg+e9iIifccdHTCdOjo6vGtrawT+/v5C5ubmorKysoJoaGgHAAAAAAAAAACfn59Q2trahtra + 2oD///8CAAAAADMzMwrU1NRFqaSdolRQTN+EgH3d29jTw+/s6b/W087BSFZf5wcYXv4DBMz/AgLp/wMJ + wP8DCp3/BAhl/wMMif8ACan/AgSn/wYGmf8bG1rwQ0NLKuXl5T2enp6lq6urrGBgYCkAAAAAAAAAAKKi + olLS0tJsyMjIg////wkAAAABurq6OObj3oWonY+8gXx21GFhX+qwrq3U5+bkv76+vcUNFXj8AQPk/wQI + uv8SJnH/FjND/wcjKP8AFRf/AR8m/wAlPv8DHUn/BAiK/wEBoP8ODmO8qamzdHBwcK1aWlriU1NTKgAA + AAAAAAAAk5OTSPDw8Gm7u7tb4uLiOsXFxRbl4d1+tqmZtcS6rsC6ta/IfHt532JhYfTQ0NHCc3Ko4QEB + 7v8AAfX/BAm0/w4gRf8mR0X/HUZH/wEfIv8KLin/CDc2/wIuMf8BJjL/BhJf/gEBofxGRoniWVlZd2Ji + Ys83NzdKAAAAAAAAAACIiIgt7+/vfrKysjzj4+Nv6OjoQsK4q6GuoI++1M3Dv+Dc18Gko6LPYmJi85eX + q9giIsv2BAnM/wwZg/8AAPP/BQi0/y5LWP8wWFb/CCkr/w41K/8XTkD/DT85/wIuMf8CJjL/CAmJ+wcH + nfwvL0OwU1NT4LKysg0AAAAAAAAAAP///wLDw8OF/f39M7m5uXfp5uSHmYhxvrqunr/c1s+/1dPQwcXE + w8aamprXJCSM/gAA9/8WNWb/KWpQ/xs3hP8DBuj/CQ26/yxEZ/8cREX/DzQv/yhqT/8dWUX/DkE5/wMv + Mv8LHUb7Bgeo/RwcePiOjpFwAAAAAAAAAAAAAAAAAAAAALGxsVbw8PBjycnJScS8saKaiXK/vLGhv9LO + ycC7urjGeHh35JWVlc8YGKr6AgLl/ydfVP84gm3/QIuE/yRFlf8BAfL/DRLA/yA6Sv8MLCv/NX5n/ylr + UP8YUEH/CTo3/wgkN/0ICaP9DQ2e8ra2yEkAAAAAAAAAAAAAAAAAAAAA2NjYH87Ozozv7+5SoJB8qZiH + cL+5sKS/09DNv9TQzMNQUFD0bGtr4igoxfwXF7j9NXVm/kmckf9Xraj/X7Gs/ylDlf8DBOT/CQ6+/wwl + Tv89h3n/NX5n/yJhSf8TSD3/CCsv+wwQi/oEBLfuDAxxRAAAAAAAAAAAAAAAAAAAAADn5+cCv7+/Sufm + 45KaiXKqlodzv8fDvb/Lwri/xcG7v11dXfR6eXjgQkLR/jU1t/lFdm/3VKuk/2W1sP9vurf/ZaKl/yQ3 + iP8CAvH/Bgq8/zNrdv89inj/KWtR/xhRQf8MMjL7FBt89wMDx/EKCnxHAAAAAAAAAAAAAAAAAAAAAAAA + AAD///8Bz87NhZqKdbWzrKS/pZaDv6mgk7/X1NC/mpiU2GloZ+1bW7j8Tk7U/VRsbe5bqKP/c7y5/4HD + wf+Lycf/Y5OS/xgjcv8EBuT/DBXJ/y5hgP8uc1n/HVhE/w80Nv0JDaf8BATS6gwMeUAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAADo5+VFpJuPrLiuob9/bFK/wry2v8K4q7/KwrfBr6um0W1sqPl1dfj/S1Ff7FqR + jfl6wL3/isnH/5rQ0P+PyMb/O11h/xoqef8BAvH/CxTI/yVZWf8eWUX/ETNC+wkKxfsFBcXbDg5eMQAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAN/e3jjKyMSuemRIv5+ViL+tn42/k4Bpv66gjr/Btqm/mZSk3paW + 6/1cXJL+TVxf+Ha6t/+JyMb/lc7N/43Kyf9moJ3/K1FQ/xYodv8FCeT/CA/E/xQ4Wf8KGnD/AgLt/wsL + Z5gMDAwIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwcHBcca9tKR/bFW/urKnv35oS7+EblO/loRtv6aX + g7+il4zIko+w8I+P4v5mYnvpY4eC73u9uv+FxsT/gMPB/2+3tP9BeHb/K11e/yFCif8CAu//BQrD/wQG + yf8KCsX/CwscXQAAAAUAAAAAAAAAAAAAAAAAAAAAAAAAAKysrCjl5eWK4t/aYrSupb+Zh3C/fWdKv39p + TL9+Z0u/h3NZv5J/Zr9/cmPOpqXV+5GR1/tZVW3pUG9u82uyr/9tubX/YrOu/1arpv87g3b/M3lm/w8d + h/8AAfX/Bwff+C8vaeQnJyejEhISMAAAAAAAAAAAAAAAAAAAAADi4uIBu7u7YP39/VnV1dRhxr+0s4Br + Tr+CbVG/gGpMv4VuUL+NeFu/iHJWv4JrT79xZmHenpzK+pCQ5P1UVY74QVpy/kJ1e/5RpZ7/QouF/ypZ + av8WL4j/AwfZ/wME3v4sLIK3hISLnTU1Nbo1NTW8MzMzJwAAAAAAAAAAAAAAALS0tBjMzMyQ3NzcMtTU + 1Izl4NtWjntipnxlR7+HclW/u6qSv8y8pr/ItqC/k31hv25VM79dSC/LfHSN7YuL2/13d/3/UVHt/ygs + vv8OD9f/AAD7/wID6v8QGqT/FTVO/xoqLKujo6NfTExMgyQkJIo7Ozt6AAAAAAAAAAAAAAAA3t7eJ93d + 3ZG/v7876Ojoc/39/BXUzsNlcVk6u454W7/g0r+/9OfXv+DSv7+0oIi/aVAxv15EI79iSzDHWU5P4VZU + h/tTUqL3Oj6x/yQqq/8QGpP/GzJ0/2CVnP9XlZD+VVxds7+/v0+AgIB9KysrgTMzM3oAAAAAAAAAAAAA + AADh4eEr4ODgh6ampm/9/f1KAAAAAPr6+hDNxLlnn4x0rMe2n7/s382/1MSwv5uGab9nTi6/W0Iiv2NK + KMBSSDriSD8z4lVGMc5KeGz1Y56Y+zJOTeY9RkiwGDIrihAcGVrAwMCJ39/fSre3t30fHx8oFBQUNAAA + AAAAAAAAAAAAANzc3Cbc3NyTu7u7f////zoAAAAAAAAAALu2exjXzsRYsqSPoaeTebyYgma/emJBv2NI + Jb9hRiO/W0QnyE1FO+lJOCPRYE84y358b8WGk426j5GRc0lJSSwAAAANPT09CuTk5G7d3d1nrq6uaD8/ + Pw8AAAAEAAAAAAAAAAAAAAAAampqErGxsXHMzMyl/v7+Rf///wH///8B////AsqvlQ/z7+1Z3tnVjque + jpeNeGCjh3NZroJvVbaFc124YFtV3WFZUM+lop+x8fHwg/Pz80RVVVUFoKCgAf///wH///8D6Ojoft7e + 3pd8fHw8gICAAQAAAAAAAAAAAAAAAAAAAABtbW0BcnJyLa+vr6f8/PyZ/v7+a/7+/mP8/Pxx5OTkdbS0 + tGvCwsJB8fHwMvPx72jV09CXysnHeMzKx5C4t7WpR0dHr1xcXEunp6dnxsbGe/Hx8XP+/v5d////U/// + /2Df39+omJiYdE1NTRAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAd3d3Kre3t47Z2dmZ0dHRfLS0 + tFypqalC+vr6Qejo6GHV1dV/xMTEWbe3twwAAAAA0tLSBISEhDKlpaV61dXVefLy8lDd3d03paWlS7a2 + tmHKysqH2dnZnZSUlGZmZmYSAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABjY2MFb29vJqWl + pX7AwMCCycnJhtfX12utra1fs7OzQs/Pzx3Nzc0DAAAAAAAAAAAAAAAAAAAAAKysrBDd3d0tmZmZYrS0 + tH3FxcWAu7u7ibW1tXuJiYlbaWlpEgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP// + ///////////+P/x//D/gAAAPwAAAB4AAAAOAAAABhAAAAYAAAAGAAAABgAAAAYAAAAPAAAADwAAAA8AA + AAPgAAAD8AAAA/AAAAPwAAAD4AAAA8AAAAHAAAABwAAAAcIAAAHDAAABwAAAA8AAAAfwAQAP8APAH/// + ////////KAAAABgAAAAwAAAAAQAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABCMjIzYAAAACAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAAAAAAAAAAD///8B////Af///wEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAGxsbFCgoKKRZWVkIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAZmZmC5iYmFLT09Ny19fXatHR + 0XGvr69jtra2NOzs7BakpKQq/Pz8PP39/Tz+/v4r8/PzGsPDw0rBwcGFtbW1j11dXdK8vLyQjo6OSAAA + AAAAAAAAAAAAAAAAAABiYmIMoKCgbt3d3ZvV1dV8y8vLh8HBwWDPz89Q9/f3ltDPzaTT0My1i35sbnBk + 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 +</value> + </data> +</root> Propchange: trunk/tools/reactosdbg/RosDBG/AboutDlg.resx ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/reactosdbg/RosDBG/Connect.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Connect.cs… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Connect.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Connect.cs [iso-8859-1] Thu May 28 13:59:51 2009 @@ -14,7 +14,7 @@ public partial class Connect : Form { public enum ConnectionType {Serial, Pipe, Socket}; - public ConnectionType Type; + public ConnectionType Type = Settings.SelectedConnType; private string defaultPipeName = Settings.Pipe; private string pipeName; public ConnectionMode pipeMode; @@ -100,7 +100,10 @@ pipeMode = ConnectionMode.MODE_SERVER; else if (cType.SelectedItem.ToString().CompareTo("Automatic") == 0) pipeMode = ConnectionMode.MODE_AUTO; - + + Settings.SelectedConnType = Type; + Settings.Save(); + Close(); } @@ -125,6 +128,7 @@ } cType.SelectedIndex = i; + tabControl.SelectedIndex = (int) Settings.SelectedConnType; } private void CustomRadioBtn_CheckedChanged(object sender, EventArgs e) Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] Thu May 28 13:59:51 2009 @@ -29,7 +29,6 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWindow)); WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin1 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); @@ -45,14 +44,12 @@ WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient6 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient7 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWindow)); this.menuStrip = new System.Windows.Forms.MenuStrip(); this.fileMenu = new System.Windows.Forms.ToolStripMenuItem(); - this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator(); - this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.saveAsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator(); - this.printToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.printSetupToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -81,18 +78,21 @@ this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); this.aboutToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStrip = new System.Windows.Forms.ToolStrip(); - this.openToolStripButton = new System.Windows.Forms.ToolStripButton(); - this.saveToolStripButton = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.printToolStripButton = new System.Windows.Forms.ToolStripButton(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.helpToolStripButton = new System.Windows.Forms.ToolStripButton(); this.statusStrip = new System.Windows.Forms.StatusStrip(); this.toolStripStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.toolTip = new System.Windows.Forms.ToolTip(this.components); this.dockPanel = new WeifenLuo.WinFormsUI.Docking.DockPanel(); this.modulesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.procThreadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.openToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.saveToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.printToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.helpToolStripButton = new System.Windows.Forms.ToolStripButton(); + this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.saveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.printToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip.SuspendLayout(); this.toolStrip.SuspendLayout(); this.statusStrip.SuspendLayout(); @@ -129,68 +129,39 @@ this.fileMenu.Size = new System.Drawing.Size(37, 20); this.fileMenu.Text = "&File"; // - // openToolStripMenuItem - // - this.openToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripMenuItem.Image"))); - this.openToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; - this.openToolStripMenuItem.Name = "openToolStripMenuItem"; - this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.openToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.openToolStripMenuItem.Text = "&Open"; - this.openToolStripMenuItem.Click += new System.EventHandler(this.OpenFile); - // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6); - // - // saveToolStripMenuItem - // - this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); - this.saveToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; - this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; - this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.saveToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.saveToolStripMenuItem.Text = "&Save"; - this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); + this.toolStripSeparator3.Size = new System.Drawing.Size(145, 6); // // saveAsToolStripMenuItem // this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; - this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.saveAsToolStripMenuItem.Text = "Save &as"; this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.SaveAsToolStripMenuItem_Click); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6); - // - // printToolStripMenuItem - // - this.printToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("printToolStripMenuItem.Image"))); - this.printToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; - this.printToolStripMenuItem.Name = "printToolStripMenuItem"; - this.printToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); - this.printToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.printToolStripMenuItem.Text = "&Print"; + this.toolStripSeparator4.Size = new System.Drawing.Size(145, 6); // // printSetupToolStripMenuItem // this.printSetupToolStripMenuItem.Enabled = false; this.printSetupToolStripMenuItem.Name = "printSetupToolStripMenuItem"; - this.printSetupToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.printSetupToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.printSetupToolStripMenuItem.Text = "Print setup"; // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(149, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(145, 6); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(148, 22); this.exitToolStripMenuItem.Text = "&Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.ExitToolsStripMenuItem_Click); // @@ -353,7 +324,7 @@ // optionsToolStripMenuItem // this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(116, 22); this.optionsToolStripMenuItem.Text = "&Settings"; this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem_Click); // @@ -384,7 +355,8 @@ // this.aboutToolStripMenuItem.Name = "aboutToolStripMenuItem"; this.aboutToolStripMenuItem.Size = new System.Drawing.Size(170, 22); - this.aboutToolStripMenuItem.Text = "&Info... ..."; + this.aboutToolStripMenuItem.Text = "&Info..."; + this.aboutToolStripMenuItem.Click += new System.EventHandler(this.aboutToolStripMenuItem_Click); // // toolStrip // @@ -401,53 +373,15 @@ this.toolStrip.TabIndex = 1; this.toolStrip.Text = "ToolStrip"; // - // openToolStripButton - // - this.openToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.openToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripButton.Image"))); - this.openToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; - this.openToolStripButton.Name = "openToolStripButton"; - this.openToolStripButton.Size = new System.Drawing.Size(23, 22); - this.openToolStripButton.Text = "Ãffnen"; - this.openToolStripButton.Click += new System.EventHandler(this.OpenFile); - // - // saveToolStripButton - // - this.saveToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.saveToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripButton.Image"))); - this.saveToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; - this.saveToolStripButton.Name = "saveToolStripButton"; - this.saveToolStripButton.Size = new System.Drawing.Size(23, 22); - this.saveToolStripButton.Text = "Speichern"; - // // toolStripSeparator1 // this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); // - // printToolStripButton - // - this.printToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.printToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("printToolStripButton.Image"))); - this.printToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; - this.printToolStripButton.Name = "printToolStripButton"; - this.printToolStripButton.Size = new System.Drawing.Size(23, 22); - this.printToolStripButton.Text = "Drucken"; - // // toolStripSeparator2 // this.toolStripSeparator2.Name = "toolStripSeparator2"; this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); - // - // helpToolStripButton - // - this.helpToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.helpToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("helpToolStripButton.Image"))); - this.helpToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; - this.helpToolStripButton.Name = "helpToolStripButton"; - this.helpToolStripButton.Size = new System.Drawing.Size(23, 22); - this.helpToolStripButton.Text = "Hilfe"; - this.helpToolStripButton.Click += new System.EventHandler(this.contentsToolStripMenuItem_Click); // // statusStrip // @@ -537,6 +471,73 @@ this.procThreadToolStripMenuItem.Text = "&Processes / Threads"; this.procThreadToolStripMenuItem.Click += new System.EventHandler(this.procThreadToolStripMenuItem_Click); // + // openToolStripButton + // + this.openToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.openToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripButton.Image"))); + this.openToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; + this.openToolStripButton.Name = "openToolStripButton"; + this.openToolStripButton.Size = new System.Drawing.Size(23, 22); + this.openToolStripButton.Text = "Ãffnen"; + this.openToolStripButton.Click += new System.EventHandler(this.OpenFile); + // + // saveToolStripButton + // + this.saveToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.saveToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripButton.Image"))); + this.saveToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; + this.saveToolStripButton.Name = "saveToolStripButton"; + this.saveToolStripButton.Size = new System.Drawing.Size(23, 22); + this.saveToolStripButton.Text = "Speichern"; + // + // printToolStripButton + // + this.printToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.printToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("printToolStripButton.Image"))); + this.printToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; + this.printToolStripButton.Name = "printToolStripButton"; + this.printToolStripButton.Size = new System.Drawing.Size(23, 22); + this.printToolStripButton.Text = "Drucken"; + // + // helpToolStripButton + // + this.helpToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.helpToolStripButton.Image = ((System.Drawing.Image)(resources.GetObject("helpToolStripButton.Image"))); + this.helpToolStripButton.ImageTransparentColor = System.Drawing.Color.Black; + this.helpToolStripButton.Name = "helpToolStripButton"; + this.helpToolStripButton.Size = new System.Drawing.Size(23, 22); + this.helpToolStripButton.Text = "Hilfe"; + this.helpToolStripButton.Click += new System.EventHandler(this.contentsToolStripMenuItem_Click); + // + // openToolStripMenuItem + // + this.openToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("openToolStripMenuItem.Image"))); + this.openToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; + this.openToolStripMenuItem.Name = "openToolStripMenuItem"; + this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); + this.openToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.openToolStripMenuItem.Text = "&Open"; + this.openToolStripMenuItem.Click += new System.EventHandler(this.OpenFile); + // + // saveToolStripMenuItem + // + this.saveToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("saveToolStripMenuItem.Image"))); + this.saveToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; + this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; + this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.saveToolStripMenuItem.Text = "&Save"; + this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); + // + // printToolStripMenuItem + // + this.printToolStripMenuItem.Image = ((System.Drawing.Image)(resources.GetObject("printToolStripMenuItem.Image"))); + this.printToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; + this.printToolStripMenuItem.Name = "printToolStripMenuItem"; + this.printToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); + this.printToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.printToolStripMenuItem.Text = "&Print"; + // // MainWindow // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Thu May 28 13:59:51 2009 @@ -276,8 +276,8 @@ mConnection.StartTCP(newConnection.Host, newConnection.Port); break; } + connectToolStripMenuItem.Text = "&Disconect"; } - connectToolStripMenuItem.Text = "&Disconect"; } else { @@ -346,6 +346,12 @@ printToolStripMenuItem.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.Print); } + private void aboutToolStripMenuItem_Click(object sender, EventArgs e) + { + AboutDlg about = new AboutDlg(); + about.ShowDialog(this); + } + } } Modified: trunk/tools/reactosdbg/RosDBG/RosDBG.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RosDBG.csp… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] Thu May 28 13:59:51 2009 @@ -68,6 +68,12 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> + <Compile Include="AboutDlg.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="AboutDlg.Designer.cs"> + <DependentUpon>AboutDlg.cs</DependentUpon> + </Compile> <Compile Include="Connect.cs"> <SubType>Form</SubType> </Compile> @@ -136,6 +142,9 @@ </Compile> <Compile Include="Program.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> + <EmbeddedResource Include="AboutDlg.resx"> + <DependentUpon>AboutDlg.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="Connect.resx"> <DependentUpon>Connect.cs</DependentUpon> </EmbeddedResource> Modified: trunk/tools/reactosdbg/RosDBG/Settings.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Settings.c… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Settings.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Settings.cs [iso-8859-1] Thu May 28 13:59:51 2009 @@ -19,6 +19,14 @@ private SerialConnSettings _serialconnsettings; private PipeConnSettings _pipeconnsettings; + [UserScopedSetting, DefaultSettingValue("0")] + [Browsable(false)] + public Connect.ConnectionType SelectedConnType + { + get { return (Connect.ConnectionType) this["SelectedConnType"]; } + set { this["SelectedConnType"] = value; } + } + /* Hack to work around a crash (bug in .net?) * using a TypeConverter in a class which is derived from * ApplicationSettingsBase results in a crash @@ -206,6 +214,13 @@ public static string Pipe { get { return mProperties.Pipe; } } public static string ComPort { get { return mProperties.Port; } } public static string Baudrate { get { return mProperties.Baudrate; } } + public static Connect.ConnectionType SelectedConnType { + get { return mProperties.SelectedConnType; } + set + { + MessageBox.Show(value.ToString()); + mProperties.SelectedConnType = value; } + } public Settings() { @@ -234,5 +249,10 @@ DialogResult = DialogResult.Cancel; Close(); } + + public static void Save() + { + mProperties.Save(); + } } }

15 years, 3 months

[cwittich] 41168: -lots of UI improvements -implementing SaveAs for Console and WebBrowser window

by cwittich＠svn.reactos.org

Author: cwittich Date: Thu May 28 13:16:07 2009 New Revision: 41168 URL: http://svn.reactos.org/svn/reactos?rev=41168&view=rev Log: -lots of UI improvements -implementing SaveAs for Console and WebBrowser window Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/BackTrace.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/Locals.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/MemoryWindow.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/Modules.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/ProcThread.Designer.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/ProcThread.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.Designer.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.resx trunk/tools/reactosdbg/RosDBG/Dockable Objects/RegisterView.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.Designer.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.cs trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.resx trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs trunk/tools/reactosdbg/RosDBG/MainWindow.cs trunk/tools/reactosdbg/RosDBG/RosDBG.csproj Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/BackTrace.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/BackTrace.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/BackTrace.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -16,7 +16,7 @@ namespace RosDBG { [DebugControl, BuildAtStartup] - public partial class BackTrace : DockContent, IUseDebugConnection, IUseSymbols, IUseShell + public partial class BackTrace : ToolWindow, IUseDebugConnection, IUseSymbols, IUseShell { DebugConnection mConnection; SymbolContext mSymbols; Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/Locals.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/Locals.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/Locals.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -16,7 +16,7 @@ namespace RosDBG { [DebugControl, BuildAtStartup] - public partial class Locals : DockContent, IUseDebugConnection, IUseSymbols, IUseShell + public partial class Locals : ToolWindow, IUseDebugConnection, IUseSymbols, IUseShell { class DisplayValue { Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/MemoryWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/MemoryWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/MemoryWindow.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -14,7 +14,7 @@ namespace RosDBG { [DebugControl] - public partial class MemoryWindow : DockContent, IUseDebugConnection + public partial class MemoryWindow : ToolWindow, IUseDebugConnection { ulong mAddress; DebugConnection mConnection; Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/Modules.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/Modules.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/Modules.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -12,7 +12,7 @@ namespace RosDBG { [DebugControl,BuildAtStartup] - public partial class Modules : DockContent, IUseDebugConnection + public partial class Modules : ToolWindow, IUseDebugConnection { public SortedList<uint, string> mModules = new SortedList<uint, string>(); Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/ProcThread.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/ProcThread.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/ProcThread.Designer.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -87,7 +87,7 @@ this.HideOnClose = true; this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "ProcThread"; - this.Text = "Processes & Threads"; + this.Text = "Processes / Threads"; this.splitContainer1.Panel1.ResumeLayout(false); this.splitContainer1.Panel2.ResumeLayout(false); this.splitContainer1.ResumeLayout(false); Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/ProcThread.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/ProcThread.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/ProcThread.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -13,7 +13,7 @@ namespace RosDBG { [DebugControl, BuildAtStartup] - public partial class ProcThread : DockContent, IUseDebugConnection, IUseSymbols + public partial class ProcThread : ToolWindow, IUseDebugConnection, IUseSymbols { DebugConnection mConnection; SymbolContext mSymcon; Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.Designer.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -83,6 +83,7 @@ this.editToolStripMenuItem.Name = "editToolStripMenuItem"; this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); this.editToolStripMenuItem.Text = "&Edit"; + this.editToolStripMenuItem.Click += new System.EventHandler(this.editToolStripMenuItem_Click); // // copyToolStripMenuItem // Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RawTraffic.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -3,6 +3,7 @@ using System.ComponentModel; using System.Drawing; using System.Data; +using System.IO; using System.Linq; using System.Text; using System.Windows.Forms; @@ -12,7 +13,7 @@ namespace RosDBG { [DebugControl, BuildAtStartup] - public partial class RawTraffic : DockContent, IUseDebugConnection + public partial class RawTraffic : ToolWindow, IUseDebugConnection { DebugConnection mConnection; List<string> textToAdd = new List<string>(); @@ -110,5 +111,34 @@ RawTrafficText.SelectAll(); } + private void editToolStripMenuItem_Click(object sender, EventArgs e) + { + selectAllToolStripMenuItem.Enabled = (RawTrafficText.Text.Length != 0); + } + + public override bool IsCmdEnabled(Commands Cmd) + { + switch (Cmd) + { + case Commands.SaveAs: + return true; + } + return false; + } + + public override void SaveAs(string FileName) + { + SaveFileDialog saveFileDialog = new SaveFileDialog(); + saveFileDialog.FileName = "debuglog-" + DateTime.Now.Date.ToShortDateString() + ".txt"; + saveFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Personal); + saveFileDialog.Filter = "Textfiles (*.txt)|*.txt|All Files (*.*)|*.*"; + if (saveFileDialog.ShowDialog(this) == DialogResult.OK) + { + StreamWriter sw = new StreamWriter(saveFileDialog.FileName); + sw.Write(RawTrafficText.Text); + sw.Close(); + } + } + } } Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.Designer.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -42,10 +42,16 @@ this.toolStripLabel1 = new System.Windows.Forms.ToolStripLabel(); this.BugzillaInput = new System.Windows.Forms.ToolStripTextBox(); this.BrowserView = new System.Windows.Forms.WebBrowser(); + this.menuStrip1 = new System.Windows.Forms.MenuStrip(); + this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripSeparator(); + this.selectAllToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); this.toolStrip1.SuspendLayout(); + this.menuStrip1.SuspendLayout(); this.SuspendLayout(); // // splitContainer1 @@ -184,12 +190,58 @@ this.BrowserView.TabIndex = 0; this.BrowserView.Navigating += new System.Windows.Forms.WebBrowserNavigatingEventHandler(this.BrowserView_Navigating); // + // menuStrip1 + // + this.menuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.editToolStripMenuItem}); + this.menuStrip1.Location = new System.Drawing.Point(0, 0); + this.menuStrip1.Name = "menuStrip1"; + this.menuStrip1.Size = new System.Drawing.Size(427, 24); + this.menuStrip1.TabIndex = 4; + this.menuStrip1.Text = "menuStrip1"; + this.menuStrip1.Visible = false; + // + // editToolStripMenuItem + // + this.editToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.copyToolStripMenuItem, + this.toolStripMenuItem1, + this.selectAllToolStripMenuItem}); + this.editToolStripMenuItem.MergeAction = System.Windows.Forms.MergeAction.Insert; + this.editToolStripMenuItem.MergeIndex = 1; + this.editToolStripMenuItem.Name = "editToolStripMenuItem"; + this.editToolStripMenuItem.Size = new System.Drawing.Size(39, 20); + this.editToolStripMenuItem.Text = "&Edit"; + this.editToolStripMenuItem.Click += new System.EventHandler(this.editToolStripMenuItem_Click); + // + // copyToolStripMenuItem + // + this.copyToolStripMenuItem.Enabled = false; + this.copyToolStripMenuItem.Image = global::RosDBG.Properties.Resources.copyToolStripMenuItem_Image; + this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; + this.copyToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.copyToolStripMenuItem.Text = "&Copy"; + this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click); + // + // toolStripMenuItem1 + // + this.toolStripMenuItem1.Name = "toolStripMenuItem1"; + this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6); + // + // selectAllToolStripMenuItem + // + this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem"; + this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.selectAllToolStripMenuItem.Text = "&Select all"; + this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click); + // // ReactOSWeb // this.AllowEndUserDocking = false; this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(427, 281); + this.Controls.Add(this.menuStrip1); this.Controls.Add(this.splitContainer1); this.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); @@ -201,7 +253,10 @@ this.splitContainer1.ResumeLayout(false); this.toolStrip1.ResumeLayout(false); this.toolStrip1.PerformLayout(); + this.menuStrip1.ResumeLayout(false); + this.menuStrip1.PerformLayout(); this.ResumeLayout(false); + this.PerformLayout(); } @@ -220,5 +275,10 @@ private System.Windows.Forms.ToolStripTextBox BugzillaInput; private System.Windows.Forms.ToolStripButton navReload; private System.Windows.Forms.ToolStripButton navHome; + private System.Windows.Forms.MenuStrip menuStrip1; + private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem; + private System.Windows.Forms.ToolStripSeparator toolStripMenuItem1; + private System.Windows.Forms.ToolStripMenuItem selectAllToolStripMenuItem; } } Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -6,12 +6,13 @@ using System.Linq; using System.Text; using System.Windows.Forms; +using mshtml; using WeifenLuo.WinFormsUI.Docking; namespace RosDBG { [DebugControl, BuildAtStartup] - public partial class ReactOSWeb : DockContent + public partial class ReactOSWeb : ToolWindow { public ReactOSWeb() { @@ -82,6 +83,60 @@ if (e.KeyCode == Keys.Return) BrowserView.Navigate("http://www.reactos.org/bugzilla/show_bug.cgi?id=" + ((ToolStripTextBox)sender).Text); } - + + private bool pIsCmdEnabled(string Cmd) + { + IHTMLDocument2 doc2 = BrowserView.Document.DomDocument as IHTMLDocument2; + if (doc2 != null) + return doc2.queryCommandEnabled(Cmd); + return false; + } + + public override bool IsCmdEnabled(Commands Cmd) + { + switch (Cmd) + { + case Commands.Copy: + return pIsCmdEnabled("copy"); + case Commands.Save: + case Commands.SaveAs: + return true; + } + return false; + } + + private void copyToolStripMenuItem_Click(object sender, EventArgs e) + { + IHTMLDocument2 htmlDocument = (mshtml.IHTMLDocument2)BrowserView.Document.DomDocument; + htmlDocument.execCommand("copy", true, null); + } + + private void selectAllToolStripMenuItem_Click(object sender, EventArgs e) + { + IHTMLDocument2 htmlDocument = (mshtml.IHTMLDocument2)BrowserView.Document.DomDocument; + htmlDocument.execCommand("selectall", true, null); + } + + private void editToolStripMenuItem_Click(object sender, EventArgs e) + { + copyToolStripMenuItem.Enabled = IsCmdEnabled(Commands.Copy); + } + + public override void Save(string FileName) + { + SaveAs(FileName); + } + + public override void SaveAs(string FileName) + { + IHTMLDocument2 htmlDocument = (mshtml.IHTMLDocument2)BrowserView.Document.DomDocument; + htmlDocument.execCommand("saveas", true, FileName); + } + + public override string GetDocumentName() + { + return BrowserView.Url.GetComponents(UriComponents.Host, UriFormat.UriEscaped).ToString() + ".html"; + } + } } Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.resx [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/ReactOSWeb.resx [iso-8859-1] Thu May 28 13:16:07 2009 @@ -201,6 +201,9 @@ DRuN9dviyqNcAAAAAElFTkSuQmCC </value> </data> + <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <value>141, 23</value> + </metadata> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAQAEAAAAAAAAAAAAAAAAAAAAA Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/RegisterView.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/RegisterView.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/RegisterView.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -12,7 +12,7 @@ namespace RosDBG { [DebugControl, BuildAtStartup] - public partial class RegisterView : DockContent, IUseDebugConnection + public partial class RegisterView : ToolWindow, IUseDebugConnection { bool mGridEnabled; Registers mRegisters; Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.Designer.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -50,7 +50,7 @@ // this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.splitContainer1.Location = new System.Drawing.Point(0, 24); + this.splitContainer1.Location = new System.Drawing.Point(0, 0); this.splitContainer1.Name = "splitContainer1"; this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; // @@ -61,7 +61,7 @@ // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.SourceCode); - this.splitContainer1.Size = new System.Drawing.Size(481, 248); + this.splitContainer1.Size = new System.Drawing.Size(481, 272); this.splitContainer1.SplitterDistance = 25; this.splitContainer1.TabIndex = 2; // @@ -103,7 +103,7 @@ this.SourceCode.Location = new System.Drawing.Point(0, 0); this.SourceCode.Name = "SourceCode"; this.SourceCode.ReadOnly = true; - this.SourceCode.Size = new System.Drawing.Size(481, 219); + this.SourceCode.Size = new System.Drawing.Size(481, 243); this.SourceCode.TabIndex = 3; this.SourceCode.Text = ""; this.SourceCode.SelectionChanged += new System.EventHandler(this.SourceCode_SelectionChanged); @@ -136,19 +136,19 @@ this.copyToolStripMenuItem.Enabled = false; this.copyToolStripMenuItem.Image = global::RosDBG.Properties.Resources.copyToolStripMenuItem_Image; this.copyToolStripMenuItem.Name = "copyToolStripMenuItem"; - this.copyToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.copyToolStripMenuItem.Size = new System.Drawing.Size(120, 22); this.copyToolStripMenuItem.Text = "&Copy"; this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click); // // toolStripMenuItem1 // this.toolStripMenuItem1.Name = "toolStripMenuItem1"; - this.toolStripMenuItem1.Size = new System.Drawing.Size(149, 6); + this.toolStripMenuItem1.Size = new System.Drawing.Size(117, 6); // // selectAllToolStripMenuItem // this.selectAllToolStripMenuItem.Name = "selectAllToolStripMenuItem"; - this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.selectAllToolStripMenuItem.Size = new System.Drawing.Size(120, 22); this.selectAllToolStripMenuItem.Text = "&Select all"; this.selectAllToolStripMenuItem.Click += new System.EventHandler(this.selectAllToolStripMenuItem_Click); // Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -12,7 +12,7 @@ namespace RosDBG { - public partial class SourceView : DockContent + public partial class SourceView : ToolWindow { string mSourceFile; //public event CanCopyChangedEventHandler CanCopyChangedEvent; @@ -104,6 +104,9 @@ private void btnCopy_Click(object sender, EventArgs e) { + if (SourceCode.SelectionLength != 0) + Clipboard.SetText(SourceCode.SelectedText); + //CopyEvent(this, new CopyEventArgs(this)); } @@ -118,6 +121,29 @@ SourceCode.SelectAll(); } + /* + public override void Save(string FileName) + { + SaveAs(FileName); + } + + public override void SaveAs(string FileName) + { + SaveFileDialog saveFileDialog = new SaveFileDialog(); + saveFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Personal); + saveFileDialog.Filter = "Textfiles (*.txt)|*.txt|All Files (*.*)|*.*"; + if (saveFileDialog.ShowDialog(this) == DialogResult.OK) + { + string File = saveFileDialog.FileName; + } + } + */ + + public override string GetDocumentName() + { + return SourceFile; + } + } } Modified: trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.resx URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/Dockable%2… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.resx [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/Dockable Objects/SourceView.resx [iso-8859-1] Thu May 28 13:16:07 2009 @@ -139,18 +139,18 @@ <data name="btnBreakpoint.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <value> iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlNJREFUOE+10l9I - U1EcB3Bfe/OhCHrqoYeKJCijPyxpZauocBRYsNH6QzIkV27darp5t3tbm7bNLWdbm25uTNqk2IQkFCx8 - CJrFzIW2aVFayZzVdJXSyvvtXoNAsmkPHTgPP875fX6H3/nl5f2v1fuoc0OzSyf2uwxQys+tfRgK5S+5 - llFH7Al69HA3Ukx6iGRaGujXwRY92gMu5ZKQZpuWmR6hwVVHygKvg8bMiG4ujvZ271gUuWUjvzDj9WyC - /hfQSIGLfY5rcJhU8DrNJTmRJmsNm2CGz64Fxi1wW9VgWMjTqMXXNzTsJmV3TsBCVcxVdN9Qgkla4Ki7 - iFkWtNcSyI4aQBGnEvMAj02jdtu04Pb9sPe6npCwiWY46yuRfVuHmzopsu9qYaw6i+mRq5CfPDz4Gwia - TMt8Dh0mX9LsIY02twYqqRA/xurQFbiATEKNnjsV+PyKRKChDJl4NaQiQWzeC/xOPSUX7cLEoAZTwyrY - NULMjOqRHqYwOaRCOq7EpziByYQSY9FynBHynvzRg1ZnLTGHxBRI9cmQfqFBZojCVJzEh4FqJPsvIxk9 - j0TnMYgPbu1ZsIkuq/o2h7yPSDHWK0OKTfo4UIWJ51cw+rgMz+7uQ5e9iDm+v/DBgkAoVJ9/SSKgOaT/ - 3lFE2oRMX/gIEwsfwtPgbkT8PBjKed/kJ/ba//qNrUZyOdtEkkNaDcVMh43P9LiL0GHbNquQFHw/sHM9 - iNPFq3LOAVkuWFMjK1WIS7a3by5YMbNl3UrwC1cPigSbmipL+RsXHeV/ufAT9/1vzTktLEcAAAAASUVO - RK5CYII= + YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAlJJREFUOE+10l9I + U1EcB3Bfe/NBCHrqoYcKIxCjPyxpZauocBRYoLT+kIyRlrNbTTfvttu623JztunGNjc3JrkopmCEgcYe + ArVYuXBtWtRWjTnLzVWOVt5vdwaBZGoPHTgPP875fX6H3/kVFPyvNfp4oLjTpqr22NSQiC9sfOTzFa66 + VouK2Od10ug0KZiZCMl0Gak33i4afT02yaoQu1HOzEUp5KsjaYDLQiEbVS3EgdHBXSsiFhP5hZlqZRPo + X0C7EvnYbbkBi04Kl1VfsSxib2tmE/RwmxXAlAGONhkYFnK2K/D1LQWzTjK4LGBQ1i5UdNySgEkYYNFe + xjwLmjUEcjE1lMSZyCLAaZLLHCYF8vtBr+smTQjYRD2srfXIvdOiQyVE7r0GLY3nMRe9DvHpo6HfgFen + W+O2qJB+RbGHFO445JAK+fgR1+JhzyVkIjL479bi82sSPcYaZMJNEFbxgote4LHSSnHVHkyH5JidlMIs + 5yMbo5GaVCI9IUUqLMFMmEA6IkE8IMI5PufJHz3otmqIBSTYgOSzOqReypGZUGI2TOLjeBMSY1eRCFxE + ZOAEqg9v9y/ZRFub7HYe+TAiRHy0Dkk26dN4I6ZfXENsuAbP7x3AQEcZc/Jg6dCSgM/XWnhFwKPyyFj/ + cQx7+UzAd4wJ9h7BU+9ejHg4UIs438Sn9pv/+o3dLWQR20Qyj3jocqbfyGX8jjLcN+2YFwuKvx/avRnE + 2fJ1y84BKeJtaK6rbKiu2NlXsqUou23TWnBL14eqeCX2+kru1hVH+V8u/ATQB2+2DQmylgAAAABJRU5E + rkJggg== </value> </data> <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.Designer.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -30,21 +30,21 @@ { this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainWindow)); - WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin4 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); - WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin4 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient10 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient22 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin4 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient4 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient23 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient11 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient24 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient4 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient25 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient26 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient12 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient27 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); - WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient28 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelSkin dockPanelSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPanelSkin(); + WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin autoHideStripSkin1 = new WeifenLuo.WinFormsUI.Docking.AutoHideStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient1 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin dockPaneStripSkin1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripSkin(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient dockPaneStripGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient2 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient2 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient3 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient dockPaneStripToolWindowGradient1 = new WeifenLuo.WinFormsUI.Docking.DockPaneStripToolWindowGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient4 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient5 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.DockPanelGradient dockPanelGradient3 = new WeifenLuo.WinFormsUI.Docking.DockPanelGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient6 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); + WeifenLuo.WinFormsUI.Docking.TabGradient tabGradient7 = new WeifenLuo.WinFormsUI.Docking.TabGradient(); this.menuStrip = new System.Windows.Forms.MenuStrip(); this.fileMenu = new System.Windows.Forms.ToolStripMenuItem(); this.openToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -67,6 +67,9 @@ this.viewMenu = new System.Windows.Forms.ToolStripMenuItem(); this.consoleToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.memoryToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.registerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.localsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.backtraceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.webbrowserToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator(); this.toolBarToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -88,9 +91,8 @@ this.toolStripStatusLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.toolTip = new System.Windows.Forms.ToolTip(this.components); this.dockPanel = new WeifenLuo.WinFormsUI.Docking.DockPanel(); - this.registerToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.localsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.backtraceToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.modulesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.procThreadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.menuStrip.SuspendLayout(); this.toolStrip.SuspendLayout(); this.statusStrip.SuspendLayout(); @@ -106,7 +108,7 @@ this.helpMenu}); this.menuStrip.Location = new System.Drawing.Point(0, 0); this.menuStrip.Name = "menuStrip"; - this.menuStrip.Size = new System.Drawing.Size(632, 24); + this.menuStrip.Size = new System.Drawing.Size(784, 24); this.menuStrip.TabIndex = 0; this.menuStrip.Text = "MenuStrip"; // @@ -133,14 +135,14 @@ this.openToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; this.openToolStripMenuItem.Name = "openToolStripMenuItem"; this.openToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.O))); - this.openToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.openToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.openToolStripMenuItem.Text = "&Open"; this.openToolStripMenuItem.Click += new System.EventHandler(this.OpenFile); // // toolStripSeparator3 // this.toolStripSeparator3.Name = "toolStripSeparator3"; - this.toolStripSeparator3.Size = new System.Drawing.Size(145, 6); + this.toolStripSeparator3.Size = new System.Drawing.Size(149, 6); // // saveToolStripMenuItem // @@ -148,20 +150,21 @@ this.saveToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; this.saveToolStripMenuItem.Name = "saveToolStripMenuItem"; this.saveToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.S))); - this.saveToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.saveToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.saveToolStripMenuItem.Text = "&Save"; + this.saveToolStripMenuItem.Click += new System.EventHandler(this.saveToolStripMenuItem_Click); // // saveAsToolStripMenuItem // this.saveAsToolStripMenuItem.Name = "saveAsToolStripMenuItem"; - this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.saveAsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.saveAsToolStripMenuItem.Text = "Save &as"; this.saveAsToolStripMenuItem.Click += new System.EventHandler(this.SaveAsToolStripMenuItem_Click); // // toolStripSeparator4 // this.toolStripSeparator4.Name = "toolStripSeparator4"; - this.toolStripSeparator4.Size = new System.Drawing.Size(145, 6); + this.toolStripSeparator4.Size = new System.Drawing.Size(149, 6); // // printToolStripMenuItem // @@ -169,24 +172,25 @@ this.printToolStripMenuItem.ImageTransparentColor = System.Drawing.Color.Black; this.printToolStripMenuItem.Name = "printToolStripMenuItem"; this.printToolStripMenuItem.ShortcutKeys = ((System.Windows.Forms.Keys)((System.Windows.Forms.Keys.Control | System.Windows.Forms.Keys.P))); - this.printToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.printToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.printToolStripMenuItem.Text = "&Print"; // // printSetupToolStripMenuItem // + this.printSetupToolStripMenuItem.Enabled = false; this.printSetupToolStripMenuItem.Name = "printSetupToolStripMenuItem"; - this.printSetupToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.printSetupToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.printSetupToolStripMenuItem.Text = "Print setup"; // // toolStripSeparator5 // this.toolStripSeparator5.Name = "toolStripSeparator5"; - this.toolStripSeparator5.Size = new System.Drawing.Size(145, 6); + this.toolStripSeparator5.Size = new System.Drawing.Size(149, 6); // // exitToolStripMenuItem // this.exitToolStripMenuItem.Name = "exitToolStripMenuItem"; - this.exitToolStripMenuItem.Size = new System.Drawing.Size(148, 22); + this.exitToolStripMenuItem.Size = new System.Drawing.Size(152, 22); this.exitToolStripMenuItem.Text = "&Exit"; this.exitToolStripMenuItem.Click += new System.EventHandler(this.ExitToolsStripMenuItem_Click); // @@ -259,6 +263,8 @@ this.consoleToolStripMenuItem, this.memoryToolStripMenuItem, this.registerToolStripMenuItem, + this.modulesToolStripMenuItem, + this.procThreadToolStripMenuItem, this.localsToolStripMenuItem, this.backtraceToolStripMenuItem, this.webbrowserToolStripMenuItem, @@ -272,28 +278,49 @@ // consoleToolStripMenuItem // this.consoleToolStripMenuItem.Name = "consoleToolStripMenuItem"; - this.consoleToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.consoleToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.consoleToolStripMenuItem.Text = "&Console"; this.consoleToolStripMenuItem.Click += new System.EventHandler(this.consoleToolStripMenuItem_Click); // // memoryToolStripMenuItem // this.memoryToolStripMenuItem.Name = "memoryToolStripMenuItem"; - this.memoryToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.memoryToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.memoryToolStripMenuItem.Text = "&Memory"; this.memoryToolStripMenuItem.Click += new System.EventHandler(this.memoryToolStripMenuItem_Click); // + // registerToolStripMenuItem + // + this.registerToolStripMenuItem.Name = "registerToolStripMenuItem"; + this.registerToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.registerToolStripMenuItem.Text = "&Register"; + this.registerToolStripMenuItem.Click += new System.EventHandler(this.registerToolStripMenuItem_Click); + // + // localsToolStripMenuItem + // + this.localsToolStripMenuItem.Name = "localsToolStripMenuItem"; + this.localsToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.localsToolStripMenuItem.Text = "&Locals"; + this.localsToolStripMenuItem.Click += new System.EventHandler(this.localsToolStripMenuItem_Click); + // + // backtraceToolStripMenuItem + // + this.backtraceToolStripMenuItem.Name = "backtraceToolStripMenuItem"; + this.backtraceToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.backtraceToolStripMenuItem.Text = "&Backtrace"; + this.backtraceToolStripMenuItem.Click += new System.EventHandler(this.backtraceToolStripMenuItem_Click); + // // webbrowserToolStripMenuItem // this.webbrowserToolStripMenuItem.Name = "webbrowserToolStripMenuItem"; - this.webbrowserToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.webbrowserToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.webbrowserToolStripMenuItem.Text = "&Webbrowser"; this.webbrowserToolStripMenuItem.Click += new System.EventHandler(this.webbrowserToolStripMenuItem_Click); // // toolStripMenuItem2 // this.toolStripMenuItem2.Name = "toolStripMenuItem2"; - this.toolStripMenuItem2.Size = new System.Drawing.Size(149, 6); + this.toolStripMenuItem2.Size = new System.Drawing.Size(175, 6); // // toolBarToolStripMenuItem // @@ -301,7 +328,7 @@ this.toolBarToolStripMenuItem.CheckOnClick = true; this.toolBarToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.toolBarToolStripMenuItem.Name = "toolBarToolStripMenuItem"; - this.toolBarToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.toolBarToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.toolBarToolStripMenuItem.Text = "&Toolbar"; this.toolBarToolStripMenuItem.Click += new System.EventHandler(this.ToolBarToolStripMenuItem_Click); // @@ -311,7 +338,7 @@ this.statusBarToolStripMenuItem.CheckOnClick = true; this.statusBarToolStripMenuItem.CheckState = System.Windows.Forms.CheckState.Checked; this.statusBarToolStripMenuItem.Name = "statusBarToolStripMenuItem"; - this.statusBarToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.statusBarToolStripMenuItem.Size = new System.Drawing.Size(178, 22); this.statusBarToolStripMenuItem.Text = "Status&bar"; this.statusBarToolStripMenuItem.Click += new System.EventHandler(this.StatusBarToolStripMenuItem_Click); // @@ -326,8 +353,8 @@ // optionsToolStripMenuItem // this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem"; - this.optionsToolStripMenuItem.Size = new System.Drawing.Size(116, 22); - this.optionsToolStripMenuItem.Text = "&Options"; + this.optionsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.optionsToolStripMenuItem.Text = "&Settings"; this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem_Click); // // helpMenu @@ -370,7 +397,7 @@ this.helpToolStripButton}); this.toolStrip.Location = new System.Drawing.Point(0, 24); this.toolStrip.Name = "toolStrip"; - this.toolStrip.Size = new System.Drawing.Size(632, 25); + this.toolStrip.Size = new System.Drawing.Size(784, 25); this.toolStrip.TabIndex = 1; this.toolStrip.Text = "ToolStrip"; // @@ -426,9 +453,9 @@ // this.statusStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripStatusLabel}); - this.statusStrip.Location = new System.Drawing.Point(0, 431); + this.statusStrip.Location = new System.Drawing.Point(0, 542); this.statusStrip.Name = "statusStrip"; - this.statusStrip.Size = new System.Drawing.Size(632, 22); + this.statusStrip.Size = new System.Drawing.Size(784, 22); this.statusStrip.TabIndex = 2; this.statusStrip.Text = "StatusStrip"; // @@ -448,79 +475,73 @@ this.dockPanel.DockBackColor = System.Drawing.SystemColors.AppWorkspace; this.dockPanel.Location = new System.Drawing.Point(0, 49); this.dockPanel.Name = "dockPanel"; - this.dockPanel.Size = new System.Drawing.Size(632, 379); - dockPanelGradient10.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient10.StartColor = System.Drawing.SystemColors.ControlLight; - autoHideStripSkin4.DockStripGradient = dockPanelGradient10; - tabGradient22.EndColor = System.Drawing.SystemColors.Control; - tabGradient22.StartColor = System.Drawing.SystemColors.Control; - tabGradient22.TextColor = System.Drawing.SystemColors.ControlDarkDark; - autoHideStripSkin4.TabGradient = tabGradient22; - dockPanelSkin4.AutoHideStripSkin = autoHideStripSkin4; - tabGradient23.EndColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient23.StartColor = System.Drawing.SystemColors.ControlLightLight; - tabGradient23.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient4.ActiveTabGradient = tabGradient23; - dockPanelGradient11.EndColor = System.Drawing.SystemColors.Control; - dockPanelGradient11.StartColor = System.Drawing.SystemColors.Control; - dockPaneStripGradient4.DockStripGradient = dockPanelGradient11; - tabGradient24.EndColor = System.Drawing.SystemColors.ControlLight; - tabGradient24.StartColor = System.Drawing.SystemColors.ControlLight; - tabGradient24.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripGradient4.InactiveTabGradient = tabGradient24; - dockPaneStripSkin4.DocumentGradient = dockPaneStripGradient4; - tabGradient25.EndColor = System.Drawing.SystemColors.ActiveCaption; - tabGradient25.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient25.StartColor = System.Drawing.SystemColors.GradientActiveCaption; - tabGradient25.TextColor = System.Drawing.SystemColors.ActiveCaptionText; - dockPaneStripToolWindowGradient4.ActiveCaptionGradient = tabGradient25; - tabGradient26.EndColor = System.Drawing.SystemColors.Control; - tabGradient26.StartColor = System.Drawing.SystemColors.Control; - tabGradient26.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripToolWindowGradient4.ActiveTabGradient = tabGradient26; - dockPanelGradient12.EndColor = System.Drawing.SystemColors.ControlLight; - dockPanelGradient12.StartColor = System.Drawing.SystemColors.ControlLight; - dockPaneStripToolWindowGradient4.DockStripGradient = dockPanelGradient12; - tabGradient27.EndColor = System.Drawing.SystemColors.GradientInactiveCaption; - tabGradient27.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; - tabGradient27.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; - tabGradient27.TextColor = System.Drawing.SystemColors.ControlText; - dockPaneStripToolWindowGradient4.InactiveCaptionGradient = tabGradient27; - tabGradient28.EndColor = System.Drawing.Color.Transparent; - tabGradient28.StartColor = System.Drawing.Color.Transparent; - tabGradient28.TextColor = System.Drawing.SystemColors.ControlDarkDark; - dockPaneStripToolWindowGradient4.InactiveTabGradient = tabGradient28; - dockPaneStripSkin4.ToolWindowGradient = dockPaneStripToolWindowGradient4; - dockPanelSkin4.DockPaneStripSkin = dockPaneStripSkin4; - this.dockPanel.Skin = dockPanelSkin4; + this.dockPanel.Size = new System.Drawing.Size(784, 490); + dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight; + autoHideStripSkin1.DockStripGradient = dockPanelGradient1; + tabGradient1.EndColor = System.Drawing.SystemColors.Control; + tabGradient1.StartColor = System.Drawing.SystemColors.Control; + tabGradient1.TextColor = System.Drawing.SystemColors.ControlDarkDark; + autoHideStripSkin1.TabGradient = tabGradient1; + dockPanelSkin1.AutoHideStripSkin = autoHideStripSkin1; + tabGradient2.EndColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient2.StartColor = System.Drawing.SystemColors.ControlLightLight; + tabGradient2.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient1.ActiveTabGradient = tabGradient2; + dockPanelGradient2.EndColor = System.Drawing.SystemColors.Control; + dockPanelGradient2.StartColor = System.Drawing.SystemColors.Control; + dockPaneStripGradient1.DockStripGradient = dockPanelGradient2; + tabGradient3.EndColor = System.Drawing.SystemColors.ControlLight; + tabGradient3.StartColor = System.Drawing.SystemColors.ControlLight; + tabGradient3.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripGradient1.InactiveTabGradient = tabGradient3; + dockPaneStripSkin1.DocumentGradient = dockPaneStripGradient1; + tabGradient4.EndColor = System.Drawing.SystemColors.ActiveCaption; + tabGradient4.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient4.StartColor = System.Drawing.SystemColors.GradientActiveCaption; + tabGradient4.TextColor = System.Drawing.SystemColors.ActiveCaptionText; + dockPaneStripToolWindowGradient1.ActiveCaptionGradient = tabGradient4; + tabGradient5.EndColor = System.Drawing.SystemColors.Control; + tabGradient5.StartColor = System.Drawing.SystemColors.Control; + tabGradient5.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripToolWindowGradient1.ActiveTabGradient = tabGradient5; + dockPanelGradient3.EndColor = System.Drawing.SystemColors.ControlLight; + dockPanelGradient3.StartColor = System.Drawing.SystemColors.ControlLight; + dockPaneStripToolWindowGradient1.DockStripGradient = dockPanelGradient3; + tabGradient6.EndColor = System.Drawing.SystemColors.GradientInactiveCaption; + tabGradient6.LinearGradientMode = System.Drawing.Drawing2D.LinearGradientMode.Vertical; + tabGradient6.StartColor = System.Drawing.SystemColors.GradientInactiveCaption; + tabGradient6.TextColor = System.Drawing.SystemColors.ControlText; + dockPaneStripToolWindowGradient1.InactiveCaptionGradient = tabGradient6; + tabGradient7.EndColor = System.Drawing.Color.Transparent; + tabGradient7.StartColor = System.Drawing.Color.Transparent; + tabGradient7.TextColor = System.Drawing.SystemColors.ControlDarkDark; + dockPaneStripToolWindowGradient1.InactiveTabGradient = tabGradient7; + dockPaneStripSkin1.ToolWindowGradient = dockPaneStripToolWindowGradient1; + dockPanelSkin1.DockPaneStripSkin = dockPaneStripSkin1; + this.dockPanel.Skin = dockPanelSkin1; this.dockPanel.TabIndex = 4; - // - // registerToolStripMenuItem - // - this.registerToolStripMenuItem.Name = "registerToolStripMenuItem"; - this.registerToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.registerToolStripMenuItem.Text = "&Register"; - this.registerToolStripMenuItem.Click += new System.EventHandler(this.registerToolStripMenuItem_Click); - // - // localsToolStripMenuItem - // - this.localsToolStripMenuItem.Name = "localsToolStripMenuItem"; - this.localsToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.localsToolStripMenuItem.Text = "&Locals"; - this.localsToolStripMenuItem.Click += new System.EventHandler(this.localsToolStripMenuItem_Click); - // - // backtraceToolStripMenuItem - // - this.backtraceToolStripMenuItem.Name = "backtraceToolStripMenuItem"; - this.backtraceToolStripMenuItem.Size = new System.Drawing.Size(152, 22); - this.backtraceToolStripMenuItem.Text = "&Backtrace"; - this.backtraceToolStripMenuItem.Click += new System.EventHandler(this.backtraceToolStripMenuItem_Click); + this.dockPanel.ActiveContentChanged += new System.EventHandler(this.dockPanel_ActiveContentChanged); + // + // modulesToolStripMenuItem + // + this.modulesToolStripMenuItem.Name = "modulesToolStripMenuItem"; + this.modulesToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.modulesToolStripMenuItem.Text = "M&odules"; + this.modulesToolStripMenuItem.Click += new System.EventHandler(this.modulesToolStripMenuItem_Click); + // + // procThreadToolStripMenuItem + // + this.procThreadToolStripMenuItem.Name = "procThreadToolStripMenuItem"; + this.procThreadToolStripMenuItem.Size = new System.Drawing.Size(178, 22); + this.procThreadToolStripMenuItem.Text = "&Processes / Threads"; + this.procThreadToolStripMenuItem.Click += new System.EventHandler(this.procThreadToolStripMenuItem_Click); // // MainWindow // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(632, 453); + this.ClientSize = new System.Drawing.Size(784, 564); this.Controls.Add(this.statusStrip); this.Controls.Add(this.dockPanel); this.Controls.Add(this.toolStrip); @@ -590,6 +611,8 @@ private System.Windows.Forms.ToolStripMenuItem registerToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem localsToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem backtraceToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem modulesToolStripMenuItem; + private System.Windows.Forms.ToolStripMenuItem procThreadToolStripMenuItem; } } Modified: trunk/tools/reactosdbg/RosDBG/MainWindow.cs URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/MainWindow… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/MainWindow.cs [iso-8859-1] Thu May 28 13:16:07 2009 @@ -25,6 +25,8 @@ private RawTraffic m_RawTraffic = new RawTraffic(); private Locals m_Locals = new Locals(); private MemoryWindow m_MemoryWindow = new MemoryWindow(); + private ProcThread m_ProcThread = new ProcThread(); + private Modules m_Modules = new Modules(); private bool mRunning; private DebugConnection.Mode mConnectionMode; @@ -49,12 +51,15 @@ RegisterControl(m_RawTraffic); RegisterControl(m_Locals); RegisterControl(m_MemoryWindow); + RegisterControl(m_ProcThread); + RegisterControl(m_Modules); m_Locals.Show(dockPanel, DockState.DockRight); m_RegView.Show(dockPanel, DockState.DockRight); m_BackTrace.Show(dockPanel, DockState.DockBottom); m_RawTraffic.Show(dockPanel); - m_MemoryWindow.Show(dockPanel); + m_Modules.Show(dockPanel); + m_ProcThread.Show(dockPanel); ReactOSWeb web = new ReactOSWeb(); web.Show(dockPanel); } @@ -62,7 +67,7 @@ void ComposeTitleString() { FocusAddress(mCurrentEip); - toolStripStatusLabel.Text = "ConnectionMode: " + mConnectionMode + " - Running: " + mRunning + " - Source Location: " + mCurrentFile + ":" + mCurrentLine; + toolStripStatusLabel.Text = "ConnectionMode: " + mConnectionMode + " - Running: " + mRunning + (mCurrentFile.CompareTo("unknown") != 0 ? " - Source Location: " + mCurrentFile + ":" + mCurrentLine : ""); } void DebugModuleChangedEvent(object sender, DebugModuleChangedEventArgs args) @@ -131,32 +136,9 @@ } } - private void SaveAsToolStripMenuItem_Click(object sender, EventArgs e) - { - SaveFileDialog saveFileDialog = new SaveFileDialog(); - saveFileDialog.InitialDirectory = Environment.GetFolderPath(Environment.SpecialFolder.Personal); - saveFileDialog.Filter = "Textdateien (*.txt)|*.txt|Alle Dateien (*.*)|*.*"; - if (saveFileDialog.ShowDialog(this) == DialogResult.OK) - { - string FileName = saveFileDialog.FileName; - } - } - private void ExitToolsStripMenuItem_Click(object sender, EventArgs e) { this.Close(); - } - - private void CutToolStripMenuItem_Click(object sender, EventArgs e) - { - } - - private void CopyToolStripMenuItem_Click(object sender, EventArgs e) - { - } - - private void PasteToolStripMenuItem_Click(object sender, EventArgs e) - { } private void ToolBarToolStripMenuItem_Click(object sender, EventArgs e) @@ -326,11 +308,44 @@ m_Locals.Show(dockPanel, DockState.DockRight); } + private void procThreadToolStripMenuItem_Click(object sender, EventArgs e) + { + m_ProcThread.Show(dockPanel); + } + + private void modulesToolStripMenuItem_Click(object sender, EventArgs e) + { + m_Modules.Show(dockPanel); + } + private void backtraceToolStripMenuItem_Click(object sender, EventArgs e) { m_BackTrace.Show(dockPanel, DockState.DockBottom); } + private void saveToolStripMenuItem_Click(object sender, EventArgs e) + { + ((ToolWindow)dockPanel.ActiveDocument.DockHandler.Form).Save( + ((ToolWindow)dockPanel.ActiveDocument.DockHandler.Form).GetDocumentName()); + } + + private void SaveAsToolStripMenuItem_Click(object sender, EventArgs e) + { + ((ToolWindow)dockPanel.ActiveDocument.DockHandler.Form).SaveAs( + ((ToolWindow)dockPanel.ActiveDocument.DockHandler.Form).GetDocumentName()); + } + + private void dockPanel_ActiveContentChanged(object sender, EventArgs e) + { + ToolWindow Wnd = (ToolWindow)dockPanel.ActiveDocument.DockHandler.Form; + + saveToolStripButton.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.Save); + saveToolStripMenuItem.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.Save); + saveAsToolStripMenuItem.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.SaveAs); + printToolStripButton.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.Print); + printToolStripMenuItem.Enabled = Wnd.IsCmdEnabled(ToolWindow.Commands.Print); + } + } } Modified: trunk/tools/reactosdbg/RosDBG/RosDBG.csproj URL: http://svn.reactos.org/svn/reactos/trunk/tools/reactosdbg/RosDBG/RosDBG.csp… ============================================================================== --- trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] (original) +++ trunk/tools/reactosdbg/RosDBG/RosDBG.csproj [iso-8859-1] Thu May 28 13:16:07 2009 @@ -47,6 +47,10 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> + <Reference Include="Microsoft.mshtml, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> + <SpecificVersion>False</SpecificVersion> + <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Microsoft.NET\Primary Interop Assemblies\Microsoft.mshtml.dll</HintPath> + </Reference> <Reference Include="System" /> <Reference Include="System.Core"> <RequiredTargetFramework>3.5</RequiredTargetFramework> @@ -81,6 +85,12 @@ </Compile> <Compile Include="DebugInfoFile.cs" /> <Compile Include="DirectoryChooser.cs"> + </Compile> + <Compile Include="Dockable Objects\ToolWindow.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="Dockable Objects\ToolWindow.Designer.cs"> + <DependentUpon>ToolWindow.cs</DependentUpon> </Compile> <Compile Include="HighLevelInteraction.cs" /> <Compile Include="HostWindow.cs">

15 years, 3 months

[mjmartin] 41167: - i8042MouInternalDeviceControl: Forgotten from last commit. Partially implement internal IOCTLs IOCTL_INTERNAL_I8042_MOUSE_WRITE_BUFFER, IOCTL_INTERNAL_I8042_MOUSE_START_INFORMATION and IOCTL_MOUSE_QUERY_ATTRIBUTES.

by mjmartin＠svn.reactos.org

Author: mjmartin Date: Thu May 28 11:08:47 2009 New Revision: 41167 URL: http://svn.reactos.org/svn/reactos?rev=41167&view=rev Log: - i8042MouInternalDeviceControl: Forgotten from last commit. Partially implement internal IOCTLs IOCTL_INTERNAL_I8042_MOUSE_WRITE_BUFFER, IOCTL_INTERNAL_I8042_MOUSE_START_INFORMATION and IOCTL_MOUSE_QUERY_ATTRIBUTES. Modified: trunk/reactos/drivers/input/i8042prt/mouse.c Modified: trunk/reactos/drivers/input/i8042prt/mouse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/input/i8042prt/mou… ============================================================================== --- trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] (original) +++ trunk/reactos/drivers/input/i8042prt/mouse.c [iso-8859-1] Thu May 28 11:08:47 2009 @@ -498,6 +498,24 @@ Status = STATUS_SUCCESS; break; } + case IOCTL_INTERNAL_I8042_MOUSE_WRITE_BUFFER: + { + DPRINT1("IOCTL_INTERNAL_I8042_MOUSE_WRITE_BUFFER not implemented\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_INTERNAL_I8042_MOUSE_START_INFORMATION: + { + DPRINT1("IOCTL_INTERNAL_I8042_MOUSE_START_INFORMATION not implemented\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } + case IOCTL_MOUSE_QUERY_ATTRIBUTES: + { + DPRINT1("IOCTL_MOUSE_QUERY_ATTRIBUTES not implemented\n"); + Status = STATUS_NOT_IMPLEMENTED; + break; + } default: { ERR_(I8042PRT, "IRP_MJ_INTERNAL_DEVICE_CONTROL / unknown ioctl code 0x%lx\n",

15 years, 3 months

← Newer
1
...
4
5
6
7
8
9
10
...
51
Older →

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 May 2009