AdvaImg:

- freeimage extracted to the separate library;
- FI_INTERFACE removed, all references to it are replaced with direct calls of FreeImage_* functions;
- unified project for AdvaImg

2 files changed, 101 insertions, 22 deletions

diff --git a/bin15/mir_full.sln b/bin15/mir_full.sln
index af38c8aeeb..94677b9a25 100644
--- a/bin15/mir_full.sln
+++ b/bin15/mir_full.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27130.2020
+VisualStudioVersion = 15.0.27130.2026
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32\miranda32.vcxproj", "{F9916510-9055-4C9F-997A-3755DEC1511B}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -22,8 +22,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Import", "..\plugins\Import
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_mmap", "..\plugins\Db3x_mmap\db3x_mmap.vcxproj", "{20D781FB-4A20-4B75-B863-304A47182966}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvaImg", "..\plugins\AdvaImg\AdvaImg_15.vcxproj", "{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Scriver", "..\plugins\Scriver\scriver.vcxproj", "{B8928210-546C-4AE3-956B-E2B724E6B8E5}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM", "..\plugins\TabSRMM\tabsrmm.vcxproj", "{99D26CA1-BFD4-4E77-9A1E-919E54CF33F7}"
@@ -432,6 +430,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_mdbx", "..\plugins\Dbx_
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ICQCorp", "..\protocols\ICQCorp\ICQCorp.vcxproj", "{AD0D0500-CE7D-417D-9C36-3620D56CA6D4}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeImage", "..\libs\freeimage\freeimage.vcxproj", "{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvaImg", "..\plugins\AdvaImg\AdvaImg.vcxproj", "{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -504,14 +506,6 @@ Global
 		{20D781FB-4A20-4B75-B863-304A47182966}.Release|Win32.Build.0 = Release|Win32
 		{20D781FB-4A20-4B75-B863-304A47182966}.Release|x64.ActiveCfg = Release|x64
 		{20D781FB-4A20-4B75-B863-304A47182966}.Release|x64.Build.0 = Release|x64
-		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Debug|Win32.Build.0 = Debug|Win32
-		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Debug|x64.ActiveCfg = Debug|x64
-		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Debug|x64.Build.0 = Debug|x64
-		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Release|Win32.ActiveCfg = Release|Win32
-		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Release|Win32.Build.0 = Release|Win32
-		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Release|x64.ActiveCfg = Release|x64
-		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Release|x64.Build.0 = Release|x64
 		{B8928210-546C-4AE3-956B-E2B724E6B8E5}.Debug|Win32.ActiveCfg = Debug|Win32
 		{B8928210-546C-4AE3-956B-E2B724E6B8E5}.Debug|Win32.Build.0 = Debug|Win32
 		{B8928210-546C-4AE3-956B-E2B724E6B8E5}.Debug|x64.ActiveCfg = Debug|x64
@@ -1998,6 +1992,22 @@ Global
 		{AD0D0500-CE7D-417D-9C36-3620D56CA6D4}.Release|Win32.Build.0 = Release|Win32
 		{AD0D0500-CE7D-417D-9C36-3620D56CA6D4}.Release|x64.ActiveCfg = Release|x64
 		{AD0D0500-CE7D-417D-9C36-3620D56CA6D4}.Release|x64.Build.0 = Release|x64
+		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Debug|Win32.Build.0 = Debug|Win32
+		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Debug|x64.ActiveCfg = Debug|x64
+		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Debug|x64.Build.0 = Debug|x64
+		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Release|Win32.ActiveCfg = Release|Win32
+		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Release|Win32.Build.0 = Release|Win32
+		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Release|x64.ActiveCfg = Release|x64
+		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Release|x64.Build.0 = Release|x64
+		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Debug|Win32.Build.0 = Debug|Win32
+		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Debug|x64.ActiveCfg = Debug|x64
+		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Debug|x64.Build.0 = Debug|x64
+		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Release|Win32.ActiveCfg = Release|Win32
+		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Release|Win32.Build.0 = Release|Win32
+		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Release|x64.ActiveCfg = Release|x64
+		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/bin15/miranda32.sln b/bin15/miranda32.sln
index 6491e85134..60300868f9 100644
--- a/bin15/miranda32.sln
+++ b/bin15/miranda32.sln
@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27130.2020
+VisualStudioVersion = 15.0.27130.2026
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32\miranda32.vcxproj", "{F9916510-9055-4C9F-997A-3755DEC1511B}"
 	ProjectSection(ProjectDependencies) = postProject
@@ -24,8 +24,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Import", "..\plugins\Import
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_mmap", "..\plugins\db3x_mmap\db3x_mmap.vcxproj", "{20D781FB-4A20-4B75-B863-304A47182966}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvaImg", "..\plugins\AdvaImg\AdvaImg_15.vcxproj", "{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}"
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TabSRMM", "..\plugins\TabSRMM\tabsrmm.vcxproj", "{99D26CA1-BFD4-4E77-9A1E-919E54CF33F7}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GG", "..\protocols\Gadu-Gadu\gadugadu.vcxproj", "{6DA1396F-2A44-4D5C-8442-012F71006217}"
@@ -136,6 +134,20 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MetaContacts", "..\sr
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dbx_mdbx", "..\plugins\Dbx_mdbx\dbx_mdbx.vcxproj", "{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeImage", "..\libs\freeimage\freeimage.vcxproj", "{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{52282CDE-49DF-4662-B582-CCF971A9FEC2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Icons", "Icons", "{949AF443-676D-4B48-B21E-9B6FC3A4808D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{85220459-761D-4E24-A381-D35A95880254}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Protocols", "Protocols", "{812EF24D-9B76-4A94-ABE0-6F80C381C203}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{6221EF9E-F53A-4381-B760-4C0208E5D597}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AdvaImg", "..\plugins\AdvaImg\AdvaImg.vcxproj", "{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -216,14 +228,6 @@ Global
 		{20D781FB-4A20-4B75-B863-304A47182966}.Release|Win32.Build.0 = Release|Win32
 		{20D781FB-4A20-4B75-B863-304A47182966}.Release|x64.ActiveCfg = Release|x64
 		{20D781FB-4A20-4B75-B863-304A47182966}.Release|x64.Build.0 = Release|x64
-		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Debug|Win32.ActiveCfg = Debug|Win32
-		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Debug|Win32.Build.0 = Debug|Win32
-		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Debug|x64.ActiveCfg = Debug|x64
-		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Debug|x64.Build.0 = Debug|x64
-		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Release|Win32.ActiveCfg = Release|Win32
-		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Release|Win32.Build.0 = Release|Win32
-		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Release|x64.ActiveCfg = Release|x64
-		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Release|x64.Build.0 = Release|x64
 		{99D26CA1-BFD4-4E77-9A1E-919E54CF33F7}.Debug|Win32.ActiveCfg = Debug|Win32
 		{99D26CA1-BFD4-4E77-9A1E-919E54CF33F7}.Debug|Win32.Build.0 = Debug|Win32
 		{99D26CA1-BFD4-4E77-9A1E-919E54CF33F7}.Debug|x64.ActiveCfg = Debug|x64
@@ -520,10 +524,75 @@ Global
 		{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}.Release|Win32.Build.0 = Release|Win32
 		{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}.Release|x64.ActiveCfg = Release|x64
 		{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18}.Release|x64.Build.0 = Release|x64
+		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Debug|Win32.Build.0 = Debug|Win32
+		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Debug|x64.ActiveCfg = Debug|x64
+		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Debug|x64.Build.0 = Debug|x64
+		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Release|Win32.ActiveCfg = Release|Win32
+		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Release|Win32.Build.0 = Release|Win32
+		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Release|x64.ActiveCfg = Release|x64
+		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E}.Release|x64.Build.0 = Release|x64
+		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Debug|Win32.ActiveCfg = Debug|Win32
+		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Debug|Win32.Build.0 = Debug|Win32
+		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Debug|x64.ActiveCfg = Debug|x64
+		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Debug|x64.Build.0 = Debug|x64
+		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Release|Win32.ActiveCfg = Release|Win32
+		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Release|Win32.Build.0 = Release|Win32
+		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Release|x64.ActiveCfg = Release|x64
+		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{D9EFEA4B-B817-4DE1-BD62-68A5DB8F5F60} = {52282CDE-49DF-4662-B582-CCF971A9FEC2}
+		{538E451F-E667-4D07-BCE6-976ECC7BB8D1} = {52282CDE-49DF-4662-B582-CCF971A9FEC2}
+		{F6A9340E-B8D9-4C75-BE30-47DC66D0ABC7} = {52282CDE-49DF-4662-B582-CCF971A9FEC2}
+		{620E0BE7-3763-4F35-9DBD-4770104E269C} = {52282CDE-49DF-4662-B582-CCF971A9FEC2}
+		{7711F563-6473-4ABD-B5E3-477CE8384AD6} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
+		{E2A369CD-EDA3-414F-8AD0-E732CD7EE68C} = {52282CDE-49DF-4662-B582-CCF971A9FEC2}
+		{9299B507-1AF9-4C93-9560-5F637D1E0C9E} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
+		{20D781FB-4A20-4B75-B863-304A47182966} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
+		{99D26CA1-BFD4-4E77-9A1E-919E54CF33F7} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
+		{6DA1396F-2A44-4D5C-8442-012F71006217} = {812EF24D-9B76-4A94-ABE0-6F80C381C203}
+		{3A12F777-56A8-42EC-BD17-8F325524241E} = {812EF24D-9B76-4A94-ABE0-6F80C381C203}
+		{01DDCB36-4DE2-405D-BC36-2C8BDEB86659} = {812EF24D-9B76-4A94-ABE0-6F80C381C203}
+		{33276462-8313-4192-8306-13717ECCA60A} = {812EF24D-9B76-4A94-ABE0-6F80C381C203}
+		{7B0F213E-C15E-4219-8AE5-49DD3D3D553D} = {812EF24D-9B76-4A94-ABE0-6F80C381C203}
+		{3C42510C-A29E-4A53-899C-203BFA874E0B} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
+		{E98A8615-1082-1979-D6D8-F763F13BFCBD} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
+		{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
+		{987F026D-EB1F-4013-ADA8-2406ACCDA526} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
+		{33912E32-3B68-4E2C-82AE-64C06EE987A7} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
+		{DB3B0449-E576-4BBB-8B08-AB9E914D39CA} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
+		{DD667247-3712-4355-9774-7E6ACAF2275E} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
+		{1AA0A504-0644-4F00-A1AD-F55D69E50DD0} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
+		{7BC6C3E7-2B17-4718-A82E-084798710E14} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
+		{D9057E63-AAAA-4FE7-800A-20C02F4761F3} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
+		{1C856B14-54CD-4D07-B18B-5F7DB073AB51} = {85220459-761D-4E24-A381-D35A95880254}
+		{A5B558C6-C767-11E1-A335-F6EB6188709B} = {85220459-761D-4E24-A381-D35A95880254}
+		{6022990D-3FD5-46A9-8AB5-E444C51646F3} = {85220459-761D-4E24-A381-D35A95880254}
+		{A8F23706-E590-4A87-96CC-5F8E5082503F} = {85220459-761D-4E24-A381-D35A95880254}
+		{36C40BA6-E0B5-438A-919C-6A991933B313} = {85220459-761D-4E24-A381-D35A95880254}
+		{DADAC956-3A54-440A-8B56-A07234DEE861} = {85220459-761D-4E24-A381-D35A95880254}
+		{D22C1BBB-E06A-4A28-8F33-17D1EA3E8563} = {85220459-761D-4E24-A381-D35A95880254}
+		{C14D6E0D-810E-4599-A6E0-17298AFA0501} = {85220459-761D-4E24-A381-D35A95880254}
+		{E71C1722-A41D-4475-87F4-29961A3654BB} = {85220459-761D-4E24-A381-D35A95880254}
+		{F47EAB99-C78F-4A92-87D5-B0E16FE5A133} = {85220459-761D-4E24-A381-D35A95880254}
+		{8D0F60DE-DB07-49FD-8E1F-0DE558BE6DE3} = {85220459-761D-4E24-A381-D35A95880254}
+		{2C9F6CB6-3E70-4E7A-945D-2A7C148B0DF3} = {85220459-761D-4E24-A381-D35A95880254}
+		{ECE691D0-BFB3-483B-A699-084269EFCE89} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
+		{A2E9DA24-95E4-4414-94AF-488A382E276A} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
+		{F553F140-B7D3-4984-90B1-00D4831B8A6E} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
+		{796B43EF-DACE-4145-8571-31886F45A2C0} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
+		{21F6C0E4-DD1A-49E6-82FD-64574BB902BD} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
+		{DADE9455-DC28-465A-9604-2CA28052B9FB} = {812EF24D-9B76-4A94-ABE0-6F80C381C203}
+		{44298314-7DD4-4EF7-B576-30E503257223} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
+		{793B6174-89B0-4682-A957-A32BE7F61502} = {949AF443-676D-4B48-B21E-9B6FC3A4808D}
+		{E0ACDEA0-0AC9-4431-8CA3-6B0CCACB2E18} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
+		{5D14CFF3-0D17-4528-99EA-DE9DCA47CC2E} = {52282CDE-49DF-4662-B582-CCF971A9FEC2}
+		{D0C4EACD-F264-4CFA-9AFC-3918FEC31A9A} = {6221EF9E-F53A-4381-B760-4C0208E5D597}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {5A4CD630-DD83-4096-AA4D-7A141E43E853}
 	EndGlobalSection