alternate list of countries removed

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

5 files changed, 0 insertions, 354 deletions

diff --git a/plugins/CountryFlags/flags.vcxproj b/plugins/CountryFlags/flags.vcxproj
index fe5bb09b22..6d51613cca 100644
--- a/plugins/CountryFlags/flags.vcxproj
+++ b/plugins/CountryFlags/flags.vcxproj
@@ -179,7 +179,6 @@
     </Link>

   </ItemDefinitionGroup>

   <ItemGroup>

-    <ClCompile Include="src\countrylistext.cpp" />

     <ClCompile Include="src\extraimg.cpp" />

     <ClCompile Include="src\huffman.cpp" />

     <ClCompile Include="src\icons.cpp" />

diff --git a/plugins/CountryFlags/flags.vcxproj.filters b/plugins/CountryFlags/flags.vcxproj.filters
index 8c31f1ad5a..df80d2c68b 100644
--- a/plugins/CountryFlags/flags.vcxproj.filters
+++ b/plugins/CountryFlags/flags.vcxproj.filters
@@ -19,9 +19,6 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="src\countrylistext.cpp">

-      <Filter>Source Files</Filter>

-    </ClCompile>

     <ClCompile Include="src\extraimg.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

diff --git a/plugins/CountryFlags/src/countrylistext.cpp b/plugins/CountryFlags/src/countrylistext.cpp
deleted file mode 100644
index d6d12d9dc3..0000000000
--- a/plugins/CountryFlags/src/countrylistext.cpp
+++ /dev/null
@@ -1,344 +0,0 @@
-/*

-Miranda IM Country Flags Plugin

-Copyright (C) 2006-2007 H. Herkenrath

-

-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 (Flags-License.txt); if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-

-#include "flags.h"

-

-static HANDLE hServiceGetList,hServiceGetByNumber;

-

-/************************* Services *******************************/

-

