1 files changed, 113 insertions, 120 deletions
diff --git a/plugins/UserInfoEx/UInfoEx_10.vcxproj b/plugins/UserInfoEx/UInfoEx_10.vcxproj
index 461657e5ae..9ed80c6ee0 100644
--- a/plugins/UserInfoEx/UInfoEx_10.vcxproj
+++ b/plugins/UserInfoEx/UInfoEx_10.vcxproj
@@ -72,8 +72,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>res;Ex_Import;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;UINFOEX_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>res;src\Ex_Import;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -98,8 +98,8 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>res;Ex_Import;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;UINFOEX_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>res;src\Ex_Import;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN64;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -125,8 +125,8 @@
       <Optimization>Full</Optimization>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>res;Ex_Import;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;UINFOEX_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>res;src\Ex_Import;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <WarningLevel>Level3</WarningLevel>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -153,8 +153,8 @@
       <Optimization>Full</Optimization>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
       <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>res;Ex_Import;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;UINFOEX_EXPORTS;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>res;src\Ex_Import;..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN64;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <WarningLevel>Level3</WarningLevel>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
@@ -177,136 +177,129 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="classMAnnivDate.cpp" />
-    <ClCompile Include="classMTime.cpp" />
-    <ClCompile Include="classPsTree.cpp" />
-    <ClCompile Include="classPsTreeItem.cpp" />
-    <ClCompile Include="commonheaders.cpp">
+    <ClCompile Include="src\classMAnnivDate.cpp" />
+    <ClCompile Include="src\classMTime.cpp" />
+    <ClCompile Include="src\classPsTree.cpp" />
+    <ClCompile Include="src\classPsTreeItem.cpp" />
+    <ClCompile Include="src\commonheaders.cpp">
       <PrecompiledHeader>Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="init.cpp" />
-    <ClCompile Include="mir_contactqueue.cpp" />
-    <ClCompile Include="mir_db.cpp" />
-    <ClCompile Include="mir_icolib.cpp" />
-    <ClCompile Include="mir_menuitems.cpp" />
-    <ClCompile Include="mir_string.cpp" />
-    <ClCompile Include="psp_options.cpp" />
-    <ClCompile Include="svc_avatar.cpp" />
-    <ClCompile Include="svc_constants.cpp" />
-    <ClCompile Include="svc_contactinfo.cpp" />
-    <ClCompile Include="svc_email.cpp" />
-    <ClCompile Include="svc_gender.cpp" />
-    <ClCompile Include="svc_homepage.cpp" />
-    <ClCompile Include="svc_phone.cpp" />
-    <ClCompile Include="svc_refreshci.cpp" />
-    <ClCompile Include="svc_reminder.cpp" />
-    <ClCompile Include="svc_timezone.cpp" />
-    <ClCompile Include="svc_timezone_old.cpp" />
-    <ClCompile Include="ex_import\classExImContactBase.cpp" />
-    <ClCompile Include="ex_import\classExImContactXML.cpp" />
-    <ClCompile Include="ex_import\dlg_ExImModules.cpp" />
-    <ClCompile Include="ex_import\dlg_ExImOpenSaveFile.cpp" />
-    <ClCompile Include="ex_import\dlg_ExImProgress.cpp" />
-    <ClCompile Include="ex_import\svc_ExImINI.cpp" />
-    <ClCompile Include="ex_import\svc_ExImport.cpp" />
-    <ClCompile Include="ex_import\svc_ExImVCF.cpp" />
-    <ClCompile Include="ex_import\svc_ExImXML.cpp" />
-    <ClCompile Include="ex_import\tinystr.cpp">
+    <ClCompile Include="src\init.cpp" />
+    <ClCompile Include="src\mir_contactqueue.cpp" />
+    <ClCompile Include="src\mir_db.cpp" />
+    <ClCompile Include="src\mir_icolib.cpp" />
+    <ClCompile Include="src\mir_menuitems.cpp" />
+    <ClCompile Include="src\mir_string.cpp" />
+    <ClCompile Include="src\psp_options.cpp" />
+    <ClCompile Include="src\svc_avatar.cpp" />
+    <ClCompile Include="src\svc_constants.cpp" />
+    <ClCompile Include="src\svc_contactinfo.cpp" />
+    <ClCompile Include="src\svc_email.cpp" />
+    <ClCompile Include="src\svc_gender.cpp" />
+    <ClCompile Include="src\svc_homepage.cpp" />
+    <ClCompile Include="src\svc_phone.cpp" />
+    <ClCompile Include="src\svc_refreshci.cpp" />
+    <ClCompile Include="src\svc_reminder.cpp" />
+    <ClCompile Include="src\svc_timezone.cpp" />
+    <ClCompile Include="src\svc_timezone_old.cpp" />
+    <ClCompile Include="src\ex_import\classExImContactBase.cpp" />
+    <ClCompile Include="src\ex_import\classExImContactXML.cpp" />
+    <ClCompile Include="src\ex_import\dlg_ExImModules.cpp" />
+    <ClCompile Include="src\ex_import\dlg_ExImOpenSaveFile.cpp" />
+    <ClCompile Include="src\ex_import\dlg_ExImProgress.cpp" />
+    <ClCompile Include="src\ex_import\svc_ExImINI.cpp" />
+    <ClCompile Include="src\ex_import\svc_ExImport.cpp" />
+    <ClCompile Include="src\ex_import\svc_ExImVCF.cpp" />
+    <ClCompile Include="src\ex_import\svc_ExImXML.cpp" />
+    <ClCompile Include="src\ex_import\tinystr.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="ex_import\tinyxml.cpp">
+    <ClCompile Include="src\ex_import\tinyxml.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="ex_import\tinyxmlerror.cpp">
+    <ClCompile Include="src\ex_import\tinyxmlerror.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="ex_import\tinyxmlparser.cpp">
+    <ClCompile Include="src\ex_import\tinyxmlparser.cpp">
       <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="Flags\svc_countrylistext.cpp">
