enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 2 Projects Releases Wiki Activity

eina: (Windows) fix creation of files with eina_file_open() in some cases 

@fix
This commit is contained in:
Vincent Torri 2014-07-13 13:49:31 +02:00 committed by Cedric BAIL
parent ea8b4c82ed
commit 4d68dfe603
1 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -757,7 +757,6 @@ eina_file_open(const char *path, Eina_Bool shared)
Eina_File *n; Eina_File *n;
char *filename; char *filename;
HANDLE handle; HANDLE handle;
HANDLE fm;
WIN32_FILE_ATTRIBUTE_DATA fad; WIN32_FILE_ATTRIBUTE_DATA fad;
ULARGE_INTEGER length; ULARGE_INTEGER length;
ULARGE_INTEGER mtime; ULARGE_INTEGER mtime;
@ -775,19 +774,17 @@ eina_file_open(const char *path, Eina_Bool shared)
NULL); NULL);
else else
#endif #endif
handle = CreateFile(filename, GENERIC_READ, FILE_SHARE_READ, handle = CreateFile(filename,
NULL, OPEN_EXISTING, FILE_ATTRIBUTE_READONLY, GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_READ | FILE_SHARE_WRITE,
NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL,
NULL); NULL);
if (handle == INVALID_HANDLE_VALUE) if (handle == INVALID_HANDLE_VALUE)
goto close_file; goto close_file;
fm = CreateFileMapping(handle, NULL, PAGE_READONLY, 0, 0, NULL);
if (!fm)
goto close_handle;
if (!GetFileAttributesEx(filename, GetFileExInfoStandard, &fad)) if (!GetFileAttributesEx(filename, GetFileExInfoStandard, &fad))
goto close_fm; goto close_handle;
length.u.LowPart = fad.nFileSizeLow; length.u.LowPart = fad.nFileSizeLow;
length.u.HighPart = fad.nFileSizeHigh; length.u.HighPart = fad.nFileSizeHigh;
@ -812,7 +809,7 @@ eina_file_open(const char *path, Eina_Bool shared)
if (!n) if (!n)
{ {
eina_lock_release(&_eina_file_lock_cache); eina_lock_release(&_eina_file_lock_cache);
goto close_fm; goto close_handle;
} }
memset(n, 0, sizeof(Eina_File)); memset(n, 0, sizeof(Eina_File));
@ -828,7 +825,6 @@ eina_file_open(const char *path, Eina_Bool shared)
n->length = length.QuadPart; n->length = length.QuadPart;
n->mtime = mtime.QuadPart; n->mtime = mtime.QuadPart;
n->handle = handle; n->handle = handle;
n->fm = fm;
n->shared = shared; n->shared = shared;
eina_lock_new(&n->lock); eina_lock_new(&n->lock);
eina_hash_direct_add(_eina_file_cache, n->filename, n); eina_hash_direct_add(_eina_file_cache, n->filename, n);
@ -837,7 +833,6 @@ eina_file_open(const char *path, Eina_Bool shared)
} }
else else
{ {
CloseHandle(fm);
CloseHandle(handle); CloseHandle(handle);
n = file; n = file;
@ -852,11 +847,8 @@ eina_file_open(const char *path, Eina_Bool shared)
return n; return n;
close_fm:
CloseHandle(fm);
close_handle: close_handle:
CloseHandle(handle); CloseHandle(handle);
close_file: close_file:
ERR("Could not open file [%s].", filename); ERR("Could not open file [%s].", filename);
free(filename); free(filename);
@ -891,6 +883,18 @@ eina_file_map_all(Eina_File *file, Eina_File_Populate rule EINA_UNUSED)
if (file->global_map == MAP_FAILED) if (file->global_map == MAP_FAILED)
{ {
void *data; void *data;
DWORD max_size_high;
DWORD max_size_low;
if (file->fm)
CloseHandle(file->fm);
max_size_high = (DWORD)((file->length & 0xffffffff00000000ULL) >> 32);
max_size_low = (DWORD)(file->length & 0x00000000ffffffffULL);
file->fm = CreateFileMapping(file->handle, NULL, PAGE_READWRITE,
max_size_high, max_size_low, NULL);
if (!file->fm)
return NULL;
data = MapViewOfFile(file->fm, FILE_MAP_READ, data = MapViewOfFile(file->fm, FILE_MAP_READ,
0, 0, file->length); 0, 0, file->length);
@ -948,6 +952,16 @@ eina_file_map_new(Eina_File *file, Eina_File_Populate rule,
return NULL; return NULL;
} }
if (file->fm)
CloseHandle(file->fm);
/* the length parameter is unsigned long, that is a DWORD */
/* so the max size high parameter of CreateFileMapping is 0 */
file->fm = CreateFileMapping(file->handle, NULL, PAGE_READWRITE,
0, (DWORD)length, NULL);
if (!file->fm)
return NULL;
data = MapViewOfFile(file->fm, FILE_MAP_READ, data = MapViewOfFile(file->fm, FILE_MAP_READ,
offset & 0xffff0000, offset & 0xffff0000,
offset & 0x0000ffff, offset & 0x0000ffff,