Ros-diffs January 2011

ros-diffs@reactos.org

20 participants
336 discussions

[tkreuzer] 50514: [CMAKE] Compile a dummy rossym library on MSVC

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jan 27 16:17:25 2011 New Revision: 50514 URL: http://svn.reactos.org/svn/reactos?rev=50514&view=rev Log: [CMAKE] Compile a dummy rossym library on MSVC Added: branches/cmake-bringup/lib/rossym/dummy.c (with props) Modified: branches/cmake-bringup/lib/rossym/CMakeLists.txt Modified: branches/cmake-bringup/lib/rossym/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/CMakeL… ============================================================================== --- branches/cmake-bringup/lib/rossym/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/rossym/CMakeLists.txt [iso-8859-1] Thu Jan 27 16:17:25 2011 @@ -1,5 +1,7 @@ -if(NOT MSVC) +if(MSVC) +add_library(rossym dummy.c) +else() add_definitions(-D_NTSYSTEM_) list(APPEND SOURCE delete.c Added: branches/cmake-bringup/lib/rossym/dummy.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/rossym/dummy.… ============================================================================== --- branches/cmake-bringup/lib/rossym/dummy.c (added) +++ branches/cmake-bringup/lib/rossym/dummy.c [iso-8859-1] Thu Jan 27 16:17:25 2011 @@ -1,0 +1,1 @@ +/* This file is intentionally left empty */ Propchange: branches/cmake-bringup/lib/rossym/dummy.c ------------------------------------------------------------------------------ svn:eol-style = native

13 years, 7 months

[tkreuzer] 50513: [CRT] Fix some warnings

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jan 27 13:45:06 2011 New Revision: 50513 URL: http://svn.reactos.org/svn/reactos?rev=50513&view=rev Log: [CRT] Fix some warnings Modified: branches/cmake-bringup/include/crt/sys/stat.h Modified: branches/cmake-bringup/include/crt/sys/stat.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/sys/s… ============================================================================== --- branches/cmake-bringup/include/crt/sys/stat.h [iso-8859-1] (original) +++ branches/cmake-bringup/include/crt/sys/stat.h [iso-8859-1] Thu Jan 27 13:45:06 2011 @@ -187,9 +187,9 @@ _Stat->st_gid = _Stat64.st_gid; _Stat->st_rdev = _Stat64.st_rdev; _Stat->st_size = _Stat64.st_size; - _Stat->st_atime = _Stat64.st_atime; - _Stat->st_mtime = _Stat64.st_mtime; - _Stat->st_ctime = _Stat64.st_ctime; + _Stat->st_atime = (__time32_t)_Stat64.st_atime; + _Stat->st_mtime = (__time32_t)_Stat64.st_mtime; + _Stat->st_ctime = (__time32_t)_Stat64.st_ctime; return ret; } __CRT_INLINE int __cdecl _fstat32i64(int _FileDes, struct _stat32i64 *_Stat) @@ -204,9 +204,9 @@ _Stat->st_gid = _Stat64.st_gid; _Stat->st_rdev = _Stat64.st_rdev; _Stat->st_size = _Stat64.st_size; - _Stat->st_atime = _Stat64.st_atime; - _Stat->st_mtime = _Stat64.st_mtime; - _Stat->st_ctime = _Stat64.st_ctime; + _Stat->st_atime = (__time32_t)_Stat64.st_atime; + _Stat->st_mtime = (__time32_t)_Stat64.st_mtime; + _Stat->st_ctime = (__time32_t)_Stat64.st_ctime; return ret; } #endif /* _USE_32BIT_TIME_T */

13 years, 7 months

