Ros-diffs November 2010

ros-diffs@reactos.org

16 participants
491 discussions

[tkreuzer] 49828: [CMAKE] ML wants /nologo, not /NOLOGO

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 27 23:41:23 2010 New Revision: 49828 URL: http://svn.reactos.org/svn/reactos?rev=49828&view=rev Log: [CMAKE] ML wants /nologo, not /NOLOGO Modified: branches/cmake-bringup/msc.cmake Modified: branches/cmake-bringup/msc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=498… ============================================================================== --- branches/cmake-bringup/msc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/msc.cmake [iso-8859-1] Sat Nov 27 23:41:23 2010 @@ -156,7 +156,7 @@ # Assemble the file add_custom_command( OUTPUT ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj - COMMAND ${CMAKE_ASM_COMPILER} /NOLOGO /Fo${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj /c /Ta ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm + COMMAND ${CMAKE_ASM_COMPILER} /nologo /Fo${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.obj /c /Ta ${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm DEPENDS "${CMAKE_BINARY_DIR}/importlibs/lib${_name}_stubs.asm" )

14 years

[tkreuzer] 49827: revert r49824

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 27 22:24:15 2010 New Revision: 49827 URL: http://svn.reactos.org/svn/reactos?rev=49827&view=rev Log: revert r49824 Modified: trunk/reactos/tools/xml.cpp Modified: trunk/reactos/tools/xml.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/xml.cpp?rev=49827&r1… ============================================================================== --- trunk/reactos/tools/xml.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/xml.cpp [iso-8859-1] Sat Nov 27 22:24:15 2010 @@ -18,7 +18,6 @@ #ifdef _MSC_VER #pragma warning ( disable : 4786 ) -#pragma warning ( disable : 4996 ) #endif//_MSC_VER #ifdef WIN32 @@ -42,6 +41,7 @@ #include <stdlib.h> #include <stdio.h> #include "xml.h" +#include "ssprintf.h" #ifndef MAX_PATH #define MAX_PATH _MAX_PATH @@ -100,9 +100,7 @@ void XMLException::SetExceptionV ( const std::string& location, const char* format, va_list args ) { - char buffer[1024]; - _vsnprintf(buffer, sizeof(buffer)-1, format, args); - _e = location + ": " + buffer; + _e = location + ": " + ssvprintf(format,args); } void XMLException::SetException ( const std::string& location, const char* format, ... ) @@ -426,14 +424,13 @@ XMLFile::Location() const { int line = 1; - char line_str[10]; const char* p = strchr ( _buf.c_str(), '\n' ); while ( p && p < _p ) { ++line; p = strchr ( p+1, '\n' ); } - return _filename + "(" + itoa(line, line_str, 10) + ")"; + return ssprintf ( "%s(%i)",_filename.c_str(), line ); } XMLAttribute::XMLAttribute()

14 years

