another part of small project fixes and x64 adaptation in some cases

git-svn-id: http://miranda-plugins.googlecode.com/svn/trunk@229 e753b5eb-9565-29b2-b5c5-2cc6f99dfbcb

7 files changed, 399 insertions, 14 deletions

diff --git a/NewStatusNotify/NewStatusNotify_10.sln b/NewStatusNotify/NewStatusNotify_10.sln
new file mode 100644
index 0000000..86109d7
--- /dev/null
+++ b/NewStatusNotify/NewStatusNotify_10.sln
@@ -0,0 +1,25 @@
+Microsoft Visual Studio Solution File, Format Version 11.00

+# Visual Studio 2010

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewStatusNotify", "NewStatusNotify_10.vcxproj", "{78E0E6B0-2D7E-4B4D-899A-DA244FBBEC73}"

+EndProject

+Global

+	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+		Debug_Unicode|Win32 = Debug_Unicode|Win32

+		Debug|Win32 = Debug|Win32

+		Release_Unicode|Win32 = Release_Unicode|Win32

+		Release|Win32 = Release|Win32

+	EndGlobalSection

+	GlobalSection(ProjectConfigurationPlatforms) = postSolution

+		{78E0E6B0-2D7E-4B4D-899A-DA244FBBEC73}.Debug_Unicode|Win32.ActiveCfg = Debug Unicode|Win32

+		{78E0E6B0-2D7E-4B4D-899A-DA244FBBEC73}.Debug_Unicode|Win32.Build.0 = Debug Unicode|Win32

+		{78E0E6B0-2D7E-4B4D-899A-DA244FBBEC73}.Debug|Win32.ActiveCfg = Debug|Win32

+		{78E0E6B0-2D7E-4B4D-899A-DA244FBBEC73}.Debug|Win32.Build.0 = Debug|Win32

+		{78E0E6B0-2D7E-4B4D-899A-DA244FBBEC73}.Release_Unicode|Win32.ActiveCfg = Release Unicode|Win32

+		{78E0E6B0-2D7E-4B4D-899A-DA244FBBEC73}.Release_Unicode|Win32.Build.0 = Release Unicode|Win32

+		{78E0E6B0-2D7E-4B4D-899A-DA244FBBEC73}.Release|Win32.ActiveCfg = Release|Win32

+		{78E0E6B0-2D7E-4B4D-899A-DA244FBBEC73}.Release|Win32.Build.0 = Release|Win32

+	EndGlobalSection

+	GlobalSection(SolutionProperties) = preSolution

+		HideSolutionNode = FALSE

+	EndGlobalSection

+EndGlobal

diff --git a/NewStatusNotify/NewStatusNotify_10.vcxproj b/NewStatusNotify/NewStatusNotify_10.vcxproj
new file mode 100644
index 0000000..a511248
--- /dev/null
+++ b/NewStatusNotify/NewStatusNotify_10.vcxproj
@@ -0,0 +1,300 @@
+<?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 Unicode|Win32">

+      <Configuration>Debug Unicode</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Debug|Win32">

+      <Configuration>Debug</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release Unicode|Win32">

+      <Configuration>Release Unicode</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+    <ProjectConfiguration Include="Release|Win32">

+      <Configuration>Release</Configuration>

+      <Platform>Win32</Platform>

+    </ProjectConfiguration>

+  </ItemGroup>

+  <PropertyGroup Label="Globals">

+    <ProjectName>NewStatusNotify</ProjectName>

+    <ProjectGuid>{78E0E6B0-2D7E-4B4D-899A-DA244FBBEC73}</ProjectGuid>

+    <RootNamespace>NewStatusNotify</RootNamespace>

+  </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>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>Unicode</CharacterSet>

+    <WholeProgramOptimization>false</WholeProgramOptimization>

+  </PropertyGroup>

+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'" Label="Configuration">

+    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <UseOfMfc>false</UseOfMfc>

+    <CharacterSet>Unicode</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.UpgradeFromVC71.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.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'" Label="PropertySheets">

+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />

+  </ImportGroup>

+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|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.UpgradeFromVC71.props" />

+  </ImportGroup>

+  <PropertyGroup Label="UserMacros" />

+  <PropertyGroup>

