@@ -1,4 +1,4 @@

-<?xml version="1.0" encoding="utf-8"?>

+<?xml version="1.0" encoding="utf-8"?>

 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

   <ItemGroup Label="ProjectConfigurations">

     <ProjectConfiguration Include="Debug|Win32">

@@ -172,11 +172,6 @@

     <ClCompile Include="interface.c" />

     <ClCompile Include="main.c" />

   </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="libclamav.vcxproj">

-      <Project>{09d341e9-7372-46e9-b0d7-caaf77984190}</Project>

-    </ProjectReference>

-  </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

   <ImportGroup Label="ExtensionTargets">

   </ImportGroup>

@@ -44,6 +44,15 @@

 #define CLAMAPI_SUCCESS 0

+/* CLAMAPI LIMITS */

+/* List of limits configurable via Scan_SetLimit and readable via Scan_GetLimit (see below) */

+enum CLAM_LIMIT_TYPE {

+    CLAM_LIMIT_FILESIZE,

+    CLAM_LIMIT_SCANSIZE,

+    CLAM_LIMIT_RECURSION

+};

+

+

 /* CLAMAPI SCAN OPTIONS */

 /* List of options settable via Scan_SetOption and retrievable via Scan_GetOption (see below)

  * All the options have a corresponding unsigned int value (0 = option disabled / non 0 = option enabled)

@@ -252,6 +261,22 @@ int CLAMAPI Scan_DeleteScanInfo(CClamAVScanner *pScanner, PCLAM_SCAN_INFO_LIST p

 /*

  * Get integer based scanning options

  * ex: License Expiration Time, Count of DB signatures, Last updated time for DB, Major, Minor version of scan library

+ * INPUT @param option : limit type

+ * OUTPUT @param value : limit size in bytes

+ */

+int CLAMAPI Scan_GetLimit(int option, unsigned int *value);

+

+/*

+ * Set integer based scanning options

+ * ex: scan Archives, scan packed samples, scan e-mail databases, scan installers

+ * INPUT @param option : limit type

+ * INPUT @param value : limit size in bytes

+ */

+int CLAMAPI Scan_SetLimit(int option, unsigned int value);

+

+/*

+ * Get integer based scanning options

+ * ex: License Expiration Time, Count of DB signatures, Last updated time for DB, Major, Minor version of scan library

  * INPUT @param scanner : opaque object

  * INPUT @param option : option enum

  * INPUT @param value : location to store value

@@ -467,6 +467,80 @@ int CLAMAPI Scan_GetOption(CClamAVScanner *pScanner, int option, void *value, un

     WIN();

 }

+

+int CLAMAPI Scan_GetLimit(int option, unsigned int *value) {

+    enum cl_engine_field limit;

+    long long curlimit;

+    int err;

+

+    INFN();

+    if(lock_engine())

+	FAIL(CL_EMEM, "Failed to lock engine");

+    if(!engine) {

+	unlock_engine();

+	FAIL(CL_EARG, "Engine is NULL");

+    }

+    switch((enum CLAM_LIMIT_TYPE)option) {

+    case CLAM_LIMIT_FILESIZE:

+	limit = CL_ENGINE_MAX_FILESIZE;

+	break;

+    case CLAM_LIMIT_SCANSIZE:

+	limit = CL_ENGINE_MAX_SCANSIZE;

+	break;

+    case CLAM_LIMIT_RECURSION:

+	limit = CL_ENGINE_MAX_SCANSIZE;

+	break;

+    default:

+	unlock_engine();

+	FAIL(CL_EARG, "Unsupported limit type: %d", option);

+    }

+    curlimit = cl_engine_get_num(engine, limit, &err);

+    if(err) {

+	unlock_engine();

+	FAIL(err, "Failed to get engine value: %s", cl_strerror(err));

+    }

+    if(curlimit > 0xffffffff)

+	*value = 0xffffffff;

+    else

+	*value = (unsigned int)curlimit;

+    unlock_engine();

+    WIN();

+}

+

+

+int CLAMAPI Scan_SetLimit(int option, unsigned int value) {

+    enum cl_engine_field limit;

+    int err;

+

+    INFN();

+    if(lock_engine())

+	FAIL(CL_EMEM, "Failed to lock engine");

+    if(!engine) {

+	unlock_engine();

+	FAIL(CL_EARG, "Engine is NULL");

+    }

+    switch((enum CLAM_LIMIT_TYPE)option) {

+    case CLAM_LIMIT_FILESIZE:

+	limit = CL_ENGINE_MAX_FILESIZE;

+	break;

+    case CLAM_LIMIT_SCANSIZE:

+	limit = CL_ENGINE_MAX_SCANSIZE;

+	break;

+    case CLAM_LIMIT_RECURSION:

+	limit = CL_ENGINE_MAX_SCANSIZE;

+	break;

+    default:

+	unlock_engine();

+	FAIL(CL_EARG, "Unsupported limit type: %d", option);

+    }

+    err = cl_engine_set_num(engine, limit, (long long)value);

+    unlock_engine();

+    if(err)

+	FAIL(err, "Failed to set engine value: %s", cl_strerror(err));

+    WIN();

+}

+

+

 int CLAMAPI Scan_ScanObject(CClamAVScanner *pScanner, const wchar_t *pObjectPath, int *pScanStatus, PCLAM_SCAN_INFO_LIST *pInfoList) {

     HANDLE fhdl;

     int res;

@@ -540,7 +614,6 @@ int CLAMAPI Scan_ScanObjectByHandle(CClamAVScanner *pScanner, HANDLE object, int

     do {

 	CLAM_SCAN_INFO si;

 	CLAM_ACTION act;

-	HANDLE fdhdl;

 	DWORD cbperf;

 	wchar_t wvirname[MAX_VIRNAME_LEN];

 	LONG lo = 0, hi = 0, hi2 = 0;