[Pkg-clamav-commits] [SCM] Debian repository for ClamAV branch, debian/unstable, updated. debian/0.95+dfsg-1-6156-g094ec9b

aCaB acab at clamav.net
Sun Apr 4 01:18:49 UTC 2010


The following commit has been merged in the debian/unstable branch:
commit 0678c04bf566fdcef6f422f8858dbcb5ff793363
Author: aCaB <acab at clamav.net>
Date:   Wed Feb 3 18:08:11 2010 +0100

    win32 readme + contrib cleanup

diff --git a/contrib/Windows/Old/clamadoc.cpp b/contrib/Windows/Old/clamadoc.cpp
deleted file mode 100644
index 83b02fa..0000000
--- a/contrib/Windows/Old/clamadoc.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-// clamadoc.cpp : implementation of the CClamavDoc class
-//
-
-/*
- *  Copyright (C) 2004 Nigel Horne <njh at bandsman.co.uk>
- *
- *  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 Street, Fifth Floor, Boston,
- *  MA 02110-1301, USA.
- */
-
-#include "stdafx.h"
-#include "resource.h"
-#include "clamav.h"
-
-#include "clamadoc.h"
-
-#ifdef _DEBUG
-#undef THIS_FILE
-static char BASED_CODE THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CClamavDoc
-
-IMPLEMENT_DYNCREATE(CClamavDoc, CDocument)
-
-BEGIN_MESSAGE_MAP(CClamavDoc, CDocument)
-
-		// NOTE - the ClassWizard will add and remove mapping macros here.
-		//    DO NOT EDIT what you see in these blocks of generated code!
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CClamavDoc construction/destruction
-
-CClamavDoc::CClamavDoc()
-{
-	// TODO: add one-time construction code here
-
-}
-
-CClamavDoc::~CClamavDoc()
-{
-}
-
-BOOL CClamavDoc::OnNewDocument()
-{
-	if (!CDocument::OnNewDocument())
-		return FALSE;
-
-	// TODO: add reinitialization code here
-	// (SDI documents will reuse this document)
-
-	return TRUE;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CClamavDoc serialization
-
-void CClamavDoc::Serialize(CArchive& ar)
-{
-	if (ar.IsStoring())
-	{
-		// TODO: add storing code here
-	}
-	else
-	{
-		// TODO: add loading code here
-	}
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CClamavDoc diagnostics
-
-#ifdef _DEBUG
-void CClamavDoc::AssertValid() const
-{
-	CDocument::AssertValid();
-}
-
-void CClamavDoc::Dump(CDumpContext& dc) const
-{
-	CDocument::Dump(dc);
-}
-#endif //_DEBUG
-
-/////////////////////////////////////////////////////////////////////////////
-// CClamavDoc commands
diff --git a/contrib/Windows/Old/clamadoc.h b/contrib/Windows/Old/clamadoc.h
deleted file mode 100644
index 7c3038b..0000000
--- a/contrib/Windows/Old/clamadoc.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// clamadoc.h : interface of the CClamavDoc class
-//
-/////////////////////////////////////////////////////////////////////////////
-
-/*
- *  Copyright (C) 2004 Nigel Horne <njh at bandsman.co.uk>
- *
- *  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 Street, Fifth Floor, Boston,
- *  MA 02110-1301, USA.
- */
-class CClamavDoc : public CDocument
-{
-protected: // create from serialization only
-	CClamavDoc();
-	DECLARE_DYNCREATE(CClamavDoc)
-
-// Attributes
-public:
-
-// Operations
-public:
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CClamavDoc)
-	public:
-	virtual BOOL OnNewDocument();
-	//}}AFX_VIRTUAL
-
-// Implementation
-public:
-	virtual ~CClamavDoc();
-	virtual void Serialize(CArchive& ar);   // overridden for document i/o
-#ifdef _DEBUG
-	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
-#endif
-
-protected:
-
-// Generated message map functions
-protected:
-	//{{AFX_MSG(CClamavDoc)
-		// NOTE - the ClassWizard will add and remove member functions here.
-		//    DO NOT EDIT what you see in these blocks of generated code !
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-/////////////////////////////////////////////////////////////////////////////
diff --git a/contrib/Windows/Old/clamav.cpp b/contrib/Windows/Old/clamav.cpp
deleted file mode 100644
index 49af72d..0000000
--- a/contrib/Windows/Old/clamav.cpp
+++ /dev/null
@@ -1,277 +0,0 @@
-// clamav.cpp : Defines the class behaviors for the application.
-//
-
-/*
- *  Copyright (C) 2004 Nigel Horne <njh at bandsman.co.uk>
- *
- *  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 Street, Fifth Floor, Boston,
- *  MA 02110-1301, USA.
- */
-#include "stdafx.h"
-#include "resource.h"
-
-#include "clamav.h"
-
-#include "clamadoc.h"
-#include "clamavw.h"
-
-#include <winsock.h>
-
-#ifdef _DEBUG
-#undef THIS_FILE
-static char BASED_CODE THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CClamavApp
-
-BEGIN_MESSAGE_MAP(CClamavApp, CWinApp)
-	//{{AFX_MSG_MAP(CClamavApp)
-	ON_COMMAND(ID_APP_ABOUT, OnAppAbout)
-	ON_COMMAND(ID_FILE_NEW, OnFileNew)
-	ON_COMMAND(ID_FILE_OPEN, OnFileOpen)
-	ON_COMMAND(ID_SET_OPTIONS, OnSetOptions)
-	//}}AFX_MSG_MAP
-	// Standard file based document commands
-	// ON_COMMAND(ID_FILE_NEW, CWinApp::OnFileNew)
-	ON_COMMAND(ID_FILE_OPEN, CWinApp::OnFileOpen)
-	// Standard print setup command
-	ON_COMMAND(ID_FILE_PRINT_SETUP, CWinApp::OnFilePrintSetup)
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CClamavApp construction
-
-CClamavApp::CClamavApp()
-{
-	// TODO: add construction code here,
-	// Place all significant initialization in InitInstance
-}
-
-CClamavApp::~CClamavApp()
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// The one and only CClamavApp object
-
-CClamavApp theApp;
-
-/////////////////////////////////////////////////////////////////////////////
-// CClamavApp initialization
-
-BOOL CClamavApp::InitInstance()
-{
-	// Standard initialization
-	// If you are not using these features and wish to reduce the size
-	//  of your final executable, you should remove from the following
-	//  the specific initialization routines you do not need.
-
-	Enable3dControls();
-
-	LoadStdProfileSettings();  // Load standard INI file options (including MRU)
-
-	// Register the application's document templates.  Document templates
-	//  serve as the connection between documents, frame windows and views.
-
-	CSingleDocTemplate* pDocTemplate;
-	pDocTemplate = new CSingleDocTemplate(
-		IDR_MAINFRAME,
-		RUNTIME_CLASS(CClamavDoc),
-		RUNTIME_CLASS(CMainFrame),       // main SDI frame window
-		RUNTIME_CLASS(CClamavView));
-	AddDocTemplate(pDocTemplate);
-	
-	// Start up Winsock
-	WSAData wsaData;
-
-    if(WSAStartup(MAKEWORD(1, 1), &wsaData) != 0) {
-		AfxMessageBox("WSAStartup() failed error code");
-        return FALSE;
-    }
-	clamServer = NULL;
-
-	if (m_lpCmdLine[0] != '\0')	{
-		// TODO: add command line processing here
-		// First argument is the server, second is the file to scan
-		// TODO: more rigourous argument checking
-		CString args = CString(m_lpCmdLine);
-
-		int index = args.Find(' ');
-		if(index == -1)
-			exit(1);
-
-		CString server = args.Left(index);
- 		const CString fileName = args.Mid(index + 1);
-		unsigned short port;
-
-		index = server.Find(':');
-		if(index != -1) {
-			port = (unsigned short)atoi(server.Mid(index + 1));
-			server = server.Left(index);	
-		} else
-			port = DEFAULT_PORT;
-
-		TRY {
-			clamServer = new ClamServer(server, port);
-		} CATCH(CException, c) {
-			AfxMessageBox("Can't establish a connection to " + server);
-			c->Delete();
-			exit(1);
-		}
-		END_CATCH
-
- 		CWinApp::OnFileNew();
-
-		// TODO: set quarantine directory
- 		
- 		exit(clamServer->Scan(fileName, 0, (CMainFrame *)AfxGetMainWnd(), m_pMainWnd, TRUE, NULL) == TRUE);
-	} else {
-		// create a new (empty) document
-		OnFileNew();
-	}
-
-#ifdef _DEBUG
-	afxTraceEnabled = TRUE;
-#endif
-
-	options = new COptions();
-	recursive = TRUE;
-
-	return TRUE;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CAboutDlg dialog used for App About
-
-class CAboutDlg : public CDialog
-{
-public:
-	CAboutDlg();
-
-// Dialog Data
-	//{{AFX_DATA(CAboutDlg)
-	enum { IDD = IDD_ABOUTBOX };
-	//}}AFX_DATA
-
-// Implementation
-protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//{{AFX_MSG(CAboutDlg)
-		// No message handlers
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-CAboutDlg::CAboutDlg() : CDialog(CAboutDlg::IDD)
-{
-	//{{AFX_DATA_INIT(CAboutDlg)
-	//}}AFX_DATA_INIT
-}
-
-void CAboutDlg::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CAboutDlg)
-	//}}AFX_DATA_MAP
-}
-
-BEGIN_MESSAGE_MAP(CAboutDlg, CDialog)
-	//{{AFX_MSG_MAP(CAboutDlg)
-		// No message handlers
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-// App command to run the dialog
-void CClamavApp::OnAppAbout()
-{
-	CAboutDlg aboutDlg;
-	aboutDlg.DoModal();
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CClamavApp commands
-
-int CClamavApp::ExitInstance() 
-{
-	// TODO: Add your specialized code here and/or call the base class
-	if(clamServer) {
-		delete clamServer;
-		clamServer = NULL;
-	}
-	if(options) {
-		delete options;
-		options = NULL;
-	}
-	WSACleanup();
-
-	return CWinApp::ExitInstance();
-}
-
-void CClamavApp::OnFileNew() 
-{
-	CWinApp::OnFileNew();
-
-	// TODO: Add your command handler code here
-
-	// Open connection to a different server
-	if(clamServer) {
-		delete clamServer;
-		clamServer = NULL;
-	}
-	TRY {
-		clamServer = new ClamServer;
-	} CATCH(CException, c) {
-		clamServer = NULL;
-		c->Delete();
-	}
-	END_CATCH
-}
-
-void CClamavApp::OnFileOpen() 
-{
-	// TODO: Add your command handler code here
-
-    CString newName;
-    if (!DoPromptFileName(newName, AFX_IDS_OPENFILE,
-      /*OFN_HIDEREADONLY |*/ OFN_FILEMUSTEXIST, TRUE, NULL))
-        return; // open cancelled
-
-    // OpenDocumentFile(newName);
-	this->Scan(newName);
-}
-
-// TODO: More than one scan happen at once but the progress bar gets confused
-// Need a new scanner class. Create a new instance everytime we scan something
-// Pass clamServer as a parameter
-//	Scanner *s = new Scanner(clamServer, 0, (CMainFrame *)AfxGetMainWnd(), m_pMainWnd, recursive, options->m_quarantineDir);
-//	if(s->clean())
-//		AfxMessageBox("No virus found in " + filename);
-// delete s;
-	
-void CClamavApp::Scan(const CString& filename)
-{
-	if(clamServer == NULL)
-		AfxMessageBox("You must connect to a clamd server first");
-	else if(clamServer->Scan(filename, 0, (CMainFrame *)AfxGetMainWnd(), m_pMainWnd, recursive, options->m_quarantineDir))
-		AfxMessageBox("No virus found in " + filename);
-}
-
-void CClamavApp::OnSetOptions() 
-{
-	// TODO: Add your command handler code here
-	if(options->DoModal() == IDOK)
-		recursive = options->m_recursive;
-}
diff --git a/contrib/Windows/Old/clamav.exe b/contrib/Windows/Old/clamav.exe
deleted file mode 100644
index 0a78452..0000000
Binary files a/contrib/Windows/Old/clamav.exe and /dev/null differ
diff --git a/contrib/Windows/Old/clamav.h b/contrib/Windows/Old/clamav.h
deleted file mode 100644
index 21d4125..0000000
--- a/contrib/Windows/Old/clamav.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// clamav.h : main header file for the CLAMAV application
-//
-
-/*
- *  Copyright (C) 2004 Nigel Horne <njh at bandsman.co.uk>
- *
- *  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 Street, Fifth Floor, Boston,
- *  MA 02110-1301, USA.
- */
-#ifndef __AFXWIN_H__
-	#error include 'stdafx.h' before including this file for PCH
-#endif
-
-
-#include "resource.h"       // main symbols
-
-#include "mainfrm.h"
-
-#include "options.h"
-#include "progress.h"
-#include "clamserver.h"
-
-#define	DEFAULT_PORT	3310
-
-/////////////////////////////////////////////////////////////////////////////
-// CClamavApp:
-// See clamav.cpp for the implementation of this class
-//
-
-class CClamavApp : public CWinApp
-{
-public:
-	CClamavApp();
-	~CClamavApp();
-	void	Scan(const CString& filename);
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CClamavApp)
-	public:
-	virtual BOOL InitInstance();
-	virtual int ExitInstance();
-	//}}AFX_VIRTUAL
-
-// Implementation
-
-	//{{AFX_MSG(CClamavApp)
-	afx_msg void OnAppAbout();
-	afx_msg void OnFileNew();
-	afx_msg void OnFileOpen();
-	afx_msg void OnSetOptions();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-
-private:
-	ClamServer	*clamServer;
-	COptions	*options;
-	BOOL		recursive;	// recursively scan folders?
-};
-
-
-/////////////////////////////////////////////////////////////////////////////
diff --git a/contrib/Windows/Old/clamav.rc b/contrib/Windows/Old/clamav.rc
deleted file mode 100644
index 4a2b970..0000000
--- a/contrib/Windows/Old/clamav.rc
+++ /dev/null
@@ -1,354 +0,0 @@
-//Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-/*
- *  Copyright (C) 2004 Nigel Horne <njh at bandsman.co.uk>
- *
- *  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 Street, Fifth Floor, Boston,
- *  MA 02110-1301, USA.
- */
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE DISCARDABLE 
-BEGIN
-    "#include ""res\\clamav.rc2""  // non-Microsoft Visual C++ edited resources\r\n"
-    "\r\n"
-    "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
-    "#define _AFX_NO_OLE_RESOURCES\r\n"
-    "#define _AFX_NO_TRACKER_RESOURCES\r\n"
-    "#define _AFX_NO_PROPERTY_RESOURCES\r\n"
-    "#include ""afxres.rc""  \011// Standard components\r\n"
-    "#include ""afxprint.rc""\011// printing/print preview resources\r\n"
-    "\0"
-END
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-IDR_MAINFRAME           ICON    DISCARDABLE     "res\\clamav.ico"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Bitmap
-//
-
-IDR_MAINFRAME           BITMAP  MOVEABLE PURE   "res\\toolbar.bmp"
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Menu
-//
-
-IDR_MAINFRAME MENU PRELOAD DISCARDABLE 
-BEGIN
-    POPUP "&File"
-    BEGIN
-        MENUITEM "&New Server\tCtrl+N",         ID_FILE_NEW
-        MENUITEM "&Scan File...\tCtrl+S",       ID_FILE_OPEN
-        MENUITEM "&Options...\tCtrl+O",         ID_SET_OPTIONS
-        MENUITEM SEPARATOR
-        MENUITEM "E&xit",                       ID_APP_EXIT
-    END
-    POPUP "&Help"
-    BEGIN
-        MENUITEM "&About Clamav...",            ID_APP_ABOUT
-    END
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Accelerator
-//
-
-IDR_MAINFRAME ACCELERATORS PRELOAD MOVEABLE PURE 
-BEGIN
-    "N",            ID_FILE_NEW,            VIRTKEY, CONTROL
-    "O",            ID_FILE_OPEN,           VIRTKEY, CONTROL
-    "S",            ID_FILE_SAVE,           VIRTKEY, CONTROL
-    "P",            ID_FILE_PRINT,          VIRTKEY, CONTROL
-    "Z",            ID_EDIT_UNDO,           VIRTKEY, CONTROL
-    "X",            ID_EDIT_CUT,            VIRTKEY, CONTROL
-    "C",            ID_EDIT_COPY,           VIRTKEY, CONTROL
-    "V",            ID_EDIT_PASTE,          VIRTKEY, CONTROL
-    VK_BACK,        ID_EDIT_UNDO,           VIRTKEY, ALT
-    VK_DELETE,      ID_EDIT_CUT,            VIRTKEY, SHIFT
-    VK_INSERT,      ID_EDIT_COPY,           VIRTKEY, CONTROL
-    VK_INSERT,      ID_EDIT_PASTE,          VIRTKEY, SHIFT
-    VK_F6,          ID_NEXT_PANE,           VIRTKEY 
-    VK_F6,          ID_PREV_PANE,           VIRTKEY, SHIFT
-    VK_F1,          ID_CONTEXT_HELP,        VIRTKEY, SHIFT
-    VK_F1,          ID_HELP,                VIRTKEY 
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Dialog
-//
-
-IDD_ABOUTBOX DIALOG DISCARDABLE  34, 22, 217, 55
-STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "About clamav"
-FONT 8, "MS Sans Serif"
-BEGIN
-    ICON            IDR_MAINFRAME,IDC_STATIC,11,17,18,20
-    LTEXT           "ClamAV Version 0.14",IDC_STATIC,40,10,76,8
-    LTEXT           "Copyright \251 2004 Nigel Horne",IDC_STATIC,40,25,102,8
-    DEFPUSHBUTTON   "OK",IDOK,176,6,32,14,WS_GROUP
-END
-
-IDD_SERVERNAME DIALOG DISCARDABLE  0, 0, 187, 67
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "ClamAV Server"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,131,6,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,131,23,50,14
-    LTEXT           "Server",IDC_STATIC,6,8,27,11
-    EDITTEXT        IDC_SERVERNAME,46,7,72,14,ES_AUTOHSCROLL
-    LTEXT           "Port",IDC_STATIC,6,33,20,11
-    EDITTEXT        IDC_SERVERPORT,46,32,54,13,ES_AUTOHSCROLL
-END
-
-IDD_PROGRESS DIALOG DISCARDABLE  0, 0, 287, 81
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Scanning"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "Stop",IDSTOP,117,56,50,14
-    CONTROL         "Filename",IDC_FileName,"Static",SS_LEFTNOWORDWRAP | 
-                    WS_GROUP,9,7,270,13
-    CTEXT           "0%",IDC_Percent,116,28,52,18
-END
-
-IDD_OPTIONS DIALOG DISCARDABLE  0, 0, 277, 90
-STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-CAPTION "Options"
-FONT 8, "MS Sans Serif"
-BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,214,42,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,213,64,50,14
-    CONTROL         "Recursively Scan Folders",IDC_RECURSIVE,"Button",
-                    BS_AUTOCHECKBOX | BS_LEFTTEXT | WS_TABSTOP,6,9,93,10
-    LTEXT           "Quarantine Directory",IDC_STATIC,10,33,75,14
-    EDITTEXT        IDC_QUARANTINE,91,29,120,18,ES_AUTOHSCROLL
-END
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Version
-//
-
-VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
- FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
- FILEFLAGS 0x1L
-#else
- FILEFLAGS 0x0L
-#endif
- FILEOS 0x4L
- FILETYPE 0x1L
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "080904b0"
-        BEGIN
-            VALUE "CompanyName", "NJH Music\0"
-            VALUE "FileDescription", "CLAMAV MFC Application\0"
-            VALUE "FileVersion", "1, 0, 0, 1\0"
-            VALUE "InternalName", "CLAMAV\0"
-            VALUE "LegalCopyright", "Copyright \251 2004 Nigel Horne\0"
-            VALUE "OriginalFilename", "CLAMAV.EXE\0"
-            VALUE "ProductName", "CLAMAV Application\0"
-            VALUE "ProductVersion", "1, 0, 0, 1\0"
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x809, 1200
-    END
-END
-
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// String Table
-//
-
-STRINGTABLE PRELOAD DISCARDABLE 
-BEGIN
-    IDR_MAINFRAME           "clamav\n\nClamav\n\n\nClamav.Document\nClamav Document"
-    IDD_OPTIONS             "Set Options\nOptions"
-END
-
-STRINGTABLE PRELOAD DISCARDABLE 
-BEGIN
-    AFX_IDS_APP_TITLE       "clamav"
-    AFX_IDS_IDLEMESSAGE     "To scan a file/folder drag 'n' drop it onto the program"
-    AFX_IDS_HELPMODEMESSAGE "Select an object on which to get Help"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_INDICATOR_EXT        "EXT"
-    ID_INDICATOR_CAPS       "CAP"
-    ID_INDICATOR_NUM        "NUM"
-    ID_INDICATOR_SCRL       "SCRL"
-    ID_INDICATOR_OVR        "OVR"
-    ID_INDICATOR_REC        "REC"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_FILE_NEW             "Connect to a different server\nNew"
-    ID_FILE_OPEN            "Scan File\nScan"
-    ID_FILE_CLOSE           "Close the active document\nClose"
-    ID_FILE_SAVE            "Save the active document\nSave"
-    ID_FILE_SAVE_AS         "Save the active document with a new name\nSave As"
-    ID_FILE_PAGE_SETUP      "Change the printing options\nPage Setup"
-    ID_FILE_PRINT_SETUP     "Change the printer and printing options\nPrint Setup"
-    ID_FILE_PRINT           "Print the active document\nPrint"
-    ID_FILE_PRINT_PREVIEW   "Display full pages\nPrint Preview"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_APP_ABOUT            "Display program information, version number and copyright\nAbout"
-    ID_APP_EXIT             "Quit the application; prompts to save documents\nExit"
-    ID_HELP_INDEX           "List Help topics\nHelp Index"
-    ID_HELP_USING           "Display instructions about how to use help\nHelp"
-    ID_CONTEXT_HELP         "Display help for clicked on buttons, menus and windows\nHelp"
-    ID_HELP                 "Display help for current task or command\nHelp"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_FILE_MRU_FILE1       "Open this document"
-    ID_FILE_MRU_FILE2       "Open this document"
-    ID_FILE_MRU_FILE3       "Open this document"
-    ID_FILE_MRU_FILE4       "Open this document"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_NEXT_PANE            "Switch to the next window pane\nNext Pane"
-    ID_PREV_PANE            "Switch back to the previous window pane\nPrevious Pane"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_WINDOW_SPLIT         "Split the active window into panes\nSplit"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_EDIT_CLEAR           "Erase the selection\nErase"
-    ID_EDIT_CLEAR_ALL       "Erase everything\nErase All"
-    ID_EDIT_COPY            "Copy the selection and put it on the Clipboard\nCopy"
-    ID_EDIT_CUT             "Cut the selection and put it on the Clipboard\nCut"
-    ID_EDIT_FIND            "Find the specified text\nFind"
-    ID_EDIT_PASTE           "Insert Clipboard contents\nPaste"
-    ID_EDIT_REPEAT          "Repeat the last action\nRepeat"
-    ID_EDIT_REPLACE         "Replace specific text with different text\nReplace"
-    ID_EDIT_SELECT_ALL      "Select the entire document\nSelect All"
-    ID_EDIT_UNDO            "Undo the last action\nUndo"
-    ID_EDIT_REDO            "Redo the previously undone action\nRedo"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    ID_VIEW_TOOLBAR         "Show or hide the toolbar\nToggle ToolBar"
-    ID_VIEW_STATUS_BAR      "Show or hide the status bar\nToggle StatusBar"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    AFX_IDS_SCSIZE          "Change the window size"
-    AFX_IDS_SCMOVE          "Change the window position"
-    AFX_IDS_SCMINIMIZE      "Reduce the window to an icon"
-    AFX_IDS_SCMAXIMIZE      "Enlarge the window to full size"
-    AFX_IDS_SCNEXTWINDOW    "Switch to the next document window"
-    AFX_IDS_SCPREVWINDOW    "Switch to the previous document window"
-    AFX_IDS_SCCLOSE         "Close the active window and prompts to save the documents"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    AFX_IDS_SCRESTORE       "Restore the window to normal size"
-    AFX_IDS_SCTASKLIST      "Activate Task List"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    AFX_IDS_PREVIEW_CLOSE   "Close print preview mode\nCancel Preview"
-END
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-#include "res\clamav.rc2"  // non-Microsoft Visual C++ edited resources
-
-#define _AFX_NO_SPLITTER_RESOURCES
-#define _AFX_NO_OLE_RESOURCES
-#define _AFX_NO_TRACKER_RESOURCES
-#define _AFX_NO_PROPERTY_RESOURCES
-#include "afxres.rc"  	// Standard components
-#include "afxprint.rc"	// printing/print preview resources
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/contrib/Windows/Old/clamavw.cpp b/contrib/Windows/Old/clamavw.cpp
deleted file mode 100644
index bcd8057..0000000
--- a/contrib/Windows/Old/clamavw.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// clamavw.cpp : implementation of the CClamavView class
-//
-
-/*
- *  Copyright (C) 2004 Nigel Horne <njh at bandsman.co.uk>
- *
- *  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 Street, Fifth Floor, Boston,
- *  MA 02110-1301, USA.
- */
-#include "stdafx.h"
-#include "clamav.h"
-
-#include "clamadoc.h"
-#include "clamavw.h"
-
-#ifdef _DEBUG
-#undef THIS_FILE
-static char BASED_CODE THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CClamavView
-
-IMPLEMENT_DYNCREATE(CClamavView, CView)
-
-BEGIN_MESSAGE_MAP(CClamavView, CView)
-	//{{AFX_MSG_MAP(CClamavView)
-	//}}AFX_MSG_MAP
-	// Standard printing commands
-	ON_COMMAND(ID_FILE_PRINT, CView::OnFilePrint)
-	ON_COMMAND(ID_FILE_PRINT_PREVIEW, CView::OnFilePrintPreview)
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// CClamavView construction/destruction
-
-CClamavView::CClamavView()
-{
-	// TODO: add construction code here
-
-}
-
-CClamavView::~CClamavView()
-{
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CClamavView drawing
-
-void CClamavView::OnDraw(CDC* pDC)
-{
-	CClamavDoc* pDoc = GetDocument();
-	ASSERT_VALID(pDoc);
-
-	// TODO: add draw code for native data here
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CClamavView printing
-
-BOOL CClamavView::OnPreparePrinting(CPrintInfo* pInfo)
-{
-	// default preparation
-	return DoPreparePrinting(pInfo);
-}
-
-void CClamavView::OnBeginPrinting(CDC* /*pDC*/, CPrintInfo* /*pInfo*/)
-{
-	// TODO: add extra initialization before printing
-}
-
-void CClamavView::OnEndPrinting(CDC* /*pDC*/, CPrintInfo* /*pInfo*/)
-{
-	// TODO: add cleanup after printing
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CClamavView diagnostics
-
-#ifdef _DEBUG
-void CClamavView::AssertValid() const
-{
-	CView::AssertValid();
-}
-
-void CClamavView::Dump(CDumpContext& dc) const
-{
-	CView::Dump(dc);
-}
-
-CClamavDoc* CClamavView::GetDocument() // non-debug version is inline
-{
-	ASSERT(m_pDocument->IsKindOf(RUNTIME_CLASS(CClamavDoc)));
-	return (CClamavDoc*)m_pDocument;
-}
-#endif //_DEBUG
-
-/////////////////////////////////////////////////////////////////////////////
-// CClamavView message handlers
diff --git a/contrib/Windows/Old/clamavw.h b/contrib/Windows/Old/clamavw.h
deleted file mode 100644
index 941cee3..0000000
--- a/contrib/Windows/Old/clamavw.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// clamavw.h : interface of the CClamavView class
-//
-/////////////////////////////////////////////////////////////////////////////
-
-/*
- *  Copyright (C) 2004 Nigel Horne <njh at bandsman.co.uk>
- *
- *  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 Street, Fifth Floor, Boston,
- *  MA 02110-1301, USA.
- */
-class CClamavView : public CView
-{
-protected: // create from serialization only
-	CClamavView();
-	DECLARE_DYNCREATE(CClamavView)
-
-// Attributes
-public:
-	CClamavDoc* GetDocument();
-
-// Operations
-public:
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CClamavView)
-	public:
-	virtual void OnDraw(CDC* pDC);  // overridden to draw this view
-	protected:
-	virtual BOOL OnPreparePrinting(CPrintInfo* pInfo);
-	virtual void OnBeginPrinting(CDC* pDC, CPrintInfo* pInfo);
-	virtual void OnEndPrinting(CDC* pDC, CPrintInfo* pInfo);
-	//}}AFX_VIRTUAL
-
-// Implementation
-public:
-	virtual ~CClamavView();
-#ifdef _DEBUG
-	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
-#endif
-
-protected:
-
-// Generated message map functions
-protected:
-	//{{AFX_MSG(CClamavView)
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-#ifndef _DEBUG  // debug version in clamavw.cpp
-inline CClamavDoc* CClamavView::GetDocument()
-   { return (CClamavDoc*)m_pDocument; }
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
diff --git a/contrib/Windows/Old/clamserver.cpp b/contrib/Windows/Old/clamserver.cpp
deleted file mode 100644
index cd5ea46..0000000
--- a/contrib/Windows/Old/clamserver.cpp
+++ /dev/null
@@ -1,445 +0,0 @@
-/*
- *  Copyright (C) 2004 Nigel Horne <njh at bandsman.co.uk>
- *
- *  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 Street, Fifth Floor, Boston,
- *  MA 02110-1301, USA.
- */
-#include "stdafx.h"
-
-#include "resource.h"
-#include "clamav.h"
-
-#include "mainfrm.h"
-
-#include "clamserver.h"
-#include "servername.h"
-
-#include <io.h>
-#include <winsock.h>
-#include <sys/stat.h>
-
-ClamServer::ClamServer(void)
-{
-	if(!InitInstance())
-		THROW(new CException());	// FIXME: never freed 
-
-	progressBar = NULL;
-	stopping = FALSE;
-}
-
-ClamServer::ClamServer(CString& serverName, unsigned short p)
-{
-	LPTSTR hostname = serverName.GetBuffer(64);	
-	serverIP = inet_addr(hostname);
-
-	if(serverIP == -1L)
-		THROW(CException());
-
-	port = p;
-
-	const int sock = CreateConnection();
-
-	if(sock < 0)
-		THROW(CException());
-
-	progressBar = NULL;
-	stopping = FALSE;
-}
-
-ClamServer::~ClamServer()
-{
-	if(progressBar) {
-		delete progressBar;
-		progressBar = NULL;
-	}
-}
-
-BOOL
-ClamServer::InitInstance(void)
-{
-	ServerName serverName;
-	
-	if(serverName.DoModal() == IDCANCEL)
-		return FALSE;
-
-	const char *hostname = serverName.m_serverName;
-
-	serverIP = inet_addr(hostname);
-
-	if(serverIP == -1L) {
-		AfxMessageBox("Unknown host");
-		return FALSE;
-	}
-
-	port = (unsigned short)serverName.m_port;
-	const int sock = CreateConnection();
-
-	if(sock < 0)
-		return TRUE;
-
-	return CheckConnection(sock);
-}
-
-const BOOL
-ClamServer::CheckConnection(int sock)
-{
-	if(send(sock, "PING\n", 5, 0) < 5) {
-		closesocket(sock);
-		AfxMessageBox("Can't talk to clamdserver");
-		return FALSE;
-	}
-	char ret[5];
-	if(recv(sock, ret, sizeof(ret), 0) <= 4) {
-		closesocket(sock);
-		AfxMessageBox("Can't receive from clamdserver");
-		return FALSE;
-	}
-	closesocket(sock);
-	if(strncmp(ret, "PONG\n", 5) != 0) {
-		AfxMessageBox("Is that server running clamd?");
-		return FALSE;
-	}
-
-	return TRUE;	
-}
-
-int
-ClamServer::CreateConnection(void)
-{
-	const int sock = socket(AF_INET, SOCK_STREAM, 0);
-	if(sock < 0) {
-		AfxMessageBox("Can't create socket");
-		return FALSE;
-	}
-
-	struct sockaddr_in server;
-	memset(&server, '\0', sizeof(struct sockaddr_in));
-	server.sin_family = PF_INET;
-	server.sin_port = htons(port);
-	server.sin_addr.s_addr = serverIP;
-
-	// TODO	display a message about connecting to the server. Include cancel button
-	if(connect(sock, (struct sockaddr *)&server, sizeof(struct sockaddr)) < 0) {
-		AfxMessageBox("Can't connect to clamdserver");
-		return FALSE;
-	}
-	return sock;
-}
-
-// TODO: on recursive pop up box with progress bar - to include cancel button
-BOOL
-ClamServer::Scan(const CString& filename, int level, CMainFrame *mainFrame, CWnd *parent, BOOL recursive, const CString& qDir)
-{
-	if(level == 0)
-		stopping = FALSE;
-	else if(stopping) {
-		if(progressBar) {
-			delete progressBar;
-			progressBar = NULL;
-		}
-		// mainFrame->ChangeStatusText("");
-		return TRUE;
-	}
-
-	// Don't scan folders "." and ".."
- 	if(filename[filename.GetLength() - 1] == '.')
- 		return TRUE;
-
-	// I understand newer MFCs have 'PathIsDirectory'
-
-	struct stat statb;
-
-	if(stat(filename, &statb) < 0) {
-		// It could be that we've been given a wild card match
-
-		WIN32_FIND_DATA findData;
-				
-		HANDLE hFind = FindFirstFile(filename, &findData);
-
-		if(hFind == INVALID_HANDLE_VALUE) {
-  			// No we haven't...
-			AfxMessageBox(CString("Can't stat ") + filename);
-			return TRUE;
-		}
-		return this->ScanWildCard(filename, level, mainFrame, parent, recursive, qDir);
-	}
-
-	if(progressBar && !stopping) {
-		if(progressBar->IsStopPressed())               
-			stopping = TRUE;
-		progressBar->SetFilename(filename);
-	}
-
-	// mainFrame->ChangeStatusText(filename);	// statusBar.ShowProgress
-	// mainFrame->UpdateWindow();
-
-	if(statb.st_mode&S_IFDIR) {
-		// Don't recurse unless we've been asked to
-
-		if((!recursive) && (level > 0))
-			return TRUE;
-
-		if(progressBar == NULL) {
-			// FIXME: not all return paths remove this, possible memory leak
-			progressBar = new CProgress(parent);
-			progressBar->Create(IDD_PROGRESS, parent);
-		}
-
-		// Have been passed a folder.
-		return this->ScanFolder(filename, level, mainFrame, parent, recursive, qDir);
-
-	}
-
-	if(progressBar && (level == 0)) {
-		delete progressBar;
-		progressBar = NULL;
-	}
-
-	const int commandSocket = CreateConnection();
-	
-	if(commandSocket < 0)
-		return TRUE;
-
-	if(send(commandSocket, "STREAM\n", 7, 0) < 7) {
-		closesocket(commandSocket);
-		AfxMessageBox("Send failed to clamd");
-		return TRUE;
-	}
-
-	char buf[64];
-	int nbytes = ClamdRecv(commandSocket, buf, sizeof(buf) - 1);
-
-	if(nbytes < 0) {
-		closesocket(commandSocket);
-		AfxMessageBox("recv failed from clamd getting PORT");
-		return TRUE;
-	}
-	buf[nbytes] = '\0';
-
-	unsigned short port;
-
-	if(sscanf(buf, "PORT %hu\n", &port) != 1) {
-		closesocket(commandSocket);
-		AfxMessageBox("Didn't get PORT information from clamd");
-
-		return TRUE;
-	}
-
-	const int dataSocket = socket(AF_INET, SOCK_STREAM, 0);
-
-	if(dataSocket < 0) {
-		closesocket(commandSocket);
-		AfxMessageBox("Can't create dataSocket");
-		return TRUE;
-	}
-
-	shutdown(dataSocket, 0);
-
-	struct sockaddr_in reply;
-	memset(&reply, '\0', sizeof(struct sockaddr_in));
-	reply.sin_family = PF_INET;
- 	reply.sin_port = htons(port);
-	reply.sin_addr.s_addr = serverIP;
-
-	const int rc = connect(dataSocket, (struct sockaddr *)&reply, sizeof(struct sockaddr_in));
-	if(rc < 0) {
-		closesocket(commandSocket);
-		closesocket(dataSocket);
-		AfxMessageBox("Failed to connect to port given by clamd");
-		return TRUE;
-	}
-
-	CFile file;
-
-	if(!file.Open(filename, CFile::modeRead|CFile::typeBinary|CFile::shareDenyNone)) {
-		closesocket(commandSocket);
-		closesocket(dataSocket);
-
-		AfxMessageBox(CString("Can't open ") + filename + " to scan: ");
-		return TRUE;
-	}
-
-	if(progressBar)
-		progressBar->SetPercent(0);
-
-	char buffer[1500];	// TODO: send in MTU byte chunks
-	off_t bytesSent = (off_t)0;
-
-	BOOL error = FALSE;
-
-	while(((nbytes = file.Read(buffer, sizeof(buffer))) > 0) && !stopping) {
-		// Every block see if someone wants to do something
-		MSG Msg;
-
-		if(::PeekMessage(&Msg, NULL, WM_NULL, WM_USER - 1, PM_NOREMOVE)) {
-   			::PeekMessage(&Msg, NULL, WM_NULL, WM_USER - 1, PM_REMOVE);
-   			TranslateMessage(&Msg);
-   			DispatchMessage(&Msg);
-
-			if((progressBar && progressBar->IsStopPressed()) ||
-			   (Msg.message == WM_QUIT)) {
-				error = TRUE;
-				break;
-			}
-		}
-
-		char buf[81];
-		if(ClamdRecv(commandSocket, buf, sizeof(buf) - 1, 0) > 0) {
-			AfxMessageBox(buf);
-			error = TRUE;
-			break;
-		}
-			
-		if(send(dataSocket, buffer, nbytes, 0) != nbytes) {
-			AfxMessageBox("Send error to clamd");
-			error = TRUE;
-			break;
-		}
-
-		if(progressBar) {
-			bytesSent += nbytes;
-
-			progressBar->SetPercent((int)(bytesSent * 100 / statb.st_size)); 
-		}
-	}
-
-	closesocket(dataSocket);
-	
-	file.Close();
-
-	if(error) {
-		closesocket(commandSocket);
-		stopping = TRUE;
-		if(progressBar && (level == 0)) {
-			delete progressBar;
-			progressBar = NULL;
-		}	
-		return TRUE;
-	}
-
-	nbytes = ClamdRecv(commandSocket, buffer, sizeof(buffer) - 1);
-
-	closesocket(commandSocket);
-
-	if(nbytes < 0) {
-		AfxMessageBox("recv error getting status");
-		return TRUE;
-	} else if(nbytes == 0)
-		return TRUE;
-
-	buffer[nbytes] = '\0';
-
-	if(strstr(buffer, "ERROR") != NULL) {
-		AfxMessageBox(filename + " " + buffer);
-		return TRUE;
-	}
-
-	// TODO: if we're scanning down a directory tree
-	// don't display a popup box - update a dialog box
-	// which tells us how far we are
-	
-	if(strstr(buffer, "FOUND") == NULL)
-		return TRUE;
-	AfxMessageBox(filename + " " + buffer);
-
-	mainFrame->ChangeStatusText(filename + " " + buffer);	// statusBar.ShowProgress
-
-	return FALSE;
-}
-
-BOOL
-ClamServer::ScanFolder(const CString& string, int level, CMainFrame *mainFrame, CWnd *parent, BOOL recursive, const CString& qDir)
-{
-	return ScanWildCard(string + "\\*.*", level, mainFrame, parent, recursive, qDir);
-}
-
-BOOL
-ClamServer::ScanWildCard(const CString& string, int level, CMainFrame *mainFrame, CWnd *parent, BOOL recursive, const CString& qDir)
-{
-	if(stopping)
-		return TRUE;
-
-	WIN32_FIND_DATA findData;
-		
-	HANDLE hFind = FindFirstFile(string, &findData);
-
-	if(hFind == INVALID_HANDLE_VALUE)
-  		// No files in this folder
-  		return TRUE;
-
-	// Get to the filename stub - i.e. the file without the trailing \*.*
-	const int index = string.Find("\\*.*");
-
-	ASSERT(index >= 0);
-
-	const CString stub = string.Left(index);
- 			
-  	BOOL rc = TRUE; 
-
- 	do
-  		//if(findData.dwFileAttributes&FILE_ATTRIBUTE_DIRECTORY)
-   		// Recurse into this folder/file only if recurse enabled
-   			// if(!this->Scan(filename + "\\" + findData.cFileName))
-				// break out as soon as one virus is found
-				// TODO: optionally report all found
-				// return FALSE;
-		if(!this->Scan(stub + "\\" + findData.cFileName, level + 1, mainFrame, parent, recursive, qDir))
-			rc = FALSE;
-	
-  	while(FindNextFile(hFind, &findData) && !stopping);
-
-	if(progressBar && (level == 0)) {
-		delete progressBar;
-		progressBar = NULL;
-	}
-
-	return rc;
-}
-
-/*
- * Read from clamav - timeout if necessary
- * timeout defaults to 30 seconds, -1 = wait forever, 0 = poll
- * TODO: default time should be read from clamav.conf
- */
-int
-ClamServer::ClamdRecv(int sock, char *buf, size_t len, int timeout /* = 30 */)
-{
-	fd_set rfds;
-	struct timeval tv;
-
-    if(timeout == -1)
-    	return recv(sock, buf, len, 0);
-
-    FD_ZERO(&rfds);
-    FD_SET(sock, &rfds);
-
-    tv.tv_sec = timeout;	   // TODO: from clamav.conf
-    tv.tv_usec = 0;
-
-    switch(select(sock + 1, &rfds, NULL, NULL, &tv)) {
-    	case -1:
-        	AfxMessageBox("select failed");
-        	return -1;
-        case 0:
-			if(timeout != 0)
-        		AfxMessageBox("Timeout waiting for data from clamd");
-     		return 0;
-    }
-
-	return recv(sock, buf, len, 0);
-}
-
-// void __cdecl __interrupt __far intFhandler(void) {
-// }
diff --git a/contrib/Windows/Old/clamserver.h b/contrib/Windows/Old/clamserver.h
deleted file mode 100644
index 8b8fbb4..0000000
--- a/contrib/Windows/Old/clamserver.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// Maintains connection to the clamd server
-
-/*
- *  Copyright (C) 2004 Nigel Horne <njh at bandsman.co.uk>
- *
- *  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 Street, Fifth Floor, Boston,
- *  MA 02110-1301, USA.
- */
-#ifndef	_CLAMSERVER_H
-
-#include "mainfrm.h"
-
-class ClamServer {
-
-public:
-	ClamServer(void);
-	ClamServer(CString& serverName, unsigned short port);
-	~ClamServer();
-	BOOL	Scan(const CString& filename, int level, CMainFrame *mainFrame,
-		CWnd *parent, BOOL recursive, const CString& qDir);
-		// returns TRUE if the file is clean
-
-private:
-	BOOL	InitInstance(void);
-	int		CreateConnection(void);
-	const	BOOL	CheckConnection(int sock);
-	BOOL	ClamServer::ScanFolder(const CString& string, int level, CMainFrame *mainFrame,
-		CWnd *parent, BOOL recursive, const CString& qDir);
-	BOOL	ClamServer::ScanWildCard(const CString& string, int level, CMainFrame *mainFrame,
-		CWnd *parent, BOOL recursive, const CString& qDir);
-	int		ClamServer::ClamdRecv(int sock, char *buf, size_t len, int timeout = 30);
-
-	long	serverIP;	// IPv4 address of the clamdserver (only one for now)
-	unsigned short	port;	// host order
-	BOOL	stopping;	// true if the application has been asked to stop
-	CProgress	*progressBar;
-};
-
-#define	_CLAMSERVER_H
-#endif	_CLAMSERVER_H
diff --git a/contrib/Windows/Old/mainfrm.cpp b/contrib/Windows/Old/mainfrm.cpp
deleted file mode 100644
index d6384f4..0000000
--- a/contrib/Windows/Old/mainfrm.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-// mainfrm.cpp : implementation of the CMainFrame class
-//
-
-/*
- *  Copyright (C) 2004 Nigel Horne <njh at bandsman.co.uk>
- *
- *  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 Street, Fifth Floor, Boston,
- *  MA 02110-1301, USA.
- */
-#include "stdafx.h"
-#include "mainfrm.h"
-#include "resource.h"
-#include "clamav.h"
-
-#ifdef _DEBUG
-#undef THIS_FILE
-static char BASED_CODE THIS_FILE[] = __FILE__;
-#endif
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CMainFrame
-
-IMPLEMENT_DYNCREATE(CMainFrame, CFrameWnd)
-
-BEGIN_MESSAGE_MAP(CMainFrame, CFrameWnd)
-	//{{AFX_MSG_MAP(CMainFrame)
-	ON_WM_CREATE()
-	ON_WM_DROPFILES()
-	//}}AFX_MSG_MAP
-	// Global help commands
-	ON_COMMAND(ID_HELP_INDEX, CFrameWnd::OnHelpIndex)
-	ON_COMMAND(ID_HELP_USING, CFrameWnd::OnHelpUsing)
-	ON_COMMAND(ID_HELP, CFrameWnd::OnHelp)
-	ON_COMMAND(ID_CONTEXT_HELP, CFrameWnd::OnContextHelp)
-	ON_COMMAND(ID_DEFAULT_HELP, CFrameWnd::OnHelpIndex)
-END_MESSAGE_MAP()
-
-/////////////////////////////////////////////////////////////////////////////
-// arrays of IDs used to initialize control bars
-	
-// toolbar buttons - IDs are command buttons
-static UINT BASED_CODE buttons[] =
-{
-	// same order as in the bitmap 'toolbar.bmp'
-	ID_FILE_NEW,
-	ID_FILE_OPEN,
-	ID_FILE_SAVE,
-		ID_SEPARATOR,
-	ID_EDIT_CUT,
-	ID_EDIT_COPY,
-	ID_EDIT_PASTE,
-		ID_SEPARATOR,
-	ID_FILE_PRINT,
-	ID_APP_ABOUT,
-	ID_CONTEXT_HELP,
-};
-
-static UINT BASED_CODE indicators[] =
-{
-	ID_SEPARATOR,           // status line indicator
-	ID_INDICATOR_CAPS,
-	ID_INDICATOR_NUM,
-	ID_INDICATOR_SCRL,
-};
-
-/////////////////////////////////////////////////////////////////////////////
-// CMainFrame construction/destruction
-
-CMainFrame::CMainFrame()
-{
-	// TODO: add member initialization code here
-	
-}
-
-CMainFrame::~CMainFrame()
-{
-}
-
-int CMainFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
-{
-	if (CFrameWnd::OnCreate(lpCreateStruct) == -1)
-		return -1;
-
-	
-	if (!m_wndToolBar.Create(this) ||
-		!m_wndToolBar.LoadBitmap(IDR_MAINFRAME) ||
-		!m_wndToolBar.SetButtons(buttons,
-		  sizeof(buttons)/sizeof(UINT)))
-	{
-		TRACE0("Failed to create toolbar\n");
-		return -1;      // fail to create
-	}
-
-	if (!m_wndStatusBar.Create(this) ||
-		!m_wndStatusBar.SetIndicators(indicators,
-		  sizeof(indicators)/sizeof(UINT)))
-	{
-		TRACE0("Failed to create status bar\n");
-		return -1;      // fail to create
-	}
-
-	m_wndToolBar.DestroyWindow();
-#if	0
-	// TODO: Delete these three lines if you don't want the toolbar to
-	//  be dockable
-	m_wndToolBar.EnableDocking(CBRS_ALIGN_ANY);
-	EnableDocking(CBRS_ALIGN_ANY);
-	DockControlBar(&m_wndToolBar);
-
-	// TODO: Remove this if you don't want tool tips
-	m_wndToolBar.SetBarStyle(m_wndToolBar.GetBarStyle() |
-		CBRS_TOOLTIPS | CBRS_FLYBY);
-#endif
-	DragAcceptFiles(TRUE);
-
-	return 0;
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// CMainFrame diagnostics
-
-#ifdef _DEBUG
-void CMainFrame::AssertValid() const
-{
-	CFrameWnd::AssertValid();
-}
-
-void CMainFrame::Dump(CDumpContext& dc) const
-{
-	CFrameWnd::Dump(dc);
-}
-
-#endif //_DEBUG
-
-void
-CMainFrame::ChangeStatusText(const CString &text)
-{
-	m_wndStatusBar.SetWindowText(text);
-}
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CMainFrame message handlers
-
-void CMainFrame::OnDropFiles(HDROP hDropInfo) 
-{
-	// TODO: Add your message handler code here and/or call default
-
-	const int nFiles = ::DragQueryFile(hDropInfo, 0xFFFFFFFF, NULL, 0);
-
-	for(int i = 0; i < nFiles; i++) {
-    	TCHAR filename[_MAX_PATH];
-
-    	::DragQueryFile(hDropInfo, i, filename, _MAX_PATH);
-
-		extern CClamavApp theApp;
-
-		theApp.Scan(filename);
-	}
-
-  	::DragFinish(hDropInfo);
-}
-
diff --git a/contrib/Windows/Old/mainfrm.h b/contrib/Windows/Old/mainfrm.h
deleted file mode 100644
index 180b885..0000000
--- a/contrib/Windows/Old/mainfrm.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// mainfrm.h : interface of the CMainFrame class
-//
-/////////////////////////////////////////////////////////////////////////////
-
-/*
- *  Copyright (C) 2004 Nigel Horne <njh at bandsman.co.uk>
- *
- *  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 Street, Fifth Floor, Boston,
- *  MA 02110-1301, USA.
- */
-#ifndef	_MAINFRM_H
-
-class CMainFrame : public CFrameWnd
-{
-protected: // create from serialization only
-	CMainFrame();
-	DECLARE_DYNCREATE(CMainFrame)
-
-// Attributes
-public:
-
-// Operations
-public:
-	void	ChangeStatusText(const CString &text);
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CMainFrame)
-	//}}AFX_VIRTUAL
-
-// Implementation
-public:
-	virtual ~CMainFrame();
-#ifdef _DEBUG
-	virtual void AssertValid() const;
-	virtual void Dump(CDumpContext& dc) const;
-#endif
-
-protected:  // control bar embedded members
-	CStatusBar  m_wndStatusBar;
-	CToolBar    m_wndToolBar;
-
-// Generated message map functions
-protected:
-	//{{AFX_MSG(CMainFrame)
-	afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
-	afx_msg void OnDropFiles(HDROP hDropInfo);
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
-
-#define	_MAINFRM_H
-#endif	_MAINFRM_H
-
-
-/////////////////////////////////////////////////////////////////////////////
diff --git a/contrib/Windows/Old/options.cpp b/contrib/Windows/Old/options.cpp
deleted file mode 100644
index d6e0a10..0000000
--- a/contrib/Windows/Old/options.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// options.cpp : implementation file
-//
-
-/*
- *  Copyright (C) 2004 Nigel Horne <njh at bandsman.co.uk>
- *
- *  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 Street, Fifth Floor, Boston,
- *  MA 02110-1301, USA.
- */
-#include "stdafx.h"
-#include "clamav.h"
-
-#ifdef _DEBUG
-#undef THIS_FILE
-static char BASED_CODE THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// COptions dialog
-
-
-COptions::COptions(CWnd* pParent /*=NULL*/)
-	: CDialog(COptions::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(COptions)
-	m_recursive = TRUE;
-	m_quarantineDir = _T("");
-	//}}AFX_DATA_INIT
-}
-
-void COptions::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(COptions)
-	DDX_Check(pDX, IDC_RECURSIVE, m_recursive);
-	DDX_Text(pDX, IDC_QUARANTINE, m_quarantineDir);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(COptions, CDialog)
-	//{{AFX_MSG_MAP(COptions)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-
-/////////////////////////////////////////////////////////////////////////////
-// COptions message handlers
diff --git a/contrib/Windows/Old/options.h b/contrib/Windows/Old/options.h
deleted file mode 100644
index e2b31a3..0000000
--- a/contrib/Windows/Old/options.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// options.h : header file
-//
-
-/*
- *  Copyright (C) 2004 Nigel Horne <njh at bandsman.co.uk>
- *
- *  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 Street, Fifth Floor, Boston,
- *  MA 02110-1301, USA.
- */
-/////////////////////////////////////////////////////////////////////////////
-// COptions dialog
-
-class COptions : public CDialog
-{
-// Construction
-public:
-	COptions(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(COptions)
-	enum { IDD = IDD_OPTIONS };
-	BOOL	m_recursive;
-	CString	m_quarantineDir;
-	//}}AFX_DATA
-
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(COptions)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(COptions)
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
diff --git a/contrib/Windows/Old/progress.cpp b/contrib/Windows/Old/progress.cpp
deleted file mode 100644
index da86c4f..0000000
--- a/contrib/Windows/Old/progress.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-// progress.cpp : implementation file
-//
-
-/*
- *  Copyright (C) 2004 Nigel Horne <njh at bandsman.co.uk>
- *
- *  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 Street, Fifth Floor, Boston,
- *  MA 02110-1301, USA.
- */
-#include "stdafx.h"
-#include "clamav.h"
-
-#include "progress.h"
-
-#ifdef _DEBUG
-#undef THIS_FILE
-static char BASED_CODE THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// CProgress dialog
-
-
-CProgress::CProgress(CWnd* pParent)
-	: CDialog(CProgress::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(CProgress)
-	m_filename = _T("bar");
-	m_percent = _T("");
-	//}}AFX_DATA_INIT
-	stopPressed = FALSE;
-}
-
-
-void CProgress::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(CProgress)
-	DDX_Text(pDX, IDC_FileName, m_filename);
-	DDX_Text(pDX, IDC_Percent, m_percent);
-	//}}AFX_DATA_MAP
-}
-
-void
-CProgress::SetFilename(const CString& filename)
-{
-	if(stopPressed)
-		return;
-
-	m_filename = _T(filename);
-
-	CStatic *text = (CStatic *)GetDlgItem(IDC_FileName);
-	if(text) {
-		text->SetWindowText(filename);
-		// text->UpdateWindow();
-		percent = -1;	// force a display when it changes
-	} else
-		AfxMessageBox("Can't find IDC_FileName");
-}
-
-void
-CProgress::SetPercent(int p)
-{
-	if((p < 0) || (p > 100))
-		return;
-
-	if(p == percent)
-		return;
-
-	char buf[5];
-	sprintf(buf, "%d%%", p);
-
-	CStatic *text = (CStatic *)GetDlgItem(IDC_Percent);
-	if(text) {
-		text->SetWindowText(buf);
-		// text->UpdateWindow();
-		percent = p;
-	} else
-		AfxMessageBox("Can't find IDC_Percent");
-}	
-
-const BOOL
-CProgress::IsStopPressed(void)
-{
-	return stopPressed;
-}
-
-BEGIN_MESSAGE_MAP(CProgress, CDialog)
-	//{{AFX_MSG_MAP(CProgress)
-	ON_BN_CLICKED(IDSTOP, OnStop)
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CProgress message handlers
-
-void CProgress::OnStop() 
-{
-	// TODO: Add your control notification handler code here
-	stopPressed = TRUE;
-
-	CButton *stopButton = (CButton *)GetDlgItem(IDSTOP);
-	if(stopButton)
-		stopButton->EnableWindow(FALSE);
-}
diff --git a/contrib/Windows/Old/progress.h b/contrib/Windows/Old/progress.h
deleted file mode 100644
index 2484b76..0000000
--- a/contrib/Windows/Old/progress.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// progress.h : header file
-//
-
-/*
- *  Copyright (C) 2004 Nigel Horne <njh at bandsman.co.uk>
- *
- *  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 Street, Fifth Floor, Boston,
- *  MA 02110-1301, USA.
- */
-/////////////////////////////////////////////////////////////////////////////
-// CProgress dialog
-
-#ifndef	_PROGRESS_H
-
-class CProgress : public CDialog
-{
-// Construction
-public:
-	CProgress(CWnd* pParent = NULL);
-
-	void	SetFilename(const CString& filename);
-	const	BOOL IsStopPressed(void);
-	void	SetPercent(int percent);
-
-// Dialog Data
-	//{{AFX_DATA(CProgress)
-	enum { IDD = IDD_PROGRESS };
-	CString	m_filename;
-	CString	m_percent;
-	//}}AFX_DATA
-
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(CProgress)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(CProgress)
-	afx_msg void OnStop();
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-
-private:
-	BOOL	stopPressed;
-	int		percent;
-};
-
-#define	_PROGRESS_H
-#endif	_PROGRESS_H
diff --git a/contrib/Windows/Old/readme.txt b/contrib/Windows/Old/readme.txt
deleted file mode 100644
index 641f1a8..0000000
--- a/contrib/Windows/Old/readme.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-This is a small Windows client for ClamAV that I hope will turn into
-something bigger with time.
-
-Since it's so early I'm only releasing the Debug version (you'll need to
-install the MFC Debug libary in \windows\system32 if you don't already
-have it) and am yet to release the source code.
-
-You will need a clamd server machine where the clamd daemon is listening
-on port 3310. When firing up the Windows client you will be asked to
-enter in the hostname/IPv4 address of the clamd server. Once you have done
-that simply drag 'n' drop files or folders on to the program, they will
-then be scanned for viruses.
-
-I only have an old copy of Visual C/C++ (version 2), so I can only accept
-patches compatible with that version.
-
-Nigel Horne njh at bandsman.co.uk
-
-29/01/04
-
------------------------------
-
-23/2/04
-Version 0.14
-Handles the ERROR status from clamd
-----------------------------------
-10/2/04
-The file mfc30d.dll has been removed. Most Windows distributions will already
-have it - if not please get it from http://www.clamav.net/w32/mfc30d.zip,
-you will need it to run the clamAV windows client
-----------------------------------
-10/2/04
-Version 0.13
-Recovers better from errors during scanning such as timeouts sending to clamd
-----------------------------------
-9/2/04
-Version 0.12
-The port of the clamd server can now be specified. The default value is 3310.
-When running from the CLI use the form server[:port] when specifying the
-server.
-----------------------------------
-5/2/04
-Version 0.11
-Now integrates with WinZip. To configure WinZip8.1 to use ClamAV as it's
-antivirus:
-	Open options->configuration->program locations
-	In optional virus scanner, enter the full path of clamav.exe
-	In the parameters field enter the IP address of the clamd server
-----------------------------------
-2/2/04
-Added a command line interface. This allows the client to be used either
-in conjunction with download managers which often ask users to specify
-a CLI to a AV system to scan files that have been downloaded. It also
-allows a full system scan to be done either manually or via the Windows
-scheduler, for example
-	clamav.exe 192.168.1.1 eicar.com
-	clamav.exe 192.168.1.1 c:\
diff --git a/contrib/Windows/Old/res/clamav.ico b/contrib/Windows/Old/res/clamav.ico
deleted file mode 100644
index d1f0837..0000000
Binary files a/contrib/Windows/Old/res/clamav.ico and /dev/null differ
diff --git a/contrib/Windows/Old/res/clamav.rc2 b/contrib/Windows/Old/res/clamav.rc2
deleted file mode 100644
index 23de8ca..0000000
--- a/contrib/Windows/Old/res/clamav.rc2
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-// CLAMAV.RC2 - resources Microsoft Visual C++ does not edit directly
-//
-
-#ifdef APSTUDIO_INVOKED
-	#error this file is not editable by Microsoft Visual C++
-#endif //APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-// Add manually edited resources here...
-
-/////////////////////////////////////////////////////////////////////////////
diff --git a/contrib/Windows/Old/res/toolbar.bmp b/contrib/Windows/Old/res/toolbar.bmp
deleted file mode 100644
index 0556e00..0000000
Binary files a/contrib/Windows/Old/res/toolbar.bmp and /dev/null differ
diff --git a/contrib/Windows/Old/resource.h b/contrib/Windows/Old/resource.h
deleted file mode 100644
index 5fa1760..0000000
--- a/contrib/Windows/Old/resource.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- *  Copyright (C) 2004 Nigel Horne <njh at bandsman.co.uk>
- *
- *  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 Street, Fifth Floor, Boston,
- *  MA 02110-1301, USA.
- */
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by clamav.rc
-//
-#define IDD_ABOUTBOX                    100
-#define IDR_MAINFRAME                   128
-#define IDD_SERVERNAME                  130
-#define IDD_PROGRESS                    131
-#define IDD_OPTIONS                     132
-#define IDC_SERVERNAME                  1000
-#define IDSTOP                          1001
-#define IDC_FileName                    1002
-#define IDC_Percent                     1003
-#define IDC_RECURSIVE                   1004
-#define IDC_QUARANTINE                  1005
-#define IDC_SERVERPORT                  1006
-#define ID_SET_OPTIONS                  32771
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        133
-#define _APS_NEXT_COMMAND_VALUE         32772
-#define _APS_NEXT_CONTROL_VALUE         1007
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/contrib/Windows/Old/servername.cpp b/contrib/Windows/Old/servername.cpp
deleted file mode 100644
index b9f88ca..0000000
--- a/contrib/Windows/Old/servername.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-// servername.cpp : implementation file
-//
-
-/*
- *  Copyright (C) 2004 Nigel Horne <njh at bandsman.co.uk>
- *
- *  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 Street, Fifth Floor, Boston,
- *  MA 02110-1301, USA.
- */
-#include "stdafx.h"
-#include "clamav.h"
-#include "servername.h"
-
-#ifdef _DEBUG
-#undef THIS_FILE
-static char BASED_CODE THIS_FILE[] = __FILE__;
-#endif
-
-/////////////////////////////////////////////////////////////////////////////
-// ServerName dialog
-
-
-ServerName::ServerName(CWnd* pParent /*=NULL*/)
-	: CDialog(ServerName::IDD, pParent)
-{
-	//{{AFX_DATA_INIT(ServerName)
-	m_serverName = _T("");
-	m_port = DEFAULT_PORT;
-	//}}AFX_DATA_INIT
-}
-
-
-void ServerName::DoDataExchange(CDataExchange* pDX)
-{
-	CDialog::DoDataExchange(pDX);
-	//{{AFX_DATA_MAP(ServerName)
-	DDX_Text(pDX, IDC_SERVERNAME, m_serverName);
-	DDV_MaxChars(pDX, m_serverName, 20);
-	DDX_Text(pDX, IDC_SERVERPORT, m_port);
-	DDV_MinMaxUInt(pDX, m_port, 1, 65535);
-	//}}AFX_DATA_MAP
-}
-
-
-BEGIN_MESSAGE_MAP(ServerName, CDialog)
-	//{{AFX_MSG_MAP(ServerName)
-		// NOTE: the ClassWizard will add message map macros here
-	//}}AFX_MSG_MAP
-END_MESSAGE_MAP()
-
-
-/////////////////////////////////////////////////////////////////////////////
-// ServerName message handlers
diff --git a/contrib/Windows/Old/servername.h b/contrib/Windows/Old/servername.h
deleted file mode 100644
index 6b548df..0000000
--- a/contrib/Windows/Old/servername.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// servername.h : header file
-//
-
-/*
- *  Copyright (C) 2004 Nigel Horne <njh at bandsman.co.uk>
- *
- *  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 Street, Fifth Floor, Boston,
- *  MA 02110-1301, USA.
- */
-#include "resource.h"       // main symbols
-
-/////////////////////////////////////////////////////////////////////////////
-// ServerName dialog
-
-class ServerName : public CDialog
-{
-// Construction
-public:
-	ServerName(CWnd* pParent = NULL);   // standard constructor
-
-// Dialog Data
-	//{{AFX_DATA(ServerName)
-	enum { IDD = IDD_SERVERNAME };
-	CString	m_serverName;
-	UINT	m_port;
-	//}}AFX_DATA
-
-
-// Overrides
-	// ClassWizard generated virtual function overrides
-	//{{AFX_VIRTUAL(ServerName)
-	protected:
-	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV support
-	//}}AFX_VIRTUAL
-
-// Implementation
-protected:
-
-	// Generated message map functions
-	//{{AFX_MSG(ServerName)
-		// NOTE: the ClassWizard will add member functions here
-	//}}AFX_MSG
-	DECLARE_MESSAGE_MAP()
-};
diff --git a/contrib/Windows/Projects/clamAV/clamconf/clamconf.vcproj b/contrib/Windows/Projects/clamAV/clamconf/clamconf.vcproj
deleted file mode 100755
index 5af6553..0000000
--- a/contrib/Windows/Projects/clamAV/clamconf/clamconf.vcproj
+++ /dev/null
@@ -1,265 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="clamconf"
-	ProjectGUID="{0AA6E5C4-591E-4244-9E1C-FDEA4BBE39F9}"
-	RootNamespace="clamconf"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				UseUnicodeResponseFiles="false"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..&quot;;&quot;$(ProjectDir)..\libclamav\pthread&quot;;&quot;$(ProjectDir)..\shared&quot;;&quot;$(ProjectDir)..\libclamav&quot;"
-				PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB;CL_NOTHREADS"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalOptions="/SAFESEH"
-				AdditionalDependencies="&quot;$(TargetDir)\libclamav.lib&quot; ws2_32.lib"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				UseUnicodeResponseFiles="false"
-				UseFAT32Workaround="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..&quot;;&quot;$(ProjectDir)..\libclamav\pthread&quot;;&quot;$(ProjectDir)..\shared&quot;;&quot;$(ProjectDir)..\libclamav&quot;"
-				PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB;CL_NOTHREADS"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalOptions="/SAFESEH"
-				AdditionalDependencies="&quot;$(TargetDir)\libclamav.lib&quot; ws2_32.lib"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				UseUnicodeResponseFiles="false"
-				UseFAT32Workaround="true"
-			/>
-			<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="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\shared\cfgparser.c"
-				>
-			</File>
-			<File
-				RelativePath=".\clamconf.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\shared\getopt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\misc.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			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=".\clamconf.rc"
-				>
-			</File>
-			<File
-				RelativePath=".\icon1.ico"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/contrib/Windows/Projects/clamAV/clamconf/clamconf.vcproj.NJH.Nigel Horne.user b/contrib/Windows/Projects/clamAV/clamconf/clamconf.vcproj.NJH.Nigel Horne.user
deleted file mode 100755
index 74f121f..0000000
--- a/contrib/Windows/Projects/clamAV/clamconf/clamconf.vcproj.NJH.Nigel Horne.user	
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="8.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NJH"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NJH"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>
diff --git a/contrib/Windows/Projects/clamAV/clamconf/stdafx.cpp b/contrib/Windows/Projects/clamAV/clamconf/stdafx.cpp
deleted file mode 100755
index b371e80..0000000
--- a/contrib/Windows/Projects/clamAV/clamconf/stdafx.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// stdafx.cpp : source file that includes just the standard includes
-// clamconf.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/contrib/Windows/Projects/clamAV/clamconf/stdafx.h b/contrib/Windows/Projects/clamAV/clamconf/stdafx.h
deleted file mode 100755
index 83cd4a7..0000000
--- a/contrib/Windows/Projects/clamAV/clamconf/stdafx.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
-#pragma once
-
-
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-#include <stdio.h>
-#include <tchar.h>
-
-
-
-// TODO: reference additional headers your program requires here
diff --git a/contrib/Windows/Projects/clamAV/clamd/clamd.vcproj b/contrib/Windows/Projects/clamAV/clamd/clamd.vcproj
deleted file mode 100755
index 1b50492..0000000
--- a/contrib/Windows/Projects/clamAV/clamd/clamd.vcproj
+++ /dev/null
@@ -1,381 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="clamd"
-	ProjectGUID="{F4366EC9-06FC-446B-B3EF-4D26C6860810}"
-	RootNamespace="clamd"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				UseUnicodeResponseFiles="false"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\libclamav\pthread&quot;;&quot;$(ProjectDir)..\shared&quot;;&quot;$(ProjectDir)..\libclamav&quot;;&quot;$(ProjectDir)..&quot;"
-				PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB;_USE_32BIT_TIME_T"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalOptions="/SAFESEH"
-				AdditionalDependencies="&quot;$(TargetDir)\libclamav.lib&quot; ws2_32.lib"
-				Version="0.92"
-				LinkIncremental="2"
-				GenerateManifest="true"
-				DelayLoadDLLs=""
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-				CLRThreadAttribute="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				UseUnicodeResponseFiles="false"
-				UseFAT32Workaround="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\libclamav\pthread&quot;;&quot;$(ProjectDir)..\shared&quot;;&quot;$(ProjectDir)..\libclamav&quot;;&quot;$(ProjectDir)..&quot;"
-				PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB;_USE_32BIT_TIME_T"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalOptions="/SAFESEH"
-				AdditionalDependencies="&quot;$(TargetDir)\libclamav.lib&quot; ws2_32.lib"
-				Version="0.92"
-				LinkIncremental="1"
-				GenerateManifest="true"
-				DelayLoadDLLs=""
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-				CLRThreadAttribute="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				UseUnicodeResponseFiles="false"
-				UseFAT32Workaround="true"
-			/>
-			<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="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\shared\cfgparser.c"
-				>
-			</File>
-			<File
-				RelativePath=".\clamd.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\clamuko.c"
-				>
-			</File>
-			<File
-				RelativePath=".\dazukoio.c"
-				>
-			</File>
-			<File
-				RelativePath=".\dazukoio_compat12.c"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\getopt.c"
-				>
-			</File>
-			<File
-				RelativePath=".\localserver.c"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\misc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\network.c"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\options.c"
-				>
-			</File>
-			<File
-				RelativePath=".\others.c"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\output.c"
-				>
-			</File>
-			<File
-				RelativePath=".\scanner.c"
-				>
-			</File>
-			<File
-				RelativePath=".\server-th.c"
-				>
-			</File>
-			<File
-				RelativePath=".\session.c"
-				>
-			</File>
-			<File
-				RelativePath=".\tcpserver.c"
-				>
-			</File>
-			<File
-				RelativePath=".\thrmgr.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\clamuko.h"
-				>
-			</File>
-			<File
-				RelativePath=".\dazuko_xp.h"
-				>
-			</File>
-			<File
-				RelativePath=".\dazukoio.h"
-				>
-			</File>
-			<File
-				RelativePath=".\dazukoio_compat12.h"
-				>
-			</File>
-			<File
-				RelativePath=".\dazukoio_xp.h"
-				>
-			</File>
-			<File
-				RelativePath=".\localserver.h"
-				>
-			</File>
-			<File
-				RelativePath=".\others.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource1.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource2.h"
-				>
-			</File>
-			<File
-				RelativePath=".\scanner.h"
-				>
-			</File>
-			<File
-				RelativePath=".\server.h"
-				>
-			</File>
-			<File
-				RelativePath=".\session.h"
-				>
-			</File>
-			<File
-				RelativePath=".\shared.h"
-				>
-			</File>
-			<File
-				RelativePath=".\tcpserver.h"
-				>
-			</File>
-			<File
-				RelativePath=".\thrmgr.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			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="..\libclamav\eventlog.rc"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/contrib/Windows/Projects/clamAV/clamd/clamd.vcproj.NJH.Nigel Horne.user b/contrib/Windows/Projects/clamAV/clamd/clamd.vcproj.NJH.Nigel Horne.user
deleted file mode 100755
index 192dd15..0000000
--- a/contrib/Windows/Projects/clamAV/clamd/clamd.vcproj.NJH.Nigel Horne.user	
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="8.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory="C:\Program Files\clamAV"
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NJH"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor="0"
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory="C:\Program Files\clamAV"
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NJH"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor="0"
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>
diff --git a/contrib/Windows/Projects/clamAV/clamd/stdafx.cpp b/contrib/Windows/Projects/clamAV/clamd/stdafx.cpp
deleted file mode 100755
index 9f5f8cd..0000000
--- a/contrib/Windows/Projects/clamAV/clamd/stdafx.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// stdafx.cpp : source file that includes just the standard includes
-// clamd.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/contrib/Windows/Projects/clamAV/clamd/stdafx.h b/contrib/Windows/Projects/clamAV/clamd/stdafx.h
deleted file mode 100755
index 83cd4a7..0000000
--- a/contrib/Windows/Projects/clamAV/clamd/stdafx.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
-#pragma once
-
-
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-#include <stdio.h>
-#include <tchar.h>
-
-
-
-// TODO: reference additional headers your program requires here
diff --git a/contrib/Windows/Projects/clamAV/clamdscan/clamdscan.vcproj b/contrib/Windows/Projects/clamAV/clamdscan/clamdscan.vcproj
deleted file mode 100755
index b92062e..0000000
--- a/contrib/Windows/Projects/clamAV/clamdscan/clamdscan.vcproj
+++ /dev/null
@@ -1,277 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="clamdscan"
-	ProjectGUID="{EC04092E-8906-4CED-AC2D-B72EC9A4CCD2}"
-	RootNamespace="clamdscan"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				UseUnicodeResponseFiles="false"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\clamscan&quot;;&quot;$(ProjectDir)..\libclamav\pthread&quot;;&quot;$(ProjectDir)..\shared&quot;;&quot;$(ProjectDir)..\libclamav&quot;;&quot;$(ProjectDir)..&quot;"
-				PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB;_USE_32BIT_TIME_T"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalOptions="/SAFESEH"
-				AdditionalDependencies="&quot;$(TargetDir)\libclamav.lib&quot; ws2_32.lib"
-				Version="0.0.1"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-				CLRThreadAttribute="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				UseUnicodeResponseFiles="false"
-				UseFAT32Workaround="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\clamscan&quot;;&quot;$(ProjectDir)..\libclamav\pthread&quot;;&quot;$(ProjectDir)..\shared&quot;;&quot;$(ProjectDir)..\libclamav&quot;;&quot;$(ProjectDir)..&quot;"
-				PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB;_USE_32BIT_TIME_T"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalOptions="/SAFESEH"
-				AdditionalDependencies="&quot;$(TargetDir)\libclamav.lib&quot; ws2_32.lib"
-				Version="0.0.1"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-				CLRThreadAttribute="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				UseUnicodeResponseFiles="false"
-				UseFAT32Workaround="true"
-			/>
-			<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="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\shared\cfgparser.c"
-				>
-			</File>
-			<File
-				RelativePath=".\clamdscan.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\client.c"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\getopt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\misc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\options.c"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\output.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\client.h"
-				>
-			</File>
-			<File
-				RelativePath=".\defaults.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			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}"
-			>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/contrib/Windows/Projects/clamAV/clamdscan/clamdscan.vcproj.NJH.Nigel Horne.user b/contrib/Windows/Projects/clamAV/clamdscan/clamdscan.vcproj.NJH.Nigel Horne.user
deleted file mode 100755
index 74f121f..0000000
--- a/contrib/Windows/Projects/clamAV/clamdscan/clamdscan.vcproj.NJH.Nigel Horne.user	
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="8.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NJH"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NJH"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>
diff --git a/contrib/Windows/Projects/clamAV/clamdscan/stdafx.cpp b/contrib/Windows/Projects/clamAV/clamdscan/stdafx.cpp
deleted file mode 100755
index 38afe15..0000000
--- a/contrib/Windows/Projects/clamAV/clamdscan/stdafx.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// stdafx.cpp : source file that includes just the standard includes
-// clamdscan.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/contrib/Windows/Projects/clamAV/clamdscan/stdafx.h b/contrib/Windows/Projects/clamAV/clamdscan/stdafx.h
deleted file mode 100755
index 83cd4a7..0000000
--- a/contrib/Windows/Projects/clamAV/clamdscan/stdafx.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
-#pragma once
-
-
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-#include <stdio.h>
-#include <tchar.h>
-
-
-
-// TODO: reference additional headers your program requires here
diff --git a/contrib/Windows/Projects/clamAV/clamscan/clamscan.vcproj b/contrib/Windows/Projects/clamAV/clamscan/clamscan.vcproj
deleted file mode 100755
index fab8933..0000000
--- a/contrib/Windows/Projects/clamAV/clamscan/clamscan.vcproj
+++ /dev/null
@@ -1,352 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="clamscan"
-	ProjectGUID="{D65C58D2-FA9B-4D48-BC87-E5B73500C40F}"
-	RootNamespace="clamscan"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				UseUnicodeResponseFiles="false"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\libclamav\pthread&quot;;&quot;$(ProjectDir)..\shared&quot;;&quot;$(ProjectDir)..\libclamav&quot;;&quot;$(ProjectDir)..&quot;;&quot;$(ProjectDir)..\libclamav\regex&quot;"
-				PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB;_DEBUG;_USE_32BIT_TIME_T"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				StructMemberAlignment="0"
-				DisableLanguageExtensions="false"
-				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalOptions="/SAFESEH"
-				AdditionalDependencies="&quot;$(TargetDir)\libclamav.lib&quot; ws2_32.lib "
-				OutputFile="$(OutDir)\$(ProjectName).exe"
-				Version="0.1"
-				LinkIncremental="2"
-				AdditionalLibraryDirectories=""
-				GenerateManifest="true"
-				DelayLoadDLLs=""
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-				CLRThreadAttribute="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				UseUnicodeResponseFiles="false"
-				UseFAT32Workaround="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\libclamav\pthread&quot;;&quot;$(ProjectDir)..\shared&quot;;&quot;$(ProjectDir)..\libclamav&quot;;&quot;$(ProjectDir)..&quot;;&quot;$(ProjectDir)..\libclamav\regex&quot;"
-				PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB;_USE_32BIT_TIME_T"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				StructMemberAlignment="3"
-				DisableLanguageExtensions="false"
-				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalOptions="/SAFESEH"
-				AdditionalDependencies="&quot;$(TargetDir)\libclamav.lib&quot; ws2_32.lib "
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-				CLRThreadAttribute="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				UseUnicodeResponseFiles="false"
-				UseFAT32Workaround="true"
-			/>
-			<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="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\shared\cfgparser.c"
-				>
-			</File>
-			<File
-				RelativePath=".\clamscan.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\shared\getopt.c"
-				>
-			</File>
-			<File
-				RelativePath=".\manager.c"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\misc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\options.c"
-				>
-			</File>
-			<File
-				RelativePath=".\others.c"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\output.c"
-				>
-			</File>
-			<File
-				RelativePath=".\treewalk.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\shared\cfgparser.h"
-				>
-			</File>
-			<File
-				RelativePath=".\clamscan_opt.h"
-				>
-			</File>
-			<File
-				RelativePath=".\defaults.h"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\getopt.h"
-				>
-			</File>
-			<File
-				RelativePath=".\global.h"
-				>
-			</File>
-			<File
-				RelativePath=".\manager.h"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\memory.h"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\misc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\options.h"
-				>
-			</File>
-			<File
-				RelativePath=".\others.h"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\output.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource1.h"
-				>
-			</File>
-			<File
-				RelativePath=".\shared.h"
-				>
-			</File>
-			<File
-				RelativePath=".\treewalk.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			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=".\clamdscan.rc"
-				>
-			</File>
-			<File
-				RelativePath=".\icon1.ico"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/contrib/Windows/Projects/clamAV/clamscan/clamscan.vcproj.NJH.Nigel Horne.user b/contrib/Windows/Projects/clamAV/clamscan/clamscan.vcproj.NJH.Nigel Horne.user
deleted file mode 100755
index e0de946..0000000
--- a/contrib/Windows/Projects/clamAV/clamscan/clamscan.vcproj.NJH.Nigel Horne.user	
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="8.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments="--tempdir=d:\temp -r -i d:\clamav-test"
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NJH"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor="0"
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments="--tempdir=d:\temp -r -i d:\"
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NJH"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor="0"
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>
diff --git a/contrib/Windows/Projects/clamAV/clamscan/stdafx.cpp b/contrib/Windows/Projects/clamAV/clamscan/stdafx.cpp
deleted file mode 100755
index 61f90ba..0000000
--- a/contrib/Windows/Projects/clamAV/clamscan/stdafx.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// stdafx.cpp : source file that includes just the standard includes
-// clamscan.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/contrib/Windows/Projects/clamAV/clamscan/stdafx.h b/contrib/Windows/Projects/clamAV/clamscan/stdafx.h
deleted file mode 100755
index 83cd4a7..0000000
--- a/contrib/Windows/Projects/clamAV/clamscan/stdafx.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
-#pragma once
-
-
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-#include <stdio.h>
-#include <tchar.h>
-
-
-
-// TODO: reference additional headers your program requires here
diff --git a/contrib/Windows/Projects/clamAV/freshclam/freshclam.rc b/contrib/Windows/Projects/clamAV/freshclam/freshclam.rc
deleted file mode 100755
index 821d3b2..0000000
--- a/contrib/Windows/Projects/clamAV/freshclam/freshclam.rc
+++ /dev/null
@@ -1,72 +0,0 @@
-// Microsoft Visual C++ generated resource script.
-//
-#include "resource.h"
-
-#define APSTUDIO_READONLY_SYMBOLS
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 2 resource.
-//
-#include "afxres.h"
-
-/////////////////////////////////////////////////////////////////////////////
-#undef APSTUDIO_READONLY_SYMBOLS
-
-/////////////////////////////////////////////////////////////////////////////
-// English (U.K.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
-#ifdef _WIN32
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
-#pragma code_page(1252)
-#endif //_WIN32
-
-#ifdef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// TEXTINCLUDE
-//
-
-1 TEXTINCLUDE 
-BEGIN
-    "resource.h\0"
-END
-
-2 TEXTINCLUDE 
-BEGIN
-    "#include ""afxres.h""\r\n"
-    "\0"
-END
-
-3 TEXTINCLUDE 
-BEGIN
-    "\r\n"
-    "\0"
-END
-
-#endif    // APSTUDIO_INVOKED
-
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// Icon
-//
-
-// Icon with lowest ID value placed first to ensure application icon
-// remains consistent on all systems.
-IDI_ICON1               ICON                    "icon1.ico"
-#endif    // English (U.K.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-
-#ifndef APSTUDIO_INVOKED
-/////////////////////////////////////////////////////////////////////////////
-//
-// Generated from the TEXTINCLUDE 3 resource.
-//
-
-
-/////////////////////////////////////////////////////////////////////////////
-#endif    // not APSTUDIO_INVOKED
-
diff --git a/contrib/Windows/Projects/clamAV/freshclam/freshclam.vcproj b/contrib/Windows/Projects/clamAV/freshclam/freshclam.vcproj
deleted file mode 100755
index 9027ed8..0000000
--- a/contrib/Windows/Projects/clamAV/freshclam/freshclam.vcproj
+++ /dev/null
@@ -1,335 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="freshclam"
-	ProjectGUID="{EDA439D9-1896-444B-871D-C78D372AAC43}"
-	RootNamespace="freshclam"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				UseUnicodeResponseFiles="false"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\libclamav\pthread&quot;;&quot;$(ProjectDir)..\shared&quot;;&quot;$(ProjectDir)..\libclamav&quot;;&quot;$(ProjectDir)..&quot;"
-				PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB;CL_NOTHREADS;_USE_32BIT_TIME_T"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalOptions="/SAFESEH"
-				AdditionalDependencies="dnsapi.lib ws2_32.lib &quot;$(TargetDir)\libclamav.lib&quot;"
-				Version="0.92"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-				CLRThreadAttribute="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				UseUnicodeResponseFiles="false"
-				UseFAT32Workaround="true"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\libclamav\pthread&quot;;&quot;$(ProjectDir)..\shared&quot;;&quot;$(ProjectDir)..\libclamav&quot;;&quot;$(ProjectDir)..&quot;"
-				PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB;CL_NOTHREADS;_USE_32BIT_TIME_T"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalOptions="/SAFESEH"
-				AdditionalDependencies="dnsapi.lib ws2_32.lib &quot;$(TargetDir)\libclamav.lib&quot;"
-				Version="0.92"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-				CLRThreadAttribute="0"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-				UseUnicodeResponseFiles="false"
-				UseFAT32Workaround="true"
-			/>
-			<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="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\shared\cdiff.c"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\cfgparser.c"
-				>
-			</File>
-			<File
-				RelativePath=".\dns.c"
-				>
-			</File>
-			<File
-				RelativePath=".\execute.c"
-				>
-			</File>
-			<File
-				RelativePath=".\freshclam.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\shared\getopt.c"
-				>
-			</File>
-			<File
-				RelativePath=".\manager.c"
-				>
-			</File>
-			<File
-				RelativePath=".\mirman.c"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\misc.c"
-				>
-			</File>
-			<File
-				RelativePath=".\nonblock.c"
-				>
-			</File>
-			<File
-				RelativePath=".\notify.c"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\options.c"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\output.c"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\tar.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\dns.h"
-				>
-			</File>
-			<File
-				RelativePath=".\execute.h"
-				>
-			</File>
-			<File
-				RelativePath=".\manager.h"
-				>
-			</File>
-			<File
-				RelativePath=".\mirman.h"
-				>
-			</File>
-			<File
-				RelativePath=".\nonblock.h"
-				>
-			</File>
-			<File
-				RelativePath=".\notify.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-			<File
-				RelativePath="..\shared\tar.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			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=".\freshclam.rc"
-				>
-			</File>
-			<File
-				RelativePath="..\libclamav\clamAV.ico"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/contrib/Windows/Projects/clamAV/freshclam/freshclam.vcproj.NJH.Nigel Horne.user b/contrib/Windows/Projects/clamAV/freshclam/freshclam.vcproj.NJH.Nigel Horne.user
deleted file mode 100755
index 74f121f..0000000
--- a/contrib/Windows/Projects/clamAV/freshclam/freshclam.vcproj.NJH.Nigel Horne.user	
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="8.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NJH"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NJH"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>
diff --git a/contrib/Windows/Projects/clamAV/freshclam/icon1.ico b/contrib/Windows/Projects/clamAV/freshclam/icon1.ico
deleted file mode 100755
index f84aef6..0000000
Binary files a/contrib/Windows/Projects/clamAV/freshclam/icon1.ico and /dev/null differ
diff --git a/contrib/Windows/Projects/clamAV/freshclam/resource.h b/contrib/Windows/Projects/clamAV/freshclam/resource.h
deleted file mode 100755
index 0203a8c..0000000
--- a/contrib/Windows/Projects/clamAV/freshclam/resource.h
+++ /dev/null
@@ -1,16 +0,0 @@
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by freshclam.rc
-//
-#define IDI_ICON1                       101
-
-// Next default values for new objects
-// 
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        102
-#define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1001
-#define _APS_NEXT_SYMED_VALUE           101
-#endif
-#endif
diff --git a/contrib/Windows/Projects/clamAV/freshclam/stdafx.cpp b/contrib/Windows/Projects/clamAV/freshclam/stdafx.cpp
deleted file mode 100755
index 489fbe4..0000000
--- a/contrib/Windows/Projects/clamAV/freshclam/stdafx.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// stdafx.cpp : source file that includes just the standard includes
-// freshclam.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/contrib/Windows/Projects/clamAV/freshclam/stdafx.h b/contrib/Windows/Projects/clamAV/freshclam/stdafx.h
deleted file mode 100755
index 83cd4a7..0000000
--- a/contrib/Windows/Projects/clamAV/freshclam/stdafx.h
+++ /dev/null
@@ -1,15 +0,0 @@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
-#pragma once
-
-
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-#include <stdio.h>
-#include <tchar.h>
-
-
-
-// TODO: reference additional headers your program requires here
diff --git a/contrib/Windows/Projects/clamAV/libclamav/clamav-config.h b/contrib/Windows/Projects/clamAV/libclamav/clamav-config.h
deleted file mode 100644
index 7fc6b30..0000000
--- a/contrib/Windows/Projects/clamAV/libclamav/clamav-config.h
+++ /dev/null
@@ -1,391 +0,0 @@
-/* clamav-config.h.  Generated from clamav-config.h.in by configure.  */
-/* clamav-config.h.in.  Generated from configure.in by autoheader.  */
-
-/* enable bind8 compatibility */
-/* #undef BIND_8_COMPAT */
-
-/* Define if your snprintf is busted */
-#define BROKEN_SNPRINTF	1	/* Use the one in snprintf.h */
-
-/* "build clamd" */
-#define BUILD_CLAMD 1
-
-/* name of the clamav group */
-#define CLAMAVGROUP "clamav"
-
-/* name of the clamav user */
-#define CLAMAVUSER "clamav"
-
-/* enable clamuko */
-/* #undef CLAMUKO */
-
-/* enable debugging */
-/* #undef CL_DEBUG */
-
-/* enable experimental code */
-/*#undef CL_EXPERIMENTAL*/
-
-/* thread safe */
-#define CL_THREAD_SAFE 1
-
-/* where to look for the config file */
-/* Note: on Windows, the installer can change this! */
-#define	CONFDIR	"C:\\Program Files\\clamAV\\conf"
-
-/* os is aix */
-/* #undef C_AIX */
-
-/* os is beos */
-/* #undef C_BEOS */
-
-/* Increase thread stack size. */
-/* #undef C_BIGSTACK */
-
-/* os is bsd flavor */
-/* #undef C_BSD */
-
-/* os is cygwin */
-/* #undef C_CYGWIN 1 */
-
-/* os is darwin */
-/* #undef C_DARWIN */
-
-/* os is hpux */
-/* #undef C_HPUX */
-
-/* os is interix */
-/* #undef C_INTERIX */
-
-/* os is irix */
-/* #undef C_IRIX */
-
-/* target is linux */
-/* #undef C_LINUX */
-
-/* os is OS/2 */
-/* #undef C_OS2 */
-
-/* os is QNX 6.x.x */
-/* #undef C_QNX6 */
-
-/* os is solaris */
-/* #undef C_SOLARIS */
-
-/* os is windows */
-#ifdef	_MSC_VER
-#define	C_WINDOWS	1
-#endif
-
-/* Path to virus database directory. */
-/* Note: on Windows, the installer can change this! */
-#define	DATADIR	"C:\\Program Files\\clamAV\\data"
-
-/* Name of the main database */
-#define DB1NAME "main.cvd"
-
-/* Name of the daily database */
-#define DB2NAME "daily.cvd"
-
-/* "default FD_SETSIZE value" */
-#define DEFAULT_FD_SETSIZE 64
-
-/* link with libclamunrar (non-GPL, see COPYING.unrar) */
-#define ENABLE_UNRAR 1
-
-/* file i/o buffer size */
-#define FILEBUFF 8192
-
-/* enable workaround for broken DNS servers */
-/* #undef FRESHCLAM_DNS_FIX */
-
-/* use "Cache-Control: no-cache" in freshclam */
-/* #undef FRESHCLAM_NO_CACHE */
-
-/* access rights in msghdr */
-/* #undef HAVE_ACCRIGHTS_IN_MSGHDR */
-
-/* attrib aligned */
-#define HAVE_ATTRIB_ALIGNED 1
-
-/* attrib packed */
-/* #define HAVE_ATTRIB_PACKED 1 */
-
-/* have bzip2 */
-/* #define HAVE_BZLIB_H 1 */
-
-/* ancillary data style fd pass */
-/* #undef HAVE_CONTROL_IN_MSGHDR 1 */
-
-#define	NO_STRTOK_R
-
-/* Define to 1 if you have the `ctime_r' function. */
-#define HAVE_CTIME_R 1
-
-/* ctime_r takes 2 arguments */
-#define HAVE_CTIME_R_2 1
-
-/* ctime_r takes 3 arguments */
-/* #undef HAVE_CTIME_R_3 */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
-/* #define HAVE_FSEEKO 1 */
-
-/* gethostbyname_r takes 3 arguments */
-/* #undef HAVE_GETHOSTBYNAME_R_3 */
-
-/* gethostbyname_r takes 5 arguments */
-/* #undef HAVE_GETHOSTBYNAME_R_5 */
-
-/* gethostbyname_r takes 6 arguments */
-/* #undef HAVE_GETHOSTBYNAME_R_6 */
-
-/* Define to 1 if you have the `getpagesize' function. */
-/* #define HAVE_GETPAGESIZE 1 */
-
-/* have gmp installed */
-/* #define HAVE_GMP 1 */
-
-/* hardware acceleration */
-/* #undef HAVE_HWACCEL */
-
-/* Define to 1 if you have the `inet_ntop' function. */
-#define HAVE_INET_NTOP 1
-
-/* Define to 1 if you have the `initgroups' function. */
-/* #define HAVE_INITGROUPS 1 */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-/* #define HAVE_INTTYPES_H 1 */
-
-/* in_addr_t is defined */
-/* #undef HAVE_IN_ADDR_T 1 */
-
-/* in_port_t is defined */
-/* #define HAVE_IN_PORT_T 1 */
-
-/* Define to 1 if you have the <libmilter/mfapi.h> header file. */
-/* #undef HAVE_LIBMILTER_MFAPI_H */
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#define HAVE_MALLOC_H 1
-
-/* Define to 1 if you have the `memcpy' function. */
-#define HAVE_MEMCPY 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have a working `mmap' system call. */
-#define	HAVE_MMAP	1
-
-/* Define to 1 if you have the <ndir.h> header file. */
-/* #undef HAVE_NDIR_H */
-
-/* Define to 1 if you have the `poll' function. */
-/* #define HAVE_POLL 1 */
-
-/* Define to 1 if you have the <poll.h> header file. */
-/* #define HAVE_POLL_H 1 */
-
-/* "pragma pack" */
-#define	HAVE_PRAGMA_PACK	1
-
-/* readdir_r takes 2 arguments */
-/* #undef HAVE_READDIR_R_2 1
-
-/* readdir_r takes 3 arguments */
-#define HAVE_READDIR_R_3 1
-
-/* Define to 1 if you have the `recvmsg' function. */
-/* #undef HAVE_RECVMSG */
-
-/* Define to 1 if you have the <regex.h> header file. */
-#define HAVE_REGEX_H 1
-
-/* have resolv.h */
-/* #undef HAVE_RESOLV_H */
-
-/* Define signed right shift implementation */
-#define HAVE_SAR 1
-
-/* Define to 1 if you have the `sendmsg' function. */
-/* #undef HAVE_SENDMSG */
-
-/* Define to 1 if you have the `setgroups' function. */
-/* #define HAVE_SETGROUPS 1 */
-
-/* Define to 1 if you have the `setsid' function. */
-/* #define HAVE_SETSID 1 */
-
-/* Define to 1 if you have the `snprintf' function. */
-#define HAVE_SNPRINTF 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-/*#define HAVE_STDINT_H 1/*
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `strerror_r' function. */
-/* #define HAVE_STRERROR_R 1 */
-
-/* Define to 1 if you have the <strings.h> header file. */
-/* #define HAVE_STRINGS_H 1 */
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strlcat' function. */
-#define HAVE_STRLCAT 1
-
-/* Define to 1 if you have the `strlcpy' function. */
-#define HAVE_STRLCPY 1
-
-/* Define to 1 if you have the <sys/filio.h> header file. */
-/* #undef HAVE_SYS_FILIO_H */
-
-/* Define to 1 if you have the <sys/inttypes.h> header file. */
-/* #undef HAVE_SYS_INTTYPES_H */
-
-/* Define to 1 if you have the <sys/int_types.h> header file. */
-/* #undef HAVE_SYS_INT_TYPES_H */
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-/*#define HAVE_SYS_MMAN_H 1*/
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-/* #undef HAVE_SYS_PARAM_H */
-
-/* "have <sys/select.h>" */
-/* #undef HAVE_SYS_SELECT_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/uio.h> header file. */
-/* #define HAVE_SYS_UIO_H 1 */
-
-/* Define to 1 if you have the <tcpd.h> header file. */
-/* #undef HAVE_TCPD_H */
-
-/* Define to 1 if you have the <termios.h> header file. */
-/* #define HAVE_TERMIOS_H 1 */
-
-/* Define to 1 if you have the <unistd.h> header file. */
-/* #define HAVE_UNISTD_H 1 */
-
-/* Define to 1 if you have the `vsnprintf' function. */
-/* #define HAVE_VSNPRINTF 1 */
-
-/* zlib installed */
-#define HAVE_ZLIB_H 1
-
-/* Early Linux doesn't set cmsg fields */
-/* #undef INCOMPLETE_CMSG */
-
-/* bzip funtions do not have bz2 prefix */
-/* #undef NOBZ2PREFIX */
-
-/* "no fd_set" */
-/* #undef NO_FD_SET */
-
-/* Name of package */
-#define PACKAGE "clamav"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "bugs at clamav.net"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME ""
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION ""
-
-/* scan buffer size */
-#define SCANBUFF 131072
-
-/* location of Sendmail binary */
-/* #undef SENDMAIL_BIN */
-
-/* major version of Sendmail */
-/* #undef SENDMAIL_VERSION_A */
-
-/* minor version of Sendmail */
-/* #undef SENDMAIL_VERSION_B */
-
-/* subversion of Sendmail */
-/* #undef SENDMAIL_VERSION_C */
-
-/* Define to 1 if the `setpgrp' function takes no argument. */
-#define SETPGRP_VOID 1
-
-/* The number of bytes in type int */
-#define SIZEOF_INT 4
-
-/* The number of bytes in type long */
-#define SIZEOF_LONG 4
-
-/* The number of bytes in type long long */
-#define SIZEOF_LONG_LONG 8
-
-/* The number of bytes in type short */
-#define SIZEOF_SHORT 2
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* use syslog */
-#define USE_SYSLOG 1
-
-/* Version number of package */
-#define VERSION "devel-20071024"
-/*#define	VERSION	"0.92RC2"*/
-
-/* tcpwrappers support */
-/* #undef WITH_TCPWRAP */
-
-/* endianess */
-#define WORDS_BIGENDIAN 0
-
-/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-/* #undef _LARGEFILE_SOURCE */
-
-/* POSIX compatibility */
-/* #undef _POSIX_PII_SOCKET */
-
-/* thread safe */
-#define _REENTRANT 1
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to `long' if <sys/types.h> does not define. */
-/* #undef off_t */
-
-/* Define to "int" if <sys/socket.h> does not define. */
-typedef	int	socklen_t;
-
-#ifdef	C_WINDOWS
-#include "compat.h"
-#endif
diff --git a/contrib/Windows/Projects/clamAV/libclamav/compat.c b/contrib/Windows/Projects/clamAV/libclamav/compat.c
deleted file mode 100644
index f2d50cd..0000000
--- a/contrib/Windows/Projects/clamAV/libclamav/compat.c
+++ /dev/null
@@ -1,508 +0,0 @@
-/*
- *  Copyright (C) 2006 Nigel Horne <njh at bandsman.co.uk>
- *
- *  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 Street, Fifth Floor, Boston,
- *  MA 02110-1301, USA.
- *
- * Unix/Linux compatibility for Windows
- * Inspired by glib and the cygwin source code
- * Tested under Microsoft Visual Studio 2005
- */
-#include <windows.h>
-
-#if HAVE_CONFIG_H
-#include "clamav-config.h"
-#endif
-
-#include <errno.h>
-#include <string.h>
-
-#include "clamav.h"
-#include "others.h"
-
-#ifndef	CL_DEBUG
-#define	NDEBUG	/* map CLAMAV debug onto standard */
-#endif
-
-#include <stdlib.h>
-#include <direct.h>
-#include <io.h>
-#include <pthread.h>
-
-#ifdef	USE_SYSLOG
-#include <strsafe.h>
-#include "syslog.h"
-#endif
-
-static	const	char	*basename(const char *file_name);
-
-/* Offset between 1/1/1601 and 1/1/1970 in 100 nanosec units */
-#define _W32_FT_OFFSET (116444736000000000ULL)
-
-/*
- * Patches for 64 bit support in opendir by
- *	Mark Pizzolato clamav-win32 at subscriptions.pizzolato.net
- */
-DIR *
-opendir(const char *dirname)
-{
-	DIR *ret = cli_calloc(1, sizeof(DIR));
-	char mask[_MAX_PATH + 3];
-	size_t i, j;
-
-	if(ret == NULL)
-		return NULL;
-
-	/* struct _WIN32_FIND_DATAA is what a LPWIN32_FIND_DATA points to */
-	ret->find_file_data = cli_calloc(1, sizeof(struct _WIN32_FIND_DATAA));
-
-	if(ret->find_file_data == NULL) {
-		free(ret);
-		return NULL;
-	}
-	ret->dir_name = cli_strdup(dirname);
-
-	if(ret->dir_name == NULL) {
-		free(ret->find_file_data);
-		free(ret);
-		return NULL;
-	}
-
-	j = strlen(dirname);
-	for(i = 0; i < j; i++)
-		if(ret->dir_name[i] == '/')
-			ret->dir_name[i] = '\\';
-
-	if(j && dirname[j - 1] == '\\')
-		ret->dir_name[--j] = '\0';
-
-	sprintf(mask, "%s\\*", ret->dir_name);
-
-	ret->find_file_handle = FindFirstFile(mask,
-				    (LPWIN32_FIND_DATA)ret->find_file_data);
-
-	if(ret->find_file_handle == INVALID_HANDLE_VALUE) {
-		free(ret->find_file_data);
-		free(ret->dir_name);
-		free(ret);
-
-		cli_warnmsg("Can't opendir(%s)\n", dirname);
-		return NULL;
-	}
-
-	ret->just_opened = TRUE;
-
-	return ret;
-}
-
-struct dirent *
-readdir(DIR *dir)
-{
-	/* NOTE: not thread safe */
-	static struct dirent result;
-
-	if(dir == NULL)
-		return NULL;
-
-	if(dir->just_opened)
-		dir->just_opened = FALSE;
-	else if(!FindNextFile((HANDLE)dir->find_file_handle, (LPWIN32_FIND_DATA)dir->find_file_data))
-		switch(GetLastError ()) {
-			case ERROR_NO_MORE_FILES:
-				return NULL;
-			default:
-				errno = EIO;
-				return NULL;
-		}
-
-	strcpy(result.d_name, basename(((LPWIN32_FIND_DATA)dir->find_file_data)->cFileName));
-
-	return &result;
-}
-
-int
-readdir_r(DIR *dir, struct dirent *dirent, struct dirent **output)
-{
-	if(dir == NULL)
-		return -1;
-	if(dirent == NULL)
-		return -1;
-	if(output == NULL)
-		return -1;
-
-	if(dir->just_opened)
-		dir->just_opened = FALSE;
-	else if(!FindNextFile((HANDLE)dir->find_file_handle, (LPWIN32_FIND_DATA)dir->find_file_data))
-		switch(GetLastError()) {
-			case ERROR_NO_MORE_FILES:
-				*output = NULL;
-				return -1;
-			default:
-				errno = EIO;
-				*output = NULL;
-				return -1;
-		}
-
-	strcpy(dirent->d_name, basename(((LPWIN32_FIND_DATA)dir->find_file_data)->cFileName));
-	*output = dirent;
-
-	return 0;
-}
-
-void
-rewinddir(DIR *dir)
-{
-	char mask[_MAX_PATH + 3];
-
-	if(dir == NULL)
-		return;
-
-	if(!FindClose((HANDLE)dir->find_file_handle))
-		cli_warnmsg("rewinddir(): FindClose() failed\n");
-
-	sprintf(mask, "%s\\*", dir->dir_name);
-
-	dir->find_file_handle = FindFirstFile (mask,
-					(LPWIN32_FIND_DATA)dir->find_file_data);
-
-	if(dir->find_file_handle == INVALID_HANDLE_VALUE) {
-		errno = EIO;
-		return;
-	}
-	dir->just_opened = TRUE;
-}
-
-int
-closedir(DIR *dir)
-{
-	if(dir == NULL)
-		return -1;
-
-	if(!FindClose((HANDLE)dir->find_file_handle)) {
-		errno = EIO;
-		return -1;
-	}
-
-	free(dir->dir_name);
-	free(dir->find_file_data);
-	free(dir);
-
-	return 0;
-}
-
-static const char *
-basename(const char *file_name)
-{
-	const char *base;
-
-	if(file_name == NULL)
-		return NULL;
-
-	base = strrchr(file_name, '\\');
-
-	if(base)
-		return base + 1;
-
-	if(isalpha(file_name[0] & 0xFF) && (file_name[1] == ':'))
-		return (const char *)(file_name + 2);
-
-	return file_name;
-}
-
-/* From the cygwin source code */
-int
-gettimeofday(struct timeval *tp, void *tz)
-{
-	if(tp) {
-		union {
-			unsigned long long ns100; /*time since 1 Jan 1601 in 100ns units */
-			FILETIME ft;
-		} _now;
-
-		GetSystemTimeAsFileTime(&_now.ft);
-		tp->tv_usec = (long)((_now.ns100 / 10ULL) % 1000000ULL );
-		tp->tv_sec = (long)((_now.ns100 - _W32_FT_OFFSET) / 10000000ULL);
-	}
-	/*
-	 * Always return 0 as per Open Group Base Specifications Issue 6.
-	 * Do not set errno on error.
-	 */
-	return 0;
-}
-
-/* TODO */
-int
-geteuid(void)
-{
-	return 0;
-}
-
-int
-getuid(void)
-{
-	return 0;
-}
-
-int
-getgid(void)
-{
-	return 0;
-}
-
-/*
- * mmap patches for more than one map area by
- *	Mark Pizzolato clamav-win32 at subscriptions.pizzolato.net
- */
-static pthread_mutex_t mmap_mutex = PTHREAD_MUTEX_INITIALIZER;
-
-static struct mmap_context {
-	struct mmap_context *link;
-	HANDLE h;
-	LPVOID view;
-	size_t length;
-} *mmaps = NULL;
-
-caddr_t
-mmap(caddr_t address, size_t length, int protection, int flags, int fd, off_t offset)
-{
-	LPVOID addr;
-	HANDLE h;
-	struct mmap_context *ctx;
-
-	if(flags != MAP_PRIVATE) {
-		cli_errmsg("mmap: only MAP_PRIVATE is supported\n");
-		return MAP_FAILED;
-	}
-	if(protection != PROT_READ) {
-		cli_errmsg("mmap: only PROT_READ is supported\n");
-		return MAP_FAILED;
-	}
-	if(address != NULL) {
-		cli_errmsg("mmap: only NULL map address is supported\n");
-		return MAP_FAILED;
-	}
-	h = CreateFileMapping((HANDLE)_get_osfhandle(fd), NULL, PAGE_READONLY, 0, 0, NULL);
-
-	if(h == NULL) {
-		cli_errmsg("mmap: CreateFileMapping failed - error %d\n",
-			GetLastError());
-		return MAP_FAILED;
-	}
-	if(GetLastError() == ERROR_ALREADY_EXISTS) {
-		cli_errmsg("mmap: ERROR_ALREADY_EXISTS\n");
-		CloseHandle(h);
-		return MAP_FAILED;
-	}
-	addr = MapViewOfFile(h, FILE_MAP_READ,
-		(DWORD)0, ((DWORD)offset & 0xFFFFFFFF),
-		length);
-
-	if(addr == NULL) {
-		cli_errmsg("mmap failed - error %d\n", GetLastError());
-		CloseHandle(h);
-		return MAP_FAILED;
-	}
-	pthread_mutex_lock(&mmap_mutex);
-	ctx = cli_malloc(sizeof(*ctx));
-	if(NULL == ctx) {
-		pthread_mutex_unlock(&mmap_mutex);
-		cli_errmsg("mmap: can't create context block\n");
-		UnmapViewOfFile(addr);
-		CloseHandle(h);
-		return MAP_FAILED;
-	}
-	ctx->h = h;
-	ctx->view = addr;
-	ctx->length = length;
-	ctx->link = mmaps;
-	mmaps = ctx;
-	pthread_mutex_unlock(&mmap_mutex);
-	return (caddr_t)addr;
-}
-
-int
-munmap(caddr_t addr, size_t length)
-{
-	struct mmap_context *ctx = mmaps, *lctx = NULL;
-
-	pthread_mutex_lock(&mmap_mutex);
-	
-	for(; ctx && (ctx->view != addr); ctx = ctx->link)
-		lctx = ctx;
-
-	if(ctx == NULL) {
-		pthread_mutex_unlock(&mmap_mutex);
-		cli_warnmsg("munmap with no corresponding mmap\n");
-		return -1;
-	}
-
-	if(ctx->length != length) {
-		pthread_mutex_unlock(&mmap_mutex);
-		cli_warnmsg("munmap with incorrect length specified (%u != %u) - partial munmap unsupported\n",
-			length, ctx->length);
-		return -1;
-	}
-
-	if(lctx == NULL)
-		mmaps = ctx->link;
-	else
-		lctx->link = ctx->link;
-
-	pthread_mutex_unlock(&mmap_mutex);
-
-	UnmapViewOfFile(ctx->view);
-	CloseHandle(ctx->h);
-	free(ctx);
-
-	return 0;
-}
-
-int
-chown(const char *filename, short uid, short gid)
-{
-	return 0;
-}
-
-#ifdef	USE_SYSLOG
-/*
- * Put into the Windows Event Log
- *	Right Click My Computer->Manage->Event Viewer->Application
- * See http://cybertiggyr.com/gene/wel/src/insert-log.c for inspiration
- * http://msdn2.microsoft.com/en-gb/library/aa363634(VS.85).aspx
- * and http://msdn2.microsoft.com/en-us/library/aa363680(VS.85).aspx
- *
- * FIXME: Not thread safe, but see shared/output.c, which ensures this code is
- *	single threaded - therefore don't call this code directly
- */
-static	HANDLE	logg_handle;
-static	int	initlog(const char *source);
-
-void
-openlog(const char *name, int options, int facility)
-{
-	if(logg_handle != NULL)
-		closelog();
-	else
-		(void)initlog(name);
-
-	logg_handle = RegisterEventSource(NULL, name);
-
-	if(logg_handle == NULL)
-		cli_warnmsg("openlog: Can't register source %s - error %d\n", name, GetLastError());
-}
-
-void
-closelog(void)
-{
-	if(logg_handle != NULL)
-		DeregisterEventSource(logg_handle);
-}
-
-void
-syslog(int level, const char *format, ...)
-{
-	if(logg_handle == NULL)
-		openlog("Clam AntiVirus", 0, LOG_LOCAL6);
-		
-	if(logg_handle != NULL) {
-		va_list args;
-		char buff[512];
-		char *ptr;
-
-		va_start(args, format);
-		(void)vsnprintf(buff, sizeof(buff), format, args);
-		va_end(args);
-		
-		ptr = buff;
-
-		/*
-		 * Category = 0, eventId = CLAMAV_EVENTMSG, SID = NULL, 1 string
-		 */
-		if(!ReportEventA(logg_handle, (WORD)level, 0, CLAMAV_EVENTMSG, NULL, 1, 0, (LPCSTR *)&ptr, NULL))
-			cli_warnmsg("syslog: ReportEventA(%d, %d, 0, %d, NULL, 1, 0, %s, NULL) failed: %d\n",
-				logg_handle, level, CLAMAV_EVENTMSG, buff, GetLastError());
-	}
-}
-
-static int
-initlog(const char *source)
-{
-	/*DWORD dwCategoryNum = 1;	/* The number of categories for the event source. */
-	HKEY hk; 
-	DWORD dwData, /*dwDisp,*/ len;
-	char path[MAX_PATH];
-
-	/* Create the event source as a subkey of the log. */
-	(void)snprintf(path, sizeof(path),
-		"SYSTEM\\CurrentControlSet\\Services\\EventLog\\Application\\%s",
-		source);
- 
-	if(RegCreateKey(HKEY_LOCAL_MACHINE, path, &hk) != 0) {
-		cli_warnmsg("Could not create the registry key\n"); 
-		/*return 0;*/
-	}
- 
-	/* Set the name of the message file. */
-	GetModuleFileName(NULL, path, sizeof(path));
-	path[sizeof(path) - 1] = '\0';
-	len = (DWORD)(strlen(path) + 1);
-
-	if(RegSetValueEx(hk, "EventMessageFile", 0, REG_EXPAND_SZ, (LPBYTE)path, len)) {
-		cli_warnmsg("Could not set the event message file\n"); 
-		RegCloseKey(hk); 
-		return 0;
-	}
- 
-	/* Set the supported event types. */
-	dwData = EVENTLOG_ERROR_TYPE | EVENTLOG_WARNING_TYPE | EVENTLOG_INFORMATION_TYPE; 
- 
-	if(RegSetValueEx(hk, "TypesSupported", 0, REG_DWORD, (LPBYTE)&dwData, sizeof(DWORD))) { 
-		cli_warnmsg("Could not set the supported types\n"); 
-		RegCloseKey(hk); 
-		return 0;
-	}
- 
-#if	0
-	/* Set the category message file and number of categories. */
-	if(RegSetValueEx(hk, "CategoryMessageFile", 0, REG_EXPAND_SZ,
-	    (LPBYTE)path, len)) {
-		cli_warnmsg("Could not set the category message file\n"); 
-		RegCloseKey(hk); 
-		return 0;
-	}
- 
-	if(RegSetValueEx(hk, "CategoryCount", 0, REG_DWORD, (LPBYTE)&dwCategoryNum, sizeof(DWORD))) {
-		cli_warnmsg("Could not set the category count\n"); 
-		RegCloseKey(hk); 
-		return 0;
-	}
-#endif
-
-	RegCloseKey(hk); 
-	return 1;
-}
-#endif
-
-int
-snprintf(char *str, size_t size, const char *format, ...)
-{
-	int ret;
-	
-	va_list args;
-	va_start(args, format);
-	ret = _vsnprintf_s(str, size, _TRUNCATE, format, args);
-	va_end(args);
-	return ret;
-}
\ No newline at end of file
diff --git a/contrib/Windows/Projects/clamAV/libclamav/compat.h b/contrib/Windows/Projects/clamAV/libclamav/compat.h
deleted file mode 100644
index e5be362..0000000
--- a/contrib/Windows/Projects/clamAV/libclamav/compat.h
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- *  Copyright (C) 2006 Nigel Horne <njh at bandsman.co.uk>
- *
- *  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 Street, Fifth Floor, Boston,
- *  MA 02110-1301, USA.
- *
- * Unix/Linux compatibility for Windows
- * Inspired by glib and the cygwin source code
- * Tested under Microsoft Visual Studio 2005
- */
-#ifndef	CLAMAV_COMPAT_H
-
-#define	CLAMAV_COMPAT_H
-
-#ifdef	C_WINDOWS
-
-#pragma warning(disable: 4996)	/* turn off warnings about depracated code */
-
-#ifndef	_USE_32BIT_TIME_T
-#define	_USE_32BIT_TIME_T
-#endif
-
-/*#include	"snprintf.h"*/
-
-#define	inline	/* it's too different in MSVC to bother */
-
-typedef	int	ssize_t;
-typedef	int	mode_t;
-typedef	char *	caddr_t;
-typedef	long	off_t;
-
-#define	X_OK	0
-#define	W_OK	2
-#define	R_OK	4
-
-#define	PROT_READ	1
-#define	MAP_PRIVATE	1
-#define	MAP_FAILED	(caddr_t)-1
-
-caddr_t	mmap(caddr_t address, size_t length, int protection, int flags, int fd, off_t offset);
-int	munmap(caddr_t addr, size_t length);
-
-#define	strcasecmp(s1, s2)	_stricmp(s1, s2)
-#define	strncasecmp(s1, s2, n)	_strnicmp(s1, s2, n)
-
-#define	chdir(d)	_chdir(d)
-#define	umask(n)	_umask(n)
-
-#ifndef	S_IRWXU
-#define	S_IRWXU	(_S_IREAD|_S_IWRITE|_S_IEXEC)
-#endif
-
-#define S_IWUSR	S_IWRITE
-#define	S_IRUSR	S_IREAD
-#define	S_ISLNK(f)	0
-#define S_ISDIR(f)	(((f)&S_IFMT) == S_IFDIR)
-#define S_ISREG(f)	(((f)&S_IFMT) == S_IFREG)
-
-#define	fsync(fd)	_commit(fd)
-#define	lstat(file, buf)	stat(file, buf)
-
-#define	_CRT_SECURE_NO_DEPRECATE	1
-
-#ifndef _WINSOCKAPI_	/* timeval is in winsock.h */
-struct timeval {
-	long	tv_sec;
-	long	tv_usec;
-};
-#endif	/* _WINSOCKAPI_ */
-
-/* Maximum filenames under various systems - njh */
-#ifndef	NAME_MAX	/* e.g. Linux */
-# ifdef	MAXNAMELEN	/* e.g. Solaris */
-#   define	NAME_MAX	MAXNAMELEN
-# else
-#   ifdef	FILENAME_MAX	/* e.g. SCO */
-#     define	NAME_MAX	FILENAME_MAX
-#   else
-#     define	NAME_MAX	256
-#   endif
-# endif
-#endif
-
-struct DIR {
-	char    *dir_name;
-	int	just_opened;
-	void	*find_file_handle;
-	void	*find_file_data;	/* LPWIN32_FIND_DATA */
-};
-typedef struct	DIR	DIR;
-struct	dirent {
-	char  d_name[NAME_MAX + 1];
-};
-
-DIR	*opendir(const char *dirname);
-struct	dirent	*readdir(DIR *dir);
-int	readdir_r(DIR *dir, struct dirent *dirent, struct dirent **output);
-void	rewinddir(DIR *dir);
-int	closedir(DIR *dir);
-int	gettimeofday(struct timeval* tp, void* tz);
-
-#define	alarm(seconds)
-#define	sleep(seconds)	Sleep(seconds * 1000)
-#define	pause();
-
-extern	const	char	*libclamav_dll;
-
-#ifdef	_DEBUG
-
-/* http://msdn2.microsoft.com/en-us/library/e5ewb1h3(VS.80).asp */
-#define _CRTDBG_MAP_ALLOC
-#include <stdlib.h>
-#include <crtdbg.h>
-
-/* breaks mspack/qtmd.c :-( */
-/* #define	free(p)	{ _free_dbg(p, _NORMAL_BLOCK); } */
-
-#endif
-
-#endif	/* C_WINDOWS */
-
-#endif	/* CLAMAV_COMPAT_H */
diff --git a/contrib/Windows/Projects/clamAV/libclamav/dllmain.c b/contrib/Windows/Projects/clamAV/libclamav/dllmain.c
deleted file mode 100755
index 1e37f6f..0000000
--- a/contrib/Windows/Projects/clamAV/libclamav/dllmain.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- *  Copyright (C) 2007 aCaB <acab at clamav.net>
- *
- *  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 Street, Fifth Floor, Boston,
- *  MA 02110-1301, USA.
- */
-#ifdef	_MSC_VER
-#include <winsock.h>
-#endif
-
-#if HAVE_CONFIG_H
-#include "clamav-config.h"
-#endif
-
-#ifndef C_WINDOWS
-#error You seem to lack the OS, the environment or the tools to build this file.
-#endif
-
-#include <windows.h>
-#include <winreg.h>
-#include "clamav.h"
-#include "others.h"
-
-#undef	CONFDIR
-
-#ifdef	LATER
-/* These are exported in the .def file */
-static char _CONFDIR[MAX_PATH];
-static char _CONFFRESHCLAM[MAX_PATH];
-static char _CONFCLAMD[MAX_PATH];
-
-char *CONFDIR =_CONFDIR;
-char *CONFFRESHCLAM =_CONFFRESHCLAM;
-char *CONFCLAMD =_CONFCLAMD;
-#else
-const	char *CONFDIR = NULL;
-const	char *CONFFRESHCLAM = NULL;
-const	char *CONFCLAMD = NULL;
-#endif
-
-#ifdef _MANAGED
-#pragma managed(push, off)
-#endif
-#include <winerror.h>
-BOOL APIENTRY DllMain(HMODULE m, DWORD wassup, LPVOID r)
-{
-#ifdef	LATER
-	HKEY key;
-	unsigned int cs=0;
-	if (wassup!=DLL_PROCESS_ATTACH) return TRUE;
-
-	if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, "Software\\ClamAV", 0, KEY_QUERY_VALUE, &key) || RegQueryValueExA(key, "confdir", 0, 0, NULL, &cs)) {
-		strcpy(CONFDIR, COPYDIR);
-		strcpy(CONFFRESHCLAM, COPYDIR"\\freshclam.conf");
-		strcpy(CONFCLAMD, COPYDIR"\\clamd.conf");
-		return TRUE;
-	}
-	if (!cs || cs>=MAX_PATH || RegQueryValueExA(key, "confdir", 0, 0, CONFDIR, &cs)) {
-		cli_errmsg("Unable to load libclamav: check your registry settings");
-		return FALSE;
-		RegCloseKey(key);
-	}
-	RegCloseKey(key);
-	_snprintf(CONFFRESHCLAM, MAX_PATH, "%s\\freshclam.conf", CONFDIR);
-	_snprintf(CONFCLAMD, MAX_PATH, "%s\\clamd.conf", CONFDIR);
-#endif
-	return TRUE;
-}
-
-#ifdef _MANAGED
-#pragma managed(pop)
-#endif
diff --git a/contrib/Windows/Projects/clamAV/libclamav/eventlog.mc b/contrib/Windows/Projects/clamAV/libclamav/eventlog.mc
deleted file mode 100644
index e5d4310..0000000
--- a/contrib/Windows/Projects/clamAV/libclamav/eventlog.mc
+++ /dev/null
@@ -1,6 +0,0 @@
-messageIdTypedef=WORD
-MessageId=0x1
-SymbolicName=CLAMAV_EVENTMSG
-Language=English
-%1
-.
diff --git a/contrib/Windows/Projects/clamAV/libclamav/libclamav.def b/contrib/Windows/Projects/clamAV/libclamav/libclamav.def
deleted file mode 100755
index 9083c31..0000000
--- a/contrib/Windows/Projects/clamAV/libclamav/libclamav.def
+++ /dev/null
@@ -1,81 +0,0 @@
-LIBRARY libClamAV
-VERSION 0.92.1
-EXPORTS cl_scandesc @1
-EXPORTS cl_scanfile @2
-EXPORTS cl_load @3
-EXPORTS cl_build @4
-EXPORTS cl_dup @5
-EXPORTS cl_free @6
-EXPORTS cl_cvdhead @7
-EXPORTS cl_cvdparse @8
-EXPORTS cl_cvdverify @9
-EXPORTS cl_cvdfree @10
-EXPORTS cl_statinidir @11
-EXPORTS cl_statchkdir @12
-EXPORTS cl_statfree @13
-EXPORTS cl_debug @14
-EXPORTS cl_retflevel @15
-EXPORTS cl_settempdir @1000 NONAME
-EXPORTS cl_retver @1001 NONAME
-EXPORTS cl_strerror @1002 NONAME
-EXPORTS cl_retdbdir @1003 NONAME
-EXPORTS cli_rmdirs @1004 NONAME
-EXPORTS cli_strtok @1005 NONAME
-EXPORTS cli_gentemp @1006 NONAME
-EXPORTS cli_strbcasestr @1007 NONAME
-EXPORTS cli_strrcpy @1008 NONAME
-EXPORTS cli_errmsg @1009 NONAME
-EXPORTS cli_warnmsg @1010 NONAME
-EXPORTS cli_calloc @1011 NONAME
-EXPORTS cli_malloc @1012 NONAME
-EXPORTS cli_untgz @1013 NONAME
-EXPORTS cli_chomp @1014 NONAME
-EXPORTS cli_gentempfd @1015 NONAME
-EXPORTS cli_rndnum @1016 NONAME
-EXPORTS snprintf @1017 NONAME
-EXPORTS cli_ctime @1018 NONAME
-EXPORTS cli_isnumber @1019 NONAME
-EXPORTS closedir @1020 NONAME
-EXPORTS readdir @1021 NONAME
-EXPORTS opendir @1022 NONAME
-EXPORTS pthread_win32_process_detach_np @1023 NONAME
-EXPORTS gettimeofday @1024 NONAME
-EXPORTS pthread_win32_process_attach_np @1025 NONAME
-EXPORTS geteuid @1026 NONAME
-EXPORTS chown @1027 NONAME
-EXPORTS cli_regfree @1028 NONAME
-EXPORTS cli_regexec @1029 NONAME
-EXPORTS cli_regcomp @1030 NONAME
-EXPORTS pthread_mutex_unlock @1031 NONAME
-EXPORTS pthread_mutex_lock @1032 NONAME
-EXPORTS pthread_mutex_init @1033 NONAME
-EXPORTS readdir_r @1034 NONAME
-EXPORTS pthread_attr_destroy @1035 NONAME
-EXPORTS pthread_cond_destroy @1036 NONAME
-EXPORTS pthread_mutex_destroy @1037 NONAME
-EXPORTS pthread_cond_wait @1038 NONAME
-EXPORTS pthread_cond_broadcast @1039 NONAME
-EXPORTS pthread_attr_setdetachstate @1040 NONAME
-EXPORTS pthread_attr_init @1041 NONAME
-EXPORTS pthread_cond_init @1042 NONAME
-EXPORTS pthread_cond_signal @1043 NONAME
-EXPORTS pthread_create @1044 NONAME
-EXPORTS pthread_cond_timedwait @1045 NONAME
-EXPORTS gzclose @1046 NONAME
-EXPORTS gzgets @1047 NONAME
-EXPORTS gzdopen @1048 NONAME
-EXPORTS getuid @1049 NONAME
-EXPORTS getgid @1050 NONAME
-EXPORTS openlog @1051 NONAME
-EXPORTS syslog @1052 NONAME
-EXPORTS closelog @1053 NONAME
-EXPORTS cli_realloc2 @1055 NONAME
-EXPORTS cli_readn @1056 NONAME
-EXPORTS cli_writen @1057 NONAME
-EXPORTS cli_strdup @1058 NONAME
-EXPORTS cli_ac_setdepth @1059 NONAME
-EXPORTS gzopen @1060 NONAME
-EXPORTS gzwrite @1061 NONAME
-EXPORTS CONFDIR DATA
-EXPORTS CONFFRESHCLAM DATA
-EXPORTS CONFCLAMD DATA
diff --git a/contrib/Windows/Projects/clamAV/libclamav/libclamav.vcproj b/contrib/Windows/Projects/clamAV/libclamav/libclamav.vcproj
deleted file mode 100644
index ec13006..0000000
--- a/contrib/Windows/Projects/clamAV/libclamav/libclamav.vcproj
+++ /dev/null
@@ -1,1029 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="libclamav"
-	ProjectGUID="{C5A10DA8-717D-4462-8E84-E8B97F50CF54}"
-	RootNamespace="libclamav"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				UseUnicodeResponseFiles="false"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;&quot;$(SolutionDir)libclamunrar&quot;;&quot;$(ProjectDir)nsis&quot;;&quot;$(ProjectDir)regex&quot;;&quot;$(ProjectDir)zlib&quot;;&quot;$(ProjectDir)pthread&quot;;&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)lzma&quot;"
-				PreprocessorDefinitions="_USE_32BIT_TIME_T;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB;_DEBUG"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				StructMemberAlignment="0"
-				DefaultCharIsUnsigned="false"
-				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalDependencies="ws2_32.lib &quot;$(ProjectDir)pthread\pthreadVC2.lib&quot; &quot;$(TargetDir)\libclamunrar_iface.lib&quot;"
-				Version="0.92.1"
-				ModuleDefinitionFile="$(InputDir)/libclamav.def"
-				GenerateDebugInformation="true"
-				AssemblyDebug="1"
-				SubSystem="2"
-			/>
-			<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="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)&quot;;&quot;$(SolutionDir)libclamunrar&quot;;&quot;$(ProjectDir)nsis&quot;;&quot;$(ProjectDir)regex&quot;;&quot;$(ProjectDir)zlib&quot;;&quot;$(ProjectDir)pthread&quot;;&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)lzma&quot;"
-				PreprocessorDefinitions="_USE_32BIT_TIME_T;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				StructMemberAlignment="0"
-				BufferSecurityCheck="false"
-				DefaultCharIsUnsigned="false"
-				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CallingConvention="0"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalDependencies="ws2_32.lib &quot;$(ProjectDir)pthread\pthreadVC2.lib&quot; &quot;$(TargetDir)\libclamunrar_iface.lib&quot;"
-				Version="0.92.1"
-				ModuleDefinitionFile="$(InputDir)/libclamav.def"
-				SubSystem="2"
-			/>
-			<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="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\aspack.c"
-				>
-			</File>
-			<File
-				RelativePath=".\autoit.c"
-				>
-			</File>
-			<File
-				RelativePath=".\binhex.c"
-				>
-			</File>
-			<File
-				RelativePath=".\blob.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="1"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\cab.c"
-				>
-			</File>
-			<File
-				RelativePath=".\chmunpack.c"
-				>
-			</File>
-			<File
-				RelativePath=".\compat.c"
-				>
-			</File>
-			<File
-				RelativePath=".\cvd.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						WarningLevel="4"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\dconf.c"
-				>
-			</File>
-			<File
-				RelativePath=".\dllmain.c"
-				>
-			</File>
-			<File
-				RelativePath=".\dsig.c"
-				>
-			</File>
-			<File
-				RelativePath=".\elf.c"
-				>
-			</File>
-			<File
-				RelativePath=".\entconv.c"
-				>
-			</File>
-			<File
-				RelativePath=".\explode.c"
-				>
-			</File>
-			<File
-				RelativePath=".\filetypes.c"
-				>
-			</File>
-			<File
-				RelativePath=".\fsg.c"
-				>
-			</File>
-			<File
-				RelativePath=".\hashtab.c"
-				>
-			</File>
-			<File
-				RelativePath=".\htmlnorm.c"
-				>
-			</File>
-			<File
-				RelativePath=".\inflate64.c"
-				>
-			</File>
-			<File
-				RelativePath=".\is_tar.c"
-				>
-			</File>
-			<File
-				RelativePath=".\line.c"
-				>
-			</File>
-			<File
-				RelativePath=".\lzma_iface.c"
-				>
-			</File>
-			<File
-				RelativePath=".\matcher-ac.c"
-				>
-			</File>
-			<File
-				RelativePath=".\matcher-bm.c"
-				>
-			</File>
-			<File
-				RelativePath=".\matcher.c"
-				>
-			</File>
-			<File
-				RelativePath=".\mbox.c"
-				>
-			</File>
-			<File
-				RelativePath=".\md5.c"
-				>
-			</File>
-			<File
-				RelativePath=".\message.c"
-				>
-			</File>
-			<File
-				RelativePath=".\mew.c"
-				>
-			</File>
-			<File
-				RelativePath=".\msexpand.c"
-				>
-			</File>
-			<File
-				RelativePath=".\mspack.c"
-				>
-			</File>
-			<File
-				RelativePath=".\ole2_extract.c"
-				>
-			</File>
-			<File
-				RelativePath=".\others.c"
-				>
-			</File>
-			<File
-				RelativePath=".\packlibs.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pdf.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pe.c"
-				>
-			</File>
-			<File
-				RelativePath=".\petite.c"
-				>
-			</File>
-			<File
-				RelativePath=".\phish_domaincheck_db.c"
-				>
-			</File>
-			<File
-				RelativePath=".\phish_whitelist.c"
-				>
-			</File>
-			<File
-				RelativePath=".\phishcheck.c"
-				>
-			</File>
-			<File
-				RelativePath=".\readdb.c"
-				>
-			</File>
-			<File
-				RelativePath=".\rebuildpe.c"
-				>
-			</File>
-			<File
-				RelativePath=".\regex_list.c"
-				>
-			</File>
-			<File
-				RelativePath=".\rtf.c"
-				>
-			</File>
-			<File
-				RelativePath=".\scanners.c"
-				>
-			</File>
-			<File
-				RelativePath=".\sis.c"
-				>
-			</File>
-			<File
-				RelativePath=".\special.c"
-				>
-			</File>
-			<File
-				RelativePath=".\spin.c"
-				>
-			</File>
-			<File
-				RelativePath=".\str.c"
-				>
-			</File>
-			<File
-				RelativePath=".\table.c"
-				>
-			</File>
-			<File
-				RelativePath=".\text.c"
-				>
-			</File>
-			<File
-				RelativePath=".\textdet.c"
-				>
-			</File>
-			<File
-				RelativePath=".\textnorm.c"
-				>
-			</File>
-			<File
-				RelativePath=".\tnef.c"
-				>
-			</File>
-			<File
-				RelativePath=".\unarj.c"
-				>
-			</File>
-			<File
-				RelativePath=".\unsp.c"
-				>
-			</File>
-			<File
-				RelativePath=".\untar.c"
-				>
-			</File>
-			<File
-				RelativePath=".\unzip.c"
-				>
-			</File>
-			<File
-				RelativePath=".\upack.c"
-				>
-			</File>
-			<File
-				RelativePath=".\upx.c"
-				>
-			</File>
-			<File
-				RelativePath=".\uuencode.c"
-				>
-			</File>
-			<File
-				RelativePath=".\vba_extract.c"
-				>
-			</File>
-			<File
-				RelativePath=".\wwunpack.c"
-				>
-			</File>
-			<File
-				RelativePath=".\yc.c"
-				>
-			</File>
-			<Filter
-				Name="nsis"
-				>
-				<File
-					RelativePath=".\nsis\bzlib.c"
-					>
-				</File>
-				<File
-					RelativePath=".\nsis\infblock.c"
-					>
-				</File>
-				<File
-					RelativePath=".\nsis\LZMADecode.c"
-					>
-				</File>
-				<File
-					RelativePath=".\nsis\nulsft.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="regex"
-				>
-				<File
-					RelativePath=".\regex\regcomp.c"
-					>
-				</File>
-				<File
-					RelativePath=".\regex\regerror.c"
-					>
-				</File>
-				<File
-					RelativePath=".\regex\regexec.c"
-					>
-				</File>
-				<File
-					RelativePath=".\regex\regfree.c"
-					>
-				</File>
-				<File
-					RelativePath=".\regex\strlcpy.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="zlib"
-				>
-				<File
-					RelativePath=".\zlib\adler32.c"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\compress.c"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\crc32.c"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\deflate.c"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\gzio.c"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\infback.c"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\inffast.c"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\inflate.c"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\inftrees.c"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\minigzip.c"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\trees.c"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\uncompr.c"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\zutil.c"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="lzma"
-				>
-				<File
-					RelativePath=".\lzma\LzmaStateDecode.c"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\aspack.h"
-				>
-			</File>
-			<File
-				RelativePath=".\autoit.h"
-				>
-			</File>
-			<File
-				RelativePath=".\binhex.h"
-				>
-			</File>
-			<File
-				RelativePath=".\blob.h"
-				>
-			</File>
-			<File
-				RelativePath=".\cab.h"
-				>
-			</File>
-			<File
-				RelativePath=".\chmunpack.h"
-				>
-			</File>
-			<File
-				RelativePath=".\clamav-config.h"
-				>
-			</File>
-			<File
-				RelativePath=".\clamav.h"
-				>
-			</File>
-			<File
-				RelativePath=".\cltypes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\compat.h"
-				>
-			</File>
-			<File
-				RelativePath=".\cvd.h"
-				>
-			</File>
-			<File
-				RelativePath=".\dconf.h"
-				>
-			</File>
-			<File
-				RelativePath=".\dsig.h"
-				>
-			</File>
-			<File
-				RelativePath=".\elf.h"
-				>
-			</File>
-			<File
-				RelativePath=".\entconv.h"
-				>
-			</File>
-			<File
-				RelativePath=".\eventlog.h"
-				>
-			</File>
-			<File
-				RelativePath=".\execs.h"
-				>
-			</File>
-			<File
-				RelativePath=".\explode.h"
-				>
-			</File>
-			<File
-				RelativePath=".\filetypes.h"
-				>
-			</File>
-			<File
-				RelativePath=".\fsg.h"
-				>
-			</File>
-			<File
-				RelativePath=".\hashtab.h"
-				>
-			</File>
-			<File
-				RelativePath=".\htmlnorm.h"
-				>
-			</File>
-			<File
-				RelativePath=".\iana_tld.h"
-				>
-			</File>
-			<File
-				RelativePath=".\inflate64.h"
-				>
-			</File>
-			<File
-				RelativePath=".\is_tar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\libclamav.h"
-				>
-			</File>
-			<File
-				RelativePath=".\line.h"
-				>
-			</File>
-			<File
-				RelativePath=".\lzma_iface.h"
-				>
-			</File>
-			<File
-				RelativePath=".\matcher-ac.h"
-				>
-			</File>
-			<File
-				RelativePath=".\matcher-bm.h"
-				>
-			</File>
-			<File
-				RelativePath=".\matcher.h"
-				>
-			</File>
-			<File
-				RelativePath=".\mbox.h"
-				>
-			</File>
-			<File
-				RelativePath=".\md5.h"
-				>
-			</File>
-			<File
-				RelativePath=".\message.h"
-				>
-			</File>
-			<File
-				RelativePath=".\mew.h"
-				>
-			</File>
-			<File
-				RelativePath=".\msexpand.h"
-				>
-			</File>
-			<File
-				RelativePath=".\mspack.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ole2_extract.h"
-				>
-			</File>
-			<File
-				RelativePath=".\others.h"
-				>
-			</File>
-			<File
-				RelativePath=".\packlibs.h"
-				>
-			</File>
-			<File
-				RelativePath=".\pdf.h"
-				>
-			</File>
-			<File
-				RelativePath=".\pe.h"
-				>
-			</File>
-			<File
-				RelativePath=".\petite.h"
-				>
-			</File>
-			<File
-				RelativePath=".\phish_domaincheck_db.h"
-				>
-			</File>
-			<File
-				RelativePath=".\phish_whitelist.h"
-				>
-			</File>
-			<File
-				RelativePath=".\phishcheck.h"
-				>
-			</File>
-			<File
-				RelativePath=".\readdb.h"
-				>
-			</File>
-			<File
-				RelativePath=".\rebuildpe.h"
-				>
-			</File>
-			<File
-				RelativePath=".\regex_list.h"
-				>
-			</File>
-			<File
-				RelativePath=".\resource.h"
-				>
-			</File>
-			<File
-				RelativePath=".\rtf.h"
-				>
-			</File>
-			<File
-				RelativePath=".\scanners.h"
-				>
-			</File>
-			<File
-				RelativePath=".\sis.h"
-				>
-			</File>
-			<File
-				RelativePath=".\special.h"
-				>
-			</File>
-			<File
-				RelativePath=".\spin.h"
-				>
-			</File>
-			<File
-				RelativePath=".\stdafx.h"
-				>
-			</File>
-			<File
-				RelativePath=".\str.h"
-				>
-			</File>
-			<File
-				RelativePath=".\syslog.h"
-				>
-			</File>
-			<File
-				RelativePath=".\table.h"
-				>
-			</File>
-			<File
-				RelativePath=".\target.h"
-				>
-			</File>
-			<File
-				RelativePath=".\text.h"
-				>
-			</File>
-			<File
-				RelativePath=".\textdet.h"
-				>
-			</File>
-			<File
-				RelativePath=".\textnorm.h"
-				>
-			</File>
-			<File
-				RelativePath=".\tnef.h"
-				>
-			</File>
-			<File
-				RelativePath=".\unarj.h"
-				>
-			</File>
-			<File
-				RelativePath=".\unsp.h"
-				>
-			</File>
-			<File
-				RelativePath=".\untar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\unzip.h"
-				>
-			</File>
-			<File
-				RelativePath=".\upack.h"
-				>
-			</File>
-			<File
-				RelativePath=".\upx.h"
-				>
-			</File>
-			<File
-				RelativePath=".\uuencode.h"
-				>
-			</File>
-			<File
-				RelativePath=".\vba_extract.h"
-				>
-			</File>
-			<File
-				RelativePath=".\wwunpack.h"
-				>
-			</File>
-			<File
-				RelativePath=".\yc.h"
-				>
-			</File>
-			<File
-				RelativePath=".\zconf.h"
-				>
-			</File>
-			<File
-				RelativePath=".\zlib.h"
-				>
-			</File>
-			<Filter
-				Name="nsis"
-				>
-				<File
-					RelativePath=".\nsis\bzlib_private.h"
-					>
-				</File>
-				<File
-					RelativePath=".\nsis\LZMADecode.h"
-					>
-				</File>
-				<File
-					RelativePath=".\nsis\nsis_bzlib.h"
-					>
-				</File>
-				<File
-					RelativePath=".\nsis\nsis_zconf.h"
-					>
-				</File>
-				<File
-					RelativePath=".\nsis\nsis_zlib.h"
-					>
-				</File>
-				<File
-					RelativePath=".\nsis\nsis_zutil.h"
-					>
-				</File>
-				<File
-					RelativePath=".\nsis\nulsft.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="regex"
-				>
-				<File
-					RelativePath=".\regex\cclass.h"
-					>
-				</File>
-				<File
-					RelativePath=".\regex\cname.h"
-					>
-				</File>
-				<File
-					RelativePath=".\regex\regex.h"
-					>
-				</File>
-				<File
-					RelativePath=".\regex\regex2.h"
-					>
-				</File>
-				<File
-					RelativePath=".\regex\utils.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="zlib"
-				>
-				<File
-					RelativePath=".\zlib\crc32.h"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\deflate.h"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\inffast.h"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\inffixed.h"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\inflate.h"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\inftrees.h"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\trees.h"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\zconf.h"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\zconf.in.h"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\zlib.h"
-					>
-				</File>
-				<File
-					RelativePath=".\zlib\zutil.h"
-					>
-				</File>
-			</Filter>
-			<Filter
-				Name="lzma"
-				>
-				<File
-					RelativePath=".\lzma\LzmaStateDecode.h"
-					>
-				</File>
-				<File
-					RelativePath=".\lzma\LzmaTypes.h"
-					>
-				</File>
-			</Filter>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			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=".\libclamav.def"
-				>
-			</File>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/contrib/Windows/Projects/clamAV/libclamav/libclamav.vcproj.NJH.Nigel Horne.user b/contrib/Windows/Projects/clamAV/libclamav/libclamav.vcproj.NJH.Nigel Horne.user
deleted file mode 100644
index 433bb3f..0000000
--- a/contrib/Windows/Projects/clamAV/libclamav/libclamav.vcproj.NJH.Nigel Horne.user	
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="8.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				Command="$(OutDir)\clamd.exe"
-				WorkingDirectory=""
-				CommandArguments="--temp=d: --debug"
-				Attach="true"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NJH"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor="0"
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				Command="$(OutDir)\clamd.exe"
-				WorkingDirectory=""
-				CommandArguments="--temp=d: --debug"
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NJH"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor="0"
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>
diff --git a/contrib/Windows/Projects/clamAV/libclamav/stdafx.cpp b/contrib/Windows/Projects/clamAV/libclamav/stdafx.cpp
deleted file mode 100755
index f0ca8b8..0000000
--- a/contrib/Windows/Projects/clamAV/libclamav/stdafx.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// stdafx.cpp : source file that includes just the standard includes
-// libclamav.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/contrib/Windows/Projects/clamAV/libclamav/stdafx.h b/contrib/Windows/Projects/clamAV/libclamav/stdafx.h
deleted file mode 100755
index a13982c..0000000
--- a/contrib/Windows/Projects/clamAV/libclamav/stdafx.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
-#pragma once
-
-// Modify the following defines if you have to target a platform prior to the ones specified below.
-// Refer to MSDN for the latest info on corresponding values for different platforms.
-#ifndef WINVER				// Allow use of features specific to Windows XP or later.
-#define WINVER 0x0501		// Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#ifndef _WIN32_WINNT		// Allow use of features specific to Windows XP or later.                   
-#define _WIN32_WINNT 0x0501	// Change this to the appropriate value to target other versions of Windows.
-#endif						
-
-#ifndef _WIN32_WINDOWS		// Allow use of features specific to Windows 98 or later.
-#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
-#endif
-
-#ifndef _WIN32_IE			// Allow use of features specific to IE 6.0 or later.
-#define _WIN32_IE 0x0600	// Change this to the appropriate value to target other versions of IE.
-#endif
-
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-// Windows Header Files:
-#include <windows.h>
-
-
-
-// TODO: reference additional headers your program requires here
diff --git a/contrib/Windows/Projects/clamAV/libclamav/syslog.h b/contrib/Windows/Projects/clamAV/libclamav/syslog.h
deleted file mode 100755
index 3ba8839..0000000
--- a/contrib/Windows/Projects/clamAV/libclamav/syslog.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *  Copyright (C) 2008 Nigel Horne <njh at bandsman.co.uk>
- *
- *  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 Street, Fifth Floor, Boston,
- *  MA 02110-1301, USA.
- *
- * Syslog compatibility for Windows
- * Tested under Microsoft Visual Studio 2005
- */
- 
-#include "eventlog.h"	/* generated from eventlog.mc by mc -U eventlog.mc */
-
-#define	LOG_ERR		EVENTLOG_ERROR_TYPE	/* or EVENTLOG_AUDIT_FAILURE? */
-#define	LOG_WARNING	EVENTLOG_WARNING_TYPE
-#define	LOG_INFO	EVENTLOG_INFORMATION_TYPE
-#define	LOG_DEBUG	EVENTLOG_INFORMATION_TYPE
-
-/* Only support LOG_MAIL and LOG_LOCAL facilities for now */
-#define LOG_MAIL        (2<<3)
-#define	LOG_LOCAL6	(22<<3)
-
-#define	LOG_PID		0x01
-
-void	openlog(const char *name, int options, int facility);
-void	closelog(void);
-void	syslog(int level, const char *format, ...);
\ No newline at end of file
diff --git a/contrib/Windows/Projects/clamAV/libclamav/target.h b/contrib/Windows/Projects/clamAV/libclamav/target.h
deleted file mode 100755
index 3c648fc..0000000
--- a/contrib/Windows/Projects/clamAV/libclamav/target.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* automatically generated by configure */
-/* on Tue Jul 25 10:34:15 GMTDT 2006 */
-/* target uppercase defines */
- 
-#ifndef TARGET_OS_WINDOWS
-#define TARGET_OS_WINDOWS "windows"
-#endif
- 
-#ifndef TARGET_OS_TYPE
-#define TARGET_OS_TYPE "windows"
-#endif
- 
-#ifndef TARGET_CPU_I686
-#define TARGET_CPU_I686 "i686"
-#endif
- 
-#ifndef TARGET_CPU_I
-#define TARGET_CPU_I "i686"
-#endif
- 
-#ifndef TARGET_CPU_TYPE
-#define TARGET_CPU_TYPE "i686"
-#endif
- 
-#ifndef TARGET_ARCH_I386
-#define TARGET_ARCH_I386 "i386"
-#endif
- 
-#ifndef TARGET_ARCH_TYPE
-#define TARGET_ARCH_TYPE "i386"
-#endif
-/* host uppercase defines */
- 
-#ifndef HOST_OS_WINDOWS
-#define HOST_OS_WINDOWS "windows"
-#endif
- 
-#ifndef HOST_OS_TYPE
-#define HOST_OS_TYPE "cygwin"
-#endif
- 
-#ifndef HOST_CPU_I686
-#define HOST_CPU_I686 "i686"
-#endif
- 
-#ifndef HOST_CPU_I
-#define HOST_CPU_I "i686"
-#endif
- 
-#ifndef HOST_CPU_TYPE
-#define HOST_CPU_TYPE "i686"
-#endif
- 
-#ifndef HOST_ARCH_I386
-#define HOST_ARCH_I386 "i386"
-#endif
- 
-#ifndef HOST_ARCH_TYPE
-#define HOST_ARCH_TYPE "i386"
-#endif
diff --git a/contrib/Windows/Projects/clamAV/libclamunrar/libclamunrar.def b/contrib/Windows/Projects/clamAV/libclamunrar/libclamunrar.def
deleted file mode 100755
index de8a797..0000000
--- a/contrib/Windows/Projects/clamAV/libclamunrar/libclamunrar.def
+++ /dev/null
@@ -1,7 +0,0 @@
-LIBRARY libClamunrar
-VERSION 0.92.1
-EXPORTS rar_unpack @1
-EXPORTS rar_init_filters @2
-EXPORTS ppm_destructor @3
-EXPORTS ppm_constructor @4
-EXPORTS rarvm_free @5
\ No newline at end of file
diff --git a/contrib/Windows/Projects/clamAV/libclamunrar/libclamunrar.vcproj b/contrib/Windows/Projects/clamAV/libclamunrar/libclamunrar.vcproj
deleted file mode 100755
index 8de720a..0000000
--- a/contrib/Windows/Projects/clamAV/libclamunrar/libclamunrar.vcproj
+++ /dev/null
@@ -1,287 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="libclamunrar"
-	ProjectGUID="{5DDAE32F-E48B-4AEC-AF14-360C58069AF3}"
-	RootNamespace="libclamunrar"
-	Keyword="MFCDLLProj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="false"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				UseUnicodeResponseFiles="false"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\libclamav&quot;;&quot;$(ProjectDir)..&quot;"
-				PreprocessorDefinitions="_USE_32BIT_TIME_T;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB;_DEBUG"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				UseUnicodeResponseFiles="false"
-				Version="0.92.1"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(InputDir)/libclamunrar.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				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="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			UseOfMFC="0"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="false"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\libclamav&quot;;&quot;$(ProjectDir)..&quot;"
-				PreprocessorDefinitions="_USE_32BIT_TIME_T;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="1033"
-				AdditionalIncludeDirectories="$(IntDir)"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				UseUnicodeResponseFiles="false"
-				Version="0.92.1"
-				LinkIncremental="1"
-				ModuleDefinitionFile="$(InputDir)/libclamunrar.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				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="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\unrar.c"
-				>
-			</File>
-			<File
-				RelativePath=".\unrar15.c"
-				>
-			</File>
-			<File
-				RelativePath=".\unrar20.c"
-				>
-			</File>
-			<File
-				RelativePath=".\unrarcmd.c"
-				>
-			</File>
-			<File
-				RelativePath=".\unrarfilter.c"
-				>
-			</File>
-			<File
-				RelativePath=".\unrarhlp.c"
-				>
-			</File>
-			<File
-				RelativePath=".\unrarppm.c"
-				>
-			</File>
-			<File
-				RelativePath=".\unrarvm.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\unrar.h"
-				>
-			</File>
-			<File
-				RelativePath=".\unrar15.h"
-				>
-			</File>
-			<File
-				RelativePath=".\unrar20.h"
-				>
-			</File>
-			<File
-				RelativePath=".\unrarcmd.h"
-				>
-			</File>
-			<File
-				RelativePath=".\unrarfilter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\unrarhlp.h"
-				>
-			</File>
-			<File
-				RelativePath=".\unrarppm.h"
-				>
-			</File>
-			<File
-				RelativePath=".\unrarvm.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			>
-			<File
-				RelativePath=".\libclamunrar.def"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/contrib/Windows/Projects/clamAV/libclamunrar/libclamunrar.vcproj.NJH.Nigel Horne.user b/contrib/Windows/Projects/clamAV/libclamunrar/libclamunrar.vcproj.NJH.Nigel Horne.user
deleted file mode 100755
index dd7674a..0000000
--- a/contrib/Windows/Projects/clamAV/libclamunrar/libclamunrar.vcproj.NJH.Nigel Horne.user	
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="8.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				Command=""
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NJH"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				Command=""
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NJH"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>
diff --git a/contrib/Windows/Projects/clamAV/libclamunrar_iface/libclamunrar_iface.def b/contrib/Windows/Projects/clamAV/libclamunrar_iface/libclamunrar_iface.def
deleted file mode 100644
index 6448f8e..0000000
--- a/contrib/Windows/Projects/clamAV/libclamunrar_iface/libclamunrar_iface.def
+++ /dev/null
@@ -1,6 +0,0 @@
-LIBRARY libClamunrar_iface
-VERSION 0.92.1
-EXPORTS unrar_extract_next @1
-EXPORTS unrar_extract_next_prepare @2
-EXPORTS unrar_open @3
-EXPORTS unrar_close @4
\ No newline at end of file
diff --git a/contrib/Windows/Projects/clamAV/libclamunrar_iface/libclamunrar_iface.vcproj b/contrib/Windows/Projects/clamAV/libclamunrar_iface/libclamunrar_iface.vcproj
deleted file mode 100755
index 972ebdf..0000000
--- a/contrib/Windows/Projects/clamAV/libclamunrar_iface/libclamunrar_iface.vcproj
+++ /dev/null
@@ -1,215 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="libclamunrar_iface"
-	ProjectGUID="{FA8BFB8E-F74F-4A71-A474-D2167B432E36}"
-	RootNamespace="libclamunrar_iface"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)..\libclamav&quot;"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;_USE_32BIT_TIME_T;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="0"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(TargetDir)\libclamav.lib&quot; &quot;$(TargetDir)\libclamunrar.lib&quot;"
-				LinkIncremental="2"
-				ModuleDefinitionFile="$(InputDir)/libclamunrar_iface.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				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="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="&quot;$(SolutionDir)&quot;;&quot;$(ProjectDir)..\libclamav&quot;"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBCLAMUNRAR_IFACE_EXPORTS;_USE_32BIT_TIME_T;HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB"
-				StringPooling="true"
-				ExceptionHandling="0"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="&quot;$(TargetDir)\libclamav.lib&quot; &quot;$(TargetDir)\libclamunrar.lib&quot;"
-				LinkIncremental="1"
-				ModuleDefinitionFile="$(InputDir)/libclamunrar_iface.def"
-				GenerateDebugInformation="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				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="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\unrar_iface.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\unrar_iface.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			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=".\libclamunrar_iface.def"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/contrib/Windows/Projects/clamAV/libclamunrar_iface/libclamunrar_iface.vcproj.NJH.Nigel Horne.user b/contrib/Windows/Projects/clamAV/libclamunrar_iface/libclamunrar_iface.vcproj.NJH.Nigel Horne.user
deleted file mode 100755
index dd7674a..0000000
--- a/contrib/Windows/Projects/clamAV/libclamunrar_iface/libclamunrar_iface.vcproj.NJH.Nigel Horne.user	
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="8.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				Command=""
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NJH"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				Command=""
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NJH"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>
diff --git a/contrib/Windows/Projects/clamAV/patches b/contrib/Windows/Projects/clamAV/patches
deleted file mode 100644
index acf05ee..0000000
--- a/contrib/Windows/Projects/clamAV/patches
+++ /dev/null
@@ -1,569 +0,0 @@
-*** /home/njh/src/clamav-devel/trunk/./clamdscan/client.c	2008-01-23 16:19:16.000000000 +0000
---- ./clamdscan/client.c	2008-02-25 15:57:20.000000000 +0000
-***************
-*** 15,36 ****
---- 15,44 ----
-   *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   *  MA 02110-1301, USA.
-   */
-+ #ifdef	_MSC_VER
-+ #include <winsock.h>
-+ #endif
-+ 
-  
-  #if HAVE_CONFIG_H
-  #include "clamav-config.h"
-  #endif
-  
-  #include <stdio.h>
-+ #ifdef	HAVE_UNISTD_H
-  #include <unistd.h>
-+ #endif
-  #include <string.h>
-  #include <sys/types.h>
-  #include <sys/stat.h>
-+ #ifndef	C_WINDOWS
-  #include <sys/socket.h>
-  #include <sys/un.h>
-  #include <netinet/in.h>
-  #include <arpa/inet.h>
-  #include <netdb.h>
-  #include <utime.h>
-+ #endif
-  #include <errno.h>
-  
-  #ifdef HAVE_SYS_UIO_H
-***************
-*** 52,60 ****
---- 60,137 ----
-  # define SOCKET_INET	AF_INET
-  #endif
-  
-+ #ifndef	C_WINDOWS
-+ #define	closesocket(s)	close(s)
-+ #endif
-+ 
-+ /* #define ENABLE_FD_PASSING	    FIXME: Doesn't work yet */
-+ 
-  void move_infected(const char *filename, const struct optstruct *opt);
-  int notremoved = 0, notmoved = 0;
-  
-+ #ifdef	C_WINDOWS
-+ static  int     get_a_line(int sockd, char *buf, size_t len);
-+ 
-+ static int
-+ dsresult(int sockd, const struct optstruct *opt)
-+ {
-+ 	char buff[BUFSIZ], *pt;
-+ 	int infected = 0, waserror = 0;
-+ 
-+ 	while(get_a_line(sockd, buff, sizeof(buff))) {
-+ 		if(strstr(buff, "FOUND\n")) {
-+ 			infected++;
-+ 			logg("%s", buff);
-+ 			if(opt_check(opt, "move") || opt_check(opt, "copy")) {
-+ 				/* filename: Virus FOUND */
-+ 				if((pt = strrchr(buff, ':'))) {
-+ 					*pt = 0;
-+ 					move_infected(buff, opt);
-+ 				} else
-+ 					mprintf("@Broken data format. File not %s.\n", opt_check(opt, "move") ? "moved" : "copied");
-+ 			} else if(opt_check(opt, "remove")) {
-+ 				if(!(pt = strrchr(buff, ':')))
-+ 					mprintf("@Broken data format. File not removed.\n");
-+ 				else {
-+ 					*pt = 0;
-+ 					if(unlink(buff)) {
-+ 						mprintf("~%s: Can't remove.\n", buff);
-+ 						logg("~%s: Can't remove.\n", buff);
-+ 						notremoved++;
-+ 					} else {
-+ 						mprintf("~%s: Removed.\n", buff);
-+ 						logg("~%s: Removed.\n", buff);
-+ 					}
-+ 				}
-+ 			}
-+ 		}
-+ 
-+ 		if(strstr(buff, "ERROR\n")) {
-+ 			logg("%s", buff);
-+ 			waserror = 1;
-+ 		}
-+ 	}
-+ 
-+ 	return infected ? infected : (waserror ? -1 : 0);
-+ }
-+ 
-+ static int
-+ get_a_line(int sockd, char *buf, size_t len)
-+ {
-+ 	char *ptr;
-+ 
-+ 	for(ptr = buf; ptr < &buf[len]; ptr++) {
-+ 		/* FIXME: very inefficient to call recv so many times */
-+ 		if(recv(sockd, ptr, sizeof(char), 0) <= 0)
-+ 			return 0;
-+ 		if(*ptr == '\n') {
-+ 			*++ptr = '\0';
-+ 			return 1;
-+ 		}
-+ 	}
-+ 	return 1;
-+ }
-+ #else
-  static int dsresult(int sockd, const struct optstruct *opt)
-  {
-  	int infected = 0, waserror = 0;
-***************
-*** 64,71 ****
-  
-  #ifndef C_OS2
-      if((fd = fdopen(dup(sockd), "r")) == NULL) {
-! #else /* FIXME: accoriding to YD OS/2 does not support dup() for sockets */
-!     if((fd = fdopen(sockd, "r")) == NULL) {
-  #endif
-  	logg("^Can't open descriptor for reading.\n");
-  	return -1;
---- 141,148 ----
-  
-  #ifndef C_OS2
-      if((fd = fdopen(dup(sockd), "r")) == NULL) {
-! #else /* FIXME: according to YD OS/2 does not support dup() for sockets */
-!     if((fd = fdopen(sockd, "rb")) == NULL) {
-  #endif
-  	logg("^Can't open descriptor for reading.\n");
-  	return -1;
-***************
-*** 90,101 ****
-  		} else {
-  		    *pt = 0;
-  		    if(unlink(buff)) {
-! 			mprintf("~%s: Can't remove.\n", buff);
-! 			logg("~%s: Can't remove.\n", buff);
-  			notremoved++;
-  		    } else {
-! 			mprintf("~%s: Removed.\n", buff);
-! 			logg("~%s: Removed.\n", buff);
-  		    }
-  		}
-  	    }
---- 167,178 ----
-  		} else {
-  		    *pt = 0;
-  		    if(unlink(buff)) {
-! 			mprintf("%s: Can't remove.\n", buff);
-! 			logg("%s: Can't remove.\n", buff);
-  			notremoved++;
-  		    } else {
-! 			mprintf("%s: Removed.\n", buff);
-! 			logg("%s: Removed.\n", buff);
-  		    }
-  		}
-  	    }
-***************
-*** 113,118 ****
---- 190,196 ----
-  
-      return infected ? infected : (waserror ? -1 : 0);
-  }
-+ #endif	/*C_WINDOWS*/
-  
-  static int dsfile(int sockd, const char *scantype, const char *filename, const struct optstruct *opt)
-  {
-***************
-*** 123,129 ****
-      scancmd = malloc(strlen(filename) + 20);
-      sprintf(scancmd, "%s %s", scantype, filename);
-  
-!     if(write(sockd, scancmd, strlen(scancmd)) <= 0) {
-  	logg("^Can't write to the socket.\n");
-  	free(scancmd);
-  	return -1;
---- 201,207 ----
-      scancmd = malloc(strlen(filename) + 20);
-      sprintf(scancmd, "%s %s", scantype, filename);
-  
-!     if(send(sockd, scancmd, strlen(scancmd), 0) <= 0) {
-  	logg("^Can't write to the socket.\n");
-  	free(scancmd);
-  	return -1;
-***************
-*** 148,161 ****
-  	char buff[4096], *pt;
-  
-  
-!     if(write(sockd, "STREAM", 6) <= 0) {
-  	logg("^Can't write to the socket.\n");
-  	return 2;
-      }
-  
-      while(loopw) {
-  	memset(buff, 0, sizeof(buff));
-! 	if(read(sockd, buff, sizeof(buff)) > 0) {
-  	    if((pt = strstr(buff, "PORT"))) {
-  		pt += 5;
-  		sscanf(pt, "%d", &port);
---- 226,239 ----
-  	char buff[4096], *pt;
-  
-  
-!     if(send(sockd, "STREAM", 6, 0) <= 0) {
-  	logg("^Can't write to the socket.\n");
-  	return 2;
-      }
-  
-      while(loopw) {
-  	memset(buff, 0, sizeof(buff));
-! 	if(recv(sockd, buff, sizeof(buff), 0) > 0) {
-  	    if((pt = strstr(buff, "PORT"))) {
-  		pt += 5;
-  		sscanf(pt, "%d", &port);
-***************
-*** 201,207 ****
-      }
-  
-      if(connect(wsockd, (struct sockaddr *) &server, sizeof(struct sockaddr_in)) < 0) {
-! 	close(wsockd);
-  	perror("connect()");
-  	logg("^Can't connect to clamd [port: %d].\n", port);
-  	return -1;
---- 279,285 ----
-      }
-  
-      if(connect(wsockd, (struct sockaddr *) &server, sizeof(struct sockaddr_in)) < 0) {
-! 	closesocket(wsockd);
-  	perror("connect()");
-  	logg("^Can't connect to clamd [port: %d].\n", port);
-  	return -1;
-***************
-*** 210,220 ****
-      while((bread = read(0, buff, sizeof(buff))) > 0) {
-  	if(write(wsockd, buff, bread) <= 0) {
-  	    logg("^Can't write to the socket.\n");
-! 	    close(wsockd);
-  	    return -1;
-  	}
-      }
-!     close(wsockd);
-  
-      memset(buff, 0, sizeof(buff));
-      while((bread = read(sockd, buff, sizeof(buff))) > 0) {
---- 288,298 ----
-      while((bread = read(0, buff, sizeof(buff))) > 0) {
-  	if(write(wsockd, buff, bread) <= 0) {
-  	    logg("^Can't write to the socket.\n");
-! 	    closesocket(wsockd);
-  	    return -1;
-  	}
-      }
-!     closesocket(wsockd);
-  
-      memset(buff, 0, sizeof(buff));
-      while((bread = read(sockd, buff, sizeof(buff))) > 0) {
-***************
-*** 259,265 ****
---- 337,345 ----
-  
-  static int dconnect(const struct optstruct *opt)
-  {
-+ #ifndef	C_WINDOWS
-  	struct sockaddr_un server;
-+ #endif
-  	struct sockaddr_in server2;
-  	struct hostent *he;
-  	struct cfgstruct *copt;
-***************
-*** 276,288 ****
---- 356,374 ----
-  	return -1;
-      }
-  
-+ #ifndef	C_WINDOWS
-      memset((char *) &server, 0, sizeof(server));
-+ #endif
-      memset((char *) &server2, 0, sizeof(server2));
-  
-      /* Set default address to connect to */
-      server2.sin_addr.s_addr = inet_addr("127.0.0.1");    
-  
-      if((cpt = cfgopt(copt, "LocalSocket"))->enabled) {
-+ #ifdef	C_WINDOWS
-+ 	logg("^LocalSocket is not supported under Windows");
-+ 	return -1;
-+ #else
-  
-  	server.sun_family = AF_UNIX;
-  	strncpy(server.sun_path, cpt->strarg, sizeof(server.sun_path));
-***************
-*** 301,308 ****
-  	    freecfg(copt);
-  	    return -1;
-  	}
-  
-!     } else if((cpt = cfgopt(copt, "TCPSocket"))->enabled) {
-  
-  	if((sockd = socket(SOCKET_INET, SOCK_STREAM, 0)) < 0) {
-  	    perror("socket()");
---- 387,404 ----
-  	    freecfg(copt);
-  	    return -1;
-  	}
-+ #endif
-+   
-+ 	} else if((cpt = cfgopt(copt, "TCPSocket"))->enabled) {
-+ #ifdef  C_WINDOWS
-+ 	WSADATA wsaData;
-  
-! 	if(WSAStartup(MAKEWORD(2,2), &wsaData) != NO_ERROR) {
-! 		logg("!Error at WSAStartup(): %d\n", WSAGetLastError());
-! 		return -1;
-! 	}
-! #endif
-!   
-  
-  	if((sockd = socket(SOCKET_INET, SOCK_STREAM, 0)) < 0) {
-  	    perror("socket()");
-***************
-*** 316,322 ****
-  
-  	if((cpt = cfgopt(copt, "TCPAddr"))->enabled) {
-  	    if ((he = gethostbyname(cpt->strarg)) == 0) {
-! 		close(sockd);
-  		perror("gethostbyname()");
-  		logg("^Can't lookup clamd hostname.\n");
-  		freecfg(copt);
---- 412,418 ----
-  
-  	if((cpt = cfgopt(copt, "TCPAddr"))->enabled) {
-  	    if ((he = gethostbyname(cpt->strarg)) == 0) {
-! 		closesocket(sockd);
-  		perror("gethostbyname()");
-  		logg("^Can't lookup clamd hostname.\n");
-  		freecfg(copt);
-***************
-*** 326,332 ****
-  	}
-  
-  	if(connect(sockd, (struct sockaddr *) &server2, sizeof(struct sockaddr_in)) < 0) {
-! 	    close(sockd);
-  	    perror("connect()");
-  	    logg("^Can't connect to clamd.\n");
-  	    freecfg(copt);
---- 422,428 ----
-  	}
-  
-  	if(connect(sockd, (struct sockaddr *) &server2, sizeof(struct sockaddr_in)) < 0) {
-! 	    closesocket(sockd);
-  	    perror("connect()");
-  	    logg("^Can't connect to clamd.\n");
-  	    freecfg(copt);
-***************
-*** 396,402 ****
-  	else
-  	    errors++;
-  
-! 	close(sockd);
-  
-      } else if(!strcmp(opt->filename, "-")) { /* scan data from stdin */
-  	if((sockd = dconnect(opt)) < 0)
---- 492,498 ----
-  	else
-  	    errors++;
-  
-! 	closesocket(sockd);
-  
-      } else if(!strcmp(opt->filename, "-")) { /* scan data from stdin */
-  	if((sockd = dconnect(opt)) < 0)
-***************
-*** 407,413 ****
-  	else
-  	    errors++;
-  
-! 	close(sockd);
-  
-      } else {
-  	int x;
---- 503,509 ----
-  	else
-  	    errors++;
-  
-! 	closesocket(sockd);
-  
-      } else {
-  	int x;
-***************
-*** 441,447 ****
-  			else
-  			    errors++;
-  
-! 			close(sockd);
-  			break;
-  
-  		    default:
---- 537,543 ----
-  			else
-  			    errors++;
-  
-! 			closesocket(sockd);
-  			break;
-  
-  		    default:
-***************
-*** 464,470 ****
---- 560,568 ----
-  	struct stat ofstat, mfstat;
-  	int n, len, movefilename_size;
-  	int moveflag = opt_check(opt, "move");
-+ #ifndef	C_WINDOWS
-  	struct utimbuf ubuf;
-+ #endif
-  
-  
-      if((moveflag && !(movedir = opt_arg(opt, "move"))) ||
-***************
-*** 551,559 ****
---- 649,660 ----
-  	if(chown(movefilename, ofstat.st_uid, ofstat.st_gid) == -1)
-  	    logg("^chown() failed for %s: %s\n", movefilename, strerror(errno));
-  
-+ 
-+ #ifndef	C_WINDOWS
-  	ubuf.actime = ofstat.st_atime;
-  	ubuf.modtime = ofstat.st_mtime;
-  	utime(movefilename, &ubuf);
-+ #endif
-  
-  	if(moveflag && unlink(filename)) {
-  	    logg("^cannot unlink '%s': %s\n", filename, strerror(errno));
-*** /home/njh/src/clamav-devel/trunk/./clamdscan/clamdscan.c	2008-01-21 20:56:26.000000000 +0000
---- ./clamdscan/clamdscan.c	2008-01-21 20:52:50.000000000 +0000
-***************
-*** 15,30 ****
-   *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   *  MA 02110-1301, USA.
-   */
-  
-  #if HAVE_CONFIG_H
-  #include "clamav-config.h"
-  #endif
-- 
-  #include <stdio.h>
-  #include <string.h>
-  #include <stdlib.h>
-  #include <unistd.h>
-  #include <sys/time.h>
-  #include <time.h>
-  #include <signal.h>
-  
---- 15,42 ----
-   *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-   *  MA 02110-1301, USA.
-   */
-+  
-+ #ifdef	_MSC_VER
-+ #include <windows.h>
-+ #include <winsock.h>
-+ #endif
-  
-  #if HAVE_CONFIG_H
-  #include "clamav-config.h"
-  #endif
-  #include <stdio.h>
-  #include <string.h>
-  #include <stdlib.h>
-+ #ifdef	HAVE_UNISTD_H
-  #include <unistd.h>
-+ #endif
-+ #ifdef	C_WINDOWS
-+ #ifdef	CL_THREAD_SAFE
-+ #include <pthread.h>
-+ #endif
-+ #else
-  #include <sys/time.h>
-+ #endif
-  #include <time.h>
-  #include <signal.h>
-  
-***************
-*** 61,67 ****
---- 73,81 ----
-  {
-  	int ds, dms, ret, infected;
-  	struct timeval t1, t2;
-+ #ifndef	C_WINDOWS
-  	struct timezone tz;
-+ #endif
-  	time_t starttime;
-  	struct optstruct *opt;
-  	const char *clamdscan_accepted[] = { "help", "version", "verbose", "quiet",
-***************
-*** 70,75 ****
---- 84,96 ----
-  				  "disable-summary", "multiscan", NULL };
-  
-  
-+ #ifdef	C_WINDOWS
-+ 	if(!pthread_win32_process_attach_np()) {
-+ 		mprintf("!Can't start the win32 pthreads layer\n");
-+ 		return 1;
-+ 	}
-+ #endif
-+ 
-      opt = opt_parse(argc, argv, clamscan_shortopt, clamscan_longopt, clamdscan_accepted);
-      if(!opt) {
-  	mprintf("!Can't parse the command line\n");
-***************
-*** 117,129 ****
-      time(&starttime);
-      /* ctime() does \n, but I need it once more */
-  
-!     gettimeofday(&t1, &tz);
-  
-      ret = client(opt, &infected);
-  
-      /* TODO: Implement STATUS in clamd */
-      if(!opt_check(opt, "disable-summary") && !opt_check(opt, "no-summary")) {
-  	gettimeofday(&t2, &tz);
-  	ds = t2.tv_sec - t1.tv_sec;
-  	dms = t2.tv_usec - t1.tv_usec;
-  	ds -= (dms < 0) ? (1):(0);
---- 138,158 ----
-      time(&starttime);
-      /* ctime() does \n, but I need it once more */
-  
-! #ifdef	C_WINDOWS
-! 	gettimeofday(&t1, NULL);
-! #else
-! 	gettimeofday(&t1, &tz);
-! #endif
-  
-      ret = client(opt, &infected);
-  
-      /* TODO: Implement STATUS in clamd */
-      if(!opt_check(opt, "disable-summary") && !opt_check(opt, "no-summary")) {
-+ #ifdef	C_WINDOWS
-+ 	gettimeofday(&t2, NULL);
-+ #else
-  	gettimeofday(&t2, &tz);
-+ #endif
-  	ds = t2.tv_sec - t1.tv_sec;
-  	dms = t2.tv_usec - t1.tv_usec;
-  	ds -= (dms < 0) ? (1):(0);
-***************
-*** 140,145 ****
---- 169,183 ----
-      }
-  
-      opt_free(opt);
-+ 
-+ #ifdef	C_WINDOWS
-+ 	WSACleanup();
-+ 	if(!pthread_win32_process_detach_np()) {
-+ 		mprintf("!Can't stop the win32 pthreads layer\n");
-+ 		return 1;
-+ 	}
-+ #endif
-+ 
-      exit(ret);
-  }
-  
diff --git a/contrib/Windows/Projects/clamAV/shared/shared.vcproj b/contrib/Windows/Projects/clamAV/shared/shared.vcproj
deleted file mode 100755
index 01bac3f..0000000
--- a/contrib/Windows/Projects/clamAV/shared/shared.vcproj
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="shared"
-	ProjectGUID="{A2FD531E-3326-4970-8003-62D9C7551BAA}"
-	RootNamespace="shared"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				UseUnicodeResponseFiles="false"
-				Optimization="0"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\libclamav\pthread&quot;;&quot;$(ProjectDir)..\shared&quot;;&quot;$(ProjectDir)..\libclamav&quot;;&quot;$(ProjectDir)..&quot;"
-				PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB;_DEBUG"
-				StringPooling="true"
-				MinimalRebuild="true"
-				ExceptionHandling="2"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				StructMemberAlignment="0"
-				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="2"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="4"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				UseUnicodeResponseFiles="false"
-				AdditionalIncludeDirectories="&quot;$(ProjectDir)..\libclamav\pthread&quot;;&quot;$(ProjectDir)..\shared&quot;;&quot;$(ProjectDir)..\libclamav&quot;;&quot;$(ProjectDir)..&quot;"
-				PreprocessorDefinitions="HAVE_CONFIG_H;_CRT_SECURE_NO_DEPRECATE;PTW32_STATIC_LIB"
-				StringPooling="true"
-				ExceptionHandling="2"
-				RuntimeLibrary="2"
-				StructMemberAlignment="3"
-				TreatWChar_tAsBuiltInType="false"
-				UsePrecompiledHeader="2"
-				WarningLevel="4"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLibrarianTool"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\cdiff.c"
-				>
-			</File>
-			<File
-				RelativePath=".\cfgparser.c"
-				>
-			</File>
-			<File
-				RelativePath=".\getopt.c"
-				>
-			</File>
-			<File
-				RelativePath=".\misc.c"
-				>
-			</File>
-			<File
-				RelativePath=".\options.c"
-				>
-			</File>
-			<File
-				RelativePath=".\output.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\cdiff.h"
-				>
-			</File>
-			<File
-				RelativePath=".\cfgparser.h"
-				>
-			</File>
-			<File
-				RelativePath=".\getopt.h"
-				>
-			</File>
-			<File
-				RelativePath=".\misc.h"
-				>
-			</File>
-			<File
-				RelativePath=".\network.h"
-				>
-			</File>
-			<File
-				RelativePath=".\options.h"
-				>
-			</File>
-			<File
-				RelativePath=".\output.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			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}"
-			>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
diff --git a/contrib/Windows/Projects/clamAV/shared/shared.vcproj.NJH.Nigel Horne.user b/contrib/Windows/Projects/clamAV/shared/shared.vcproj.NJH.Nigel Horne.user
deleted file mode 100755
index dd7674a..0000000
--- a/contrib/Windows/Projects/clamAV/shared/shared.vcproj.NJH.Nigel Horne.user	
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="8.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				Command=""
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NJH"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				Command=""
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NJH"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>
diff --git a/contrib/Windows/Projects/clamAV/shared/stdafx.cpp b/contrib/Windows/Projects/clamAV/shared/stdafx.cpp
deleted file mode 100755
index 36daea3..0000000
--- a/contrib/Windows/Projects/clamAV/shared/stdafx.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// stdafx.cpp : source file that includes just the standard includes
-// shared.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
-#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/contrib/Windows/Projects/clamAV/shared/stdafx.h b/contrib/Windows/Projects/clamAV/shared/stdafx.h
deleted file mode 100755
index a13982c..0000000
--- a/contrib/Windows/Projects/clamAV/shared/stdafx.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
-#pragma once
-
-// Modify the following defines if you have to target a platform prior to the ones specified below.
-// Refer to MSDN for the latest info on corresponding values for different platforms.
-#ifndef WINVER				// Allow use of features specific to Windows XP or later.
-#define WINVER 0x0501		// Change this to the appropriate value to target other versions of Windows.
-#endif
-
-#ifndef _WIN32_WINNT		// Allow use of features specific to Windows XP or later.                   
-#define _WIN32_WINNT 0x0501	// Change this to the appropriate value to target other versions of Windows.
-#endif						
-
-#ifndef _WIN32_WINDOWS		// Allow use of features specific to Windows 98 or later.
-#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
-#endif
-
-#ifndef _WIN32_IE			// Allow use of features specific to IE 6.0 or later.
-#define _WIN32_IE 0x0600	// Change this to the appropriate value to target other versions of IE.
-#endif
-
-#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
-// Windows Header Files:
-#include <windows.h>
-
-
-
-// TODO: reference additional headers your program requires here
diff --git a/contrib/Windows/Projects/readme.txt b/contrib/Windows/Projects/readme.txt
deleted file mode 100644
index b5863bb..0000000
--- a/contrib/Windows/Projects/readme.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-This directory contains the files needed to build ClamAV under Windows
-using Visual Studio 2005, thus avoiding emulation layers such as Cygwin.
-
-Some patches are needed against the rest of SVN for the code to
-compile (most of them are trivial), see clamAV/patches.
-
-You will need to get hold of w32-pthreads version 2.6, or later, from
-http://sourceware.org/pthreads-win32/ and install pthreadVC2.dll into a
-location that CLamAV can find, such as c:\Program Files\ClamAV\pthreadVC2.dll.
-You will need to create a folder "libclamav\pthread" and these files into
-there: config.h, pthread.h, pthreadVC2.dll, pthreadVC2.lib, sched.h,
-semaphore.h.
-
-You will need to download the zlib source from http://www.zlib.net/
-and install the .c and .h files into .../libclamav/zlib.
-
-Thanks to acab at clamav.net for adding libclamav.dll support, and to
-edwin at clamav.net for testing it all and for pthreads support as a DLL.
-
-TODO:	Support GMP
-	virusaction is not supported
-	A plugin to MS Exchange
-	On access scanning
-	Scan when a screensaver kicks in
-	zlib should be DLL, not bundled into libclamav.dll (needs thought
-		on the C runtime library)
-
--Nigel Horne
diff --git a/win32/README b/win32/README
new file mode 100644
index 0000000..2deb5e5
--- /dev/null
+++ b/win32/README
@@ -0,0 +1,60 @@
+ClamAV for Win32
+----------------
+
+0- Requirements
+
+To build the source code you will need:
+- Git for windows with a git "shell"
+- Microsoft Visual Studio 2008 (the express version is just fine)
+
+To run the binaries at least Windows 2000 is required. Microsoft Visual C++ 2008
+runtime libraries needs to be installed on the system. See:
+http://www.microsoft.com/downloads/details.aspx?familyid=9b2da534-3e03-4391-8a4d-074b9f2bc1bf&displaylang=en
+
+
+1- Getting the code
+
+The win32 source code is merged in the ClamAV repository and is available
+via git.
+Clone the repository with: git clone git://git.clamav.net/git/clamav-devel
+See http://www.clamav.net/download/sources for more info.
+
+
+2- Code configuration
+
+After downloading the source code, minimal configuration is required:
+just run the win32/configure.bat script *from within the git shell*.
+Skip this step if you are building from an official release tarball.
+
+
+3- Compilation
+
+Open win32/ClamAV.sln in Visual Studio and build all.
+The output directory for the binaries is either /win32/Debug or /win32/Release,
+depending on the configuration you pick.
+
+
+4- Special notes
+
+The ClamAV tools in win32 are the same as in unix, so refer to their respective
+manpage for general usage.
+The major differences are listed below:
+- Config files path search order:
+  1- The content of the registry key "HKEY_LOCAL_MACHINE/Software/ClamAV/ConfDir"
+  2- The directory where libclamav.dll is located
+  3- "C:\ClamAV"
+
+- Database files path search order:
+  1- The content of the registry key "HKEY_LOCAL_MACHINE/Software/ClamAV/DataDir"
+  2- The directory "database" inside the directory where libclamav.dll is located
+  3- "C:\ClamAV\db"
+
+- Globbing
+Since the windows command prompt doesn't take care of wildcard expansion, minimal
+emulation of unix glob() is performed internally. It supports "*" and "?" only.
+
+- File paths
+Please always use the backslash as the path separator.
+SMB Network shares and UNC paths are supported.
+
+

-- 
Debian repository for ClamAV



More information about the Pkg-clamav-commits mailing list