Ros-diffs December 2012

ros-diffs@reactos.org

12 participants
287 discussions

[tkreuzer] 57932: [PSDK] Start rewrite sal.h This will drop support for WDK's prefast, since it's impossible to maintain both sal version 1 and 2 and the old stuff is quite unreliable anyway. Only ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Dec 16 18:28:06 2012 New Revision: 57932 URL: http://svn.reactos.org/svn/reactos?rev=57932&view=rev Log: [PSDK] Start rewrite sal.h This will drop support for WDK's prefast, since it's impossible to maintain both sal version 1 and 2 and the old stuff is quite unreliable anyway. Only MSVC 11+ analyze with attributes for SAL will work. abragin: "\o/ for throwing away some legacy" ;-) Modified: trunk/reactos/include/psdk/sal.h trunk/reactos/lib/sdk/crt/string/splitp.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/psdk/sal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/sal.h?rev=579… Modified: trunk/reactos/lib/sdk/crt/string/splitp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/splitp.…

12 years

[akhaldi] 57931: [LIBINFHOST] * Fix a linking issue with the upcoming toolchain.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 16 17:15:34 2012 New Revision: 57931 URL: http://svn.reactos.org/svn/reactos?rev=57931&view=rev Log: [LIBINFHOST] * Fix a linking issue with the upcoming toolchain. Modified: trunk/reactos/lib/inflib/CMakeLists.txt Modified: trunk/reactos/lib/inflib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/inflib/CMakeLists.txt?… ============================================================================== --- trunk/reactos/lib/inflib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/inflib/CMakeLists.txt [iso-8859-1] Sun Dec 16 17:15:34 2012 @@ -23,6 +23,7 @@ add_definitions(-D__NO_CTYPE_INLINES -DINFLIB_HOST -D_CRT_NON_CONFORMING_SWPRINTFS) add_library(inflibhost ${GLOBAL_FILES} ${SOURCE}) if(NOT MSVC) + add_definitions(-D_swprintf=swprintf) add_target_compile_flags(inflibhost "-Wpointer-arith -Wwrite-strings") endif() target_link_libraries(inflibhost unicode)

12 years

[tkreuzer] 57930: [CRT] Fix build (2nd try)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Dec 16 16:48:31 2012 New Revision: 57930 URL: http://svn.reactos.org/svn/reactos?rev=57930&view=rev Log: [CRT] Fix build (2nd try) Modified: trunk/reactos/lib/sdk/crt/string/splitp.c Modified: trunk/reactos/lib/sdk/crt/string/splitp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/splitp.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/splitp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/splitp.c [iso-8859-1] Sun Dec 16 16:48:31 2012 @@ -32,7 +32,7 @@ } #endif - _Analysis_assume_(path != 0); + //_Analysis_assume_(path != 0); #if WINVER == 0x600 /* Skip '\\?\' prefix */

12 years

[tkreuzer] 57929: [CRT] Fix build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Dec 16 16:44:54 2012 New Revision: 57929 URL: http://svn.reactos.org/svn/reactos?rev=57929&view=rev Log: [CRT] Fix build Modified: trunk/reactos/lib/sdk/crt/misc/amsg.c Modified: trunk/reactos/lib/sdk/crt/misc/amsg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/misc/amsg.c?re… ============================================================================== --- trunk/reactos/lib/sdk/crt/misc/amsg.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/misc/amsg.c [iso-8859-1] Sun Dec 16 16:44:54 2012 @@ -47,6 +47,6 @@ void _amsg_exit(int errnum) { fprintf(stderr, "runtime error - %s\n", __rt_err_msg[errnum]); - _aexit_rtn(-1); + _exit(-1); }

12 years

