Ros-diffs January 2011

ros-diffs@reactos.org

20 participants
336 discussions

[tkreuzer] 50434: [CMAKE] Add __WINESRC__ definition to all winetests.
by tkreuzer＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: tkreuzer Date: Wed Jan 19 14:18:42 2011 New Revision: 50434 URL: http://svn.reactos.org/svn/reactos?rev=50434&view=rev Log: [CMAKE] Add __WINESRC__ definition to all winetests. Modified: trunk/rostests/winetests/CMakeLists.txt Modified: trunk/rostests/winetests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/CMakeLists.txt?… ============================================================================== --- trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/CMakeLists.txt [iso-8859-1] Wed Jan 19 14:18:42 2011 @@ -1,3 +1,5 @@ + +add_definitions(-D__WINESRC__) add_subdirectory(advapi32) add_subdirectory(advpack)

1 0

[tkreuzer] 50433: [CMAKE] Fix warnings by casting values explicitly to int in wine/test.h
by tkreuzer＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: tkreuzer Date: Wed Jan 19 13:50:22 2011 New Revision: 50433 URL: http://svn.reactos.org/svn/reactos?rev=50433&view=rev Log: [CMAKE] Fix warnings by casting values explicitly to int in wine/test.h Modified: branches/cmake-bringup/include/reactos/wine/test.h Modified: branches/cmake-bringup/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/reactos/w… ============================================================================== --- branches/cmake-bringup/include/reactos/wine/test.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/reactos/wine/test.h [iso-8859-1] Wed Jan 19 13:50:22 2011 @@ -440,13 +440,13 @@ { if (exit_code > 255) { - fprintf( stdout, "%s: exception 0x%08x in child process\n", current_test->name, exit_code ); + fprintf( stdout, "%s: exception 0x%08x in child process\n", current_test->name, (unsigned int)exit_code ); InterlockedIncrement( &failures ); } else { fprintf( stdout, "%s: %u failures in child process\n", - current_test->name, exit_code ); + current_test->name, (unsigned int)exit_code ); while (exit_code-- > 0) InterlockedIncrement(&failures); } @@ -558,8 +558,8 @@ if (winetest_debug) { fprintf( stdout, "%s: %d tests executed (%d marked as todo, %d %s), %d skipped.\n", - test->name, successes + failures + todo_successes + todo_failures, - todo_successes, failures + todo_failures, + test->name, (int)successes + failures + todo_successes + todo_failures, + (int)todo_successes, (int)failures + todo_failures, (failures + todo_failures != 1) ? "failures" : "failure", skipped ); }

1 0

[tkreuzer] 50432: [CMAKE] define _CRT_NONSTDC_NO_DEPRECATE for libmpg123 to silence a warning
by tkreuzer＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: tkreuzer Date: Wed Jan 19 13:35:09 2011 New Revision: 50432 URL: http://svn.reactos.org/svn/reactos?rev=50432&view=rev Log: [CMAKE] define _CRT_NONSTDC_NO_DEPRECATE for libmpg123 to silence a warning Modified: branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt Modified: branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libm… ============================================================================== --- branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/3rdparty/libmpg123/CMakeLists.txt [iso-8859-1] Wed Jan 19 13:35:09 2011 @@ -8,6 +8,7 @@ -Dlseek=_lseek -Dread=_read -Dstrdup=_strdup + -D_CRT_NONSTDC_NO_DEPRECATE -D_DLL -D__USE_CRTIMP) include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/libs/libmpg123)

1 0

