Skip to content

Commit

Permalink
cleanup unused code
Browse files Browse the repository at this point in the history
  • Loading branch information
awakecoding committed Sep 16, 2012
1 parent 4f3ad30 commit a0491ca
Show file tree
Hide file tree
Showing 28 changed files with 856 additions and 870 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ bin
*.userprefs
*.pidb
obj
*.pdb
*.dll
*.suo
*~


55 changes: 55 additions & 0 deletions FreeRDP.Server/FreeRDP.Server.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{509571ED-62AD-48D5-ADDE-ECC79FF87223}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FreeRDP.Server</RootNamespace>
<AssemblyName>FreeRDP.Server</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Server.cs" />
<Compile Include="Windows.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
36 changes: 36 additions & 0 deletions FreeRDP.Server/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("FreeRDP.Server")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("FreeRDP.Server")]
[assembly: AssemblyCopyright("Copyright © 2012")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("08699bff-c8a0-4b77-8fc6-0d1065fdc331")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
14 changes: 7 additions & 7 deletions GFreeRDP/IUserAction.cs → FreeRDP.Server/Server.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
/**
/**
* FreeRDP: A Remote Desktop Protocol Implementation
* Abstract Server Interface
*
* Copyright 2012 Marc-Andre Moreau <[email protected]>
* Copyright 2011-2012 Marc-Andre Moreau <[email protected]>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -16,12 +17,11 @@
* limitations under the License.
*/

using System;

namespace GFreeRDP
namespace FreeRDP.Server
{
public interface IUserAction
public abstract class Server
{
void OnNewConnection(string hostname, string username, string password);
public abstract void Start();
public abstract void Stop();
}
}
62 changes: 62 additions & 0 deletions FreeRDP.Server/Windows.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
/**
* FreeRDP: A Remote Desktop Protocol Implementation
* Windows Server Interface
*
* Copyright 2011-2012 Marc-Andre Moreau <[email protected]>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

using System;
using System.Text;
using System.Runtime.InteropServices;

namespace FreeRDP.Server
{
public class Windows : Server
{
private IntPtr instance;

[DllImport("libwfreerdp-server", CallingConvention = CallingConvention.Cdecl)]
public static extern IntPtr wfreerdp_server_new();

[DllImport("libwfreerdp-server", CallingConvention = CallingConvention.Cdecl)]
public static extern void wfreerdp_server_start(IntPtr instance);

[DllImport("libwfreerdp-server", CallingConvention = CallingConvention.Cdecl)]
public static extern void wfreerdp_server_stop(IntPtr instance);

[DllImport("libwfreerdp-server", CallingConvention = CallingConvention.Cdecl)]
public static extern void wfreerdp_server_free(IntPtr instance);

public Windows()
{
instance = wfreerdp_server_new();
}

~Windows()
{
wfreerdp_server_free(instance);
}

public override void Start()
{
wfreerdp_server_start(instance);
}

public override void Stop()
{
wfreerdp_server_stop(instance);
}
}
}
46 changes: 34 additions & 12 deletions FreeRDP.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,40 +5,65 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeRDP", "FreeRDP\FreeRDP.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NFreeRDP", "NFreeRDP\NFreeRDP.csproj", "{DDCCC18C-7B29-431D-8F48-F6DCD579D272}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GFreeRDP", "GFreeRDP\GFreeRDP.csproj", "{60C01725-0B80-414D-82F4-6EDEF452AD94}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeRDP.Server", "FreeRDP.Server\FreeRDP.Server.csproj", "{509571ED-62AD-48D5-ADDE-ECC79FF87223}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NFreeRDP-Server", "NFreeRDP-Server\NFreeRDP-Server.csproj", "{112B4C2E-6A1B-4ECF-9273-2E11AF8456AF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|Mixed Platforms = Release|Mixed Platforms
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{60C01725-0B80-414D-82F4-6EDEF452AD94}.Debug|Mixed Platforms.ActiveCfg = Debug|Mixed Platforms
{60C01725-0B80-414D-82F4-6EDEF452AD94}.Debug|Mixed Platforms.Build.0 = Debug|Mixed Platforms
{60C01725-0B80-414D-82F4-6EDEF452AD94}.Debug|x86.ActiveCfg = Debug|Mixed Platforms
{60C01725-0B80-414D-82F4-6EDEF452AD94}.Debug|x86.Build.0 = Debug|Mixed Platforms
{60C01725-0B80-414D-82F4-6EDEF452AD94}.Release|Mixed Platforms.ActiveCfg = Release|Mixed Platforms
{60C01725-0B80-414D-82F4-6EDEF452AD94}.Release|Mixed Platforms.Build.0 = Release|Mixed Platforms
{60C01725-0B80-414D-82F4-6EDEF452AD94}.Release|x86.ActiveCfg = Release|Mixed Platforms
{60C01725-0B80-414D-82F4-6EDEF452AD94}.Release|x86.Build.0 = Release|Mixed Platforms
{C5E8D831-864B-4BE7-8027-77727D5A6D80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C5E8D831-864B-4BE7-8027-77727D5A6D80}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C5E8D831-864B-4BE7-8027-77727D5A6D80}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{C5E8D831-864B-4BE7-8027-77727D5A6D80}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{C5E8D831-864B-4BE7-8027-77727D5A6D80}.Debug|x86.ActiveCfg = Debug|Any CPU
{C5E8D831-864B-4BE7-8027-77727D5A6D80}.Debug|x86.Build.0 = Debug|Any CPU
{C5E8D831-864B-4BE7-8027-77727D5A6D80}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C5E8D831-864B-4BE7-8027-77727D5A6D80}.Release|Any CPU.Build.0 = Release|Any CPU
{C5E8D831-864B-4BE7-8027-77727D5A6D80}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{C5E8D831-864B-4BE7-8027-77727D5A6D80}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{C5E8D831-864B-4BE7-8027-77727D5A6D80}.Release|x86.ActiveCfg = Release|Any CPU
{C5E8D831-864B-4BE7-8027-77727D5A6D80}.Release|x86.Build.0 = Release|Any CPU
{DDCCC18C-7B29-431D-8F48-F6DCD579D272}.Debug|Any CPU.ActiveCfg = Debug|x86
{DDCCC18C-7B29-431D-8F48-F6DCD579D272}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{DDCCC18C-7B29-431D-8F48-F6DCD579D272}.Debug|Mixed Platforms.Build.0 = Debug|x86
{DDCCC18C-7B29-431D-8F48-F6DCD579D272}.Debug|x86.ActiveCfg = Debug|x86
{DDCCC18C-7B29-431D-8F48-F6DCD579D272}.Debug|x86.Build.0 = Debug|x86
{DDCCC18C-7B29-431D-8F48-F6DCD579D272}.Release|Any CPU.ActiveCfg = Release|x86
{DDCCC18C-7B29-431D-8F48-F6DCD579D272}.Release|Mixed Platforms.ActiveCfg = Release|x86
{DDCCC18C-7B29-431D-8F48-F6DCD579D272}.Release|Mixed Platforms.Build.0 = Release|x86
{DDCCC18C-7B29-431D-8F48-F6DCD579D272}.Release|x86.ActiveCfg = Release|x86
{DDCCC18C-7B29-431D-8F48-F6DCD579D272}.Release|x86.Build.0 = Release|x86
{509571ED-62AD-48D5-ADDE-ECC79FF87223}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{509571ED-62AD-48D5-ADDE-ECC79FF87223}.Debug|Any CPU.Build.0 = Debug|Any CPU
{509571ED-62AD-48D5-ADDE-ECC79FF87223}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{509571ED-62AD-48D5-ADDE-ECC79FF87223}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{509571ED-62AD-48D5-ADDE-ECC79FF87223}.Debug|x86.ActiveCfg = Debug|Any CPU
{509571ED-62AD-48D5-ADDE-ECC79FF87223}.Release|Any CPU.ActiveCfg = Release|Any CPU
{509571ED-62AD-48D5-ADDE-ECC79FF87223}.Release|Any CPU.Build.0 = Release|Any CPU
{509571ED-62AD-48D5-ADDE-ECC79FF87223}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{509571ED-62AD-48D5-ADDE-ECC79FF87223}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{509571ED-62AD-48D5-ADDE-ECC79FF87223}.Release|x86.ActiveCfg = Release|Any CPU
{112B4C2E-6A1B-4ECF-9273-2E11AF8456AF}.Debug|Any CPU.ActiveCfg = Debug|x86
{112B4C2E-6A1B-4ECF-9273-2E11AF8456AF}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{112B4C2E-6A1B-4ECF-9273-2E11AF8456AF}.Debug|Mixed Platforms.Build.0 = Debug|x86
{112B4C2E-6A1B-4ECF-9273-2E11AF8456AF}.Debug|x86.ActiveCfg = Debug|x86
{112B4C2E-6A1B-4ECF-9273-2E11AF8456AF}.Debug|x86.Build.0 = Debug|x86
{112B4C2E-6A1B-4ECF-9273-2E11AF8456AF}.Release|Any CPU.ActiveCfg = Release|x86
{112B4C2E-6A1B-4ECF-9273-2E11AF8456AF}.Release|Mixed Platforms.ActiveCfg = Release|x86
{112B4C2E-6A1B-4ECF-9273-2E11AF8456AF}.Release|Mixed Platforms.Build.0 = Release|x86
{112B4C2E-6A1B-4ECF-9273-2E11AF8456AF}.Release|x86.ActiveCfg = Release|x86
{112B4C2E-6A1B-4ECF-9273-2E11AF8456AF}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = GFreeRDP\GFreeRDP.csproj
Expand All @@ -54,7 +79,4 @@ Global
$3.inheritsScope = text/x-csharp
$3.scope = text/x-csharp
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
27 changes: 0 additions & 27 deletions GFreeRDP/AssemblyInfo.cs

This file was deleted.

58 changes: 0 additions & 58 deletions GFreeRDP/ConnectionDialog.cs

This file was deleted.

Loading

0 comments on commit a0491ca

Please sign in to comment.