[tkreuzer] 50512: [CMAKE] ML64 compatibility fixes for amd64 assembly

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jan 27 13:37:21 2011 New Revision: 50512 URL: http://svn.reactos.org/svn/reactos?rev=50512&view=rev Log: [CMAKE] ML64 compatibility fixes for amd64 assembly Modified: branches/cmake-bringup/lib/sdk/crt/except/amd64/chkstk_asm.s branches/cmake-bringup/lib/sdk/crt/except/amd64/seh.s branches/cmake-bringup/lib/sdk/crt/math/amd64/alldiv.S branches/cmake-bringup/lib/sdk/crt/math/amd64/atan.S branches/cmake-bringup/lib/sdk/crt/math/amd64/atan2.S branches/cmake-bringup/lib/sdk/crt/math/amd64/ceil.S branches/cmake-bringup/lib/sdk/crt/math/amd64/ceilf.S branches/cmake-bringup/lib/sdk/crt/math/amd64/exp.S branches/cmake-bringup/lib/sdk/crt/math/amd64/fabs.S branches/cmake-bringup/lib/sdk/crt/math/amd64/floor.S branches/cmake-bringup/lib/sdk/crt/math/amd64/floorf.S branches/cmake-bringup/lib/sdk/crt/math/amd64/fmod.S branches/cmake-bringup/lib/sdk/crt/math/amd64/fmodf.S branches/cmake-bringup/lib/sdk/crt/math/amd64/ldexp.S branches/cmake-bringup/lib/sdk/crt/math/amd64/log.S branches/cmake-bringup/lib/sdk/crt/math/amd64/log10.S branches/cmake-bringup/lib/sdk/crt/math/amd64/pow.S branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrt.S branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrtf.S branches/cmake-bringup/lib/sdk/crt/math/amd64/tan.S branches/cmake-bringup/lib/sdk/crt/setjmp/amd64/setjmp.s Modified: branches/cmake-bringup/lib/sdk/crt/except/amd64/chkstk_asm.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/excep… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/except/amd64/chkstk_asm.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/except/amd64/chkstk_asm.s [iso-8859-1] Thu Jan 27 13:37:21 2011 @@ -10,21 +10,25 @@ #include <asm.inc> +/* CODE **********************************************************************/ +.code64 PUBLIC MsgUnimplemented MsgUnimplemented: .asciz "WARNING: %s at %s:%d is UNIMPLEMENTED!\n" -.proc _chkstk +FUNC _chkstk + .endprolog UNIMPLEMENTED chkstk ret -.endp +ENDFUNC _chkstk -.proc _alloca_probe +FUNC _alloca_probe + .endprolog UNIMPLEMENTED alloca_probe ret -.endp +ENDFUNC _alloca_probe END /* EOF */ Modified: branches/cmake-bringup/lib/sdk/crt/except/amd64/seh.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/excep… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/except/amd64/seh.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/except/amd64/seh.s [iso-8859-1] Thu Jan 27 13:37:21 2011 @@ -17,42 +17,43 @@ /* GLOBALS *******************************************************************/ -.globl _global_unwind2 -.globl _local_unwind2 -.globl _abnormal_termination -.globl _except_handler2 -.globl _except_handler3 +PUBLIC _global_unwind2 +PUBLIC _local_unwind2 +PUBLIC _abnormal_termination +PUBLIC _except_handler2 +PUBLIC _except_handler3 -/* FUNCTIONS *****************************************************************/ +/* CODE **********************************************************************/ +.code64 -.func _unwind_handler -_unwind_handler: +FUNC _unwind_handler + .endprolog ret -.endfunc +ENDFUNC _unwind_handler -.func _global_unwind2 -_global_unwind2: +FUNC _global_unwind2 + .endprolog ret -.endfunc +ENDFUNC _global_unwind2 -.func _abnormal_termination -_abnormal_termination: +FUNC _abnormal_termination + .endprolog ret -.endfunc +ENDFUNC _abnormal_termination -.func _local_unwind2 -_local_unwind2: +FUNC _local_unwind2 + .endprolog ret -.endfunc +ENDFUNC _local_unwind2 -.func _except_handler2 -_except_handler2: +FUNC _except_handler2 + .endprolog ret -.endfunc +ENDFUNC _except_handler2 -.func _except_handler3 -_except_handler3: +FUNC _except_handler3 + .endprolog ret -.endfunc +ENDFUNC _except_handler3 END Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/alldiv.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/alldiv.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/alldiv.S [iso-8859-1] Thu Jan 27 13:37:21 2011 @@ -10,18 +10,21 @@ #include <asm.inc> -/* DATA *********************************************************************/ +/* DATA **********************************************************************/ +.code64 PUBLIC _fltused _fltused: - .long 0x9875 + .long HEX(9875) -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 -.proc alldiv +FUNC alldiv + .endprolog UNIMPLEMENTED alldiv ret -.endp alldiv +ENDFUNC alldiv + +END Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/atan.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/atan.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/atan.S [iso-8859-1] Thu Jan 27 13:37:21 2011 @@ -11,11 +11,12 @@ #include <asm.inc> #include <ksamd64.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 PUBLIC atan atan: UNIMPLEMENTED atan ret + +END Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/atan2.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/atan2.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/atan2.S [iso-8859-1] Thu Jan 27 13:37:21 2011 @@ -11,11 +11,12 @@ #include <asm.inc> #include <ksamd64.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 PUBLIC atan2 atan2: UNIMPLEMENTED atan2 ret + +END Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/ceil.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/ceil.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/ceil.S [iso-8859-1] Thu Jan 27 13:37:21 2011 @@ -11,8 +11,7 @@ #include <asm.inc> #include <ksamd64.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 PUBLIC ceil @@ -20,3 +19,4 @@ UNIMPLEMENTED ceil ret +END Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/ceilf.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/ceilf.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/ceilf.S [iso-8859-1] Thu Jan 27 13:37:21 2011 @@ -11,8 +11,7 @@ #include <asm.inc> #include <ksamd64.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 PUBLIC ceilf @@ -39,7 +38,7 @@ fstp dword ptr [rsp] movss xmm0, [rsp] - + add rsp, 16 ret Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/exp.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/exp.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/exp.S [iso-8859-1] Thu Jan 27 13:37:21 2011 @@ -11,8 +11,7 @@ #include <asm.inc> #include <ksamd64.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 PUBLIC exp Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/fabs.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/fabs.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/fabs.S [iso-8859-1] Thu Jan 27 13:37:21 2011 @@ -10,12 +10,12 @@ #include <asm.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 -PUBLIC fabs -fabs: +PUBLIC _fabs +_fabs: UNIMPLEMENTED fabs ret +END Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/floor.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/floor.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/floor.S [iso-8859-1] Thu Jan 27 13:37:21 2011 @@ -11,8 +11,7 @@ #include <asm.inc> #include <ksamd64.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 PUBLIC floor Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/floorf.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/floorf.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/floorf.S [iso-8859-1] Thu Jan 27 13:37:21 2011 @@ -11,8 +11,7 @@ #include <asm.inc> #include <ksamd64.inc> -/* FUNCTIONS ****************************************************************/ - +/* CODE **********************************************************************/ .code64 PUBLIC floorf Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/fmod.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/fmod.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/fmod.S [iso-8859-1] Thu Jan 27 13:37:21 2011 @@ -10,10 +10,11 @@ #include <asm.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 -PUBLIC fmod -fmod: +PUBLIC _fmod +_fmod: UNIMPLEMENTED fmod ret Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/fmodf.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/fmodf.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/fmodf.S [iso-8859-1] Thu Jan 27 13:37:21 2011 @@ -10,7 +10,8 @@ #include <asm.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC fmodf fmodf: Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/ldexp.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/ldexp.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/ldexp.S [iso-8859-1] Thu Jan 27 13:37:21 2011 @@ -10,7 +10,8 @@ #include <asm.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC ldexp ldexp: Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/log.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/log.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/log.S [iso-8859-1] Thu Jan 27 13:37:21 2011 @@ -10,9 +10,12 @@ #include <asm.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC log log: UNIMPLEMENTED log ret + +END Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/log10.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/log10.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/log10.S [iso-8859-1] Thu Jan 27 13:37:21 2011 @@ -10,10 +10,12 @@ #include <asm.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC log10 log10: UNIMPLEMENTED log10 ret +END Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/pow.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/pow.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/pow.S [iso-8859-1] Thu Jan 27 13:37:21 2011 @@ -11,10 +11,12 @@ #include <asm.inc> #include <ksamd64.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC pow pow: UNIMPLEMENTED pow ret +END Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrt.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrt.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrt.S [iso-8859-1] Thu Jan 27 13:37:21 2011 @@ -11,7 +11,8 @@ #include <asm.inc> #include <ksamd64.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC sqrt sqrt: Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrtf.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrtf.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/sqrtf.S [iso-8859-1] Thu Jan 27 13:37:21 2011 @@ -11,7 +11,8 @@ #include <asm.inc> #include <ksamd64.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC sqrtf sqrtf: Modified: branches/cmake-bringup/lib/sdk/crt/math/amd64/tan.S URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/math/… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/math/amd64/tan.S [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/math/amd64/tan.S [iso-8859-1] Thu Jan 27 13:37:21 2011 @@ -11,7 +11,8 @@ #include <asm.inc> #include <ksamd64.inc> -/* DATA *********************************************************************/ +/* CODE **********************************************************************/ +.code64 PUBLIC tan tan: Modified: branches/cmake-bringup/lib/sdk/crt/setjmp/amd64/setjmp.s URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/setjm… ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/setjmp/amd64/setjmp.s [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/setjmp/amd64/setjmp.s [iso-8859-1] Thu Jan 27 13:37:21 2011 @@ -11,41 +11,45 @@ #include <asm.inc> #include <ksamd64.inc> -#define JUMP_BUFFER_Frame 0x00 -#define JUMP_BUFFER_Rbx 0x08 -#define JUMP_BUFFER_Rsp 0x10 -#define JUMP_BUFFER_Rbp 0x18 -#define JUMP_BUFFER_Rsi 0x20 -#define JUMP_BUFFER_Rdi 0x28 -#define JUMP_BUFFER_R12 0x30 -#define JUMP_BUFFER_R13 0x38 -#define JUMP_BUFFER_R14 0x40 -#define JUMP_BUFFER_R15 0x48 -#define JUMP_BUFFER_Rip 0x50 -#define JUMP_BUFFER_Spare 0x58 -#define JUMP_BUFFER_Xmm6 0x60 -#define JUMP_BUFFER_Xmm7 0x70 -#define JUMP_BUFFER_Xmm8 0x80 -#define JUMP_BUFFER_Xmm9 0x90 -#define JUMP_BUFFER_Xmm10 0xa0 -#define JUMP_BUFFER_Xmm11 0xb0 -#define JUMP_BUFFER_Xmm12 0xc0 -#define JUMP_BUFFER_Xmm13 0xd0 -#define JUMP_BUFFER_Xmm14 0xe0 -#define JUMP_BUFFER_Xmm15 0xf0 +#define JUMP_BUFFER_Frame 0 /* 0x00 */ +#define JUMP_BUFFER_Rbx 8 /* 0x08 */ +#define JUMP_BUFFER_Rsp 16 /* 0x10 */ +#define JUMP_BUFFER_Rbp 24 /* 0x18 */ +#define JUMP_BUFFER_Rsi 32 /* 0x20 */ +#define JUMP_BUFFER_Rdi 40 /* 0x28 */ +#define JUMP_BUFFER_R12 48 /* 0x30 */ +#define JUMP_BUFFER_R13 56 /* 0x38 */ +#define JUMP_BUFFER_R14 64 /* 0x40 */ +#define JUMP_BUFFER_R15 72 /* 0x48 */ +#define JUMP_BUFFER_Rip 80 /* 0x50 */ +#define JUMP_BUFFER_Spare 88 /* 0x58 */ +#define JUMP_BUFFER_Xmm6 96 /* 0x60 */ +#define JUMP_BUFFER_Xmm7 112 /* 0x70 */ +#define JUMP_BUFFER_Xmm8 128 /* 0x80 */ +#define JUMP_BUFFER_Xmm9 144 /* 0x90 */ +#define JUMP_BUFFER_Xmm10 160 /* 0xa0 */ +#define JUMP_BUFFER_Xmm11 176 /* 0xb0 */ +#define JUMP_BUFFER_Xmm12 192 /* 0xc0 */ +#define JUMP_BUFFER_Xmm13 208 /* 0xd0 */ +#define JUMP_BUFFER_Xmm14 224 /* 0xe0 */ +#define JUMP_BUFFER_Xmm15 240 /* 0xf0 */ /* FUNCTIONS ******************************************************************/ +.code64 -/* +/*! * int _setjmp(jmp_buf env); * - * Parameters: <rcx> - jmp_buf env - * Returns: 0 - * Notes: Sets up the jmp_buf + * \param <rcx> - jmp_buf env + * \return 0 + * \note Sets up the jmp_buf */ PUBLIC _setjmp -.proc _setjmp +FUNC _setjmp + + .endprolog + /* Load rsp as it was before the call into rax */ lea rax, [rsp + 8] /* Load return address into r8 */ @@ -73,18 +77,21 @@ movdqa [rcx + JUMP_BUFFER_Xmm15], xmm15 xor rax, rax ret -.endp setjmp +ENDFUNC _setjmp -/* +/*! * int _setjmpex(jmp_buf _Buf,void *_Ctx); * - * Parameters: <rcx> - jmp_buf env - * <rdx> - frame - * Returns: 0 - * Notes: Sets up the jmp_buf + * \param <rcx> - jmp_buf env + * \param <rdx> - frame + * \return 0 + * \note Sets up the jmp_buf */ PUBLIC _setjmpex -.proc _setjmpex +FUNC _setjmpex + + .endprolog + /* Load rsp as it was before the call into rax */ lea rax, [rsp + 8] /* Load return address into r8 */ @@ -112,19 +119,21 @@ movdqa [rcx + JUMP_BUFFER_Xmm15], xmm15 xor rax, rax ret -.endp setjmpex +ENDFUNC _setjmpex -/* +/*! * void longjmp(jmp_buf env, int value); * - * Parameters: <rcx> - jmp_buf setup by _setjmp - * <rdx> - int value to return - * Returns: Doesn't return - * Notes: Non-local goto + * \param <rcx> - jmp_buf setup by _setjmp + * \param <rdx> - int value to return + * \return Doesn't return + * \note Non-local goto */ PUBLIC longjmp -.proc longjmp +FUNC longjmp + + .endprolog // FIXME: handle frame @@ -152,9 +161,9 @@ /* return param2 or 1 if it was 0 */ mov rax, rdx test rax, rax - jnz 2f + jnz l2 inc rax -2: jmp r8 -.endp longjmp +l2: jmp r8 +ENDFUNC longjmp END

