8 files changed, 635 insertions, 10 deletions
diff --git a/imo2sproxy/msvc/imoproxy.sln b/imo2sproxy/msvc/imoproxy.sln
new file mode 100644
index 0000000..69ec646
--- /dev/null
+++ b/imo2sproxy/msvc/imoproxy.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imoproxy", "imoproxy.vcxproj", "{609F6098-0772-1FDF-3B31-77BF41EEEA73}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "imoskype", "imoskype.vcxproj", "{CFC9DE96-16A4-B5E3-811B-FB8AF02ACE16}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+		Template|Win32 = Template|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{609F6098-0772-1FDF-3B31-77BF41EEEA73}.Debug|Win32.ActiveCfg = Debug|Win32
+		{609F6098-0772-1FDF-3B31-77BF41EEEA73}.Debug|Win32.Build.0 = Debug|Win32
+		{609F6098-0772-1FDF-3B31-77BF41EEEA73}.Release|Win32.ActiveCfg = Release|Win32
+		{609F6098-0772-1FDF-3B31-77BF41EEEA73}.Release|Win32.Build.0 = Release|Win32
+		{609F6098-0772-1FDF-3B31-77BF41EEEA73}.Template|Win32.ActiveCfg = Release|Win32
+		{609F6098-0772-1FDF-3B31-77BF41EEEA73}.Template|Win32.Build.0 = Release|Win32
+		{CFC9DE96-16A4-B5E3-811B-FB8AF02ACE16}.Debug|Win32.ActiveCfg = Debug|Win32
+		{CFC9DE96-16A4-B5E3-811B-FB8AF02ACE16}.Debug|Win32.Build.0 = Debug|Win32
+		{CFC9DE96-16A4-B5E3-811B-FB8AF02ACE16}.Release|Win32.ActiveCfg = Release|Win32
+		{CFC9DE96-16A4-B5E3-811B-FB8AF02ACE16}.Release|Win32.Build.0 = Release|Win32
+		{CFC9DE96-16A4-B5E3-811B-FB8AF02ACE16}.Template|Win32.ActiveCfg = Template|Win32
+		{CFC9DE96-16A4-B5E3-811B-FB8AF02ACE16}.Template|Win32.Build.0 = Template|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/imo2sproxy/msvc/imoproxy.vcxproj b/imo2sproxy/msvc/imoproxy.vcxproj
new file mode 100644
index 0000000..393d278
--- /dev/null
+++ b/imo2sproxy/msvc/imoproxy.vcxproj
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <SccProjectName />
+    <SccLocalPath />
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)/Plugins\</OutDir>
+    <IntDir>$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <IntDir>$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)$(Configuration)/Plugins\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
+      <Optimization>Disabled</Optimization>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <WarningLevel>Level3</WarningLevel>
+      <MinimalRebuild>true</MinimalRebuild>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <AdditionalIncludeDirectories>../src/common;../src/imolib;../src/imo2skype;../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;imoproxy_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BrowseInformation>true</BrowseInformation>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+    </ClCompile>
+    <Midl>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <TypeLibraryName>.\Debug\imoproxy.tlb</TypeLibraryName>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <TargetEnvironment>Win32</TargetEnvironment>
+    </Midl>
+    <ResourceCompile>
+      <Culture>0x0c07</Culture>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <LinkDLL>true</LinkDLL>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <StringPooling>true</StringPooling>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <Optimization>Full</Optimization>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <WarningLevel>Level3</WarningLevel>
+      <IgnoreStandardIncludePath>false</IgnoreStandardIncludePath>
+      <AdditionalIncludeDirectories>../src/common;../src/imolib;../src/imo2skype;../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;imoproxy_EXPORTS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BrowseInformation>true</BrowseInformation>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+    </ClCompile>
+    <Midl>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <TypeLibraryName>.\Release\imoproxy.tlb</TypeLibraryName>
+      <MkTypLibCompatible>true</MkTypLibCompatible>
+      <TargetEnvironment>Win32</TargetEnvironment>
+    </Midl>
+    <ResourceCompile>
+      <Culture>0x0c07</Culture>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <LinkDLL>true</LinkDLL>
+      <SubSystem>Console</SubSystem>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\imo2skype\avatarlist.c" />
+    <ClCompile Include="..\src\imo2skype\buddylist.c" />
+    <ClCompile Include="..\src\imo2skype\callqueue.c" />
+    <ClCompile Include="..\src\common\cJSON.c" />
+    <ClCompile Include="..\src\common\fifo.c" />
+    <ClCompile Include="..\src\imo2skype\imo2skypeapi.c" />
+    <ClCompile Include="..\src\imo2skype\imo2sproxy.c" />
+    <ClCompile Include="..\src\imo2skype\miranda\io_layer_netlib.c" />
+    <ClCompile Include="..\src\imolib\imo_request.c" />
+    <ClCompile Include="..\src\imolib\imo_skype.c" />
+    <ClCompile Include="..\src\imo2skype\miranda\imoproxy.c" />
+    <ClCompile Include="..\src\imolib\io_layer_win32.c" />
+    <ClCompile Include="..\src\common\memlist.c" />
+    <ClCompile Include="..\src\imo2skype\msgqueue.c" />
+    <ClCompile Include="..\src\imo2skype\queue.c" />
+    <ClCompile Include="..\src\imo2skype\miranda\skypepluginlink.c" />
+    <ClCompile Include="..\src\imo2skype\socksproxy.c" />
+    <ClCompile Include="..\src\imo2skype\w32browser.c" />
+    <ClCompile Include="..\src\imo2skype\w32skypeemu.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\imo2skype\avatarlist.h" />
+    <ClInclude Include="..\src\imo2skype\buddylist.h" />
+    <ClInclude Include="..\src\imo2skype\callqueue.h" />
+    <ClInclude Include="..\src\common\cJSON.h" />
+    <ClInclude Include="..\src\common\fifo.h" />
+    <ClInclude Include="..\src\imo2skype\imo2skypeapi.h" />
+    <ClInclude Include="..\src\imo2skype\imo2sproxy.h" />
+    <ClInclude Include="..\src\imolib\imo_request.h" />
+    <ClInclude Include="..\src\imolib\imo_skype.h" />
+    <ClInclude Include="..\src\imolib\io_layer.h" />
+    <ClInclude Include="..\src\common\memlist.h" />
+    <ClInclude Include="..\src\imo2skype\msgqueue.h" />
+    <ClInclude Include="..\src\imo2skype\queue.h" />
+    <ClInclude Include="..\src\imo2skype\miranda\skypepluginlink.h" />
+    <ClInclude Include="..\src\imo2skype\socksproxy.h" />
+    <ClInclude Include="..\src\imo2skype\w32browser.h" />
+    <ClInclude Include="..\src\imo2skype\w32skypeemu.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\src\imo2skype\miranda\res.rc">
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\Sources\svn.mim.new\imo2sproxy\src\imo2skype\miranda;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\Sources\svn.mim.new\imo2sproxy\src\imo2skype\miranda;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ResourceCompile>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
+\ No newline at end of file
diff --git a/imo2sproxy/msvc/imoproxy.vcxproj.filters b/imo2sproxy/msvc/imoproxy.vcxproj.filters
new file mode 100644
index 0000000..2b3bc03
--- /dev/null
+++ b/imo2sproxy/msvc/imoproxy.vcxproj.filters
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Quellcodedateien">
+      <UniqueIdentifier>{288c6599-c842-4411-b9ee-00d1a9083076}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Header-Dateien">
+      <UniqueIdentifier>{1dab0c2b-0346-4cb2-a196-c735aff137ee}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+    <Filter Include="Ressourcendateien">
+      <UniqueIdentifier>{81de8f2b-05ca-4efa-9bb4-a49b6bcbdb51}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\imo2skype\buddylist.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imo2skype\callqueue.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\cJSON.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\fifo.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imo2skype\imo2skypeapi.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imo2skype\imo2sproxy.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imolib\imo_request.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imolib\imo_skype.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imo2skype\miranda\imoproxy.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imolib\io_layer_win32.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\memlist.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imo2skype\msgqueue.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imo2skype\queue.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imo2skype\miranda\skypepluginlink.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imo2skype\socksproxy.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imo2skype\w32browser.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imo2skype\w32skypeemu.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imo2skype\avatarlist.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imo2skype\miranda\io_layer_netlib.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\imo2skype\buddylist.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imo2skype\callqueue.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\cJSON.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\fifo.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imo2skype\imo2skypeapi.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imo2skype\imo2sproxy.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imolib\imo_request.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imolib\imo_skype.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imolib\io_layer.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\memlist.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imo2skype\msgqueue.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imo2skype\queue.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imo2skype\miranda\skypepluginlink.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imo2skype\socksproxy.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imo2skype\w32browser.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imo2skype\w32skypeemu.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imo2skype\avatarlist.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\src\imo2skype\miranda\res.rc">
+      <Filter>Ressourcendateien</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/imo2sproxy/msvc/imoskype.vcxproj b/imo2sproxy/msvc/imoskype.vcxproj
new file mode 100644
index 0000000..97df505
--- /dev/null
+++ b/imo2sproxy/msvc/imoskype.vcxproj
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Template|Win32">
+      <Configuration>Template</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <SccProjectName />
+    <SccLocalPath />
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>false</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(VCTargetsPath)Microsoft.Cpp.UpgradeFromVC60.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)/Plugins\</OutDir>
+    <IntDir>$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <OutDir>$(SolutionDir)$(Configuration)/Plugins\</OutDir>
+    <IntDir>$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <InlineFunctionExpansion>Default</InlineFunctionExpansion>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
+      <Optimization>Disabled</Optimization>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <WarningLevel>Level3</WarningLevel>
+      <MinimalRebuild>true</MinimalRebuild>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <AdditionalIncludeDirectories>../src/common;../src/imolib;../src/imo2skype;../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PrecompiledHeaderOutputFile>.\Debug\imoskype.pch</PrecompiledHeaderOutputFile>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+    </ClCompile>
+    <Midl>
+      <TypeLibraryName>.\Debug\imoskype.tlb</TypeLibraryName>
+    </Midl>
+    <ResourceCompile>
+      <Culture>0x0c07</Culture>
+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <StringPooling>true</StringPooling>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <Optimization>Full</Optimization>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <WarningLevel>Level3</WarningLevel>
+      <AdditionalIncludeDirectories>../src/common;../src/imo2skype;../src/imolib;../../include;../../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <BrowseInformation>true</BrowseInformation>
+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+    </ClCompile>
+    <Midl>
+      <TypeLibraryName>.\Release\imoskype.tlb</TypeLibraryName>
+    </Midl>
+    <ResourceCompile>
+      <Culture>0x0c07</Culture>
+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
+    <Bscmake>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+    </Bscmake>
+    <Link>
+      <SuppressStartupBanner>true</SuppressStartupBanner>
+      <SubSystem>Console</SubSystem>
+      <AdditionalDependencies>odbc32.lib;odbccp32.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\imo2skype\avatarlist.c" />
+    <ClCompile Include="..\src\imo2skype\buddylist.c" />
+    <ClCompile Include="..\src\imo2skype\callqueue.c" />
+    <ClCompile Include="..\src\common\cJSON.c" />
+    <ClCompile Include="..\src\common\fifo.c" />
+    <ClCompile Include="..\src\imo2skype\imo2skypeapi.c" />
+    <ClCompile Include="..\src\imo2skype\imo2sproxy.c" />
+    <ClCompile Include="..\src\imolib\imo_request.c" />
+    <ClCompile Include="..\src\imolib\imo_skype.c" />
+    <ClCompile Include="..\src\imolib\io_layer_win32.c" />
+    <ClCompile Include="..\src\imo2skype\main.c" />
+    <ClCompile Include="..\src\common\memlist.c" />
+    <ClCompile Include="..\src\imo2skype\msgqueue.c" />
+    <ClCompile Include="..\src\imo2skype\queue.c" />
+    <ClCompile Include="..\src\imo2skype\socksproxy.c" />
+    <ClCompile Include="..\src\imo2skype\w32browser.c" />
+    <ClCompile Include="..\src\imo2skype\w32skypeemu.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\imo2skype\avatarlist.h" />
+    <ClInclude Include="..\src\imo2skype\buddylist.h" />
+    <ClInclude Include="..\src\imo2skype\callqueue.h" />
+    <ClInclude Include="..\src\common\cJSON.h" />
+    <ClInclude Include="..\src\common\fifo.h" />
+    <ClInclude Include="..\src\imo2skype\imo2skypeapi.h" />
+    <ClInclude Include="..\src\imo2skype\imo2sproxy.h" />
+    <ClInclude Include="..\src\imolib\imo_request.h" />
+    <ClInclude Include="..\src\imolib\imo_skype.h" />
+    <ClInclude Include="..\src\imolib\io_layer.h" />
+    <ClInclude Include="..\src\common\memlist.h" />
+    <ClInclude Include="..\src\imo2skype\msgqueue.h" />
+    <ClInclude Include="..\src\imo2skype\queue.h" />
+    <ClInclude Include="..\src\imo2skype\socksproxy.h" />
+    <ClInclude Include="..\src\imo2skype\w32browser.h" />
+    <ClInclude Include="..\src\imo2skype\w32skypeemu.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
+\ No newline at end of file
diff --git a/imo2sproxy/msvc/imoskype.vcxproj.filters b/imo2sproxy/msvc/imoskype.vcxproj.filters
new file mode 100644
index 0000000..7f6f013
--- /dev/null
+++ b/imo2sproxy/msvc/imoskype.vcxproj.filters
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Quellcodedateien">
+      <UniqueIdentifier>{49295a05-b07d-4360-abfb-1e43e52d536c}</UniqueIdentifier>
+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
+    </Filter>
+    <Filter Include="Header-Dateien">
+      <UniqueIdentifier>{3d1fb946-0eba-471f-8ac5-3e6b26d4649f}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl</Extensions>
+    </Filter>
+    <Filter Include="Ressourcendateien">
+      <UniqueIdentifier>{046433d8-2654-45f6-a85d-7f6984c6bd26}</UniqueIdentifier>
+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\imo2skype\buddylist.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imo2skype\callqueue.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\cJSON.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\fifo.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imo2skype\imo2skypeapi.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imo2skype\imo2sproxy.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imolib\imo_request.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imolib\imo_skype.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imolib\io_layer_win32.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imo2skype\main.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\common\memlist.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imo2skype\msgqueue.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imo2skype\queue.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imo2skype\socksproxy.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imo2skype\w32browser.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imo2skype\w32skypeemu.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\imo2skype\avatarlist.c">
+      <Filter>Quellcodedateien</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\imo2skype\buddylist.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imo2skype\callqueue.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\cJSON.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\fifo.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imo2skype\imo2skypeapi.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imo2skype\imo2sproxy.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imolib\imo_request.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imolib\imo_skype.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imolib\io_layer.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\common\memlist.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imo2skype\msgqueue.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imo2skype\queue.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imo2skype\socksproxy.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imo2skype\w32browser.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imo2skype\w32skypeemu.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\imo2skype\avatarlist.h">
+      <Filter>Header-Dateien</Filter>
+    </ClInclude>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/imo2sproxy/src/imo2skype/miranda/imoproxy.c b/imo2sproxy/src/imo2skype/miranda/imoproxy.c
index 6ca6512..1b11907 100644
--- a/imo2sproxy/src/imo2skype/miranda/imoproxy.c
+++ b/imo2sproxy/src/imo2skype/miranda/imoproxy.c
@@ -21,12 +21,12 @@
 #include "socksproxy.h"
 #include "w32skypeemu.h"
 #include "skypepluginlink.h"