[tkreuzer] 57928: [CRT] Fix / silence a number of warnings/errors detected with VS-analyze

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Dec 16 16:38:36 2012 New Revision: 57928 URL: http://svn.reactos.org/svn/reactos?rev=57928&view=rev Log: [CRT] Fix / silence a number of warnings/errors detected with VS-analyze Modified: trunk/reactos/lib/sdk/crt/include/internal/mingw-w64/internal.h trunk/reactos/lib/sdk/crt/include/internal/rterror.h trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h trunk/reactos/lib/sdk/crt/mbstring/mbclen.c trunk/reactos/lib/sdk/crt/mbstring/mbstrlen.c trunk/reactos/lib/sdk/crt/stdio/popen.c trunk/reactos/lib/sdk/crt/stdio/stat64.c trunk/reactos/lib/sdk/crt/stdlib/getenv.c trunk/reactos/lib/sdk/crt/string/_mbstrnlen.c trunk/reactos/lib/sdk/crt/string/mbstowcs_s.c trunk/reactos/lib/sdk/crt/string/scanf.h trunk/reactos/lib/sdk/crt/string/splitp.c trunk/reactos/lib/sdk/crt/string/strtoi64.c trunk/reactos/lib/sdk/crt/string/wcstombs_s.c trunk/reactos/lib/sdk/crt/time/ctime.c trunk/reactos/lib/sdk/crt/time/strftime.c trunk/reactos/lib/sdk/crt/time/timezone.c trunk/reactos/lib/sdk/crt/wine/undname.c Modified: trunk/reactos/lib/sdk/crt/include/internal/mingw-w64/internal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/mingw-w64/internal.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/mingw-w64/internal.h [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -139,7 +139,7 @@ /* __CRTIMP extern wchar_t *_wcmdln; */ #endif - _CRTIMP void __cdecl _amsg_exit(int); + _CRTIMP __declspec(noreturn) void __cdecl _amsg_exit(int); int __CRTDECL _setargv(void); int __CRTDECL __setargv(void); Modified: trunk/reactos/lib/sdk/crt/include/internal/rterror.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/rterror.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/rterror.h [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -25,7 +25,7 @@ #define _RT_STDIOINIT 15 /* not enough space for stdio initialization */ #define _RT_LOWIOINIT 16 /* not enough space for lowio initialization */ -void _amsg_exit (int errnum); +__declspec(noreturn) void _amsg_exit (int errnum); /* not in any other header */ void _dosmaperr(unsigned long oserrcode); Modified: trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/include/intern… ============================================================================== --- trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/include/internal/wine/msvcrt.h [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -31,7 +31,7 @@ extern const unsigned short _ctype [257]; void __cdecl _purecall(void); -void __cdecl _amsg_exit(int errnum); +__declspec(noreturn) void __cdecl _amsg_exit(int errnum); extern char **_environ; extern wchar_t **_wenviron; Modified: trunk/reactos/lib/sdk/crt/mbstring/mbclen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbcle… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/mbclen.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/mbclen.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -34,7 +34,7 @@ { if (str && *str && size) { - return !isleadbyte(*str) ? 1 : (size>1 ? 2 : -1); + return !isleadbyte((unsigned char)*str) ? 1 : (size>1 ? 2 : -1); } return 0; } Modified: trunk/reactos/lib/sdk/crt/mbstring/mbstrlen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/mbstr… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/mbstrlen.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/mbstrlen.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -30,7 +30,7 @@ /* FIXME: According to the documentation we are supposed to test for * multi-byte character validity. Whatever that means */ - str += isleadbyte(*str) ? 2 : 1; + str += isleadbyte((unsigned char)*str) ? 2 : 1; len++; } return len; Modified: trunk/reactos/lib/sdk/crt/stdio/popen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/popen.c?… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/popen.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/popen.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -109,6 +109,7 @@ } CloseHandle(ProcessInformation.hThread); + CloseHandle(ProcessInformation.hProcess); if ( *md == 'r' ) { Modified: trunk/reactos/lib/sdk/crt/stdio/stat64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/stat64.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/stat64.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/stat64.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -45,7 +45,7 @@ Also a letter as first char isn't enough to be classified as a drive letter */ - if (isalpha(*path)&& (*(path+1)==':')) + if (isalpha((unsigned char)*path)&& (*(path+1)==':')) buf->st_dev = buf->st_rdev = _totupper(*path) - 'A'; /* drive num */ else buf->st_dev = buf->st_rdev = _getdrive() - 1; Modified: trunk/reactos/lib/sdk/crt/stdlib/getenv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdlib/getenv.… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdlib/getenv.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdlib/getenv.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -16,12 +16,12 @@ */ char *getenv(const char *name) { - char **environ; + char **env; size_t length = strlen(name); - for (environ = *__p__environ(); *environ; environ++) + for (env = *__p__environ(); *env; env++) { - char *str = *environ; + char *str = *env; char *pos = strchr(str,'='); if (pos && ((unsigned int)(pos - str) == length) && !_strnicmp(str, name, length)) return pos + 1; @@ -34,12 +34,12 @@ */ wchar_t *_wgetenv(const wchar_t *name) { - wchar_t **environ; + wchar_t **env; size_t length = wcslen(name); - for (environ = *__p__wenviron(); *environ; environ++) + for (env = *__p__wenviron(); *env; env++) { - wchar_t *str = *environ; + wchar_t *str = *env; wchar_t *pos = wcschr(str, L'='); if (pos && ((unsigned int)(pos - str) == length) && !_wcsnicmp(str, name, length)) return pos + 1; Modified: trunk/reactos/lib/sdk/crt/string/_mbstrnlen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/_mbstrn… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/_mbstrnlen.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/_mbstrnlen.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -10,6 +10,7 @@ #include <mbctype.h> #include <specstrings.h> +_Success_(return>0) _Check_return_ _CRTIMP size_t Modified: trunk/reactos/lib/sdk/crt/string/mbstowcs_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/mbstowc… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/mbstowcs_s.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/mbstowcs_s.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -9,8 +9,9 @@ #include <precomp.h> #include <mbstring.h> +_Success_(return!=EINVAL) +_Check_return_opt_ _CRTIMP -_Check_return_opt_ errno_t __cdecl mbstowcs_s( Modified: trunk/reactos/lib/sdk/crt/string/scanf.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/scanf.h… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/scanf.h [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -37,8 +37,8 @@ #define _CHAR_ char #define _EOF_ EOF #define _EOF_RET EOF -#define _ISSPACE_(c) isspace(c) -#define _ISDIGIT_(c) isdigit(c) +#define _ISSPACE_(c) isspace((unsigned char)(c)) +#define _ISDIGIT_(c) isdigit((unsigned char)(c)) #define _WIDE2SUPPORTED_(c) c /* FIXME: convert wide char to char */ #define _CHAR2SUPPORTED_(c) c /* No conversion needed (char to char) */ #define _CHAR2DIGIT_(c, base) char2digit((c), (base)) Modified: trunk/reactos/lib/sdk/crt/string/splitp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/splitp.… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/splitp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/splitp.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -31,6 +31,8 @@ return; } #endif + + _Analysis_assume_(path != 0); #if WINVER == 0x600 /* Skip '\\?\' prefix */ Modified: trunk/reactos/lib/sdk/crt/string/strtoi64.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/strtoi6… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/strtoi64.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/strtoi64.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -7,7 +7,7 @@ BOOL negative = FALSE; __int64 ret = 0; - while(isspace(*nptr)) nptr++; + while(isspace((unsigned char)*nptr)) nptr++; if(*nptr == '-') { negative = TRUE; @@ -31,7 +31,7 @@ char cur = tolower(*nptr); int v; - if(isdigit(cur)) { + if(isdigit((unsigned char)cur)) { if(cur >= '0'+base) break; v = cur-'0'; Modified: trunk/reactos/lib/sdk/crt/string/wcstombs_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcstomb… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcstombs_s.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/wcstombs_s.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -8,6 +8,7 @@ #include <precomp.h> +_Success_(return!=EINVAL) _Check_return_wat_ _CRTIMP errno_t Modified: trunk/reactos/lib/sdk/crt/time/ctime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/ctime.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/ctime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/ctime.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -7,12 +7,11 @@ */ #define MINGW_HAS_SECURE_API 1 +#include <errno.h> #define RC_INVOKED 1 // to prevent inline functions #include <tchar.h> #include <time.h> #include "bitsfixup.h" - -#define EINVAL -1 /* Doesn't really exist, but we need it here */ _CRTIMP errno_t __cdecl localtime_s(struct tm *_Tm,const time_t *_Time); Modified: trunk/reactos/lib/sdk/crt/time/strftime.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/strftime.… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/strftime.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/strftime.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -2,8 +2,8 @@ * COPYRIGHT: LGPL, See LGPL.txt in the top level directory * PROJECT: ReactOS CRT library * FILE: lib/sdk/crt/time/strftime.c - * PURPOSE: - * PROGRAMER: + * PURPOSE: + * PROGRAMER: */ #include <precomp.h> @@ -258,7 +258,7 @@ else tmp = mstm->tm_wday-1; - tmp = mstm->tm_yday/7 + (tmp<=mstm->tm_yday%7); + tmp = mstm->tm_yday/7 + (tmp <= ((unsigned)mstm->tm_yday%7)); if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 2, 0, 53)) return 0; break; Modified: trunk/reactos/lib/sdk/crt/time/timezone.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/time/timezone.… ============================================================================== --- trunk/reactos/lib/sdk/crt/time/timezone.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/time/timezone.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -219,31 +219,33 @@ */ int CDECL _get_tzname(size_t *ret, char *buf, size_t bufsize, int index) { - char *timezone; - - switch(index) + char *str_timezone; + + switch (index) { case 0: - timezone = tz_name; + str_timezone = tz_name; break; + case 1: - timezone = tz_dst_name; + str_timezone = tz_dst_name; break; + default: *_errno() = EINVAL; return EINVAL; } - if(!ret || (!buf && bufsize > 0) || (buf && !bufsize)) + if (!ret || (!buf && (bufsize > 0)) || (buf && !bufsize)) { *_errno() = EINVAL; return EINVAL; } - *ret = strlen(timezone)+1; + *ret = strlen(str_timezone) + 1; if(!buf && !bufsize) return 0; - strcpy(buf, timezone); + strncpy(buf, str_timezone, bufsize); return 0; } Modified: trunk/reactos/lib/sdk/crt/wine/undname.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/wine/undname.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/wine/undname.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/wine/undname.c [iso-8859-1] Sun Dec 16 16:38:36 2012 @@ -216,8 +216,8 @@ for (i = a->max - 1; i >= 0; i--) { c = '>'; - if (i < a->start) c = '-'; - else if (i >= a->num) c = '}'; + if ((unsigned)i < a->start) c = '-'; + else if ((unsigned)i >= a->num) c = '}'; /* This check is as useless as the unused-but-set gcc warning that we want to silence here */ if (c != 0) TRACE("%p\t%d%c %s\n", a, i, c, a->elts[i]); } @@ -861,7 +861,7 @@ if (!get_modified_type(ct, sym, pmt_ref, in_args ? dt : 'P', in_args)) goto done; break; case 'P': /* Pointer */ - if (isdigit(*sym->current)) + if (isdigit((unsigned char)*sym->current)) { /* FIXME: P6 = Function pointer, others who knows.. */ if (*sym->current++ == '6')