13 years, 7 months

[tkreuzer] 50511: [UNICODE] revert change to string.c from r49492 and apply the fix to wine/unicode.h. also move the include of string.h to unicode.h sync unicode.h with wine

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jan 27 12:12:15 2011 New Revision: 50511 URL: http://svn.reactos.org/svn/reactos?rev=50511&view=rev Log: [UNICODE] revert change to string.c from r49492 and apply the fix to wine/unicode.h. also move the include of string.h to unicode.h sync unicode.h with wine Modified: branches/cmake-bringup/tools/unicode/string.c branches/cmake-bringup/tools/unicode/wine/unicode.h Modified: branches/cmake-bringup/tools/unicode/string.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/unicode/str… ============================================================================== --- branches/cmake-bringup/tools/unicode/string.c [iso-8859-1] (original) +++ branches/cmake-bringup/tools/unicode/string.c [iso-8859-1] Thu Jan 27 12:12:15 2011 @@ -21,11 +21,8 @@ #include <assert.h> #include <limits.h> #include <stdio.h> -#include <string.h> - -#ifndef _MSC_VER - #define WINE_UNICODE_INLINE /* nothing */ -#endif + +#define WINE_UNICODE_INLINE /* nothing */ #include "wine/unicode.h" int strcmpiW( const WCHAR *str1, const WCHAR *str2 ) @@ -467,7 +464,7 @@ *fmta = '\0'; if (*iter == 'a' || *iter == 'A' || *iter == 'e' || *iter == 'E' || - *iter == 'f' || *iter == 'F' || + *iter == 'f' || *iter == 'F' || *iter == 'g' || *iter == 'G') sprintf(bufaiter, fmtbufa, va_arg(valist, double)); else Modified: branches/cmake-bringup/tools/unicode/wine/unicode.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/unicode/win… ============================================================================== --- branches/cmake-bringup/tools/unicode/wine/unicode.h [iso-8859-1] (original) +++ branches/cmake-bringup/tools/unicode/wine/unicode.h [iso-8859-1] Thu Jan 27 12:12:15 2011 @@ -18,10 +18,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef __WINE_UNICODE_H -#define __WINE_UNICODE_H +#ifndef __WINE_WINE_UNICODE_H +#define __WINE_WINE_UNICODE_H #include <stdarg.h> +#include <string.h> #include <host/typedefs.h> // Definitions copied from <winnls.h> @@ -44,12 +45,24 @@ #define WC_NO_BEST_FIT_CHARS 1024 #define WC_ERR_INVALID_CHARS 0x0080 +#ifdef __WINE_WINE_TEST_H +#error This file should not be used in Wine tests +#endif + +#ifdef __cplusplus +extern "C" { +#endif + #ifndef WINE_UNICODE_API -#define WINE_UNICODE_API DECLSPEC_IMPORT +# if defined(_MSC_VER) || defined(__MINGW32__) +# define WINE_UNICODE_API DECLSPEC_IMPORT +# else +# define WINE_UNICODE_API +# endif #endif #ifndef WINE_UNICODE_INLINE -#define WINE_UNICODE_INLINE extern inline +#define WINE_UNICODE_INLINE static inline #endif /* code page info common to SBCS and DBCS */ @@ -117,20 +130,17 @@ extern int vsprintfW( WCHAR *str, const WCHAR *format, va_list valist ); extern int vsnprintfW( WCHAR *str, size_t len, const WCHAR *format, va_list valist ); -WINE_UNICODE_INLINE int wine_is_dbcs_leadbyte( const union cptable *table, unsigned char ch ); WINE_UNICODE_INLINE int wine_is_dbcs_leadbyte( const union cptable *table, unsigned char ch ) { return (table->info.char_size == 2) && (table->dbcs.cp2uni_leadbytes[ch]); } -WINE_UNICODE_INLINE WCHAR tolowerW( WCHAR ch ); WINE_UNICODE_INLINE WCHAR tolowerW( WCHAR ch ) { extern WINE_UNICODE_API const WCHAR wine_casemap_lower[]; return ch + wine_casemap_lower[wine_casemap_lower[ch >> 8] + (ch & 0xff)]; } -WINE_UNICODE_INLINE WCHAR toupperW( WCHAR ch ); WINE_UNICODE_INLINE WCHAR toupperW( WCHAR ch ) { extern WINE_UNICODE_API const WCHAR wine_casemap_upper[]; @@ -139,74 +149,62 @@ /* the character type contains the C1_* flags in the low 12 bits */ /* and the C2_* type in the high 4 bits */ -WINE_UNICODE_INLINE unsigned short get_char_typeW( WCHAR ch ); WINE_UNICODE_INLINE unsigned short get_char_typeW( WCHAR ch ) { extern WINE_UNICODE_API const unsigned short wine_wctype_table[]; return wine_wctype_table[wine_wctype_table[ch >> 8] + (ch & 0xff)]; } -WINE_UNICODE_INLINE int iscntrlW( WCHAR wc ); WINE_UNICODE_INLINE int iscntrlW( WCHAR wc ) { return get_char_typeW(wc) & C1_CNTRL; } -WINE_UNICODE_INLINE int ispunctW( WCHAR wc ); WINE_UNICODE_INLINE int ispunctW( WCHAR wc ) { return get_char_typeW(wc) & C1_PUNCT; } -WINE_UNICODE_INLINE int isspaceW( WCHAR wc ); WINE_UNICODE_INLINE int isspaceW( WCHAR wc ) { return get_char_typeW(wc) & C1_SPACE; } -WINE_UNICODE_INLINE int isdigitW( WCHAR wc ); WINE_UNICODE_INLINE int isdigitW( WCHAR wc ) { return get_char_typeW(wc) & C1_DIGIT; } -WINE_UNICODE_INLINE int isxdigitW( WCHAR wc ); WINE_UNICODE_INLINE int isxdigitW( WCHAR wc ) { return get_char_typeW(wc) & C1_XDIGIT; } -WINE_UNICODE_INLINE int islowerW( WCHAR wc ); WINE_UNICODE_INLINE int islowerW( WCHAR wc ) { return get_char_typeW(wc) & C1_LOWER; } -WINE_UNICODE_INLINE int isupperW( WCHAR wc ); WINE_UNICODE_INLINE int isupperW( WCHAR wc ) { return get_char_typeW(wc) & C1_UPPER; } -WINE_UNICODE_INLINE int isalnumW( WCHAR wc ); WINE_UNICODE_INLINE int isalnumW( WCHAR wc ) { return get_char_typeW(wc) & (C1_ALPHA|C1_DIGIT|C1_LOWER|C1_UPPER); } -WINE_UNICODE_INLINE int isalphaW( WCHAR wc ); WINE_UNICODE_INLINE int isalphaW( WCHAR wc ) { return get_char_typeW(wc) & (C1_ALPHA|C1_LOWER|C1_UPPER); } -WINE_UNICODE_INLINE int isgraphW( WCHAR wc ); WINE_UNICODE_INLINE int isgraphW( WCHAR wc ) { return get_char_typeW(wc) & (C1_ALPHA|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER); } -WINE_UNICODE_INLINE int isprintW( WCHAR wc ); WINE_UNICODE_INLINE int isprintW( WCHAR wc ) { return get_char_typeW(wc) & (C1_ALPHA|C1_BLANK|C1_PUNCT|C1_DIGIT|C1_LOWER|C1_UPPER); @@ -214,7 +212,6 @@ /* some useful string manipulation routines */ -WINE_UNICODE_INLINE unsigned int strlenW( const WCHAR *str ); WINE_UNICODE_INLINE unsigned int strlenW( const WCHAR *str ) { const WCHAR *s = str; @@ -222,7 +219,6 @@ return (unsigned int)(s - str); } -WINE_UNICODE_INLINE WCHAR *strcpyW( WCHAR *dst, const WCHAR *src ); WINE_UNICODE_INLINE WCHAR *strcpyW( WCHAR *dst, const WCHAR *src ) { WCHAR *p = dst; @@ -233,14 +229,12 @@ /* strncpy doesn't do what you think, don't use it */ #define strncpyW(d,s,n) error do_not_use_strncpyW_use_lstrcpynW_or_memcpy_instead -WINE_UNICODE_INLINE int strcmpW( const WCHAR *str1, const WCHAR *str2 ); WINE_UNICODE_INLINE int strcmpW( const WCHAR *str1, const WCHAR *str2 ) { while (*str1 && (*str1 == *str2)) { str1++; str2++; } return *str1 - *str2; } -WINE_UNICODE_INLINE int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ); WINE_UNICODE_INLINE int strncmpW( const WCHAR *str1, const WCHAR *str2, int n ) { if (n <= 0) return 0; @@ -248,21 +242,18 @@ return *str1 - *str2; } -WINE_UNICODE_INLINE WCHAR *strcatW( WCHAR *dst, const WCHAR *src ); WINE_UNICODE_INLINE WCHAR *strcatW( WCHAR *dst, const WCHAR *src ) { strcpyW( dst + strlenW(dst), src ); return dst; } -WINE_UNICODE_INLINE WCHAR *strchrW( const WCHAR *str, WCHAR ch ); WINE_UNICODE_INLINE WCHAR *strchrW( const WCHAR *str, WCHAR ch ) { do { if (*str == ch) return (WCHAR *)(ULONG_PTR)str; } while (*str++); return NULL; } -WINE_UNICODE_INLINE WCHAR *strrchrW( const WCHAR *str, WCHAR ch ); WINE_UNICODE_INLINE WCHAR *strrchrW( const WCHAR *str, WCHAR ch ) { WCHAR *ret = NULL; @@ -270,14 +261,12 @@ return ret; } -WINE_UNICODE_INLINE WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ); WINE_UNICODE_INLINE WCHAR *strpbrkW( const WCHAR *str, const WCHAR *accept ) { for ( ; *str; str++) if (strchrW( accept, *str )) return (WCHAR *)(ULONG_PTR)str; return NULL; } -WINE_UNICODE_INLINE size_t strspnW( const WCHAR *str, const WCHAR *accept ); WINE_UNICODE_INLINE size_t strspnW( const WCHAR *str, const WCHAR *accept ) { const WCHAR *ptr; @@ -285,7 +274,6 @@ return ptr - str; } -WINE_UNICODE_INLINE size_t strcspnW( const WCHAR *str, const WCHAR *reject ); WINE_UNICODE_INLINE size_t strcspnW( const WCHAR *str, const WCHAR *reject ) { const WCHAR *ptr; @@ -293,7 +281,6 @@ return ptr - str; } -WINE_UNICODE_INLINE WCHAR *strlwrW( WCHAR *str ); WINE_UNICODE_INLINE WCHAR *strlwrW( WCHAR *str ) { WCHAR *ret = str; @@ -301,7 +288,6 @@ return ret; } -WINE_UNICODE_INLINE WCHAR *struprW( WCHAR *str ); WINE_UNICODE_INLINE WCHAR *struprW( WCHAR *str ) { WCHAR *ret = str; @@ -309,7 +295,6 @@ return ret; } -WINE_UNICODE_INLINE WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ); WINE_UNICODE_INLINE WCHAR *memchrW( const WCHAR *ptr, WCHAR ch, size_t n ) { const WCHAR *end; @@ -317,7 +302,6 @@ return NULL; } -WINE_UNICODE_INLINE WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ); WINE_UNICODE_INLINE WCHAR *memrchrW( const WCHAR *ptr, WCHAR ch, size_t n ) { const WCHAR *end; @@ -326,13 +310,11 @@ return ret; } -WINE_UNICODE_INLINE long int atolW( const WCHAR *str ); WINE_UNICODE_INLINE long int atolW( const WCHAR *str ) { return strtolW( str, (WCHAR **)0, 10 ); } -WINE_UNICODE_INLINE int atoiW( const WCHAR *str ); WINE_UNICODE_INLINE int atoiW( const WCHAR *str ) { return (int)atolW( str ); @@ -340,4 +322,8 @@ #undef WINE_UNICODE_INLINE -#endif /* __WINE_UNICODE_H */ +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_WINE_UNICODE_H */

