XFire adoption (crashes on login, no 64bit)

git-svn-id: http://svn.miranda-ng.org/main/trunk@2212 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
author: Robert Pösel <robyer@seznam.cz> 2012-11-05 21:11:48 +0000
committer: Robert Pösel <robyer@seznam.cz> 2012-11-05 21:11:48 +0000
commit: 048aaf0c4e77402adf584e3318e5aae6f1cdd749 (patch)
tree: def343da80e282ae43164e45e672a1386db66546
parent: 35a9af527f9b7ec35e81455784cd0a795be910c5 (diff)
195 files changed, 591 insertions, 1880 deletions
diff --git a/plugins/!NotAdopted/Xfire/UpgradeLog.XML b/plugins/!NotAdopted/Xfire/UpgradeLog.XML
deleted file mode 100644
index e0dcb46506..0000000000
--- a/plugins/!NotAdopted/Xfire/UpgradeLog.XML
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><?xml-stylesheet type='text/xsl' href='_UpgradeReport_Files/UpgradeReport.xslt'?><UpgradeLog>
-<Properties><Property Name="Solution" Value="xfiretest">
-</Property><Property Name="Projektmappendatei" Value="H:\Projekte\Xfire\xfiretest.sln">
-</Property><Property Name="Date" Value="Montag, 12. März 2012">
-</Property><Property Name="Time" Value="18:34">
-</Property></Properties><Event ErrorLevel="0" Project="xfiretest" Source="xfiretest\xfiretest.vcproj" Description="Converting project file 'H:\Projekte\Xfire\xfiretest\xfiretest.vcproj'.">
-</Event><Event ErrorLevel="1" Project="xfiretest" Source="xfiretest\xfiretest.vcproj" Description="This application has been updated to include settings related to the User Account Control (UAC) feature of Windows Vista. By default, when run on Windows Vista with UAC enabled, this application is marked to run with the same privileges as the process that launched it. This marking also disables the application from running with virtualization. You can change UAC related settings from the Property Pages of the project.">
-</Event><Event ErrorLevel="1" Project="xfiretest" Source="xfiretest\xfiretest.vcproj" Description="VCWebServiceProxyGeneratorTool is no longer supported. The tool has been removed from your project settings.">
-</Event><Event ErrorLevel="1" Project="xfiretest" Source="xfiretest\xfiretest.vcproj" Description="Attribute 'Detect64BitPortabilityProblems' of 'VCCLCompilerTool' is not supported in this version and has been removed during conversion.">
-</Event><Event ErrorLevel="0" Project="xfiretest" Source="xfiretest\xfiretest.vcproj" Description="Web deployment to the local IIS server is no longer supported. The Web Deployment build tool has been removed from your project settings.">
-</Event><Event ErrorLevel="1" Project="xfiretest" Source="xfiretest\xfiretest.vcproj" Description="VCConvertEngine could not convert attribute UseUnicodeResponseFiles = false under Tool VCCLCompilerTool.">
-</Event><Event ErrorLevel="1" Project="xfiretest" Source="xfiretest\xfiretest.vcproj" Description="Attribute 'Detect64BitPortabilityProblems' of 'VCCLCompilerTool' is not supported in this version and has been removed during conversion.">
-</Event><Event ErrorLevel="1" Project="xfiretest" Source="xfiretest\xfiretest.vcproj" Description="VCConvertEngine could not convert attribute UseUnicodeResponseFiles = false under Tool VCLinkerTool.">
-</Event><Event ErrorLevel="1" Project="xfiretest" Source="xfiretest\xfiretest.vcproj" Description="Attribute 'OptimizeForWindows98' of 'VCLinkerTool' is not supported in this version and has been removed during conversion.">
-</Event><Event ErrorLevel="0" Project="xfiretest" Source="xfiretest\xfiretest.vcproj" Description="Done converting to new project file 'H:\Projekte\Xfire\xfiretest\xfiretest.vcxproj'.">
-</Event><Event ErrorLevel="3" Project="xfiretest" Source="xfiretest\xfiretest.vcproj" Description="Converted">
-</Event><Event ErrorLevel="0" Project="" Source="xfiretest.sln" Description="Die Projektmappe wurde erfolgreich konvertiert.">
-</Event><Event ErrorLevel="3" Project="" Source="xfiretest.sln" Description="Converted">
-</Event></UpgradeLog>
-\ No newline at end of file
diff --git a/plugins/!NotAdopted/Xfire/Xfire.sln b/plugins/!NotAdopted/Xfire/Xfire.sln
deleted file mode 100644
index b00f8777d6..0000000000
--- a/plugins/!NotAdopted/Xfire/Xfire.sln
+++ /dev/null
@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual C++ Express 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xfire", "xfiretest\xfiretest.vcxproj", "{E4CD8BBA-B580-4584-AC3E-B4E9915026AE}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{E4CD8BBA-B580-4584-AC3E-B4E9915026AE}.Debug|Win32.ActiveCfg = Debug|Win32
-		{E4CD8BBA-B580-4584-AC3E-B4E9915026AE}.Debug|Win32.Build.0 = Debug|Win32
-		{E4CD8BBA-B580-4584-AC3E-B4E9915026AE}.Release|Win32.ActiveCfg = Release|Win32
-		{E4CD8BBA-B580-4584-AC3E-B4E9915026AE}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/plugins/!NotAdopted/Xfire/icons/copy.ico b/plugins/!NotAdopted/Xfire/icons/copy.ico
deleted file mode 100644
index 71d6c98a79..0000000000
--- a/plugins/!NotAdopted/Xfire/icons/copy.ico
+++ /dev/null
diff --git a/plugins/!NotAdopted/Xfire/icons/onlineprof.ico b/plugins/!NotAdopted/Xfire/icons/onlineprof.ico
deleted file mode 100644
index 71d6c98a79..0000000000
--- a/plugins/!NotAdopted/Xfire/icons/onlineprof.ico
+++ /dev/null
diff --git a/plugins/!NotAdopted/Xfire/icons/onlineprof.xcf b/plugins/!NotAdopted/Xfire/icons/onlineprof.xcf
deleted file mode 100644
index 64f5548e1d..0000000000
--- a/plugins/!NotAdopted/Xfire/icons/onlineprof.xcf
+++ /dev/null
diff --git a/plugins/!NotAdopted/Xfire/icons/xfire.ico b/plugins/!NotAdopted/Xfire/icons/xfire.ico
deleted file mode 100644
index 71d6c98a79..0000000000
--- a/plugins/!NotAdopted/Xfire/icons/xfire.ico
+++ /dev/null
diff --git a/plugins/!NotAdopted/Xfire/im_xfire.ico b/plugins/!NotAdopted/Xfire/im_xfire.ico
deleted file mode 100644
index 4329de949c..0000000000
--- a/plugins/!NotAdopted/Xfire/im_xfire.ico
+++ /dev/null
diff --git a/plugins/!NotAdopted/Xfire/resource.rc b/plugins/!NotAdopted/Xfire/resource.rc
deleted file mode 100644
index eb23862dff..0000000000
--- a/plugins/!NotAdopted/Xfire/resource.rc
+++ /dev/null
@@ -1,128 +0,0 @@
-#define IDC_STATIC -1
-#define IDC_STC16 1001
-#define IDC_INSTALLTYPE 1002
-
-#include "resource.h"
-#include "windows.h"
-
-ID_OP ICON DISCARDABLE "x_fire16x16.ico"
-IDI_TM ICON DISCARDABLE "d_xfire.ico"
-IDI_ONLINE ICON DISCARDABLE "xfire online.ico"
-IDI_OFFLINE ICON DISCARDABLE "xfire offline.ico"
-IDI_AWAY ICON DISCARDABLE "xfire away.ico"
-
-IDD_OPT DIALOGEX 0,0,304,218
-FONT 8,"MS Sans Serif",0,0,0
-STYLE WS_CHILD|WS_VISIBLE|DS_FIXEDSYS
-EXSTYLE WS_EX_CONTROLPARENT
-BEGIN
-  CONTROL "",IDC_LOGIN,"Edit",WS_CHILD|WS_VISIBLE|WS_TABSTOP|ES_AUTOHSCROLL,58,9,100,13,WS_EX_CLIENTEDGE
-  CONTROL "",IDC_PASSWORD,"Edit",WS_CHILD|WS_VISIBLE|WS_TABSTOP|ES_AUTOHSCROLL|ES_PASSWORD,58,24,100,13,WS_EX_CLIENTEDGE
-  CONTROL "Password:",IDC_STATIC,"Static",WS_CHILD|WS_VISIBLE|WS_GROUP|SS_RIGHT,4,25,52,9
-  CONTROL "Loginname:",IDC_STATIC,"Static",WS_CHILD|WS_VISIBLE|WS_GROUP|SS_RIGHT,4,11,52,9
-  CONTROL "XFire",IDC_GROUPMAIN,"Button",WS_CHILD|WS_VISIBLE|WS_GROUP|BS_GROUPBOX,2,1,160,54
-  CONTROL "Nick:",IDC_STC1,"Static",WS_CHILD|WS_VISIBLE|WS_GROUP|SS_RIGHT,4,40,52,9
-  CONTROL "",IDC_NICK,"Edit",WS_CHILD|WS_VISIBLE|WS_TABSTOP|ES_AUTOHSCROLL,58,38,100,13,WS_EX_CLIENTEDGE
-  CONTROL "Options",IDC_GRP1,"Button",WS_CHILD|WS_VISIBLE|BS_GROUPBOX,2,57,300,100
-  CONTROL "Disable Avatars",IDC_NOAV,"Button",WS_CHILD|WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,8,66,266,9
-  CONTROL "No Ip/Port in StatusMsg",IDC_NOIPPORT,"Button",WS_CHILD|WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,8,77,266,9
-  CONTROL "Switch to Online instead of AFK on non supported Globalstatuses",IDC_ONINAFK,"Button",WS_CHILD|WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,8,88,268,9
-  CONTROL "Icon Options *",IDC_GRP5,"Button",WS_CHILD|WS_VISIBLE|BS_GROUPBOX,2,158,300,28
-  CONTROL "Gameicon:",IDC_STC6,"Static",WS_CHILD|WS_VISIBLE,8,171,36,9
-  CONTROL "",IDC_CBGICO,"ComboBox",WS_CHILD|WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,46,169,106,9
-  CONTROL "Voiceicon:",IDC_STC8,"Static",WS_CHILD|WS_VISIBLE,154,171,36,9
-  CONTROL "",IDC_CBVICO,"ComboBox",WS_CHILD|WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,192,169,106,9
-  CONTROL "* requires Miranda restart",IDC_STC9,"Static",WS_CHILD|WS_VISIBLE,2,208,300,9
-  CONTROL "Dont create automatically Clangroups",IDC_NOCLANGROUP,"Button",WS_CHILD|WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,8,99,268,9
-  CONTROL "Scan for games on every Miranda start",IDC_SCANALWAYS,"Button",WS_CHILD|WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,8,110,268,9
-  CONTROL "Files",IDC_GRP6,"Button",WS_CHILD|WS_VISIBLE|BS_GROUPBOX,164,1,138,35
-  CONTROL "xfire_games.ini",IDC_CHKG,"Button",WS_CHILD|WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,170,12,118,9
-  CONTROL "icons.dll",IDC_CHKI,"Button",WS_CHILD|WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,170,24,128,9
-  CONTROL "?",IDC_FINDFILES,"Button",WS_CHILD|WS_VISIBLE|WS_TABSTOP,290,7,10,9
-  CONTROL "GameServerQuery support",IDC_GSQP,"Button",WS_CHILD|WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,8,121,268,9
-  CONTROL "Display Error and Infomessage:",IDC_STC12,"Static",WS_CHILD|WS_VISIBLE,128,144,170,9
-  CONTROL "",IDC_NOMSG,"ComboBox",WS_CHILD|WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,230,142,66,9
-  CONTROL "Setup your Games...",IDC_SETUPGAMES,"Button",WS_CHILD|WS_VISIBLE|WS_TABSTOP,210,188,94,19
-  CONTROL "No custom away message",IDC_NOCUSTOMAWAY,"Button",WS_CHILD|WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,8,132,110,9
-END
-
-VS_VERSION_INFO VERSIONINFO
-FILEVERSION 0,1,3,11
-PRODUCTVERSION 0,1,3,11
-FILEOS 0x00040004
-FILETYPE 0x00000002
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "FFFF04B0"
-    BEGIN
-      VALUE "About Miranda", "Miranda IM is a new generation IM client, extensible with numerous plugins. Get Miranda IM at http://www.miranda-im.org\0"
-      VALUE "ProductName", "Plugin for Miranda IM\0"
-      VALUE "OriginalFilename", "XFire.dll\0"
-      VALUE "FileVersion", "0.1.3.11\0"
-      VALUE "ProductVersion", "0.1.3.11\0"
-      VALUE "FileDescription", "Miranda XFire Protocol plugin\0"
-      VALUE "LegalCopyright", "Copyright � 2008 dufte\0"
-    END
-  END
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0xFFFF, 0x04B0
-  END
-END
-
-IDD_UD DIALOGEX 0,0,223,159
-FONT 8,"MS Sans Serif",0,0,0
-STYLE WS_CHILD|WS_VISIBLE|DS_FIXEDSYS
-EXSTYLE WS_EX_CONTROLPARENT
-BEGIN
-  CONTROL "Username:",IDC_STC2,"Static",WS_CHILD|WS_VISIBLE,8,18,36,9
-  CONTROL "Nick:",IDC_STC3,"Static",WS_CHILD|WS_VISIBLE,8,9,32,9
-  CONTROL "Game",IDC_GRP2,"Button",WS_CHILD|WS_VISIBLE|BS_GROUPBOX,2,44,220,32
-  CONTROL "Voicechat",IDC_GRP3,"Button",WS_CHILD|WS_VISIBLE|BS_GROUPBOX,2,77,220,33
-  CONTROL "Name:",IDC_STC4,"Static",WS_CHILD|WS_VISIBLE,30,53,36,9
-  CONTROL "Unreal Tournament 2004",IDC_GAME,"Edit",WS_CHILD|WS_VISIBLE|WS_TABSTOP|ES_READONLY|ES_AUTOHSCROLL,54,53,134,9
-  CONTROL "IP:",IDC_STC5,"Static",WS_CHILD|WS_VISIBLE,30,64,18,9
-  CONTROL "255.255.255.255",IDC_GIP,"Edit",WS_CHILD|WS_VISIBLE|WS_TABSTOP|ES_READONLY|ES_AUTOHSCROLL,54,64,54,9
-  CONTROL "Port:",IDC_STC7,"Static",WS_CHILD|WS_VISIBLE,134,64,16,9
-  CONTROL "27770",IDC_GPORT,"Edit",WS_CHILD|WS_VISIBLE|WS_TABSTOP|ES_READONLY|ES_AUTOHSCROLL,150,64,70,9
-  CONTROL "Unreal Tournament 2004",IDC_VNAME,"Edit",WS_CHILD|WS_VISIBLE|WS_TABSTOP|ES_READONLY|ES_AUTOHSCROLL,54,88,132,9
-  CONTROL "Name:",IDC_STC10,"Static",WS_CHILD|WS_VISIBLE,30,88,22,9
-  CONTROL "IP:",IDC_STC11,"Static",WS_CHILD|WS_VISIBLE,30,99,18,9
-  CONTROL "255.255.255.255",IDC_VIP,"Edit",WS_CHILD|WS_VISIBLE|WS_TABSTOP|ES_READONLY|ES_AUTOHSCROLL,54,99,54,9
-  CONTROL "Port:",IDC_STC13,"Static",WS_CHILD|WS_VISIBLE,134,99,16,9
-  CONTROL "27770",IDC_VPORT,"Edit",WS_CHILD|WS_VISIBLE|WS_TABSTOP|ES_READONLY|ES_AUTOHSCROLL,150,99,70,9
-  CONTROL "Userdetails",IDC_GRP4,"Button",WS_CHILD|WS_VISIBLE|BS_GROUPBOX,2,0,112,44
-  CONTROL "dufte",IDC_DNICK,"Edit",WS_CHILD|WS_VISIBLE|WS_TABSTOP|ES_READONLY|ES_AUTOHSCROLL,46,9,64,9
-  CONTROL "dufte",IDC_DUSERNAME,"Edit",WS_CHILD|WS_VISIBLE|WS_TABSTOP|ES_READONLY|ES_AUTOHSCROLL,46,18,66,9
-  CONTROL "",IDC_GAMEICO,"Static",WS_CHILD|WS_VISIBLE|SS_CENTERIMAGE|SS_ICON,6,53,22,19
-  CONTROL "",IDC_VOICEICO,"Static",WS_CHILD|WS_VISIBLE|SS_CENTERIMAGE|SS_ICON,6,88,22,19
-  CONTROL "Copy",IDC_COPYGAME,"Button",WS_CHILD|WS_VISIBLE|WS_TABSTOP,190,49,30,11
-  CONTROL "Copy",IDC_COPYVOICE,"Button",WS_CHILD|WS_VISIBLE|WS_TABSTOP,190,83,30,11
-  CONTROL "",IDC_PROFILIMG,"Static",WS_CHILD|WS_VISIBLE|SS_CENTERIMAGE|SS_BITMAP,0,112,222,44
-  CONTROL "",IDC_GAMEINFOLIST,"SysListView32",WS_CHILD|WS_VISIBLE|LVS_REPORT,116,1,106,43,WS_EX_CLIENTEDGE
-END
-
-IDD_GAMELIST DIALOGEX 6,5,348,223
-CAPTION "Setup your Games ..."
-FONT 8,"MS Sans Serif",0,0,0
-STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU
-EXSTYLE WS_EX_TOPMOST
-BEGIN
-  CONTROL "",IDC_LST1,"SysListView32",WS_CHILD|WS_VISIBLE|WS_TABSTOP|LVS_AUTOARRANGE|LVS_SHAREIMAGELISTS|LVS_REPORT,0,0,184,222,WS_EX_CLIENTEDGE
-  CONTROL "Game",IDC_GRP7,"Button",WS_CHILD|WS_VISIBLE|BS_GROUPBOX,186,0,162,187
-  CONTROL "Close",IDC_BTN1,"Button",WS_CHILD|WS_VISIBLE|WS_TABSTOP,304,208,44,13
-  CONTROL "Never Detect",IDC_NEVERD,"Button",WS_CHILD|WS_VISIBLE|WS_DISABLED|WS_TABSTOP|BS_AUTORADIOBUTTON,192,24,150,9
-  CONTROL "Automatically Detect",IDC_RBN2,"Button",WS_CHILD|WS_VISIBLE|WS_DISABLED|WS_TABSTOP|BS_AUTORADIOBUTTON,192,11,150,9
-  CONTROL "Manuel Setup",IDC_MANUAL,"Button",WS_CHILD|WS_VISIBLE|WS_DISABLED|WS_TABSTOP|BS_AUTORADIOBUTTON,192,36,150,9
-  CONTROL "",IDC_GAMEPATH,"Edit",WS_CHILD|WS_VISIBLE|WS_DISABLED|WS_TABSTOP,194,66,148,11,WS_EX_CLIENTEDGE
-  CONTROL "DetectExe:",IDC_STC14,"Static",WS_CHILD|WS_VISIBLE,194,55,148,9
-  CONTROL "Browse ...",IDC_BTN2,"Button",WS_CHILD|WS_VISIBLE|WS_DISABLED|WS_TABSTOP,280,79,62,13
-  CONTROL "Apply",IDC_APPLY,"Button",WS_CHILD|WS_VISIBLE|WS_DISABLED|WS_TABSTOP,238,168,56,13
-  CONTROL "Browse ...",IDC_BTN3,"Button",WS_CHILD|WS_VISIBLE|WS_DISABLED|WS_TABSTOP,280,118,62,13
-  CONTROL "",IDC_LAUNCH,"Edit",WS_CHILD|WS_VISIBLE|WS_DISABLED|WS_TABSTOP,194,105,148,11,WS_EX_CLIENTEDGE
-  CONTROL "LauncherExe:",IDC_STC15,"Static",WS_CHILD|WS_VISIBLE,194,94,148,9
-  CONTROL "Installtype:",IDC_STC16,"Static",WS_CHILD|WS_VISIBLE|SS_RIGHT,188,190,128,9
-  CONTROL "",IDC_INSTALLTYPE,"ComboBox",WS_CHILD|WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,318,188,30,13
-END
-
diff --git a/plugins/!NotAdopted/Xfire/xfire.ico b/plugins/!NotAdopted/Xfire/xfire.ico
deleted file mode 100644
index 6a35240bf1..0000000000
--- a/plugins/!NotAdopted/Xfire/xfire.ico
+++ /dev/null
diff --git a/plugins/!NotAdopted/Xfire/xfiresmall.ico b/plugins/!NotAdopted/Xfire/xfiresmall.ico
deleted file mode 100644
index 5baa26441b..0000000000
--- a/plugins/!NotAdopted/Xfire/xfiresmall.ico
+++ /dev/null
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/Export.def b/plugins/!NotAdopted/Xfire/xfiretest/Export.def
deleted file mode 100644
index 4dceee1c2d..0000000000
--- a/plugins/!NotAdopted/Xfire/xfiretest/Export.def
+++ /dev/null
@@ -1,6 +0,0 @@
-LIBRARY XFIREDLL
-EXPORTS 
-	Load @1
-	Unload @2
-	MirandaPluginInfoEx @3
-	MirandaPluginInterfaces @4
-\ No newline at end of file
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfiretest.vcproj b/plugins/!NotAdopted/Xfire/xfiretest/xfiretest.vcproj
deleted file mode 100644
index c3fcf1f205..0000000000
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfiretest.vcproj
+++ /dev/null
@@ -1,963 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8,00"
-	Name="xfire"
-	ProjectGUID="{E4CD8BBA-B580-4584-AC3E-B4E9915026AE}"
-	RootNamespace="xfiretest"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="D:\Programme\Miranda IM 7.12\Plugins"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="-D_SCL_SECURE_NO_WARNINGS"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PTW32_STATIC_LIB"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="kernel32.lib $(NoInherit)"
-				OutputFile="$(OutDir)\XFire.dll"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="D:\Programme\Miranda IM 7.12\Plugins"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalOptions="-D_SCL_SECURE_NO_WARNINGS"
-				Optimization="3"
-				FavorSizeOrSpeed="1"
-				WholeProgramOptimization="true"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;PTW32_STATIC_LIB;_CRT_SECURE_NO_WARNINGS"
-				ExceptionHandling="1"
-				BasicRuntimeChecks="0"
-				RuntimeLibrary="0"
-				BufferSecurityCheck="true"
-				FloatingPointModel="2"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="1"
-				ErrorReporting="0"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalDependencies="kernel32.lib $(NoInherit)"
-				OutputFile="$(OutDir)\XFire.dll"
-				LinkIncremental="1"
-				GenerateManifest="false"
-				GenerateDebugInformation="true"
-				GenerateMapFile="true"
-				MapExports="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				OptimizeForWindows98="1"
-				BaseAddress=""
-				ImportLibrary="$(TargetDir)$XFire.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Ressourcendateien"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\resource.rc"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Miranda Plugin"
-			>
-			<File
-				RelativePath=".\Export.def"
-				>
-			</File>
-			<Filter
-				Name="Xfire_class"
-				>
-				<Filter
-					Name="source"
-					>
-					<File
-						RelativePath=".\Xfire_avatar_loader.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\Xfire_base.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\Xfire_game.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\Xfire_gamelist.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\Xfire_icon_mng.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\Xfire_voicechat.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="headers"
-					>
-					<File
-						RelativePath=".\Xfire_avatar_loader.h"
-						>
-					</File>
-					<File
-						RelativePath=".\Xfire_base.h"
-						>
-					</File>
-					<File
-						RelativePath=".\Xfire_game.h"
-						>
-					</File>
-					<File
-						RelativePath=".\Xfire_gamelist.h"
-						>
-					</File>
-					<File
-						RelativePath=".\Xfire_icon_mng.h"
-						>
-					</File>
-					<File
-						RelativePath=".\Xfire_voicechat.h"
-						>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="plugin"
-				>
-				<Filter
-					Name="sources"
-					>
-					<File
-						RelativePath=".\addgamedialog.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\all_statusmsg.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\iniupdater.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\main.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\options.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\passworddialog.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\processbuddyinfo.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\pwd_dlg.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\searching4games.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\services.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\setnickname.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\tools.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\userdetails.cpp"
-						>
-					</File>
-					<File
-						RelativePath=".\variables.cpp"
-						>
-					</File>
-				</Filter>
-				<Filter
-					Name="headers"
-					>
-					<File
-						RelativePath=".\addgamedialog.h"
-						>
-					</File>
-					<File
-						RelativePath=".\all_statusmsg.h"
-						>
-					</File>
-					<File
-						RelativePath=".\baseProtocol.h"
-						>
-					</File>
-					<File
-						RelativePath=".\iniupdater.h"
-						>
-					</File>
-					<File
-						RelativePath=".\m_assocmgr.h"
-						>
-					</File>
-					<File
-						RelativePath=".\m_extraicons.h"
-						>
-					</File>
-					<File
-						RelativePath=".\m_folders.h"
-						>
-					</File>
-					<File
-						RelativePath=".\m_updater.h"
-						>
-					</File>
-					<File
-						RelativePath=".\m_variables.h"
-						>
-					</File>
-					<File
-						RelativePath=".\passworddialog.h"
-						>
-					</File>
-					<File
-						RelativePath=".\processbuddyinfo.h"
-						>
-					</File>
-					<File
-						RelativePath=".\pwd_dlg.h"
-						>
-					</File>
-					<File
-						RelativePath=".\resource.h"
-						>
-					</File>
-					<File
-						RelativePath=".\services.h"
-						>
-					</File>
-					<File
-						RelativePath=".\setnickname.h"
-						>
-					</File>
-					<File
-						RelativePath=".\stdafx.h"
-						>
-					</File>
-					<File
-						RelativePath=".\tools.h"
-						>
-					</File>
-					<File
-						RelativePath=".\variables.h"
-						>
-					</File>
-				</Filter>
-			</Filter>
-			<Filter
-				Name="m8"
-				>
-				<File
-					RelativePath=".\m8.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="proxy"
-				>
-				<File
-					RelativePath=".\Xfire_proxy.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\Xfire_proxy.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="XFirelib"
-			>
-			<Filter
-				Name="sources"
-				Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-				UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-				>
-				<File
-					RelativePath=".\authpacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\buddyinfo.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\buddylist.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\buddylistgames2packet.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\buddylistgamespacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\buddylistnamespacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\buddylistonlinepacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\clanbuddylistnamespacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\claninvitationpacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\client.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\clientinformationpacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\clientloginpacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\clientversionpacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\dummyxfiregameresolver.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\friendsoffriendlist.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\gameinfopacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\getbuddyinfo.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\invitebuddypacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\inviterequestpacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\loginfailedpacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\loginsuccesspacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\messageackpacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\messagepacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\monitoredobj.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\otherloginpacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\packetreader.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\recvbuddychangednick.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\recvdidpacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\recvoldversionpacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\recvprefspacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\recvremovebuddypacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\recvstatusmessagepacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\searchbuddy.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\sendacceptinvitationpacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\senddenyinvitationpacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\sendgameserverpacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\sendgamestatus2packet.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\sendgamestatuspacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\sendkeepalivepacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\sendmessagepacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\sendnickchangepacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\sendremovebuddypacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\sendsidpacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\sendstatusmessagepacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\sendtypingpacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\SHA1.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\socket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\stdafx.cpp"
-					>
-					<FileConfiguration
-						Name="Debug|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="1"
-						/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32"
-						>
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="1"
-						/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\variablevalue.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\xfireclanpacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\xfirefoundbuddys.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\xfiregame.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\xfiregameresolver.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\xfirepacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\xfirepacketcontent.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\xfireparse.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\xfireprefpacket.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\xfirerecvpacketcontent.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\xfiresendpacketcontent.cpp"
-					>
-				</File>
-				<File
-					RelativePath=".\xfiretest.cpp.old"
-					>
-				</File>
-				<File
-					RelativePath=".\xfireutils.cpp"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="headers"
-				Filter="h;hpp;hxx;hm;inl;inc;xsd"
-				UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-				>
-				<File
-					RelativePath=".\authpacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\buddyinfo.h"
-					>
-				</File>
-				<File
-					RelativePath=".\buddylist.h"
-					>
-				</File>
-				<File
-					RelativePath=".\buddylistgames2packet.h"
-					>
-				</File>
-				<File
-					RelativePath=".\buddylistgamespacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\buddylistnamespacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\buddylistonlinepacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\clanbuddylistnamespacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\claninvitationpacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\client.h"
-					>
-				</File>
-				<File
-					RelativePath=".\clientinformationpacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\clientloginpacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\clientversionpacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\dummyxfiregameresolver.h"
-					>
-				</File>
-				<File
-					RelativePath=".\friendsoffriendlist.h"
-					>
-				</File>
-				<File
-					RelativePath=".\gameinfopacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\getbuddyinfo.h"
-					>
-				</File>
-				<File
-					RelativePath=".\invitebuddypacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\inviterequestpacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\loginfailedpacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\loginsuccesspacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\messageackpacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\messagepacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\monitoredobj.h"
-					>
-				</File>
-				<File
-					RelativePath=".\otherloginpacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\packetlistener.h"
-					>
-				</File>
-				<File
-					RelativePath=".\packetreader.h"
-					>
-				</File>
-				<File
-					RelativePath=".\recvbuddychangednick.h"
-					>
-				</File>
-				<File
-					RelativePath=".\recvdidpacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\recvoldversionpacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\recvprefspacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\recvremovebuddypacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\recvstatusmessagepacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\searchbuddy.h"
-					>
-				</File>
-				<File
-					RelativePath=".\sendacceptinvitationpacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\senddenyinvitationpacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\sendgameserverpacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\sendgamestatus2packet.h"
-					>
-				</File>
-				<File
-					RelativePath=".\sendgamestatuspacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\sendkeepalivepacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\sendmessagepacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\sendnickchangepacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\sendremovebuddypacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\sendsidpacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\sendstatusmessagepacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\sendtypingpacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\SHA1.h"
-					>
-				</File>
-				<File
-					RelativePath=".\socket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\socketexception.h"
-					>
-				</File>
-				<File
-					RelativePath=".\variablevalue.h"
-					>
-				</File>
-				<File
-					RelativePath=".\xdebug.h"
-					>
-				</File>
-				<File
-					RelativePath=".\xfireclanpacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\xfirefoundbuddys.h"
-					>
-				</File>
-				<File
-					RelativePath=".\xfiregame.h"
-					>
-				</File>
-				<File
-					RelativePath=".\xfiregameresolver.h"
-					>
-				</File>
-				<File
-					RelativePath=".\xfirepacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\xfirepacketcontent.h"
-					>
-				</File>
-				<File
-					RelativePath=".\xfireparse.h"
-					>
-				</File>
-				<File
-					RelativePath=".\xfireprefpacket.h"
-					>
-				</File>
-				<File
-					RelativePath=".\xfirerecvpacketcontent.h"
-					>
-				</File>
-				<File
-					RelativePath=".\xfiresendpacketcontent.h"
-					>
-				</File>
-				<File
-					RelativePath=".\xfireutils.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfiretest.vcxproj b/plugins/!NotAdopted/Xfire/xfiretest/xfiretest.vcxproj
deleted file mode 100644
index f0fc8a1fe8..0000000000
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfiretest.vcxproj
+++ /dev/null
@@ -1,282 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>xfire</ProjectName>
-    <ProjectGuid>{E4CD8BBA-B580-4584-AC3E-B4E9915026AE}</ProjectGuid>
-    <RootNamespace>xfiretest</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
-    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PTW32_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>kernel32.lib</AdditionalDependencies>
-      <OutputFile>$(OutDir)XFire.dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Full</Optimization>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <WholeProgramOptimization>true</WholeProgramOptimization>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PTW32_STATIC_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ExceptionHandling>Sync</ExceptionHandling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <FloatingPointModel>Fast</FloatingPointModel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>OldStyle</DebugInformationFormat>
-      <ErrorReporting>None</ErrorReporting>
-      <AdditionalIncludeDirectories>..\..\..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>kernel32.lib</AdditionalDependencies>
-      <OutputFile>$(OutDir)XFire.dll</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapExports>true</MapExports>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <BaseAddress>
-      </BaseAddress>
-      <ImportLibrary>$(TargetDir)$XFire.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ResourceCompile Include="resource.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Export.def" />
-    <None Include="xfiretest.cpp.old" />
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Xfire_avatar_loader.cpp" />
-    <ClCompile Include="Xfire_base.cpp" />
-    <ClCompile Include="Xfire_game.cpp" />
-    <ClCompile Include="Xfire_gamelist.cpp" />
-    <ClCompile Include="Xfire_icon_mng.cpp" />
-    <ClCompile Include="Xfire_voicechat.cpp" />
-    <ClCompile Include="addgamedialog.cpp" />
-    <ClCompile Include="all_statusmsg.cpp" />
-    <ClCompile Include="iniupdater.cpp" />
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="options.cpp" />
-    <ClCompile Include="passworddialog.cpp" />
-    <ClCompile Include="processbuddyinfo.cpp" />
-    <ClCompile Include="pwd_dlg.cpp" />
-    <ClCompile Include="searching4games.cpp" />
-    <ClCompile Include="services.cpp" />
-    <ClCompile Include="setnickname.cpp" />
-    <ClCompile Include="tools.cpp" />
-    <ClCompile Include="userdetails.cpp" />
-    <ClCompile Include="variables.cpp" />
-    <ClCompile Include="Xfire_proxy.cpp" />
-    <ClCompile Include="authpacket.cpp" />
-    <ClCompile Include="buddyinfo.cpp" />
-    <ClCompile Include="buddylist.cpp" />
-    <ClCompile Include="buddylistgames2packet.cpp" />
-    <ClCompile Include="buddylistgamespacket.cpp" />
-    <ClCompile Include="buddylistnamespacket.cpp" />
-    <ClCompile Include="buddylistonlinepacket.cpp" />
-    <ClCompile Include="clanbuddylistnamespacket.cpp" />
-    <ClCompile Include="claninvitationpacket.cpp" />
-    <ClCompile Include="client.cpp" />
-    <ClCompile Include="clientinformationpacket.cpp" />
-    <ClCompile Include="clientloginpacket.cpp" />
-    <ClCompile Include="clientversionpacket.cpp" />
-    <ClCompile Include="dummyxfiregameresolver.cpp" />
-    <ClCompile Include="friendsoffriendlist.cpp" />
-    <ClCompile Include="gameinfopacket.cpp" />
-    <ClCompile Include="getbuddyinfo.cpp" />
-    <ClCompile Include="invitebuddypacket.cpp" />
-    <ClCompile Include="inviterequestpacket.cpp" />
-    <ClCompile Include="loginfailedpacket.cpp" />
-    <ClCompile Include="loginsuccesspacket.cpp" />
-    <ClCompile Include="messageackpacket.cpp" />
-    <ClCompile Include="messagepacket.cpp" />
-    <ClCompile Include="monitoredobj.cpp" />
-    <ClCompile Include="otherloginpacket.cpp" />
-    <ClCompile Include="packetreader.cpp" />
-    <ClCompile Include="recvbuddychangednick.cpp" />
-    <ClCompile Include="recvdidpacket.cpp" />
-    <ClCompile Include="recvoldversionpacket.cpp" />
-    <ClCompile Include="recvprefspacket.cpp" />
-    <ClCompile Include="recvremovebuddypacket.cpp" />
-    <ClCompile Include="recvstatusmessagepacket.cpp" />
-    <ClCompile Include="searchbuddy.cpp" />
-    <ClCompile Include="sendacceptinvitationpacket.cpp" />
-    <ClCompile Include="senddenyinvitationpacket.cpp" />
-    <ClCompile Include="sendgameserverpacket.cpp" />
-    <ClCompile Include="sendgamestatus2packet.cpp" />
-    <ClCompile Include="sendgamestatuspacket.cpp" />
-    <ClCompile Include="sendkeepalivepacket.cpp" />
-    <ClCompile Include="sendmessagepacket.cpp" />
-    <ClCompile Include="sendnickchangepacket.cpp" />
-    <ClCompile Include="sendremovebuddypacket.cpp" />
-    <ClCompile Include="sendsidpacket.cpp" />
-    <ClCompile Include="sendstatusmessagepacket.cpp" />
-    <ClCompile Include="sendtypingpacket.cpp" />
-    <ClCompile Include="SHA1.cpp" />
-    <ClCompile Include="socket.cpp" />
-    <ClCompile Include="stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-    </ClCompile>
-    <ClCompile Include="variablevalue.cpp" />
-    <ClCompile Include="xfireclanpacket.cpp" />
-    <ClCompile Include="xfirefoundbuddys.cpp" />
-    <ClCompile Include="xfiregame.cpp" />
-    <ClCompile Include="xfiregameresolver.cpp" />
-    <ClCompile Include="xfirepacket.cpp" />
-    <ClCompile Include="xfirepacketcontent.cpp" />
-    <ClCompile Include="xfireparse.cpp" />
-    <ClCompile Include="xfireprefpacket.cpp" />
-    <ClCompile Include="xfirerecvpacketcontent.cpp" />
-    <ClCompile Include="xfiresendpacketcontent.cpp" />
-    <ClCompile Include="xfireutils.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Xfire_avatar_loader.h" />
-    <ClInclude Include="Xfire_base.h" />
-    <ClInclude Include="Xfire_game.h" />
-    <ClInclude Include="Xfire_gamelist.h" />
-    <ClInclude Include="Xfire_icon_mng.h" />
-    <ClInclude Include="Xfire_voicechat.h" />
-    <ClInclude Include="addgamedialog.h" />
-    <ClInclude Include="all_statusmsg.h" />
-    <ClInclude Include="baseProtocol.h" />
-    <ClInclude Include="iniupdater.h" />
-    <ClInclude Include="passworddialog.h" />
-    <ClInclude Include="processbuddyinfo.h" />
-    <ClInclude Include="pwd_dlg.h" />
-    <ClInclude Include="resource.h" />
-    <ClInclude Include="services.h" />
-    <ClInclude Include="setnickname.h" />
-    <ClInclude Include="stdafx.h" />
-    <ClInclude Include="tools.h" />
-    <ClInclude Include="variables.h" />
-    <ClInclude Include="m8.h" />
-    <ClInclude Include="Xfire_proxy.h" />
-    <ClInclude Include="authpacket.h" />
-    <ClInclude Include="buddyinfo.h" />
-    <ClInclude Include="buddylist.h" />
-    <ClInclude Include="buddylistgames2packet.h" />
-    <ClInclude Include="buddylistgamespacket.h" />
-    <ClInclude Include="buddylistnamespacket.h" />
-    <ClInclude Include="buddylistonlinepacket.h" />
-    <ClInclude Include="clanbuddylistnamespacket.h" />
-    <ClInclude Include="claninvitationpacket.h" />
-    <ClInclude Include="client.h" />
-    <ClInclude Include="clientinformationpacket.h" />
-    <ClInclude Include="clientloginpacket.h" />
-    <ClInclude Include="clientversionpacket.h" />
-    <ClInclude Include="dummyxfiregameresolver.h" />
-    <ClInclude Include="friendsoffriendlist.h" />
-    <ClInclude Include="gameinfopacket.h" />
-    <ClInclude Include="getbuddyinfo.h" />
-    <ClInclude Include="invitebuddypacket.h" />
-    <ClInclude Include="inviterequestpacket.h" />
-    <ClInclude Include="loginfailedpacket.h" />
-    <ClInclude Include="loginsuccesspacket.h" />
-    <ClInclude Include="messageackpacket.h" />
-    <ClInclude Include="messagepacket.h" />
-    <ClInclude Include="monitoredobj.h" />
-    <ClInclude Include="otherloginpacket.h" />
-    <ClInclude Include="packetlistener.h" />
-    <ClInclude Include="packetreader.h" />
-    <ClInclude Include="recvbuddychangednick.h" />
-    <ClInclude Include="recvdidpacket.h" />
-    <ClInclude Include="recvoldversionpacket.h" />
-    <ClInclude Include="recvprefspacket.h" />
-    <ClInclude Include="recvremovebuddypacket.h" />
-    <ClInclude Include="recvstatusmessagepacket.h" />
-    <ClInclude Include="searchbuddy.h" />
-    <ClInclude Include="sendacceptinvitationpacket.h" />
-    <ClInclude Include="senddenyinvitationpacket.h" />
-    <ClInclude Include="sendgameserverpacket.h" />
-    <ClInclude Include="sendgamestatus2packet.h" />
-    <ClInclude Include="sendgamestatuspacket.h" />
-    <ClInclude Include="sendkeepalivepacket.h" />
-    <ClInclude Include="sendmessagepacket.h" />
-    <ClInclude Include="sendnickchangepacket.h" />
-    <ClInclude Include="sendremovebuddypacket.h" />
-    <ClInclude Include="sendsidpacket.h" />
-    <ClInclude Include="sendstatusmessagepacket.h" />
-    <ClInclude Include="sendtypingpacket.h" />
-    <ClInclude Include="SHA1.h" />
-    <ClInclude Include="socket.h" />
-    <ClInclude Include="socketexception.h" />
-    <ClInclude Include="variablevalue.h" />
-    <ClInclude Include="xdebug.h" />
-    <ClInclude Include="xfireclanpacket.h" />
-    <ClInclude Include="xfirefoundbuddys.h" />
-    <ClInclude Include="xfiregame.h" />
-    <ClInclude Include="xfiregameresolver.h" />
-    <ClInclude Include="xfirepacket.h" />
-    <ClInclude Include="xfirepacketcontent.h" />
-    <ClInclude Include="xfireparse.h" />
-    <ClInclude Include="xfireprefpacket.h" />
-    <ClInclude Include="xfirerecvpacketcontent.h" />
-    <ClInclude Include="xfiresendpacketcontent.h" />
-    <ClInclude Include="xfireutils.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
-\ No newline at end of file
diff --git a/plugins/!NotAdopted/Xfire/LICENSE.txt b/protocols/Xfire/docs/LICENSE.txt
index b8602677e0..b8602677e0 100644
--- a/plugins/!NotAdopted/Xfire/LICENSE.txt
+++ b/protocols/Xfire/docs/LICENSE.txt
diff --git a/plugins/!NotAdopted/Xfire/README.txt b/protocols/Xfire/docs/README.txt
index 2f2ab07512..2f2ab07512 100644
--- a/plugins/!NotAdopted/Xfire/README.txt
+++ b/protocols/Xfire/docs/README.txt
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/srcheader.txt b/protocols/Xfire/docs/xfirelib.txt
index 971953ba23..971953ba23 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/srcheader.txt
+++ b/protocols/Xfire/docs/xfirelib.txt
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/Kopie von resource.rc b/protocols/Xfire/res/Kopie von resource.rc
index f94085600b..f94085600b 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/Kopie von resource.rc
+++ b/protocols/Xfire/res/Kopie von resource.rc
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/d_xfire.ico b/protocols/Xfire/res/d_xfire.ico
index 6855c0b9dd..6855c0b9dd 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/d_xfire.ico
+++ b/protocols/Xfire/res/d_xfire.ico
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/icon.ico b/protocols/Xfire/res/icon.ico
index 0e767a56d8..0e767a56d8 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/icon.ico
+++ b/protocols/Xfire/res/icon.ico
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/resource.rc b/protocols/Xfire/res/resource.rc
index 10825a1f15..928c9d8383 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/resource.rc
+++ b/protocols/Xfire/res/resource.rc
@@ -42,7 +42,7 @@
 #define IDC_STC44 1006
 #define IDC_IMG1 1002
 
