Skip to content

Commit 2dfde62

Browse files
authored
replaced interop library with internal code (#9)
* replaced interop library with internal code * deleted old files of Interop library
1 parent edeccc2 commit 2dfde62

55 files changed

Lines changed: 67 additions & 2252 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

CloudInit.ConfigDrive.sln

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
44
VisualStudioVersion = 15.0.27428.2015
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenConfigDrive", "src\GenConfigDrive\GenConfigDrive.csproj", "{A71DAC22-FD4F-476C-B694-70FD07413AC7}"
7-
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Windows.ImagingApi", "src\Windows.ImagingApi\Windows.ImagingApi.csproj", "{47CC75BB-AD6A-4596-9E55-8CD427A88BBE}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GenConfigDrive", "src\GenConfigDrive\GenConfigDrive.csproj", "{A71DAC22-FD4F-476C-B694-70FD07413AC7}"
97
EndProject
108
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudInit.ConfigDrive.Core", "src\CloudInit.ConfigDrive.Core\CloudInit.ConfigDrive.Core.csproj", "{1CC6A38B-FCA8-4EB6-A3C1-33DFB41F8DBB}"
119
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CloudInit.ConfigDrive.WindowsImaging", "src\CloudInit.ConfigDrive.WindowsImaging\CloudInit.ConfigDrive.WindowsImaging.csproj", "{77D7A071-FAA5-438C-8312-9AE2DCF872DC}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudInit.ConfigDrive.WindowsImaging", "src\CloudInit.ConfigDrive.WindowsImaging\CloudInit.ConfigDrive.WindowsImaging.csproj", "{77D7A071-FAA5-438C-8312-9AE2DCF872DC}"
1311
EndProject
1412
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudInit.ConfigDrive.Abstractions", "src\CloudInit.ConfigDrive.Abstractions\CloudInit.ConfigDrive.Abstractions.csproj", "{BF9DF076-07E1-422C-A044-36D3F832B5BE}"
1513
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CloudInit.ConfigDrive", "src\CloudInit.ConfigDrive\CloudInit.ConfigDrive.csproj", "{F393029E-52DF-44C3-818D-94B71807E335}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudInit.ConfigDrive", "src\CloudInit.ConfigDrive\CloudInit.ConfigDrive.csproj", "{F393029E-52DF-44C3-818D-94B71807E335}"
1715
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CloudInit.ConfigDrive.NoCloud", "src\CloudInit.ConfigDrive.NoCloud\CloudInit.ConfigDrive.NoCloud.csproj", "{1B4A5A68-A987-4B31-BAC6-20F130B6C171}"
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CloudInit.ConfigDrive.NoCloud", "src\CloudInit.ConfigDrive.NoCloud\CloudInit.ConfigDrive.NoCloud.csproj", "{1B4A5A68-A987-4B31-BAC6-20F130B6C171}"
1917
EndProject
2018
Global
2119
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -27,10 +25,6 @@ Global
2725
{A71DAC22-FD4F-476C-B694-70FD07413AC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
2826
{A71DAC22-FD4F-476C-B694-70FD07413AC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
2927
{A71DAC22-FD4F-476C-B694-70FD07413AC7}.Release|Any CPU.Build.0 = Release|Any CPU
30-
{47CC75BB-AD6A-4596-9E55-8CD427A88BBE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31-
{47CC75BB-AD6A-4596-9E55-8CD427A88BBE}.Debug|Any CPU.Build.0 = Debug|Any CPU
32-
{47CC75BB-AD6A-4596-9E55-8CD427A88BBE}.Release|Any CPU.ActiveCfg = Release|Any CPU
33-
{47CC75BB-AD6A-4596-9E55-8CD427A88BBE}.Release|Any CPU.Build.0 = Release|Any CPU
3428
{1CC6A38B-FCA8-4EB6-A3C1-33DFB41F8DBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3529
{1CC6A38B-FCA8-4EB6-A3C1-33DFB41F8DBB}.Debug|Any CPU.Build.0 = Debug|Any CPU
3630
{1CC6A38B-FCA8-4EB6-A3C1-33DFB41F8DBB}.Release|Any CPU.ActiveCfg = Release|Any CPU

src/CloudInit.ConfigDrive.WindowsImaging/CloudInit.ConfigDrive.WindowsImaging.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525

2626
<ItemGroup>
2727
<ProjectReference Include="..\CloudInit.ConfigDrive.Core\CloudInit.ConfigDrive.Core.csproj" />
28-
<ProjectReference Include="..\Windows.ImagingApi\Windows.ImagingApi.csproj" />
29-
</ItemGroup>
28+
</ItemGroup>
3029

3130
</Project>

src/Windows.ImagingApi/ImageStream.cs renamed to src/CloudInit.ConfigDrive.WindowsImaging/ImageStream.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
using System.Runtime.InteropServices;
55
using System.Runtime.InteropServices.ComTypes;
66

7-
namespace Contiva.Windows.ImagingApi
7+
namespace Contiva.CloudInit.ConfigDrive
88
{
99
/// <summary>
1010
/// This is a representation of an IO.Stream and IStream object.
1111
/// </summary>
12-
public class ImageStream : Stream, IStream, IDisposable
12+
internal class ImageStream : Stream, IStream, IDisposable
1313
{
1414
/// <summary>
1515
/// Gets a value indicating whether the current stream supports reading.

src/Windows.ImagingApi/Interop/DDiscFormat2DataEvents.cs renamed to src/CloudInit.ConfigDrive.WindowsImaging/Interop/DDiscFormat2DataEvents.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System.Runtime.CompilerServices;
22
using System.Runtime.InteropServices;
33

4-
namespace Contiva.Windows.ImagingApi.Interop
4+
namespace Contiva.CloudInit.ConfigDrive.Interop
55
{
66
[TypeLibType(4480)]
77
[Guid("2735413C-7F64-5B0F-8F00-5D77AFBE261E"), ComImport]

src/Windows.ImagingApi/Interop/DiscFormat2Data_Events.cs renamed to src/CloudInit.ConfigDrive.WindowsImaging/Interop/DiscFormat2Data_Events.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System.Runtime.InteropServices;
22

3-
namespace Contiva.Windows.ImagingApi.Interop
3+
namespace Contiva.CloudInit.ConfigDrive.Interop
44
{
55
[TypeLibType((short)0x10), ComVisible(false), ComEventInterface(typeof(DDiscFormat2DataEvents), typeof(DiscFormat2Data_EventsProvider))]
66
public interface DiscFormat2Data_Events

src/Windows.ImagingApi/Interop/DiscFormat2Data_EventsHandler.cs renamed to src/CloudInit.ConfigDrive.WindowsImaging/Interop/DiscFormat2Data_EventsHandler.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
using System.Runtime.InteropServices;
2+
23
// ReSharper disable InconsistentNaming
34

4-
namespace Contiva.Windows.ImagingApi.Interop
5+
namespace Contiva.CloudInit.ConfigDrive.Interop
56
{
67
[UnmanagedFunctionPointer(CallingConvention.StdCall)]
78
public delegate void DiscFormat2Data_EventsHandler([In, MarshalAs(UnmanagedType.IDispatch)] object sender, [In, MarshalAs(UnmanagedType.IDispatch)] object args);

src/Windows.ImagingApi/Interop/DiscFormat2Data_EventsProvider.cs renamed to src/CloudInit.ConfigDrive.WindowsImaging/Interop/DiscFormat2Data_EventsProvider.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System.Runtime.InteropServices.ComTypes;
55
using System.Threading;
66

7-
namespace Contiva.Windows.ImagingApi.Interop
7+
namespace Contiva.CloudInit.ConfigDrive.Interop
88
{
99
[ClassInterface(ClassInterfaceType.None)]
1010
// ReSharper disable once InconsistentNaming

src/Windows.ImagingApi/Interop/DiscFormat2Data_SinkHelper.cs renamed to src/CloudInit.ConfigDrive.WindowsImaging/Interop/DiscFormat2Data_SinkHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#pragma warning disable 1584,1711,1572,1581,1580
2323
#pragma warning disable 1591
2424

25-
namespace Contiva.Windows.ImagingApi.Interop
25+
namespace Contiva.CloudInit.ConfigDrive.Interop
2626
{
2727
// Interfaces
2828

src/Windows.ImagingApi/Interop/EmulationType.cs renamed to src/CloudInit.ConfigDrive.WindowsImaging/Interop/EmulationType.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22

3-
namespace Contiva.Windows.ImagingApi.Interop
3+
namespace Contiva.CloudInit.ConfigDrive.Interop
44
{
55
[Flags]
66
public enum EmulationType

src/Windows.ImagingApi/Interop/FsiFileSystems.cs renamed to src/CloudInit.ConfigDrive.WindowsImaging/Interop/FsiFileSystems.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
using System;
55

66
#pragma warning disable 1591
7-
namespace Contiva.Windows.ImagingApi.Interop
7+
namespace Contiva.CloudInit.ConfigDrive.Interop
88
{
99
[Flags]
1010
public enum FsiFileSystems

0 commit comments

Comments
 (0)