12 years

[pschweitzer] 57927: [MORE] Fix memory leak

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Dec 16 16:12:30 2012 New Revision: 57927 URL: http://svn.reactos.org/svn/reactos?rev=57927&view=rev Log: [MORE] Fix memory leak Modified: trunk/reactos/base/applications/cmdutils/more/more.c Modified: trunk/reactos/base/applications/cmdutils/more/more.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/more/more.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/more/more.c [iso-8859-1] Sun Dec 16 16:12:30 2012 @@ -164,6 +164,7 @@ if (!LoadString(hApp, IDS_CONTINUE, szCont, sizeof(szCont) / sizeof(TCHAR))) { /* Shouldn't happen, so exit */ + free(buff); return 1; } szContLength = _tcslen(szCont);

12 years

[pschweitzer] 57926: [ATACLT] Add missing printf() parameter

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Dec 16 16:09:41 2012 New Revision: 57926 URL: http://svn.reactos.org/svn/reactos?rev=57926&view=rev Log: [ATACLT] Add missing printf() parameter Modified: trunk/reactos/base/applications/atactl/atactl.cpp Modified: trunk/reactos/base/applications/atactl/atactl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/atactl/a… ============================================================================== --- trunk/reactos/base/applications/atactl/atactl.cpp [iso-8859-1] (original) +++ trunk/reactos/base/applications/atactl/atactl.cpp [iso-8859-1] Sun Dec 16 16:09:41 2012 @@ -118,6 +118,7 @@ "...\n" "------\n" "", + DEFAULT_REMOVAL_LOCK_TIMEOUT, DEFAULT_REMOVAL_LOCK_TIMEOUT ); exit(0);