13 years, 7 months

[fireball] 50510: - Fix "Not enough hook windows array size" debug print.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Jan 27 10:52:59 2011 New Revision: 50510 URL: http://svn.reactos.org/svn/reactos?rev=50510&view=rev Log: - Fix "Not enough hook windows array size" debug print. Modified: branches/arwinss/reactos/dll/win32/user32/hook.c Modified: branches/arwinss/reactos/dll/win32/user32/hook.c URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/dll/win32/user3… ============================================================================== --- branches/arwinss/reactos/dll/win32/user32/hook.c [iso-8859-1] (original) +++ branches/arwinss/reactos/dll/win32/user32/hook.c [iso-8859-1] Thu Jan 27 10:52:59 2011 @@ -419,7 +419,8 @@ UINT cbListSize = sizeof(hook_windows); if (!RosUserBuildShellHookHwndList(hook_windows, &cbListSize)) { - ERR("Not enough hook windows array size!\n"); + if (cbListSize > sizeof(hook_windows)) ERR("Not enough hook windows array size!\n"); + /* otherwise the list is just empty */ } else {

13 years, 7 months

[tkreuzer] 50509: [EXPLORER_NEW] Fix syntax

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jan 27 10:47:55 2011 New Revision: 50509 URL: http://svn.reactos.org/svn/reactos?rev=50509&view=rev Log: [EXPLORER_NEW] Fix syntax Modified: branches/cmake-bringup/base/shell/explorer-new/taskswnd.c Modified: branches/cmake-bringup/base/shell/explorer-new/taskswnd.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explor… ============================================================================== --- branches/cmake-bringup/base/shell/explorer-new/taskswnd.c [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer-new/taskswnd.c [iso-8859-1] Thu Jan 27 10:47:55 2011 @@ -1725,8 +1725,9 @@ if (hmenu) { POINT pt; + int cmd; GetCursorPos(&pt); - int cmd = TrackPopupMenu(hmenu, TPM_LEFTBUTTON|TPM_RIGHTBUTTON|TPM_RETURNCMD, pt.x, pt.y, 0, This->hWndToolbar, NULL); + cmd = TrackPopupMenu(hmenu, TPM_LEFTBUTTON|TPM_RIGHTBUTTON|TPM_RETURNCMD, pt.x, pt.y, 0, This->hWndToolbar, NULL); if (cmd) { SetForegroundWindow(TaskItem->hWnd); // reactivate window after the context menu has closed PostMessage(TaskItem->hWnd, WM_SYSCOMMAND, cmd, 0); @@ -1756,19 +1757,19 @@ TaskSwitchWnd_HandleTaskGroupRightClick(This, TaskGroup); return TRUE; - } + } } TaskItem = FindTaskItemByIndex(This, (INT)wIndex); - + if (TaskItem != NULL) { TaskSwitchWnd_HandleTaskItemRightClick(This, TaskItem); return TRUE; } - + return FALSE; }

