fix for broken project file compatibility in VS2019 16.6.0

2 files changed, 394 insertions, 28 deletions

diff --git a/plugins/UserInfoEx/UInfoEx.vcxproj b/plugins/UserInfoEx/UInfoEx.vcxproj
index 20144f2d78..396c155995 100644
--- a/plugins/UserInfoEx/UInfoEx.vcxproj
+++ b/plugins/UserInfoEx/UInfoEx.vcxproj
@@ -26,20 +26,131 @@
     <Import Project="$(ProjectDir)..\..\build\vc.common\plugin.props" />

   </ImportGroup>

   <ItemGroup>

+    <ClCompile Include="src\classMAnnivDate.cpp" />

+    <ClCompile Include="src\classMTime.cpp" />

+    <ClCompile Include="src\classPsTree.cpp" />

+    <ClCompile Include="src\classPsTreeItem.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" />

+    <ClCompile Include="src\dlg_anniversarylist.cpp" />

+    <ClCompile Include="src\dlg_msgbox.cpp" />

+    <ClCompile Include="src\dlg_propsheet.cpp" />

+    <ClCompile Include="src\ex_import\classExImContactBase.cpp">

+      <PrecompiledHeaderFile>..\stdafx.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\ex_import\classExImContactXML.cpp">

+      <PrecompiledHeaderFile>..\stdafx.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\ex_import\dlg_ExImModules.cpp">

+      <PrecompiledHeaderFile>..\stdafx.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\ex_import\dlg_ExImOpenSaveFile.cpp">

+      <PrecompiledHeaderFile>..\stdafx.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\ex_import\dlg_ExImProgress.cpp">

+      <PrecompiledHeaderFile>..\stdafx.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\ex_import\svc_ExImINI.cpp">

+      <PrecompiledHeaderFile>..\stdafx.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\ex_import\svc_ExImport.cpp">

+      <PrecompiledHeaderFile>..\stdafx.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\ex_import\svc_ExImVCF.cpp">

+      <PrecompiledHeaderFile>..\stdafx.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\ex_import\svc_ExImXML.cpp">

+      <PrecompiledHeaderFile>..\stdafx.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\Flags\svc_flags.cpp">

+      <PrecompiledHeaderFile>..\stdafx.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <ClCompile Include="src\Flags\svc_flagsicons.cpp">

+      <PrecompiledHeaderFile>..\stdafx.h</PrecompiledHeaderFile>

+    </ClCompile>

+    <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_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_options.cpp" />

+    <ClCompile Include="src\psp_origin.cpp" />

+    <ClCompile Include="src\psp_profile.cpp" />

+    <ClCompile Include="src\stdafx.cxx">

+      <PrecompiledHeader>Create</PrecompiledHeader>

+    </ClCompile>

+    <ClCompile Include="src\svc_avatar.cpp" />

+    <ClCompile Include="src\svc_constants.cpp" />

+    <ClCompile Include="src\svc_email.cpp" />

+    <ClCompile Include="src\svc_gender.cpp" />

+    <ClCompile Include="src\svc_homepage.cpp" />

+    <ClCompile Include="src\svc_refreshci.cpp" />

+    <ClCompile Include="src\svc_reminder.cpp" />

+    <ClCompile Include="src\svc_timezone.cpp" />

+    <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\Flags\svc_flags.h" />

+    <ClInclude Include="src\Flags\svc_flagsicons.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_base.h" />

+    <ClInclude Include="src\psp_options.h" />

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

+    <ClInclude Include="src\stdafx.h" />

+    <ClInclude Include="src\svc_avatar.h" />

+    <ClInclude Include="src\svc_constants.h" />

+    <ClInclude Include="src\svc_email.h" />

+    <ClInclude Include="src\svc_gender.h" />

+    <ClInclude Include="src\svc_homepage.h" />

+    <ClInclude Include="src\svc_refreshci.h" />

+    <ClInclude Include="src\svc_reminder.h" />

+    <ClInclude Include="src\svc_timezone.h" />

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

+  </ItemGroup>

+  <ItemGroup>

     <ProjectReference Include="..\..\libs\freeimage\freeimage.vcxproj">

       <Project>{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}</Project>

     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="src\ex_import\*.cpp">

-      <PrecompiledHeaderFile>..\stdafx.h</PrecompiledHeaderFile>

-    </ClCompile>

-    <ClCompile Include="src\Flags\*.cpp">

-      <PrecompiledHeaderFile>..\stdafx.h</PrecompiledHeaderFile>

-    </ClCompile>

+    <ClInclude Include="src\classMAnnivDate.h" />

+    <ClInclude Include="src\classMTime.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\dlg_anniversarylist.h" />

+    <ClInclude Include="src\dlg_msgbox.h" />