12 years

[hbelusca] 57925: [WIn32k] Fix the fix for Safe Mode (vide revision r57923).

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 16 14:37:45 2012 New Revision: 57925 URL: http://svn.reactos.org/svn/reactos?rev=57925&view=rev Log: [WIn32k] Fix the fix for Safe Mode (vide revision r57923). Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/syspar… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] Sun Dec 16 14:37:45 2012 @@ -25,18 +25,16 @@ #define METRIC2REG(met) (-((((met) * 1440)- 0) / dpi)) #define REQ_INTERACTIVE_WINSTA(err) \ - if (GetW32ProcessInfo()->prpwinsta) \ + if (GetW32ProcessInfo()->prpwinsta != InputWindowStation) \ { \ - if (GetW32ProcessInfo()->prpwinsta != InputWindowStation) \ + if (GetW32ProcessInfo()->prpwinsta == NULL) \ + { \ + ERR("NtUserSystemParametersInfo called without active window station, and it requires an interactive one\n"); \ + } \ + else \ { \ ERR("NtUserSystemParametersInfo requires interactive window station (current is %wZ)\n", &GetW32ProcessInfo()->prpwinsta->Name); \ - EngSetLastError(err); \ - return 0; \ } \ - } \ - else \ - { \ - ERR("NtUserSystemParametersInfo called without active window station, and it requires an interactive one.\n"); \ EngSetLastError(err); \ return 0; \ }

