Try using a stable temporary directory at first to silence ZoneAlarm

warnings.
This commit is contained in:
Ferenc Wagner 2005-03-29 19:51:49 +00:00 committed by Alexandre Julliard
parent ddf74e6798
commit 96812eb280
1 changed files with 11 additions and 3 deletions

View File

@ -432,7 +432,7 @@ char *
run_tests (char *logname, const char *tag) run_tests (char *logname, const char *tag)
{ {
int nr_of_files = 0, nr_of_tests = 0, i; int nr_of_files = 0, nr_of_tests = 0, i;
char *tempdir; char *tempdir, *shorttempdir;
int logfile; int logfile;
char *strres, *eol, *nextline; char *strres, *eol, *nextline;
DWORD strsize; DWORD strsize;
@ -459,9 +459,17 @@ run_tests (char *logname, const char *tag)
tempdir = tempnam (0, "wct"); tempdir = tempnam (0, "wct");
if (!tempdir) if (!tempdir)
report (R_FATAL, "Can't name temporary dir (check %%TEMP%%)."); report (R_FATAL, "Can't name temporary dir (check %%TEMP%%).");
report (R_DIR, tempdir); shorttempdir = strdup (tempdir);
if (!CreateDirectory (tempdir, NULL)) if (shorttempdir) { /* try stable path for ZoneAlarm */
strstr (shorttempdir, "wct")[3] = 0;
if (CreateDirectoryA (shorttempdir, NULL)) {
free (tempdir);
tempdir = shorttempdir;
} else free (shorttempdir);
}
if (tempdir != shorttempdir && !CreateDirectoryA (tempdir, NULL))
report (R_FATAL, "Could not create directory: %s", tempdir); report (R_FATAL, "Could not create directory: %s", tempdir);
report (R_DIR, tempdir);
xprintf ("Version 3\n"); xprintf ("Version 3\n");
strres = extract_rcdata (WINE_BUILD, STRINGRES, &strsize); strres = extract_rcdata (WINE_BUILD, STRINGRES, &strsize);