Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-11 15:15:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

In the CRT, replaced __set_errno calls having Win32 error codes as their argument with _dosmaperr.

Browse source 
svn path=/trunk/; revision=39862
This commit is contained in:
Jeffrey Morlan 2009-03-04 07:39:44 +00:00
parent 6db382c056
commit 5f17f63202
3 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/lib/sdk/crt/process/process.c
View file

@ -296,7 +296,7 @@ do_spawnT(int mode, const _TCHAR* cmdname, const _TCHAR* args, const _TCHAR* env
{ {
dwError = GetLastError(); dwError = GetLastError();
ERR("%x\n", dwError); ERR("%x\n", dwError);
__set_errno(dwError); _dosmaperr(dwError);
return(-1); return(-1);
} }
CloseHandle(ProcessInformation.hThread); CloseHandle(ProcessInformation.hThread);

48
reactos/lib/sdk/crt/stdio/file.c
View file

@ -463,12 +463,12 @@ int CDECL _access(const char *filename, int mode)
if (!filename || attr == INVALID_FILE_ATTRIBUTES) if (!filename || attr == INVALID_FILE_ATTRIBUTES)
{ {
__set_errno(GetLastError()); _dosmaperr(GetLastError());
return -1; return -1;
} }
if ((attr & FILE_ATTRIBUTE_READONLY) && (mode & W_OK)) if ((attr & FILE_ATTRIBUTE_READONLY) && (mode & W_OK))
{ {
__set_errno(ERROR_ACCESS_DENIED); _dosmaperr(ERROR_ACCESS_DENIED);
return -1; return -1;
} }
return 0; return 0;
@ -485,12 +485,12 @@ int CDECL _waccess(const wchar_t *filename, int mode)
if (!filename || attr == INVALID_FILE_ATTRIBUTES) if (!filename || attr == INVALID_FILE_ATTRIBUTES)
{ {
__set_errno(GetLastError()); _dosmaperr(GetLastError());
return -1; return -1;
} }
if ((attr & FILE_ATTRIBUTE_READONLY) && (mode & W_OK)) if ((attr & FILE_ATTRIBUTE_READONLY) && (mode & W_OK))
{ {
__set_errno(ERROR_ACCESS_DENIED); _dosmaperr(ERROR_ACCESS_DENIED);
return -1; return -1;
} }
return 0; return 0;
@ -511,7 +511,7 @@ int CDECL _chmod(const char *path, int flags)
if (newFlags == oldFlags || SetFileAttributesA(path, newFlags)) if (newFlags == oldFlags || SetFileAttributesA(path, newFlags))
return 0; return 0;
} }
__set_errno(GetLastError()); _dosmaperr(GetLastError());
return -1; return -1;
} }
@ -530,7 +530,7 @@ int CDECL _wchmod(const wchar_t *path, int flags)
if (newFlags == oldFlags || SetFileAttributesW(path, newFlags)) if (newFlags == oldFlags || SetFileAttributesW(path, newFlags))
return 0; return 0;
} }
__set_errno(GetLastError()); _dosmaperr(GetLastError());
return -1; return -1;
} }
@ -543,7 +543,7 @@ int CDECL _unlink(const char *path)
if(DeleteFileA(path)) if(DeleteFileA(path))
return 0; return 0;
TRACE("failed (%d)\n",GetLastError()); TRACE("failed (%d)\n",GetLastError());
__set_errno(GetLastError()); _dosmaperr(GetLastError());
return -1; return -1;
} }
@ -556,7 +556,7 @@ int CDECL _wunlink(const wchar_t *path)
if(DeleteFileW(path)) if(DeleteFileW(path))
return 0; return 0;
TRACE("failed (%d)\n",GetLastError()); TRACE("failed (%d)\n",GetLastError());
__set_errno(GetLastError()); _dosmaperr(GetLastError());
return -1; return -1;
} }
@ -621,7 +621,7 @@ int CDECL _close(int fd)
else if (!CloseHandle(hand)) else if (!CloseHandle(hand))
{ {
WARN(":failed-last error (%d)\n",GetLastError()); WARN(":failed-last error (%d)\n",GetLastError());
__set_errno(GetLastError()); _dosmaperr(GetLastError());
ret = -1; ret = -1;
} }
else else
@ -655,7 +655,7 @@ int CDECL _commit(int fd)
return 0; return 0;
} }
TRACE(":failed-last error (%d)\n",GetLastError()); TRACE(":failed-last error (%d)\n",GetLastError());
__set_errno(GetLastError()); _dosmaperr(GetLastError());
return -1; return -1;
} }
TRACE(":ok\n"); TRACE(":ok\n");
@ -701,7 +701,7 @@ int CDECL _dup2(int od, int nd)
else else
{ {
ret = -1; ret = -1;
__set_errno(GetLastError()); _dosmaperr(GetLastError());
} }
} }
else else
@ -827,7 +827,7 @@ __int64 CDECL _lseeki64(int fd, __int64 offset, int whence)
return ret.QuadPart; return ret.QuadPart;
} }
TRACE(":error-last error (%d)\n",GetLastError()); TRACE(":error-last error (%d)\n",GetLastError());
__set_errno(GetLastError()); _dosmaperr(GetLastError());
return -1; return -1;
} }
@ -941,7 +941,7 @@ int CDECL _chsize(int fd, long size)
if (pos >= 0) if (pos >= 0)
{ {
ret = SetEndOfFile(handle); ret = SetEndOfFile(handle);
if (!ret) __set_errno(GetLastError()); if (!ret) _dosmaperr(GetLastError());
} }
/* restore the file pointer */ /* restore the file pointer */
@ -1151,7 +1151,7 @@ int CDECL _futime(int fd, struct _utimbuf *t)
if (!SetFileTime(hand, NULL, &at, &wt)) if (!SetFileTime(hand, NULL, &at, &wt))
{ {
__set_errno(GetLastError()); _dosmaperr(GetLastError());
return -1 ; return -1 ;
} }
return 0; return 0;
@ -1324,7 +1324,7 @@ int CDECL _pipe(int *pfds, unsigned int psize, int textmode)
UNLOCK_FILES(); UNLOCK_FILES();
} }
else else
__set_errno(GetLastError()); _dosmaperr(GetLastError());
return ret; return ret;
} }
@ -1415,7 +1415,7 @@ int CDECL _sopen( const char *path, int oflags, int shflags, ... )
if (hand == INVALID_HANDLE_VALUE) { if (hand == INVALID_HANDLE_VALUE) {
WARN(":failed-last error (%d)\n",GetLastError()); WARN(":failed-last error (%d)\n",GetLastError());
__set_errno(GetLastError()); _dosmaperr(GetLastError());
return -1; return -1;
} }
@ -1445,7 +1445,7 @@ int CDECL _wsopen( const wchar_t* path, int oflags, int shflags, ... )
free(patha); free(patha);
return retval; return retval;
} }
__set_errno(GetLastError()); _dosmaperr(GetLastError());
free(patha); free(patha);
return -1; return -1;
} }
@ -1490,7 +1490,7 @@ int CDECL _wopen(const wchar_t *path,int flags,...)
return retval; return retval;
} }
__set_errno(GetLastError()); _dosmaperr(GetLastError());
return -1; return -1;
} }
@ -2237,7 +2237,7 @@ FILE * CDECL _wfsopen(const wchar_t *path, const wchar_t *mode, int share)
} }
free(patha); free(patha);
free(modea); free(modea);
__set_errno(GetLastError()); _dosmaperr(GetLastError());
return NULL; return NULL;
} }
@ -2419,7 +2419,7 @@ FILE* CDECL freopen(const char *path, const char *mode,FILE* file)
{ {
file->_flag = 0; file->_flag = 0;
WARN(":failed-last error (%d)\n",GetLastError()); WARN(":failed-last error (%d)\n",GetLastError());
__set_errno(GetLastError()); _dosmaperr(GetLastError());
file = NULL; file = NULL;
} }
} }
@ -2634,7 +2634,7 @@ int CDECL remove(const char *path)
if (DeleteFileA(path)) if (DeleteFileA(path))
return 0; return 0;
TRACE(":failed (%d)\n",GetLastError()); TRACE(":failed (%d)\n",GetLastError());
__set_errno(GetLastError()); _dosmaperr(GetLastError());
return -1; return -1;
} }
@ -2647,7 +2647,7 @@ int CDECL _wremove(const wchar_t *path)
if (DeleteFileW(path)) if (DeleteFileW(path))
return 0; return 0;
TRACE(":failed (%d)\n",GetLastError()); TRACE(":failed (%d)\n",GetLastError());
__set_errno(GetLastError()); _dosmaperr(GetLastError());
return -1; return -1;
} }
@ -2660,7 +2660,7 @@ int CDECL rename(const char *oldpath,const char *newpath)
if (MoveFileExA(oldpath, newpath, MOVEFILE_COPY_ALLOWED)) if (MoveFileExA(oldpath, newpath, MOVEFILE_COPY_ALLOWED))
return 0; return 0;
TRACE(":failed (%d)\n",GetLastError()); TRACE(":failed (%d)\n",GetLastError());
__set_errno(GetLastError()); _dosmaperr(GetLastError());
return -1; return -1;
} }
@ -2673,7 +2673,7 @@ int CDECL _wrename(const wchar_t *oldpath,const wchar_t *newpath)
if (MoveFileExW(oldpath, newpath, MOVEFILE_COPY_ALLOWED)) if (MoveFileExW(oldpath, newpath, MOVEFILE_COPY_ALLOWED))
return 0; return 0;
TRACE(":failed (%d)\n",GetLastError()); TRACE(":failed (%d)\n",GetLastError());
__set_errno(GetLastError()); _dosmaperr(GetLastError());
return -1; return -1;
} }