12 years

[tkreuzer] 57924: [FREELDR] Fix / silence a number of warnings/errors detected with VS-analyze

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Dec 16 14:23:05 2012 New Revision: 57924 URL: http://svn.reactos.org/svn/reactos?rev=57924&view=rev Log: [FREELDR] Fix / silence a number of warnings/errors detected with VS-analyze Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c trunk/reactos/boot/freeldr/freeldr/debug.c trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c trunk/reactos/boot/freeldr/freeldr/include/winldr.h trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c trunk/reactos/boot/freeldr/freeldr/version.c trunk/reactos/boot/freeldr/freeldr/windows/conversion.c Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hardware.c [iso-8859-1] Sun Dec 16 14:23:05 2012 @@ -1241,7 +1241,8 @@ } -static BOOLEAN +//static +BOOLEAN DetectKeyboardDevice(VOID) { UCHAR Status; @@ -1321,8 +1322,8 @@ PCONFIGURATION_COMPONENT_DATA PeripheralKey; ULONG Size; - /* HACK: don't call DetectKeyboardDevice() as it fails in Qemu 0.8.2 */ - if (TRUE || DetectKeyboardDevice()) + /* HACK: don't call DetectKeyboardDevice() as it fails in Qemu 0.8.2 + if (DetectKeyboardDevice()) */ { /* Set 'Configuration Data' value */ Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/ntoskrnl.c [iso-8859-1] Sun Dec 16 14:23:05 2012 @@ -12,6 +12,7 @@ IN EVENT_TYPE Type, IN BOOLEAN State) { + memset(Event, 0, sizeof(*Event)); } VOID Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcmem.c [iso-8859-1] Sun Dec 16 14:23:05 2012 @@ -285,8 +285,8 @@ /* Add the descriptor */ MapCount = AddMemoryDescriptor(PcMemoryMap, MAX_BIOS_DESCRIPTORS, - RealBaseAddress / MM_PAGE_SIZE, - RealSize / MM_PAGE_SIZE, + (PFN_NUMBER)(RealBaseAddress / MM_PAGE_SIZE), + (PFN_NUMBER)(RealSize / MM_PAGE_SIZE), MemoryType); } Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/pcvideo.c [iso-8859-1] Sun Dec 16 14:23:05 2012 @@ -17,6 +17,7 @@ */ #include <freeldr.h> +#include <suppress.h> #define NDEBUG #include <debug.h> @@ -1047,6 +1048,7 @@ BufPtr < (USHORT *) (VIDEOTEXT_MEM_ADDRESS + VIDEOTEXT_MEM_SIZE); BufPtr++) { + _PRAGMA_WARNING_SUPPRESS(__WARNING_DEREF_NULL_PTR) *BufPtr = AttrChar; } } Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/xboxhw.c [iso-8859-1] Sun Dec 16 14:23:05 2012 @@ -327,11 +327,11 @@ USHORT i; ULONG Size; BOOLEAN Changed; - + /* Count the number of visible drives */ DiskReportError(FALSE); DiskCount = 0; - + /* There are some really broken BIOSes out there. There are even BIOSes * that happily report success when you ask them to read from non-existent * harddisks. So, we set the buffer to known contents first, then try to @@ -357,9 +357,9 @@ DiskReportError(TRUE); TRACE("BIOS reports %d harddisk%s\n", (int)DiskCount, (DiskCount == 1) ? "": "s"); - + //DetectBiosFloppyController(BusKey); - + /* Allocate resource descriptor */ Size = sizeof(CM_PARTIAL_RESOURCE_LIST) + sizeof(CM_INT13_DRIVE_PARAMETER) * DiskCount; @@ -369,7 +369,7 @@ ERR("Failed to allocate resource descriptor\n"); return; } - + /* Initialize resource descriptor */ memset(PartialResourceList, 0, Size); PartialResourceList->Version = 1; @@ -380,7 +380,7 @@ PartialResourceList->PartialDescriptors[0].Flags = 0; PartialResourceList->PartialDescriptors[0].u.DeviceSpecificData.DataSize = sizeof(CM_INT13_DRIVE_PARAMETER) * DiskCount; - + /* Get harddisk Int13 geometry data */ Int13Drives = (PVOID)(((ULONG_PTR)PartialResourceList) + sizeof(CM_PARTIAL_RESOURCE_LIST)); for (i = 0; i < DiskCount; i++) @@ -392,7 +392,7 @@ Int13Drives[i].SectorsPerTrack = (USHORT)Geometry.Sectors; Int13Drives[i].MaxHeads = (USHORT)Geometry.Heads - 1; Int13Drives[i].NumberDrives = DiskCount; - + TRACE( "Disk %x: %u Cylinders %u Heads %u Sectors %u Bytes\n", 0x80 + i, @@ -402,7 +402,7 @@ Geometry.BytesPerSector); } } - + FldrCreateComponentKey(BusKey, ControllerClass, DiskController, @@ -414,14 +414,12 @@ Size, &ControllerKey); TRACE("Created key: DiskController\\0\n"); - + MmHeapFree(PartialResourceList); - + /* Create and fill subkey for each harddisk */ for (i = 0; i < DiskCount; i++) { - PCM_PARTIAL_RESOURCE_LIST PartialResourceList; - ULONG Size; CHAR Identifier[20]; /* Get disk values */ Modified: trunk/reactos/boot/freeldr/freeldr/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/debug… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/debug.c [iso-8859-1] Sun Dec 16 14:23:05 2012 @@ -275,7 +275,7 @@ iLevel = TRACE_LEVEL; else return FALSE; - + if(strcmp(channel, "memory") == 0) iChannel = DPRINT_MEMORY; else if(strcmp(channel, "filesystem") == 0) iChannel = DPRINT_FILESYSTEM; else if(strcmp(channel, "inifile") == 0) iChannel = DPRINT_INIFILE; @@ -289,7 +289,7 @@ else if(strcmp(channel, "peloader") == 0) iChannel = DPRINT_PELOADER; else if(strcmp(channel, "scsiport") == 0) iChannel = DPRINT_SCSIPORT; else if(strcmp(channel, "heap") == 0) iChannel = DPRINT_HEAP; - else if(strcmp(channel, "all") == 0) + else if(strcmp(channel, "all") == 0) { int i; @@ -309,7 +309,7 @@ DbgChannels[iChannel] |= iLevel; else DbgChannels[iChannel] &= ~iLevel; - + return TRUE; } @@ -411,7 +411,7 @@ { if (Message) { - DbgPrint("Assertion \'%s\' failed at %s line %d: %s\n", + DbgPrint("Assertion \'%s\' failed at %s line %u: %s\n", (PCHAR)FailedAssertion, (PCHAR)FileName, LineNumber, @@ -419,7 +419,7 @@ } else { - DbgPrint("Assertion \'%s\' failed at %s line %d\n", + DbgPrint("Assertion \'%s\' failed at %s line %u\n", (PCHAR)FailedAssertion, (PCHAR)FileName, LineNumber); Modified: trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/fs/nt… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/fs/ntfs.c [iso-8859-1] Sun Dec 16 14:23:05 2012 @@ -66,7 +66,7 @@ DataRun++; for (i = 0; i < DataRunLengthSize; i++) { - *DataRunLength += *DataRun << (i << 3); + *DataRunLength += ((ULONG64)*DataRun) << (i * 8); DataRun++; } @@ -79,11 +79,11 @@ { for (i = 0; i < DataRunOffsetSize - 1; i++) { - *DataRunOffset += *DataRun << (i << 3); + *DataRunOffset += ((ULONG64)*DataRun) << (i * 8); DataRun++; } /* The last byte contains sign so we must process it different way. */ - *DataRunOffset = ((CHAR)(*(DataRun++)) << (i << 3)) + *DataRunOffset; + *DataRunOffset = ((LONG64)(CHAR)(*(DataRun++)) << (i * 8)) + *DataRunOffset; } TRACE("DataRunOffsetSize: %x\n", DataRunOffsetSize); @@ -387,7 +387,7 @@ ListBuffer = MmHeapAlloc((ULONG)ListSize); else ListBuffer = NULL; - + if(!ListBuffer) { TRACE("Failed to allocate memory: %x\n", (ULONG)ListSize); @@ -616,7 +616,7 @@ BitmapData = MmHeapAlloc((ULONG)BitmapDataSize); else BitmapData = NULL; - + if (BitmapData == NULL) { MmHeapFree(IndexRecord); Modified: trunk/reactos/boot/freeldr/freeldr/include/winldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/winldr.h [iso-8859-1] Sun Dec 16 14:23:05 2012 @@ -86,7 +86,7 @@ // conversion.c PVOID VaToPa(PVOID Va); PVOID PaToVa(PVOID Pa); -VOID List_PaToVa(LIST_ENTRY *ListEntry); +VOID List_PaToVa(_In_ LIST_ENTRY *ListEntry); VOID ConvertConfigToVA(PCONFIGURATION_COMPONENT_DATA Start); // peloader.c Modified: trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inffi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/inffile/inffile.c [iso-8859-1] Sun Dec 16 14:23:05 2012 @@ -560,7 +560,7 @@ return p + 1; default: - if (!isspace(*p)) + if (!isspace((unsigned char)*p)) { parser->start = p; set_state( parser, KEY_NAME ); @@ -633,7 +633,7 @@ set_state( parser, EOL_BACKSLASH ); return p; default: - if (!isspace(*p)) token_end = p + 1; + if (!isspace((unsigned char)*p)) token_end = p + 1; else { push_token( parser, p ); @@ -685,7 +685,7 @@ set_state( parser, EOL_BACKSLASH ); return p; default: - if (!isspace(*p)) token_end = p + 1; + if (!isspace((unsigned char)*p)) token_end = p + 1; else { push_token( parser, p ); @@ -730,7 +730,7 @@ return p + 1; default: - if (isspace(*p)) + if (isspace((unsigned char)*p)) continue; push_token( parser, p ); pop_state( parser ); @@ -787,7 +787,7 @@ set_state( parser, EOL_BACKSLASH ); return p; } - if (!isspace(*p)) + if (!isspace((unsigned char)*p)) break; } parser->start = p; @@ -808,7 +808,7 @@ set_state( parser, EOL_BACKSLASH ); return p; } - if (!isspace(*p)) + if (!isspace((unsigned char)*p)) break; } pop_state( parser ); Modified: trunk/reactos/boot/freeldr/freeldr/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/versi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/version.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/version.c [iso-8859-1] Sun Dec 16 14:23:05 2012 @@ -23,14 +23,11 @@ PCHAR GetFreeLoaderVersionString(VOID) { - if (FREELOADER_PATCH_VERSION == 0) - { - sprintf(FreeLoaderVersionString, "FreeLoader v%d.%d", FREELOADER_MAJOR_VERSION, FREELOADER_MINOR_VERSION); - } - else - { - sprintf(FreeLoaderVersionString, "FreeLoader v%d.%d.%d", FREELOADER_MAJOR_VERSION, FREELOADER_MINOR_VERSION, FREELOADER_PATCH_VERSION); - } +#if (FREELOADER_PATCH_VERSION == 0) + sprintf(FreeLoaderVersionString, "FreeLoader v%d.%d", FREELOADER_MAJOR_VERSION, FREELOADER_MINOR_VERSION); +#else + sprintf(FreeLoaderVersionString, "FreeLoader v%d.%d.%d", FREELOADER_MAJOR_VERSION, FREELOADER_MINOR_VERSION, FREELOADER_PATCH_VERSION); +#endif return FreeLoaderVersionString; } Modified: trunk/reactos/boot/freeldr/freeldr/windows/conversion.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/conversion.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/conversion.c [iso-8859-1] Sun Dec 16 14:23:05 2012 @@ -45,7 +45,7 @@ #endif VOID -List_PaToVa(PLIST_ENTRY ListHeadPa) +List_PaToVa(_In_ PLIST_ENTRY ListHeadPa) { PLIST_ENTRY EntryPa, NextPa;