-static struct CountryListEntry countries[]={

-	{0   ,"Unspecified"},

-	{9999,"Other"},

-	{0xFFFF,"Unknown"},

-	{93  ,"Afghanistan"},

-	{355 ,"Albania"},

-	{213 ,"Algeria"},

-	{684 ,"American Samoa"},

-	{376 ,"Andorra"},

-	{244 ,"Angola"},

-	{101 ,"Anguilla"},

-	{102 ,"Antigua and Barbuda"},

-	//{5902,"Antilles"}, /* removed */

-	{54  ,"Argentina"},

-	{374 ,"Armenia"},

-	{297 ,"Aruba"},

-	{247 ,"Ascension Island"},

-	{61  ,"Australia"},

-	{6721,"Australian Antarctic Territory"}, /* was missing */

-	{43  ,"Austria"},

-	{994 ,"Azerbaijan"},

-	{103 ,"Bahamas"},

-	{973 ,"Bahrain"},

-	{880 ,"Bangladesh"},

-	{104 ,"Barbados"},

-	{120 ,"Barbuda"},

-	{375 ,"Belarus"},

-	{32  ,"Belgium"},

-	{501 ,"Belize"},

-	{229 ,"Benin"},

-	{105 ,"Bermuda"},

-	{975 ,"Bhutan"},

-	{591 ,"Bolivia"},

-	{387 ,"Bosnia and Herzegovina"},

-	{267 ,"Botswana"},

-	{55  ,"Brazil"},

-	{106 ,"British Virgin Islands"},

-	{673 ,"Brunei"},

-	{359 ,"Bulgaria"},

-	{226 ,"Burkina Faso"},

-	{257 ,"Burundi"},

-	{855 ,"Cambodia"},

-	{237 ,"Cameroon"},

-	{107 ,"Canada"},

-	{178 ,"Canary Islands"},

-	{238 ,"Cape Verde Islands"},

-	{108 ,"Cayman Islands"},

-	{236 ,"Central African Republic"},

-	{235 ,"Chad"},

-	{56  ,"Chile, Republic of"},

-	{86  ,"China"},

-	{672 ,"Christmas Island"},

-	{6101,"Cocos-Keeling Islands"},

-	//{6102,"Cocos (Keeling) Islands"}, /* removed */

-	{57  ,"Colombia"},

-	{2691,"Comoros"},

-	{243 ,"Congo, Democratic Republic of (Zaire)"},

-	{242 ,"Congo, Republic of the"},

-	{682 ,"Cook Islands"},

-	{506 ,"Costa Rica"},

-	{225 ,"Cote d'Ivoire (Ivory Coast)"},

-	{385 ,"Croatia"},

-	{53  ,"Cuba"},

-	{357 ,"Cyprus"},

-	{420 ,"Czech Republic"},

-	{45  ,"Denmark"},

-	{246 ,"Diego Garcia"},

-	{253 ,"Djibouti"},

-	{109 ,"Dominica"},

-	{110 ,"Dominican Republic"},

-	{593 ,"Ecuador"},

-	{20  ,"Egypt"},

-	{503 ,"El Salvador"},

-	{240 ,"Equatorial Guinea"},

-	{291 ,"Eritrea"},

-	{372 ,"Estonia"},

-	{251 ,"Ethiopia"},

-	{500 ,"Falkland Islands (Malvinas)"}, /* was "Falkland Islands" */

-	{298 ,"Faroe Islands"}, /* was "Faeroe Islands" */

-	{679 ,"Fiji"},

-	{358 ,"Finland"},

-	{33  ,"France"},

-	{5901,"French Antilles"},

-	{594 ,"French Guiana"},

-	{689 ,"French Polynesia"},

-	{241 ,"Gabon"},

-	{220 ,"Gambia"},

-	{995 ,"Georgia"},

-	{49  ,"Germany"},

-	{233 ,"Ghana"},

-	{350 ,"Gibraltar"},

-	{30  ,"Greece"},

-	{299 ,"Greenland"},

-	{111 ,"Grenada"},

-	{590 ,"Guadeloupe"},

-	{671 ,"Guam, US Territory of"},

-	{5399,"Guantanamo Bay"}, /* was missing */

-	{502 ,"Guatemala"},

-	{224 ,"Guinea"},

-	{245 ,"Guinea-Bissau"},

-	{592 ,"Guyana"},

-	{509 ,"Haiti"},

-	{504 ,"Honduras"},

-	{852 ,"Hong Kong"},

-	{36  ,"Hungary"},

-	{354 ,"Iceland"},

-	{91  ,"India"},

-	{62  ,"Indonesia"},

-	{98  ,"Iran (Islamic Republic of)"},

-	{964 ,"Iraq"},

-	{353 ,"Ireland"},

-	{972 ,"Israel"},

-	{39  ,"Italy"},

-	{112 ,"Jamaica"},

-	{81  ,"Japan"},

-	{962 ,"Jordan"},

-	{705 ,"Kazakhstan"},

-	{254 ,"Kenya"},

-	{686 ,"Kiribati"},

-	{850 ,"Korea, North"},

-	{82  ,"Korea, South"},

-	{965 ,"Kuwait"},

-	{706 ,"Kyrgyzstan"},

-	{856 ,"Laos"},

-	{371 ,"Latvia"},

-	{961 ,"Lebanon"},

-	{266 ,"Lesotho"},

-	{231 ,"Liberia"},

-	{218 ,"Libyan Arab Jamahiriya"},

-	{4101,"Liechtenstein"},

-	{370 ,"Lithuania"},

-	{352 ,"Luxembourg"},

-	{853 ,"Macau"},

-	{389 ,"Macedonia (F.Y.R.O.M.)"},

-	{261 ,"Madagascar"},

-	{265 ,"Malawi"},

-	{60  ,"Malaysia"},

-	{960 ,"Maldives"},

-	{223 ,"Mali"},

-	{356 ,"Malta"},

-	{692 ,"Marshall Islands"},

-	{596 ,"Martinique"},

-	{222 ,"Mauritania"},

-	{230 ,"Mauritius"},

-	{269 ,"Mayotte Island"},

-	{52  ,"Mexico"},

-	{691 ,"Micronesia, Federated States of"},

-	{373 ,"Moldova, Republic of"},

-	{377 ,"Monaco"},

-	{976 ,"Mongolia"},

-	{382 ,"Montenegro, Republic of"}, /* was "Yugoslavia - Montenegro" */

-	{113 ,"Montserrat"},

-	{212 ,"Morocco"},

-	{258 ,"Mozambique"},

-	{95  ,"Myanmar"},

-	{264 ,"Namibia"},

-	{674 ,"Nauru"},

-	{977 ,"Nepal"},

-	{31  ,"Netherlands"},

-	{599 ,"Netherlands Antilles"},

-	{114 ,"Nevis"},

-	{687 ,"New Caledonia"},

-	{64  ,"New Zealand"},

-	{505 ,"Nicaragua"},

-	{227 ,"Niger"},

-	{234 ,"Nigeria"},

-	{683 ,"Niue"},

-	{6722,"Norfolk Island"},

-	{47  ,"Norway"},

-	{968 ,"Oman"},

-	{92  ,"Pakistan"},

-	{680 ,"Palau"},

-	{507 ,"Panama"},

-	{675 ,"Papua New Guinea"},

-	{595 ,"Paraguay"},

-	{51  ,"Peru"},

-	{63  ,"Philippines"},

-	{48  ,"Poland"},

-	{351 ,"Portugal"},

-	{121 ,"Puerto Rico"},

-	{974 ,"Qatar"},

-	{262 ,"Reunion Island"},

-	{40  ,"Romania"},

-	{6701,"Rota Island"},

-	{7   ,"Russia"},

-	{250 ,"Rwanda"},

-	{290 ,"Saint Helena"},

-	{115 ,"Saint Kitts"},

-	{1141,"Saint Kitts and Nevis"},

-	{122 ,"Saint Lucia"},

-	{508 ,"Saint Pierre and Miquelon"},

-	{116 ,"Saint Vincent and the Grenadines"},

-	{670 ,"Saipan Island (Northern Mariana Islands)"}, /* was "Saipan Island" */

-	{685 ,"Samoa"}, /* was "Western Samoa" */

-	{378 ,"San Marino"},

-	{239 ,"Sao Tome and Principe"},

-	{966 ,"Saudi Arabia"},

-	{442 ,"Scotland"},

-	{221 ,"Senegal"},

-	{381 ,"Serbia, Republic of"}, /* was "Yugoslavia" */

-	{248 ,"Seychelles"},

-	{232 ,"Sierra Leone"},

-	{65  ,"Singapore"},

-	{421 ,"Slovakia"},

-	{386 ,"Slovenia"},

-	{677 ,"Solomon Islands"},

-	{252 ,"Somalia"},

-	{27  ,"South Africa"},

-	{34  ,"Spain"},

-	{94  ,"Sri Lanka"},

-	{249 ,"Sudan"},

-	{597 ,"Suriname"},

-	{268 ,"Swaziland"},

-	{46  ,"Sweden"},

-	{41  ,"Switzerland"},

-	{963 ,"Syrian Arab Republic"},

-	{886 ,"Taiwan"},

-	{708 ,"Tajikistan"},

-	{255 ,"Tanzania"},

-	{66  ,"Thailand"},

-	{6702,"Tinian Island"},

-	{228 ,"Togo"},

-	{690 ,"Tokelau"},

-	{676 ,"Tonga"},

-	{117 ,"Trinidad and Tobago"},

-	{216 ,"Tunisia"},

-	{90  ,"Turkey"},

-	{709 ,"Turkmenistan"},

-	{118 ,"Turks and Caicos Islands"},

-	{688 ,"Tuvalu"},

-	{256 ,"Uganda"},

-	{380 ,"Ukraine"},

-	{971 ,"United Arab Emirates"},

-	{44  ,"United Kingdom"},

-	{598 ,"Uruguay"},

-	{1   ,"USA"},

-	{711 ,"Uzbekistan"},

-	{678 ,"Vanuatu"},

-	{379 ,"Vatican City"},

-	{58  ,"Venezuela"},

-	{84  ,"Vietnam"},

-	{123 ,"Virgin Islands (USA)"},

-	{441 ,"Wales"},

-	{681 ,"Wallis and Futuna Islands"},

-	{967 ,"Yemen"},

-	//{3811,"Yugoslavia - Serbia"}, /* removed */

-	{260 ,"Zambia"},

-	{263 ,"Zimbabwe"},

-};

