Changeset 2888 for trunk/src

Timestamp:

Sep 6, 2016, 5:02:20 PM (9 years ago)

Author:

bird

Message:

kWorker: skip some unnecessary DeleteFileW calls from cl.exe cleaning up temporary files.

File:

• trunk/src/kWorker/kWorker.c (modified) (3 diffs)

trunk/src/kWorker/kWorker.c

@@ -5442 +5442 @@
     return cwcRet;
 }
+
+
+#ifdef WITH_TEMP_MEMORY_FILES
+/** Kernel32 - DeleteFileW
+ * Skip deleting the in-memory files. */
+static BOOL WINAPI kwSandbox_Kernel32_DeleteFileW(LPCWSTR pwszFilename)
+{
+    BOOL fRc;
+    if (   g_Sandbox.pTool->u.Sandboxed.enmHint == KWTOOLHINT_VISUAL_CPP_CL
+        && kwFsIsClTempFileW(pwszFilename))
+    {
+        KWFS_LOG(("DeleteFileW(%s) -> TRUE [temp]\n", pwszFilename));
+        fRc = TRUE;
+    }
+    else
+    {
+        fRc = DeleteFileW(pwszFilename);
+        KWFS_LOG(("DeleteFileW(%s) -> %d (%d)\n", pwszFilename, fRc, GetLastError()));
+    }
+    return fRc;
+}
+#endif /* WITH_TEMP_MEMORY_FILES */
 
 
@@ -6066 +6088 @@
     { TUPLE("GetFileAttributesW"),          NULL,       (KUPTR)kwSandbox_Kernel32_GetFileAttributesW },
     { TUPLE("GetShortPathNameW"),           NULL,       (KUPTR)kwSandbox_Kernel32_GetShortPathNameW },
+#ifdef WITH_TEMP_MEMORY_FILES
+    { TUPLE("DeleteFileW"),                 NULL,       (KUPTR)kwSandbox_Kernel32_DeleteFileW },
+#endif
 
     { TUPLE("VirtualAlloc"),                NULL,       (KUPTR)kwSandbox_Kernel32_VirtualAlloc },
@@ -6174 +6199 @@
     { TUPLE("GetFileAttributesW"),          NULL,       (KUPTR)kwSandbox_Kernel32_GetFileAttributesW },
     { TUPLE("GetShortPathNameW"),           NULL,       (KUPTR)kwSandbox_Kernel32_GetShortPathNameW },
+#ifdef WITH_TEMP_MEMORY_FILES
+    { TUPLE("DeleteFileW"),                 NULL,       (KUPTR)kwSandbox_Kernel32_DeleteFileW },
+#endif
 
 #ifdef WITH_HASH_MD5_CACHE