[tkreuzer] 49826: [ASM] Merge asm related changes from cmake branch.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 27 22:12:15 2010 New Revision: 49826 URL: http://svn.reactos.org/svn/reactos?rev=49826&view=rev Log: [ASM] Merge asm related changes from cmake branch. Added: trunk/reactos/include/reactos/asm.inc trunk/reactos/include/reactos/ks386.inc trunk/reactos/lib/sdk/crt/math/i386/atan2_asm.s (with props) trunk/reactos/lib/sdk/crt/math/i386/exp_asm.s (with props) trunk/reactos/lib/sdk/crt/math/i386/fmod_asm.s (with props) trunk/reactos/lib/sdk/crt/math/i386/fmodf_asm.s (with props) trunk/reactos/lib/sdk/crt/math/i386/ftol2_asm.s (with props) trunk/reactos/lib/sdk/crt/string/i386/tcscat.inc trunk/reactos/lib/sdk/crt/string/i386/tcschr.inc trunk/reactos/lib/sdk/crt/string/i386/tcscmp.inc trunk/reactos/lib/sdk/crt/string/i386/tcscpy.inc trunk/reactos/lib/sdk/crt/string/i386/tcslen.inc trunk/reactos/lib/sdk/crt/string/i386/tcsncat.inc trunk/reactos/lib/sdk/crt/string/i386/tcsncmp.inc trunk/reactos/lib/sdk/crt/string/i386/tcsncpy.inc trunk/reactos/lib/sdk/crt/string/i386/tcsnlen.inc trunk/reactos/lib/sdk/crt/string/i386/tcsrchr.inc Removed: trunk/reactos/lib/sdk/crt/string/i386/tcscat.h trunk/reactos/lib/sdk/crt/string/i386/tcschr.h trunk/reactos/lib/sdk/crt/string/i386/tcscmp.h trunk/reactos/lib/sdk/crt/string/i386/tcscpy.h trunk/reactos/lib/sdk/crt/string/i386/tcslen.h trunk/reactos/lib/sdk/crt/string/i386/tcsncat.h trunk/reactos/lib/sdk/crt/string/i386/tcsncmp.h trunk/reactos/lib/sdk/crt/string/i386/tcsncpy.h trunk/reactos/lib/sdk/crt/string/i386/tcsnlen.h trunk/reactos/lib/sdk/crt/string/i386/tcsrchr.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/arch.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/boot.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386pnp.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/int386.S trunk/reactos/boot/freeldr/freeldr/arch/amd64/mb.S trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S trunk/reactos/dll/win32/kernel32/thread/amd64/fiber.S trunk/reactos/dll/win32/kernel32/thread/amd64/thread.S trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S trunk/reactos/dll/win32/kernel32/thread/i386/thread.S trunk/reactos/hal/halx86/amd64/mps.S trunk/reactos/hal/halx86/amd64/systimer.S trunk/reactos/hal/halx86/generic/i386/systimer.S trunk/reactos/hal/halx86/generic/i386/trap.S trunk/reactos/lib/rtl/amd64/debug_asm.S trunk/reactos/lib/rtl/amd64/except_asm.S trunk/reactos/lib/rtl/amd64/rtlmem.S trunk/reactos/lib/rtl/amd64/slist.S trunk/reactos/lib/rtl/i386/debug_asm.S trunk/reactos/lib/rtl/i386/except_asm.s trunk/reactos/lib/rtl/i386/interlck.S trunk/reactos/lib/rtl/i386/res_asm.s trunk/reactos/lib/rtl/i386/rtlmem.s trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s trunk/reactos/lib/sdk/crt/except/amd64/seh.s trunk/reactos/lib/sdk/crt/except/i386/chkstk_asm.s trunk/reactos/lib/sdk/crt/except/i386/prolog.s trunk/reactos/lib/sdk/crt/except/i386/seh.s trunk/reactos/lib/sdk/crt/float/i386/logb.c trunk/reactos/lib/sdk/crt/math/amd64/alldiv.S trunk/reactos/lib/sdk/crt/math/amd64/atan.S trunk/reactos/lib/sdk/crt/math/amd64/atan2.S trunk/reactos/lib/sdk/crt/math/amd64/ceil.S trunk/reactos/lib/sdk/crt/math/amd64/ceilf.S trunk/reactos/lib/sdk/crt/math/amd64/exp.S trunk/reactos/lib/sdk/crt/math/amd64/fabs.S trunk/reactos/lib/sdk/crt/math/amd64/floor.S trunk/reactos/lib/sdk/crt/math/amd64/floorf.S trunk/reactos/lib/sdk/crt/math/amd64/fmod.S trunk/reactos/lib/sdk/crt/math/amd64/fmodf.S trunk/reactos/lib/sdk/crt/math/amd64/ldexp.S trunk/reactos/lib/sdk/crt/math/amd64/log.S trunk/reactos/lib/sdk/crt/math/amd64/log10.S trunk/reactos/lib/sdk/crt/math/amd64/pow.S trunk/reactos/lib/sdk/crt/math/amd64/sqrt.S trunk/reactos/lib/sdk/crt/math/amd64/sqrtf.S trunk/reactos/lib/sdk/crt/math/amd64/tan.S trunk/reactos/lib/sdk/crt/math/i386/alldiv_asm.s trunk/reactos/lib/sdk/crt/math/i386/alldvrm_asm.s trunk/reactos/lib/sdk/crt/math/i386/allmul_asm.s trunk/reactos/lib/sdk/crt/math/i386/allrem_asm.s trunk/reactos/lib/sdk/crt/math/i386/allshl_asm.s trunk/reactos/lib/sdk/crt/math/i386/allshr_asm.s trunk/reactos/lib/sdk/crt/math/i386/atan_asm.s trunk/reactos/lib/sdk/crt/math/i386/aulldiv_asm.s trunk/reactos/lib/sdk/crt/math/i386/aulldvrm_asm.s trunk/reactos/lib/sdk/crt/math/i386/aullrem_asm.s trunk/reactos/lib/sdk/crt/math/i386/aullshr_asm.s trunk/reactos/lib/sdk/crt/math/i386/ceil_asm.s trunk/reactos/lib/sdk/crt/math/i386/ceilf.S trunk/reactos/lib/sdk/crt/math/i386/cos_asm.s trunk/reactos/lib/sdk/crt/math/i386/fabs_asm.s trunk/reactos/lib/sdk/crt/math/i386/floor_asm.s trunk/reactos/lib/sdk/crt/math/i386/floorf.S trunk/reactos/lib/sdk/crt/math/i386/ftol_asm.s trunk/reactos/lib/sdk/crt/math/i386/log10_asm.s trunk/reactos/lib/sdk/crt/math/i386/log_asm.s trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s trunk/reactos/lib/sdk/crt/math/i386/sin_asm.s trunk/reactos/lib/sdk/crt/math/i386/sqrt_asm.s trunk/reactos/lib/sdk/crt/math/i386/tan_asm.s trunk/reactos/lib/sdk/crt/mem/i386/memchr_asm.s trunk/reactos/lib/sdk/crt/mem/i386/memcpy_asm.s trunk/reactos/lib/sdk/crt/mem/i386/memmove_asm.s trunk/reactos/lib/sdk/crt/mem/i386/memset_asm.s trunk/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s trunk/reactos/lib/sdk/crt/setjmp/i386/setjmp.s trunk/reactos/lib/sdk/crt/string/i386/strcat_asm.s trunk/reactos/lib/sdk/crt/string/i386/strchr_asm.s trunk/reactos/lib/sdk/crt/string/i386/strcmp_asm.s trunk/reactos/lib/sdk/crt/string/i386/strcpy_asm.s trunk/reactos/lib/sdk/crt/string/i386/strlen_asm.s trunk/reactos/lib/sdk/crt/string/i386/strncat_asm.s trunk/reactos/lib/sdk/crt/string/i386/strncmp_asm.s trunk/reactos/lib/sdk/crt/string/i386/strncpy_asm.s trunk/reactos/lib/sdk/crt/string/i386/strnlen_asm.s trunk/reactos/lib/sdk/crt/string/i386/strrchr_asm.s trunk/reactos/lib/sdk/crt/string/i386/tchar.h trunk/reactos/lib/sdk/crt/string/i386/wcscat_asm.s trunk/reactos/lib/sdk/crt/string/i386/wcschr_asm.s trunk/reactos/lib/sdk/crt/string/i386/wcscmp_asm.s trunk/reactos/lib/sdk/crt/string/i386/wcscpy_asm.s trunk/reactos/lib/sdk/crt/string/i386/wcslen_asm.s trunk/reactos/lib/sdk/crt/string/i386/wcsncat_asm.s trunk/reactos/lib/sdk/crt/string/i386/wcsncmp_asm.s trunk/reactos/lib/sdk/crt/string/i386/wcsncpy_asm.s trunk/reactos/lib/sdk/crt/string/i386/wcsnlen_asm.s trunk/reactos/lib/sdk/crt/string/i386/wcsrchr_asm.s trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S trunk/reactos/ntoskrnl/ex/i386/ioport.S trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S trunk/reactos/ntoskrnl/kdbg/amd64/kdb_help.S trunk/reactos/ntoskrnl/kdbg/i386/kdb_help.S trunk/reactos/ntoskrnl/ke/amd64/boot.S trunk/reactos/ntoskrnl/ke/amd64/ctxswitch.S trunk/reactos/ntoskrnl/ke/amd64/trap.S trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S trunk/reactos/ntoskrnl/rtl/i386/stack.S trunk/reactos/subsystems/win32/win32k/dib/i386/dib24bpp_hline.s trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_hline.s trunk/reactos/subsystems/win32/win32k/eng/i386/floatobj.S trunk/reactos/subsystems/win32/win32k/misc/i386/atan2_asm.s trunk/reactos/subsystems/win32/win32k/misc/i386/ceil_asm.s trunk/reactos/subsystems/win32/win32k/misc/i386/cos_asm.s trunk/reactos/subsystems/win32/win32k/misc/i386/floor_asm.s trunk/reactos/subsystems/win32/win32k/misc/i386/sin_asm.s trunk/reactos/tools/nci/ncitool.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/arch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/boot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/i386pnp.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/int386.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/amd64/mb.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/arch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… Modified: trunk/reactos/dll/ntdll/dispatch/i386/dispatch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/dispatch/i386/di… Modified: trunk/reactos/dll/win32/kernel32/thread/amd64/fiber.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… Modified: trunk/reactos/dll/win32/kernel32/thread/amd64/thread.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… Modified: trunk/reactos/dll/win32/kernel32/thread/i386/fiber.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… Modified: trunk/reactos/dll/win32/kernel32/thread/i386/thread.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… Modified: trunk/reactos/hal/halx86/amd64/mps.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/amd64/mps.S?rev… Modified: trunk/reactos/hal/halx86/amd64/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/amd64/systimer.… Modified: trunk/reactos/hal/halx86/generic/i386/systimer.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/i386/sy… Modified: trunk/reactos/hal/halx86/generic/i386/trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic/i386/tr… Added: trunk/reactos/include/reactos/asm.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/asm.inc?re… Added: trunk/reactos/include/reactos/ks386.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/ks386.inc?… Modified: trunk/reactos/lib/rtl/amd64/debug_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/amd64/debug_asm.S?… Modified: trunk/reactos/lib/rtl/amd64/except_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/amd64/except_asm.S… Modified: trunk/reactos/lib/rtl/amd64/rtlmem.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/amd64/rtlmem.S?rev… Modified: trunk/reactos/lib/rtl/amd64/slist.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/amd64/slist.S?rev=… Modified: trunk/reactos/lib/rtl/i386/debug_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/debug_asm.S?r… Modified: trunk/reactos/lib/rtl/i386/except_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/except_asm.s?… Modified: trunk/reactos/lib/rtl/i386/interlck.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/interlck.S?re… Modified: trunk/reactos/lib/rtl/i386/res_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/res_asm.s?rev… Modified: trunk/reactos/lib/rtl/i386/rtlmem.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/rtlmem.s?rev=… Modified: trunk/reactos/lib/sdk/crt/except/amd64/chkstk_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/amd64/c… Modified: trunk/reactos/lib/sdk/crt/except/amd64/seh.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/amd64/s… Modified: trunk/reactos/lib/sdk/crt/except/i386/chkstk_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/i386/ch… Modified: trunk/reactos/lib/sdk/crt/except/i386/prolog.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/i386/pr… Modified: trunk/reactos/lib/sdk/crt/except/i386/seh.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/except/i386/se… Modified: trunk/reactos/lib/sdk/crt/float/i386/logb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/float/i386/log… Modified: trunk/reactos/lib/sdk/crt/math/amd64/alldiv.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/all… Modified: trunk/reactos/lib/sdk/crt/math/amd64/atan.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/ata… Modified: trunk/reactos/lib/sdk/crt/math/amd64/atan2.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/ata… Modified: trunk/reactos/lib/sdk/crt/math/amd64/ceil.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/cei… Modified: trunk/reactos/lib/sdk/crt/math/amd64/ceilf.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/cei… Modified: trunk/reactos/lib/sdk/crt/math/amd64/exp.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/exp… Modified: trunk/reactos/lib/sdk/crt/math/amd64/fabs.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/fab… Modified: trunk/reactos/lib/sdk/crt/math/amd64/floor.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/flo… Modified: trunk/reactos/lib/sdk/crt/math/amd64/floorf.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/flo… Modified: trunk/reactos/lib/sdk/crt/math/amd64/fmod.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/fmo… Modified: trunk/reactos/lib/sdk/crt/math/amd64/fmodf.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/fmo… Modified: trunk/reactos/lib/sdk/crt/math/amd64/ldexp.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/lde… Modified: trunk/reactos/lib/sdk/crt/math/amd64/log.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/log… Modified: trunk/reactos/lib/sdk/crt/math/amd64/log10.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/log… Modified: trunk/reactos/lib/sdk/crt/math/amd64/pow.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/pow… Modified: trunk/reactos/lib/sdk/crt/math/amd64/sqrt.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/sqr… Modified: trunk/reactos/lib/sdk/crt/math/amd64/sqrtf.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/sqr… Modified: trunk/reactos/lib/sdk/crt/math/amd64/tan.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/amd64/tan… Modified: trunk/reactos/lib/sdk/crt/math/i386/alldiv_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/alld… Modified: trunk/reactos/lib/sdk/crt/math/i386/alldvrm_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/alld… Modified: trunk/reactos/lib/sdk/crt/math/i386/allmul_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/allm… Modified: trunk/reactos/lib/sdk/crt/math/i386/allrem_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/allr… Modified: trunk/reactos/lib/sdk/crt/math/i386/allshl_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/alls… Modified: trunk/reactos/lib/sdk/crt/math/i386/allshr_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/alls… Added: trunk/reactos/lib/sdk/crt/math/i386/atan2_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/atan… Modified: trunk/reactos/lib/sdk/crt/math/i386/atan_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/atan… Modified: trunk/reactos/lib/sdk/crt/math/i386/aulldiv_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/aull… Modified: trunk/reactos/lib/sdk/crt/math/i386/aulldvrm_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/aull… Modified: trunk/reactos/lib/sdk/crt/math/i386/aullrem_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/aull… Modified: trunk/reactos/lib/sdk/crt/math/i386/aullshr_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/aull… Modified: trunk/reactos/lib/sdk/crt/math/i386/ceil_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/ceil… Modified: trunk/reactos/lib/sdk/crt/math/i386/ceilf.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/ceil… Modified: trunk/reactos/lib/sdk/crt/math/i386/cos_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/cos_… Added: trunk/reactos/lib/sdk/crt/math/i386/exp_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/exp_… Modified: trunk/reactos/lib/sdk/crt/math/i386/fabs_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/fabs… Modified: trunk/reactos/lib/sdk/crt/math/i386/floor_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/floo… Modified: trunk/reactos/lib/sdk/crt/math/i386/floorf.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/floo… Added: trunk/reactos/lib/sdk/crt/math/i386/fmod_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/fmod… Added: trunk/reactos/lib/sdk/crt/math/i386/fmodf_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/fmod… Added: trunk/reactos/lib/sdk/crt/math/i386/ftol2_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/ftol… Modified: trunk/reactos/lib/sdk/crt/math/i386/ftol_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/ftol… Modified: trunk/reactos/lib/sdk/crt/math/i386/log10_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/log1… Modified: trunk/reactos/lib/sdk/crt/math/i386/log_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/log_… Modified: trunk/reactos/lib/sdk/crt/math/i386/pow_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/pow_… Modified: trunk/reactos/lib/sdk/crt/math/i386/sin_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/sin_… Modified: trunk/reactos/lib/sdk/crt/math/i386/sqrt_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/sqrt… Modified: trunk/reactos/lib/sdk/crt/math/i386/tan_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/math/i386/tan_… Modified: trunk/reactos/lib/sdk/crt/mem/i386/memchr_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/i386/memch… Modified: trunk/reactos/lib/sdk/crt/mem/i386/memcpy_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/i386/memcp… Modified: trunk/reactos/lib/sdk/crt/mem/i386/memmove_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/i386/memmo… Modified: trunk/reactos/lib/sdk/crt/mem/i386/memset_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mem/i386/memse… Modified: trunk/reactos/lib/sdk/crt/setjmp/amd64/setjmp.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/setjmp/amd64/s… Modified: trunk/reactos/lib/sdk/crt/setjmp/i386/setjmp.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/setjmp/i386/se… Modified: trunk/reactos/lib/sdk/crt/string/i386/strcat_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/st… Modified: trunk/reactos/lib/sdk/crt/string/i386/strchr_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/st… Modified: trunk/reactos/lib/sdk/crt/string/i386/strcmp_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/st… Modified: trunk/reactos/lib/sdk/crt/string/i386/strcpy_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/st… Modified: trunk/reactos/lib/sdk/crt/string/i386/strlen_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/st… Modified: trunk/reactos/lib/sdk/crt/string/i386/strncat_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/st… Modified: trunk/reactos/lib/sdk/crt/string/i386/strncmp_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/st… Modified: trunk/reactos/lib/sdk/crt/string/i386/strncpy_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/st… Modified: trunk/reactos/lib/sdk/crt/string/i386/strnlen_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/st… Modified: trunk/reactos/lib/sdk/crt/string/i386/strrchr_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/st… Modified: trunk/reactos/lib/sdk/crt/string/i386/tchar.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… Removed: trunk/reactos/lib/sdk/crt/string/i386/tcscat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… Added: trunk/reactos/lib/sdk/crt/string/i386/tcscat.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… Removed: trunk/reactos/lib/sdk/crt/string/i386/tcschr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… Added: trunk/reactos/lib/sdk/crt/string/i386/tcschr.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… Removed: trunk/reactos/lib/sdk/crt/string/i386/tcscmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… Added: trunk/reactos/lib/sdk/crt/string/i386/tcscmp.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… Removed: trunk/reactos/lib/sdk/crt/string/i386/tcscpy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… Added: trunk/reactos/lib/sdk/crt/string/i386/tcscpy.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… Removed: trunk/reactos/lib/sdk/crt/string/i386/tcslen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… Added: trunk/reactos/lib/sdk/crt/string/i386/tcslen.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… Removed: trunk/reactos/lib/sdk/crt/string/i386/tcsncat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… Added: trunk/reactos/lib/sdk/crt/string/i386/tcsncat.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… Removed: trunk/reactos/lib/sdk/crt/string/i386/tcsncmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… Added: trunk/reactos/lib/sdk/crt/string/i386/tcsncmp.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… Removed: trunk/reactos/lib/sdk/crt/string/i386/tcsncpy.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… Added: trunk/reactos/lib/sdk/crt/string/i386/tcsncpy.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… Removed: trunk/reactos/lib/sdk/crt/string/i386/tcsnlen.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… Added: trunk/reactos/lib/sdk/crt/string/i386/tcsnlen.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… Removed: trunk/reactos/lib/sdk/crt/string/i386/tcsrchr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… Added: trunk/reactos/lib/sdk/crt/string/i386/tcsrchr.inc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/tc… Modified: trunk/reactos/lib/sdk/crt/string/i386/wcscat_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/wc… Modified: trunk/reactos/lib/sdk/crt/string/i386/wcschr_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/wc… Modified: trunk/reactos/lib/sdk/crt/string/i386/wcscmp_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/wc… Modified: trunk/reactos/lib/sdk/crt/string/i386/wcscpy_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/wc… Modified: trunk/reactos/lib/sdk/crt/string/i386/wcslen_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/wc… Modified: trunk/reactos/lib/sdk/crt/string/i386/wcsncat_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/wc… Modified: trunk/reactos/lib/sdk/crt/string/i386/wcsncmp_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/wc… Modified: trunk/reactos/lib/sdk/crt/string/i386/wcsncpy_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/wc… Modified: trunk/reactos/lib/sdk/crt/string/i386/wcsnlen_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/wc… Modified: trunk/reactos/lib/sdk/crt/string/i386/wcsrchr_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/i386/wc… Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/fastinter… Modified: trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/interlck_… Modified: trunk/reactos/ntoskrnl/ex/i386/ioport.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/ioport.S?… Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… Modified: trunk/reactos/ntoskrnl/kdbg/amd64/kdb_help.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/amd64/kdb_he… Modified: trunk/reactos/ntoskrnl/kdbg/i386/kdb_help.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/i386/kdb_hel… Modified: trunk/reactos/ntoskrnl/ke/amd64/boot.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/boot.S?r… Modified: trunk/reactos/ntoskrnl/ke/amd64/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/ctxswitc… Modified: trunk/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/amd64/trap.S?r… Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… Modified: trunk/reactos/ntoskrnl/ke/i386/usercall_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/usercall_… Modified: trunk/reactos/ntoskrnl/rtl/i386/stack.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/i386/stack.S?… Modified: trunk/reactos/subsystems/win32/win32k/dib/i386/dib24bpp_hline.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_colorfill.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/dib/i386/dib32bpp_hline.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/di… Modified: trunk/reactos/subsystems/win32/win32k/eng/i386/floatobj.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… Modified: trunk/reactos/subsystems/win32/win32k/misc/i386/atan2_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… Modified: trunk/reactos/subsystems/win32/win32k/misc/i386/ceil_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… Modified: trunk/reactos/subsystems/win32/win32k/misc/i386/cos_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… Modified: trunk/reactos/subsystems/win32/win32k/misc/i386/floor_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… Modified: trunk/reactos/subsystems/win32/win32k/misc/i386/sin_asm.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/mi… Modified: trunk/reactos/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/ncitool.c?rev=49…