+    <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">$(SolutionDir)$(Configuration)/Plugins\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">$(SolutionDir)$(Configuration)/Plugins\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)/Plugins\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>

+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)/Plugins\</OutDir>

+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)/Obj/$(ProjectName)\</IntDir>

+    <IgnoreImportLibrary Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</IgnoreImportLibrary>

+  </PropertyGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>.\Release/NewStatusNotify.tlb</TypeLibraryName>

+      <HeaderFileName>

+      </HeaderFileName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <OmitFramePointers>true</OmitFramePointers>

+      <EnableFiberSafeOptimizations>false</EnableFiberSafeOptimizations>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

+      <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <StringPooling>true</StringPooling>

+      <ExceptionHandling>

+      </ExceptionHandling>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <AssemblerListingLocation>

+      </AssemblerListingLocation>

+      <BrowseInformation>

+      </BrowseInformation>

+      <WarningLevel>Level3</WarningLevel>

+      <CompileAs>CompileAsC</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0000</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/release %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>comctl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <ModuleDefinitionFile>

+      </ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>.\Release/NewStatusNotify.tlb</TypeLibraryName>

+      <HeaderFileName>

+      </HeaderFileName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <PrecompiledHeader>

+      </PrecompiledHeader>

+      <PrecompiledHeaderFile>newstatusnotify.h</PrecompiledHeaderFile>

+      <AssemblerListingLocation>

+      </AssemblerListingLocation>

+      <BrowseInformationFile>

+      </BrowseInformationFile>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <CompileAs>CompileAsC</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0000</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalDependencies>comctl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>

+      <Version>

+      </Version>

+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <MapFileName>

+      </MapFileName>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>.\Release/NewStatusNotify.tlb</TypeLibraryName>

+      <HeaderFileName>

+      </HeaderFileName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Disabled</Optimization>

+      <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

+      <AssemblerListingLocation>

+      </AssemblerListingLocation>

+      <BrowseInformation>

+      </BrowseInformation>

+      <BrowseInformationFile>$(OutDir)</BrowseInformationFile>

+      <WarningLevel>Level3</WarningLevel>

+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>

+      <CompileAs>CompileAsC</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0000</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalDependencies>comctl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>

+      <Version>1.1.2.5</Version>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <MapFileName>$(OutDir)$(ProjectName).map</MapFileName>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

+    <Midl>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <MkTypLibCompatible>true</MkTypLibCompatible>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <TargetEnvironment>Win32</TargetEnvironment>

+      <TypeLibraryName>.\Release/NewStatusNotify.tlb</TypeLibraryName>

+      <HeaderFileName>

+      </HeaderFileName>

+    </Midl>

+    <ClCompile>

+      <Optimization>Full</Optimization>

+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>

+      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>

+      <OmitFramePointers>true</OmitFramePointers>

+      <WholeProgramOptimization>true</WholeProgramOptimization>

+      <AdditionalIncludeDirectories>../include;../ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

+      <StringPooling>true</StringPooling>

+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

+      <FunctionLevelLinking>true</FunctionLevelLinking>

+      <AssemblerListingLocation>

+      </AssemblerListingLocation>

+      <BrowseInformation>

+      </BrowseInformation>

+      <WarningLevel>Level3</WarningLevel>

+      <CompileAs>CompileAsC</CompileAs>

+    </ClCompile>

+    <ResourceCompile>

+      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <Culture>0x0000</Culture>

+    </ResourceCompile>

+    <Link>

+      <AdditionalOptions>/release %(AdditionalOptions)</AdditionalOptions>

+      <AdditionalDependencies>comctl32.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>

+      <ShowProgress>NotSet</ShowProgress>

+      <OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>

+      <SuppressStartupBanner>true</SuppressStartupBanner>

+      <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

+      <ModuleDefinitionFile>

+      </ModuleDefinitionFile>

+      <GenerateDebugInformation>true</GenerateDebugInformation>

+      <OptimizeReferences>true</OptimizeReferences>

+      <EnableCOMDATFolding>true</EnableCOMDATFolding>

+      <LinkTimeCodeGeneration>UseLinkTimeCodeGeneration</LinkTimeCodeGeneration>

+      <DataExecutionPrevention>

+      </DataExecutionPrevention>

+      <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>

+      <TargetMachine>MachineX86</TargetMachine>

+    </Link>

+  </ItemDefinitionGroup>

