Clean up dynamically loaded libraries at deinit, have a lastmodtime fallback.
This commit is contained in:
parent
6f41886cd9
commit
9acdd83369
|
@ -711,6 +711,12 @@ int __PHYSFS_platformDeinit(void)
|
||||||
userDir = NULL;
|
userDir = NULL;
|
||||||
} /* if */
|
} /* if */
|
||||||
|
|
||||||
|
if (libKernel32)
|
||||||
|
{
|
||||||
|
FreeLibrary(libKernel32);
|
||||||
|
libKernel32 = NULL;
|
||||||
|
} /* if */
|
||||||
|
|
||||||
return(1); /* It's all good */
|
return(1); /* It's all good */
|
||||||
} /* __PHYSFS_platformDeinit */
|
} /* __PHYSFS_platformDeinit */
|
||||||
|
|
||||||
|
@ -1044,6 +1050,7 @@ PHYSFS_sint64 __PHYSFS_platformGetLastModTime(const char *fname)
|
||||||
WIN32_FILE_ATTRIBUTE_DATA attrData;
|
WIN32_FILE_ATTRIBUTE_DATA attrData;
|
||||||
memset(&attrData, '\0', sizeof (attrData));
|
memset(&attrData, '\0', sizeof (attrData));
|
||||||
|
|
||||||
|
/* GetFileAttributesEx didn't show up until Win98 and NT4. */
|
||||||
if (pGetFileAttributesEx != NULL)
|
if (pGetFileAttributesEx != NULL)
|
||||||
{
|
{
|
||||||
if (pGetFileAttributesEx(fname, GetFileExInfoStandard, &attrData))
|
if (pGetFileAttributesEx(fname, GetFileExInfoStandard, &attrData))
|
||||||
|
@ -1057,14 +1064,23 @@ PHYSFS_sint64 __PHYSFS_platformGetLastModTime(const char *fname)
|
||||||
} /* if */
|
} /* if */
|
||||||
} /* if */
|
} /* if */
|
||||||
|
|
||||||
|
/* GetFileTime() has been in the Win32 API since the start. */
|
||||||
if (retval == -1) /* try a fallback... */
|
if (retval == -1) /* try a fallback... */
|
||||||
{
|
{
|
||||||
/* !!! FIXME: uhh...? */
|
FILETIME ft;
|
||||||
|
BOOL rc;
|
||||||
|
const char *err;
|
||||||
|
win32file *f = (win32file *) __PHYSFS_platformOpenRead(fname);
|
||||||
|
BAIL_IF_MACRO(f == NULL, NULL, -1)
|
||||||
|
rc = GetFileTime(f->handle, NULL, NULL, &ft);
|
||||||
|
err = win32strerror();
|
||||||
|
CloseHandle(f->handle);
|
||||||
|
free(f);
|
||||||
|
BAIL_IF_MACRO(!rc, err, -1);
|
||||||
|
retval = FileTimeToPhysfsTime(&ft);
|
||||||
} /* if */
|
} /* if */
|
||||||
|
|
||||||
return(retval);
|
return(retval);
|
||||||
|
|
||||||
/*return(FileTimeToPhysfsTime(&attrData.ftCreationTime));*/
|
|
||||||
} /* __PHYSFS_platformGetLastModTime */
|
} /* __PHYSFS_platformGetLastModTime */
|
||||||
|
|
||||||
/* end of win32.c ... */
|
/* end of win32.c ... */
|
||||||
|
|
Loading…
Reference in New Issue