revert entire file.c
This commit is contained in:
parent
c31bb6aea5
commit
8eea99ae04
@ -73,7 +73,7 @@ static BOOL FileIsHandled(HANDLE handle)
|
||||
|
||||
static int FileGetFd(HANDLE handle)
|
||||
{
|
||||
WINPR_FILE* file = (WINPR_FILE*)handle;
|
||||
WINPR_FILE *file= (WINPR_FILE*)handle;
|
||||
|
||||
if (!FileIsHandled(handle))
|
||||
return -1;
|
||||
@ -81,9 +81,8 @@ static int FileGetFd(HANDLE handle)
|
||||
return fileno(file->fp);
|
||||
}
|
||||
|
||||
static BOOL FileCloseHandle(HANDLE handle)
|
||||
{
|
||||
WINPR_FILE* file = (WINPR_FILE*)handle;
|
||||
static BOOL FileCloseHandle(HANDLE handle) {
|
||||
WINPR_FILE* file = (WINPR_FILE *)handle;
|
||||
|
||||
if (!FileIsHandled(handle))
|
||||
return FALSE;
|
||||
@ -116,7 +115,7 @@ static BOOL FileSetEndOfFile(HANDLE hFile)
|
||||
if (ftruncate(fileno(pFile->fp), size) < 0)
|
||||
{
|
||||
WLog_ERR(TAG, "ftruncate %s failed with %s [0x%08X]",
|
||||
pFile->lpFileName, strerror(errno), errno);
|
||||
pFile->lpFileName, strerror(errno), errno);
|
||||
SetLastError(map_posix_err(errno));
|
||||
return FALSE;
|
||||
}
|
||||
@ -126,7 +125,7 @@ static BOOL FileSetEndOfFile(HANDLE hFile)
|
||||
|
||||
|
||||
static DWORD FileSetFilePointer(HANDLE hFile, LONG lDistanceToMove,
|
||||
PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod)
|
||||
PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod)
|
||||
{
|
||||
WINPR_FILE* pFile = (WINPR_FILE*) hFile;
|
||||
INT64 offset;
|
||||
@ -139,41 +138,37 @@ static DWORD FileSetFilePointer(HANDLE hFile, LONG lDistanceToMove,
|
||||
* and the low integer must be interpreted as unsigned. */
|
||||
if (lpDistanceToMoveHigh)
|
||||
{
|
||||
offset = (INT64)(((UINT64) * lpDistanceToMoveHigh << 32U) | (UINT64)lDistanceToMove);
|
||||
offset = (INT64)(((UINT64)*lpDistanceToMoveHigh << 32U) | (UINT64)lDistanceToMove);
|
||||
}
|
||||
else
|
||||
offset = lDistanceToMove;
|
||||
offset = lDistanceToMove;
|
||||
|
||||
switch (dwMoveMethod)
|
||||
switch(dwMoveMethod)
|
||||
{
|
||||
case FILE_BEGIN:
|
||||
whence = SEEK_SET;
|
||||
break;
|
||||
|
||||
case FILE_END:
|
||||
whence = SEEK_END;
|
||||
break;
|
||||
|
||||
case FILE_CURRENT:
|
||||
whence = SEEK_CUR;
|
||||
break;
|
||||
|
||||
default:
|
||||
return INVALID_SET_FILE_POINTER;
|
||||
case FILE_BEGIN:
|
||||
whence = SEEK_SET;
|
||||
break;
|
||||
case FILE_END:
|
||||
whence = SEEK_END;
|
||||
break;
|
||||
case FILE_CURRENT:
|
||||
whence = SEEK_CUR;
|
||||
break;
|
||||
default:
|
||||
return INVALID_SET_FILE_POINTER;
|
||||
}
|
||||
|
||||
if (_fseeki64(pFile->fp, offset, whence))
|
||||
{
|
||||
WLog_ERR(TAG, "_fseeki64(%s) failed with %s [0x%08X]", pFile->lpFileName,
|
||||
strerror(errno), errno);
|
||||
strerror(errno), errno);
|
||||
return INVALID_SET_FILE_POINTER;
|
||||
}
|
||||
|
||||
return _ftelli64(pFile->fp);
|
||||
}
|
||||
|
||||
static BOOL FileSetFilePointerEx(HANDLE hFile, LARGE_INTEGER liDistanceToMove,
|
||||
PLARGE_INTEGER lpNewFilePointer, DWORD dwMoveMethod)
|
||||
static BOOL FileSetFilePointerEx(HANDLE hFile, LARGE_INTEGER liDistanceToMove, PLARGE_INTEGER lpNewFilePointer, DWORD dwMoveMethod)
|
||||
{
|
||||
WINPR_FILE* pFile = (WINPR_FILE*) hFile;
|
||||
int whence;
|
||||
@ -181,28 +176,25 @@ static BOOL FileSetFilePointerEx(HANDLE hFile, LARGE_INTEGER liDistanceToMove,
|
||||
if (!hFile)
|
||||
return FALSE;
|
||||
|
||||
switch (dwMoveMethod)
|
||||
switch(dwMoveMethod)
|
||||
{
|
||||
case FILE_BEGIN:
|
||||
whence = SEEK_SET;
|
||||
break;
|
||||
|
||||
case FILE_END:
|
||||
whence = SEEK_END;
|
||||
break;
|
||||
|
||||
case FILE_CURRENT:
|
||||
whence = SEEK_CUR;
|
||||
break;
|
||||
|
||||
default:
|
||||
return FALSE;
|
||||
case FILE_BEGIN:
|
||||
whence = SEEK_SET;
|
||||
break;
|
||||
case FILE_END:
|
||||
whence = SEEK_END;
|
||||
break;
|
||||
case FILE_CURRENT:
|
||||
whence = SEEK_CUR;
|
||||
break;
|
||||
default:
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
if (_fseeki64(pFile->fp, liDistanceToMove.QuadPart, whence))
|
||||
{
|
||||
WLog_ERR(TAG, "_fseeki64(%s) failed with %s [0x%08X]", pFile->lpFileName,
|
||||
strerror(errno), errno);
|
||||
strerror(errno), errno);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
@ -213,7 +205,7 @@ static BOOL FileSetFilePointerEx(HANDLE hFile, LARGE_INTEGER liDistanceToMove,
|
||||
}
|
||||
|
||||
static BOOL FileRead(PVOID Object, LPVOID lpBuffer, DWORD nNumberOfBytesToRead,
|
||||
LPDWORD lpNumberOfBytesRead, LPOVERLAPPED lpOverlapped)
|
||||
LPDWORD lpNumberOfBytesRead, LPOVERLAPPED lpOverlapped)
|
||||
{
|
||||
size_t io_status;
|
||||
WINPR_FILE* file;
|
||||
@ -229,7 +221,7 @@ static BOOL FileRead(PVOID Object, LPVOID lpBuffer, DWORD nNumberOfBytesToRead,
|
||||
if (!Object)
|
||||
return FALSE;
|
||||
|
||||
file = (WINPR_FILE*)Object;
|
||||
file = (WINPR_FILE *)Object;
|
||||
clearerr(file->fp);
|
||||
io_status = fread(lpBuffer, 1, nNumberOfBytesToRead, file->fp);
|
||||
|
||||
@ -242,7 +234,6 @@ static BOOL FileRead(PVOID Object, LPVOID lpBuffer, DWORD nNumberOfBytesToRead,
|
||||
case EWOULDBLOCK:
|
||||
SetLastError(ERROR_NO_DATA);
|
||||
break;
|
||||
|
||||
default:
|
||||
SetLastError(map_posix_err(errno));
|
||||
}
|
||||
@ -255,7 +246,7 @@ static BOOL FileRead(PVOID Object, LPVOID lpBuffer, DWORD nNumberOfBytesToRead,
|
||||
}
|
||||
|
||||
static BOOL FileWrite(PVOID Object, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrite,
|
||||
LPDWORD lpNumberOfBytesWritten, LPOVERLAPPED lpOverlapped)
|
||||
LPDWORD lpNumberOfBytesWritten, LPOVERLAPPED lpOverlapped)
|
||||
{
|
||||
size_t io_status;
|
||||
WINPR_FILE* file;
|
||||
@ -270,10 +261,10 @@ static BOOL FileWrite(PVOID Object, LPCVOID lpBuffer, DWORD nNumberOfBytesToWrit
|
||||
if (!Object)
|
||||
return FALSE;
|
||||
|
||||
file = (WINPR_FILE*)Object;
|
||||
file = (WINPR_FILE *)Object;
|
||||
|
||||
clearerr(file->fp);
|
||||
io_status = fwrite(lpBuffer, 1, nNumberOfBytesToWrite, file->fp);
|
||||
|
||||
if (io_status == 0 && ferror(file->fp))
|
||||
{
|
||||
SetLastError(map_posix_err(errno));
|
||||
@ -292,20 +283,21 @@ static DWORD FileGetFileSize(HANDLE Object, LPDWORD lpFileSizeHigh)
|
||||
if (!Object)
|
||||
return 0;
|
||||
|
||||
file = (WINPR_FILE*)Object;
|
||||
file = (WINPR_FILE *)Object;
|
||||
|
||||
cur = _ftelli64(file->fp);
|
||||
|
||||
if (cur < 0)
|
||||
{
|
||||
WLog_ERR(TAG, "_ftelli64(%s) failed with %s [0x%08X]", file->lpFileName,
|
||||
strerror(errno), errno);
|
||||
strerror(errno), errno);
|
||||
return INVALID_FILE_SIZE;
|
||||
}
|
||||
|
||||
if (_fseeki64(file->fp, 0, SEEK_END) != 0)
|
||||
{
|
||||
WLog_ERR(TAG, "_fseeki64(%s) failed with %s [0x%08X]", file->lpFileName,
|
||||
strerror(errno), errno);
|
||||
strerror(errno), errno);
|
||||
return INVALID_FILE_SIZE;
|
||||
}
|
||||
|
||||
@ -314,14 +306,14 @@ static DWORD FileGetFileSize(HANDLE Object, LPDWORD lpFileSizeHigh)
|
||||
if (size < 0)
|
||||
{
|
||||
WLog_ERR(TAG, "_ftelli64(%s) failed with %s [0x%08X]", file->lpFileName,
|
||||
strerror(errno), errno);
|
||||
strerror(errno), errno);
|
||||
return INVALID_FILE_SIZE;
|
||||
}
|
||||
|
||||
if (_fseeki64(file->fp, cur, SEEK_SET) != 0)
|
||||
{
|
||||
WLog_ERR(TAG, "_ftelli64(%s) failed with %s [0x%08X]", file->lpFileName,
|
||||
strerror(errno), errno);
|
||||
strerror(errno), errno);
|
||||
return INVALID_FILE_SIZE;
|
||||
}
|
||||
|
||||
@ -332,9 +324,9 @@ static DWORD FileGetFileSize(HANDLE Object, LPDWORD lpFileSizeHigh)
|
||||
}
|
||||
|
||||
static BOOL FileLockFileEx(HANDLE hFile, DWORD dwFlags, DWORD dwReserved,
|
||||
DWORD nNumberOfBytesToLockLow, DWORD nNumberOfBytesToLockHigh,
|
||||
LPOVERLAPPED lpOverlapped)
|
||||
{
|
||||
DWORD nNumberOfBytesToLockLow, DWORD nNumberOfBytesToLockHigh,
|
||||
LPOVERLAPPED lpOverlapped)
|
||||
{
|
||||
#ifdef __sun
|
||||
struct flock lock;
|
||||
int lckcmd;
|
||||
@ -374,15 +366,12 @@ static BOOL FileLockFileEx(HANDLE hFile, DWORD dwFlags, DWORD dwReserved,
|
||||
else
|
||||
lckcmd = F_SETLKW;
|
||||
|
||||
if (fcntl(fileno(pFile->fp), lckcmd, &lock) == -1)
|
||||
{
|
||||
if(fcntl(fileno(pFile->fp), lckcmd, &lock) == -1) {
|
||||
WLog_ERR(TAG, "F_SETLK failed with %s [0x%08X]",
|
||||
strerror(errno), errno);
|
||||
strerror(errno), errno);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
if (dwFlags & LOCKFILE_EXCLUSIVE_LOCK)
|
||||
lock = LOCK_EX;
|
||||
else
|
||||
@ -394,17 +383,18 @@ static BOOL FileLockFileEx(HANDLE hFile, DWORD dwFlags, DWORD dwReserved,
|
||||
if (flock(fileno(pFile->fp), lock) < 0)
|
||||
{
|
||||
WLog_ERR(TAG, "flock failed with %s [0x%08X]",
|
||||
strerror(errno), errno);
|
||||
strerror(errno), errno);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
pFile->bLocked = TRUE;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static BOOL FileUnlockFile(HANDLE hFile, DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh,
|
||||
DWORD nNumberOfBytesToUnlockLow, DWORD nNumberOfBytesToUnlockHigh)
|
||||
DWORD nNumberOfBytesToUnlockLow, DWORD nNumberOfBytesToUnlockHigh)
|
||||
{
|
||||
WINPR_FILE* pFile = (WINPR_FILE*)hFile;
|
||||
#ifdef __sun
|
||||
@ -425,29 +415,27 @@ static BOOL FileUnlockFile(HANDLE hFile, DWORD dwFileOffsetLow, DWORD dwFileOffs
|
||||
lock.l_len = 0;
|
||||
lock.l_whence = SEEK_SET;
|
||||
lock.l_type = F_UNLCK;
|
||||
|
||||
if (fcntl(fileno(pFile->fp), F_GETLK, &lock) == -1)
|
||||
{
|
||||
WLog_ERR(TAG, "F_UNLCK on %s failed with %s [0x%08X]",
|
||||
pFile->lpFileName, strerror(errno), errno);
|
||||
pFile->lpFileName, strerror(errno), errno);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
if (flock(fileno(pFile->fp), LOCK_UN) < 0)
|
||||
{
|
||||
WLog_ERR(TAG, "flock(LOCK_UN) %s failed with %s [0x%08X]",
|
||||
pFile->lpFileName, strerror(errno), errno);
|
||||
pFile->lpFileName, strerror(errno), errno);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static BOOL FileUnlockFileEx(HANDLE hFile, DWORD dwReserved, DWORD nNumberOfBytesToUnlockLow,
|
||||
DWORD nNumberOfBytesToUnlockHigh, LPOVERLAPPED lpOverlapped)
|
||||
DWORD nNumberOfBytesToUnlockHigh, LPOVERLAPPED lpOverlapped)
|
||||
{
|
||||
WINPR_FILE* pFile = (WINPR_FILE*)hFile;
|
||||
#ifdef __sun
|
||||
@ -475,24 +463,21 @@ static BOOL FileUnlockFileEx(HANDLE hFile, DWORD dwReserved, DWORD nNumberOfByte
|
||||
lock.l_len = 0;
|
||||
lock.l_whence = SEEK_SET;
|
||||
lock.l_type = F_UNLCK;
|
||||
|
||||
if (fcntl(fileno(pFile->fp), F_GETLK, &lock) == -1)
|
||||
{
|
||||
WLog_ERR(TAG, "F_UNLCK on %s failed with %s [0x%08X]",
|
||||
pFile->lpFileName, strerror(errno), errno);
|
||||
pFile->lpFileName, strerror(errno), errno);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
if (flock(fileno(pFile->fp), LOCK_UN) < 0)
|
||||
{
|
||||
WLog_ERR(TAG, "flock(LOCK_UN) %s failed with %s [0x%08X]",
|
||||
pFile->lpFileName, strerror(errno), errno);
|
||||
pFile->lpFileName, strerror(errno), errno);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@ -600,8 +585,7 @@ static BOOL FileSetFileTime(HANDLE hFile, const FILETIME* lpCreationTime,
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static HANDLE_OPS fileOps =
|
||||
{
|
||||
static HANDLE_OPS fileOps = {
|
||||
FileIsHandled,
|
||||
FileCloseHandle,
|
||||
FileGetFd,
|
||||
@ -624,8 +608,7 @@ static HANDLE_OPS fileOps =
|
||||
FileSetFileTime
|
||||
};
|
||||
|
||||
static HANDLE_OPS shmOps =
|
||||
{
|
||||
static HANDLE_OPS shmOps = {
|
||||
FileIsHandled,
|
||||
FileCloseHandle,
|
||||
FileGetFd,
|
||||
@ -653,31 +636,26 @@ static const char* FileGetMode(DWORD dwDesiredAccess, DWORD dwCreationDispositio
|
||||
{
|
||||
BOOL writeable = (dwDesiredAccess & (GENERIC_WRITE | FILE_WRITE_DATA | FILE_APPEND_DATA)) != 0;
|
||||
|
||||
switch (dwCreationDisposition)
|
||||
switch(dwCreationDisposition)
|
||||
{
|
||||
case CREATE_ALWAYS:
|
||||
*create = TRUE;
|
||||
return (writeable) ? "wb+" : "rwb";
|
||||
|
||||
case CREATE_NEW:
|
||||
*create = TRUE;
|
||||
return "wb+";
|
||||
|
||||
case OPEN_ALWAYS:
|
||||
*create = TRUE;
|
||||
return "rb+";
|
||||
|
||||
case OPEN_EXISTING:
|
||||
*create = FALSE;
|
||||
return (writeable) ? "rb+" : "rb";
|
||||
|
||||
case TRUNCATE_EXISTING:
|
||||
*create = FALSE;
|
||||
return "wb+";
|
||||
|
||||
default:
|
||||
*create = FALSE;
|
||||
return "";
|
||||
case CREATE_ALWAYS:
|
||||
*create = TRUE;
|
||||
return (writeable) ? "wb+" : "rwb";
|
||||
case CREATE_NEW:
|
||||
*create = TRUE;
|
||||
return "wb+";
|
||||
case OPEN_ALWAYS:
|
||||
*create = TRUE;
|
||||
return "rb+";
|
||||
case OPEN_EXISTING:
|
||||
*create = FALSE;
|
||||
return (writeable) ? "rb+" : "rb";
|
||||
case TRUNCATE_EXISTING:
|
||||
*create = FALSE;
|
||||
return "wb+";
|
||||
default:
|
||||
*create = FALSE;
|
||||
return "";
|
||||
}
|
||||
}
|
||||
|
||||
@ -732,13 +710,12 @@ UINT32 map_posix_err(int fs_errno)
|
||||
rc = STATUS_UNSUCCESSFUL;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
static HANDLE FileCreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
|
||||
LPSECURITY_ATTRIBUTES lpSecurityAttributes,
|
||||
DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile)
|
||||
static HANDLE FileCreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes,
|
||||
DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile)
|
||||
{
|
||||
WINPR_FILE* pFile;
|
||||
BOOL create;
|
||||
@ -759,7 +736,6 @@ static HANDLE FileCreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dw
|
||||
}
|
||||
|
||||
pFile = (WINPR_FILE*) calloc(1, sizeof(WINPR_FILE));
|
||||
|
||||
if (!pFile)
|
||||
{
|
||||
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
|
||||
@ -768,8 +744,8 @@ static HANDLE FileCreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dw
|
||||
|
||||
WINPR_HANDLE_SET_TYPE_AND_MODE(pFile, HANDLE_TYPE_FILE, WINPR_FD_READ);
|
||||
pFile->ops = &fileOps;
|
||||
pFile->lpFileName = _strdup(lpFileName);
|
||||
|
||||
pFile->lpFileName = _strdup(lpFileName);
|
||||
if (!pFile->lpFileName)
|
||||
{
|
||||
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
|
||||
@ -798,7 +774,6 @@ static HANDLE FileCreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dw
|
||||
}
|
||||
|
||||
fp = fopen(pFile->lpFileName, "ab");
|
||||
|
||||
if (!fp)
|
||||
{
|
||||
SetLastError(map_posix_err(errno));
|
||||
@ -835,7 +810,6 @@ static HANDLE FileCreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dw
|
||||
fp = fopen(pFile->lpFileName, mode);
|
||||
|
||||
pFile->fp = fp;
|
||||
|
||||
if (!pFile->fp)
|
||||
{
|
||||
/* This case can occur when trying to open a
|
||||
@ -847,6 +821,7 @@ static HANDLE FileCreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dw
|
||||
}
|
||||
|
||||
setvbuf(fp, NULL, _IONBF, 0);
|
||||
|
||||
#ifdef __sun
|
||||
lock.l_start = 0;
|
||||
lock.l_len = 0;
|
||||
@ -854,24 +829,18 @@ static HANDLE FileCreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dw
|
||||
|
||||
if (dwShareMode & FILE_SHARE_READ)
|
||||
lock.l_type = F_RDLCK;
|
||||
|
||||
if (dwShareMode & FILE_SHARE_WRITE)
|
||||
lock.l_type = F_RDLCK;
|
||||
|
||||
#else
|
||||
|
||||
if (dwShareMode & FILE_SHARE_READ)
|
||||
lock = LOCK_SH;
|
||||
|
||||
if (dwShareMode & FILE_SHARE_WRITE)
|
||||
lock = LOCK_EX;
|
||||
|
||||
#endif
|
||||
|
||||
if (dwShareMode & (FILE_SHARE_READ | FILE_SHARE_WRITE))
|
||||
{
|
||||
#ifdef __sun
|
||||
|
||||
if (fcntl(fileno(pFile->fp), F_SETLKW, &lock) == -1)
|
||||
#else
|
||||
if (flock(fileno(pFile->fp), lock) < 0)
|
||||
@ -882,7 +851,7 @@ static HANDLE FileCreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dw
|
||||
#else
|
||||
WLog_ERR(TAG, "flock failed with %s [0x%08X]",
|
||||
#endif
|
||||
strerror(errno), errno);
|
||||
strerror(errno), errno);
|
||||
SetLastError(map_posix_err(errno));
|
||||
FileCloseHandle(pFile);
|
||||
return INVALID_HANDLE_VALUE;
|
||||
@ -891,10 +860,10 @@ static HANDLE FileCreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dw
|
||||
pFile->bLocked = TRUE;
|
||||
}
|
||||
|
||||
if (fstat(fileno(pFile->fp), &st) == 0 && dwFlagsAndAttributes & FILE_ATTRIBUTE_READONLY)
|
||||
if (fstat(fileno(pFile->fp), &st)==0 && dwFlagsAndAttributes & FILE_ATTRIBUTE_READONLY)
|
||||
{
|
||||
st.st_mode &= ~(S_IWUSR | S_IWGRP | S_IWOTH);
|
||||
fchmod(fileno(pFile->fp), st.st_mode);
|
||||
st.st_mode &= ~(S_IWUSR|S_IWGRP|S_IWOTH);
|
||||
fchmod(fileno(pFile->fp), st.st_mode);
|
||||
}
|
||||
|
||||
SetLastError(STATUS_SUCCESS);
|
||||
@ -912,28 +881,28 @@ HANDLE_CREATOR _FileHandleCreator =
|
||||
FileCreateFileA
|
||||
};
|
||||
|
||||
HANDLE_CREATOR* GetFileHandleCreator(void)
|
||||
HANDLE_CREATOR *GetFileHandleCreator(void)
|
||||
{
|
||||
return &_FileHandleCreator;
|
||||
}
|
||||
|
||||
|
||||
static WINPR_FILE* FileHandle_New(FILE* fp)
|
||||
static WINPR_FILE *FileHandle_New(FILE* fp)
|
||||
{
|
||||
WINPR_FILE* pFile;
|
||||
WINPR_FILE *pFile;
|
||||
char name[MAX_PATH];
|
||||
|
||||
_snprintf(name, sizeof(name), "device_%d", fileno(fp));
|
||||
pFile = (WINPR_FILE*) calloc(1, sizeof(WINPR_FILE));
|
||||
|
||||
if (!pFile)
|
||||
{
|
||||
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
pFile->fp = fp;
|
||||
pFile->ops = &shmOps;
|
||||
pFile->lpFileName = _strdup(name);
|
||||
|
||||
WINPR_HANDLE_SET_TYPE_AND_MODE(pFile, HANDLE_TYPE_FILE, WINPR_FD_READ);
|
||||
return pFile;
|
||||
}
|
||||
@ -941,28 +910,23 @@ static WINPR_FILE* FileHandle_New(FILE* fp)
|
||||
HANDLE GetStdHandle(DWORD nStdHandle)
|
||||
{
|
||||
FILE* fp;
|
||||
WINPR_FILE* pFile;
|
||||
WINPR_FILE *pFile;
|
||||
|
||||
switch (nStdHandle)
|
||||
{
|
||||
case STD_INPUT_HANDLE:
|
||||
fp = stdin;
|
||||
break;
|
||||
|
||||
case STD_OUTPUT_HANDLE:
|
||||
fp = stdout;
|
||||
break;
|
||||
|
||||
case STD_ERROR_HANDLE:
|
||||
fp = stderr;
|
||||
break;
|
||||
|
||||
default:
|
||||
return INVALID_HANDLE_VALUE;
|
||||
}
|
||||
|
||||
pFile = FileHandle_New(fp);
|
||||
|
||||
if (!pFile)
|
||||
return INVALID_HANDLE_VALUE;
|
||||
|
||||
@ -980,13 +944,14 @@ BOOL SetStdHandleEx(DWORD dwStdHandle, HANDLE hNewHandle, HANDLE* phOldHandle)
|
||||
}
|
||||
|
||||
BOOL GetDiskFreeSpaceA(LPCSTR lpRootPathName, LPDWORD lpSectorsPerCluster,
|
||||
LPDWORD lpBytesPerSector, LPDWORD lpNumberOfFreeClusters, LPDWORD lpTotalNumberOfClusters)
|
||||
LPDWORD lpBytesPerSector, LPDWORD lpNumberOfFreeClusters, LPDWORD lpTotalNumberOfClusters)
|
||||
{
|
||||
#if defined(ANDROID)
|
||||
#define STATVFS statfs
|
||||
#else
|
||||
#define STATVFS statvfs
|
||||
#endif
|
||||
|
||||
struct STATVFS svfst;
|
||||
STATVFS(lpRootPathName, &svfst);
|
||||
*lpSectorsPerCluster = svfst.f_frsize;
|
||||
@ -997,7 +962,7 @@ BOOL GetDiskFreeSpaceA(LPCSTR lpRootPathName, LPDWORD lpSectorsPerCluster,
|
||||
}
|
||||
|
||||
BOOL GetDiskFreeSpaceW(LPCWSTR lpwRootPathName, LPDWORD lpSectorsPerCluster,
|
||||
LPDWORD lpBytesPerSector, LPDWORD lpNumberOfFreeClusters, LPDWORD lpTotalNumberOfClusters)
|
||||
LPDWORD lpBytesPerSector, LPDWORD lpNumberOfFreeClusters, LPDWORD lpTotalNumberOfClusters)
|
||||
{
|
||||
LPSTR lpRootPathName;
|
||||
BOOL ret;
|
||||
@ -1007,9 +972,8 @@ BOOL GetDiskFreeSpaceW(LPCWSTR lpwRootPathName, LPDWORD lpSectorsPerCluster,
|
||||
SetLastError(ERROR_NOT_ENOUGH_MEMORY);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
ret = GetDiskFreeSpaceA(lpRootPathName, lpSectorsPerCluster, lpBytesPerSector,
|
||||
lpNumberOfFreeClusters, lpTotalNumberOfClusters);
|
||||
lpNumberOfFreeClusters, lpTotalNumberOfClusters);
|
||||
free(lpRootPathName);
|
||||
return ret;
|
||||
}
|
||||
@ -1101,128 +1065,80 @@ BOOL ValidFileNameComponent(LPCWSTR lpFileName)
|
||||
|
||||
#ifdef _UWP
|
||||
|
||||
HANDLE CreateFileW(LPCWSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
|
||||
LPSECURITY_ATTRIBUTES lpSecurityAttributes,
|
||||
DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile)
|
||||
HANDLE CreateFileW(LPCWSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes,
|
||||
DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile)
|
||||
{
|
||||
HANDLE hFile;
|
||||
CREATEFILE2_EXTENDED_PARAMETERS params;
|
||||
|
||||
ZeroMemory(¶ms, sizeof(CREATEFILE2_EXTENDED_PARAMETERS));
|
||||
|
||||
params.dwSize = sizeof(CREATEFILE2_EXTENDED_PARAMETERS);
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_FLAG_BACKUP_SEMANTICS) params.dwFileFlags |=
|
||||
FILE_FLAG_BACKUP_SEMANTICS;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_FLAG_DELETE_ON_CLOSE) params.dwFileFlags |=
|
||||
FILE_FLAG_DELETE_ON_CLOSE;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_FLAG_BACKUP_SEMANTICS) params.dwFileFlags |= FILE_FLAG_BACKUP_SEMANTICS;
|
||||
if (dwFlagsAndAttributes & FILE_FLAG_DELETE_ON_CLOSE) params.dwFileFlags |= FILE_FLAG_DELETE_ON_CLOSE;
|
||||
if (dwFlagsAndAttributes & FILE_FLAG_NO_BUFFERING) params.dwFileFlags |= FILE_FLAG_NO_BUFFERING;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_FLAG_OPEN_NO_RECALL) params.dwFileFlags |= FILE_FLAG_OPEN_NO_RECALL;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_FLAG_OPEN_REPARSE_POINT) params.dwFileFlags |=
|
||||
FILE_FLAG_OPEN_REPARSE_POINT;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_FLAG_OPEN_REQUIRING_OPLOCK) params.dwFileFlags |=
|
||||
FILE_FLAG_OPEN_REQUIRING_OPLOCK;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_FLAG_OPEN_REPARSE_POINT) params.dwFileFlags |= FILE_FLAG_OPEN_REPARSE_POINT;
|
||||
if (dwFlagsAndAttributes & FILE_FLAG_OPEN_REQUIRING_OPLOCK) params.dwFileFlags |= FILE_FLAG_OPEN_REQUIRING_OPLOCK;
|
||||
if (dwFlagsAndAttributes & FILE_FLAG_OVERLAPPED) params.dwFileFlags |= FILE_FLAG_OVERLAPPED;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_FLAG_POSIX_SEMANTICS) params.dwFileFlags |=
|
||||
FILE_FLAG_POSIX_SEMANTICS;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_FLAG_POSIX_SEMANTICS) params.dwFileFlags |= FILE_FLAG_POSIX_SEMANTICS;
|
||||
if (dwFlagsAndAttributes & FILE_FLAG_RANDOM_ACCESS) params.dwFileFlags |= FILE_FLAG_RANDOM_ACCESS;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_FLAG_SESSION_AWARE) params.dwFileFlags |= FILE_FLAG_SESSION_AWARE;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_FLAG_SEQUENTIAL_SCAN) params.dwFileFlags |=
|
||||
FILE_FLAG_SEQUENTIAL_SCAN;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_FLAG_SEQUENTIAL_SCAN) params.dwFileFlags |= FILE_FLAG_SEQUENTIAL_SCAN;
|
||||
if (dwFlagsAndAttributes & FILE_FLAG_WRITE_THROUGH) params.dwFileFlags |= FILE_FLAG_WRITE_THROUGH;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_ARCHIVE) params.dwFileAttributes |=
|
||||
FILE_ATTRIBUTE_ARCHIVE;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_COMPRESSED) params.dwFileAttributes |=
|
||||
FILE_ATTRIBUTE_COMPRESSED;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_ARCHIVE) params.dwFileAttributes |= FILE_ATTRIBUTE_ARCHIVE;
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_COMPRESSED) params.dwFileAttributes |= FILE_ATTRIBUTE_COMPRESSED;
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_DEVICE) params.dwFileAttributes |= FILE_ATTRIBUTE_DEVICE;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_DIRECTORY) params.dwFileAttributes |=
|
||||
FILE_ATTRIBUTE_DIRECTORY;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_ENCRYPTED) params.dwFileAttributes |=
|
||||
FILE_ATTRIBUTE_ENCRYPTED;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_DIRECTORY) params.dwFileAttributes |= FILE_ATTRIBUTE_DIRECTORY;
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_ENCRYPTED) params.dwFileAttributes |= FILE_ATTRIBUTE_ENCRYPTED;
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_HIDDEN) params.dwFileAttributes |= FILE_ATTRIBUTE_HIDDEN;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_INTEGRITY_STREAM) params.dwFileAttributes |=
|
||||
FILE_ATTRIBUTE_INTEGRITY_STREAM;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_INTEGRITY_STREAM) params.dwFileAttributes |= FILE_ATTRIBUTE_INTEGRITY_STREAM;
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_NORMAL) params.dwFileAttributes |= FILE_ATTRIBUTE_NORMAL;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_NOT_CONTENT_INDEXED) params.dwFileAttributes |=
|
||||
FILE_ATTRIBUTE_NOT_CONTENT_INDEXED;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_NO_SCRUB_DATA) params.dwFileAttributes |=
|
||||
FILE_ATTRIBUTE_NO_SCRUB_DATA;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_OFFLINE) params.dwFileAttributes |=
|
||||
FILE_ATTRIBUTE_OFFLINE;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_READONLY) params.dwFileAttributes |=
|
||||
FILE_ATTRIBUTE_READONLY;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_REPARSE_POINT) params.dwFileAttributes |=
|
||||
FILE_ATTRIBUTE_REPARSE_POINT;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_SPARSE_FILE) params.dwFileAttributes |=
|
||||
FILE_ATTRIBUTE_SPARSE_FILE;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_NOT_CONTENT_INDEXED) params.dwFileAttributes |= FILE_ATTRIBUTE_NOT_CONTENT_INDEXED;
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_NO_SCRUB_DATA) params.dwFileAttributes |= FILE_ATTRIBUTE_NO_SCRUB_DATA;
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_OFFLINE) params.dwFileAttributes |= FILE_ATTRIBUTE_OFFLINE;
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_READONLY) params.dwFileAttributes |= FILE_ATTRIBUTE_READONLY;
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_REPARSE_POINT) params.dwFileAttributes |= FILE_ATTRIBUTE_REPARSE_POINT;
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_SPARSE_FILE) params.dwFileAttributes |= FILE_ATTRIBUTE_SPARSE_FILE;
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_SYSTEM) params.dwFileAttributes |= FILE_ATTRIBUTE_SYSTEM;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_TEMPORARY) params.dwFileAttributes |=
|
||||
FILE_ATTRIBUTE_TEMPORARY;
|
||||
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_VIRTUAL) params.dwFileAttributes |=
|
||||
FILE_ATTRIBUTE_VIRTUAL;
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_TEMPORARY) params.dwFileAttributes |= FILE_ATTRIBUTE_TEMPORARY;
|
||||
if (dwFlagsAndAttributes & FILE_ATTRIBUTE_VIRTUAL) params.dwFileAttributes |= FILE_ATTRIBUTE_VIRTUAL;
|
||||
|
||||
if (dwFlagsAndAttributes & SECURITY_ANONYMOUS) params.dwSecurityQosFlags |= SECURITY_ANONYMOUS;
|
||||
|
||||
if (dwFlagsAndAttributes & SECURITY_CONTEXT_TRACKING) params.dwSecurityQosFlags |=
|
||||
SECURITY_CONTEXT_TRACKING;
|
||||
|
||||
if (dwFlagsAndAttributes & SECURITY_CONTEXT_TRACKING) params.dwSecurityQosFlags |= SECURITY_CONTEXT_TRACKING;
|
||||
if (dwFlagsAndAttributes & SECURITY_DELEGATION) params.dwSecurityQosFlags |= SECURITY_DELEGATION;
|
||||
|
||||
if (dwFlagsAndAttributes & SECURITY_EFFECTIVE_ONLY) params.dwSecurityQosFlags |=
|
||||
SECURITY_EFFECTIVE_ONLY;
|
||||
|
||||
if (dwFlagsAndAttributes & SECURITY_IDENTIFICATION) params.dwSecurityQosFlags |=
|
||||
SECURITY_IDENTIFICATION;
|
||||
|
||||
if (dwFlagsAndAttributes & SECURITY_IMPERSONATION) params.dwSecurityQosFlags |=
|
||||
SECURITY_IMPERSONATION;
|
||||
if (dwFlagsAndAttributes & SECURITY_EFFECTIVE_ONLY) params.dwSecurityQosFlags |= SECURITY_EFFECTIVE_ONLY;
|
||||
if (dwFlagsAndAttributes & SECURITY_IDENTIFICATION) params.dwSecurityQosFlags |= SECURITY_IDENTIFICATION;
|
||||
if (dwFlagsAndAttributes & SECURITY_IMPERSONATION) params.dwSecurityQosFlags |= SECURITY_IMPERSONATION;
|
||||
|
||||
params.lpSecurityAttributes = lpSecurityAttributes;
|
||||
params.hTemplateFile = hTemplateFile;
|
||||
|
||||
hFile = CreateFile2(lpFileName, dwDesiredAccess, dwShareMode, dwCreationDisposition, ¶ms);
|
||||
|
||||
return hFile;
|
||||
}
|
||||
|
||||
HANDLE CreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode,
|
||||
LPSECURITY_ATTRIBUTES lpSecurityAttributes,
|
||||
DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile)
|
||||
HANDLE CreateFileA(LPCSTR lpFileName, DWORD dwDesiredAccess, DWORD dwShareMode, LPSECURITY_ATTRIBUTES lpSecurityAttributes,
|
||||
DWORD dwCreationDisposition, DWORD dwFlagsAndAttributes, HANDLE hTemplateFile)
|
||||
{
|
||||
HANDLE hFile;
|
||||
WCHAR* lpFileNameW = NULL;
|
||||
|
||||
|
||||
|
||||
ConvertToUnicode(CP_UTF8, 0, lpFileName, -1, &lpFileNameW, 0);
|
||||
|
||||
if (!lpFileNameW)
|
||||
return NULL;
|
||||
|
||||
hFile = CreateFileW(lpFileNameW, dwDesiredAccess, dwShareMode, lpSecurityAttributes,
|
||||
dwCreationDisposition, dwFlagsAndAttributes, hTemplateFile);
|
||||
dwCreationDisposition, dwFlagsAndAttributes, hTemplateFile);
|
||||
|
||||
free(lpFileNameW);
|
||||
|
||||
return hFile;
|
||||
}
|
||||
|
||||
@ -1240,16 +1156,19 @@ DWORD WINAPI GetFileSize(HANDLE hFile, LPDWORD lpFileSizeHigh)
|
||||
return INVALID_FILE_SIZE;
|
||||
|
||||
*lpFileSizeHigh = fileSize.HighPart;
|
||||
|
||||
return fileSize.LowPart;
|
||||
}
|
||||
|
||||
DWORD SetFilePointer(HANDLE hFile, LONG lDistanceToMove,
|
||||
PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod)
|
||||
PLONG lpDistanceToMoveHigh, DWORD dwMoveMethod)
|
||||
{
|
||||
BOOL status;
|
||||
LARGE_INTEGER liDistanceToMove = { 0, 0 };
|
||||
LARGE_INTEGER liNewFilePointer = { 0, 0 };
|
||||
|
||||
liDistanceToMove.LowPart = lDistanceToMove;
|
||||
|
||||
status = SetFilePointerEx(hFile, liDistanceToMove, &liNewFilePointer, dwMoveMethod);
|
||||
|
||||
if (!status)
|
||||
@ -1263,14 +1182,12 @@ DWORD SetFilePointer(HANDLE hFile, LONG lDistanceToMove,
|
||||
|
||||
HANDLE FindFirstFileA(LPCSTR lpFileName, LPWIN32_FIND_DATAA lpFindFileData)
|
||||
{
|
||||
return FindFirstFileExA(lpFileName, FindExInfoStandard, lpFindFileData, FindExSearchNameMatch, NULL,
|
||||
0);
|
||||
return FindFirstFileExA(lpFileName, FindExInfoStandard, lpFindFileData, FindExSearchNameMatch, NULL, 0);
|
||||
}
|
||||
|
||||
HANDLE FindFirstFileW(LPCWSTR lpFileName, LPWIN32_FIND_DATAW lpFindFileData)
|
||||
{
|
||||
return FindFirstFileExW(lpFileName, FindExInfoStandard, lpFindFileData, FindExSearchNameMatch, NULL,
|
||||
0);
|
||||
return FindFirstFileExW(lpFileName, FindExInfoStandard, lpFindFileData, FindExSearchNameMatch, NULL, 0);
|
||||
}
|
||||
|
||||
DWORD GetFullPathNameA(LPCSTR lpFileName, DWORD nBufferLength, LPSTR lpBuffer, LPSTR* lpFilePart)
|
||||
@ -1295,6 +1212,7 @@ DWORD GetFullPathNameA(LPCSTR lpFileName, DWORD nBufferLength, LPSTR lpBuffer, L
|
||||
return 0;
|
||||
|
||||
dwStatus = GetFullPathNameW(lpFileNameW, nBufferLengthW, lpBufferW, &lpFilePartW);
|
||||
|
||||
ConvertFromUnicode(CP_UTF8, 0, lpBufferW, nBufferLengthW, &lpBuffer, nBufferLength, NULL, NULL);
|
||||
|
||||
if (lpFilePart)
|
||||
@ -1302,18 +1220,20 @@ DWORD GetFullPathNameA(LPCSTR lpFileName, DWORD nBufferLength, LPSTR lpBuffer, L
|
||||
|
||||
free(lpFileNameW);
|
||||
free(lpBufferW);
|
||||
|
||||
return dwStatus * 2;
|
||||
}
|
||||
|
||||
BOOL GetDiskFreeSpaceA(LPCSTR lpRootPathName, LPDWORD lpSectorsPerCluster,
|
||||
LPDWORD lpBytesPerSector, LPDWORD lpNumberOfFreeClusters, LPDWORD lpTotalNumberOfClusters)
|
||||
LPDWORD lpBytesPerSector, LPDWORD lpNumberOfFreeClusters, LPDWORD lpTotalNumberOfClusters)
|
||||
{
|
||||
BOOL status;
|
||||
ULARGE_INTEGER FreeBytesAvailableToCaller = { 0, 0 };
|
||||
ULARGE_INTEGER TotalNumberOfBytes = { 0, 0 };
|
||||
ULARGE_INTEGER TotalNumberOfFreeBytes = { 0, 0 };
|
||||
|
||||
status = GetDiskFreeSpaceExA(lpRootPathName, &FreeBytesAvailableToCaller,
|
||||
&TotalNumberOfBytes, &TotalNumberOfFreeBytes);
|
||||
&TotalNumberOfBytes, &TotalNumberOfFreeBytes);
|
||||
|
||||
if (!status)
|
||||
return FALSE;
|
||||
@ -1322,18 +1242,20 @@ BOOL GetDiskFreeSpaceA(LPCSTR lpRootPathName, LPDWORD lpSectorsPerCluster,
|
||||
*lpSectorsPerCluster = TotalNumberOfBytes.LowPart;
|
||||
*lpNumberOfFreeClusters = FreeBytesAvailableToCaller.LowPart;
|
||||
*lpTotalNumberOfClusters = TotalNumberOfFreeBytes.LowPart;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
BOOL GetDiskFreeSpaceW(LPCWSTR lpRootPathName, LPDWORD lpSectorsPerCluster,
|
||||
LPDWORD lpBytesPerSector, LPDWORD lpNumberOfFreeClusters, LPDWORD lpTotalNumberOfClusters)
|
||||
LPDWORD lpBytesPerSector, LPDWORD lpNumberOfFreeClusters, LPDWORD lpTotalNumberOfClusters)
|
||||
{
|
||||
BOOL status;
|
||||
ULARGE_INTEGER FreeBytesAvailableToCaller = { 0, 0 };
|
||||
ULARGE_INTEGER TotalNumberOfBytes = { 0, 0 };
|
||||
ULARGE_INTEGER TotalNumberOfFreeBytes = { 0, 0 };
|
||||
|
||||
status = GetDiskFreeSpaceExW(lpRootPathName, &FreeBytesAvailableToCaller,
|
||||
&TotalNumberOfBytes, &TotalNumberOfFreeBytes);
|
||||
&TotalNumberOfBytes, &TotalNumberOfFreeBytes);
|
||||
|
||||
if (!status)
|
||||
return FALSE;
|
||||
@ -1342,6 +1264,7 @@ BOOL GetDiskFreeSpaceW(LPCWSTR lpRootPathName, LPDWORD lpSectorsPerCluster,
|
||||
*lpSectorsPerCluster = TotalNumberOfBytes.LowPart;
|
||||
*lpNumberOfFreeClusters = FreeBytesAvailableToCaller.LowPart;
|
||||
*lpTotalNumberOfClusters = TotalNumberOfFreeBytes.LowPart;
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@ -1380,7 +1303,7 @@ HANDLE GetFileHandleForFileDescriptor(int fd)
|
||||
#ifdef _WIN32
|
||||
return (HANDLE)_get_osfhandle(fd);
|
||||
#else /* _WIN32 */
|
||||
WINPR_FILE* pFile;
|
||||
WINPR_FILE *pFile;
|
||||
FILE* fp;
|
||||
int flags;
|
||||
|
||||
@ -1389,7 +1312,6 @@ HANDLE GetFileHandleForFileDescriptor(int fd)
|
||||
return INVALID_HANDLE_VALUE;
|
||||
|
||||
flags = fcntl(fd, F_GETFL);
|
||||
|
||||
if (flags == -1)
|
||||
return INVALID_HANDLE_VALUE;
|
||||
|
||||
@ -1402,8 +1324,8 @@ HANDLE GetFileHandleForFileDescriptor(int fd)
|
||||
return INVALID_HANDLE_VALUE;
|
||||
|
||||
setvbuf(fp, NULL, _IONBF, 0);
|
||||
pFile = FileHandle_New(fp);
|
||||
|
||||
pFile = FileHandle_New(fp);
|
||||
if (!pFile)
|
||||
return INVALID_HANDLE_VALUE;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user