diff --git a/reactos/lib/msvcrt/io/read.c b/reactos/lib/msvcrt/io/read.c index 520e2ec9a4b..b95e69897a1 100644 --- a/reactos/lib/msvcrt/io/read.c +++ b/reactos/lib/msvcrt/io/read.c @@ -10,13 +10,13 @@ #include #include -size_t _read(int _fd, void *_buf, size_t _nbyte) +size_t _read(int _fd, void *_buf, size_t _nbyte) { - size_t _rbyte; + DWORD _rbyte; - if (!ReadFile(_get_osfhandle(_fd),_buf,_nbyte,&_rbyte,NULL)) + if (!ReadFile(_get_osfhandle(_fd),_buf,_nbyte,&_rbyte,NULL)) { return -1; } - return _rbyte; + return (size_t)_rbyte; } diff --git a/reactos/lib/msvcrt/io/write.c b/reactos/lib/msvcrt/io/write.c index 51dac7b85f1..c64dc1890dd 100644 --- a/reactos/lib/msvcrt/io/write.c +++ b/reactos/lib/msvcrt/io/write.c @@ -14,10 +14,11 @@ size_t _write(int _fd, const void *_buf, size_t _nbyte) { - size_t _wbyte; + DWORD _wbyte; - if ( !WriteFile(_get_osfhandle(_fd),_buf,_nbyte,&_wbyte,NULL) ) { + if (!WriteFile(_get_osfhandle(_fd),_buf,_nbyte,&_wbyte,NULL)) + { return -1; } - return _wbyte; + return (size_t)_wbyte; } diff --git a/reactos/lib/msvcrt/stdio/vsprintf.c b/reactos/lib/msvcrt/stdio/vsprintf.c index 362c29f8f12..52e899eafa8 100644 --- a/reactos/lib/msvcrt/stdio/vsprintf.c +++ b/reactos/lib/msvcrt/stdio/vsprintf.c @@ -26,7 +26,7 @@ vswprintf(wchar_t *str, const wchar_t *fmt, va_list ap) int len; f._flag = _IOWRT|_IOSTRG; - f._ptr = str; + f._ptr = (char*)str; f._cnt = INT_MAX; f._file = -1; len = vfwprintf(&f,fmt, ap); @@ -56,7 +56,7 @@ _vsnwprintf(wchar_t *str, size_t maxlen, const wchar_t *fmt, va_list ap) FILE f; int len; f._flag = _IOWRT|_IOSTRG; - f._ptr = str; + f._ptr = (char*)str; f._cnt = maxlen; f._file = -1; len = vfwprintf(&f,fmt, ap); diff --git a/reactos/lib/msvcrt/stdlib/splitp.c b/reactos/lib/msvcrt/stdlib/splitp.c index 12d7e04834e..20536c67ebc 100644 --- a/reactos/lib/msvcrt/stdlib/splitp.c +++ b/reactos/lib/msvcrt/stdlib/splitp.c @@ -32,7 +32,7 @@ void _splitpath( const char *path, char *drive, char *dir, char *fname, char *ex else { *ext = 0; - tmp_ext = path+strlen(path); + tmp_ext = (char *)path+strlen(path); } if ( tmp_dir != NULL ) { strncpy(fname,tmp_dir+1,tmp_ext - tmp_dir - 1); @@ -76,7 +76,7 @@ void _wsplitpath( const wchar_t *path, wchar_t *drive, wchar_t *dir, wchar_t *fn else { *ext = 0; - tmp_ext = path+wcslen(path); + tmp_ext = (wchar_t *)path+wcslen(path); } if ( tmp_dir != NULL ) { diff --git a/reactos/subsys/csrss/init.c b/reactos/subsys/csrss/init.c index c481c306c33..b7d5e87ff76 100644 --- a/reactos/subsys/csrss/init.c +++ b/reactos/subsys/csrss/init.c @@ -1,4 +1,4 @@ -/* $Id: init.c,v 1.11 2001/03/25 02:34:30 dwelch Exp $ +/* $Id: init.c,v 1.12 2001/06/25 23:48:20 ekohl Exp $ * * reactos/subsys/csrss/init.c * @@ -157,14 +157,14 @@ CsrServerInitialization ( return FALSE; } RtlInitUnicodeString( &RefreshEventName, L"\\TextConsoleRefreshEvent" ); - InitializeObjectAttributes( &RefreshEventAttr, &RefreshEventName, NULL, NULL, NULL ); + InitializeObjectAttributes( &RefreshEventAttr, &RefreshEventName, 0, NULL, NULL ); Status = NtCreateEvent( &RefreshEventHandle, STANDARD_RIGHTS_ALL, &RefreshEventAttr, FALSE, FALSE ); if( !NT_SUCCESS( Status ) ) { PrintString( "CSR: Unable to create refresh event!\n" ); return FALSE; } - Status = RtlCreateUserThread( NtCurrentProcess(), NULL, FALSE, 0, NULL, NULL, (PTHREAD_START_ROUTINE)Console_Api, (DWORD) RefreshEventHandle, NULL, NULL ); + Status = RtlCreateUserThread( NtCurrentProcess(), NULL, FALSE, 0, NULL, NULL, (PTHREAD_START_ROUTINE)Console_Api, (PVOID) RefreshEventHandle, NULL, NULL ); if( !NT_SUCCESS( Status ) ) { PrintString( "CSR: Unable to create console thread\n" );