+    <ClCompile Include="src\Flags\svc_countrylistext.cpp">
       <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="Flags\svc_flags.cpp">
+    <ClCompile Include="src\Flags\svc_flags.cpp">
       <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="Flags\svc_flagsicons.cpp">
+    <ClCompile Include="src\Flags\svc_flagsicons.cpp">
       <PrecompiledHeaderFile>..\commonheaders.h</PrecompiledHeaderFile>
     </ClCompile>
-    <ClCompile Include="dlg_anniversarylist.cpp" />
-    <ClCompile Include="dlg_msgbox.cpp" />
-    <ClCompile Include="dlg_propsheet.cpp" />
-    <ClCompile Include="psp_about.cpp" />
-    <ClCompile Include="psp_anniversary.cpp" />
-    <ClCompile Include="psp_base.cpp" />
-    <ClCompile Include="psp_company.cpp" />
-    <ClCompile Include="psp_contact.cpp" />
-    <ClCompile Include="psp_general.cpp" />
-    <ClCompile Include="psp_origin.cpp" />
-    <ClCompile Include="psp_profile.cpp" />
-    <ClCompile Include="ctrl_annivedit.cpp" />
-    <ClCompile Include="ctrl_base.cpp" />
-    <ClCompile Include="ctrl_button.cpp" />
-    <ClCompile Include="ctrl_combo.cpp" />
-    <ClCompile Include="ctrl_contact.cpp" />
-    <ClCompile Include="ctrl_edit.cpp" />
-    <ClCompile Include="ctrl_tzcombo.cpp" />
+    <ClCompile Include="src\dlg_anniversarylist.cpp" />
+    <ClCompile Include="src\dlg_msgbox.cpp" />
+    <ClCompile Include="src\dlg_propsheet.cpp" />
+    <ClCompile Include="src\psp_about.cpp" />
+    <ClCompile Include="src\psp_anniversary.cpp" />
+    <ClCompile Include="src\psp_base.cpp" />
+    <ClCompile Include="src\psp_company.cpp" />
+    <ClCompile Include="src\psp_contact.cpp" />
+    <ClCompile Include="src\psp_general.cpp" />
+    <ClCompile Include="src\psp_origin.cpp" />
+    <ClCompile Include="src\psp_profile.cpp" />
+    <ClCompile Include="src\ctrl_annivedit.cpp" />
+    <ClCompile Include="src\ctrl_base.cpp" />
+    <ClCompile Include="src\ctrl_button.cpp" />
+    <ClCompile Include="src\ctrl_combo.cpp" />
+    <ClCompile Include="src\ctrl_contact.cpp" />
+    <ClCompile Include="src\ctrl_edit.cpp" />
+    <ClCompile Include="src\ctrl_tzcombo.cpp" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="classMAnnivDate.h" />
-    <ClInclude Include="classMTime.h" />
-    <ClInclude Include="commonheaders.h" />
-    <ClInclude Include="mir_contactqueue.h" />
-    <ClInclude Include="mir_db.h" />
-    <ClInclude Include="mir_icolib.h" />
-    <ClInclude Include="mir_menuitems.h" />
-    <ClInclude Include="mir_string.h" />
-    <ClInclude Include="psp_options.h" />
-    <ClInclude Include="svc_avatar.h" />
-    <ClInclude Include="svc_constants.h" />
-    <ClInclude Include="svc_contactinfo.h" />
-    <ClInclude Include="svc_email.h" />
-    <ClInclude Include="svc_gender.h" />
-    <ClInclude Include="svc_homepage.h" />
-    <ClInclude Include="svc_phone.h" />
-    <ClInclude Include="svc_refreshci.h" />
-    <ClInclude Include="svc_reminder.h" />
-    <ClInclude Include="svc_timezone.h" />
-    <ClInclude Include="svc_timezone_old.h" />
-    <ClInclude Include="ex_import\classExImContactBase.h" />
-    <ClInclude Include="ex_import\classExImContactXML.h" />
-    <ClInclude Include="ex_import\dlg_ExImModules.h" />
-    <ClInclude Include="ex_import\dlg_ExImOpenSaveFile.h" />
-    <ClInclude Include="ex_import\dlg_ExImProgress.h" />
-    <ClInclude Include="ex_import\mir_rfcCodecs.h" />
-    <ClInclude Include="ex_import\svc_ExImINI.h" />
-    <ClInclude Include="ex_import\svc_ExImport.h" />
-    <ClInclude Include="ex_import\svc_ExImVCF.h" />
-    <ClInclude Include="ex_import\svc_ExImXML.h" />
-    <ClInclude Include="ex_import\tinystr.h" />
-    <ClInclude Include="ex_import\tinyxml.h" />
-    <ClInclude Include="Flags\svc_countrylistext.h" />
-    <ClInclude Include="Flags\svc_flags.h" />
-    <ClInclude Include="Flags\svc_flagsicons.h" />
-    <ClInclude Include="dlg_anniversarylist.h" />
-    <ClInclude Include="dlg_msgbox.h" />
-    <ClInclude Include="dlg_propsheet.h" />
-    <ClInclude Include="psp_base.h" />
-    <ClInclude Include="ctrl_annivedit.h" />
-    <ClInclude Include="ctrl_base.h" />
-    <ClInclude Include="ctrl_button.h" />
-    <ClInclude Include="ctrl_combo.h" />
-    <ClInclude Include="ctrl_contact.h" />
-    <ClInclude Include="ctrl_edit.h" />
-    <ClInclude Include="ctrl_tzcombo.h" />
-    <ClInclude Include="Res\resource.h" />
-    <ClInclude Include="Res\version.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Res\default.ico" />
-    <None Include="Res\dragcopy.cur" />
-    <None Include="Res\flags.png" />
-    <None Include="Res\main.ico" />
-    <None Include="changelog.txt" />
+    <ClInclude Include="src\classMAnnivDate.h" />
+    <ClInclude Include="src\classMTime.h" />
+    <ClInclude Include="src\commonheaders.h" />
+    <ClInclude Include="src\mir_contactqueue.h" />
+    <ClInclude Include="src\mir_db.h" />
+    <ClInclude Include="src\mir_icolib.h" />
+    <ClInclude Include="src\mir_menuitems.h" />
+    <ClInclude Include="src\mir_string.h" />
+    <ClInclude Include="src\psp_options.h" />
+    <ClInclude Include="src\svc_avatar.h" />
+    <ClInclude Include="src\svc_constants.h" />
+    <ClInclude Include="src\svc_contactinfo.h" />
+    <ClInclude Include="src\svc_email.h" />
+    <ClInclude Include="src\svc_gender.h" />
+    <ClInclude Include="src\svc_homepage.h" />
+    <ClInclude Include="src\svc_phone.h" />
+    <ClInclude Include="src\svc_refreshci.h" />
+    <ClInclude Include="src\svc_reminder.h" />
+    <ClInclude Include="src\svc_timezone.h" />
+    <ClInclude Include="src\svc_timezone_old.h" />
+    <ClInclude Include="src\ex_import\classExImContactBase.h" />
+    <ClInclude Include="src\ex_import\classExImContactXML.h" />
+    <ClInclude Include="src\ex_import\dlg_ExImModules.h" />
+    <ClInclude Include="src\ex_import\dlg_ExImOpenSaveFile.h" />
+    <ClInclude Include="src\ex_import\dlg_ExImProgress.h" />
+    <ClInclude Include="src\ex_import\mir_rfcCodecs.h" />
+    <ClInclude Include="src\ex_import\svc_ExImINI.h" />
+    <ClInclude Include="src\ex_import\svc_ExImport.h" />
+    <ClInclude Include="src\ex_import\svc_ExImVCF.h" />
+    <ClInclude Include="src\ex_import\svc_ExImXML.h" />
+    <ClInclude Include="src\ex_import\tinystr.h" />
+    <ClInclude Include="src\ex_import\tinyxml.h" />
+    <ClInclude Include="src\Flags\svc_countrylistext.h" />
+    <ClInclude Include="src\Flags\svc_flags.h" />
+    <ClInclude Include="src\Flags\svc_flagsicons.h" />
+    <ClInclude Include="src\dlg_anniversarylist.h" />
+    <ClInclude Include="src\dlg_msgbox.h" />
+    <ClInclude Include="src\dlg_propsheet.h" />
+    <ClInclude Include="src\psp_base.h" />
+    <ClInclude Include="src\ctrl_annivedit.h" />
+    <ClInclude Include="src\ctrl_base.h" />
+    <ClInclude Include="src\ctrl_button.h" />
+    <ClInclude Include="src\ctrl_combo.h" />
+    <ClInclude Include="src\ctrl_contact.h" />
+    <ClInclude Include="src\ctrl_edit.h" />
+    <ClInclude Include="src\ctrl_tzcombo.h" />
+    <ClInclude Include="src\Res\resource.h" />
+    <ClInclude Include="src\Res\version.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Res\resource.rc" />