- finally problem with dynamic UserInfoEx load solved completely

git-svn-id: http://svn.miranda-ng.org/main/trunk@818 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

6 files changed, 37 insertions, 0 deletions

diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index 3685c0d779..0fef92c1a1 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -277,6 +277,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stduihist", "..\src\core\st
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stduseronline", "..\src\core\stduseronline\stduseronline_10.vcxproj", "{D22C1BBB-E06A-4A28-8F33-17D1EA3E8563}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdaway", "..\src\core\stdaway\stdaway_10.vcxproj", "{C14D6E0D-810E-4599-A6E0-17298AFA0501}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -1368,6 +1370,14 @@ Global
 		{D22C1BBB-E06A-4A28-8F33-17D1EA3E8563}.Release|Win32.Build.0 = Release|Win32

 		{D22C1BBB-E06A-4A28-8F33-17D1EA3E8563}.Release|x64.ActiveCfg = Release|x64

 		{D22C1BBB-E06A-4A28-8F33-17D1EA3E8563}.Release|x64.Build.0 = Release|x64

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.Debug|Win32.ActiveCfg = Debug|Win32

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.Debug|Win32.Build.0 = Debug|Win32

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.Debug|x64.ActiveCfg = Debug|x64

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.Debug|x64.Build.0 = Debug|x64

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.Release|Win32.ActiveCfg = Release|Win32

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.Release|Win32.Build.0 = Release|Win32

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.Release|x64.ActiveCfg = Release|x64

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.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 8ae62a1fca..8ef56a1441 100644
--- a/bin10/mir_full_pro.sln
+++ b/bin10/mir_full_pro.sln
@@ -311,6 +311,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stduihist", "..\src\core\st
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stduseronline", "..\src\core\stduseronline\stduseronline_10.vcxproj", "{D22C1BBB-E06A-4A28-8F33-17D1EA3E8563}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdaway", "..\src\core\stdaway\stdaway_10.vcxproj", "{C14D6E0D-810E-4599-A6E0-17298AFA0501}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -1411,6 +1413,14 @@ Global
 		{D22C1BBB-E06A-4A28-8F33-17D1EA3E8563}.Release|Win32.Build.0 = Release|Win32

 		{D22C1BBB-E06A-4A28-8F33-17D1EA3E8563}.Release|x64.ActiveCfg = Release|x64

 		{D22C1BBB-E06A-4A28-8F33-17D1EA3E8563}.Release|x64.Build.0 = Release|x64

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.Debug|Win32.ActiveCfg = Debug|Win32

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.Debug|Win32.Build.0 = Debug|Win32

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.Debug|x64.ActiveCfg = Debug|x64

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.Debug|x64.Build.0 = Debug|x64

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.Release|Win32.ActiveCfg = Release|Win32

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.Release|Win32.Build.0 = Release|Win32

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.Release|x64.ActiveCfg = Release|x64

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

@@ -1457,6 +1467,7 @@ Global
 		{36C40BA6-E0B5-438A-919C-6A991933B313} = {CBBD3DE7-97CE-479D-87E3-8EACD035AF9B}

 		{DADAC956-3A54-440A-8B56-A07234DEE861} = {CBBD3DE7-97CE-479D-87E3-8EACD035AF9B}

 		{D22C1BBB-E06A-4A28-8F33-17D1EA3E8563} = {CBBD3DE7-97CE-479D-87E3-8EACD035AF9B}

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501} = {CBBD3DE7-97CE-479D-87E3-8EACD035AF9B}

 		{20D781FB-4A20-4B75-B863-304A47182966} = {BB69C74C-04FF-498B-8288-8259C3C5A41C}

 		{A2E9DA24-95E4-4414-94AF-488A382E276A} = {BB69C74C-04FF-498B-8288-8259C3C5A41C}

 		{6D3DC604-9CA0-45A2-85D7-1EFE3309F23B} = {BB69C74C-04FF-498B-8288-8259C3C5A41C}

diff --git a/bin10/miranda32.sln b/bin10/miranda32.sln
index 86f50e6585..5f940f57cf 100644
--- a/bin10/miranda32.sln
+++ b/bin10/miranda32.sln
@@ -96,6 +96,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stduihist", "..\src\core\st
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stduseronline", "..\src\core\stduseronline\stduseronline_10.vcxproj", "{D22C1BBB-E06A-4A28-8F33-17D1EA3E8563}"

 EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stdaway", "..\src\core\stdaway\stdaway_10.vcxproj", "{C14D6E0D-810E-4599-A6E0-17298AFA0501}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Win32 = Debug|Win32

@@ -479,6 +481,14 @@ Global
 		{D22C1BBB-E06A-4A28-8F33-17D1EA3E8563}.Release|Win32.Build.0 = Release|Win32

 		{D22C1BBB-E06A-4A28-8F33-17D1EA3E8563}.Release|x64.ActiveCfg = Release|x64

 		{D22C1BBB-E06A-4A28-8F33-17D1EA3E8563}.Release|x64.Build.0 = Release|x64

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.Debug|Win32.ActiveCfg = Debug|Win32

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.Debug|Win32.Build.0 = Debug|Win32

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.Debug|x64.ActiveCfg = Debug|x64

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.Debug|x64.Build.0 = Debug|x64

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.Release|Win32.ActiveCfg = Release|Win32

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.Release|Win32.Build.0 = Release|Win32

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.Release|x64.ActiveCfg = Release|x64

+		{C14D6E0D-810E-4599-A6E0-17298AFA0501}.Release|x64.Build.0 = Release|x64

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE

diff --git a/src/core/stduserinfo/main.cpp b/src/core/stduserinfo/main.cpp
index 88ed31e921..0dc541834a 100644
--- a/src/core/stduserinfo/main.cpp
+++ b/src/core/stduserinfo/main.cpp
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 

 #include "commonheaders.h"

 

+int LoadContactsModule(void);

 int LoadUserInfoModule(void);

 

 CLIST_INTERFACE* pcli;

@@ -75,6 +76,7 @@ extern "C" int __declspec(dllexport) Load(void)
 			enableThemeDialogTexture = (pfnEnableThemeDialogTexture)GetProcAddress(hThemeAPI, "EnableThemeDialogTexture");

 	}

 

+	LoadContactsModule();

 	LoadUserInfoModule();

 	return 0;

 }

diff --git a/src/core/stduserinfo/stduserinfo_10.vcxproj b/src/core/stduserinfo/stduserinfo_10.vcxproj
index b2e30b6ff8..cead8b4c53 100644
--- a/src/core/stduserinfo/stduserinfo_10.vcxproj
+++ b/src/core/stduserinfo/stduserinfo_10.vcxproj
@@ -201,6 +201,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>

     </ClCompile>

     <ClCompile Include="contactinfo.cpp" />

+    <ClCompile Include="contacts.cpp" />

     <ClCompile Include="main.cpp" />

     <ClCompile Include="stdinfo.cpp" />

     <ClCompile Include="userinfo.cpp" />

diff --git a/src/core/stduserinfo/stduserinfo_10.vcxproj.filters b/src/core/stduserinfo/stduserinfo_10.vcxproj.filters
index ac101b1384..abd2924e59 100644
--- a/src/core/stduserinfo/stduserinfo_10.vcxproj.filters
+++ b/src/core/stduserinfo/stduserinfo_10.vcxproj.filters
@@ -30,6 +30,9 @@
     <ClCompile Include="userinfo.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

+    <ClCompile Include="contacts.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

   </ItemGroup>

   <ItemGroup>

     <ClInclude Include="..\stdplug.h">