13 years, 7 months

[tkreuzer] 50508: [WORDPAD] Fix chinese resource file

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jan 27 10:44:08 2011 New Revision: 50508 URL: http://svn.reactos.org/svn/reactos?rev=50508&view=rev Log: [WORDPAD] Fix chinese resource file Modified: branches/cmake-bringup/base/applications/wordpad/Zh.rc Modified: branches/cmake-bringup/base/applications/wordpad/Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/wordpad/Zh.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/wordpad/Zh.rc [iso-8859-1] Thu Jan 27 10:44:08 2011 @@ -487,9 +487,7 @@ STRING_PROMPT_SAVE_CHANGES, "å²åæ¹åå° '%s'?" STRING_SEARCH_FINISHED, "æªæ¡æ¥æ¾çµæ." STRING_LOAD_RICHED_FAILED, "RichEdit è£è¼å¤±æ." - STRING_SAVE_LOSEFORMATTING, "ä½ å·²ç¶é¸æå²åçºææ¬æªæ¡, " \ - "éå¯è½å°è´æ ¼å¼ä¸å¤±. " \ - "ä½ ç¢ºå®è¦ééº¼åå?" + STRING_SAVE_LOSEFORMATTING, "ä½ å·²ç¶é¸æå²åçºææ¬æªæ¡, éå¯è½å°è´æ ¼å¼ä¸å¤±. ä½ ç¢ºå®è¦ééº¼åå?" STRING_INVALID_NUMBER, "æ¸åæ ¼å¼ç¡æ" STRING_OLE_STORAGE_NOT_SUPPORTED, "ä¸æ¯æ´OLE å²åæªæ¡" STRING_WRITE_FAILED, "ä¸è½å²åæªæ¡."

