summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bin10/mir_full.sln10
-rw-r--r--bin10/mir_full_pro.sln11
-rw-r--r--bin11/mir_full.sln12
-rw-r--r--include/m_clistint.h15
-rw-r--r--plugins/YARelay/YARelay_10.vcxproj11
-rw-r--r--plugins/YARelay/YARelay_10.vcxproj.filters13
6 files changed, 53 insertions, 19 deletions
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index 6b64df2234..469f226436 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -383,6 +383,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XSoundNotify", "..\plugins\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YahooGroups", "..\plugins\YahooGroups\YahooGroups_10.vcxproj", "{0E73244B-30D7-4A62-B4B3-9A32B96EC1B7}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YARelay", "..\plugins\YARelay\YARelay_10.vcxproj", "{AA5CA2D0-F096-4001-B1B6-439C7FC11E77}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -1711,6 +1713,14 @@ Global
{0E73244B-30D7-4A62-B4B3-9A32B96EC1B7}.Release|Win32.Build.0 = Release|Win32
{0E73244B-30D7-4A62-B4B3-9A32B96EC1B7}.Release|x64.ActiveCfg = Release|x64
{0E73244B-30D7-4A62-B4B3-9A32B96EC1B7}.Release|x64.Build.0 = Release|x64
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Debug|Win32.Build.0 = Debug|Win32
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Debug|x64.ActiveCfg = Debug|x64
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Debug|x64.Build.0 = Debug|x64
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Release|Win32.ActiveCfg = Release|Win32
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Release|Win32.Build.0 = Release|Win32
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Release|x64.ActiveCfg = Release|x64
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln
index d02bd1a0e1..d045c58d9a 100644
--- a/bin10/mir_full_pro.sln
+++ b/bin10/mir_full_pro.sln
@@ -419,6 +419,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NimContact", "..\plugins\No
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YahooGroups", "..\plugins\YahooGroups\YahooGroups_10.vcxproj", "{0E73244B-30D7-4A62-B4B3-9A32B96EC1B7}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YARelay", "..\plugins\YARelay\YARelay_10.vcxproj", "{AA5CA2D0-F096-4001-B1B6-439C7FC11E77}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -1747,6 +1749,14 @@ Global
{0E73244B-30D7-4A62-B4B3-9A32B96EC1B7}.Release|Win32.Build.0 = Release|Win32
{0E73244B-30D7-4A62-B4B3-9A32B96EC1B7}.Release|x64.ActiveCfg = Release|x64
{0E73244B-30D7-4A62-B4B3-9A32B96EC1B7}.Release|x64.Build.0 = Release|x64
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Debug|Win32.Build.0 = Debug|Win32
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Debug|x64.ActiveCfg = Debug|x64
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Debug|x64.Build.0 = Debug|x64
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Release|Win32.ActiveCfg = Release|Win32
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Release|Win32.Build.0 = Release|Win32
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Release|x64.ActiveCfg = Release|x64
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1807,6 +1817,7 @@ Global
{F5E3FAFE-B650-4736-8D27-FA53866668C6} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
{01F9E227-06F5-4BED-907F-402CA7DFAFE6} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
{73482497-9F57-4819-A9AB-5D841A9F072D} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77} = {A93476F5-9C4C-48A6-A8A4-C79D804A3228}
{20D781FB-4A20-4B75-B863-304A47182966} = {BB69C74C-04FF-498B-8288-8259C3C5A41C}
{6D3DC604-9CA0-45A2-85D7-1EFE3309F23B} = {BB69C74C-04FF-498B-8288-8259C3C5A41C}
{751ED05D-AD3E-4EC6-A485-4ECDF1FE6068} = {BB69C74C-04FF-498B-8288-8259C3C5A41C}
diff --git a/bin11/mir_full.sln b/bin11/mir_full.sln
index 6630da9164..b0c3dfeb57 100644
--- a/bin11/mir_full.sln
+++ b/bin11/mir_full.sln
@@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32_11.vcxproj", "{F9916510-9055-4C9F-997A-3755DEC1511B}"
ProjectSection(ProjectDependencies) = postProject
{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60} = {D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60}
@@ -383,6 +383,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "XSoundNotify", "..\plugins\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YahooGroups", "..\plugins\YahooGroups\YahooGroups_11.vcxproj", "{0E73244B-30D7-4A62-B4B3-9A32B96EC1B7}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "YARelay", "..\plugins\YARelay\YARelay_10.vcxproj", "{AA5CA2D0-F096-4001-B1B6-439C7FC11E77}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -1711,6 +1713,14 @@ Global
{0E73244B-30D7-4A62-B4B3-9A32B96EC1B7}.Release|Win32.Build.0 = Release|Win32
{0E73244B-30D7-4A62-B4B3-9A32B96EC1B7}.Release|x64.ActiveCfg = Release|x64
{0E73244B-30D7-4A62-B4B3-9A32B96EC1B7}.Release|x64.Build.0 = Release|x64
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Debug|Win32.ActiveCfg = Debug|Win32
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Debug|Win32.Build.0 = Debug|Win32
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Debug|x64.ActiveCfg = Debug|x64
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Debug|x64.Build.0 = Debug|x64
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Release|Win32.ActiveCfg = Release|Win32
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Release|Win32.Build.0 = Release|Win32
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Release|x64.ActiveCfg = Release|x64
+ {AA5CA2D0-F096-4001-B1B6-439C7FC11E77}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/include/m_clistint.h b/include/m_clistint.h
index 04053e77e3..55fbe34e60 100644
--- a/include/m_clistint.h
+++ b/include/m_clistint.h
@@ -230,12 +230,6 @@ typedef struct _menuProto
#define TIM_CALLBACK (WM_USER+1857)
#define TIM_CREATE (WM_USER+1858)
-// Miranda 0.4.3.0+
-// retrieves the pointer to a CLIST_INTERFACE structure
-// NOTE: valid only for the clist clone building, not for the regular use
-
-#define MS_CLIST_RETRIEVE_INTERFACE "CList/RetrieveInterface"
-
/***************************************************************************
* CLIST_INTERFACE structure definition
***************************************************************************/
@@ -481,4 +475,13 @@ typedef struct
extern CLIST_INTERFACE cli, *pcli;
+// Miranda 0.4.3.0+
+// retrieves the pointer to a CLIST_INTERFACE structure
+// NOTE: valid only for the clist clone building, not for the regular use
+
+#define MS_CLIST_RETRIEVE_INTERFACE "CList/RetrieveInterface"
+
+__forceinline CLIST_INTERFACE* mir_getCLI()
+{ return (CLIST_INTERFACE*)CallService(MS_CLIST_RETRIEVE_INTERFACE, 0, 0);
+}
#endif // M_CLISTINT_H__
diff --git a/plugins/YARelay/YARelay_10.vcxproj b/plugins/YARelay/YARelay_10.vcxproj
index bd6c661871..13f29ee66c 100644
--- a/plugins/YARelay/YARelay_10.vcxproj
+++ b/plugins/YARelay/YARelay_10.vcxproj
@@ -20,7 +20,7 @@
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectName>YARelay</ProjectName>
- <ProjectGuid>{00037ACC-F32D-4B5F-93A8-3CF0E277E377}</ProjectGuid>
+ <ProjectGuid>{AA5CA2D0-F096-4001-B1B6-439C7FC11E77}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -81,7 +81,6 @@
<IntrinsicFunctions>false</IntrinsicFunctions>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<ExceptionHandling>false</ExceptionHandling>
- <PrecompiledHeaderFile>autorun.h</PrecompiledHeaderFile>
<PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile>
<ResourceCompile>
@@ -112,7 +111,6 @@
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<ExceptionHandling>false</ExceptionHandling>
- <PrecompiledHeaderFile>autorun.h</PrecompiledHeaderFile>
<PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile>
<ResourceCompile>
@@ -139,7 +137,6 @@
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<ExceptionHandling>false</ExceptionHandling>
- <PrecompiledHeaderFile>autorun.h</PrecompiledHeaderFile>
<PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile>
<ResourceCompile>
@@ -166,7 +163,6 @@
<PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<ExceptionHandling>false</ExceptionHandling>
- <PrecompiledHeaderFile>autorun.h</PrecompiledHeaderFile>
<PrecompiledHeader>Use</PrecompiledHeader>
</ClCompile>
<ResourceCompile>
@@ -183,16 +179,17 @@
</Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClInclude Include="src\autorun.h" />
<ClInclude Include="src\resource.h" />
+ <ClInclude Include="src\stdafx.h" />
<ClInclude Include="src\Version.h" />
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="res\autorun.rc" />
<ResourceCompile Include="res\Version.rc" />
+ <ResourceCompile Include="res\yaRelay.rc" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\main.cpp" />
+ <ClCompile Include="src\options.cpp" />
<ClCompile Include="src\stdafx.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
diff --git a/plugins/YARelay/YARelay_10.vcxproj.filters b/plugins/YARelay/YARelay_10.vcxproj.filters
index 8d0561f6f0..a16abcbd93 100644
--- a/plugins/YARelay/YARelay_10.vcxproj.filters
+++ b/plugins/YARelay/YARelay_10.vcxproj.filters
@@ -15,21 +15,21 @@
</Filter>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="src\autorun.h">
- <Filter>Header Files</Filter>
- </ClInclude>
<ClInclude Include="src\resource.h">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="src\Version.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="src\stdafx.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
- <ResourceCompile Include="res\autorun.rc">
+ <ResourceCompile Include="res\Version.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
- <ResourceCompile Include="res\Version.rc">
+ <ResourceCompile Include="res\yaRelay.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
@@ -40,5 +40,8 @@
<ClCompile Include="src\stdafx.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="src\options.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
</Project> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 04:49:27 +0000