14 years

[fireball] 49825: [MPRAPI] - Sync to Wine-1.3.8 See issue #5718 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Nov 27 21:38:11 2010 New Revision: 49825 URL: http://svn.reactos.org/svn/reactos?rev=49825&view=rev Log: [MPRAPI] - Sync to Wine-1.3.8 See issue #5718 for more details. Modified: trunk/reactos/dll/win32/mprapi/mprapi.c trunk/reactos/dll/win32/mprapi/mprapi.spec trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/mprapi/mprapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mprapi/mprapi.c?… ============================================================================== --- trunk/reactos/dll/win32/mprapi/mprapi.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mprapi/mprapi.c [iso-8859-1] Sat Nov 27 21:38:11 2010 @@ -45,6 +45,32 @@ } /*********************************************************************** + * MprAdminGetErrorString (MPRAPI.@) + * + * Return a unicode string for the given mpr errorcode + * + * PARAMS + * mprerror [i] errorcode, for which a description is requested + * localstr [o] pointer, where a buffer with the error description is returned + * + * RETURNS + * Failure: ERROR_MR_MID_NOT_FOUND, when mprerror is not known + * Success: ERROR_SUCCESS, and in localstr a pointer to a buffer from LocalAlloc, + * which contains the error description. + * + * NOTES + * The caller must free the returned buffer with LocalFree + * + */ +DWORD APIENTRY MprAdminGetErrorString(DWORD mprerror, LPWSTR *localstr) +{ + FIXME("(0x%x/%u, %p): stub!\n", mprerror, mprerror, localstr); + + *localstr = NULL; + return ERROR_MR_MID_NOT_FOUND; +} + +/*********************************************************************** * MprAdminIsServiceRunning (MPRAPI.@) */ BOOL APIENTRY MprAdminIsServiceRunning(LPWSTR server) Modified: trunk/reactos/dll/win32/mprapi/mprapi.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mprapi/mprapi.sp… ============================================================================== --- trunk/reactos/dll/win32/mprapi/mprapi.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/mprapi/mprapi.spec [iso-8859-1] Sat Nov 27 21:38:11 2010 @@ -6,7 +6,7 @@ @ stub MprAdminDeregisterConnectionNotification @ stub MprAdminDeviceEnum @ stub MprAdminEstablishDomainRasServer -@ stub MprAdminGetErrorString +@ stdcall MprAdminGetErrorString(long ptr) @ stub MprAdminGetPDCServer @ stub MprAdminInterfaceConnect @ stub MprAdminInterfaceCreate Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Sat Nov 27 21:38:11 2010 @@ -90,6 +90,7 @@ reactos/dll/win32/mciwave # Autosync reactos/dll/win32/mlang # Autosync reactos/dll/win32/mpr # Autosync +reactos/dll/win32/mprapi # Autosync reactos/dll/win32/msacm32 # Autosync reactos/dll/win32/msadp32.acm # Autosync reactos/dll/win32/mscat32 # Autosync