-

-static INT_PTR ServiceGetCountryByNumber(WPARAM wParam,LPARAM lParam)

-{

-	for (int i=0; i < SIZEOF(countries); ++i)

-		if ((int)wParam == countries[i].id)

-			return (INT_PTR)countries[i].szName;

-

-	return NULL;

-}

-

-static INT_PTR ServiceGetCountryList(WPARAM wParam,LPARAM lParam)

-{

-	if ((int*)wParam == NULL || (void*)lParam == NULL) return 1;

-	*(int*)wParam=SIZEOF(countries);

-	*(struct CountryListEntry**)lParam=countries;

-	return 0;

-}

-

-/************************* Misc ***********************************/

-

-static DWORD NameHashFunction(const char *szStr)

-{

-#if defined _M_IX86 && !defined _NUMEGA_BC_FINALCHECK && !defined NOINLINEASM

-	__asm {

-		xor   edx,edx

-		xor   eax,eax

-		mov   esi,szStr

-		mov   al,[esi]

-		dec   esi

-		xor   cl,cl

-	lph_top:	 //only 4 of 9 instructions in here don't use AL, so optimal pipe use is impossible

-		xor   edx,eax

-		inc   esi

-		and   cl,31

-		movzx eax,byte ptr [esi]

-		add   cl,5

-		test  al,al

-		rol   eax,cl		 //rol is u-pipe only, but pairable

-		                 //rol doesn't touch z-flag

-		jnz   lph_top  //5 clock tick loop. not bad.

-

-		xor   eax,edx

-	}

-#else

-	DWORD hash=0;

-	int i;

-	int shift=0;

-	for(i=0;szStr[i];i++) {

-		hash^=szStr[i]<<shift;

-		if (shift>24) hash^=(szStr[i]>>(32-shift))&0x7F;

-		shift=(shift+5)&0x1F;

-	}

-	return hash;

-#endif

-}

