@@ -119,13 +119,17 @@ typedef struct _CLAM_SCAN_INFO {

     const wchar_t *pThreatName;

     /** The handle of the file being processed **/

-    /* Note #1: the handle MUST NOT BE CLOSED by the callback

-     * Note #2: the handle has got GENERIC_READ	access

+    /* Note #1: the handle MUST BE CLOSED by the caller, at any point

+     * Note #2: the has FILE_ATTRIBUTE_TEMPORARY and FILE_FLAG_DELETE_ON_CLOSE attributes

      * Note #3: the file pointer is guaranteed to be set at the begin of

-     *          the file and its position needs not to be reset

-     * Note #4: the file may already be mapped into memory, entirely or just partially */

+     *          the file and its position needs not to be reset */

     /* Presence: SCAN_PHASE_PRESCAN, SCAN_PHASE_POSTSCAN */

     HANDLE object;

+

+    /** An unique identifier for the file being processed **/

+    /* Provided for mapping purposes (type HANDLE for legacy reasons) */

+    /* Presence: SCAN_PHASE_PRESCAN, SCAN_PHASE_POSTSCAN */

+    HANDLE objectId;

     /** The path of inner file relative to file being scanned **/

     /* This applies only to archive for which internal names can be retrieved and is NULL otherwise */

@@ -984,12 +984,14 @@ int CLAMAPI Scan_DeleteScanInfo(CClamAVScanner *pScanner, PCLAM_SCAN_INFO_LIST p

 cl_error_t prescan_cb(int fd, void *context) {

     struct scan_ctx *sctx = (struct scan_ctx *)context;

+    char tmpf[4096];

     instance *inst;

     CLAM_SCAN_INFO si;

     CLAM_ACTION act;

     HANDLE fdhdl;

     DWORD perf;

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

+    long fpos;

+    int rsz;

     if(!context) {

 	logg("!prescan_cb called with NULL clamav context\n");

@@ -1003,18 +1005,42 @@ cl_error_t prescan_cb(int fd, void *context) {

     si.errorCode = CLAMAPI_SUCCESS;

     si.pThreatType = NULL;

     si.pThreatName = NULL;

-    fdhdl = si.object = (HANDLE)_get_osfhandle(fd);

     si.pInnerObjectPath = NULL;

-    lo = SetFilePointer(fdhdl, 0, &hi, FILE_CURRENT);

-    SetFilePointer(fdhdl, 0, &hi2, FILE_BEGIN);

+    while(1) {

+	static int tmpn;

+	snprintf(tmpf, sizeof(tmpf), "%s\\%08x.tmp", tmpdir, ++tmpn);

+	tmpf[sizeof(tmpf)-1] = '\0';

+	fdhdl = CreateFile(tmpf, GENERIC_READ | GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_TEMPORARY | FILE_FLAG_DELETE_ON_CLOSE, NULL);

+	if(fdhdl != INVALID_HANDLE_VALUE) break;

+	/* FIXME: handle non dup filename errors */

+    }

+

+    fpos = lseek(fd, 0, SEEK_CUR);

+    lseek(fd, 0, SEEK_SET);

+    while((rsz = read(fd, tmpf, sizeof(tmpf))) > 0) {

+	    int wsz = 0;

+	    while(wsz != rsz) {

+		DWORD rwsz;

+		if(!WriteFile(fdhdl, &tmpf[wsz], rsz - wsz, &rwsz, NULL)) {

+		    /* FIXME: handle write fail here */

+		}

+		wsz += rwsz;

+	    }

+    }

+    if(rsz) {

+	/* FIXME: handle read fail here */

+    }

+    lseek(fd, fpos, SEEK_SET);

+    SetFilePointer(fdhdl, 0, NULL, FILE_BEGIN);

+    si.object = fdhdl;

+    si.objectId = (HANDLE)_get_osfhandle(fd);

     logg("*prescan_cb (clamav context %p, instance %p) invoking callback %p with context %p\n", context, inst, inst->scancb, inst->scancb_ctx);

     perf = GetTickCount();

     inst->scancb(&si, &act, inst->scancb_ctx);

     perf = GetTickCount() - perf;

     sctx->cb_times += perf;

     logg("*prescan_cb (clamav context %p, instance %p) callback completed with %u in %u ms\n", context, inst, act, perf);

-    SetFilePointer(fdhdl, lo, &hi, FILE_BEGIN);

     switch(act) {

 	case CLAM_ACTION_SKIP:

 	    logg("*prescan_cb (clamav context %p, instance %p) cb result: SKIP\n", context, inst);

@@ -1036,10 +1062,8 @@ cl_error_t postscan_cb(int fd, int result, const char *virname, void *context) {

     instance *inst;

     CLAM_SCAN_INFO si;

     CLAM_ACTION act;

-    HANDLE fdhdl;

     DWORD perf;

     wchar_t wvirname[MAX_VIRNAME_LEN] = L"Clam.";

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

     if(!context) {

 	logg("!postscan_cb called with NULL clamav context\n");

@@ -1062,17 +1086,15 @@ cl_error_t postscan_cb(int fd, int result, const char *virname, void *context) {

 	    si.pThreatName = NULL;

     logg("*in postscan_cb with clamav context %p, instance %p, fd %d, result %d, virusname %S)\n", context, inst, fd, result, si.pThreatName);

     si.pThreatType = threat_type(virname);

-    fdhdl = si.object = (HANDLE)_get_osfhandle(fd);

+    si.objectId = (HANDLE)_get_osfhandle(fd);

+    si.object = INVALID_HANDLE_VALUE;

     si.pInnerObjectPath = NULL;

-    lo = SetFilePointer(fdhdl, 0, &hi, FILE_CURRENT);

-    SetFilePointer(fdhdl, 0, &hi2, FILE_BEGIN);

     logg("*postscan_cb (clamav context %p, instance %p) invoking callback %p with context %p\n", context, inst, inst->scancb, inst->scancb_ctx);

     perf = GetTickCount();

     inst->scancb(&si, &act, inst->scancb_ctx);

     perf = GetTickCount() - perf;

     sctx->cb_times += perf;

     logg("*postscan_cb (clamav context %p, instance %p) callback completed with %u in %u ms\n", context, inst, act, perf);

-    SetFilePointer(fdhdl, lo, &hi, FILE_BEGIN);

     switch(act) {

 	case CLAM_ACTION_SKIP:

 	    logg("*postscan_cb (clamav context %p, instance %p) cb result: SKIP\n", context, inst);