13 years, 7 months

[tkreuzer] 50507: [PING] Fix resource syntax for MSVC and recent versions of the gcc preprocessor.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jan 27 10:42:06 2011 New Revision: 50507 URL: http://svn.reactos.org/svn/reactos?rev=50507&view=rev Log: [PING] Fix resource syntax for MSVC and recent versions of the gcc preprocessor. Modified: branches/cmake-bringup/base/applications/network/ping/lang/de-DE.rc branches/cmake-bringup/base/applications/network/ping/lang/en-US.rc branches/cmake-bringup/base/applications/network/ping/lang/fr-FR.rc branches/cmake-bringup/base/applications/network/ping/lang/it-IT.rc branches/cmake-bringup/base/applications/network/ping/lang/pl-PL.rc Modified: branches/cmake-bringup/base/applications/network/ping/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/ping/lang/de-DE.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/ping/lang/de-DE.rc [iso-8859-1] Thu Jan 27 10:42:06 2011 @@ -2,13 +2,13 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_USAGE "\nSyntax: ping [-t] [-n Anzahl] [-l Größe] [-w Zeitlimit] Zielhost\n\n" \ - "Optionen:\n" \ - " -t Sendet fortlaufend Pings an den angegebenen Host.\n" \ - " Drücken Sie STRG-C, um den Vorgang abzubrechen.\n" \ - " -n Anzahl Anzahl der Echoanforderungen, die gesendet werden.\n" \ - " -l Größe Größe des Sendepuffers.\n" \ - " -w Zeitlimit Zeitlimit in Millisekunden für eine Antwort.\n\n\0" + IDS_USAGE "\nSyntax: ping [-t] [-n Anzahl] [-l Größe] [-w Zeitlimit] Zielhost\n\n\ +Optionen:\n\ + -t Sendet fortlaufend Pings an den angegebenen Host.\n\ + Drücken Sie STRG-C, um den Vorgang abzubrechen.\n\ + -n Anzahl Anzahl der Echoanforderungen, die gesendet werden.\n\ + -l Größe Größe des Sendepuffers.\n\ + -w Zeitlimit Zeitlimit in Millisekunden für eine Antwort.\n\n\0" IDS_PING_WITH_BYTES "\nPinging %1 [%2] with %3!d! bytes Data:\n\n\0" IDS_PING_STATISTICS "\nPing Statistik für %1:\n\0" Modified: branches/cmake-bringup/base/applications/network/ping/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/ping/lang/en-US.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/ping/lang/en-US.rc [iso-8859-1] Thu Jan 27 10:42:06 2011 @@ -2,14 +2,14 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_USAGE "\nUsage: ping [-t] [-n count] [-l size] [-w timeout] destination-host\n\n" \ - "Options:\n" \ - " -t Ping the specified host until stopped.\n" \ - " To stop - type Control-C.\n" \ - " -n count Number of echo requests to send.\n" \ - " -l size Send buffer size.\n" \ - " -w timeout Timeout in milliseconds to wait for each reply.\n\n\0" - + IDS_USAGE "\nUsage: ping [-t] [-n count] [-l size] [-w timeout] destination-host\n\n\ +Options:\n\ + -t Ping the specified host until stopped.\n\ + To stop - type Control-C.\n\ + -n count Number of echo requests to send.\n\ + -l size Send buffer size.\n\ + -w timeout Timeout in milliseconds to wait for each reply.\n\n\0" + IDS_PING_WITH_BYTES "\nPinging %1 [%2] with %3!d! bytes of data:\n\n\0" IDS_PING_STATISTICS "\nPing statistics for %1:\n\0" IDS_PACKETS_SENT_RECEIVED_LOST " Packets: Sent = %1!d!, Received = %2!d!, Lost = %3!d! (%4!d!%% loss),\n\0" Modified: branches/cmake-bringup/base/applications/network/ping/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/ping/lang/fr-FR.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/ping/lang/fr-FR.rc [iso-8859-1] Thu Jan 27 10:42:06 2011 @@ -2,14 +2,14 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_USAGE "\nUtilisation : ping [-t] [-n nombre] [-l taille] [-w dÃ©lai] hÃ´te-destination\n\n" \ - "Options :\n" \ - " -t Ping l'hÃ´te spÃ©cifiÃ© jusqu'Ã l'arrÃªt.\n" \ - " Pour l'arrÃªter, tapez Ctrl+c.\n" \ - " -n nombre Nombre de requÃªtes echo Ã envoyer.\n" \ - " -l taille Taille du tampon d'envoi.\n" \ - " -w dÃ©lai DÃ©lai d'attente en millisecondes pour chaque rÃ©ponse.\n\n\0" - + IDS_USAGE "\nUtilisation : ping [-t] [-n nombre] [-l taille] [-w dÃ©lai] hÃ´te-destination\n\n\ +Options :\n\ + -t Ping l'hÃ´te spÃ©cifiÃ© jusqu'Ã l'arrÃªt.\n\ + Pour l'arrÃªter, tapez Ctrl+c.\n\ + -n nombre Nombre de requÃªtes echo Ã envoyer.\n\ + -l taille Taille du tampon d'envoi.\n\ + -w dÃ©lai DÃ©lai d'attente en millisecondes pour chaque rÃ©ponse.\n\n\0" + IDS_PING_WITH_BYTES "\nPing de %1 [%2] avec %3!d! octets de donnÃ©es :\n\n\0" IDS_PING_STATISTICS "\nStatistiques du ping de %1 :\n\0" IDS_PACKETS_SENT_RECEIVED_LOST " Paquets : EnvoyÃ©s = %1!d!, ReÃ§us = %2!d!, Perdus = %3!d! (%4!d!%% de perte),\n\0" Modified: branches/cmake-bringup/base/applications/network/ping/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/ping/lang/it-IT.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/ping/lang/it-IT.rc [iso-8859-1] Thu Jan 27 10:42:06 2011 @@ -2,14 +2,14 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_USAGE "\nUso: ping [-t] [-n conteggio] [-l dimensione] [-w timeout] host-destinazione\n\n" \ - "Opzioni:\n" \ - " -t Esegue il ping dell'host specificato finchè non termina.\n" \ - " Per fermare - digitare Control-C.\n" \ - " -n conteggio Numero di richieste echo da inviare.\n" \ - " -l dimensione Dimensione del buffer di invio.\n" \ - " -w timeout Timeout in millisecondi per l'attesa di ogni risposta.\n\n\0" - + IDS_USAGE "\nUso: ping [-t] [-n conteggio] [-l dimensione] [-w timeout] host-destinazione\n\n\ +Opzioni:\n\ + -t Esegue il ping dell'host specificato finchè non termina.\n\ + Per fermare - digitare Control-C.\n\ + -n conteggio Numero di richieste echo da inviare.\n\ + -l dimensione Dimensione del buffer di invio.\n\ + -w timeout Timeout in millisecondi per l'attesa di ogni risposta.\n\n\0" + IDS_PING_WITH_BYTES "\nPing in corso %1 [%2] con %3!d! bytes di dati:\n\n\0" IDS_PING_STATISTICS "\nStatistiche di Ping per %1:\n\0" IDS_PACKETS_SENT_RECEIVED_LOST " Pacchetti: Inviati = %1!d!, Ricevuti = %2!d!, Persi = %3!d! (%4!d!%% perdita),\n\0" Modified: branches/cmake-bringup/base/applications/network/ping/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… ============================================================================== --- branches/cmake-bringup/base/applications/network/ping/lang/pl-PL.rc [iso-8859-1] (original) +++ branches/cmake-bringup/base/applications/network/ping/lang/pl-PL.rc [iso-8859-1] Thu Jan 27 10:42:06 2011 @@ -9,14 +9,14 @@ STRINGTABLE DISCARDABLE BEGIN - IDS_USAGE "\nSposób u¿ycia: ping [-t] [-n iloæ] [-l bajtów] [-w czas] host-docelowy\n\n" \ - "Opcje:\n" \ - " -t Pinguj wskazanego hosta w sposób ci¹g³y.\n" \ - " Aby przerwaæ - wcinij Control C.\n" \ - " -n iloæ Iloæ prób pingowania.\n" \ - " -l bajtów Rozmiar pakietu echo w bajtach .\n" \ - " -w czas Opónienie oczekiwanej odpowiedzi, w milisekundach.\n\n\0" - + IDS_USAGE "\nSposób u¿ycia: ping [-t] [-n iloæ] [-l bajtów] [-w czas] host-docelowy\n\n\ +Opcje:\n\ + -t Pinguj wskazanego hosta w sposób ci¹g³y.\n\ + Aby przerwaæ - wcinij Control C.\n\ + -n iloæ Iloæ prób pingowania.\n\ + -l bajtów Rozmiar pakietu echo w bajtach .\n\ + -w czas Opónienie oczekiwanej odpowiedzi, w milisekundach.\n\n\0" + IDS_PING_WITH_BYTES "\nPingowanie %1 [%2] przy u¿yciu %3!d! bajtów danych:\n\n\0" IDS_PING_STATISTICS "\nStatystyka wyników badania hosta %1:\n\0" IDS_PACKETS_SENT_RECEIVED_LOST " Pakiety: Wys³ane = %1!d!, Odebrane = %2!d!, Utracone = %3!d! (%4!d!%% strat),\n\0"