-

-void InitCountryListExt(void)

-{

-	/* hack to replace built-in country list */

-	DestroyServiceFunction((HANDLE)NameHashFunction(MS_UTILS_GETCOUNTRYLIST));

-	DestroyServiceFunction((HANDLE)NameHashFunction(MS_UTILS_GETCOUNTRYBYNUMBER));

-	hServiceGetList=CreateServiceFunction(MS_UTILS_GETCOUNTRYLIST,ServiceGetCountryList);

-	hServiceGetByNumber=CreateServiceFunction(MS_UTILS_GETCOUNTRYBYNUMBER,ServiceGetCountryByNumber);

-}

-

-void UninitCountryListExt(void)

-{

-	DestroyServiceFunction(hServiceGetList);

-	DestroyServiceFunction(hServiceGetByNumber);

-}

diff --git a/plugins/CountryFlags/src/flags.h b/plugins/CountryFlags/src/flags.h
index c91876bd97..464dcfae54 100644
--- a/plugins/CountryFlags/src/flags.h
+++ b/plugins/CountryFlags/src/flags.h
@@ -52,10 +52,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 	#define FASTCALL 

 #endif

 

-/* countrylistext.c */

-void InitCountryListExt(void);

-void UninitCountryListExt(void);

-

 /* huffman.c */

 #ifdef HUFFMAN_ENCODE

 	int Huffman_Compress(unsigned char *in,unsigned char *out,unsigned int insize );

diff --git a/plugins/CountryFlags/src/main.cpp b/plugins/CountryFlags/src/main.cpp
index d63d302bd9..1fda1837b3 100644
--- a/plugins/CountryFlags/src/main.cpp
+++ b/plugins/CountryFlags/src/main.cpp
@@ -57,7 +57,6 @@ extern "C" __declspec(dllexport) int Load(void)
 	mir_getLP(&pluginInfo);

 

 	PrepareBufferedFunctions();

-	InitCountryListExt();

 	if ( CallService(MS_UTILS_GETCOUNTRYLIST, (WPARAM)&nCountriesCount, (LPARAM)&countries))

 		nCountriesCount = 0;

 	InitIcons();

@@ -72,6 +71,5 @@ extern "C" __declspec(dllexport) int Unload(void)
 	UninitExtraImg();

 	UninitIpToCountry();

 	UninitIcons();

-	UninitCountryListExt();

 	return 0;

 }
\ No newline at end of file