+    <ClInclude Include="src\dlg_propsheet.h" />

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="src\ex_import\*.h" />

-    <ClInclude Include="src\Flags\*.h" />

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

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

   </ItemGroup>

 </Project>
\ No newline at end of file
diff --git a/plugins/UserInfoEx/UInfoEx.vcxproj.filters b/plugins/UserInfoEx/UInfoEx.vcxproj.filters
index 0904da07ed..c235916a1c 100644
--- a/plugins/UserInfoEx/UInfoEx.vcxproj.filters
+++ b/plugins/UserInfoEx/UInfoEx.vcxproj.filters
@@ -8,35 +8,290 @@
       <UniqueIdentifier>{c8dd3d4e-3adb-4b2d-ac98-78e190c2b49A}</UniqueIdentifier>

     </Filter>

   </ItemGroup>

-  <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />

   <ItemGroup>

-    <ClInclude Include="src\ex_import\*.h">

-      <Filter>Source Files\Export</Filter>

-    </ClInclude>

-    <ClCompile Include="src\ex_import\*.cpp">

-      <Filter>Source Files\Export</Filter>

+    <ClCompile Include="src\classMAnnivDate.cpp">

+      <Filter>Source Files</Filter>

     </ClCompile>

-  </ItemGroup>

-  <ItemGroup>

-    <ClInclude Include="src\Flags\*.h">

-      <Filter>Source Files\Flags</Filter>

-    </ClInclude>

-    <ClCompile Include="src\Flags\*.cpp">

-      <Filter>Source Files\Flags</Filter>

+    <ClCompile Include="src\classMTime.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\classPsTree.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\classPsTreeItem.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\ctrl_annivedit.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\ctrl_base.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\ctrl_button.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\ctrl_combo.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\ctrl_contact.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\ctrl_edit.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\ctrl_tzcombo.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\dlg_anniversarylist.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\dlg_msgbox.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\dlg_propsheet.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\ex_import\classExImContactBase.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\ex_import\classExImContactXML.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\ex_import\dlg_ExImModules.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\ex_import\dlg_ExImOpenSaveFile.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\ex_import\dlg_ExImProgress.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\ex_import\svc_ExImINI.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\ex_import\svc_ExImport.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\ex_import\svc_ExImVCF.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\ex_import\svc_ExImXML.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\Flags\svc_flags.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\Flags\svc_flagsicons.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\init.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\mir_contactqueue.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\mir_db.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\mir_icolib.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\mir_menuitems.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\mir_string.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\psp_about.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\psp_anniversary.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\psp_base.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\psp_company.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\psp_contact.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\psp_general.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\psp_options.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\psp_origin.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\psp_profile.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\stdafx.cxx">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\svc_avatar.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\svc_constants.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\svc_email.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\svc_gender.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\svc_homepage.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\svc_refreshci.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\svc_reminder.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="src\svc_timezone.cpp">

+      <Filter>Source Files</Filter>

     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="src\*.h">

+    <ClInclude Include="src\ex_import\classExImContactBase.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClCompile Include="src\*.cpp;src\*.cxx">

-      <Filter>Source Files</Filter>

-    </ClCompile>

-    <ResourceCompile Include="res\*.rc">

+    <ClInclude Include="src\ex_import\classExImContactXML.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\ex_import\dlg_ExImModules.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\ex_import\dlg_ExImOpenSaveFile.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\ex_import\dlg_ExImProgress.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\ex_import\mir_rfcCodecs.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\ex_import\svc_ExImINI.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\ex_import\svc_ExImport.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\ex_import\svc_ExImVCF.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\ex_import\svc_ExImXML.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\Flags\svc_flags.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\Flags\svc_flagsicons.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\mir_contactqueue.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\mir_db.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\mir_icolib.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\mir_menuitems.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\mir_string.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\psp_base.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\psp_options.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\stdafx.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\svc_avatar.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\svc_constants.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\svc_email.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\svc_gender.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\svc_homepage.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\svc_refreshci.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\svc_reminder.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\svc_timezone.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

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

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\classMAnnivDate.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\classMTime.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\ctrl_annivedit.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\ctrl_base.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\ctrl_button.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\ctrl_combo.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\ctrl_contact.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\ctrl_edit.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\ctrl_tzcombo.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\dlg_anniversarylist.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\dlg_msgbox.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+    <ClInclude Include="src\dlg_propsheet.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

+  </ItemGroup>

+  <ItemGroup>

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

       <Filter>Resource Files</Filter>

     </ResourceCompile>

-    <None Include="res\*.ico;res\*.bmp;res\*.cur">

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

       <Filter>Resource Files</Filter>

-    </None>

+    </ResourceCompile>

   </ItemGroup>

+  <Import Project="$(ProjectDir)..\..\build\vc.common\common.filters" />

 </Project>
\ No newline at end of file