enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

eina_file: fixed T2244 

Summary:
dirty fix for 'eet' problems with file deletion on WINDOWS
to work with the commit: D4698, D4699

Reviewers: cedric, NikaWhite, rimmed, vtorri, raster

Reviewed By: cedric

Subscribers: artem.popov, cedric, jpeg

Maniphest Tasks: T2244

Differential Revision: https://phab.enlightenment.org/D4701

Signed-off-by: Cedric BAIL <cedric@osg.samsung.com>
This commit is contained in:
Ivan Furs 2017-03-15 10:49:19 -07:00 committed by Cedric BAIL
parent 24ed55539d
commit 4d13273e3b
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/lib/eina/eina_file_win32.c
View File

@ -383,7 +383,7 @@ eina_file_real_close(Eina_File *file)
free(map);
}
if (file->global_map != MAP_FAILED && file->handle != NULL)
if (file->global_map != MAP_FAILED)
UnmapViewOfFile(file->global_map);
if (file->handle != INVALID_HANDLE_VALUE)
@ -730,7 +730,7 @@ eina_file_open(const char *path, Eina_Bool shared)
else
#endif
handle = CreateFile(filename,
GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL,
NULL);
@ -832,7 +832,21 @@ eina_file_unlink(const char *pathname)
if (file->handle != INVALID_HANDLE_VALUE)
{
CloseHandle(file->handle);
file->handle = INVALID_HANDLE_VALUE;
file->handle = CreateFile(unlink_path,
GENERIC_READ,
FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL,
OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL | FILE_FLAG_DELETE_ON_CLOSE,
NULL);
if (file->handle != INVALID_HANDLE_VALUE)
{
CloseHandle(file->handle);
file->handle = INVALID_HANDLE_VALUE;
return EINA_TRUE;
}
}
}