[tkreuzer] 50431: [CMAKE] Move secure api functions from external file into string.h and use standard macros. Fixes 2 warnings.
by tkreuzer＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: tkreuzer Date: Wed Jan 19 13:33:48 2011 New Revision: 50431 URL: http://svn.reactos.org/svn/reactos?rev=50431&view=rev Log: [CMAKE] Move secure api functions from external file into string.h and use standard macros. Fixes 2 warnings. Modified: branches/cmake-bringup/include/crt/string.h Modified: branches/cmake-bringup/include/crt/string.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/strin… ============================================================================== --- branches/cmake-bringup/include/crt/string.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/crt/string.h [iso-8859-1] Wed Jan 19 13:33:48 2011 @@ -82,6 +82,17 @@ _CRTIMP char *_strupr_l(char *_String,_locale_t _Locale); _CRTIMP size_t __cdecl strxfrm(char *_Dst,const char *_Src,size_t _MaxCount); _CRTIMP size_t __cdecl _strxfrm_l(char *_Dst,const char *_Src,size_t _MaxCount,_locale_t _Locale); +#if __STDC_WANT_SECURE_LIB__ + _CRTIMP errno_t __cdecl _strset_s(char *_Dst,size_t _DstSize,int _Value); + _CRTIMP errno_t __cdecl _strerror_s(char *_Buf,size_t _SizeInBytes,const char *_ErrMsg); + _CRTIMP errno_t __cdecl _strlwr_s(char *_Str,size_t _Size); + _CRTIMP errno_t __cdecl _strlwr_s_l(char *_Str,size_t _Size,_locale_t _Locale); + _CRTIMP errno_t __cdecl _strnset_s(char *_Str,size_t _Size,int _Val,size_t _MaxCount); + _CRTIMP errno_t __cdecl _strupr_s(char *_Str,size_t _Size); + _CRTIMP errno_t __cdecl _strupr_s_l(char *_Str,size_t _Size,_locale_t _Locale); + _CRTIMP errno_t __cdecl strcpy_s(char *_Dst, size_t _Size, const char *_Src); + _CRTIMP errno_t __cdecl strcat_s(char *_Dst, size_t _Size, const char *_Src); +#endif #ifndef NO_OLDNAMES _CRTIMP _CRT_NONSTDC_DEPRECATE(_strdup) char *__cdecl strdup(const char *_Src); @@ -102,27 +113,15 @@ _CRTIMP wchar_t *__cdecl _wcsdup(const wchar_t *_Str); _CRTIMP _CRT_INSECURE_DEPRECATE(wcsat_s) wchar_t *__cdecl wcscat(wchar_t *_Dest,const wchar_t *_Source); -#if __STDC_WANT_SECURE_LIB__ - _CRTIMP errno_t __cdecl wcsat_s(wchar_t * Dest, size_t SizeInWords, const wchar_t * _Source); -#endif _CRTIMP _CONST_RETURN wchar_t *__cdecl wcschr(const wchar_t *_Str,wchar_t _Ch); _CRTIMP int __cdecl wcscmp(const wchar_t *_Str1,const wchar_t *_Str2); _CRTIMP _CRT_INSECURE_DEPRECATE(wcscpy_s) wchar_t *__cdecl wcscpy(wchar_t *_Dest,const wchar_t *_Source); -#if __STDC_WANT_SECURE_LIB__ - _CRTIMP errno_t __cdecl wcscpy_s(wchar_t * Dest, size_t SizeInWords, const wchar_t * _Source); -#endif _CRTIMP size_t __cdecl wcscspn(const wchar_t *_Str,const wchar_t *_Control); _CRTIMP wchar_t *wcsncat(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); _CRTIMP size_t __cdecl wcslen(const wchar_t *_Str); _CRTIMP _CRT_INSECURE_DEPRECATE(wcsnlen_s) size_t __cdecl wcsnlen(const wchar_t *_Src,size_t _MaxCount); -#if __STDC_WANT_SECURE_LIB__ - _CRTIMP errno_t __cdecl wcsnlen_s(wchar_t **_Src, size_t _MaxCount); -#endif _CRTIMP int __cdecl wcsncmp(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); _CRTIMP _CRT_INSECURE_DEPRECATE(wcsncpy_s) wchar_t *wcsncpy(wchar_t *_Dest,const wchar_t *_Source,size_t _Count); -#if __STDC_WANT_SECURE_LIB__ - _CRTIMP errno_t __cdecl wcsncpy_s(wchar_t *_Dest, size_t SizeInWords, const wchar_t *_Source ,size_t _Count); -#endif _CRTIMP _CONST_RETURN wchar_t *__cdecl wcspbrk(const wchar_t *_Str,const wchar_t *_Control); _CRTIMP _CONST_RETURN wchar_t *__cdecl wcsrchr(const wchar_t *_Str,wchar_t _Ch); _CRTIMP size_t __cdecl wcsspn(const wchar_t *_Str,const wchar_t *_Control); @@ -151,6 +150,20 @@ _CRTIMP int __cdecl _wcsncoll_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); _CRTIMP int __cdecl _wcsnicoll(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount); _CRTIMP int __cdecl _wcsnicoll_l(const wchar_t *_Str1,const wchar_t *_Str2,size_t _MaxCount,_locale_t _Locale); +#if __STDC_WANT_SECURE_LIB__ + _CRTIMP errno_t __cdecl wcsat_s(wchar_t * Dest, size_t SizeInWords, const wchar_t * _Source); + _CRTIMP errno_t __cdecl wcscpy_s(wchar_t * Dest, size_t SizeInWords, const wchar_t * _Source); + _CRTIMP errno_t __cdecl wcsnlen_s(wchar_t **_Src, size_t _MaxCount); + _CRTIMP errno_t __cdecl wcsncpy_s(wchar_t *_Dest, size_t SizeInWords, const wchar_t *_Source ,size_t _Count); + _CRTIMP errno_t __cdecl _wcserror_s(wchar_t *_Buf,size_t _SizeInWords,int _ErrNum); + _CRTIMP errno_t __cdecl __wcserror_s(wchar_t *_Buffer,size_t _SizeInWords,const wchar_t *_ErrMsg); + _CRTIMP errno_t __cdecl _wcsnset_s(wchar_t *_Dst,size_t _DstSizeInWords,wchar_t _Val,size_t _MaxCount); + _CRTIMP errno_t __cdecl _wcsset_s(wchar_t *_Str,size_t _SizeInWords,wchar_t _Val); + _CRTIMP errno_t __cdecl _wcslwr_s(wchar_t *_Str,size_t _SizeInWords); + _CRTIMP errno_t __cdecl _wcslwr_s_l(wchar_t *_Str,size_t _SizeInWords,_locale_t _Locale); + _CRTIMP errno_t __cdecl _wcsupr_s(wchar_t *_Str,size_t _Size); + _CRTIMP errno_t __cdecl _wcsupr_s_l(wchar_t *_Str,size_t _Size,_locale_t _Locale); +#endif #ifndef NO_OLDNAMES _CRTIMP _CRT_NONSTDC_DEPRECATE(_wcsdup) wchar_t *__cdecl wcsdup(const wchar_t *_Str); @@ -171,8 +184,6 @@ } #endif -#include <sec_api/string_s.h> - // HACK #define strcasecmp _stricmp #define strncasecmp _strnicmp @@ -180,3 +191,4 @@ #define wcsicmp _wcsicmp #endif +