14 years

[tkreuzer] 49824: [XML] Silence a warning on MSVC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 27 19:02:37 2010 New Revision: 49824 URL: http://svn.reactos.org/svn/reactos?rev=49824&view=rev Log: [XML] Silence a warning on MSVC Modified: trunk/reactos/tools/xml.cpp Modified: trunk/reactos/tools/xml.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/xml.cpp?rev=49824&r1… ============================================================================== --- trunk/reactos/tools/xml.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/xml.cpp [iso-8859-1] Sat Nov 27 19:02:37 2010 @@ -18,6 +18,7 @@ #ifdef _MSC_VER #pragma warning ( disable : 4786 ) +#pragma warning ( disable : 4996 ) #endif//_MSC_VER #ifdef WIN32 @@ -41,7 +42,6 @@ #include <stdlib.h> #include <stdio.h> #include "xml.h" -#include "ssprintf.h" #ifndef MAX_PATH #define MAX_PATH _MAX_PATH @@ -100,7 +100,9 @@ void XMLException::SetExceptionV ( const std::string& location, const char* format, va_list args ) { - _e = location + ": " + ssvprintf(format,args); + char buffer[1024]; + _vsnprintf(buffer, sizeof(buffer)-1, format, args); + _e = location + ": " + buffer; } void XMLException::SetException ( const std::string& location, const char* format, ... ) @@ -424,13 +426,14 @@ XMLFile::Location() const { int line = 1; + char line_str[10]; const char* p = strchr ( _buf.c_str(), '\n' ); while ( p && p < _p ) { ++line; p = strchr ( p+1, '\n' ); } - return ssprintf ( "%s(%i)",_filename.c_str(), line ); + return _filename + "(" + itoa(line, line_str, 10) + ")"; } XMLAttribute::XMLAttribute()