-#include "include/newpluginapi.h"
-#include "include/m_langpack.h"
-#include "include/m_options.h"
-#include "include/m_database.h"
-#include "include/m_system.h"
-#include "sdk/m_updater.h"
+#include "newpluginapi.h"
+#include "m_langpack.h"
+#include "m_options.h"
+#include "m_database.h"
+#include "m_system.h"
+#include "m_updater.h"
 #include "resource.h"
 
 // Crash dumper
diff --git a/imo2sproxy/src/imo2skype/miranda/io_layer_netlib.c b/imo2sproxy/src/imo2skype/miranda/io_layer_netlib.c
index 378f72e..56d461f 100644
--- a/imo2sproxy/src/imo2skype/miranda/io_layer_netlib.c
+++ b/imo2sproxy/src/imo2skype/miranda/io_layer_netlib.c
@@ -7,8 +7,8 @@
 #include <windows.h>
 #include <winsock2.h>
 #include <stdlib.h>
-#include "include/newpluginapi.h"
-#include "include/m_netlib.h"
+#include "newpluginapi.h"
+#include "m_netlib.h"
 #include "fifo.h"
 #include "memlist.h"
 #include "io_layer.h"
diff --git a/imo2sproxy/src/imo2skype/miranda/skypepluginlink.c b/imo2sproxy/src/imo2skype/miranda/skypepluginlink.c
index 0109bd6..3efd400 100644
--- a/imo2sproxy/src/imo2skype/miranda/skypepluginlink.c
+++ b/imo2sproxy/src/imo2skype/miranda/skypepluginlink.c
@@ -3,8 +3,8 @@
 #include <windows.h>
 #include <stdlib.h>
 #include "skypepluginlink.h"
-#include "include/newpluginapi.h"
-#include "include/m_system.h"
+#include "newpluginapi.h"
+#include "m_system.h"
 
 #define LockMutex(x) EnterCriticalSection (&x)
 #define UnlockMutex(x) LeaveCriticalSection(&x)