1 0

[tkreuzer] 50430: [CMAKE] Include stdio.h into strsafe.h to silence a warning
by tkreuzer＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: tkreuzer Date: Wed Jan 19 12:05:18 2011 New Revision: 50430 URL: http://svn.reactos.org/svn/reactos?rev=50430&view=rev Log: [CMAKE] Include stdio.h into strsafe.h to silence a warning Modified: branches/cmake-bringup/include/psdk/strsafe.h Modified: branches/cmake-bringup/include/psdk/strsafe.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/psdk/strs… ============================================================================== --- branches/cmake-bringup/include/psdk/strsafe.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/psdk/strsafe.h [iso-8859-1] Wed Jan 19 12:05:18 2011 @@ -1,6 +1,7 @@ #ifndef __STRSAFE_H_ #define __STRSAFE_H_ +#include <stdio.h> #include <stdlib.h> #include <stdarg.h>

1 0

[tkreuzer] 50429: [CMAKE] prevent macro refefinition
by tkreuzer＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: tkreuzer Date: Wed Jan 19 11:58:42 2011 New Revision: 50429 URL: http://svn.reactos.org/svn/reactos?rev=50429&view=rev Log: [CMAKE] prevent macro refefinition Modified: branches/cmake-bringup/dll/win32/msvcrt/stubs.c Modified: branches/cmake-bringup/dll/win32/msvcrt/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/stubs.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/stubs.c [iso-8859-1] Wed Jan 19 11:58:42 2011 @@ -1,6 +1,7 @@ #include <stubs.h> +#undef UNIMPLEMENTED #define UNIMPLEMENTED __wine_spec_unimplemented_stub("msvcrt.dll", __FUNCTION__) int __get_app_type()

1 0