13 years, 7 months

[tkreuzer] 50506: [CABMAN] Define DPRINT on release builds to something that does nothing. Fixes a warning about an empty controlled statement on MSVC.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Jan 27 10:21:40 2011 New Revision: 50506 URL: http://svn.reactos.org/svn/reactos?rev=50506&view=rev Log: [CABMAN] Define DPRINT on release builds to something that does nothing. Fixes a warning about an empty controlled statement on MSVC. Modified: branches/cmake-bringup/tools/cabman/cabinet.h Modified: branches/cmake-bringup/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/cabman/cabi… ============================================================================== --- branches/cmake-bringup/tools/cabman/cabinet.h [iso-8859-1] (original) +++ branches/cmake-bringup/tools/cabman/cabinet.h [iso-8859-1] Thu Jan 27 10:21:40 2011 @@ -80,7 +80,7 @@ #else /* DBG */ #undef DPRINT -#define DPRINT(_t_, _x_) +#define DPRINT(_t_, _x_) do { } while(0) #undef ASSERT #define ASSERT(_x_)

13 years, 7 months

[tkreuzer] 50505: [CMAKE] - Sync with trunk 50501 - fix a couple of merge artifacts (indentation)

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jan 26 23:24:08 2011 New Revision: 50505 URL: http://svn.reactos.org/svn/reactos?rev=50505&view=rev Log: [CMAKE] - Sync with trunk 50501 - fix a couple of merge artifacts (indentation) Added: branches/cmake-bringup/dll/win32/avifil32/rsrc-utf8.rc (with props) Modified: branches/cmake-bringup/ (props changed) branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt branches/cmake-bringup/base/applications/network/ping/ping.c branches/cmake-bringup/base/applications/network/ping/ping.rc branches/cmake-bringup/dll/directx/dsound/CMakeLists.txt branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt branches/cmake-bringup/dll/win32/avifil32/rsrc.rc branches/cmake-bringup/dll/win32/gdiplus/CMakeLists.txt branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt branches/cmake-bringup/dll/win32/setupapi/cfgmgr.c branches/cmake-bringup/dll/win32/user32/controls/icontitle.c branches/cmake-bringup/dll/win32/user32/windows/class.c branches/cmake-bringup/dll/win32/user32/windows/cursoricon.c branches/cmake-bringup/drivers/usb/usbehci/fdo.c branches/cmake-bringup/drivers/usb/usbehci/irp.c branches/cmake-bringup/drivers/usb/usbehci/transfer.c branches/cmake-bringup/drivers/usb/usbehci/usbehci.h branches/cmake-bringup/drivers/usb/usbehci/usbiffn.c branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/ (props changed) branches/cmake-bringup/include/crt/math.h branches/cmake-bringup/lib/3rdparty/libsamplerate/CMakeLists.txt branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt branches/cmake-bringup/lib/sdk/crt/misc/i10output.c branches/cmake-bringup/lib/sdk/crt/printf/streamout.c branches/cmake-bringup/ntoskrnl/include/internal/i386/mm.h branches/cmake-bringup/ntoskrnl/mm/ARM3/syspte.c branches/cmake-bringup/ntoskrnl/se/priv.c branches/cmake-bringup/subsystems/win32/win32k/include/tags.h branches/cmake-bringup/subsystems/win32/win32k/include/xformobj.h branches/cmake-bringup/subsystems/win32/win32k/ntuser/window.c branches/cmake-bringup/subsystems/win32/win32k/objects/arc.c branches/cmake-bringup/subsystems/win32/win32k/objects/bitmaps.c branches/cmake-bringup/subsystems/win32/win32k/objects/coord.c branches/cmake-bringup/subsystems/win32/win32k/objects/dibobj.c branches/cmake-bringup/subsystems/win32/win32k/objects/drawing.c branches/cmake-bringup/subsystems/win32/win32k/objects/font.c branches/cmake-bringup/subsystems/win32/win32k/objects/metafile.c branches/cmake-bringup/subsystems/win32/win32k/objects/path.c branches/cmake-bringup/subsystems/win32/win32k/objects/xformobj.c branches/cmake-bringup/subsystems/win32/win32k/pch.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/cmake-bringup/base/applications/network/ping/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/network/ping/ping.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/base/applications/network/ping/ping.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/applications… Modified: branches/cmake-bringup/dll/directx/dsound/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dsoun… Modified: branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/… Modified: branches/cmake-bringup/dll/win32/avifil32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avifil3… Added: branches/cmake-bringup/dll/win32/avifil32/rsrc-utf8.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avifil3… Modified: branches/cmake-bringup/dll/win32/avifil32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/avifil3… Modified: branches/cmake-bringup/dll/win32/gdiplus/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/gdiplus… Modified: branches/cmake-bringup/dll/win32/jscript/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/jscript… Modified: branches/cmake-bringup/dll/win32/setupapi/cfgmgr.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/setupap… Modified: branches/cmake-bringup/dll/win32/user32/controls/icontitle.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/dll/win32/user32/windows/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/user32/… Modified: branches/cmake-bringup/drivers/usb/usbehci/fdo.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/irp.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/transfer.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/usbehci.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/drivers/usb/usbehci/usbiffn.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbeh… Modified: branches/cmake-bringup/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/include/crt/math.… Modified: branches/cmake-bringup/lib/3rdparty/libsamplerate/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/libs… Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMake… Modified: branches/cmake-bringup/lib/sdk/crt/misc/i10output.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/misc/… Modified: branches/cmake-bringup/lib/sdk/crt/printf/streamout.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/print… Modified: branches/cmake-bringup/ntoskrnl/include/internal/i386/mm.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/include/… Modified: branches/cmake-bringup/ntoskrnl/mm/ARM3/syspte.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/mm/ARM3/… Modified: branches/cmake-bringup/ntoskrnl/se/priv.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/se/priv.… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/tags.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/include/xformobj.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/arc.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/bitmaps.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/coord.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/drawing.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/font.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/metafile.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/path.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/objects/xformobj.c URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… Modified: branches/cmake-bringup/subsystems/win32/win32k/pch.h URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/…

13 years, 7 months

← Newer
1
...
5
6
7
8
9
10
11
...
34
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 January 2011