14 years

[tkreuzer] 49823: [CMAKE] Add an incomplete cmake file for msi

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 27 18:30:39 2010 New Revision: 49823 URL: http://svn.reactos.org/svn/reactos?rev=49823&view=rev Log: [CMAKE] Add an incomplete cmake file for msi Added: branches/cmake-bringup/dll/win32/msi/CMakeLists.txt (with props) Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Sat Nov 27 18:30:39 2010 @@ -91,7 +91,7 @@ add_subdirectory(msgsm32.acm) add_subdirectory(mshtml) add_subdirectory(mshtml.tlb) -#add_subdirectory(msi) +add_subdirectory(msi) add_subdirectory(msimg32) add_subdirectory(msimtf) add_subdirectory(msisip) Added: branches/cmake-bringup/dll/win32/msi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msi/CMa… ============================================================================== --- branches/cmake-bringup/dll/win32/msi/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/msi/CMakeLists.txt [iso-8859-1] Sat Nov 27 18:30:39 2010 @@ -1,0 +1,84 @@ + +spec2def(msi.dll msi.spec) + +if (0) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +add_definitions(-D__WINESRC__) + +add_library(msi SHARED + action.c + alter.c + appsearch.c + automation.c + classes.c + cond.tab.c + create.c</file> + custom.c</file> + database.c</file> + delete.c</file> + dialog.c</file> + distinct.c</file> + drop.c</file> + events.c</file> + files.c</file> + font.c</file> + format.c</file> + handle.c</file> + helpers.c</file> + insert.c</file> + install.c</file> + join.c</file> + media.c</file> + msi.c</file> + msi_main.c</file> + msiquery.c</file> + package.c</file> + preview.c</file> + record.c</file> + registry.c</file> + regsvr.c</file> + script.c</file> + select.c</file> + source.c</file> + sql.tab.c</file> + storages.c</file> + streams.c</file> + string.c</file> + suminfo.c</file> + table.c</file> + tokenize.c</file> + update.c</file> + upgrade.c</file> + where.c</file> + msi.rc</file> + ${CMAKE_CURRENT_BINARY_DIR}/msi.def) + +set_module_type(msi win32dll) + +target_link_libraries(msi wine uuid PSEH_LIB) + +add_importlibs(msi + kernel32 + urlmon + wininet + comctl32 + shell32 + shlwapi + cabinet + oleaut32 + ole32 + version + user32 + gdi32 + advapi32 + odbccp32 + ntdll) + +# <library>msiserver_interface</library> +# <dependency>msiserver</dependency> +# <dependency>msiheader</dependency> + +add_cab_target(msi 1) +endif() +add_importlib_target(msi.spec) Propchange: branches/cmake-bringup/dll/win32/msi/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