+  <ItemGroup>

+    <ClCompile Include="indiv_sounds.c" />

+    <ClCompile Include="main.c">

+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug Unicode|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>

+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>

+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release Unicode|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>

+      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="commonheaders.h" />

+    <ClInclude Include="newstatusnotify.h" />

+    <ClInclude Include="res\resource.h" />

+    <ClInclude Include="res\version.h" />

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="res\main_off.ico" />

+    <None Include="res\main_on.ico" />

+    <None Include="res\popup.ico" />

+    <None Include="res\sound.ico" />

+    <None Include="Docs\NewStatusNotify_readme.txt" />

+    <None Include="Docs\NewStatusNotify_translate.txt" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="res\resource.rc" />

+  </ItemGroup>

+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

+  <ImportGroup Label="ExtensionTargets">

+  </ImportGroup>

+</Project>
\ No newline at end of file
diff --git a/NewStatusNotify/NewStatusNotify_10.vcxproj.filters b/NewStatusNotify/NewStatusNotify_10.vcxproj.filters
new file mode 100644
index 0000000..43b2131
--- /dev/null
+++ b/NewStatusNotify/NewStatusNotify_10.vcxproj.filters
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>

+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <ItemGroup>

+    <Filter Include="Source Files">

+      <UniqueIdentifier>{6537d2b7-049a-4673-8eec-d5e35e5a33e3}</UniqueIdentifier>

+      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>

+    </Filter>

+    <Filter Include="Header Files">

+      <UniqueIdentifier>{910d9c58-9eb3-4838-b11f-3f652824226d}</UniqueIdentifier>

+      <Extensions>h;hpp;hxx;hm;inl</Extensions>

+    </Filter>

+    <Filter Include="Resource Files">

+      <UniqueIdentifier>{7c28ea1e-73b6-468b-bc87-cea7bec69bdd}</UniqueIdentifier>

+      <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>

+    </Filter>

+  </ItemGroup>

+  <ItemGroup>

+    <ClCompile Include="indiv_sounds.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="main.c">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+  </ItemGroup>

+  <ItemGroup>

+    <ClInclude Include="commonheaders.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="newstatusnotify.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="res\resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="res\version.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

+    <None Include="res\main_off.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\main_on.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\popup.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="res\sound.ico">

+      <Filter>Resource Files</Filter>

+    </None>

+    <None Include="Docs\NewStatusNotify_readme.txt" />

+    <None Include="Docs\NewStatusNotify_translate.txt" />

+  </ItemGroup>

+  <ItemGroup>

+    <ResourceCompile Include="res\resource.rc">

+      <Filter>Resource Files</Filter>

+    </ResourceCompile>

+  </ItemGroup>

+</Project>
\ No newline at end of file
diff --git a/NewStatusNotify/NewStatusNotify_7.vcproj b/NewStatusNotify/NewStatusNotify_7.vcproj
index c9447b2..a4ebf19 100644
--- a/NewStatusNotify/NewStatusNotify_7.vcproj
+++ b/NewStatusNotify/NewStatusNotify_7.vcproj
@@ -26,7 +26,7 @@
 				OmitFramePointers="TRUE"

 				EnableFiberSafeOptimizations="FALSE"

 				WholeProgramOptimization="TRUE"

-				AdditionalIncludeDirectories="..\..\include;..\ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				StringPooling="TRUE"

 				ExceptionHandling="FALSE"

 				RuntimeLibrary="0"

@@ -98,7 +98,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				WholeProgramOptimization="FALSE"

-				AdditionalIncludeDirectories="..\..\include\"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;NewStatusNotify_EXPORTS"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -165,7 +165,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..\include;..\ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;NewStatusNotify_EXPORTS"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -235,7 +235,7 @@
 				FavorSizeOrSpeed="2"

 				OmitFramePointers="TRUE"

 				WholeProgramOptimization="TRUE"

-				AdditionalIncludeDirectories="..\..\include;..\ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				StringPooling="TRUE"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="TRUE"

diff --git a/NewStatusNotify/NewStatusNotify_8.vcproj b/NewStatusNotify/NewStatusNotify_8.vcproj
index 58b69c8..30b89db 100644
--- a/NewStatusNotify/NewStatusNotify_8.vcproj
+++ b/NewStatusNotify/NewStatusNotify_8.vcproj
@@ -53,7 +53,7 @@
 				OmitFramePointers="true"

 				EnableFiberSafeOptimizations="false"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="..\..\include;..\ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				StringPooling="true"

 				ExceptionHandling="0"

 				RuntimeLibrary="0"