[tkreuzer] 50428: [CMAKE] Add missing strcpy_s and strcat_s prototypes to silence some warnings
by tkreuzer＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: tkreuzer Date: Wed Jan 19 11:55:45 2011 New Revision: 50428 URL: http://svn.reactos.org/svn/reactos?rev=50428&view=rev Log: [CMAKE] Add missing strcpy_s and strcat_s prototypes to silence some warnings Modified: branches/cmake-bringup/include/crt/sec_api/string_s.h Modified: branches/cmake-bringup/include/crt/sec_api/string_s.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/sec_a… ============================================================================== --- branches/cmake-bringup/include/crt/sec_api/string_s.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/crt/sec_api/string_s.h [iso-8859-1] Wed Jan 19 11:55:45 2011 @@ -21,6 +21,9 @@ _CRTIMP errno_t __cdecl _strnset_s(char *_Str,size_t _Size,int _Val,size_t _MaxCount); _CRTIMP errno_t __cdecl _strupr_s(char *_Str,size_t _Size); _CRTIMP errno_t __cdecl _strupr_s_l(char *_Str,size_t _Size,_locale_t _Locale); + _CRTIMP errno_t __cdecl strcpy_s(char *_Dst, size_t _Size, const char *_Src); + _CRTIMP errno_t __cdecl strcat_s(char *_Dst, size_t _Size, const char *_Src); + #ifndef _WSTRING_S_DEFINED #define _WSTRING_S_DEFINED _CRTIMP wchar_t *__cdecl wcstok_s(wchar_t *_Str,const wchar_t *_Delim,wchar_t **_Context);

1 0

[tkreuzer] 50427: [CMAKE] Don't add importlibs folder as link directory for anything other than i386 builds
by tkreuzer＠svn.reactos.org 19 Jan '11

19 Jan '11

Author: tkreuzer Date: Wed Jan 19 11:33:27 2011 New Revision: 50427 URL: http://svn.reactos.org/svn/reactos?rev=50427&view=rev Log: [CMAKE] Don't add importlibs folder as link directory for anything other than i386 builds Modified: branches/cmake-bringup/gcc.cmake Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=504… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Wed Jan 19 11:33:27 2011 @@ -2,7 +2,10 @@ if(CMAKE_CROSSCOMPILING) # Linking -link_directories("${REACTOS_SOURCE_DIR}/importlibs" ${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) +if(ARCH MATCHES i386) +link_directories("${REACTOS_SOURCE_DIR}/importlibs") +endif() +link_directories(${REACTOS_BINARY_DIR}/lib/3rdparty/mingw) set(CMAKE_C_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <FLAGS> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>") set(CMAKE_EXE_LINKER_FLAGS "-nodefaultlibs -nostdlib -Wl,--enable-auto-image-base -Wl,--disable-auto-import")

1 0

[rmessiant] 50426: [NTOS] - Fix a typo in the page fault handler that caused PDEs to be fixed up when they were in fact valid.
by rmessiant＠svn.reactos.org 18 Jan '11

18 Jan '11

Author: rmessiant Date: Tue Jan 18 22:42:44 2011 New Revision: 50426 URL: http://svn.reactos.org/svn/reactos?rev=50426&view=rev Log: [NTOS] - Fix a typo in the page fault handler that caused PDEs to be fixed up when they were in fact valid. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Tue Jan 18 22:42:44 2011 @@ -683,7 +683,7 @@ // // Is the PDE valid? // - if (!PointerPde->u.Hard.Valid == 0) + if (PointerPde->u.Hard.Valid == 0) { // // Debug spew (eww!)

1 0

[fireball] 50425: - Forgot to commit w32ksvc.db change.
by fireball＠svn.reactos.org 18 Jan '11

18 Jan '11

Author: fireball Date: Tue Jan 18 18:30:57 2011 New Revision: 50425 URL: http://svn.reactos.org/svn/reactos?rev=50425&view=rev Log: - Forgot to commit w32ksvc.db change. Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db Modified: branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/w32ksvc.db [iso-8859-1] Tue Jan 18 18:30:57 2011 @@ -38,7 +38,7 @@ RosGdiGetCharWidth 4 RosGdiGetDeviceCaps 2 RosGdiGetDeviceGammaRamp 2 -RosGdiSetWindow 3 +RosGdiSetWindow 5 RosGdiGetICMProfile 3 RosGdiGetNearestColor 2 RosGdiGetPixelFormat 1

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
34
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2011