14 years

[tkreuzer] 49822: [MSVCRT] - Fix forwarded export of GetLocaleInfoW - Rename _inp & co to MSVCRT__inp, because they are only available as intrinsics on MSVC - Implement them using the intrinsic

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Nov 27 15:50:53 2010 New Revision: 49822 URL: http://svn.reactos.org/svn/reactos?rev=49822&view=rev Log: [MSVCRT] - Fix forwarded export of GetLocaleInfoW - Rename _inp & co to MSVCRT__inp, because they are only available as intrinsics on MSVC - Implement them using the intrinsic Modified: branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c Modified: branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Sat Nov 27 15:50:53 2010 @@ -137,7 +137,7 @@ @ extern __badioinfo __badioinfo @ cdecl __crtCompareStringA(long long str long str long) kernel32.CompareStringA @ cdecl __crtCompareStringW(long long wstr long wstr long) kernel32.CompareStringW -@ cdecl __crtGetLocaleInfoW(long long ptr long) kernel32.GetLocaleInfo +@ cdecl __crtGetLocaleInfoW(long long ptr long) kernel32.GetLocaleInfoW @ cdecl __crtGetStringTypeW(long long wstr long ptr) @ cdecl __crtLCMapStringA(long long str long ptr long long long) # stub __crtLCMapStringW @@ -475,9 +475,9 @@ # stub _i64tow_s @ cdecl _initterm(ptr ptr) # stub _initterm_e -@ cdecl -arch=i386 _inp(long) -@ cdecl -arch=i386 _inpd(long) -@ cdecl -arch=i386 _inpw(long) +@ cdecl -arch=i386 _inp(long) MSVCRT__inp +@ cdecl -arch=i386 _inpd(long) MSVCRT__inpd +@ cdecl -arch=i386 _inpw(long) MSVCRT__inpw @ cdecl _invalid_parameter(wstr wstr wstr long long) @ extern _iob # stub _isalnum_l @@ -757,9 +757,9 @@ @ cdecl _open_osfhandle(long long) @ extern _osplatform _osplatform @ extern _osver _osver -@ cdecl _outp(long long) -@ cdecl _outpd(long long) -@ cdecl _outpw(long long) +@ cdecl _outp(long long) MSVCRT__outp +@ cdecl _outpd(long long) MSVCRT__outpd +@ cdecl _outpw(long long) MSVCRT__outpw @ cdecl _pclose (ptr) @ extern _pctype _pctype @ extern _pgmptr _pgmptr Modified: branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msvcrt/… ============================================================================== --- branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msvcrt/msvcrt_stubs.c [iso-8859-1] Sat Nov 27 15:50:53 2010 @@ -53,47 +53,43 @@ return 0; } -int _inp( + +int MSVCRT__inp( unsigned short port) { - UNIMPLEMENTED; - return 0; + return _inp(port); } -unsigned short _inpw( +unsigned short MSVCRT__inpw( unsigned short port) { - UNIMPLEMENTED; - return 0; + return _inpw(port); } -unsigned long _inpd( +unsigned long MSVCRT__inpd( unsigned short port) { - return 0; + return _inpd(port); } -int _outp( +int MSVCRT__outp( unsigned short port, int databyte) { - UNIMPLEMENTED; - return 0; + return _outp(port, databyte); } -unsigned short _outpw( +unsigned short MSVCRT__outpw( unsigned short port, unsigned short dataword) { - UNIMPLEMENTED; - return 0; + return _outpw(port, dataword); } -unsigned long _outpd( +unsigned long MSVCRT__outpd( unsigned short port, unsigned long dataword) { - UNIMPLEMENTED; - return 0; + return _outpd(port, dataword); }