@@ -153,7 +153,7 @@
 				Name="VCCLCompilerTool"

 				Optimization="0"

 				WholeProgramOptimization="false"

-				AdditionalIncludeDirectories="..\..\include;..\ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;NewStatusNotify_EXPORTS"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -250,7 +250,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..\include;..\ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="WIN32;_WINDOWS;_USRDLL;NewStatusNotify_EXPORTS"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -350,7 +350,7 @@
 				FavorSizeOrSpeed="2"

 				OmitFramePointers="true"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="..\..\include;..\ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				StringPooling="true"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

diff --git a/NewStatusNotify/NewStatusNotify_9.vcproj b/NewStatusNotify/NewStatusNotify_9.vcproj
index ba8a611..f9aded2 100644
--- a/NewStatusNotify/NewStatusNotify_9.vcproj
+++ b/NewStatusNotify/NewStatusNotify_9.vcproj
@@ -54,7 +54,7 @@
 				OmitFramePointers="true"

 				EnableFiberSafeOptimizations="false"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="..\..\include;..\ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				StringPooling="true"

 				ExceptionHandling="0"

 				RuntimeLibrary="0"

@@ -147,7 +147,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..\include;..\ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="_DEBUG;"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -239,7 +239,7 @@
 			<Tool

 				Name="VCCLCompilerTool"

 				Optimization="0"

-				AdditionalIncludeDirectories="..\..\include;..\ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				PreprocessorDefinitions="_DEBUG;"

 				BasicRuntimeChecks="3"

 				RuntimeLibrary="1"

@@ -335,7 +335,7 @@
 				FavorSizeOrSpeed="2"

 				OmitFramePointers="true"

 				WholeProgramOptimization="true"

-				AdditionalIncludeDirectories="..\..\include;..\ExternalAPI"

+				AdditionalIncludeDirectories="../include;../ExternalAPI"

 				StringPooling="true"

 				RuntimeLibrary="0"

 				EnableFunctionLevelLinking="true"

diff --git a/NewStatusNotify/main.c b/NewStatusNotify/main.c
index 3885d73..2881174 100644
--- a/NewStatusNotify/main.c
+++ b/NewStatusNotify/main.c
@@ -788,7 +788,7 @@ static int ContactStatusChanged(WPARAM wParam, LPARAM lParam) {
 			{

 			ppd.lchContact = (HANDLE)wParam; //You need to give me a valid hContact, because I don't check its existance.

 			ppd.lchIcon = LoadSkinnedProtoIcon(lpzProto, newStatus);

-			lstrcpyn(ppd.lptzContactName, (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)wParam, GCMDF_TCHAR), SIZEOF(ppd.lptzContactName)-1);

+			lstrcpyn(ppd.lptzContactName, (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)wParam, GSMDF_TCHAR), SIZEOF(ppd.lptzContactName)-1);

 		

 			if (MyOptions.ShowGroup)

 				{//add group name to popup title

@@ -1296,7 +1296,7 @@ static BOOL CALLBACK DlgProcPopUpOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPA
 //						pd->newStatus = (WORD)(i <= ID_STATUS_MAX ? (pd->oldStatus + 1) : ID_STATUS_ONLINE);

 						pd->newStatus = (WORD)(i < ID_STATUS_MAX ? (i + 1) : (i == ID_STATUS_MAX ? ID_STATUS_OFFLINE : ID_STATUS_ONLINE));

 						ppd.lchIcon = LoadSkinnedIcon(StatusesList[Index(pd->newStatus)].Icon);

-						lstrcpyn(ppd.lptzContactName, (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)NULL,GCMDF_TCHAR), SIZEOF(ppd.lptzContactName)-1);

+						lstrcpyn(ppd.lptzContactName, (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)NULL,GSMDF_TCHAR), SIZEOF(ppd.lptzContactName)-1);

 						if (MyOptions.UseDullText == 1)

 							lstrcpy(ppd.lptzText, StatusesList[Index(pd->newStatus)].lpzStandardText);

 						else if (MyOptions.UseDullText == 2)