12 years

[hbelusca] 57923: [WIN32K] Fix BSOD when starting ReactOS in Safe Mode : NEVER dereference a NULL pointer in a DPRINT or you are dead !! (here, the possible NULL pointer is GetW32ProcessInfo()->prp...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Dec 16 14:01:32 2012 New Revision: 57923 URL: http://svn.reactos.org/svn/reactos?rev=57923&view=rev Log: [WIN32K] Fix BSOD when starting ReactOS in Safe Mode : NEVER dereference a NULL pointer in a DPRINT or you are dead !! (here, the possible NULL pointer is GetW32ProcessInfo()->prpwinsta). More precisely, you obtain: <NTOSKRNL.EXE:112296 (ReactOS/ntoskrnl/ke/i386/traphdlr.c:1246 (@KiTrap0EHandler@4))> <NTOSKRNL.EXE:110154 (ReactOS/ntoskrnl/ke/i386/trap.s:0 (_KiTrap0E))> <NTOSKRNL.EXE:142926 (ReactOS/lib/sdk/crt/printf/streamout.c:644 (streamout))> <NTOSKRNL.EXE:140631 (ReactOS/lib/sdk/crt/printf/_sxprintf.c:61 (_vsnprintf))> <NTOSKRNL.EXE:12736a (ReactOS/lib/rtl/debug.c:85 (vDbgPrintExWithPrefixInternal@24))> <NTOSKRNL.EXE:12751c (ReactOS/lib/rtl/debug.c:209 (DbgPrint))> <win32k.sys:55034 (ReactOS/win32ss/user/ntuser/sysparams.c:451 (SpiGet))> <win32k.sys:56bc7 (ReactOS/win32ss/user/ntuser/sysparams.c:963 (@UserSystemParametersInfo@16) Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c Modified: trunk/reactos/win32ss/user/ntuser/sysparams.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/syspar… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/sysparams.c [iso-8859-1] Sun Dec 16 14:01:32 2012 @@ -25,9 +25,18 @@ #define METRIC2REG(met) (-((((met) * 1440)- 0) / dpi)) #define REQ_INTERACTIVE_WINSTA(err) \ - if ( GetW32ProcessInfo()->prpwinsta != InputWindowStation) \ + if (GetW32ProcessInfo()->prpwinsta) \ { \ - ERR("NtUserSystemParametersInfo requires interactive window station (current is %wZ)\n", &GetW32ProcessInfo()->prpwinsta->Name); \ + if (GetW32ProcessInfo()->prpwinsta != InputWindowStation) \ + { \ + ERR("NtUserSystemParametersInfo requires interactive window station (current is %wZ)\n", &GetW32ProcessInfo()->prpwinsta->Name); \ + EngSetLastError(err); \ + return 0; \ + } \ + } \ + else \ + { \ + ERR("NtUserSystemParametersInfo called without active window station, and it requires an interactive one.\n"); \ EngSetLastError(err); \ return 0; \ } @@ -1568,7 +1577,7 @@ /* Get a pointer to the current Windowstation */ if (!ppi->prpwinsta) { - ERR("UserSystemParametersInfo called without active windowstation.\n"); + ERR("UserSystemParametersInfo called without active window station.\n"); //ASSERT(FALSE); //return FALSE; }

12 years

← Newer
1
...
12
13
14
15
16
17
18
...
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2012