14 years

[akhaldi] 49821: [CMAKE] - Add missing asm dependency.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Nov 27 15:31:33 2010 New Revision: 49821 URL: http://svn.reactos.org/svn/reactos?rev=49821&view=rev Log: [CMAKE] - Add missing asm dependency. Modified: branches/cmake-bringup/hal/CMakeLists.txt Modified: branches/cmake-bringup/hal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] Sat Nov 27 15:31:33 2010 @@ -100,7 +100,7 @@ add_library(mini_hal ${MINI_HAL_SOURCE}) set_property(TARGET mini_hal PROPERTY COMPILE_DEFINITIONS "_BLDR_;_MINIHAL_") -add_dependencies(mini_hal psdk bugcodes) +add_dependencies(mini_hal psdk bugcodes asm) add_minicd_target(hal reactos hal.dll) add_livecd_target(hal reactos/system32) else()

14 years

[fireball] 49820: - Fix POINT/POINTL mismatch.

by fireball＠svn.reactos.org

Author: fireball Date: Sat Nov 27 14:53:22 2010 New Revision: 49820 URL: http://svn.reactos.org/svn/reactos?rev=49820&view=rev Log: - Fix POINT/POINTL mismatch. Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/bitblt.c [iso-8859-1] Sat Nov 27 14:53:22 2010 @@ -313,7 +313,7 @@ INT XSrc, INT YSrc, DWORD rop) { BOOLEAN bRet; - POINT SourcePoint, BrushOrigin; + POINTL SourcePoint, BrushOrigin; RECTL DestRect; EXLATEOBJ exlo; XLATEOBJ *XlateObj = NULL; Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win3… ============================================================================== --- branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] (original) +++ branches/arwinss/reactos/subsystems/win32/win32k/gre/rect.c [iso-8859-1] Sat Nov 27 14:53:22 2010 @@ -30,7 +30,7 @@ BOOLEAN bRet; RECTL DestRect; MIX Mix; - POINT BrushOrigin; + POINTL BrushOrigin; DestRect.left = LeftRect + pDC->rcDcRect.left + pDC->rcVport.left; DestRect.right = RightRect + pDC->rcDcRect.left + pDC->rcVport.left; @@ -105,7 +105,7 @@ BOOLEAN bRet; MIX Mix; INT i; - POINT BrushOrigin; + POINTL BrushOrigin; BrushOrigin.x = pDC->dclevel.ptlBrushOrigin.x + pDC->rcDcRect.left; BrushOrigin.y = pDC->dclevel.ptlBrushOrigin.y + pDC->rcDcRect.top;

14 years

[akhaldi] 49819: [CMAKE] - Fix xinput9_1_0

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Nov 27 13:05:52 2010 New Revision: 49819 URL: http://svn.reactos.org/svn/reactos?rev=49819&view=rev Log: [CMAKE] - Fix xinput9_1_0 Modified: branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/xinput9… ============================================================================== --- branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/xinput9_1_0/CMakeLists.txt [iso-8859-1] Sat Nov 27 13:05:52 2010 @@ -8,8 +8,8 @@ set_source_files_properties(xinput9_1_0.def PROPERTIES EXTERNAL_OBJECT TRUE) endif() +set_module_type(xinput9_1_0 win32dll) + add_importlibs(xinput9_1_0 msvcrt kernel32) -set_module_type(xinput9_1_0 win32dll) - add_cab_target(xinput9_1_0 1)

14 years

← Newer
1
2
3
4
5
6
7
8
9
...
50
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 November 2010