-#include "resource.h"
+#include "..\src\resource.h"
 #include "windows.h"
 
 ID_OP ICON DISCARDABLE "x_fire16x16.ico"
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/true.ico b/protocols/Xfire/res/true.ico
index c49a58dfa5..c49a58dfa5 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/true.ico
+++ b/protocols/Xfire/res/true.ico
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/x_fire16x16.ico b/protocols/Xfire/res/x_fire16x16.ico
index b93f1bef0c..b93f1bef0c 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/x_fire16x16.ico
+++ b/protocols/Xfire/res/x_fire16x16.ico
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfire away.ico b/protocols/Xfire/res/xfire away.ico
index cf473325cf..cf473325cf 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfire away.ico
+++ b/protocols/Xfire/res/xfire away.ico
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfire offline.ico b/protocols/Xfire/res/xfire offline.ico
index 008dd67e40..008dd67e40 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfire offline.ico
+++ b/protocols/Xfire/res/xfire offline.ico
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfire online.ico b/protocols/Xfire/res/xfire online.ico
index 545aca993a..545aca993a 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfire online.ico
+++ b/protocols/Xfire/res/xfire online.ico
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/Jamfile b/protocols/Xfire/src/Jamfile
index a8bd2d8d8a..a8bd2d8d8a 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/Jamfile
+++ b/protocols/Xfire/src/Jamfile
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/SHA1.cpp b/protocols/Xfire/src/SHA1.cpp
index f296b563cd..f296b563cd 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/SHA1.cpp
+++ b/protocols/Xfire/src/SHA1.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/SHA1.h b/protocols/Xfire/src/SHA1.h
index b95a00970f..b95a00970f 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/SHA1.h
+++ b/protocols/Xfire/src/SHA1.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_avatar_loader.cpp b/protocols/Xfire/src/Xfire_avatar_loader.cpp
index e1fe2fdd01..e1fe2fdd01 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_avatar_loader.cpp
+++ b/protocols/Xfire/src/Xfire_avatar_loader.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_avatar_loader.h b/protocols/Xfire/src/Xfire_avatar_loader.h
index a51082629e..a51082629e 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_avatar_loader.h
+++ b/protocols/Xfire/src/Xfire_avatar_loader.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_base.cpp b/protocols/Xfire/src/Xfire_base.cpp
index 2e04d9c0a3..2d28b12659 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_base.cpp
+++ b/protocols/Xfire/src/Xfire_base.cpp
@@ -421,7 +421,7 @@ BOOL Xfire_base::getIniPath(char*path) {
 	if(!path)
 		return FALSE;
 
-	FoldersGetCustomPath( XFireWorkingFolder, path, MAX_PATH, 'W' );
+	FoldersGetCustomPath( XFireWorkingFolder, path, MAX_PATH, "" );
 	strcat_s(path,MAX_PATH,"\\");
 	strcat_s(path,MAX_PATH,"xfire_games.ini");
 
@@ -433,7 +433,7 @@ BOOL Xfire_base::getIconPath(char*path) {
 	if(!path)
 		return FALSE;
 
-	FoldersGetCustomPath( XFireIconFolder, path, MAX_PATH, 'I' );
+	FoldersGetCustomPath( XFireIconFolder, path, MAX_PATH, "" );
 	strcat_s(path,MAX_PATH,"\\");
 
 	return TRUE;
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_base.h b/protocols/Xfire/src/Xfire_base.h
index 5753e631c4..5753e631c4 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_base.h
+++ b/protocols/Xfire/src/Xfire_base.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_game.cpp b/protocols/Xfire/src/Xfire_game.cpp
index a0250de65c..10ae7bc783 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_game.cpp
+++ b/protocols/Xfire/src/Xfire_game.cpp
@@ -454,7 +454,7 @@ void Xfire_game::createMenuitem(unsigned int pos,int dbid)
 	mi.position = 500090002+pos;
 	mi.hIcon = this->hicon?this->hicon:LoadIcon(hinstance,MAKEINTRESOURCE(ID_OP));
 	mi.pszName = menuitemtext(this->name);
-	this->menuhandle=(HANDLE)CallService( MS_CLIST_ADDMAINMENUITEM, 0, (LPARAM)&mi );
+	this->menuhandle=Menu_AddMainMenuItem(&mi);
 
 	//menu aktualisieren ob hidden
 	this->refreshMenuitem();
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_game.h b/protocols/Xfire/src/Xfire_game.h
index 0d502d121b..0d502d121b 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_game.h
+++ b/protocols/Xfire/src/Xfire_game.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_gamelist.cpp b/protocols/Xfire/src/Xfire_gamelist.cpp
index a50d90747d..3496a2e3f1 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_gamelist.cpp
+++ b/protocols/Xfire/src/Xfire_gamelist.cpp
@@ -115,8 +115,8 @@ void Xfire_gamelist::Addgame(Xfire_game* newgame)
 //entfernt ein game aus der liste
 BOOL Xfire_gamelist::Removegame(int id)
 {
-	std::vector<Xfire_game *>::iterator i = gamelist.begin();
-    while( i != gamelist.end() ) {
+	std::vector<Xfire_game *>::iterator i = gamelist.begin();
+    while( i != gamelist.end() ) {
 		if((*i)->id == id) {
 			(*i)->remoteMenuitem();
 			gamelist.erase(i);
@@ -255,7 +255,7 @@ void Xfire_gamelist::createDummyMenuItem()
 	midummy.popupPosition = 500084000;
 	midummy.pszPopupName = Translate("Start game");
 	midummy.pszContactOwner=protocolname;
-	dummymenuitem=(HANDLE)CallService( MS_CLIST_ADDMAINMENUITEM, 0, (LPARAM)&midummy );
+	dummymenuitem=Menu_AddMainMenuItem(&midummy);
 }
 
 //entfernt dummymenueintrag
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_gamelist.h b/protocols/Xfire/src/Xfire_gamelist.h
index 0f6c341a45..0f6c341a45 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_gamelist.h
+++ b/protocols/Xfire/src/Xfire_gamelist.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_icon_mng.cpp b/protocols/Xfire/src/Xfire_icon_mng.cpp
index f5612e8e56..f5612e8e56 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_icon_mng.cpp
+++ b/protocols/Xfire/src/Xfire_icon_mng.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_icon_mng.h b/protocols/Xfire/src/Xfire_icon_mng.h
index 895d18ba91..895d18ba91 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_icon_mng.h
+++ b/protocols/Xfire/src/Xfire_icon_mng.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_proxy.cpp b/protocols/Xfire/src/Xfire_proxy.cpp
index 641c481097..641c481097 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_proxy.cpp
+++ b/protocols/Xfire/src/Xfire_proxy.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_proxy.h b/protocols/Xfire/src/Xfire_proxy.h
index 3623d969dc..3623d969dc 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_proxy.h
+++ b/protocols/Xfire/src/Xfire_proxy.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_voicechat.cpp b/protocols/Xfire/src/Xfire_voicechat.cpp
index ccca22b1a8..ccca22b1a8 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_voicechat.cpp
+++ b/protocols/Xfire/src/Xfire_voicechat.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_voicechat.h b/protocols/Xfire/src/Xfire_voicechat.h
index 1b70f3f456..1b70f3f456 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/Xfire_voicechat.h
+++ b/protocols/Xfire/src/Xfire_voicechat.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/addgamedialog.cpp b/protocols/Xfire/src/addgamedialog.cpp
index 4576157250..4d3d717b8c 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/addgamedialog.cpp
+++ b/protocols/Xfire/src/addgamedialog.cpp
@@ -42,7 +42,7 @@ static void FillGameList( LPVOID hwndDlg ) {
 		//vector f�r doppelfilter
 		vector<DWORD> dublBuffer;
 		//Cache ist leer, Cache f�llen
-		FoldersGetCustomPath( XFireWorkingFolder, inipath, 1024, 'W' );
+		FoldersGetCustomPath( XFireWorkingFolder, inipath, 1024, "" );
 		strcat_s(inipath,MAX_PATH,"\\");
 		strcat_s(inipath,MAX_PATH,"xfire_games.ini");
 
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/addgamedialog.h b/protocols/Xfire/src/addgamedialog.h
index 3795df1ed5..3795df1ed5 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/addgamedialog.h
+++ b/protocols/Xfire/src/addgamedialog.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/all_statusmsg.cpp b/protocols/Xfire/src/all_statusmsg.cpp
index fd3dbcf6ea..52e06e79ba 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/all_statusmsg.cpp
+++ b/protocols/Xfire/src/all_statusmsg.cpp
@@ -57,7 +57,8 @@ BOOL BackupStatusMsg() {
 	oltostatus=new vector<unsigned int>;
 
 	//alle protokolle durchgehen und den status in den vector sichern
-	CallService(MS_PROTO_ENUMPROTOCOLS,(WPARAM)&anz,(LPARAM)&temp);
+	// TODO: was enumprotocols, is enumprotos okay?
+	CallService(MS_PROTO_ENUMPROTOS,(WPARAM)&anz,(LPARAM)&temp);
 	for(int i=0;i<anz;i++)
 	{
 		statusid=CallProtoService(temp[i]->szName,PS_GETSTATUS,0,0);
@@ -232,11 +233,11 @@ BOOL SetGameStatusMsg()
 	{
 		//alternativ zweig ohne variables
 		DBVARIANT dbv;
-		if(!DBGetContactSetting(NULL,protocolname,"setstatusmsg",&dbv)) {
-
-			DBVARIANT dbv3;
-
-			//statusmsg rein
+		if(!DBGetContactSetting(NULL,protocolname,"setstatusmsg",&dbv)) {
+
+			DBVARIANT dbv3;
+
+			//statusmsg rein
 			xgamelist.setString(dbv.pszVal,&statusmsg);
 
 			//mit den vars ersetzen beginnen
@@ -280,7 +281,8 @@ BOOL SetGameStatusMsg()
 		}
 	}
 
-	CallService(MS_PROTO_ENUMPROTOCOLS,(WPARAM)&anz,(LPARAM)&temp);
+	// TODO: MS_PROTO_ENUMPROTOCOLS was original... is enumprotos okay?
+	CallService(MS_PROTO_ENUMPROTOS,(WPARAM)&anz,(LPARAM)&temp);
 	for(int i=0;i<anz;i++)
 	{
 		if(olstatus->at(i)!=-1)
@@ -348,7 +350,8 @@ BOOL SetOldStatusMsg()
 	if(olstatusmsg==NULL)
 		return FALSE;
 
-	CallService(MS_PROTO_ENUMPROTOCOLS,(WPARAM)&anz,(LPARAM)&temp);
+	// TODO: was enumprotocols, is enumprotos okay?
+	CallService(MS_PROTO_ENUMPROTOS,(WPARAM)&anz,(LPARAM)&temp);
 	for(int i=0;i<anz;i++)
 	{
 		if(olstatus->at(i)!=-1)
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/all_statusmsg.h b/protocols/Xfire/src/all_statusmsg.h
index a3a95a56b7..a3a95a56b7 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/all_statusmsg.h
+++ b/protocols/Xfire/src/all_statusmsg.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/authpacket.cpp b/protocols/Xfire/src/authpacket.cpp
index 9183fd1e48..9183fd1e48 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/authpacket.cpp
+++ b/protocols/Xfire/src/authpacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/authpacket.h b/protocols/Xfire/src/authpacket.h
index 5a9f5bb057..5a9f5bb057 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/authpacket.h
+++ b/protocols/Xfire/src/authpacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/baseProtocol.h b/protocols/Xfire/src/baseProtocol.h
index feae6e69de..1e63fb59c2 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/baseProtocol.h
+++ b/protocols/Xfire/src/baseProtocol.h
@@ -26,6 +26,8 @@
  *
  */
 
+#define MIRANDA_VER    0x0A00
+
 //=====================================================
 //	Includes (yea why not include lots of stuff :D )
 //=====================================================
@@ -61,7 +63,6 @@
 #include <m_protoint.h>
 #include <m_userinfo.h>
 #include <m_options.h>
-#include <m_protosvc.h>
 #include <m_utils.h>
 #include <m_ignore.h>
 #include <m_clc.h>
@@ -69,8 +70,13 @@
 #include <m_avatars.h>
 #include <m_folders.h>
 #include <m_assocmgr.h>
-#include <services.h>
-#include <m_extraicons.h>
+#include <m_icolib.h>
+#include <m_genmenu.h>
+#include <m_cluiframes.h>
+#include <m_account.h>
+#include <m_protoplugin.h>
+
+#include "services.h"
 
 /*#pragma comment(lib, "atl.lib")
 #include <atldef.h>
@@ -160,114 +166,6 @@ struct CONTACT // Contains info about users
 #define MSGBOX(msg) mir_forkthread(Message,(LPVOID)msg)
 #define MSGBOXE(msg)  mir_forkthread(MessageE,(LPVOID)msg)
 
-/*#define  EXTRA_ICON_EMAIL  1
-#define  EXTRA_ICON_PROTO  2
-#define  EXTRA_ICON_SMS    3
-#define  EXTRA_ICON_ADV1  4
-#define  EXTRA_ICON_ADV2  9 //5
-#define  EXTRA_ICON_ADV3        9
-#define  EXTRA_ICON_ADV4        10 */
-
-static int icoslot[] = { 4, 5, 9, 10 };
-
-
-typedef struct
-{
-int cbSize;      //must be sizeof(IconExtraColumn)
-int ColumnType;
-HANDLE hImage;    //return value from MS_CLIST_EXTRA_ADD_ICON
-}IconExtraColumn,*pIconExtraColumn;
-
-
-//Set icon for contact at needed column
-//wparam=hContact
-//lparam=pIconExtraColumn
-//return 0 on success,-1 on failure
-//
-//See above for supported columns
-#define MS_CLIST_EXTRA_SET_ICON      "CListFrames/SetIconForExraColumn"
-
-//Adding icon to extra image list. 
-//Call this in ME_CLIST_EXTRA_LIST_REBUILD event
-//
-//wparam=hIcon
-//lparam=0
-//return hImage on success,-1 on failure
-#define MS_CLIST_EXTRA_ADD_ICON      "CListFrames/AddIconToExtraImageList"
-
-
-
-#define ME_CLIST_EXTRA_LIST_REBUILD      "CListFrames/OnExtraListRebuild"
-
-#define PS_GETAWAYMSG  "/GetAwayMsg"
-
-//called with wparam=hContact
-#define ME_CLIST_EXTRA_IMAGE_APPLY      "CListFrames/OnExtraImageApply"
-
-#define FU_TBREDRAW      1 //redraw titlebar
-#define FU_FMREDRAW      2 //redraw Frame
-#define FU_FMPOS      4 //update Frame position
-#define MS_CLIST_FRAMES_UPDATEFRAME      "CListFrame/UpdateFrame"
-
-#define SKINICONDESC_SIZE     sizeof(SKINICONDESC)
-#define SKINICONDESC_SIZE_V1  0x18
-#define SKINICONDESC_SIZE_V2  0x1C
-#define SKINICONDESC_SIZE_V3  0x24
-
-typedef struct {
-  int cbSize;
-  union {
-    char *pszSection;         // section name used to group icons
-    TCHAR *ptszSection;
-    wchar_t *pwszSection;
-  };
-  union {
-    char *pszDescription;     // description for options dialog
-    TCHAR *ptszDescription;
-    wchar_t *pwszDescription;
-  };
-  char *pszName;              // name to refer to icon when playing and in db
-  char *pszDefaultFile;       // default icon file to use
-  int  iDefaultIndex;         // index of icon in default file
-  HICON hDefaultIcon;         // handle to default icon
-  int cx,cy;                  // dimensions of icon
-  int flags; 
-} SKINICONDESC;
-
-#define SIDF_UNICODE  0x100   // Section and Description are in UCS-2
-
-#if defined(_UNICODE)
-  #define SIDF_TCHAR  SIDF_UNICODE
-#else
-  #define SIDF_TCHAR  0
-#endif
-
-// entfernt menuitems
-#define MS_CLIST_REMOVEMAINMENUITEM					"CList/RemoveMainMenuItem"
-
-//
-//  Add a icon into options UI
-//
-//  wParam = 0
-//  lParam = (LPARAM)(SKINICONDESC*)sid;
-//
-#define MS_SKIN2_ADDICON "Skin2/Icons/AddIcon"
-
-//
-//  Retrieve HICON with name specified in lParam
-//  Returned HICON SHOULDN'T be destroyed, it is managed by IcoLib
-//
-
-#define MS_SKIN2_GETICON "Skin2/Icons/GetIcon"
-
-//
-//  Icons change notification
-//
-#define ME_SKIN2_ICONSCHANGED "Skin2/IconsChanged"
-
-#define MS_SKIN2_GETICONBYHANDLE "Skin2/Icons/GetIconByHandle"
-
-
 #pragma comment(lib,"Advapi32.lib")
 #pragma comment(lib,"Psapi.lib")
 #pragma comment(lib,"gdiplus.lib")
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/buddyinfo.cpp b/protocols/Xfire/src/buddyinfo.cpp
index bcd9d47c81..bcd9d47c81 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/buddyinfo.cpp
+++ b/protocols/Xfire/src/buddyinfo.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/buddyinfo.h b/protocols/Xfire/src/buddyinfo.h
index 54f918dffd..54f918dffd 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/buddyinfo.h
+++ b/protocols/Xfire/src/buddyinfo.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/buddylist.cpp b/protocols/Xfire/src/buddylist.cpp
index ea7e264502..ea7e264502 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/buddylist.cpp
+++ b/protocols/Xfire/src/buddylist.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/buddylist.h b/protocols/Xfire/src/buddylist.h
index 7ab1e26878..7ab1e26878 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/buddylist.h
+++ b/protocols/Xfire/src/buddylist.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/buddylistgames2packet.cpp b/protocols/Xfire/src/buddylistgames2packet.cpp
index 2252339908..2252339908 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/buddylistgames2packet.cpp
+++ b/protocols/Xfire/src/buddylistgames2packet.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/buddylistgames2packet.h b/protocols/Xfire/src/buddylistgames2packet.h
index 81fe92eecb..81fe92eecb 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/buddylistgames2packet.h
+++ b/protocols/Xfire/src/buddylistgames2packet.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/buddylistgamespacket.cpp b/protocols/Xfire/src/buddylistgamespacket.cpp
index 4ba878951b..4ba878951b 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/buddylistgamespacket.cpp
+++ b/protocols/Xfire/src/buddylistgamespacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/buddylistgamespacket.h b/protocols/Xfire/src/buddylistgamespacket.h
index ba0264c29e..ba0264c29e 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/buddylistgamespacket.h
+++ b/protocols/Xfire/src/buddylistgamespacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/buddylistnamespacket.cpp b/protocols/Xfire/src/buddylistnamespacket.cpp
index 80e962fe4d..80e962fe4d 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/buddylistnamespacket.cpp
+++ b/protocols/Xfire/src/buddylistnamespacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/buddylistnamespacket.h b/protocols/Xfire/src/buddylistnamespacket.h
index 5c50f4f110..5c50f4f110 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/buddylistnamespacket.h
+++ b/protocols/Xfire/src/buddylistnamespacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/buddylistonlinepacket.cpp b/protocols/Xfire/src/buddylistonlinepacket.cpp
index 3dd726d4e9..3dd726d4e9 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/buddylistonlinepacket.cpp
+++ b/protocols/Xfire/src/buddylistonlinepacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/buddylistonlinepacket.h b/protocols/Xfire/src/buddylistonlinepacket.h
index 1f9b432b63..1f9b432b63 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/buddylistonlinepacket.h
+++ b/protocols/Xfire/src/buddylistonlinepacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/clanbuddylistnamespacket.cpp b/protocols/Xfire/src/clanbuddylistnamespacket.cpp
index 2a1b4c77a6..2a1b4c77a6 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/clanbuddylistnamespacket.cpp
+++ b/protocols/Xfire/src/clanbuddylistnamespacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/clanbuddylistnamespacket.h b/protocols/Xfire/src/clanbuddylistnamespacket.h
index f47fc694f7..f47fc694f7 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/clanbuddylistnamespacket.h
+++ b/protocols/Xfire/src/clanbuddylistnamespacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/claninvitationpacket.cpp b/protocols/Xfire/src/claninvitationpacket.cpp
index 08fb2b2267..08fb2b2267 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/claninvitationpacket.cpp
+++ b/protocols/Xfire/src/claninvitationpacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/claninvitationpacket.h b/protocols/Xfire/src/claninvitationpacket.h
index b595c5ba9c..b595c5ba9c 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/claninvitationpacket.h
+++ b/protocols/Xfire/src/claninvitationpacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/client.cpp b/protocols/Xfire/src/client.cpp
index 4800482e27..4800482e27 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/client.cpp
+++ b/protocols/Xfire/src/client.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/client.h b/protocols/Xfire/src/client.h
index 5822c6c27e..5822c6c27e 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/client.h
+++ b/protocols/Xfire/src/client.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/clientinformationpacket.cpp b/protocols/Xfire/src/clientinformationpacket.cpp
index f0d65e8a00..f0d65e8a00 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/clientinformationpacket.cpp
+++ b/protocols/Xfire/src/clientinformationpacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/clientinformationpacket.h b/protocols/Xfire/src/clientinformationpacket.h
index 533e3fbc91..533e3fbc91 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/clientinformationpacket.h
+++ b/protocols/Xfire/src/clientinformationpacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/clientloginpacket.cpp b/protocols/Xfire/src/clientloginpacket.cpp
index 30a28cc7eb..30a28cc7eb 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/clientloginpacket.cpp
+++ b/protocols/Xfire/src/clientloginpacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/clientloginpacket.h b/protocols/Xfire/src/clientloginpacket.h
index 56f8641b25..56f8641b25 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/clientloginpacket.h
+++ b/protocols/Xfire/src/clientloginpacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/clientversionpacket.cpp b/protocols/Xfire/src/clientversionpacket.cpp
index 3150eac746..3150eac746 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/clientversionpacket.cpp
+++ b/protocols/Xfire/src/clientversionpacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/clientversionpacket.h b/protocols/Xfire/src/clientversionpacket.h
index 4c40b1875a..4c40b1875a 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/clientversionpacket.h
+++ b/protocols/Xfire/src/clientversionpacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/dummyxfiregameresolver.cpp b/protocols/Xfire/src/dummyxfiregameresolver.cpp
index 5189c8ef9b..5189c8ef9b 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/dummyxfiregameresolver.cpp
+++ b/protocols/Xfire/src/dummyxfiregameresolver.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/dummyxfiregameresolver.h b/protocols/Xfire/src/dummyxfiregameresolver.h
index fdaaeb5c0b..fdaaeb5c0b 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/dummyxfiregameresolver.h
+++ b/protocols/Xfire/src/dummyxfiregameresolver.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/friendsoffriendlist.cpp b/protocols/Xfire/src/friendsoffriendlist.cpp
index bb2c4f884f..bb2c4f884f 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/friendsoffriendlist.cpp
+++ b/protocols/Xfire/src/friendsoffriendlist.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/friendsoffriendlist.h b/protocols/Xfire/src/friendsoffriendlist.h
index 70c59a76e9..70c59a76e9 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/friendsoffriendlist.h
+++ b/protocols/Xfire/src/friendsoffriendlist.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/gameinfopacket.cpp b/protocols/Xfire/src/gameinfopacket.cpp
index a134af85c9..a134af85c9 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/gameinfopacket.cpp
+++ b/protocols/Xfire/src/gameinfopacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/gameinfopacket.h b/protocols/Xfire/src/gameinfopacket.h
index dfd890e814..dfd890e814 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/gameinfopacket.h
+++ b/protocols/Xfire/src/gameinfopacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/getbuddyinfo.cpp b/protocols/Xfire/src/getbuddyinfo.cpp
index 6d21742510..6d21742510 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/getbuddyinfo.cpp
+++ b/protocols/Xfire/src/getbuddyinfo.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/getbuddyinfo.h b/protocols/Xfire/src/getbuddyinfo.h
index efd8ded51d..efd8ded51d 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/getbuddyinfo.h
+++ b/protocols/Xfire/src/getbuddyinfo.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/iniupdater.cpp b/protocols/Xfire/src/iniupdater.cpp
index edc8043b78..61b99884ed 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/iniupdater.cpp
+++ b/protocols/Xfire/src/iniupdater.cpp
@@ -53,7 +53,7 @@ void UpdateMyXFireIni(LPVOID dummy) {
 	char file3[1024];
 
 	//ini pfad rausbekommen
-	FoldersGetCustomPath( XFireWorkingFolder, file, 1024, 'W' );
+	FoldersGetCustomPath( XFireWorkingFolder, file, 1024, "" );
 	strcat(file,"\\");
 	strcpy(file2,file);
 	strcpy(file3,file);
@@ -94,7 +94,7 @@ void UpdateMyIcons(LPVOID dummy) {
 	char file3[1024];
 
 	//ini pfad rausbekommen
-	FoldersGetCustomPath( XFireIconFolder, file, 1024, 'W' );
+	FoldersGetCustomPath( XFireIconFolder, file, 1024, "" );
 	strcat(file,"\\");
 	strcpy(file2,file);
 	strcpy(file3,file);
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/iniupdater.h b/protocols/Xfire/src/iniupdater.h
index f89174ae7d..f89174ae7d 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/iniupdater.h
+++ b/protocols/Xfire/src/iniupdater.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/invitebuddypacket.cpp b/protocols/Xfire/src/invitebuddypacket.cpp
index f9e46cdebf..f9e46cdebf 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/invitebuddypacket.cpp
+++ b/protocols/Xfire/src/invitebuddypacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/invitebuddypacket.h b/protocols/Xfire/src/invitebuddypacket.h
index 055898d04a..055898d04a 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/invitebuddypacket.h
+++ b/protocols/Xfire/src/invitebuddypacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/inviterequestpacket.cpp b/protocols/Xfire/src/inviterequestpacket.cpp
index dc105d31ff..dc105d31ff 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/inviterequestpacket.cpp
+++ b/protocols/Xfire/src/inviterequestpacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/inviterequestpacket.h b/protocols/Xfire/src/inviterequestpacket.h
index 5f8bac43cb..5f8bac43cb 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/inviterequestpacket.h
+++ b/protocols/Xfire/src/inviterequestpacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/loginfailedpacket.cpp b/protocols/Xfire/src/loginfailedpacket.cpp
index 9d6490dfb2..9d6490dfb2 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/loginfailedpacket.cpp
+++ b/protocols/Xfire/src/loginfailedpacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/loginfailedpacket.h b/protocols/Xfire/src/loginfailedpacket.h
index 20f955bc51..20f955bc51 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/loginfailedpacket.h
+++ b/protocols/Xfire/src/loginfailedpacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/loginsuccesspacket.cpp b/protocols/Xfire/src/loginsuccesspacket.cpp
index 483c2fbb4b..483c2fbb4b 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/loginsuccesspacket.cpp
+++ b/protocols/Xfire/src/loginsuccesspacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/loginsuccesspacket.h b/protocols/Xfire/src/loginsuccesspacket.h
index 55dae54b01..55dae54b01 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/loginsuccesspacket.h
+++ b/protocols/Xfire/src/loginsuccesspacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/m8.h b/protocols/Xfire/src/m8.h
index 94a25be3bf..94a25be3bf 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/m8.h
+++ b/protocols/Xfire/src/m8.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/main.cpp b/protocols/Xfire/src/main.cpp
index 1c590e0107..82cf23243e 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/main.cpp
+++ b/protocols/Xfire/src/main.cpp
@@ -1,7 +1,5 @@
 #include "stdafx.h"
 
-//#define MIRANDA_VER    0x801
-
 /*
  *  Plugin of miranda IM(ICQ) for Communicating with users of the XFire Network.
  *
@@ -76,7 +74,6 @@
 
 //miranda stuff
 #include "baseProtocol.h"
-#include "m_updater.h"
 #include "Xfire_gamelist.h"
 #include "Xfire_proxy.h"
 #include "Xfire_avatar_loader.h"
@@ -94,13 +91,13 @@ int OptInit(WPARAM wParam,LPARAM lParam);
 int OnDetailsInit(WPARAM wParam,LPARAM lParam);
 HANDLE hFillListEvent = 0;
 CONTACT user;
-HINSTANCE hinstance;
+HINSTANCE hinstance = NULL;
+int hLangpack;
 HANDLE heventXStatusIconChanged;
 HANDLE copyipport,gotoclansite,vipport,joingame,startthisgame,removefriend,blockfriend;
 int foundgames=0;
 Gdiplus::GdiplusStartupInput gdiplusStartupInput;
 ULONG_PTR           gdiplusToken;
-BOOL miranda8 = FALSE;
 
 //xfire preferences, wichtige variablen
 xfire_prefitem xfireconfig[XFIRE_RECVPREFSPACKET_MAXCONFIGS];
@@ -127,14 +124,7 @@ extern LPtsrGetServerInfo tsrGetServerInfo;
 HANDLE hGameDetection = CreateEvent(NULL,FALSE,FALSE,NULL);
 HANDLE hConnectionClose = CreateEvent(NULL,TRUE,FALSE,NULL);
 
-//extraicon handles
-HANDLE extraiconGAME=NULL;
-HANDLE extraiconVOICE=NULL;
-
-int EXTRA_ICON_ADV1 = 4;
-int EXTRA_ICON_ADV2 = 5;
-
-PLUGININFOEX pluginInfo={
+PLUGININFOEX pluginInfoEx={
 		sizeof(PLUGININFOEX),
 		"Xfire protocol",
 		PLUGIN_MAKE_VERSION(0,1,8,4),
@@ -142,12 +132,10 @@ PLUGININFOEX pluginInfo={
 		"dufte",
 		"dufte@justmail.de",
 		"(c) 2012 Xfirelib by Herbert Poul, Xfire Miranda protocol plugin by dufte",
-		"",
-		0,
+		"http://miranda-ng.org",
 		0,
 		// {9B8E1735-970D-4ce0-930C-A561956BDCA2}
 		{ 0x9b8e1735, 0x970d, 0x4ce0, { 0x93, 0xc, 0xa5, 0x61, 0x95, 0x6b, 0xdc, 0xa2 } }
-
 };
 
 int FillList(WPARAM wParam, LPARAM lParam);
@@ -790,29 +778,12 @@ void XFireClient::sendmsg(char*usr,char*cmsg) {
 
 //=====================================================
 
-/*extern "C" __declspec(dllexport) PLUGININFO*  MirandaPluginInfo(DWORD mirandaVersion)
-{
-	return &pluginInfo;
-}*/
-
 extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD mirandaVersion)
 {
-	if (mirandaVersion < PLUGIN_MAKE_VERSION(0, 8, 0, 0))
-	{
-		miranda8 = FALSE;
-	}
-	else
-		miranda8 = TRUE;
-
-	return &pluginInfo;
+	return &pluginInfoEx;
 }
 
-static const MUUID interfaces[] = {MIID_PROTOCOL,MIID_LAST};
-
-extern "C" __declspec(dllexport) const MUUID * MirandaPluginInterfaces(void)
-{
-	return interfaces;
-}
+extern "C" __declspec(dllexport) const MUUID MirandaInterfaces[] = {MIID_PROTOCOL, MIID_LAST};
 
 //=====================================================
 // Unloads plugin
@@ -858,7 +829,7 @@ void __stdcall XFireLog( const char* fmt, ... )
 
 BOOL WINAPI DllMain(HINSTANCE hinst,DWORD fdwReason,LPVOID lpvReserved)
 {
-	hinstance=hinst;
+	hinstance = hinst;
 	//AtlAxWinInit();
 	return TRUE;
 }
@@ -972,8 +943,6 @@ static int OnSystemModulesLoaded(WPARAM wParam,LPARAM lParam)
 	strcat(servicefunction, PS_SETAWAYMSG);
 	CreateServiceFunction(servicefunction, SetAwayMsg);
 
-	CallService(MS_UPDATE_REGISTERFL, 3701, (WPARAM)&pluginInfo);
-
 	/*NETLIBUSER nlu;
 	ZeroMemory(&nlu, sizeof(nlu));
     nlu.cbSize = sizeof(nlu);
@@ -1088,22 +1057,20 @@ int ExtraListRebuild(WPARAM wparam, LPARAM lparam)
 int ExtraImageApply(WPARAM wparam, LPARAM lparam)
 {
 	HANDLE hContact=(HANDLE)wparam;
-	if(ServiceExists(MS_CLIST_EXTRA_SET_ICON))
-	{
-		char *szProto;
-		szProto = ( char* ) CallService( MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0);
-		if ( szProto != NULL && !lstrcmpiA( szProto, protocolname ) && DBGetContactSettingWord(hContact, protocolname, "Status", ID_STATUS_OFFLINE)!=ID_STATUS_OFFLINE) {
-			int gameid=DBGetContactSettingWord(hContact, protocolname, "GameId", 0);
-			int gameid2=DBGetContactSettingWord(hContact, protocolname, "VoiceId", 0);
+	// TODO: maybe need to fix extra icons
+	char *szProto;
+	szProto = ( char* ) CallService( MS_PROTO_GETCONTACTBASEPROTO, (WPARAM) hContact, 0);
+	if ( szProto != NULL && !lstrcmpiA( szProto, protocolname ) && DBGetContactSettingWord(hContact, protocolname, "Status", ID_STATUS_OFFLINE)!=ID_STATUS_OFFLINE) {
+		int gameid=DBGetContactSettingWord(hContact, protocolname, "GameId", 0);
+		int gameid2=DBGetContactSettingWord(hContact, protocolname, "VoiceId", 0);
 
-			if(gameid!=0)
-			{
-				SetIcon(hContact,xgamelist.iconmngr.getGameIconHandle(gameid));
-			}
-			if(gameid2!=0)
-			{
-				SetIcon(hContact,xgamelist.iconmngr.getGameIconHandle(gameid2),EXTRA_ICON_ADV2);
-			}
+		if(gameid!=0)
+		{
+			SetIcon(hContact,xgamelist.iconmngr.getGameIconHandle(gameid));
+		}
+		if(gameid2!=0)
+		{
+			SetIcon(hContact,xgamelist.iconmngr.getGameIconHandle(gameid2),EXTRA_ICON_ADV2);
 		}
 	}
 	return 0;
@@ -1111,9 +1078,9 @@ int ExtraImageApply(WPARAM wparam, LPARAM lparam)
 
 
 
-extern "C" __declspec(dllexport) int  Load(PLUGINLINK *link)
+extern "C" __declspec(dllexport) int  Load(void)
 {
-	pluginLink=link;
+	mir_getLP(&pluginInfoEx);
 
 	InitializeCriticalSection(&modeMsgsMutex);
 	InitializeCriticalSection(&connectingMutex);
@@ -1147,25 +1114,23 @@ extern "C" __declspec(dllexport) int  Load(PLUGINLINK *link)
 	//statusmessages setzen
 	strcpy(statusmessage[0],"");
 	strcpy(statusmessage[1],"(AFK) Away from Keyboard");
-
-	PROTOCOLDESCRIPTOR pd;
+	
 	char servicefunction[100];
-
+	
 	HookEvent(ME_OPT_INITIALISE, OptInit);
 	HookEvent(ME_SYSTEM_MODULESLOADED, OnSystemModulesLoaded);
 
-	ZeroMemory(&pd,sizeof(pd));
-	pd.cbSize=sizeof(pd);
-	pd.szName=protocolname;
-	pd.type=PROTOTYPE_PROTOCOL;
+	PROTOCOLDESCRIPTOR pd = {0};
+	pd.cbSize = PROTOCOLDESCRIPTOR_V3_SIZE;
+	pd.szName = protocolname;
+	pd.type = PROTOTYPE_PROTOCOL;
 	CallService(MS_PROTO_REGISTERMODULE,0,(LPARAM)&pd);
-	hLogEvent=CreateHookableEvent("XFireProtocol/Log");
 
-	mir_getMMI( &mmi );
-	mir_getUTFI( &utfi );
 
-	CList_MakeAllOffline();
+	hLogEvent=CreateHookableEvent("XFireProtocol/Log");
 
+	CList_MakeAllOffline();
+	
 	strcpy(servicefunction, protocolname);
 	strcat(servicefunction, PS_GETCAPS);
 	CreateServiceFunction(servicefunction, GetCaps);
@@ -1194,16 +1159,12 @@ extern "C" __declspec(dllexport) int  Load(PLUGINLINK *link)
 	strcat(servicefunction, PS_GETMYAVATAR);
 	CreateServiceFunction(servicefunction, GetMyAvatar);
 
-	//nur bei miranda8 den iconrefresh machen
-	if(miranda8) {
-		HookEvent(ME_CLIST_EXTRA_IMAGE_APPLY, ExtraImageApply);
-		HookEvent(ME_CLIST_EXTRA_LIST_REBUILD, ExtraListRebuild);
-	}
+	HookEvent(ME_CLIST_EXTRA_IMAGE_APPLY, ExtraImageApply);
+	HookEvent(ME_CLIST_EXTRA_LIST_REBUILD, ExtraListRebuild);
 
 	//erstell eine hook f�r andere plugins damit diese nachpr�fen k�nnen, ab wann jemand ingame ist oer nicht
 	hookgamestart = CreateHookableEvent(XFIRE_INGAMESTATUSHOOK);
 
-
 	strcpy(servicefunction, protocolname);
 	strcat(servicefunction, PS_BASICSEARCH);
 	CreateServiceFunction(servicefunction, BasicSearch);
@@ -1233,7 +1194,6 @@ extern "C" __declspec(dllexport) int  Load(PLUGINLINK *link)
 	strcpy(servicefunction, XFIRE_SEND_PREFS);
 	CreateServiceFunction( servicefunction,	SendPrefs );
 
-
 	//f�r mtipper, damit man das statusico �bertragen kann
 	strcpy(servicefunction, protocolname);
 	strcat(servicefunction, "/GetXStatusIcon");
@@ -1269,7 +1229,7 @@ extern "C" __declspec(dllexport) int  Load(PLUGINLINK *link)
 	mi.pszContactOwner=protocolname;
 	mi.hIcon = LoadIcon(hinstance,MAKEINTRESOURCE(ID_OP));
 	mi.pszName = LPGEN("&XFire Online Profile");
-	CallService( MS_CLIST_ADDCONTACTMENUITEM, 0, (LPARAM)&mi );
+	Menu_AddContactMenuItem(&mi);
 
 	//gotoxfireclansitemen�punkt
 	strcpy(servicefunction, protocolname);
@@ -1280,7 +1240,7 @@ extern "C" __declspec(dllexport) int  Load(PLUGINLINK *link)
 	mi.pszContactOwner=protocolname;
 	mi.hIcon = LoadIcon(hinstance,MAKEINTRESOURCE(ID_OP));
 	mi.pszName = LPGEN("XFire &Clan Site");
-	gotoclansite=(HANDLE)CallService( MS_CLIST_ADDCONTACTMENUITEM, 0, (LPARAM)&mi );
+	gotoclansite=Menu_AddContactMenuItem(&mi);
 
 	//kopiermen�punkt
 	strcpy(servicefunction, protocolname);
@@ -1291,7 +1251,7 @@ extern "C" __declspec(dllexport) int  Load(PLUGINLINK *link)
 	mi.hIcon = LoadIcon(hinstance,MAKEINTRESOURCE(ID_OP));
 	mi.pszContactOwner=protocolname;
 	mi.pszName = LPGEN("C&opy Server Address and Port");
-	copyipport=(HANDLE)CallService( MS_CLIST_ADDCONTACTMENUITEM, 0, (LPARAM)&mi );
+	copyipport=Menu_AddContactMenuItem(&mi);
 
 	//kopiermen�punkt
 	strcpy(servicefunction, protocolname);
@@ -1302,7 +1262,7 @@ extern "C" __declspec(dllexport) int  Load(PLUGINLINK *link)
 	mi.hIcon = LoadIcon(hinstance,MAKEINTRESOURCE(ID_OP));
 	mi.pszContactOwner=protocolname;
 	mi.pszName = LPGEN("Cop&y Voice Server Address and Port");
-	vipport=(HANDLE)CallService( MS_CLIST_ADDCONTACTMENUITEM, 0, (LPARAM)&mi );
+	vipport=Menu_AddContactMenuItem(&mi);
 
 	//joinmen�punkt
 	strcpy(servicefunction, protocolname);
@@ -1313,7 +1273,7 @@ extern "C" __declspec(dllexport) int  Load(PLUGINLINK *link)
 	mi.hIcon = LoadIcon(hinstance,MAKEINTRESOURCE(ID_OP));
 	mi.pszContactOwner=protocolname;
 	mi.pszName = LPGEN("Join &Game ...");
-	joingame=(HANDLE)CallService( MS_CLIST_ADDCONTACTMENUITEM, 0, (LPARAM)&mi );
+	joingame=Menu_AddContactMenuItem(&mi);
 
 	//joinmen�punkt
 	strcpy(servicefunction, protocolname);
@@ -1324,7 +1284,7 @@ extern "C" __declspec(dllexport) int  Load(PLUGINLINK *link)
 	mi.hIcon = LoadIcon(hinstance,MAKEINTRESOURCE(ID_OP));
 	mi.pszContactOwner=protocolname;
 	mi.pszName = LPGEN("Play this Game ...");
-	startthisgame=(HANDLE)CallService( MS_CLIST_ADDCONTACTMENUITEM, 0, (LPARAM)&mi );
+	startthisgame=Menu_AddContactMenuItem(&mi);
 
 	//remove friend
 	strcpy(servicefunction, protocolname);
@@ -1335,7 +1295,7 @@ extern "C" __declspec(dllexport) int  Load(PLUGINLINK *link)
 	mi.hIcon = LoadIcon(hinstance,MAKEINTRESOURCE(ID_OP));
 	mi.pszContactOwner=protocolname;
 	mi.pszName = LPGEN("Remove F&riend ...");
-	removefriend=(HANDLE)CallService( MS_CLIST_ADDCONTACTMENUITEM, 0, (LPARAM)&mi );
+	removefriend=Menu_AddContactMenuItem(&mi);
 
 	//block user
 	strcpy(servicefunction, protocolname);
@@ -1346,7 +1306,7 @@ extern "C" __declspec(dllexport) int  Load(PLUGINLINK *link)
 	mi.hIcon = LoadIcon(hinstance,MAKEINTRESOURCE(ID_OP));
 	mi.pszContactOwner=protocolname;
 	mi.pszName = LPGEN("Block U&ser ...");
-	blockfriend=(HANDLE)CallService( MS_CLIST_ADDCONTACTMENUITEM, 0, (LPARAM)&mi );
+	blockfriend=Menu_AddContactMenuItem(&mi);
 
 	//my fire profile
 	strcpy(servicefunction, protocolname);
@@ -1357,7 +1317,7 @@ extern "C" __declspec(dllexport) int  Load(PLUGINLINK *link)
 	mi.hIcon = LoadIcon(hinstance,MAKEINTRESOURCE(ID_OP));
 	mi.pszContactOwner=protocolname;
 	mi.pszName = LPGEN("&My XFire Online Profile");
-	CallService( MS_CLIST_ADDMAINMENUITEM, 0, (LPARAM)&mi );
+	Menu_AddMainMenuItem(&mi);
 
 	//my activity protocol
 	strcpy(servicefunction, protocolname);
@@ -1368,7 +1328,7 @@ extern "C" __declspec(dllexport) int  Load(PLUGINLINK *link)
 	mi.hIcon = LoadIcon(hinstance,MAKEINTRESOURCE(ID_OP));
 	mi.pszContactOwner=protocolname;
 	mi.pszName = LPGEN("&Activity Report");
-	CallService( MS_CLIST_ADDMAINMENUITEM, 0, (LPARAM)&mi );
+	Menu_AddMainMenuItem(&mi);
 
 	//rescan my games
 	strcpy(servicefunction, protocolname);
@@ -1379,7 +1339,7 @@ extern "C" __declspec(dllexport) int  Load(PLUGINLINK *link)
 	mi.hIcon = LoadIcon(hinstance,MAKEINTRESOURCE(ID_OP));
 	mi.pszContactOwner=protocolname;
 	mi.pszName = LPGEN("&Rescan my Games ...");
-	CallService( MS_CLIST_ADDMAINMENUITEM, 0, (LPARAM)&mi );
+	Menu_AddMainMenuItem(&mi);
 
 	strcpy(servicefunction, protocolname);
 	strcat(servicefunction, "SetNick");
@@ -1389,13 +1349,10 @@ extern "C" __declspec(dllexport) int  Load(PLUGINLINK *link)
 	mi.hIcon = LoadIcon(hinstance,MAKEINTRESOURCE(ID_OP));
 	mi.pszContactOwner=protocolname;
 	mi.pszName = LPGEN("Set &Nickname");
-	CallService( MS_CLIST_ADDMAINMENUITEM, 0, (LPARAM)&mi );
+	Menu_AddMainMenuItem(&mi);
 
 	HookEvent( ME_CLIST_PREBUILDCONTACTMENU, RebuildContactMenu );
 
-	EXTRA_ICON_ADV1=icoslot[DBGetContactSettingByte(NULL,protocolname,"gameico",-1)];
-	EXTRA_ICON_ADV2=icoslot[DBGetContactSettingByte(NULL,protocolname,"voiceico",-1)];
-
 	//lade GetExtendedUdpTable Funktion
 	HMODULE hmod=LoadLibraryA("IpHlpApi.dll");
 	_GetExtendedUdpTable=(pGetExtendedUdpTable)GetProcAddress(hmod,"GetExtendedUdpTable");
@@ -1572,7 +1529,7 @@ int TMLoadIcon(WPARAM wParam,LPARAM lParam)
 {
 	if(LOWORD( wParam ) == PLI_PROTOCOL) {
 		if(wParam & PLIF_ICOLIB)
-			return Skin_GetIcon("XFIRE_main");
+			return (int)Skin_GetIcon("XFIRE_main");
 		return (int)CopyIcon( Skin_GetIcon("XFIRE_main"));
 	}
 	return NULL;
@@ -2118,7 +2075,7 @@ BOOL GetAvatar(char* username,XFireAvatar* av)
 					if(pos)
 					{
 						char filename[512];
-						FoldersGetCustomPath( XFireAvatarFolder, filename, 1024, 'A' );
+						FoldersGetCustomPath( XFireAvatarFolder, filename, 1024, "" );
 						strcat(filename,"\\");
 						strcat(filename,username);
 
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/messageackpacket.cpp b/protocols/Xfire/src/messageackpacket.cpp
index 178e2c9717..178e2c9717 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/messageackpacket.cpp
+++ b/protocols/Xfire/src/messageackpacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/messageackpacket.h b/protocols/Xfire/src/messageackpacket.h
index 35d0848fbd..35d0848fbd 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/messageackpacket.h
+++ b/protocols/Xfire/src/messageackpacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/messagepacket.cpp b/protocols/Xfire/src/messagepacket.cpp
index 61617bc541..61617bc541 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/messagepacket.cpp
+++ b/protocols/Xfire/src/messagepacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/messagepacket.h b/protocols/Xfire/src/messagepacket.h
index fe867ef96b..fe867ef96b 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/messagepacket.h
+++ b/protocols/Xfire/src/messagepacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/monitoredobj.cpp b/protocols/Xfire/src/monitoredobj.cpp
index 42b00120ae..42b00120ae 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/monitoredobj.cpp
+++ b/protocols/Xfire/src/monitoredobj.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/monitoredobj.h b/protocols/Xfire/src/monitoredobj.h
index 4e4b2d66f6..4e4b2d66f6 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/monitoredobj.h
+++ b/protocols/Xfire/src/monitoredobj.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/options.cpp b/protocols/Xfire/src/options.cpp
index 10e4fbb25a..2cb78c3318 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/options.cpp
+++ b/protocols/Xfire/src/options.cpp
@@ -1,21 +1,21 @@
 /*
  *  Plugin of miranda IM(ICQ) for Communicating with users of the XFire Network. 
  *
- *  Copyright (C) 2010 by
- *          dufte <dufte@justmail.de>
- *
- *  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
+ *  Copyright (C) 2010 by
+ *          dufte <dufte@justmail.de>
+ *
+ *  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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  *
  *  Based on J. Lawler              - BaseProtocol
@@ -139,7 +139,7 @@ static BOOL CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 			SetWindowLong(hwndTree,GWL_STYLE,GetWindowLong(hwndTree,GWL_STYLE)|TVS_NOHSCROLL|TVS_CHECKBOXES);
 			SendMessage(hwndDlg, DM_REBUILD_TREE, 0, 0);
 
-			FoldersGetCustomPath( XFireWorkingFolder, inipath, 1024, 'W' );
+			FoldersGetCustomPath( XFireWorkingFolder, inipath, 1024, "" );
 			strcat(inipath,"\\");
 			strcat(inipath,"xfire_games.ini");
 			
@@ -156,7 +156,7 @@ static BOOL CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 				inifound = FALSE;
 			}
 
-			FoldersGetCustomPath( XFireIconFolder, inipath, 1024, 'W' );
+			FoldersGetCustomPath( XFireIconFolder, inipath, 1024, "" );
 			strcat(inipath,"\\");
 			strcat(inipath,"icons.dll");
 			
@@ -604,7 +604,7 @@ static BOOL CALLBACK DlgProcOpts4(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 			//addgamedia auf 0 setzen
 			TranslateDialogDefault(hwndDlg);
 
-			FoldersGetCustomPath( XFireWorkingFolder, inipath, 1024, 'W' );
+			FoldersGetCustomPath( XFireWorkingFolder, inipath, 1024, "" );
 			strcat(inipath,"\\");
 			strcat(inipath,"xfire_games.ini");
 			
@@ -621,7 +621,7 @@ static BOOL CALLBACK DlgProcOpts4(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 				inifound = FALSE;
 			}
 
-			FoldersGetCustomPath( XFireIconFolder, inipath, 1024, 'W' );
+			FoldersGetCustomPath( XFireIconFolder, inipath, 1024, "" );
 			strcat(inipath,"\\");
 			strcat(inipath,"icons.dll");
 			
@@ -646,7 +646,7 @@ static BOOL CALLBACK DlgProcOpts4(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
 
 			SendMessage(GetDlgItem(hwndDlg,IDC_REMUSER),BM_SETIMAGE,IMAGE_ICON,(WPARAM)LoadSkinnedIcon(SKINICON_OTHER_DELETE));
 
-			FoldersGetCustomPath( XFireWorkingFolder, inipath, 1024, 'W' );
+			FoldersGetCustomPath( XFireWorkingFolder, inipath, 1024, "" );
 			SetDlgItemText(hwndDlg,IDC_FILESSHOULDBE,inipath);
 
 			EnableDlgItem(hwndDlg, IDC_REMUSER, FALSE);
@@ -1264,7 +1264,7 @@ int OptInit(WPARAM wParam,LPARAM lParam)
 	odp.flags=ODPF_BOLDGROUPS;
 	//odp.nIDBottomSimpleControl=IDC_GROUPMAIN;
 	odp.pfnDlgProc=DlgProcOpts;
-	CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp);
+	Options_AddPage(wParam, &odp);
 
 	return 0;
 }
 \ No newline at end of file
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/otherloginpacket.cpp b/protocols/Xfire/src/otherloginpacket.cpp
index d0d16fb41e..d0d16fb41e 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/otherloginpacket.cpp
+++ b/protocols/Xfire/src/otherloginpacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/otherloginpacket.h b/protocols/Xfire/src/otherloginpacket.h
index 4f1168e427..4f1168e427 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/otherloginpacket.h
+++ b/protocols/Xfire/src/otherloginpacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/packetlistener.h b/protocols/Xfire/src/packetlistener.h
index 5702affcff..5702affcff 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/packetlistener.h
+++ b/protocols/Xfire/src/packetlistener.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/packetreader.cpp b/protocols/Xfire/src/packetreader.cpp
index d06c480a6e..d06c480a6e 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/packetreader.cpp
+++ b/protocols/Xfire/src/packetreader.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/packetreader.h b/protocols/Xfire/src/packetreader.h
index 6108500565..6108500565 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/packetreader.h
+++ b/protocols/Xfire/src/packetreader.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/passworddialog.cpp b/protocols/Xfire/src/passworddialog.cpp
index 7b2202c24f..7b2202c24f 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/passworddialog.cpp
+++ b/protocols/Xfire/src/passworddialog.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/passworddialog.h b/protocols/Xfire/src/passworddialog.h
index 4078c766df..4078c766df 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/passworddialog.h
+++ b/protocols/Xfire/src/passworddialog.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/processbuddyinfo.cpp b/protocols/Xfire/src/processbuddyinfo.cpp
index f60d69ef5f..e5e6fb6af7 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/processbuddyinfo.cpp
+++ b/protocols/Xfire/src/processbuddyinfo.cpp
@@ -50,7 +50,7 @@ void ProcessBuddyInfo(xfirelib::BuddyInfoPacket *buddyinfo,HANDLE hcontact,char*
 		DBDeleteContactSetting(NULL,protocolname, "MyAvatarFile");
 	}
 
-	FoldersGetCustomPath( XFireAvatarFolder, filename, 1024, 'A' );
+	FoldersGetCustomPath( XFireAvatarFolder, filename, 1024, "" );
 	strcat(filename,"\\");
 	
 	switch(buddyinfo->avatarmode) {
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/processbuddyinfo.h b/protocols/Xfire/src/processbuddyinfo.h
index 0964ef983b..0964ef983b 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/processbuddyinfo.h
+++ b/protocols/Xfire/src/processbuddyinfo.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/pwd_dlg.cpp b/protocols/Xfire/src/pwd_dlg.cpp
index e2668b96d7..e2668b96d7 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/pwd_dlg.cpp
+++ b/protocols/Xfire/src/pwd_dlg.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/pwd_dlg.h b/protocols/Xfire/src/pwd_dlg.h
index 022c63de9f..022c63de9f 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/pwd_dlg.h
+++ b/protocols/Xfire/src/pwd_dlg.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/recvbuddychangednick.cpp b/protocols/Xfire/src/recvbuddychangednick.cpp
index f48b8da043..f48b8da043 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/recvbuddychangednick.cpp
+++ b/protocols/Xfire/src/recvbuddychangednick.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/recvbuddychangednick.h b/protocols/Xfire/src/recvbuddychangednick.h
index 6c3ae08e05..6c3ae08e05 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/recvbuddychangednick.h
+++ b/protocols/Xfire/src/recvbuddychangednick.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/recvdidpacket.cpp b/protocols/Xfire/src/recvdidpacket.cpp
index ee0925c724..ee0925c724 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/recvdidpacket.cpp
+++ b/protocols/Xfire/src/recvdidpacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/recvdidpacket.h b/protocols/Xfire/src/recvdidpacket.h
index 92e09ff2f3..92e09ff2f3 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/recvdidpacket.h
+++ b/protocols/Xfire/src/recvdidpacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/recvoldversionpacket.cpp b/protocols/Xfire/src/recvoldversionpacket.cpp
index 635d69352a..635d69352a 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/recvoldversionpacket.cpp
+++ b/protocols/Xfire/src/recvoldversionpacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/recvoldversionpacket.h b/protocols/Xfire/src/recvoldversionpacket.h
index 46bc1d6ccc..46bc1d6ccc 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/recvoldversionpacket.h
+++ b/protocols/Xfire/src/recvoldversionpacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/recvprefspacket.cpp b/protocols/Xfire/src/recvprefspacket.cpp
index faad9ce964..faad9ce964 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/recvprefspacket.cpp
+++ b/protocols/Xfire/src/recvprefspacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/recvprefspacket.h b/protocols/Xfire/src/recvprefspacket.h
index 24683f870b..24683f870b 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/recvprefspacket.h
+++ b/protocols/Xfire/src/recvprefspacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/recvremovebuddypacket.cpp b/protocols/Xfire/src/recvremovebuddypacket.cpp
index 1e9b14d939..1e9b14d939 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/recvremovebuddypacket.cpp
+++ b/protocols/Xfire/src/recvremovebuddypacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/recvremovebuddypacket.h b/protocols/Xfire/src/recvremovebuddypacket.h
index 87c75c0012..87c75c0012 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/recvremovebuddypacket.h
+++ b/protocols/Xfire/src/recvremovebuddypacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/recvstatusmessagepacket.cpp b/protocols/Xfire/src/recvstatusmessagepacket.cpp
index 38387f424d..38387f424d 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/recvstatusmessagepacket.cpp
+++ b/protocols/Xfire/src/recvstatusmessagepacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/recvstatusmessagepacket.h b/protocols/Xfire/src/recvstatusmessagepacket.h
index 95e61fab12..95e61fab12 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/recvstatusmessagepacket.h
+++ b/protocols/Xfire/src/recvstatusmessagepacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/resource.h b/protocols/Xfire/src/resource.h
index 5d2cbd8a4e..5d2cbd8a4e 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/resource.h
+++ b/protocols/Xfire/src/resource.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/searchbuddy.cpp b/protocols/Xfire/src/searchbuddy.cpp
index 716d88438c..716d88438c 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/searchbuddy.cpp
+++ b/protocols/Xfire/src/searchbuddy.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/searchbuddy.h b/protocols/Xfire/src/searchbuddy.h
index 79c474d06c..79c474d06c 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/searchbuddy.h
+++ b/protocols/Xfire/src/searchbuddy.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/searching4games.cpp b/protocols/Xfire/src/searching4games.cpp
index 4cc8eed062..abdb9c7b8e 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/searching4games.cpp
+++ b/protocols/Xfire/src/searching4games.cpp
@@ -1,21 +1,21 @@
 /*
  *  Plugin of miranda IM(ICQ) for Communicating with users of the XFire Network. 
  *
- *  Copyright (C) 2010 by
- *          dufte <dufte@justmail.de>
- *
- *  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
+ *  Copyright (C) 2010 by
+ *          dufte <dufte@justmail.de>
+ *
+ *  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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  *
  *
@@ -244,7 +244,7 @@ void Scan4Games( LPVOID lparam  )
 		mir_forkthread(ShowSearchDialog,&hwnd);
 	}
 
-	FoldersGetCustomPath( XFireWorkingFolder, inipath, 1024, 'W' );
+	FoldersGetCustomPath( XFireWorkingFolder, inipath, 1024, "" );
 	strcat(inipath,"\\");
 	strcat(inipath,"xfire_games.ini");
 
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/sendacceptinvitationpacket.cpp b/protocols/Xfire/src/sendacceptinvitationpacket.cpp
index ece6c0bc3a..ece6c0bc3a 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/sendacceptinvitationpacket.cpp
+++ b/protocols/Xfire/src/sendacceptinvitationpacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/sendacceptinvitationpacket.h b/protocols/Xfire/src/sendacceptinvitationpacket.h
index 9bc2c4769b..9bc2c4769b 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/sendacceptinvitationpacket.h
+++ b/protocols/Xfire/src/sendacceptinvitationpacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/senddenyinvitationpacket.cpp b/protocols/Xfire/src/senddenyinvitationpacket.cpp
index f122c91ce4..f122c91ce4 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/senddenyinvitationpacket.cpp
+++ b/protocols/Xfire/src/senddenyinvitationpacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/senddenyinvitationpacket.h b/protocols/Xfire/src/senddenyinvitationpacket.h
index 10cf6a3a80..10cf6a3a80 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/senddenyinvitationpacket.h
+++ b/protocols/Xfire/src/senddenyinvitationpacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/sendgameserverpacket.cpp b/protocols/Xfire/src/sendgameserverpacket.cpp
index 2f65e1578b..2f65e1578b 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/sendgameserverpacket.cpp
+++ b/protocols/Xfire/src/sendgameserverpacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/sendgameserverpacket.h b/protocols/Xfire/src/sendgameserverpacket.h
index d9f8dfc8b4..d9f8dfc8b4 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/sendgameserverpacket.h
+++ b/protocols/Xfire/src/sendgameserverpacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/sendgamestatus2packet.cpp b/protocols/Xfire/src/sendgamestatus2packet.cpp
index 8859e004cb..8859e004cb 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/sendgamestatus2packet.cpp
+++ b/protocols/Xfire/src/sendgamestatus2packet.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/sendgamestatus2packet.h b/protocols/Xfire/src/sendgamestatus2packet.h
index cad9d0108b..cad9d0108b 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/sendgamestatus2packet.h
+++ b/protocols/Xfire/src/sendgamestatus2packet.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/sendgamestatuspacket.cpp b/protocols/Xfire/src/sendgamestatuspacket.cpp
index fe3ae43e5a..fe3ae43e5a 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/sendgamestatuspacket.cpp
+++ b/protocols/Xfire/src/sendgamestatuspacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/sendgamestatuspacket.h b/protocols/Xfire/src/sendgamestatuspacket.h
index 57bec411ee..57bec411ee 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/sendgamestatuspacket.h
+++ b/protocols/Xfire/src/sendgamestatuspacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/sendkeepalivepacket.cpp b/protocols/Xfire/src/sendkeepalivepacket.cpp
index 242ba88214..242ba88214 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/sendkeepalivepacket.cpp
+++ b/protocols/Xfire/src/sendkeepalivepacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/sendkeepalivepacket.h b/protocols/Xfire/src/sendkeepalivepacket.h
index 5d81785998..5d81785998 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/sendkeepalivepacket.h
+++ b/protocols/Xfire/src/sendkeepalivepacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/sendmessagepacket.cpp b/protocols/Xfire/src/sendmessagepacket.cpp
index a0f7e4e3d0..a0f7e4e3d0 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/sendmessagepacket.cpp
+++ b/protocols/Xfire/src/sendmessagepacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/sendmessagepacket.h b/protocols/Xfire/src/sendmessagepacket.h
index f54efd778c..f54efd778c 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/sendmessagepacket.h
+++ b/protocols/Xfire/src/sendmessagepacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/sendnickchangepacket.cpp b/protocols/Xfire/src/sendnickchangepacket.cpp
index 57d38ac50d..57d38ac50d 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/sendnickchangepacket.cpp
+++ b/protocols/Xfire/src/sendnickchangepacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/sendnickchangepacket.h b/protocols/Xfire/src/sendnickchangepacket.h
index 940bac032d..940bac032d 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/sendnickchangepacket.h
+++ b/protocols/Xfire/src/sendnickchangepacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/sendremovebuddypacket.cpp b/protocols/Xfire/src/sendremovebuddypacket.cpp
index a49b3f38ed..a49b3f38ed 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/sendremovebuddypacket.cpp
+++ b/protocols/Xfire/src/sendremovebuddypacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/sendremovebuddypacket.h b/protocols/Xfire/src/sendremovebuddypacket.h
index 6a27728300..6a27728300 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/sendremovebuddypacket.h
+++ b/protocols/Xfire/src/sendremovebuddypacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/sendsidpacket.cpp b/protocols/Xfire/src/sendsidpacket.cpp
index 34c80a7ff3..34c80a7ff3 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/sendsidpacket.cpp
+++ b/protocols/Xfire/src/sendsidpacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/sendsidpacket.h b/protocols/Xfire/src/sendsidpacket.h
index ffffad2071..ffffad2071 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/sendsidpacket.h
+++ b/protocols/Xfire/src/sendsidpacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/sendstatusmessagepacket.cpp b/protocols/Xfire/src/sendstatusmessagepacket.cpp
index 6495515119..6495515119 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/sendstatusmessagepacket.cpp
+++ b/protocols/Xfire/src/sendstatusmessagepacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/sendstatusmessagepacket.h b/protocols/Xfire/src/sendstatusmessagepacket.h
index 3c4106e260..3c4106e260 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/sendstatusmessagepacket.h
+++ b/protocols/Xfire/src/sendstatusmessagepacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/sendtypingpacket.cpp b/protocols/Xfire/src/sendtypingpacket.cpp
index 3cc09d80e9..3cc09d80e9 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/sendtypingpacket.cpp
+++ b/protocols/Xfire/src/sendtypingpacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/sendtypingpacket.h b/protocols/Xfire/src/sendtypingpacket.h
index d3226f3a0e..d3226f3a0e 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/sendtypingpacket.h
+++ b/protocols/Xfire/src/sendtypingpacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/services.cpp b/protocols/Xfire/src/services.cpp
index 3f39200e59..3f39200e59 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/services.cpp
+++ b/protocols/Xfire/src/services.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/services.h b/protocols/Xfire/src/services.h
index af0477f1c7..af0477f1c7 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/services.h
+++ b/protocols/Xfire/src/services.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/setnickname.cpp b/protocols/Xfire/src/setnickname.cpp
index 2062c2f487..2062c2f487 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/setnickname.cpp
+++ b/protocols/Xfire/src/setnickname.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/setnickname.h b/protocols/Xfire/src/setnickname.h
index f3d9eb552e..f3d9eb552e 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/setnickname.h
+++ b/protocols/Xfire/src/setnickname.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/socket.cpp b/protocols/Xfire/src/socket.cpp
index d47d3c6d1b..f5f48e5588 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/socket.cpp
+++ b/protocols/Xfire/src/socket.cpp
@@ -16,8 +16,8 @@
 #include <iostream>
 
 /*NETLIB*****************/
-#include "newpluginapi.h"
-#include "m_netlib.h"
+#include <newpluginapi.h>
+#include <m_netlib.h>
 extern HANDLE hNetlib;
 /*NETLIB*****************/
 
@@ -211,11 +211,11 @@ bool Socket::connect ( const std::string host, const int port, int useproxy,std:
   /* XDEBUG(("Is valid .. %d\n",status));
   if ( errno == EAFNOSUPPORT ) return false; */
   //status = ::connect ( m_sock, ( sockaddr * ) &m_addr, sizeof ( m_addr ) );
-
-  /*if(useproxy&&status==0) {
-	      char temp[1024];
-		  this->send("CONNECT cs.xfire.com:25999 HTTP/1.1\nHost: cs.xfire.com:25999\nUser-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows 98)\n\n");
-		  this->recv((char*)temp,1024);
+
+  /*if(useproxy&&status==0) {
+	      char temp[1024];
+		  this->send("CONNECT cs.xfire.com:25999 HTTP/1.1\nHost: cs.xfire.com:25999\nUser-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows 98)\n\n");
+		  this->recv((char*)temp,1024);
 	  }*/
 
   NETLIBOPENCONNECTION ncon = { 0 };
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/socket.h b/protocols/Xfire/src/socket.h
index 370aeb74f7..370aeb74f7 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/socket.h
+++ b/protocols/Xfire/src/socket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/socketexception.h b/protocols/Xfire/src/socketexception.h
index dc506aeaf7..dc506aeaf7 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/socketexception.h
+++ b/protocols/Xfire/src/socketexception.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/stdafx.cpp b/protocols/Xfire/src/stdafx.cpp
index f16632cd31..f16632cd31 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/stdafx.cpp
+++ b/protocols/Xfire/src/stdafx.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/stdafx.h b/protocols/Xfire/src/stdafx.h
index 3b6a0d7bd2..3b6a0d7bd2 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/stdafx.h
+++ b/protocols/Xfire/src/stdafx.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/testclient/Jamfile b/protocols/Xfire/src/testclient/Jamfile
index 29b07b1a20..29b07b1a20 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/testclient/Jamfile
+++ b/protocols/Xfire/src/testclient/Jamfile
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/testclient/test.cpp b/protocols/Xfire/src/testclient/test.cpp
index 0d4f2070ab..0d4f2070ab 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/testclient/test.cpp
+++ b/protocols/Xfire/src/testclient/test.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/testclient/test.h b/protocols/Xfire/src/testclient/test.h
index 55af5d6f4a..55af5d6f4a 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/testclient/test.h
+++ b/protocols/Xfire/src/testclient/test.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/tools.cpp b/protocols/Xfire/src/tools.cpp
index 44e755cd28..44e755cd28 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/tools.cpp
+++ b/protocols/Xfire/src/tools.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/tools.h b/protocols/Xfire/src/tools.h
index ca0b906179..ca0b906179 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/tools.h
+++ b/protocols/Xfire/src/tools.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/userdetails.cpp b/protocols/Xfire/src/userdetails.cpp
index dab38f47b6..4ea28ffa98 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/userdetails.cpp
+++ b/protocols/Xfire/src/userdetails.cpp
@@ -1,21 +1,21 @@
 /*
  *  Plugin of miranda IM(ICQ) for Communicating with users of the XFire Network. 
  *
- *  Copyright (C) 2010 by
- *          dufte <dufte@justmail.de>
- *
- *  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
+ *  Copyright (C) 2010 by
+ *          dufte <dufte@justmail.de>
+ *
+ *  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., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  *
  *  Based on J. Lawler              - BaseProtocol
@@ -443,7 +443,7 @@ int OnDetailsInit(WPARAM wParam,LPARAM lParam)
 	odp.pszTitle = Translate("XFire");
 	odp.pszGroup = NULL;
 
-	CallService(MS_USERINFO_ADDPAGE,wParam,(LPARAM)&odp);	
+	UserInfo_AddPage(wParam, &odp);
 
 	return 0;
 }
 \ No newline at end of file
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/variables.cpp b/protocols/Xfire/src/variables.cpp
index d8479b7dc6..d8479b7dc6 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/variables.cpp
+++ b/protocols/Xfire/src/variables.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/variables.h b/protocols/Xfire/src/variables.h
index 74a73b1176..74a73b1176 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/variables.h
+++ b/protocols/Xfire/src/variables.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/variablevalue.cpp b/protocols/Xfire/src/variablevalue.cpp
index 584f64412c..584f64412c 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/variablevalue.cpp
+++ b/protocols/Xfire/src/variablevalue.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/variablevalue.h b/protocols/Xfire/src/variablevalue.h
index 8282f47cbf..8282f47cbf 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/variablevalue.h
+++ b/protocols/Xfire/src/variablevalue.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xdebug.h b/protocols/Xfire/src/xdebug.h
index ffc17b8095..ffc17b8095 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xdebug.h
+++ b/protocols/Xfire/src/xdebug.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfireclanpacket.cpp b/protocols/Xfire/src/xfireclanpacket.cpp
index c26577fae1..c26577fae1 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfireclanpacket.cpp
+++ b/protocols/Xfire/src/xfireclanpacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfireclanpacket.h b/protocols/Xfire/src/xfireclanpacket.h
index 7e5b1bc843..7e5b1bc843 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfireclanpacket.h
+++ b/protocols/Xfire/src/xfireclanpacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfirefoundbuddys.cpp b/protocols/Xfire/src/xfirefoundbuddys.cpp
index dacae8f885..dacae8f885 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfirefoundbuddys.cpp
+++ b/protocols/Xfire/src/xfirefoundbuddys.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfirefoundbuddys.h b/protocols/Xfire/src/xfirefoundbuddys.h
index 70d44f201b..70d44f201b 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfirefoundbuddys.h
+++ b/protocols/Xfire/src/xfirefoundbuddys.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfiregame.cpp b/protocols/Xfire/src/xfiregame.cpp
index e9b0e869bf..e9b0e869bf 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfiregame.cpp
+++ b/protocols/Xfire/src/xfiregame.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfiregame.h b/protocols/Xfire/src/xfiregame.h
index b8293750ad..b8293750ad 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfiregame.h
+++ b/protocols/Xfire/src/xfiregame.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfiregameresolver.cpp b/protocols/Xfire/src/xfiregameresolver.cpp
index af7b67f799..af7b67f799 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfiregameresolver.cpp
+++ b/protocols/Xfire/src/xfiregameresolver.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfiregameresolver.h b/protocols/Xfire/src/xfiregameresolver.h
index 1215550009..1215550009 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfiregameresolver.h
+++ b/protocols/Xfire/src/xfiregameresolver.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfirepacket.cpp b/protocols/Xfire/src/xfirepacket.cpp
index 955881863f..955881863f 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfirepacket.cpp
+++ b/protocols/Xfire/src/xfirepacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfirepacket.h b/protocols/Xfire/src/xfirepacket.h
index c7b938e2f9..c7b938e2f9 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfirepacket.h
+++ b/protocols/Xfire/src/xfirepacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfirepacketcontent.cpp b/protocols/Xfire/src/xfirepacketcontent.cpp
index 87a7778357..87a7778357 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfirepacketcontent.cpp
+++ b/protocols/Xfire/src/xfirepacketcontent.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfirepacketcontent.h b/protocols/Xfire/src/xfirepacketcontent.h
index abb894f5fc..abb894f5fc 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfirepacketcontent.h
+++ b/protocols/Xfire/src/xfirepacketcontent.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfireparse.cpp b/protocols/Xfire/src/xfireparse.cpp
index e286e14df0..e286e14df0 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfireparse.cpp
+++ b/protocols/Xfire/src/xfireparse.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfireparse.h b/protocols/Xfire/src/xfireparse.h
index e03e814a6e..e03e814a6e 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfireparse.h
+++ b/protocols/Xfire/src/xfireparse.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfireprefpacket.cpp b/protocols/Xfire/src/xfireprefpacket.cpp
index 6afc613fed..6afc613fed 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfireprefpacket.cpp
+++ b/protocols/Xfire/src/xfireprefpacket.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfireprefpacket.h b/protocols/Xfire/src/xfireprefpacket.h
index f4e1709357..f4e1709357 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfireprefpacket.h
+++ b/protocols/Xfire/src/xfireprefpacket.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfirerecvpacketcontent.cpp b/protocols/Xfire/src/xfirerecvpacketcontent.cpp
index 5abc70aa6b..5abc70aa6b 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfirerecvpacketcontent.cpp
+++ b/protocols/Xfire/src/xfirerecvpacketcontent.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfirerecvpacketcontent.h b/protocols/Xfire/src/xfirerecvpacketcontent.h
index 2ca2aca424..2ca2aca424 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfirerecvpacketcontent.h
+++ b/protocols/Xfire/src/xfirerecvpacketcontent.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfiresendpacketcontent.cpp b/protocols/Xfire/src/xfiresendpacketcontent.cpp
index b743092973..b743092973 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfiresendpacketcontent.cpp
+++ b/protocols/Xfire/src/xfiresendpacketcontent.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfiresendpacketcontent.h b/protocols/Xfire/src/xfiresendpacketcontent.h
index 7ce106d295..7ce106d295 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfiresendpacketcontent.h
+++ b/protocols/Xfire/src/xfiresendpacketcontent.h
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfireutils.cpp b/protocols/Xfire/src/xfireutils.cpp
index 5df7ba314b..5df7ba314b 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfireutils.cpp
+++ b/protocols/Xfire/src/xfireutils.cpp
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfireutils.h b/protocols/Xfire/src/xfireutils.h
index a149b27a63..a149b27a63 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfireutils.h
+++ b/protocols/Xfire/src/xfireutils.h
diff --git a/protocols/Xfire/xfire.vcxproj b/protocols/Xfire/xfire.vcxproj
new file mode 100644
index 0000000000..473b44fb20
--- /dev/null
+++ b/protocols/Xfire/xfire.vcxproj
@@ -0,0 +1,280 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>xfire</ProjectName>
+    <ProjectGuid>{E4CD8BBA-B580-4584-AC3E-B4E9915026AE}</ProjectGuid>
+    <RootNamespace>xFire</RootNamespace>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+    <WholeProgramOptimization>false</WholeProgramOptimization>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <CharacterSet>NotSet</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
+    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;PTW32_STATIC_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+      <AdditionalIncludeDirectories>../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>kernel32.lib</AdditionalDependencies>
+      <OutputFile>$(OutDir)XFire.dll</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Console</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalLibraryDirectories>$(SolutionDir)\lib;..\..\bin10\lib</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <AdditionalOptions>-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)</AdditionalOptions>
+      <Optimization>Full</Optimization>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <WholeProgramOptimization>true</WholeProgramOptimization>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;PTW32_STATIC_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ExceptionHandling>Sync</ExceptionHandling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <FloatingPointModel>Fast</FloatingPointModel>
+      <PrecompiledHeader>Use</PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>OldStyle</DebugInformationFormat>
+      <ErrorReporting>None</ErrorReporting>
+      <AdditionalIncludeDirectories>../../include;../../plugins/ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>kernel32.lib</AdditionalDependencies>
+      <OutputFile>$(OutDir)XFire.dll</OutputFile>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <GenerateMapFile>true</GenerateMapFile>
+      <MapExports>true</MapExports>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <BaseAddress>
+      </BaseAddress>
+      <ImportLibrary>$(TargetDir)$XFire.lib</ImportLibrary>
+      <TargetMachine>MachineX86</TargetMachine>
+      <AdditionalLibraryDirectories>$(SolutionDir)\lib;..\..\bin10\lib</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ResourceCompile Include="res\resource.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\Xfire_avatar_loader.cpp" />
+    <ClCompile Include="src\Xfire_base.cpp" />
+    <ClCompile Include="src\Xfire_game.cpp" />
+    <ClCompile Include="src\Xfire_gamelist.cpp" />
+    <ClCompile Include="src\Xfire_icon_mng.cpp" />
+    <ClCompile Include="src\Xfire_voicechat.cpp" />
+    <ClCompile Include="src\addgamedialog.cpp" />
+    <ClCompile Include="src\all_statusmsg.cpp" />
+    <ClCompile Include="src\iniupdater.cpp" />
+    <ClCompile Include="src\main.cpp" />
+    <ClCompile Include="src\options.cpp" />
+    <ClCompile Include="src\passworddialog.cpp" />
+    <ClCompile Include="src\processbuddyinfo.cpp" />
+    <ClCompile Include="src\pwd_dlg.cpp" />
+    <ClCompile Include="src\searching4games.cpp" />
+    <ClCompile Include="src\services.cpp" />
+    <ClCompile Include="src\setnickname.cpp" />
+    <ClCompile Include="src\tools.cpp" />
+    <ClCompile Include="src\userdetails.cpp" />
+    <ClCompile Include="src\variables.cpp" />
+    <ClCompile Include="src\Xfire_proxy.cpp" />
+    <ClCompile Include="src\authpacket.cpp" />
+    <ClCompile Include="src\buddyinfo.cpp" />
+    <ClCompile Include="src\buddylist.cpp" />
+    <ClCompile Include="src\buddylistgames2packet.cpp" />
+    <ClCompile Include="src\buddylistgamespacket.cpp" />
+    <ClCompile Include="src\buddylistnamespacket.cpp" />
+    <ClCompile Include="src\buddylistonlinepacket.cpp" />
+    <ClCompile Include="src\clanbuddylistnamespacket.cpp" />
+    <ClCompile Include="src\claninvitationpacket.cpp" />
+    <ClCompile Include="src\client.cpp" />
+    <ClCompile Include="src\clientinformationpacket.cpp" />
+    <ClCompile Include="src\clientloginpacket.cpp" />
+    <ClCompile Include="src\clientversionpacket.cpp" />
+    <ClCompile Include="src\dummyxfiregameresolver.cpp" />
+    <ClCompile Include="src\friendsoffriendlist.cpp" />
+    <ClCompile Include="src\gameinfopacket.cpp" />
+    <ClCompile Include="src\getbuddyinfo.cpp" />
+    <ClCompile Include="src\invitebuddypacket.cpp" />
+    <ClCompile Include="src\inviterequestpacket.cpp" />
+    <ClCompile Include="src\loginfailedpacket.cpp" />
+    <ClCompile Include="src\loginsuccesspacket.cpp" />
+    <ClCompile Include="src\messageackpacket.cpp" />
+    <ClCompile Include="src\messagepacket.cpp" />
+    <ClCompile Include="src\monitoredobj.cpp" />
+    <ClCompile Include="src\otherloginpacket.cpp" />
+    <ClCompile Include="src\packetreader.cpp" />
+    <ClCompile Include="src\recvbuddychangednick.cpp" />
+    <ClCompile Include="src\recvdidpacket.cpp" />
+    <ClCompile Include="src\recvoldversionpacket.cpp" />
+    <ClCompile Include="src\recvprefspacket.cpp" />
+    <ClCompile Include="src\recvremovebuddypacket.cpp" />
+    <ClCompile Include="src\recvstatusmessagepacket.cpp" />
+    <ClCompile Include="src\searchbuddy.cpp" />
+    <ClCompile Include="src\sendacceptinvitationpacket.cpp" />
+    <ClCompile Include="src\senddenyinvitationpacket.cpp" />
+    <ClCompile Include="src\sendgameserverpacket.cpp" />
+    <ClCompile Include="src\sendgamestatus2packet.cpp" />
+    <ClCompile Include="src\sendgamestatuspacket.cpp" />
+    <ClCompile Include="src\sendkeepalivepacket.cpp" />
+    <ClCompile Include="src\sendmessagepacket.cpp" />
+    <ClCompile Include="src\sendnickchangepacket.cpp" />
+    <ClCompile Include="src\sendremovebuddypacket.cpp" />
+    <ClCompile Include="src\sendsidpacket.cpp" />
+    <ClCompile Include="src\sendstatusmessagepacket.cpp" />
+    <ClCompile Include="src\sendtypingpacket.cpp" />
+    <ClCompile Include="src\SHA1.cpp" />
+    <ClCompile Include="src\socket.cpp" />
+    <ClCompile Include="src\stdafx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+    </ClCompile>
+    <ClCompile Include="src\variablevalue.cpp" />
+    <ClCompile Include="src\xfireclanpacket.cpp" />
+    <ClCompile Include="src\xfirefoundbuddys.cpp" />
+    <ClCompile Include="src\xfiregame.cpp" />
+    <ClCompile Include="src\xfiregameresolver.cpp" />
+    <ClCompile Include="src\xfirepacket.cpp" />
+    <ClCompile Include="src\xfirepacketcontent.cpp" />
+    <ClCompile Include="src\xfireparse.cpp" />
+    <ClCompile Include="src\xfireprefpacket.cpp" />
+    <ClCompile Include="src\xfirerecvpacketcontent.cpp" />
+    <ClCompile Include="src\xfiresendpacketcontent.cpp" />
+    <ClCompile Include="src\xfireutils.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\Xfire_avatar_loader.h" />
+    <ClInclude Include="src\Xfire_base.h" />
+    <ClInclude Include="src\Xfire_game.h" />
+    <ClInclude Include="src\Xfire_gamelist.h" />
+    <ClInclude Include="src\Xfire_icon_mng.h" />
+    <ClInclude Include="src\Xfire_voicechat.h" />
+    <ClInclude Include="src\addgamedialog.h" />
+    <ClInclude Include="src\all_statusmsg.h" />
+    <ClInclude Include="src\baseProtocol.h" />
+    <ClInclude Include="src\iniupdater.h" />
+    <ClInclude Include="src\passworddialog.h" />
+    <ClInclude Include="src\processbuddyinfo.h" />
+    <ClInclude Include="src\pwd_dlg.h" />
+    <ClInclude Include="src\resource.h" />
+    <ClInclude Include="src\services.h" />
+    <ClInclude Include="src\setnickname.h" />
+    <ClInclude Include="src\stdafx.h" />
+    <ClInclude Include="src\tools.h" />
+    <ClInclude Include="src\variables.h" />
+    <ClInclude Include="src\m8.h" />
+    <ClInclude Include="src\Xfire_proxy.h" />
+    <ClInclude Include="src\authpacket.h" />
+    <ClInclude Include="src\buddyinfo.h" />
+    <ClInclude Include="src\buddylist.h" />
+    <ClInclude Include="src\buddylistgames2packet.h" />
+    <ClInclude Include="src\buddylistgamespacket.h" />
+    <ClInclude Include="src\buddylistnamespacket.h" />
+    <ClInclude Include="src\buddylistonlinepacket.h" />
+    <ClInclude Include="src\clanbuddylistnamespacket.h" />
+    <ClInclude Include="src\claninvitationpacket.h" />
+    <ClInclude Include="src\client.h" />
+    <ClInclude Include="src\clientinformationpacket.h" />
+    <ClInclude Include="src\clientloginpacket.h" />
+    <ClInclude Include="src\clientversionpacket.h" />
+    <ClInclude Include="src\dummyxfiregameresolver.h" />
+    <ClInclude Include="src\friendsoffriendlist.h" />
+    <ClInclude Include="src\gameinfopacket.h" />
+    <ClInclude Include="src\getbuddyinfo.h" />
+    <ClInclude Include="src\invitebuddypacket.h" />
+    <ClInclude Include="src\inviterequestpacket.h" />
+    <ClInclude Include="src\loginfailedpacket.h" />
+    <ClInclude Include="src\loginsuccesspacket.h" />
+    <ClInclude Include="src\messageackpacket.h" />
+    <ClInclude Include="src\messagepacket.h" />
+    <ClInclude Include="src\monitoredobj.h" />
+    <ClInclude Include="src\otherloginpacket.h" />
+    <ClInclude Include="src\packetlistener.h" />
+    <ClInclude Include="src\packetreader.h" />
+    <ClInclude Include="src\recvbuddychangednick.h" />
+    <ClInclude Include="src\recvdidpacket.h" />
+    <ClInclude Include="src\recvoldversionpacket.h" />
+    <ClInclude Include="src\recvprefspacket.h" />
+    <ClInclude Include="src\recvremovebuddypacket.h" />
+    <ClInclude Include="src\recvstatusmessagepacket.h" />
+    <ClInclude Include="src\searchbuddy.h" />
+    <ClInclude Include="src\sendacceptinvitationpacket.h" />
+    <ClInclude Include="src\senddenyinvitationpacket.h" />
+    <ClInclude Include="src\sendgameserverpacket.h" />
+    <ClInclude Include="src\sendgamestatus2packet.h" />
+    <ClInclude Include="src\sendgamestatuspacket.h" />
+    <ClInclude Include="src\sendkeepalivepacket.h" />
+    <ClInclude Include="src\sendmessagepacket.h" />
+    <ClInclude Include="src\sendnickchangepacket.h" />
+    <ClInclude Include="src\sendremovebuddypacket.h" />
+    <ClInclude Include="src\sendsidpacket.h" />
+    <ClInclude Include="src\sendstatusmessagepacket.h" />
+    <ClInclude Include="src\sendtypingpacket.h" />
+    <ClInclude Include="src\SHA1.h" />
+    <ClInclude Include="src\socket.h" />
+    <ClInclude Include="src\socketexception.h" />
+    <ClInclude Include="src\variablevalue.h" />
+    <ClInclude Include="src\xdebug.h" />
+    <ClInclude Include="src\xfireclanpacket.h" />
+    <ClInclude Include="src\xfirefoundbuddys.h" />
+    <ClInclude Include="src\xfiregame.h" />
+    <ClInclude Include="src\xfiregameresolver.h" />
+    <ClInclude Include="src\xfirepacket.h" />
+    <ClInclude Include="src\xfirepacketcontent.h" />
+    <ClInclude Include="src\xfireparse.h" />
+    <ClInclude Include="src\xfireprefpacket.h" />
+    <ClInclude Include="src\xfirerecvpacketcontent.h" />
+    <ClInclude Include="src\xfiresendpacketcontent.h" />
+    <ClInclude Include="src\xfireutils.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
+\ No newline at end of file
diff --git a/plugins/!NotAdopted/Xfire/xfiretest/xfiretest.vcxproj.filters b/protocols/Xfire/xfire.vcxproj.filters
index d84586a058..1acfc098e7 100644
--- a/plugins/!NotAdopted/Xfire/xfiretest/xfiretest.vcxproj.filters
+++ b/protocols/Xfire/xfire.vcxproj.filters
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Ressourcendateien">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
     <Filter Include="Miranda Plugin">
       <UniqueIdentifier>{429b4466-b5e0-4103-b9a3-79d9329ed56b}</UniqueIdentifier>
     </Filter>
@@ -43,515 +39,510 @@
       <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
     </Filter>
+    <Filter Include="Resources">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="resource.rc">
-      <Filter>Ressourcendateien</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Export.def">
-      <Filter>Miranda Plugin</Filter>
-    </None>
-    <None Include="xfiretest.cpp.old">
-      <Filter>XFirelib\sources</Filter>
-    </None>
-    <None Include="ReadMe.txt" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Xfire_avatar_loader.cpp">
+    <ClCompile Include="src\Xfire_avatar_loader.cpp">
       <Filter>Miranda Plugin\Xfire_class\source</Filter>
     </ClCompile>
-    <ClCompile Include="Xfire_base.cpp">
+    <ClCompile Include="src\Xfire_base.cpp">
       <Filter>Miranda Plugin\Xfire_class\source</Filter>
     </ClCompile>
-    <ClCompile Include="Xfire_game.cpp">
+    <ClCompile Include="src\Xfire_game.cpp">
       <Filter>Miranda Plugin\Xfire_class\source</Filter>
     </ClCompile>
-    <ClCompile Include="Xfire_gamelist.cpp">
+    <ClCompile Include="src\Xfire_gamelist.cpp">
       <Filter>Miranda Plugin\Xfire_class\source</Filter>
     </ClCompile>
-    <ClCompile Include="Xfire_icon_mng.cpp">
+    <ClCompile Include="src\Xfire_icon_mng.cpp">
       <Filter>Miranda Plugin\Xfire_class\source</Filter>
     </ClCompile>
-    <ClCompile Include="Xfire_voicechat.cpp">
+    <ClCompile Include="src\Xfire_voicechat.cpp">
       <Filter>Miranda Plugin\Xfire_class\source</Filter>
     </ClCompile>
-    <ClCompile Include="addgamedialog.cpp">
+    <ClCompile Include="src\addgamedialog.cpp">
       <Filter>Miranda Plugin\plugin\sources</Filter>
     </ClCompile>
-    <ClCompile Include="all_statusmsg.cpp">
+    <ClCompile Include="src\all_statusmsg.cpp">
       <Filter>Miranda Plugin\plugin\sources</Filter>
     </ClCompile>
-    <ClCompile Include="iniupdater.cpp">
+    <ClCompile Include="src\iniupdater.cpp">
       <Filter>Miranda Plugin\plugin\sources</Filter>
     </ClCompile>
-    <ClCompile Include="main.cpp">
+    <ClCompile Include="src\main.cpp">
       <Filter>Miranda Plugin\plugin\sources</Filter>
     </ClCompile>
-    <ClCompile Include="options.cpp">
+    <ClCompile Include="src\options.cpp">
       <Filter>Miranda Plugin\plugin\sources</Filter>
     </ClCompile>
-    <ClCompile Include="passworddialog.cpp">
+    <ClCompile Include="src\passworddialog.cpp">
       <Filter>Miranda Plugin\plugin\sources</Filter>
     </ClCompile>
-    <ClCompile Include="processbuddyinfo.cpp">
+    <ClCompile Include="src\processbuddyinfo.cpp">
       <Filter>Miranda Plugin\plugin\sources</Filter>
     </ClCompile>
-    <ClCompile Include="pwd_dlg.cpp">
+    <ClCompile Include="src\pwd_dlg.cpp">
       <Filter>Miranda Plugin\plugin\sources</Filter>
     </ClCompile>
-    <ClCompile Include="searching4games.cpp">
+    <ClCompile Include="src\searching4games.cpp">
       <Filter>Miranda Plugin\plugin\sources</Filter>
     </ClCompile>
-    <ClCompile Include="services.cpp">
+    <ClCompile Include="src\services.cpp">
       <Filter>Miranda Plugin\plugin\sources</Filter>
     </ClCompile>
-    <ClCompile Include="setnickname.cpp">
+    <ClCompile Include="src\setnickname.cpp">
       <Filter>Miranda Plugin\plugin\sources</Filter>
     </ClCompile>
-    <ClCompile Include="tools.cpp">
+    <ClCompile Include="src\tools.cpp">
       <Filter>Miranda Plugin\plugin\sources</Filter>
     </ClCompile>
-    <ClCompile Include="userdetails.cpp">
+    <ClCompile Include="src\userdetails.cpp">
       <Filter>Miranda Plugin\plugin\sources</Filter>
     </ClCompile>
-    <ClCompile Include="variables.cpp">
+    <ClCompile Include="src\variables.cpp">
       <Filter>Miranda Plugin\plugin\sources</Filter>
     </ClCompile>
-    <ClCompile Include="Xfire_proxy.cpp">
+    <ClCompile Include="src\Xfire_proxy.cpp">
       <Filter>Miranda Plugin\proxy</Filter>
     </ClCompile>
-    <ClCompile Include="authpacket.cpp">
+    <ClCompile Include="src\authpacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="buddyinfo.cpp">
+    <ClCompile Include="src\buddyinfo.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="buddylist.cpp">
+    <ClCompile Include="src\buddylist.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="buddylistgames2packet.cpp">
+    <ClCompile Include="src\buddylistgames2packet.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="buddylistgamespacket.cpp">
+    <ClCompile Include="src\buddylistgamespacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="buddylistnamespacket.cpp">
+    <ClCompile Include="src\buddylistnamespacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="buddylistonlinepacket.cpp">
+    <ClCompile Include="src\buddylistonlinepacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="clanbuddylistnamespacket.cpp">
+    <ClCompile Include="src\clanbuddylistnamespacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="claninvitationpacket.cpp">
+    <ClCompile Include="src\claninvitationpacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="client.cpp">
+    <ClCompile Include="src\client.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="clientinformationpacket.cpp">
+    <ClCompile Include="src\clientinformationpacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="clientloginpacket.cpp">
+    <ClCompile Include="src\clientloginpacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="clientversionpacket.cpp">
+    <ClCompile Include="src\clientversionpacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="dummyxfiregameresolver.cpp">
+    <ClCompile Include="src\dummyxfiregameresolver.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="friendsoffriendlist.cpp">
+    <ClCompile Include="src\friendsoffriendlist.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="gameinfopacket.cpp">
+    <ClCompile Include="src\gameinfopacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="getbuddyinfo.cpp">
+    <ClCompile Include="src\getbuddyinfo.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="invitebuddypacket.cpp">
+    <ClCompile Include="src\invitebuddypacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="inviterequestpacket.cpp">
+    <ClCompile Include="src\inviterequestpacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="loginfailedpacket.cpp">
+    <ClCompile Include="src\loginfailedpacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="loginsuccesspacket.cpp">
+    <ClCompile Include="src\loginsuccesspacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="messageackpacket.cpp">
+    <ClCompile Include="src\messageackpacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="messagepacket.cpp">
+    <ClCompile Include="src\messagepacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="monitoredobj.cpp">
+    <ClCompile Include="src\monitoredobj.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="otherloginpacket.cpp">
+    <ClCompile Include="src\otherloginpacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="packetreader.cpp">
+    <ClCompile Include="src\packetreader.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="recvbuddychangednick.cpp">
+    <ClCompile Include="src\recvbuddychangednick.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="recvdidpacket.cpp">
+    <ClCompile Include="src\recvdidpacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="recvoldversionpacket.cpp">
+    <ClCompile Include="src\recvoldversionpacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="recvprefspacket.cpp">
+    <ClCompile Include="src\recvprefspacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="recvremovebuddypacket.cpp">
+    <ClCompile Include="src\recvremovebuddypacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="recvstatusmessagepacket.cpp">
+    <ClCompile Include="src\recvstatusmessagepacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="searchbuddy.cpp">
+    <ClCompile Include="src\searchbuddy.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="sendacceptinvitationpacket.cpp">
+    <ClCompile Include="src\sendacceptinvitationpacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="senddenyinvitationpacket.cpp">
+    <ClCompile Include="src\senddenyinvitationpacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="sendgameserverpacket.cpp">
+    <ClCompile Include="src\sendgameserverpacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="sendgamestatus2packet.cpp">
+    <ClCompile Include="src\sendgamestatus2packet.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="sendgamestatuspacket.cpp">
+    <ClCompile Include="src\sendgamestatuspacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="sendkeepalivepacket.cpp">
+    <ClCompile Include="src\sendkeepalivepacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="sendmessagepacket.cpp">
+    <ClCompile Include="src\sendmessagepacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="sendnickchangepacket.cpp">
+    <ClCompile Include="src\sendnickchangepacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="sendremovebuddypacket.cpp">
+    <ClCompile Include="src\sendremovebuddypacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="sendsidpacket.cpp">
+    <ClCompile Include="src\sendsidpacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="sendstatusmessagepacket.cpp">
+    <ClCompile Include="src\sendstatusmessagepacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="sendtypingpacket.cpp">
+    <ClCompile Include="src\sendtypingpacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="SHA1.cpp">
+    <ClCompile Include="src\SHA1.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="socket.cpp">
+    <ClCompile Include="src\socket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="stdafx.cpp">
+    <ClCompile Include="src\stdafx.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="variablevalue.cpp">
+    <ClCompile Include="src\variablevalue.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="xfireclanpacket.cpp">
+    <ClCompile Include="src\xfireclanpacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="xfirefoundbuddys.cpp">
+    <ClCompile Include="src\xfirefoundbuddys.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="xfiregame.cpp">
+    <ClCompile Include="src\xfiregame.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="xfiregameresolver.cpp">
+    <ClCompile Include="src\xfiregameresolver.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="xfirepacket.cpp">
+    <ClCompile Include="src\xfirepacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="xfirepacketcontent.cpp">
+    <ClCompile Include="src\xfirepacketcontent.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="xfireparse.cpp">
+    <ClCompile Include="src\xfireparse.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="xfireprefpacket.cpp">
+    <ClCompile Include="src\xfireprefpacket.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="xfirerecvpacketcontent.cpp">
+    <ClCompile Include="src\xfirerecvpacketcontent.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="xfiresendpacketcontent.cpp">
+    <ClCompile Include="src\xfiresendpacketcontent.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
-    <ClCompile Include="xfireutils.cpp">
+    <ClCompile Include="src\xfireutils.cpp">
       <Filter>XFirelib\sources</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="Xfire_avatar_loader.h">
+    <ClInclude Include="src\Xfire_avatar_loader.h">
       <Filter>Miranda Plugin\Xfire_class\headers</Filter>
     </ClInclude>
-    <ClInclude Include="Xfire_base.h">
+    <ClInclude Include="src\Xfire_base.h">
       <Filter>Miranda Plugin\Xfire_class\headers</Filter>
     </ClInclude>
-    <ClInclude Include="Xfire_game.h">
+    <ClInclude Include="src\Xfire_game.h">
       <Filter>Miranda Plugin\Xfire_class\headers</Filter>
     </ClInclude>
-    <ClInclude Include="Xfire_gamelist.h">
+    <ClInclude Include="src\Xfire_gamelist.h">
       <Filter>Miranda Plugin\Xfire_class\headers</Filter>
     </ClInclude>
-    <ClInclude Include="Xfire_icon_mng.h">
+    <ClInclude Include="src\Xfire_icon_mng.h">
       <Filter>Miranda Plugin\Xfire_class\headers</Filter>
     </ClInclude>
-    <ClInclude Include="Xfire_voicechat.h">
+    <ClInclude Include="src\Xfire_voicechat.h">
       <Filter>Miranda Plugin\Xfire_class\headers</Filter>
     </ClInclude>
-    <ClInclude Include="addgamedialog.h">
+    <ClInclude Include="src\addgamedialog.h">
       <Filter>Miranda Plugin\plugin\headers</Filter>
     </ClInclude>
-    <ClInclude Include="all_statusmsg.h">
+    <ClInclude Include="src\all_statusmsg.h">
       <Filter>Miranda Plugin\plugin\headers</Filter>
     </ClInclude>
-    <ClInclude Include="baseProtocol.h">
+    <ClInclude Include="src\baseProtocol.h">
       <Filter>Miranda Plugin\plugin\headers</Filter>
     </ClInclude>
-    <ClInclude Include="iniupdater.h">
+    <ClInclude Include="src\iniupdater.h">
       <Filter>Miranda Plugin\plugin\headers</Filter>
     </ClInclude>
-    <ClInclude Include="passworddialog.h">
+    <ClInclude Include="src\passworddialog.h">
       <Filter>Miranda Plugin\plugin\headers</Filter>
     </ClInclude>
-    <ClInclude Include="processbuddyinfo.h">
+    <ClInclude Include="src\processbuddyinfo.h">
       <Filter>Miranda Plugin\plugin\headers</Filter>
     </ClInclude>
-    <ClInclude Include="pwd_dlg.h">
+    <ClInclude Include="src\pwd_dlg.h">
       <Filter>Miranda Plugin\plugin\headers</Filter>
     </ClInclude>
-    <ClInclude Include="resource.h">
+    <ClInclude Include="src\resource.h">
       <Filter>Miranda Plugin\plugin\headers</Filter>
     </ClInclude>
-    <ClInclude Include="services.h">
+    <ClInclude Include="src\services.h">
       <Filter>Miranda Plugin\plugin\headers</Filter>
     </ClInclude>
-    <ClInclude Include="setnickname.h">
+    <ClInclude Include="src\setnickname.h">
       <Filter>Miranda Plugin\plugin\headers</Filter>
     </ClInclude>
-    <ClInclude Include="stdafx.h">
+    <ClInclude Include="src\stdafx.h">
       <Filter>Miranda Plugin\plugin\headers</Filter>
     </ClInclude>
-    <ClInclude Include="tools.h">
+    <ClInclude Include="src\tools.h">
       <Filter>Miranda Plugin\plugin\headers</Filter>
     </ClInclude>
-    <ClInclude Include="variables.h">
+    <ClInclude Include="src\variables.h">
       <Filter>Miranda Plugin\plugin\headers</Filter>
     </ClInclude>
-    <ClInclude Include="m8.h">
+    <ClInclude Include="src\m8.h">
       <Filter>Miranda Plugin\m8</Filter>
     </ClInclude>
-    <ClInclude Include="Xfire_proxy.h">
+    <ClInclude Include="src\Xfire_proxy.h">
       <Filter>Miranda Plugin\proxy</Filter>
     </ClInclude>
-    <ClInclude Include="authpacket.h">
+    <ClInclude Include="src\authpacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="buddyinfo.h">
+    <ClInclude Include="src\buddyinfo.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="buddylist.h">
+    <ClInclude Include="src\buddylist.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="buddylistgames2packet.h">
+    <ClInclude Include="src\buddylistgames2packet.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="buddylistgamespacket.h">
+    <ClInclude Include="src\buddylistgamespacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="buddylistnamespacket.h">
+    <ClInclude Include="src\buddylistnamespacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="buddylistonlinepacket.h">
+    <ClInclude Include="src\buddylistonlinepacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="clanbuddylistnamespacket.h">
+    <ClInclude Include="src\clanbuddylistnamespacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="claninvitationpacket.h">
+    <ClInclude Include="src\claninvitationpacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="client.h">
+    <ClInclude Include="src\client.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="clientinformationpacket.h">
+    <ClInclude Include="src\clientinformationpacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="clientloginpacket.h">
+    <ClInclude Include="src\clientloginpacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="clientversionpacket.h">
+    <ClInclude Include="src\clientversionpacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="dummyxfiregameresolver.h">
+    <ClInclude Include="src\dummyxfiregameresolver.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="friendsoffriendlist.h">
+    <ClInclude Include="src\friendsoffriendlist.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="gameinfopacket.h">
+    <ClInclude Include="src\gameinfopacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="getbuddyinfo.h">
+    <ClInclude Include="src\getbuddyinfo.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="invitebuddypacket.h">
+    <ClInclude Include="src\invitebuddypacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="inviterequestpacket.h">
+    <ClInclude Include="src\inviterequestpacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="loginfailedpacket.h">
+    <ClInclude Include="src\loginfailedpacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="loginsuccesspacket.h">
+    <ClInclude Include="src\loginsuccesspacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="messageackpacket.h">
+    <ClInclude Include="src\messageackpacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="messagepacket.h">
+    <ClInclude Include="src\messagepacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="monitoredobj.h">
+    <ClInclude Include="src\monitoredobj.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="otherloginpacket.h">
+    <ClInclude Include="src\otherloginpacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="packetlistener.h">
+    <ClInclude Include="src\packetlistener.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="packetreader.h">
+    <ClInclude Include="src\packetreader.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="recvbuddychangednick.h">
+    <ClInclude Include="src\recvbuddychangednick.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="recvdidpacket.h">
+    <ClInclude Include="src\recvdidpacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="recvoldversionpacket.h">
+    <ClInclude Include="src\recvoldversionpacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="recvprefspacket.h">
+    <ClInclude Include="src\recvprefspacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="recvremovebuddypacket.h">
+    <ClInclude Include="src\recvremovebuddypacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="recvstatusmessagepacket.h">
+    <ClInclude Include="src\recvstatusmessagepacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="searchbuddy.h">
+    <ClInclude Include="src\searchbuddy.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="sendacceptinvitationpacket.h">
+    <ClInclude Include="src\sendacceptinvitationpacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="senddenyinvitationpacket.h">
+    <ClInclude Include="src\senddenyinvitationpacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="sendgameserverpacket.h">
+    <ClInclude Include="src\sendgameserverpacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="sendgamestatus2packet.h">
+    <ClInclude Include="src\sendgamestatus2packet.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="sendgamestatuspacket.h">
+    <ClInclude Include="src\sendgamestatuspacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="sendkeepalivepacket.h">
+    <ClInclude Include="src\sendkeepalivepacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="sendmessagepacket.h">
+    <ClInclude Include="src\sendmessagepacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="sendnickchangepacket.h">
+    <ClInclude Include="src\sendnickchangepacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="sendremovebuddypacket.h">
+    <ClInclude Include="src\sendremovebuddypacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="sendsidpacket.h">
+    <ClInclude Include="src\sendsidpacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="sendstatusmessagepacket.h">
+    <ClInclude Include="src\sendstatusmessagepacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="sendtypingpacket.h">
+    <ClInclude Include="src\sendtypingpacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="SHA1.h">
+    <ClInclude Include="src\SHA1.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="socket.h">
+    <ClInclude Include="src\socket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="socketexception.h">
+    <ClInclude Include="src\socketexception.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="variablevalue.h">
+    <ClInclude Include="src\variablevalue.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="xdebug.h">
+    <ClInclude Include="src\xdebug.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="xfireclanpacket.h">
+    <ClInclude Include="src\xfireclanpacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="xfirefoundbuddys.h">
+    <ClInclude Include="src\xfirefoundbuddys.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="xfiregame.h">
+    <ClInclude Include="src\xfiregame.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="xfiregameresolver.h">
+    <ClInclude Include="src\xfiregameresolver.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="xfirepacket.h">
+    <ClInclude Include="src\xfirepacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="xfirepacketcontent.h">
+    <ClInclude Include="src\xfirepacketcontent.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="xfireparse.h">
+    <ClInclude Include="src\xfireparse.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="xfireprefpacket.h">
+    <ClInclude Include="src\xfireprefpacket.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="xfirerecvpacketcontent.h">
+    <ClInclude Include="src\xfirerecvpacketcontent.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="xfiresendpacketcontent.h">
+    <ClInclude Include="src\xfiresendpacketcontent.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
-    <ClInclude Include="xfireutils.h">
+    <ClInclude Include="src\xfireutils.h">
       <Filter>XFirelib\headers</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="res\resource.rc">
+      <Filter>Resources</Filter>
+    </ResourceCompile>
+  </ItemGroup>
 </Project>
 \ No newline at end of file
author	Robert Pösel <robyer@seznam.cz>	2012-11-05 21:11:48 +0000
committer	Robert Pösel <robyer@seznam.cz>	2012-11-05 21:11:48 +0000
commit	048aaf0c4e77402adf584e3318e5aae6f1cdd749 (patch)
tree	def343da80e282ae43164e45e672a1386db66546
parent	35a9af527f9b7ec35e81455784cd0a795be910c5 (diff)