From 6dfdccb3decd016ced438309d326547e5244604e Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Fri, 18 May 2012 20:27:43 +0000 Subject: compilation fix git-svn-id: http://svn.miranda-ng.org/main/trunk@55 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- bin10/mir_full.sln | 123 ++++++++++----------- plugins/Autorun/autorun.h | 1 + plugins/Boltun/boltun.cpp | 12 +- plugins/Bonsai/FixOptions/Bonsai.cpp | 7 +- plugins/Bonsai/FixOptions/FixOptions.vcxproj | 2 - .../Bonsai/FixOptions/FixOptions.vcxproj.filters | 6 - plugins/Bonsai/FixOptions/commonheaders.h | 1 - plugins/Bonsai/FixOptions/mirandaMem.cpp | 35 ------ plugins/Bonsai/FixOptions/mirandaMem.h | 32 ------ plugins/Bonsai/FixOptions/utils.cpp | 8 +- 10 files changed, 75 insertions(+), 152 deletions(-) delete mode 100644 plugins/Bonsai/FixOptions/mirandaMem.cpp delete mode 100644 plugins/Bonsai/FixOptions/mirandaMem.h diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index 0fbe5c564f..1e9d221d97 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -44,13 +44,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miranda32", "..\src\miranda EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "msn", "..\protocols\MSN\msn_10.vcxproj", "{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbrw", "..\plugins\dbrw\dbrw_10.vcxproj", "{0A3D4D77-77B8-B817-FC8B-535BDCD0980A}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dbrw", "..\plugins\dbrw\dbrw_10.vcxproj", "{DD948CA0-E04B-BF22-2FF2-53C36521026C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clist_nicer", "..\plugins\clist_nicer\clist_nicer_10.vcxproj", "{3C42510C-A29E-4A53-899C-203BFA874E0B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xstatus_ICQ", "..\protocols\IcqOscarJ\icons_pack\ICONS.vcxproj", "{500057D6-5563-7AEF-129A-FC17C88C5BC1}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xstatus_ICQ", "..\protocols\IcqOscarJ\icons_pack\ICONS.vcxproj", "{876125F4-A75A-14E4-E352-8C729653C330}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xstatus_jabber", "..\protocols\JabberG\jabber_xstatus\JABBER_XSTATUS_10.vcxproj", "{C188A10E-AA70-BB1D-6B56-FC218C8FBB65}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xstatus_jabber", "..\protocols\JabberG\jabber_xstatus\JABBER_XSTATUS_10.vcxproj", "{CD88016D-2959-CF09-20D2-BC00A525121A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "toolbar_icons", "..\plugins\modernb\icons_pack\ICONS_10.vcxproj", "{796B43EF-DACE-4145-8571-31886F45A2C0}" EndProject @@ -62,7 +62,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tabsrmm_icons", "..\plugins EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AuthState", "..\plugins\AuthState\authstate_10.vcxproj", "{DB315D7D-00BB-43B2-93A6-0430CA2B9F28}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "autorun", "..\plugins\Autorun\autorun.vcxproj", "{2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "autorun", "..\plugins\Autorun\autorun.vcxproj", "{744E3D5B-2C68-B385-F3DF-66E333AABE5F}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Bass_interface", "..\plugins\Bass_interface\Bass_interface.vcxproj", "{3933E789-D185-41DC-8169-9FF4365B6015}" EndProject @@ -76,9 +76,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BuddyExpectator", "..\plugi EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Console", "..\plugins\Console\Console.vcxproj", "{A231E008-2D1A-4F24-95DD-59F56F85A499}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "contacts", "..\plugins\ContactsPlus\contacts.vcxproj", "{F4F2FD25-1553-FB72-F695-0701D20C3168}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "contacts", "..\plugins\ContactsPlus\contacts.vcxproj", "{AF97F763-D949-D100-BE82-078A3C5196D5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flags", "..\plugins\CountryFlags\flags.vcxproj", "{B4361FA0-4073-4B60-EE72-F5C08E6EDF61}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "flags", "..\plugins\CountryFlags\flags.vcxproj", "{19B6101A-27FF-05B9-A4ED-B8EE16715BEE}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "crshdmp", "..\plugins\crshdmp\crshdmp_10.vcxproj", "{576EEEFD-E423-482B-879A-F0515D40B8E1}" EndProject @@ -110,7 +110,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "folders", "..\plugins\folde EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gender", "..\plugins\Gender\gender_10.vcxproj", "{9DF8913A-99A3-40D2-86FE-585EBDDCABB2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linklist", "..\plugins\HistoryLinkListPlus\linklist.vcxproj", "{850EC838-0EAD-45EB-6F1B-16DC90DCE18D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "linklist", "..\plugins\HistoryLinkListPlus\linklist.vcxproj", "{5CBA14D7-A4F1-B86F-0954-075F60D83A3A}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "historysweeperlight", "..\plugins\HistorySweeperLight\historysweeperlight_10.vcxproj", "{9DE1F0B0-B9D1-4681-82E7-13CC3E047445}" EndProject @@ -197,6 +197,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Weather", "..\protocols\weather\weather_10.vcxproj", "{6BFE3E13-BD5D-4C1C-BB29-A82FB51A16CE}" EndProject Global + GlobalSection(DPCodeReviewSolutionGUID) = preSolution + DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} + EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 @@ -380,10 +383,10 @@ Global {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|Win32.Build.0 = Release|Win32 {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.ActiveCfg = Release|x64 {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.Build.0 = Release|x64 - {0A3D4D77-77B8-B817-FC8B-535BDCD0980A}.Debug|Win32.ActiveCfg = Debug|Win32 - {0A3D4D77-77B8-B817-FC8B-535BDCD0980A}.Debug|x64.ActiveCfg = Debug|x64 - {0A3D4D77-77B8-B817-FC8B-535BDCD0980A}.Release|Win32.ActiveCfg = Release|Win32 - {0A3D4D77-77B8-B817-FC8B-535BDCD0980A}.Release|x64.ActiveCfg = Release|x64 + {DD948CA0-E04B-BF22-2FF2-53C36521026C}.Debug|Win32.ActiveCfg = Debug|Win32 + {DD948CA0-E04B-BF22-2FF2-53C36521026C}.Debug|x64.ActiveCfg = Debug|x64 + {DD948CA0-E04B-BF22-2FF2-53C36521026C}.Release|Win32.ActiveCfg = Release|Win32 + {DD948CA0-E04B-BF22-2FF2-53C36521026C}.Release|x64.ActiveCfg = Release|x64 {3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.ActiveCfg = Debug|Win32 {3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.Build.0 = Debug|Win32 {3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|x64.ActiveCfg = Debug|x64 @@ -392,22 +395,22 @@ Global {3C42510C-A29E-4A53-899C-203BFA874E0B}.Release|Win32.Build.0 = Release|Win32 {3C42510C-A29E-4A53-899C-203BFA874E0B}.Release|x64.ActiveCfg = Release|x64 {3C42510C-A29E-4A53-899C-203BFA874E0B}.Release|x64.Build.0 = Release|x64 - {500057D6-5563-7AEF-129A-FC17C88C5BC1}.Debug|Win32.ActiveCfg = Debug|Win32 - {500057D6-5563-7AEF-129A-FC17C88C5BC1}.Debug|Win32.Build.0 = Debug|Win32 - {500057D6-5563-7AEF-129A-FC17C88C5BC1}.Debug|x64.ActiveCfg = Debug|x64 - {500057D6-5563-7AEF-129A-FC17C88C5BC1}.Debug|x64.Build.0 = Debug|x64 - {500057D6-5563-7AEF-129A-FC17C88C5BC1}.Release|Win32.ActiveCfg = Release|Win32 - {500057D6-5563-7AEF-129A-FC17C88C5BC1}.Release|Win32.Build.0 = Release|Win32 - {500057D6-5563-7AEF-129A-FC17C88C5BC1}.Release|x64.ActiveCfg = Release|x64 - {500057D6-5563-7AEF-129A-FC17C88C5BC1}.Release|x64.Build.0 = Release|x64 - {C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Debug|Win32.ActiveCfg = Debug|Win32 - {C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Debug|Win32.Build.0 = Debug|Win32 - {C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Debug|x64.ActiveCfg = Debug|x64 - {C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Debug|x64.Build.0 = Debug|x64 - {C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Release|Win32.ActiveCfg = Release|Win32 - {C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Release|Win32.Build.0 = Release|Win32 - {C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Release|x64.ActiveCfg = Release|x64 - {C188A10E-AA70-BB1D-6B56-FC218C8FBB65}.Release|x64.Build.0 = Release|x64 + {876125F4-A75A-14E4-E352-8C729653C330}.Debug|Win32.ActiveCfg = Debug|Win32 + {876125F4-A75A-14E4-E352-8C729653C330}.Debug|Win32.Build.0 = Debug|Win32 + {876125F4-A75A-14E4-E352-8C729653C330}.Debug|x64.ActiveCfg = Debug|x64 + {876125F4-A75A-14E4-E352-8C729653C330}.Debug|x64.Build.0 = Debug|x64 + {876125F4-A75A-14E4-E352-8C729653C330}.Release|Win32.ActiveCfg = Release|Win32 + {876125F4-A75A-14E4-E352-8C729653C330}.Release|Win32.Build.0 = Release|Win32 + {876125F4-A75A-14E4-E352-8C729653C330}.Release|x64.ActiveCfg = Release|x64 + {876125F4-A75A-14E4-E352-8C729653C330}.Release|x64.Build.0 = Release|x64 + {CD88016D-2959-CF09-20D2-BC00A525121A}.Debug|Win32.ActiveCfg = Debug|Win32 + {CD88016D-2959-CF09-20D2-BC00A525121A}.Debug|Win32.Build.0 = Debug|Win32 + {CD88016D-2959-CF09-20D2-BC00A525121A}.Debug|x64.ActiveCfg = Debug|x64 + {CD88016D-2959-CF09-20D2-BC00A525121A}.Debug|x64.Build.0 = Debug|x64 + {CD88016D-2959-CF09-20D2-BC00A525121A}.Release|Win32.ActiveCfg = Release|Win32 + {CD88016D-2959-CF09-20D2-BC00A525121A}.Release|Win32.Build.0 = Release|Win32 + {CD88016D-2959-CF09-20D2-BC00A525121A}.Release|x64.ActiveCfg = Release|x64 + {CD88016D-2959-CF09-20D2-BC00A525121A}.Release|x64.Build.0 = Release|x64 {796B43EF-DACE-4145-8571-31886F45A2C0}.Debug|Win32.ActiveCfg = Debug|Win32 {796B43EF-DACE-4145-8571-31886F45A2C0}.Debug|Win32.Build.0 = Debug|Win32 {796B43EF-DACE-4145-8571-31886F45A2C0}.Debug|x64.ActiveCfg = Debug|x64 @@ -448,14 +451,14 @@ Global {DB315D7D-00BB-43B2-93A6-0430CA2B9F28}.Release|Win32.Build.0 = Release|Win32 {DB315D7D-00BB-43B2-93A6-0430CA2B9F28}.Release|x64.ActiveCfg = Release|x64 {DB315D7D-00BB-43B2-93A6-0430CA2B9F28}.Release|x64.Build.0 = Release|x64 - {2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Debug|Win32.ActiveCfg = Debug|Win32 - {2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Debug|Win32.Build.0 = Debug|Win32 - {2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Debug|x64.ActiveCfg = Debug|x64 - {2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Debug|x64.Build.0 = Debug|x64 - {2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Release|Win32.ActiveCfg = Release|Win32 - {2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Release|Win32.Build.0 = Release|Win32 - {2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Release|x64.ActiveCfg = Release|x64 - {2CF5BEA8-BD73-ED7B-FC7C-32E7E972A630}.Release|x64.Build.0 = Release|x64 + {744E3D5B-2C68-B385-F3DF-66E333AABE5F}.Debug|Win32.ActiveCfg = Debug|Win32 + {744E3D5B-2C68-B385-F3DF-66E333AABE5F}.Debug|Win32.Build.0 = Debug|Win32 + {744E3D5B-2C68-B385-F3DF-66E333AABE5F}.Debug|x64.ActiveCfg = Debug|x64 + {744E3D5B-2C68-B385-F3DF-66E333AABE5F}.Debug|x64.Build.0 = Debug|x64 + {744E3D5B-2C68-B385-F3DF-66E333AABE5F}.Release|Win32.ActiveCfg = Release|Win32 + {744E3D5B-2C68-B385-F3DF-66E333AABE5F}.Release|Win32.Build.0 = Release|Win32 + {744E3D5B-2C68-B385-F3DF-66E333AABE5F}.Release|x64.ActiveCfg = Release|x64 + {744E3D5B-2C68-B385-F3DF-66E333AABE5F}.Release|x64.Build.0 = Release|x64 {3933E789-D185-41DC-8169-9FF4365B6015}.Debug|Win32.ActiveCfg = Debug|Win32 {3933E789-D185-41DC-8169-9FF4365B6015}.Debug|Win32.Build.0 = Debug|Win32 {3933E789-D185-41DC-8169-9FF4365B6015}.Debug|x64.ActiveCfg = Debug|x64 @@ -502,20 +505,20 @@ Global {A231E008-2D1A-4F24-95DD-59F56F85A499}.Release|Win32.Build.0 = Release|Win32 {A231E008-2D1A-4F24-95DD-59F56F85A499}.Release|x64.ActiveCfg = Release|x64 {A231E008-2D1A-4F24-95DD-59F56F85A499}.Release|x64.Build.0 = Release|x64 - {F4F2FD25-1553-FB72-F695-0701D20C3168}.Debug|Win32.ActiveCfg = Debug|Win32 - {F4F2FD25-1553-FB72-F695-0701D20C3168}.Debug|Win32.Build.0 = Debug|Win32 - {F4F2FD25-1553-FB72-F695-0701D20C3168}.Debug|x64.ActiveCfg = Debug|x64 - {F4F2FD25-1553-FB72-F695-0701D20C3168}.Debug|x64.Build.0 = Debug|x64 - {F4F2FD25-1553-FB72-F695-0701D20C3168}.Release|Win32.ActiveCfg = Release|Win32 - {F4F2FD25-1553-FB72-F695-0701D20C3168}.Release|Win32.Build.0 = Release|Win32 - {F4F2FD25-1553-FB72-F695-0701D20C3168}.Release|x64.ActiveCfg = Release|x64 - {F4F2FD25-1553-FB72-F695-0701D20C3168}.Release|x64.Build.0 = Release|x64 - {B4361FA0-4073-4B60-EE72-F5C08E6EDF61}.Debug|Win32.ActiveCfg = Debug|Win32 - {B4361FA0-4073-4B60-EE72-F5C08E6EDF61}.Debug|Win32.Build.0 = Debug|Win32 - {B4361FA0-4073-4B60-EE72-F5C08E6EDF61}.Debug|x64.ActiveCfg = Debug|Win32 - {B4361FA0-4073-4B60-EE72-F5C08E6EDF61}.Release|Win32.ActiveCfg = Release|Win32 - {B4361FA0-4073-4B60-EE72-F5C08E6EDF61}.Release|Win32.Build.0 = Release|Win32 - {B4361FA0-4073-4B60-EE72-F5C08E6EDF61}.Release|x64.ActiveCfg = Release|Win32 + {AF97F763-D949-D100-BE82-078A3C5196D5}.Debug|Win32.ActiveCfg = Debug|Win32 + {AF97F763-D949-D100-BE82-078A3C5196D5}.Debug|Win32.Build.0 = Debug|Win32 + {AF97F763-D949-D100-BE82-078A3C5196D5}.Debug|x64.ActiveCfg = Debug|x64 + {AF97F763-D949-D100-BE82-078A3C5196D5}.Debug|x64.Build.0 = Debug|x64 + {AF97F763-D949-D100-BE82-078A3C5196D5}.Release|Win32.ActiveCfg = Release|Win32 + {AF97F763-D949-D100-BE82-078A3C5196D5}.Release|Win32.Build.0 = Release|Win32 + {AF97F763-D949-D100-BE82-078A3C5196D5}.Release|x64.ActiveCfg = Release|x64 + {AF97F763-D949-D100-BE82-078A3C5196D5}.Release|x64.Build.0 = Release|x64 + {19B6101A-27FF-05B9-A4ED-B8EE16715BEE}.Debug|Win32.ActiveCfg = Debug|Win32 + {19B6101A-27FF-05B9-A4ED-B8EE16715BEE}.Debug|Win32.Build.0 = Debug|Win32 + {19B6101A-27FF-05B9-A4ED-B8EE16715BEE}.Debug|x64.ActiveCfg = Debug|Win32 + {19B6101A-27FF-05B9-A4ED-B8EE16715BEE}.Release|Win32.ActiveCfg = Release|Win32 + {19B6101A-27FF-05B9-A4ED-B8EE16715BEE}.Release|Win32.Build.0 = Release|Win32 + {19B6101A-27FF-05B9-A4ED-B8EE16715BEE}.Release|x64.ActiveCfg = Release|Win32 {576EEEFD-E423-482B-879A-F0515D40B8E1}.Debug|Win32.ActiveCfg = Debug|Win32 {576EEEFD-E423-482B-879A-F0515D40B8E1}.Debug|Win32.Build.0 = Debug|Win32 {576EEEFD-E423-482B-879A-F0515D40B8E1}.Debug|x64.ActiveCfg = Debug|x64 @@ -629,14 +632,14 @@ Global {9DF8913A-99A3-40D2-86FE-585EBDDCABB2}.Release|Win32.Build.0 = Release|Win32 {9DF8913A-99A3-40D2-86FE-585EBDDCABB2}.Release|x64.ActiveCfg = Release|x64 {9DF8913A-99A3-40D2-86FE-585EBDDCABB2}.Release|x64.Build.0 = Release|x64 - {850EC838-0EAD-45EB-6F1B-16DC90DCE18D}.Debug|Win32.ActiveCfg = Debug|Win32 - {850EC838-0EAD-45EB-6F1B-16DC90DCE18D}.Debug|Win32.Build.0 = Debug|Win32 - {850EC838-0EAD-45EB-6F1B-16DC90DCE18D}.Debug|x64.ActiveCfg = Debug|x64 - {850EC838-0EAD-45EB-6F1B-16DC90DCE18D}.Debug|x64.Build.0 = Debug|x64 - {850EC838-0EAD-45EB-6F1B-16DC90DCE18D}.Release|Win32.ActiveCfg = Release|Win32 - {850EC838-0EAD-45EB-6F1B-16DC90DCE18D}.Release|Win32.Build.0 = Release|Win32 - {850EC838-0EAD-45EB-6F1B-16DC90DCE18D}.Release|x64.ActiveCfg = Release|x64 - {850EC838-0EAD-45EB-6F1B-16DC90DCE18D}.Release|x64.Build.0 = Release|x64 + {5CBA14D7-A4F1-B86F-0954-075F60D83A3A}.Debug|Win32.ActiveCfg = Debug|Win32 + {5CBA14D7-A4F1-B86F-0954-075F60D83A3A}.Debug|Win32.Build.0 = Debug|Win32 + {5CBA14D7-A4F1-B86F-0954-075F60D83A3A}.Debug|x64.ActiveCfg = Debug|x64 + {5CBA14D7-A4F1-B86F-0954-075F60D83A3A}.Debug|x64.Build.0 = Debug|x64 + {5CBA14D7-A4F1-B86F-0954-075F60D83A3A}.Release|Win32.ActiveCfg = Release|Win32 + {5CBA14D7-A4F1-B86F-0954-075F60D83A3A}.Release|Win32.Build.0 = Release|Win32 + {5CBA14D7-A4F1-B86F-0954-075F60D83A3A}.Release|x64.ActiveCfg = Release|x64 + {5CBA14D7-A4F1-B86F-0954-075F60D83A3A}.Release|x64.Build.0 = Release|x64 {9DE1F0B0-B9D1-4681-82E7-13CC3E047445}.Debug|Win32.ActiveCfg = Debug|Win32 {9DE1F0B0-B9D1-4681-82E7-13CC3E047445}.Debug|Win32.Build.0 = Debug|Win32 {9DE1F0B0-B9D1-4681-82E7-13CC3E047445}.Debug|x64.ActiveCfg = Debug|Win32 @@ -964,10 +967,4 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(DPCodeReviewSolutionGUID) = preSolution - DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} - EndGlobalSection - GlobalSection(DPCodeReviewSolutionGUID) = preSolution - DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} - EndGlobalSection EndGlobal diff --git a/plugins/Autorun/autorun.h b/plugins/Autorun/autorun.h index 4452ef7a4a..a991061066 100644 --- a/plugins/Autorun/autorun.h +++ b/plugins/Autorun/autorun.h @@ -1,6 +1,7 @@ #define IDD_OPT_AUTORUN 101 #define IDC_AUTORUN 102 +#define MIRANDA_VER 0x0A00 #define SUB_KEY "Software\\Microsoft\\Windows\\CurrentVersion\\Run" #define ModuleName "Autorun" diff --git a/plugins/Boltun/boltun.cpp b/plugins/Boltun/boltun.cpp index bdad74deec..372995be7c 100644 --- a/plugins/Boltun/boltun.cpp +++ b/plugins/Boltun/boltun.cpp @@ -59,8 +59,8 @@ BOOL blInit = FALSE; UINT pTimer = 0; TCHAR *path; -PLUGININFO pluginInfo={ - sizeof(PLUGININFO), +PLUGININFOEX pluginInfo={ + sizeof(PLUGININFOEX), BOLTUN_NAME, PLUGIN_MAKE_VERSION(0,0,3,0), PLUGIN_DESCRIPTION, @@ -69,7 +69,9 @@ PLUGININFO pluginInfo={ "© 2003-2008 Alexander S. Kiselev A.K.A. KAS, Valentin Pavlyuchenko", "http://miranda-im.org", UNICODE_AWARE, - 0 + 0, + // {488C5C84-56DA-434F-96F1-B18900DEF760} + { 0x488c5c84, 0x56da, 0x434f, { 0x96, 0xf1, 0xb1, 0x89, 0x0, 0xde, 0xf7, 0x60 } } }; static HANDLE hEventDbEventAdded; @@ -618,7 +620,7 @@ static int MessagePrebuild(WPARAM wParam, LPARAM lParam) return 0; } -extern "C" __declspec(dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVersion) +extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfo(DWORD mirandaVersion) { return &pluginInfo; } @@ -626,7 +628,7 @@ extern "C" __declspec(dllexport) PLUGININFO* MirandaPluginInfo(DWORD mirandaVers extern "C" int __declspec(dllexport) Load(PLUGINLINK *link) { pluginLink = link; - mir_getLP(&pluginInfoEx); + mir_getLP(&pluginInfo); mmi.cbSize=sizeof(struct MM_INTERFACE); CallService(MS_SYSTEM_GET_MMI,0,(LPARAM)&mmi); diff --git a/plugins/Bonsai/FixOptions/Bonsai.cpp b/plugins/Bonsai/FixOptions/Bonsai.cpp index cddbf70ff5..bea3156f89 100644 --- a/plugins/Bonsai/FixOptions/Bonsai.cpp +++ b/plugins/Bonsai/FixOptions/Bonsai.cpp @@ -34,6 +34,7 @@ HIMAGELIST imgList = NULL; PLUGINLINK *pluginLink; int hLangpack; +struct MM_INTERFACE mmi; PLUGININFOEX pluginInfo = { sizeof(PLUGININFOEX), @@ -80,15 +81,13 @@ extern "C" int __declspec(dllexport) Load(PLUGINLINK *link) LogInit(); pluginLink = link; - mir_getLP(&pluginInfoEx); + mir_getMMI(&mmi); + mir_getLP(&pluginInfo); InitServices(); HookEvents(); - InitializeMirandaMemFunctions(); - - hbModified = LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_MODIFIED)); hbUnmodified = LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_UNMODIFIED)); hbHidden = LoadBitmap(hInstance, MAKEINTRESOURCE(IDB_HIDDEN)); diff --git a/plugins/Bonsai/FixOptions/FixOptions.vcxproj b/plugins/Bonsai/FixOptions/FixOptions.vcxproj index a2873a0476..67a96c954e 100644 --- a/plugins/Bonsai/FixOptions/FixOptions.vcxproj +++ b/plugins/Bonsai/FixOptions/FixOptions.vcxproj @@ -184,7 +184,6 @@ - @@ -193,7 +192,6 @@ - diff --git a/plugins/Bonsai/FixOptions/FixOptions.vcxproj.filters b/plugins/Bonsai/FixOptions/FixOptions.vcxproj.filters index 263e9a73f1..3bb27e93ca 100644 --- a/plugins/Bonsai/FixOptions/FixOptions.vcxproj.filters +++ b/plugins/Bonsai/FixOptions/FixOptions.vcxproj.filters @@ -27,9 +27,6 @@ Source Files - - Source Files - Source Files @@ -50,9 +47,6 @@ Header Files - - Header Files - Header Files diff --git a/plugins/Bonsai/FixOptions/commonheaders.h b/plugins/Bonsai/FixOptions/commonheaders.h index 0bc013dcdf..29ebda9d46 100644 --- a/plugins/Bonsai/FixOptions/commonheaders.h +++ b/plugins/Bonsai/FixOptions/commonheaders.h @@ -50,7 +50,6 @@ typedef INT_PTR (*MIRANDASERVICE)(WPARAM,LPARAM); #include "version.h" #include "utils.h" -#include "mirandaMem.h" #include "services.h" #include "list.h" #include "dlg_handlers.h" diff --git a/plugins/Bonsai/FixOptions/mirandaMem.cpp b/plugins/Bonsai/FixOptions/mirandaMem.cpp deleted file mode 100644 index 05280dbbdb..0000000000 --- a/plugins/Bonsai/FixOptions/mirandaMem.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/* -Bonsai plugin for Miranda IM - -Copyright © 2006 Cristian Libotean - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#include "mirandaMem.h" - -void *(*MirandaMalloc)(size_t size) = NULL; -void *(*MirandaRealloc)(void *data, size_t newSize) = NULL; -void (*MirandaFree) (void *data) = NULL; - -void InitializeMirandaMemFunctions() -{ - struct MM_INTERFACE mmi = {0}; - mmi.cbSize = sizeof(MM_INTERFACE); - CallService(MS_SYSTEM_GET_MMI, 0, (LPARAM) &mmi); - MirandaMalloc = mmi.mmi_malloc; - MirandaRealloc = mmi.mmi_realloc; - MirandaFree = mmi.mmi_free; -} \ No newline at end of file diff --git a/plugins/Bonsai/FixOptions/mirandaMem.h b/plugins/Bonsai/FixOptions/mirandaMem.h deleted file mode 100644 index 6f7b12aa9e..0000000000 --- a/plugins/Bonsai/FixOptions/mirandaMem.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -Bonsai plugin for Miranda IM - -Copyright © 2006 Cristian Libotean - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -*/ - -#ifndef M_BONSAI_MIRANDA_MEM_H -#define M_BONSAI_MIRANDA_MEM_H - -#include "commonheaders.h" - -extern void *(*MirandaMalloc)(size_t size); -extern void *(*MirandaRealloc)(void *data, size_t newSize); -extern void (*MirandaFree) (void *data); - -void InitializeMirandaMemFunctions(); - -#endif \ No newline at end of file diff --git a/plugins/Bonsai/FixOptions/utils.cpp b/plugins/Bonsai/FixOptions/utils.cpp index f47f78592c..3f30dc44ad 100644 --- a/plugins/Bonsai/FixOptions/utils.cpp +++ b/plugins/Bonsai/FixOptions/utils.cpp @@ -145,7 +145,7 @@ int GetStringFromDatabase(HANDLE hContact, char *szModule, char *szSettingName, len = (tmp < size - 1) ? tmp : size - 1; strncpy(szResult, dbv.pszVal, len); szResult[len] = '\0'; - MirandaFree(dbv.pszVal); + mir_free(dbv.pszVal); } else{ res = 1; @@ -182,7 +182,7 @@ int GetStringFromDatabase(HANDLE hContact, char *szModule, char *szSettingName, wcsncpy(szResult, dbv.pwszVal, len); szResult[len] = L'\0'; } - MirandaFree(dbv.pwszVal); + mir_free(dbv.pwszVal); } else{ res = 1; @@ -240,7 +240,7 @@ TCHAR *GetContactName(HANDLE hContact, char *szProto) { buffer = _tcsdup(ctInfo.pszVal); } - MirandaFree(ctInfo.pszVal); + mir_free(ctInfo.pszVal); if (!ret) { return buffer; @@ -323,7 +323,7 @@ TCHAR *GetContactID(HANDLE hContact, char *szProto) } - MirandaFree(ctInfo.pszVal); + mir_free(ctInfo.pszVal); if (!ret) { return buffer; -- cgit v1.2.3