hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 23:34:06 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Win-specific: Native file handles in dictzip

Browse source
This commit is contained in:
Abs62 2012-11-12 17:08:14 +04:00
parent f02de96ccf
commit 02dfa9f36a
2 changed files with 38 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
dictzip.c
View file

@ -446,6 +446,18 @@ dictData *dict_data_open( const char *filename, int computeCRC )
"\"%s\" not in text or dzip format\n", filename );*/ "\"%s\" not in text or dzip format\n", filename );*/
} }
#ifdef __WIN32
wchar_t wname[16384];
if( MultiByteToWideChar( CP_UTF8, 0, filename, -1, wname, 16384 ) == 0 )
return 0;
h->fd = CreateFileW( wname, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, 0,
OPEN_EXISTING, FILE_FLAG_RANDOM_ACCESS, 0);
if( h->fd == INVALID_HANDLE_VALUE )
return 0;
h->size = GetFileSize( h->fd, 0 );
#else
h->fd = gd_fopen( filename, "rb" ); h->fd = gd_fopen( filename, "rb" );
if ( !h->fd ) if ( !h->fd )
@ -458,6 +470,7 @@ dictData *dict_data_open( const char *filename, int computeCRC )
fseek( h->fd, 0, SEEK_END ); fseek( h->fd, 0, SEEK_END );
h->size = ftell( h->fd ); h->size = ftell( h->fd );
#endif
for (j = 0; j < DICT_CACHE_SIZE; j++) { for (j = 0; j < DICT_CACHE_SIZE; j++) {
h->cache[j].chunk = -1; h->cache[j].chunk = -1;
@ -476,8 +489,13 @@ void dict_data_close( dictData *header )
if (!header) if (!header)
return; return;
#ifdef __WIN32
if ( header->fd != INVALID_HANDLE_VALUE )
CloseHandle( header->fd );
#else
if ( header->fd ) if ( header->fd )
fclose( header->fd ); fclose( header->fd );
#endif
if (header->chunks) xfree( header->chunks ); if (header->chunks) xfree( header->chunks );
if (header->offsets) xfree( header->offsets ); if (header->offsets) xfree( header->offsets );
@ -539,8 +557,16 @@ char *dict_data_read_ (
break; break;
case DICT_TEXT: case DICT_TEXT:
{ {
#ifdef __WIN32
DWORD pos = SetFilePointer( h->fd, start, 0, FILE_BEGIN );
DWORD readed = 0;
if( pos != INVALID_SET_FILE_POINTER || GetLastError() != NO_ERROR )
ReadFile( h->fd, buffer, size, &readed, 0 );
if( size != readed )
#else
if ( fseek( h->fd, start, SEEK_SET ) != 0 || if ( fseek( h->fd, start, SEEK_SET ) != 0 ||
fread( buffer, size, 1, h->fd ) != 1 ) fread( buffer, size, 1, h->fd ) != 1 )
#endif
{ {
xfree( buffer ); xfree( buffer );
return 0; return 0;
@ -609,8 +635,16 @@ char *dict_data_read_ (
i, h->chunks[i], OUT_BUFFER_SIZE ); i, h->chunks[i], OUT_BUFFER_SIZE );
} }
#ifdef __WIN32
DWORD pos = SetFilePointer( h->fd, h->offsets[ i ], 0, FILE_BEGIN );
DWORD readed = 0;
if( pos != INVALID_SET_FILE_POINTER || GetLastError() != NO_ERROR )
ReadFile( h->fd, outBuffer, h->chunks[ i ], &readed, 0 );
if( h->chunks[ i ] != readed )
#else
if ( fseek( h->fd, h->offsets[ i ], SEEK_SET ) != 0 || if ( fseek( h->fd, h->offsets[ i ], SEEK_SET ) != 0 ||
fread( outBuffer, h->chunks[ i ], 1, h->fd ) != 1 ) fread( outBuffer, h->chunks[ i ], 1, h->fd ) != 1 )
#endif
{ {
xfree( buffer ); xfree( buffer );
return 0; return 0;

5
dictzip.h
View file

@ -49,8 +49,11 @@ typedef struct dictCache {
} dictCache; } dictCache;
typedef struct dictData { typedef struct dictData {
#ifdef __WIN32
HANDLE fd; /* file handle */
#else
FILE * fd; /* file descriptor */ FILE * fd; /* file descriptor */
#endif
unsigned long size; /* size of file */ unsigned long size; /* size of file */