6
reactos/lib/sdk/crt/stdio/stat64.c
View file

@ -34,7 +34,7 @@ int CDECL _tstat64(const _TCHAR *path, struct __stat64 *buf)
if (!GetFileAttributesEx(path, GetFileExInfoStandard, &hfi)) if (!GetFileAttributesEx(path, GetFileExInfoStandard, &hfi))
{ {
TRACE("failed (%d)\n",GetLastError()); TRACE("failed (%d)\n",GetLastError());
__set_errno(ERROR_FILE_NOT_FOUND); _dosmaperr(ERROR_FILE_NOT_FOUND);
return -1; return -1;
} }
@ -101,7 +101,7 @@ int CDECL _fstat64(int fd, struct __stat64* buf)
if (!buf) if (!buf)
{ {
WARN(":failed-NULL buf\n"); WARN(":failed-NULL buf\n");
__set_errno(ERROR_INVALID_PARAMETER); _dosmaperr(ERROR_INVALID_PARAMETER);
return -1; return -1;
} }
@ -125,7 +125,7 @@ int CDECL _fstat64(int fd, struct __stat64* buf)
if (!GetFileInformationByHandle(hand, &hfi)) if (!GetFileInformationByHandle(hand, &hfi))
{ {
WARN(":failed-last error (%d)\n",GetLastError()); WARN(":failed-last error (%d)\n",GetLastError());
__set_errno(ERROR_INVALID_PARAMETER); _dosmaperr(ERROR_INVALID_PARAMETER);
return -1; return -1;
} }
buf->st_mode = _S_IFREG | _S_IREAD; buf->st_mode = _S_IFREG | _S_IREAD;