Changeset 21944 for trunk/src/user32/oslibdnd.cpp

Timestamp:

Jan 18, 2012, 8:15:16 PM (14 years ago)

Author:

dmik

Message:

Remove usage of broken tempnam().

See #63 for details. This is a regression of r21928.
The fix actually simplifies the code as there was no
need in this function in the first place.

File:

• trunk/src/user32/oslibdnd.cpp (modified) (2 diffs)

trunk/src/user32/oslibdnd.cpp

@@ -25 +25 @@
 #include "oslibdnd.h"
 
-static char *pszFile = NULL;
 static HWND  hwndTarget = 0;
 static PDRAGINFO curDragInfo = NULL;
 static char *pszCurDragData = NULL;
 
-#if 0
-    FILE *tmpfile;
-    tmpfile = fopen(pszFile, "wb+");    
-    fwrite(lpszDnDString, 1, strlen(lpszDnDString)+1, tmpfile);
-    fclose(tmpfile);
-#endif
 //******************************************************************************
 //******************************************************************************
@@ -62 +55 @@
 
     char szDir[CCHMAXPATH*4];
-    
-    pszFile = tempnam(0, 0);
-    if(pszFile == NULL) {
-        DebugInt3();
-        DrgFreeDraginfo(pdinfo);
-        return NULL;
-    }
-
-    strcpy(szDir, pszFile);
-
-    char *tmp = strrchr(szDir, '\\');
-    if (!tmp)
-        tmp = strrchr(szDir, '/');
-    if (!tmp) {
-        DebugInt3();
-        free(pszFile);
-        DrgFreeDraginfo(pdinfo);
-        return NULL;
-    }
-
-    *tmp = 0;
-    tmp++;
-
-    dprintf(("temporary file %s", pszFile));
-
+
+    const char *pszTmpDir = getenv("TMP");
+    if (!pszTmpDir)
+        pszTmpDir = getenv("TEMP");
+    if (!pszTmpDir)
+        pszTmpDir = ".";
+
+    strncpy(szDir, pszTmpDir, sizeof(szDir) - 2);
+    szDir[sizeof(szDir) - 2] = '\0'; // strncpy doesn't ensure this
     strcat(szDir, "\\");
+
+    dprintf(("temporary dir %s", szDir));
     
     ditem.hwndItem       = pdinfo->hwndSource;