Ros-diffs May 2009

ros-diffs@reactos.org

27 participants
504 discussions

[spetreolle] 40988: disable crashing bitmap font test in gdi32:font
by spetreolle＠svn.reactos.org 19 May '09

19 May '09

Author: spetreolle Date: Tue May 19 23:14:32 2009 New Revision: 40988 URL: http://svn.reactos.org/svn/reactos?rev=40988&view=rev Log: disable crashing bitmap font test in gdi32:font Modified: trunk/rostests/winetests/gdi32/font.c Modified: trunk/rostests/winetests/gdi32/font.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/gdi32/font.c?re… ============================================================================== --- trunk/rostests/winetests/gdi32/font.c [iso-8859-1] (original) +++ trunk/rostests/winetests/gdi32/font.c [iso-8859-1] Tue May 19 23:14:32 2009 @@ -2916,6 +2916,8 @@ init(); test_logfont(); + skip("ROS-HACK: Skipping bitmap font tests\n"); + return; test_bitmap_font(); test_outline_font(); test_bitmap_font_metrics();

1 0

[tkreuzer] 40987: update mascm_ros.diff
by tkreuzer＠svn.reactos.org 19 May '09

19 May '09

Author: tkreuzer Date: Tue May 19 23:08:45 2009 New Revision: 40987 URL: http://svn.reactos.org/svn/reactos?rev=40987&view=rev Log: update mascm_ros.diff Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_ros.diff Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm.rc [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm.rc [iso-8859-1] Tue May 19 23:08:45 2009 @@ -43,4 +43,5 @@ #include "msacm_Si.rc" #include "msacm_Sv.rc" #include "msacm_Tr.rc" +#include "msacm_Uk.rc" #include "msacm_Zh.rc" Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_ros.diff URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_ros.diff [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_ros.diff [iso-8859-1] Tue May 19 23:08:45 2009 @@ -55,10 +55,11 @@ Index: msacm.rc =================================================================== ---- msacm.rc (revision 25687) -+++ msacm.rc (working copy) -@@ -34,3 +34,4 @@ - #include "msacm_Ru.rc" +--- msacm.rc (Revision 40986) ++++ msacm.rc (Arbeitskopie) +@@ -43,4 +43,5 @@ + #include "msacm_Si.rc" #include "msacm_Sv.rc" - #include "msacm_Hu.rc" + #include "msacm_Tr.rc" +#include "msacm_Uk.rc" + #include "msacm_Zh.rc"

1 0

[tkreuzer] 40986: Sync msacm with wine HEAD
by tkreuzer＠svn.reactos.org 19 May '09

19 May '09

Author: tkreuzer Date: Tue May 19 23:04:36 2009 New Revision: 40986 URL: http://svn.reactos.org/svn/reactos?rev=40986&view=rev Log: Sync msacm with wine HEAD Added: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Cs.rc (with props) branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Da.rc (with props) branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ko.rc (with props) branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Lt.rc (with props) branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ro.rc (with props) branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Si.rc (with props) branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Tr.rc (with props) branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Zh.rc (with props) Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/driver.c branches/ros-amd64-bringup/reactos/dll/win32/msacm32/filter.c branches/ros-amd64-bringup/reactos/dll/win32/msacm32/format.c branches/ros-amd64-bringup/reactos/dll/win32/msacm32/internal.c branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm32.spec branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm32_main.c branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_De.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_En.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Es.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Fr.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Hu.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_It.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ja.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Nl.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_No.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Pl.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Pt.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ru.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Sv.rc branches/ros-amd64-bringup/reactos/dll/win32/msacm32/pcmconverter.c branches/ros-amd64-bringup/reactos/dll/win32/msacm32/stream.c branches/ros-amd64-bringup/reactos/dll/win32/msacm32/wineacm.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/driver.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/filter.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/format.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/internal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm32.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm32_main.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Added: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Cs.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Added: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Da.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_De.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_En.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Es.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Fr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Hu.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_It.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ja.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Added: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ko.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Added: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Lt.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Nl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_No.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Pl.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Pt.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Added: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ro.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Ru.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Added: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Si.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Sv.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Added: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Tr.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Added: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/msacm_Zh.rc URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/pcmconverter.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/stream.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w… Modified: branches/ros-amd64-bringup/reactos/dll/win32/msacm32/wineacm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…

1 0

[tkreuzer] 40985: mesa32: Remove outdated files.
by tkreuzer＠svn.reactos.org 19 May '09

19 May '09

Author: tkreuzer Date: Tue May 19 22:55:08 2009 New Revision: 40985 URL: http://svn.reactos.org/svn/reactos?rev=40985&view=rev Log: mesa32: Remove outdated files. Removed: branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/drivers/common/sources branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/glapi/sources branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/main/api_eval.h branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/main/mcompiler.h branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/main/sources branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/math/sources branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/grammar/sources branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/shader_debug.c branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_library_noise.c branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_library_noise.h branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/slang/sources branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/sources branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/swrast/s_drawpix.h branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/swrast/s_pointtemp.h branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/swrast/sources branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/swrast_setup/sources branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/tnl/sources Removed: branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/drivers/common/sources URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/drivers/common/sources [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/drivers/common/sources (removed) @@ -1,2 +1,0 @@ -MESA_DRIVER_COMMON_SOURCES = \ -driverfuncs.c Removed: branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/glapi/sources URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/glapi/sources [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/glapi/sources (removed) @@ -1,12 +1,0 @@ -MESA_GLAPI_SOURCES = \ -glapi.c \ -glthread.c - -MESA_GLAPI_HEADERS = \ -dispatch.h \ -glapi.h \ -glapioffsets.h \ -glapitable.h \ -glapitemp.h \ -glprocs.h \ -glthread.h Removed: branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/main/api_eval.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/main/api_eval.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/main/api_eval.h (removed) @@ -1,42 +1,0 @@ - -/* - * Mesa 3-D graphics library - * Version: 3.5 - * - * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - - -#ifndef API_EVAL_H -#define API_EVAL_H - -#include "mtypes.h" - -extern void _mesa_EvalPoint1( GLint i ); -extern void _mesa_EvalPoint2( GLint i, GLint j ); -extern void _mesa_EvalCoord1f( GLfloat u ); -extern void _mesa_EvalCoord2f( GLfloat u, GLfloat v ); -extern void _mesa_EvalCoord1fv( const GLfloat *u ); -extern void _mesa_EvalCoord2fv( const GLfloat *u ); - -#endif - - - Removed: branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/main/mcompiler.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/main/mcompiler.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/main/mcompiler.h (removed) @@ -1,392 +1,0 @@ -/* - * Mesa 3-D graphics library - * Version: 7.1 - * - * Copyright (C) 1999-2008 Brian Paul All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - - - - -/** - * \file mcopmiler.h - * - * Define helper macros/etc that are platform or compiler-specific. - * There shouldn't be anything specific to GL in here. - */ - -#ifndef MCOMPILER_H -#define MCOMPILER_H - - - -/* Get typedefs for uintptr_t and friends */ -#if defined(__MINGW32__) || defined(__NetBSD__) -# include <stdint.h> -#elif defined(_WIN32) -# include <BaseTsd.h> -# if _MSC_VER == 1200 - typedef UINT_PTR uintptr_t; -# endif -#else -# include <inttypes.h> -#endif - - - - -#ifdef __cplusplus -extern "C" { -#endif - - - -/** - * NULL - */ -#ifndef NULL -#define NULL 0 -#endif - - - -/** - * Function inlining - */ -#if defined(__GNUC__) -# define INLINE __inline__ -#elif defined(__MSC__) -# define INLINE __inline -#elif defined(_MSC_VER) -# define INLINE __inline -#elif defined(__ICL) -# define INLINE __inline -#elif defined(__INTEL_COMPILER) -# define INLINE inline -#elif defined(__WATCOMC__) && (__WATCOMC__ >= 1100) -# define INLINE __inline -#else -# define INLINE -#endif - - -/** - * PUBLIC/USED macros for symbol export. - * - * If we build the library with gcc's -fvisibility=hidden flag, we'll - * use the PUBLIC macro to mark functions that are to be exported. - * - * We also need to define a USED attribute, so the optimizer doesn't - * inline a static function that we later use in an alias. - ajax - */ -#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303 -# define PUBLIC __attribute__((visibility("default"))) -# define USED __attribute__((used)) -#else -# define PUBLIC -# define USED -#endif - - -/** - * Some compilers don't like some of Mesa's const usage. - */ -#ifdef NO_CONST -# define CONST -#else -# define CONST const -#endif - - -/** - * ASSERT macro - */ -#if defined(BUILD_FOR_SNAP) && defined(CHECKED) -# define ASSERT(X) _CHECK(X) -#elif defined(DEBUG) -# define ASSERT(X) assert(X) -#else -# define ASSERT(X) -#endif - - -/** - * __builtin_expect() dummy for non-gcc - */ -#if (!defined(__GNUC__) || __GNUC__ < 3) && (!defined(__IBMC__) || __IBMC__ < 900) -# define __builtin_expect(x, y) x -#endif - - - -/** - * The __FUNCTION__ gcc variable is generally only used for debugging. - * If we're not using gcc, define __FUNCTION__ as a cpp symbol here. - * Don't define it if using a newer Windows compiler. - */ -#if defined(__VMS) -# define __FUNCTION__ "VMS$NL:" -#elif __STDC_VERSION__ < 199901L -# if ((!defined __GNUC__) || (__GNUC__ < 2)) && (!defined __xlC__) && \ - (!defined(_MSC_VER) || _MSC_VER < 1300) -# define __FUNCTION__ "<unknown>" -# endif -#endif - - - - -/** gcc -pedantic warns about long string literals, LONGSTRING silences that */ -#if !defined(__GNUC__) || (__GNUC__ < 2) || \ - ((__GNUC__ == 2) && (__GNUC_MINOR__ <= 7)) -# define LONGSTRING -#else -# define LONGSTRING __extension__ -#endif - - -/* Create a macro so that asm functions can be linked into compilers other - * than GNU C - */ -#ifndef _ASMAPI -#if defined(WIN32) && !defined(BUILD_FOR_SNAP)/* was: !defined( __GNUC__ ) && !defined( VMS ) && !defined( __INTEL_COMPILER )*/ -#define _ASMAPI __cdecl -#else -#define _ASMAPI -#endif -#ifdef PTR_DECL_IN_FRONT -#define _ASMAPIP * _ASMAPI -#else -#define _ASMAPIP _ASMAPI * -#endif -#endif - -#ifdef USE_X86_ASM -#define _NORMAPI _ASMAPI -#define _NORMAPIP _ASMAPIP -#else -#define _NORMAPI -#define _NORMAPIP * -#endif - - - -/** - * XXX is this used anymore? - */ -#if !defined(CAPI) && defined(WIN32) && !defined(BUILD_FOR_SNAP) -#define CAPI _cdecl -#endif - - - -/** - * USE_IEEE: Determine if we're using IEEE floating point - */ -#if defined(__i386__) || defined(__386__) || defined(__sparc__) || \ - defined(__s390x__) || defined(__powerpc__) || \ - defined(__x86_64__) || \ - defined(ia64) || defined(__ia64__) || \ - defined(__hppa__) || defined(hpux) || \ - defined(__mips) || defined(_MIPS_ARCH) || \ - defined(__arm__) || \ - defined(__sh__) || defined(__m32r__) || \ - (defined(__sun) && defined(_IEEE_754)) || \ - (defined(__alpha__) && (defined(__IEEE_FLOAT) || !defined(VMS))) -#define USE_IEEE -#define IEEE_ONE 0x3f800000 -#endif - - - -/** - * finite macro - */ -#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP) -# define __WIN32__ -# define finite _finite -#endif - -#if defined(__WATCOMC__) -# define finite _finite -# pragma disable_message(201) /* Disable unreachable code warnings */ -#endif - - -/** - * IS_INF_OR_NAN: test if float is infinite or NaN - */ -#ifdef USE_IEEE -static INLINE int IS_INF_OR_NAN( float x ) -{ - fi_type tmp; - tmp.f = x; - return !(int)((unsigned int)((tmp.i & 0x7fffffff)-0x7f800000) >> 31); -} -#elif defined(isfinite) -#define IS_INF_OR_NAN(x) (!isfinite(x)) -#elif defined(finite) -#define IS_INF_OR_NAN(x) (!finite(x)) -#elif defined(__VMS) -#define IS_INF_OR_NAN(x) (!finite(x)) -#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -#define IS_INF_OR_NAN(x) (!isfinite(x)) -#else -#define IS_INF_OR_NAN(x) (!finite(x)) -#endif - - - -/*** - *** START_FAST_MATH: Set x86 FPU to faster, 32-bit precision mode (and save - *** original mode to a temporary). - *** END_FAST_MATH: Restore x86 FPU to original mode. - ***/ -#if defined(__GNUC__) && defined(__i386__) -/* - * Set the x86 FPU control word to guarentee only 32 bits of precision - * are stored in registers. Allowing the FPU to store more introduces - * differences between situations where numbers are pulled out of memory - * vs. situations where the compiler is able to optimize register usage. - * - * In the worst case, we force the compiler to use a memory access to - * truncate the float, by specifying the 'volatile' keyword. - */ -/* Hardware default: All exceptions masked, extended double precision, - * round to nearest (IEEE compliant): - */ -#define DEFAULT_X86_FPU 0x037f -/* All exceptions masked, single precision, round to nearest: - */ -#define FAST_X86_FPU 0x003f -/* The fldcw instruction will cause any pending FP exceptions to be - * raised prior to entering the block, and we clear any pending - * exceptions before exiting the block. Hence, asm code has free - * reign over the FPU while in the fast math block. - */ -#if defined(NO_FAST_MATH) -#define START_FAST_MATH(x) \ -do { \ - static unsigned mask = DEFAULT_X86_FPU; \ - __asm__ ( "fnstcw %0" : "=m" (*&(x)) ); \ - __asm__ ( "fldcw %0" : : "m" (mask) ); \ -} while (0) -#else -#define START_FAST_MATH(x) \ -do { \ - static unsigned mask = FAST_X86_FPU; \ - __asm__ ( "fnstcw %0" : "=m" (*&(x)) ); \ - __asm__ ( "fldcw %0" : : "m" (mask) ); \ -} while (0) -#endif -/* Restore original FPU mode, and clear any exceptions that may have - * occurred in the FAST_MATH block. - */ -#define END_FAST_MATH(x) \ -do { \ - __asm__ ( "fnclex ; fldcw %0" : : "m" (*&(x)) ); \ -} while (0) - -#elif defined(__WATCOMC__) && defined(__386__) -#define DEFAULT_X86_FPU 0x037f /* See GCC comments above */ -#define FAST_X86_FPU 0x003f /* See GCC comments above */ -void _watcom_start_fast_math(unsigned short *x,unsigned short *mask); -#pragma aux _watcom_start_fast_math = \ - "fnstcw word ptr [eax]" \ - "fldcw word ptr [ecx]" \ - parm [eax] [ecx] \ - modify exact []; -void _watcom_end_fast_math(unsigned short *x); -#pragma aux _watcom_end_fast_math = \ - "fnclex" \ - "fldcw word ptr [eax]" \ - parm [eax] \ - modify exact []; -#if defined(NO_FAST_MATH) -#define START_FAST_MATH(x) \ -do { \ - static unsigned short mask = DEFAULT_X86_FPU; \ - _watcom_start_fast_math(&x,&mask); \ -} while (0) -#else -#define START_FAST_MATH(x) \ -do { \ - static unsigned short mask = FAST_X86_FPU; \ - _watcom_start_fast_math(&x,&mask); \ -} while (0) -#endif -#define END_FAST_MATH(x) _watcom_end_fast_math(&x) - -#elif defined(_MSC_VER) && defined(_M_IX86) -#define DEFAULT_X86_FPU 0x037f /* See GCC comments above */ -#define FAST_X86_FPU 0x003f /* See GCC comments above */ -#if defined(NO_FAST_MATH) -#define START_FAST_MATH(x) do {\ - static unsigned mask = DEFAULT_X86_FPU;\ - __asm fnstcw word ptr [x]\ - __asm fldcw word ptr [mask]\ -} while(0) -#else -#define START_FAST_MATH(x) do {\ - static unsigned mask = FAST_X86_FPU;\ - __asm fnstcw word ptr [x]\ - __asm fldcw word ptr [mask]\ -} while(0) -#endif -#define END_FAST_MATH(x) do {\ - __asm fnclex\ - __asm fldcw word ptr [x]\ -} while(0) - -#else -#define START_FAST_MATH(x) x = 0 -#define END_FAST_MATH(x) (void)(x) -#endif - - - -/** - * Either define MESA_BIG_ENDIAN or MESA_LITTLE_ENDIAN. - * Do not use them unless absolutely necessary! - * Try to use a runtime test instead. - * For now, only used by some DRI hardware drivers for color/texel packing. - */ -#if defined(BYTE_ORDER) && defined(BIG_ENDIAN) && BYTE_ORDER == BIG_ENDIAN -#if defined(__linux__) -#include <byteswap.h> -#define CPU_TO_LE32( x ) bswap_32( x ) -#else /*__linux__*/ -#define CPU_TO_LE32( x ) ( x ) /* fix me for non-Linux big-endian! */ -#endif /*__linux__*/ -#define MESA_BIG_ENDIAN 1 -#else -#define CPU_TO_LE32( x ) ( x ) -#define MESA_LITTLE_ENDIAN 1 -#endif -#define LE32_TO_CPU( x ) CPU_TO_LE32( x ) - - - -#ifdef __cplusplus -} -#endif - - -#endif /* MCOMPILER_H */ Removed: branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/main/sources URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/main/sources [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/main/sources (removed) @@ -1,138 +1,0 @@ -# List of source files in this directory used for X.org xserver build -MESA_MAIN_SOURCES = \ -accum.c \ -api_arrayelt.c \ -api_loopback.c \ -api_noop.c \ -api_validate.c \ -arrayobj.c \ -attrib.c \ -blend.c \ -bufferobj.c \ -buffers.c \ -clip.c \ -colortab.c \ -context.c \ -convolve.c \ -debug.c \ -depth.c \ -depthstencil.c \ -dlist.c \ -drawpix.c \ -enable.c \ -enums.c \ -eval.c \ -execmem.c \ -extensions.c \ -fbobject.c \ -feedback.c \ -fog.c \ -framebuffer.c \ -get.c \ -getstring.c \ -hash.c \ -hint.c \ -histogram.c \ -image.c \ -imports.c \ -light.c \ -lines.c \ -matrix.c \ -mipmap.c \ -mm.c \ -occlude.c \ -pixel.c \ -points.c \ -polygon.c \ -rastpos.c \ -rbadaptors.c \ -renderbuffer.c \ -state.c \ -stencil.c \ -texcompress.c \ -texcompress_fxt1.c \ -texcompress_s3tc.c \ -texenvprogram.c \ -texformat.c \ -teximage.c \ -texobj.c \ -texrender.c \ -texstate.c \ -texstore.c \ -varray.c \ -$(VSNPRINTF_SOURCES) \ -vtxfmt.c - -MESA_VSNPRINTF_SOURCES = \ -vsnprintf.c - -MESA_MAIN_HEADERS = \ -accum.h \ -api_arrayelt.h \ -api_eval.h \ -api_loopback.h \ -api_noop.h \ -api_validate.h \ -arrayobj.h \ -attrib.h \ -bitset.h \ -blend.h \ -bufferobj.h \ -buffers.h \ -clip.h \ -colormac.h \ -colortab.h \ -config.h \ -context.h \ -convolve.h \ -dd.h \ -debug.h \ -depth.h \ -depthstencil.h \ -dlist.h \ -drawpix.h \ -enable.h \ -enums.h \ -eval.h \ -extensions.h \ -fbobject.h \ -feedback.h \ -fog.h \ -framebuffer.h \ -get.h \ -glheader.h \ -hash.h \ -hint.h \ -histogram.h \ -image.h \ -imports.h \ -light.h \ -lines.h \ -macros.h \ -matrix.h \ -mipmap.h \ -mm.h \ -mtypes.h \ -occlude.h \ -pixel.h \ -points.h \ -polygon.h \ -rastpos.h \ -rbadaptors.h \ -renderbuffer.h \ -simple_list.h \ -state.h \ -stencil.h \ -texcompress.h \ -texenvprogram.h \ -texformat.h \ -texformat_tmp.h \ -teximage.h \ -texobj.h \ -texrender.h \ -texstate.h \ -texstore.h \ -varray.h \ -version.h \ -vtxfmt.h \ -vtxfmt_tmp.h Removed: branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/math/sources URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/math/sources [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/math/sources (removed) @@ -1,25 +1,0 @@ -MESA_MATH_SOURCES = \ -m_debug_clip.c \ -m_debug_norm.c \ -m_debug_xform.c \ -m_eval.c \ -m_matrix.c \ -m_translate.c \ -m_vector.c \ -m_xform.c - -MESA_MATH_HEADERS = \ -m_clip_tmp.h \ -m_copy_tmp.h \ -m_debug.h \ -m_debug_util.h \ -m_dotprod_tmp.h \ -m_eval.h \ -m_matrix.h \ -m_norm_tmp.h \ -m_trans_tmp.h \ -m_translate.h \ -m_vector.h \ -m_xform.h \ -m_xform_tmp.h \ -mathmod.h Removed: branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/grammar/sources URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/grammar/sources [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/grammar/sources (removed) @@ -1,8 +1,0 @@ -MESA_SHADER_GRAMMAR_SOURCES = \ -grammar_mesa.c - -MESA_SHADER_GRAMMAR_HEADERS = \ -grammar.c \ -grammar.h \ -grammar_mesa.h \ -grammar_syn.h Removed: branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/shader_debug.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/shader_debug.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/shader_debug.c (removed) @@ -1,53 +1,0 @@ - - -#include "main/glheader.h" -#include "main/mtypes.h" - - -/** - * Write shader and associated info to a file. - */ -void -_mesa_write_shader_to_file(const struct gl_shader *shader) -{ - const char *type; - char filename[100]; - FILE *f; - - if (shader->Type == GL_FRAGMENT_SHADER) - type = "frag"; - else - type = "vert"; - - snprintf(filename, strlen(filename), "shader_%u.%s", shader->Name, type); - f = fopen(filename, "w"); - if (!f) { - fprintf(stderr, "Unable to open %s for writing\n", filename); - return; - } - - fprintf(f, "/* Shader %u source */\n", shader->Name); - fputs(shader->Source, f); - fprintf(f, "\n"); - - fprintf(f, "/* Compile status: %d */\n", shader->CompileStatus); - fprintf(f, "\n"); - - if (shader->CompileStatus) { - FILE *stdout_save; - - stdout_save = stdout; - stdout = f; - - fprintf(f, "/*GPU code */\n"); - _mesa_print_program(shader->Program); - - stdout = stdout_save; - } - - fclose(f); -} - - - - Removed: branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_library_noise.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_library_noise.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_library_noise.c (removed) @@ -1,501 +1,0 @@ -/* - * Mesa 3-D graphics library - * Version: 6.5 - * - * Copyright (C) 2006 Brian Paul All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -/* - * SimplexNoise1234 - * Copyright (c) 2003-2005, Stefan Gustavson - * - * Contact: stegu(a)itn.liu.se - */ - -/** \file - \brief C implementation of Perlin Simplex Noise over 1,2,3, and 4 dimensions. - \author Stefan Gustavson (stegu(a)itn.liu.se) -*/ - -/* - * This implementation is "Simplex Noise" as presented by - * Ken Perlin at a relatively obscure and not often cited course - * session "Real-Time Shading" at Siggraph 2001 (before real - * time shading actually took on), under the title "hardware noise". - * The 3D function is numerically equivalent to his Java reference - * code available in the PDF course notes, although I re-implemented - * it from scratch to get more readable code. The 1D, 2D and 4D cases - * were implemented from scratch by me from Ken Perlin's text. - * - * This file has no dependencies on any other file, not even its own - * header file. The header file is made for use by external code only. - */ - - -#include "main/imports.h" -#include "slang_library_noise.h" - -#define FASTFLOOR(x) ( ((x)>0) ? ((int)x) : (((int)x)-1) ) - -/* - * --------------------------------------------------------------------- - * Static data - */ - -/* - * Permutation table. This is just a random jumble of all numbers 0-255, - * repeated twice to avoid wrapping the index at 255 for each lookup. - * This needs to be exactly the same for all instances on all platforms, - * so it's easiest to just keep it as static explicit data. - * This also removes the need for any initialisation of this class. - * - * Note that making this an int[] instead of a char[] might make the - * code run faster on platforms with a high penalty for unaligned single - * byte addressing. Intel x86 is generally single-byte-friendly, but - * some other CPUs are faster with 4-aligned reads. - * However, a char[] is smaller, which avoids cache trashing, and that - * is probably the most important aspect on most architectures. - * This array is accessed a *lot* by the noise functions. - * A vector-valued noise over 3D accesses it 96 times, and a - * float-valued 4D noise 64 times. We want this to fit in the cache! - */ -unsigned char perm[512] = {151,160,137,91,90,15, - 131,13,201,95,96,53,194,233,7,225,140,36,103,30,69,142,8,99,37,240,21,10,23, - 190, 6,148,247,120,234,75,0,26,197,62,94,252,219,203,117,35,11,32,57,177,33, - 88,237,149,56,87,174,20,125,136,171,168, 68,175,74,165,71,134,139,48,27,166, - 77,146,158,231,83,111,229,122,60,211,133,230,220,105,92,41,55,46,245,40,244, - 102,143,54, 65,25,63,161, 1,216,80,73,209,76,132,187,208, 89,18,169,200,196, - 135,130,116,188,159,86,164,100,109,198,173,186, 3,64,52,217,226,250,124,123, - 5,202,38,147,118,126,255,82,85,212,207,206,59,227,47,16,58,17,182,189,28,42, - 223,183,170,213,119,248,152, 2,44,154,163, 70,221,153,101,155,167, 43,172,9, - 129,22,39,253, 19,98,108,110,79,113,224,232,178,185, 112,104,218,246,97,228, - 251,34,242,193,238,210,144,12,191,179,162,241, 81,51,145,235,249,14,239,107, - 49,192,214, 31,181,199,106,157,184, 84,204,176,115,121,50,45,127, 4,150,254, - 138,236,205,93,222,114,67,29,24,72,243,141,128,195,78,66,215,61,156,180, - 151,160,137,91,90,15, - 131,13,201,95,96,53,194,233,7,225,140,36,103,30,69,142,8,99,37,240,21,10,23, - 190, 6,148,247,120,234,75,0,26,197,62,94,252,219,203,117,35,11,32,57,177,33, - 88,237,149,56,87,174,20,125,136,171,168, 68,175,74,165,71,134,139,48,27,166, - 77,146,158,231,83,111,229,122,60,211,133,230,220,105,92,41,55,46,245,40,244, - 102,143,54, 65,25,63,161, 1,216,80,73,209,76,132,187,208, 89,18,169,200,196, - 135,130,116,188,159,86,164,100,109,198,173,186, 3,64,52,217,226,250,124,123, - 5,202,38,147,118,126,255,82,85,212,207,206,59,227,47,16,58,17,182,189,28,42, - 223,183,170,213,119,248,152, 2,44,154,163, 70,221,153,101,155,167, 43,172,9, - 129,22,39,253, 19,98,108,110,79,113,224,232,178,185, 112,104,218,246,97,228, - 251,34,242,193,238,210,144,12,191,179,162,241, 81,51,145,235,249,14,239,107, - 49,192,214, 31,181,199,106,157,184, 84,204,176,115,121,50,45,127, 4,150,254, - 138,236,205,93,222,114,67,29,24,72,243,141,128,195,78,66,215,61,156,180 -}; - -/* - * --------------------------------------------------------------------- - */ - -/* - * Helper functions to compute gradients-dot-residualvectors (1D to 4D) - * Note that these generate gradients of more than unit length. To make - * a close match with the value range of classic Perlin noise, the final - * noise values need to be rescaled to fit nicely within [-1,1]. - * (The simplex noise functions as such also have different scaling.) - * Note also that these noise functions are the most practical and useful - * signed version of Perlin noise. To return values according to the - * RenderMan specification from the SL noise() and pnoise() functions, - * the noise values need to be scaled and offset to [0,1], like this: - * float SLnoise = (SimplexNoise1234::noise(x,y,z) + 1.0) * 0.5; - */ - -static float grad1( int hash, float x ) { - int h = hash & 15; - float grad = 1.0f + (h & 7); /* Gradient value 1.0, 2.0, ..., 8.0 */ - if (h&8) grad = -grad; /* Set a random sign for the gradient */ - return ( grad * x ); /* Multiply the gradient with the distance */ -} - -static float grad2( int hash, float x, float y ) { - int h = hash & 7; /* Convert low 3 bits of hash code */ - float u = h<4 ? x : y; /* into 8 simple gradient directions, */ - float v = h<4 ? y : x; /* and compute the dot product with (x,y). */ - return ((h&1)? -u : u) + ((h&2)? -2.0f*v : 2.0f*v); -} - -static float grad3( int hash, float x, float y , float z ) { - int h = hash & 15; /* Convert low 4 bits of hash code into 12 simple */ - float u = h<8 ? x : y; /* gradient directions, and compute dot product. */ - float v = h<4 ? y : h==12||h==14 ? x : z; /* Fix repeats at h = 12 to 15 */ - return ((h&1)? -u : u) + ((h&2)? -v : v); -} - -static float grad4( int hash, float x, float y, float z, float t ) { - int h = hash & 31; /* Convert low 5 bits of hash code into 32 simple */ - float u = h<24 ? x : y; /* gradient directions, and compute dot product. */ - float v = h<16 ? y : z; - float w = h<8 ? z : t; - return ((h&1)? -u : u) + ((h&2)? -v : v) + ((h&4)? -w : w); -} - - /* A lookup table to traverse the simplex around a given point in 4D. */ - /* Details can be found where this table is used, in the 4D noise method. */ - /* TODO: This should not be required, backport it from Bill's GLSL code! */ - static unsigned char simplex[64][4] = { - {0,1,2,3},{0,1,3,2},{0,0,0,0},{0,2,3,1},{0,0,0,0},{0,0,0,0},{0,0,0,0},{1,2,3,0}, - {0,2,1,3},{0,0,0,0},{0,3,1,2},{0,3,2,1},{0,0,0,0},{0,0,0,0},{0,0,0,0},{1,3,2,0}, - {0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}, - {1,2,0,3},{0,0,0,0},{1,3,0,2},{0,0,0,0},{0,0,0,0},{0,0,0,0},{2,3,0,1},{2,3,1,0}, - {1,0,2,3},{1,0,3,2},{0,0,0,0},{0,0,0,0},{0,0,0,0},{2,0,3,1},{0,0,0,0},{2,1,3,0}, - {0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0},{0,0,0,0}, - {2,0,1,3},{0,0,0,0},{0,0,0,0},{0,0,0,0},{3,0,1,2},{3,0,2,1},{0,0,0,0},{3,1,2,0}, - {2,1,0,3},{0,0,0,0},{0,0,0,0},{0,0,0,0},{3,1,0,2},{0,0,0,0},{3,2,0,1},{3,2,1,0}}; - -/* 1D simplex noise */ -GLfloat _slang_library_noise1 (GLfloat x) -{ - int i0 = FASTFLOOR(x); - int i1 = i0 + 1; - float x0 = x - i0; - float x1 = x0 - 1.0f; - float t1 = 1.0f - x1*x1; - float n0, n1; - - float t0 = 1.0f - x0*x0; -/* if(t0 < 0.0f) t0 = 0.0f; // this never happens for the 1D case */ - t0 *= t0; - n0 = t0 * t0 * grad1(perm[i0 & 0xff], x0); - -/* if(t1 < 0.0f) t1 = 0.0f; // this never happens for the 1D case */ - t1 *= t1; - n1 = t1 * t1 * grad1(perm[i1 & 0xff], x1); - /* The maximum value of this noise is 8*(3/4)^4 = 2.53125 */ - /* A factor of 0.395 would scale to fit exactly within [-1,1], but */ - /* we want to match PRMan's 1D noise, so we scale it down some more. */ - return 0.25f * (n0 + n1); -} - -/* 2D simplex noise */ -GLfloat _slang_library_noise2 (GLfloat x, GLfloat y) -{ -#define F2 0.366025403f /* F2 = 0.5*(sqrt(3.0)-1.0) */ -#define G2 0.211324865f /* G2 = (3.0-Math.sqrt(3.0))/6.0 */ - - float n0, n1, n2; /* Noise contributions from the three corners */ - - /* Skew the input space to determine which simplex cell we're in */ - float s = (x+y)*F2; /* Hairy factor for 2D */ - float xs = x + s; - float ys = y + s; - int i = FASTFLOOR(xs); - int j = FASTFLOOR(ys); - - float t = (float)(i+j)*G2; - float X0 = i-t; /* Unskew the cell origin back to (x,y) space */ - float Y0 = j-t; - float x0 = x-X0; /* The x,y distances from the cell origin */ - float y0 = y-Y0; - - float x1, y1, x2, y2; - int ii, jj; - float t0, t1, t2; - - /* For the 2D case, the simplex shape is an equilateral triangle. */ - /* Determine which simplex we are in. */ - int i1, j1; /* Offsets for second (middle) corner of simplex in (i,j) coords */ - if(x0>y0) {i1=1; j1=0;} /* lower triangle, XY order: (0,0)->(1,0)->(1,1) */ - else {i1=0; j1=1;} /* upper triangle, YX order: (0,0)->(0,1)->(1,1) */ - - /* A step of (1,0) in (i,j) means a step of (1-c,-c) in (x,y), and */ - /* a step of (0,1) in (i,j) means a step of (-c,1-c) in (x,y), where */ - /* c = (3-sqrt(3))/6 */ - - x1 = x0 - i1 + G2; /* Offsets for middle corner in (x,y) unskewed coords */ - y1 = y0 - j1 + G2; - x2 = x0 - 1.0f + 2.0f * G2; /* Offsets for last corner in (x,y) unskewed coords */ - y2 = y0 - 1.0f + 2.0f * G2; - - /* Wrap the integer indices at 256, to avoid indexing perm[] out of bounds */ - ii = i % 256; - jj = j % 256; - - /* Calculate the contribution from the three corners */ - t0 = 0.5f - x0*x0-y0*y0; - if(t0 < 0.0f) n0 = 0.0f; - else { - t0 *= t0; - n0 = t0 * t0 * grad2(perm[ii+perm[jj]], x0, y0); - } - - t1 = 0.5f - x1*x1-y1*y1; - if(t1 < 0.0f) n1 = 0.0f; - else { - t1 *= t1; - n1 = t1 * t1 * grad2(perm[ii+i1+perm[jj+j1]], x1, y1); - } - - t2 = 0.5f - x2*x2-y2*y2; - if(t2 < 0.0f) n2 = 0.0f; - else { - t2 *= t2; - n2 = t2 * t2 * grad2(perm[ii+1+perm[jj+1]], x2, y2); - } - - /* Add contributions from each corner to get the final noise value. */ - /* The result is scaled to return values in the interval [-1,1]. */ - return 40.0f * (n0 + n1 + n2); /* TODO: The scale factor is preliminary! */ -} - -/* 3D simplex noise */ -GLfloat _slang_library_noise3 (GLfloat x, GLfloat y, GLfloat z) -{ -/* Simple skewing factors for the 3D case */ -#define F3 0.333333333f -#define G3 0.166666667f - - float n0, n1, n2, n3; /* Noise contributions from the four corners */ - - /* Skew the input space to determine which simplex cell we're in */ - float s = (x+y+z)*F3; /* Very nice and simple skew factor for 3D */ - float xs = x+s; - float ys = y+s; - float zs = z+s; - int i = FASTFLOOR(xs); - int j = FASTFLOOR(ys); - int k = FASTFLOOR(zs); - - float t = (float)(i+j+k)*G3; - float X0 = i-t; /* Unskew the cell origin back to (x,y,z) space */ - float Y0 = j-t; - float Z0 = k-t; - float x0 = x-X0; /* The x,y,z distances from the cell origin */ - float y0 = y-Y0; - float z0 = z-Z0; - - float x1, y1, z1, x2, y2, z2, x3, y3, z3; - int ii, jj, kk; - float t0, t1, t2, t3; - - /* For the 3D case, the simplex shape is a slightly irregular tetrahedron. */ - /* Determine which simplex we are in. */ - int i1, j1, k1; /* Offsets for second corner of simplex in (i,j,k) coords */ - int i2, j2, k2; /* Offsets for third corner of simplex in (i,j,k) coords */ - -/* This code would benefit from a backport from the GLSL version! */ - if(x0>=y0) { - if(y0>=z0) - { i1=1; j1=0; k1=0; i2=1; j2=1; k2=0; } /* X Y Z order */ - else if(x0>=z0) { i1=1; j1=0; k1=0; i2=1; j2=0; k2=1; } /* X Z Y order */ - else { i1=0; j1=0; k1=1; i2=1; j2=0; k2=1; } /* Z X Y order */ - } - else { /* x0<y0 */ - if(y0<z0) { i1=0; j1=0; k1=1; i2=0; j2=1; k2=1; } /* Z Y X order */ - else if(x0<z0) { i1=0; j1=1; k1=0; i2=0; j2=1; k2=1; } /* Y Z X order */ - else { i1=0; j1=1; k1=0; i2=1; j2=1; k2=0; } /* Y X Z order */ - } - - /* A step of (1,0,0) in (i,j,k) means a step of (1-c,-c,-c) in (x,y,z), */ - /* a step of (0,1,0) in (i,j,k) means a step of (-c,1-c,-c) in (x,y,z), and */ - /* a step of (0,0,1) in (i,j,k) means a step of (-c,-c,1-c) in (x,y,z), where */ - /* c = 1/6. */ - - x1 = x0 - i1 + G3; /* Offsets for second corner in (x,y,z) coords */ - y1 = y0 - j1 + G3; - z1 = z0 - k1 + G3; - x2 = x0 - i2 + 2.0f*G3; /* Offsets for third corner in (x,y,z) coords */ - y2 = y0 - j2 + 2.0f*G3; - z2 = z0 - k2 + 2.0f*G3; - x3 = x0 - 1.0f + 3.0f*G3; /* Offsets for last corner in (x,y,z) coords */ - y3 = y0 - 1.0f + 3.0f*G3; - z3 = z0 - 1.0f + 3.0f*G3; - - /* Wrap the integer indices at 256, to avoid indexing perm[] out of bounds */ - ii = i % 256; - jj = j % 256; - kk = k % 256; - - /* Calculate the contribution from the four corners */ - t0 = 0.6f - x0*x0 - y0*y0 - z0*z0; - if(t0 < 0.0f) n0 = 0.0f; - else { - t0 *= t0; - n0 = t0 * t0 * grad3(perm[ii+perm[jj+perm[kk]]], x0, y0, z0); - } - - t1 = 0.6f - x1*x1 - y1*y1 - z1*z1; - if(t1 < 0.0f) n1 = 0.0f; - else { - t1 *= t1; - n1 = t1 * t1 * grad3(perm[ii+i1+perm[jj+j1+perm[kk+k1]]], x1, y1, z1); - } - - t2 = 0.6f - x2*x2 - y2*y2 - z2*z2; - if(t2 < 0.0f) n2 = 0.0f; - else { - t2 *= t2; - n2 = t2 * t2 * grad3(perm[ii+i2+perm[jj+j2+perm[kk+k2]]], x2, y2, z2); - } - - t3 = 0.6f - x3*x3 - y3*y3 - z3*z3; - if(t3<0.0f) n3 = 0.0f; - else { - t3 *= t3; - n3 = t3 * t3 * grad3(perm[ii+1+perm[jj+1+perm[kk+1]]], x3, y3, z3); - } - - /* Add contributions from each corner to get the final noise value. */ - /* The result is scaled to stay just inside [-1,1] */ - return 32.0f * (n0 + n1 + n2 + n3); /* TODO: The scale factor is preliminary! */ -} - -/* 4D simplex noise */ -GLfloat _slang_library_noise4 (GLfloat x, GLfloat y, GLfloat z, GLfloat w) -{ - /* The skewing and unskewing factors are hairy again for the 4D case */ -#define F4 0.309016994f /* F4 = (Math.sqrt(5.0)-1.0)/4.0 */ -#define G4 0.138196601f /* G4 = (5.0-Math.sqrt(5.0))/20.0 */ - - float n0, n1, n2, n3, n4; /* Noise contributions from the five corners */ - - /* Skew the (x,y,z,w) space to determine which cell of 24 simplices we're in */ - float s = (x + y + z + w) * F4; /* Factor for 4D skewing */ - float xs = x + s; - float ys = y + s; - float zs = z + s; - float ws = w + s; - int i = FASTFLOOR(xs); - int j = FASTFLOOR(ys); - int k = FASTFLOOR(zs); - int l = FASTFLOOR(ws); - - float t = (i + j + k + l) * G4; /* Factor for 4D unskewing */ - float X0 = i - t; /* Unskew the cell origin back to (x,y,z,w) space */ - float Y0 = j - t; - float Z0 = k - t; - float W0 = l - t; - - float x0 = x - X0; /* The x,y,z,w distances from the cell origin */ - float y0 = y - Y0; - float z0 = z - Z0; - float w0 = w - W0; - - /* For the 4D case, the simplex is a 4D shape I won't even try to describe. */ - /* To find out which of the 24 possible simplices we're in, we need to */ - /* determine the magnitude ordering of x0, y0, z0 and w0. */ - /* The method below is a good way of finding the ordering of x,y,z,w and */ - /* then find the correct traversal order for the simplex we're in. */ - /* First, six pair-wise comparisons are performed between each possible pair */ - /* of the four coordinates, and the results are used to add up binary bits */ - /* for an integer index. */ - int c1 = (x0 > y0) ? 32 : 0; - int c2 = (x0 > z0) ? 16 : 0; - int c3 = (y0 > z0) ? 8 : 0; - int c4 = (x0 > w0) ? 4 : 0; - int c5 = (y0 > w0) ? 2 : 0; - int c6 = (z0 > w0) ? 1 : 0; - int c = c1 + c2 + c3 + c4 + c5 + c6; - - int i1, j1, k1, l1; /* The integer offsets for the second simplex corner */ - int i2, j2, k2, l2; /* The integer offsets for the third simplex corner */ - int i3, j3, k3, l3; /* The integer offsets for the fourth simplex corner */ - - float x1, y1, z1, w1, x2, y2, z2, w2, x3, y3, z3, w3, x4, y4, z4, w4; - int ii, jj, kk, ll; - float t0, t1, t2, t3, t4; - - /* simplex[c] is a 4-vector with the numbers 0, 1, 2 and 3 in some order. */ - /* Many values of c will never occur, since e.g. x>y>z>w makes x<z, y<w and x<w */ - /* impossible. Only the 24 indices which have non-zero entries make any sense. */ - /* We use a thresholding to set the coordinates in turn from the largest magnitude. */ - /* The number 3 in the "simplex" array is at the position of the largest coordinate. */ - i1 = simplex[c][0]>=3 ? 1 : 0; - j1 = simplex[c][1]>=3 ? 1 : 0; - k1 = simplex[c][2]>=3 ? 1 : 0; - l1 = simplex[c][3]>=3 ? 1 : 0; - /* The number 2 in the "simplex" array is at the second largest coordinate. */ - i2 = simplex[c][0]>=2 ? 1 : 0; - j2 = simplex[c][1]>=2 ? 1 : 0; - k2 = simplex[c][2]>=2 ? 1 : 0; - l2 = simplex[c][3]>=2 ? 1 : 0; - /* The number 1 in the "simplex" array is at the second smallest coordinate. */ - i3 = simplex[c][0]>=1 ? 1 : 0; - j3 = simplex[c][1]>=1 ? 1 : 0; - k3 = simplex[c][2]>=1 ? 1 : 0; - l3 = simplex[c][3]>=1 ? 1 : 0; - /* The fifth corner has all coordinate offsets = 1, so no need to look that up. */ - - x1 = x0 - i1 + G4; /* Offsets for second corner in (x,y,z,w) coords */ - y1 = y0 - j1 + G4; - z1 = z0 - k1 + G4; - w1 = w0 - l1 + G4; - x2 = x0 - i2 + 2.0f*G4; /* Offsets for third corner in (x,y,z,w) coords */ - y2 = y0 - j2 + 2.0f*G4; - z2 = z0 - k2 + 2.0f*G4; - w2 = w0 - l2 + 2.0f*G4; - x3 = x0 - i3 + 3.0f*G4; /* Offsets for fourth corner in (x,y,z,w) coords */ - y3 = y0 - j3 + 3.0f*G4; - z3 = z0 - k3 + 3.0f*G4; - w3 = w0 - l3 + 3.0f*G4; - x4 = x0 - 1.0f + 4.0f*G4; /* Offsets for last corner in (x,y,z,w) coords */ - y4 = y0 - 1.0f + 4.0f*G4; - z4 = z0 - 1.0f + 4.0f*G4; - w4 = w0 - 1.0f + 4.0f*G4; - - /* Wrap the integer indices at 256, to avoid indexing perm[] out of bounds */ - ii = i % 256; - jj = j % 256; - kk = k % 256; - ll = l % 256; - - /* Calculate the contribution from the five corners */ - t0 = 0.6f - x0*x0 - y0*y0 - z0*z0 - w0*w0; - if(t0 < 0.0f) n0 = 0.0f; - else { - t0 *= t0; - n0 = t0 * t0 * grad4(perm[ii+perm[jj+perm[kk+perm[ll]]]], x0, y0, z0, w0); - } - - t1 = 0.6f - x1*x1 - y1*y1 - z1*z1 - w1*w1; - if(t1 < 0.0f) n1 = 0.0f; - else { - t1 *= t1; - n1 = t1 * t1 * grad4(perm[ii+i1+perm[jj+j1+perm[kk+k1+perm[ll+l1]]]], x1, y1, z1, w1); - } - - t2 = 0.6f - x2*x2 - y2*y2 - z2*z2 - w2*w2; - if(t2 < 0.0f) n2 = 0.0f; - else { - t2 *= t2; - n2 = t2 * t2 * grad4(perm[ii+i2+perm[jj+j2+perm[kk+k2+perm[ll+l2]]]], x2, y2, z2, w2); - } - - t3 = 0.6f - x3*x3 - y3*y3 - z3*z3 - w3*w3; - if(t3 < 0.0f) n3 = 0.0f; - else { - t3 *= t3; - n3 = t3 * t3 * grad4(perm[ii+i3+perm[jj+j3+perm[kk+k3+perm[ll+l3]]]], x3, y3, z3, w3); - } - - t4 = 0.6f - x4*x4 - y4*y4 - z4*z4 - w4*w4; - if(t4 < 0.0f) n4 = 0.0f; - else { - t4 *= t4; - n4 = t4 * t4 * grad4(perm[ii+1+perm[jj+1+perm[kk+1+perm[ll+1]]]], x4, y4, z4, w4); - } - - /* Sum up and scale the result to cover the range [-1,1] */ - return 27.0f * (n0 + n1 + n2 + n3 + n4); /* TODO: The scale factor is preliminary! */ -} - Removed: branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_library_noise.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_library_noise.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/slang/slang_library_noise.h (removed) @@ -1,42 +1,0 @@ -/* - * Mesa 3-D graphics library - * Version: 6.5 - * - * Copyright (C) 2006 Brian Paul All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -#if !defined SLANG_LIBRARY_NOISE_H -#define SLANG_LIBRARY_NOISE_H - -#if defined __cplusplus -extern "C" { -#endif - -GLfloat _slang_library_noise1 (GLfloat); -GLfloat _slang_library_noise2 (GLfloat, GLfloat); -GLfloat _slang_library_noise3 (GLfloat, GLfloat, GLfloat); -GLfloat _slang_library_noise4 (GLfloat, GLfloat, GLfloat, GLfloat); - -#ifdef __cplusplus -} -#endif - -#endif - Removed: branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/slang/sources URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/slang/sources [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/slang/sources (removed) @@ -1,44 +1,0 @@ -MESA_SHADER_SLANG_SOURCES = \ -slang_analyse.c \ -slang_assemble_assignment.c \ -slang_assemble.c \ -slang_assemble_conditional.c \ -slang_assemble_constructor.c \ -slang_assemble_typeinfo.c \ -slang_compile.c \ -slang_compile_function.c \ -slang_compile_operation.c \ -slang_compile_struct.c \ -slang_compile_variable.c \ -slang_execute.c \ -slang_execute_x86.c \ -slang_export.c \ -slang_library_texsample.c \ -slang_library_noise.c \ -slang_link.c \ -slang_preprocess.c \ -slang_storage.c \ -slang_utility.c - -MESA_SHADER_SLANG_HEADERS = \ -slang_analyse.h \ -slang_assemble.h \ -slang_assemble_assignment.h \ -slang_assemble_conditional.h \ -slang_assemble_constructor.h \ -slang_assemble_typeinfo.h \ -slang_compile.h \ -slang_compile_function.h \ -slang_compile_operation.h \ -slang_compile_struct.h \ -slang_compile_variable.h \ -slang_execute.h \ -slang_export.h \ -slang_library_noise.h \ -slang_library_texsample.h \ -slang_link.h \ -slang_mesa.h \ -slang_preprocess.h \ -slang_storage.h \ -slang_utility.h \ -traverse_wrap.h Removed: branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/sources URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/sources [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/shader/sources (removed) @@ -1,28 +1,0 @@ -# List of source files in this directory used for X.org xserver build -MESA_SHADER_SOURCES = \ -arbprogparse.c \ -arbprogram.c \ -atifragshader.c \ -nvfragparse.c \ -nvprogram.c \ -nvvertexec.c \ -nvvertparse.c \ -program.c \ -programopt.c \ -shaderobjects.c \ -shaderobjects_3dlabs.c - -MESA_SHADER_HEADERS = \ -arbprogparse.h \ -arbprogram.h \ -arbprogram_syn.h \ -atifragshader.h \ -nvfragparse.h \ -nvprogram.h \ -nvvertexec.h \ -nvvertparse.h \ -programopt.h \ -program.h \ -program_instruction.h \ -shaderobjects.h \ -shaderobjects_3dlabs.h Removed: branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/swrast/s_drawpix.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/swrast/s_drawpix.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/swrast/s_drawpix.h (removed) @@ -1,36 +1,0 @@ - -/* - * Mesa 3-D graphics library - * Version: 3.5 - * - * Copyright (C) 1999-2001 Brian Paul All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - - -#ifndef S_DRAWPIXELS_H -#define S_DRAWPIXELS_H - - -#include "mtypes.h" -#include "swrast.h" - -/* XXX kill this header? */ - -#endif Removed: branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/swrast/s_pointtemp.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/swrast/s_pointtemp.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/swrast/s_pointtemp.h (removed) @@ -1,419 +1,0 @@ -/* - * Mesa 3-D graphics library - * Version: 6.5.3 - * - * Copyright (C) 1999-2007 Brian Paul All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -/* - * Regarding GL_NV_point_sprite: - * - * Portions of this software may use or implement intellectual - * property owned and licensed by NVIDIA Corporation. NVIDIA disclaims - * any and all warranties with respect to such intellectual property, - * including any use thereof or modifications thereto. - */ - - -/* - * Point rendering template code. - * - * Set FLAGS = bitwise-OR of the following tokens: - * - * RGBA = do rgba instead of color index - * SMOOTH = do antialiasing - * ATTRIBS = general attributes (texcoords, etc) - * SPECULAR = do separate specular color - * LARGE = do points with diameter > 1 pixel - * ATTENUATE = compute point size attenuation - * SPRITE = GL_ARB_point_sprite / GL_NV_point_sprite - * - * Notes: LARGE and ATTENUATE are exclusive of each other. - * ATTRIBS requires RGBA - */ - - -/* - * NOTES on antialiased point rasterization: - * - * Let d = distance of fragment center from vertex. - * if d < rmin2 then - * fragment has 100% coverage - * else if d > rmax2 then - * fragment has 0% coverage - * else - * fragment has % coverage = (d - rmin2) / (rmax2 - rmin2) - */ - - -static void -NAME ( GLcontext *ctx, const SWvertex *vert ) -{ -#if FLAGS & (ATTENUATE | LARGE | SMOOTH | SPRITE) - GLfloat size; -#endif -#if FLAGS & RGBA -#if (FLAGS & ATTENUATE) && (FLAGS & SMOOTH) - GLfloat alphaAtten; -#endif - const GLchan red = vert->color[0]; - const GLchan green = vert->color[1]; - const GLchan blue = vert->color[2]; - const GLchan alpha = vert->color[3]; -#endif -#if FLAGS & SPECULAR - const GLchan specRed = vert->specular[0]; - const GLchan specGreen = vert->specular[1]; - const GLchan specBlue = vert->specular[2]; -#endif -#if FLAGS & INDEX - const GLuint colorIndex = (GLuint) vert->index; /* XXX round? */ -#endif -#if FLAGS & ATTRIBS - GLfloat attrib[FRAG_ATTRIB_MAX][4]; /* texture & varying */ -#endif - SWcontext *swrast = SWRAST_CONTEXT(ctx); - SWspan *span = &(swrast->PointSpan); - - /* Cull primitives with malformed coordinates. - */ - { - float tmp = vert->win[0] + vert->win[1]; - if (IS_INF_OR_NAN(tmp)) - return; - } - - /* - * Span init - */ - span->interpMask = SPAN_FOG; - span->arrayMask = SPAN_XY | SPAN_Z; - span->attrStart[FRAG_ATTRIB_FOGC][0] = vert->attrib[FRAG_ATTRIB_FOGC][0]; - span->attrStepX[FRAG_ATTRIB_FOGC][0] = 0.0; - span->attrStepY[FRAG_ATTRIB_FOGC][0] = 0.0; -#if FLAGS & RGBA - span->arrayMask |= SPAN_RGBA; -#endif -#if FLAGS & SPECULAR - span->arrayMask |= SPAN_SPEC; -#endif -#if FLAGS & INDEX - span->arrayMask |= SPAN_INDEX; -#endif -#if FLAGS & ATTRIBS - span->arrayMask |= (SPAN_TEXTURE | SPAN_LAMBDA); - if (ctx->FragmentProgram._Active) { - /* Don't divide texture s,t,r by q (use TXP to do that) */ - ATTRIB_LOOP_BEGIN - COPY_4V(attrib[attr], vert->attrib[attr]); - ATTRIB_LOOP_END - } - else { - /* Divide texture s,t,r by q here */ - ATTRIB_LOOP_BEGIN - const GLfloat q = vert->attrib[attr][3]; - const GLfloat invQ = (q == 0.0F || q == 1.0F) ? 1.0F : (1.0F / q); - attrib[attr][0] = vert->attrib[attr][0] * invQ; - attrib[attr][1] = vert->attrib[attr][1] * invQ; - attrib[attr][2] = vert->attrib[attr][2] * invQ; - attrib[attr][3] = q; - ATTRIB_LOOP_END - } - /* need these for fragment programs */ - span->attrStart[FRAG_ATTRIB_WPOS][3] = 1.0F; - span->attrStepX[FRAG_ATTRIB_WPOS][3] = 0.0F; - span->attrStepY[FRAG_ATTRIB_WPOS][3] = 0.0F; -#endif -#if FLAGS & SMOOTH - span->arrayMask |= SPAN_COVERAGE; -#endif -#if FLAGS & SPRITE - span->arrayMask |= (SPAN_TEXTURE | SPAN_LAMBDA); -#endif - - /* Compute point size if not known to be one */ -#if FLAGS & ATTENUATE - /* first, clamp attenuated size to the user-specifed range */ - size = CLAMP(vert->pointSize, ctx->Point.MinSize, ctx->Point.MaxSize); -#if (FLAGS & RGBA) && (FLAGS & SMOOTH) - /* only if multisampling, compute the fade factor */ - if (ctx->Multisample.Enabled) { - if (vert->pointSize >= ctx->Point.Threshold) { - alphaAtten = 1.0F; - } - else { - GLfloat dsize = vert->pointSize / ctx->Point.Threshold; - alphaAtten = dsize * dsize; - } - } - else { - alphaAtten = 1.0; - } -#endif -#elif FLAGS & (LARGE | SMOOTH | SPRITE) - /* constant, non-attenuated size */ - size = ctx->Point._Size; /* this is already clamped */ -#endif - - -#if FLAGS & (ATTENUATE | LARGE | SMOOTH | SPRITE) - /*** - *** Multi-pixel points - ***/ - - /* do final clamping now */ - if (ctx->Point.SmoothFlag) { - size = CLAMP(size, ctx->Const.MinPointSizeAA, ctx->Const.MaxPointSizeAA); - } - else { - size = CLAMP(size, ctx->Const.MinPointSize, ctx->Const.MaxPointSize); - } - - {{ - GLint x, y; - const GLfloat radius = 0.5F * size; - const GLuint z = (GLuint) (vert->win[2] + 0.5F); - GLuint count; -#if FLAGS & SMOOTH - const GLfloat rmin = radius - 0.7071F; /* 0.7071 = sqrt(2)/2 */ - const GLfloat rmax = radius + 0.7071F; - const GLfloat rmin2 = MAX2(0.0F, rmin * rmin); - const GLfloat rmax2 = rmax * rmax; - const GLfloat cscale = 1.0F / (rmax2 - rmin2); - const GLint xmin = (GLint) (vert->win[0] - radius); - const GLint xmax = (GLint) (vert->win[0] + radius); - const GLint ymin = (GLint) (vert->win[1] - radius); - const GLint ymax = (GLint) (vert->win[1] + radius); -#else - /* non-smooth */ - GLint xmin, xmax, ymin, ymax; - GLint iSize = (GLint) (size + 0.5F); - GLint iRadius; - iSize = MAX2(1, iSize); - iRadius = iSize / 2; - if (iSize & 1) { - /* odd size */ - xmin = (GLint) (vert->win[0] - iRadius); - xmax = (GLint) (vert->win[0] + iRadius); - ymin = (GLint) (vert->win[1] - iRadius); - ymax = (GLint) (vert->win[1] + iRadius); - } - else { - /* even size */ - xmin = (GLint) vert->win[0] - iRadius; - xmax = xmin + iSize - 1; - ymin = (GLint) vert->win[1] - iRadius; - ymax = ymin + iSize - 1; - } -#endif /*SMOOTH*/ - - /* check if we need to flush */ - if (span->end + (xmax-xmin+1) * (ymax-ymin+1) >= MAX_WIDTH || - (swrast->_RasterMask & (BLEND_BIT | LOGIC_OP_BIT | MASKING_BIT))) { - if (span->end > 0) { -#if FLAGS & RGBA - _swrast_write_rgba_span(ctx, span); -#else - _swrast_write_index_span(ctx, span); -#endif - span->end = 0; - } - } - - /* - * OK, generate fragments - */ - count = span->end; - (void) radius; - for (y = ymin; y <= ymax; y++) { - /* check if we need to flush */ - if (count + (xmax-xmin+1) >= MAX_WIDTH) { - span->end = count; -#if FLAGS & RGBA - _swrast_write_rgba_span(ctx, span); -#else - _swrast_write_index_span(ctx, span); -#endif - count = span->end = 0; - } - for (x = xmin; x <= xmax; x++) { -#if FLAGS & SPRITE - GLuint u; -#endif - -#if FLAGS & RGBA - span->array->rgba[count][RCOMP] = red; - span->array->rgba[count][GCOMP] = green; - span->array->rgba[count][BCOMP] = blue; - span->array->rgba[count][ACOMP] = alpha; -#endif -#if FLAGS & SPECULAR - span->array->spec[count][RCOMP] = specRed; - span->array->spec[count][GCOMP] = specGreen; - span->array->spec[count][BCOMP] = specBlue; -#endif -#if FLAGS & INDEX - span->array->index[count] = colorIndex; -#endif -#if FLAGS & ATTRIBS - ATTRIB_LOOP_BEGIN - COPY_4V(span->array->attribs[attr][count], attrib[attr]); - if (attr < FRAG_ATTRIB_VAR0 && attr >= FRAG_ATTRIB_TEX0) { - const GLuint u = attr - FRAG_ATTRIB_TEX0; - span->array->lambda[u][count] = 0.0; - } - ATTRIB_LOOP_END -#endif - -#if FLAGS & SMOOTH - /* compute coverage */ - { - const GLfloat dx = x - vert->win[0] + 0.5F; - const GLfloat dy = y - vert->win[1] + 0.5F; - const GLfloat dist2 = dx * dx + dy * dy; - if (dist2 < rmax2) { - if (dist2 >= rmin2) { - /* compute partial coverage */ - span->array->coverage[count] = 1.0F - (dist2 - rmin2) * cscale; -#if FLAGS & INDEX - /* coverage in [0,15] */ - span->array->coverage[count] *= 15.0; -#endif - } - else { - /* full coverage */ - span->array->coverage[count] = 1.0F; - } - - span->array->x[count] = x; - span->array->y[count] = y; - span->array->z[count] = z; - -#if (FLAGS & ATTENUATE) && (FLAGS & RGBA) - span->array->rgba[count][ACOMP] = (GLchan) (alpha * alphaAtten); -#elif FLAGS & RGBA - span->array->rgba[count][ACOMP] = alpha; -#endif /*ATTENUATE*/ - count++; - } /*if*/ - } - -#else /*SMOOTH*/ - - /* not smooth (square points) */ - span->array->x[count] = x; - span->array->y[count] = y; - span->array->z[count] = z; - -#if FLAGS & SPRITE - for (u = 0; u < ctx->Const.MaxTextureUnits; u++) { - GLuint attr = FRAG_ATTRIB_TEX0 + u; - if (ctx->Texture.Unit[u]._ReallyEnabled) { - if (ctx->Point.CoordReplace[u]) { - GLfloat s = 0.5F + (x + 0.5F - vert->win[0]) / size; - GLfloat t, r; - if (ctx->Point.SpriteOrigin == GL_LOWER_LEFT) - t = 0.5F + (y + 0.5F - vert->win[1]) / size; - else /* GL_UPPER_LEFT */ - t = 0.5F - (y + 0.5F - vert->win[1]) / size; - if (ctx->Point.SpriteRMode == GL_ZERO) - r = 0.0F; - else if (ctx->Point.SpriteRMode == GL_S) - r = vert->attrib[attr][0]; - else /* GL_R */ - r = vert->attrib[attr][2]; - span->array->attribs[attr][count][0] = s; - span->array->attribs[attr][count][1] = t; - span->array->attribs[attr][count][2] = r; - span->array->attribs[attr][count][3] = 1.0F; - span->array->lambda[u][count] = 0.0; /* XXX fix? */ - } - else { - COPY_4V(span->array->attribs[attr][count], - vert->attrib[attr]); - } - } - } -#endif /*SPRITE*/ - - count++; /* square point */ - -#endif /*SMOOTH*/ - - } /*for x*/ - } /*for y*/ - span->end = count; - }} - -#else /* LARGE | ATTENUATE | SMOOTH | SPRITE */ - - /*** - *** Single-pixel points - ***/ - {{ - GLuint count; - - /* check if we need to flush */ - if (span->end >= MAX_WIDTH || - (swrast->_RasterMask & (BLEND_BIT | LOGIC_OP_BIT | MASKING_BIT))) { -#if FLAGS & RGBA - _swrast_write_rgba_span(ctx, span); -#else - _swrast_write_index_span(ctx, span); -#endif - span->end = 0; - } - - count = span->end; - -#if FLAGS & RGBA - span->array->rgba[count][RCOMP] = red; - span->array->rgba[count][GCOMP] = green; - span->array->rgba[count][BCOMP] = blue; - span->array->rgba[count][ACOMP] = alpha; -#endif -#if FLAGS & SPECULAR - span->array->spec[count][RCOMP] = specRed; - span->array->spec[count][GCOMP] = specGreen; - span->array->spec[count][BCOMP] = specBlue; -#endif -#if FLAGS & INDEX - span->array->index[count] = colorIndex; -#endif -#if FLAGS & ATTRIBS - ATTRIB_LOOP_BEGIN - COPY_4V(span->array->attribs[attr][count], attribs[attr]); - ATTRIB_LOOP_END -#endif - - span->array->x[count] = (GLint) vert->win[0]; - span->array->y[count] = (GLint) vert->win[1]; - span->array->z[count] = (GLint) (vert->win[2] + 0.5F); - span->end = count + 1; - }} - -#endif /* LARGE || ATTENUATE || SMOOTH */ - - ASSERT(span->end <= MAX_WIDTH); -} - - -#undef FLAGS -#undef NAME Removed: branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/swrast/sources URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/swrast/sources [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/swrast/sources (removed) @@ -1,65 +1,0 @@ -# List of source files in this directory used for X.org xserver build -MESA_SWRAST_SOURCES = \ -s_aaline.c \ -s_aatriangle.c \ -s_accum.c \ -s_alpha.c \ -s_arbshader.c \ -s_atifragshader.c \ -s_bitmap.c \ -s_blend.c \ -s_blit.c \ -s_buffers.c \ -s_context.c \ -s_copypix.c \ -s_depth.c \ -s_drawpix.c \ -s_feedback.c \ -s_fog.c \ -s_imaging.c \ -s_lines.c \ -s_logic.c \ -s_masking.c \ -s_nvfragprog.c \ -s_points.c \ -s_readpix.c \ -s_span.c \ -s_stencil.c \ -s_texcombine.c \ -s_texfilter.c \ -s_texstore.c \ -s_triangle.c \ -s_zoom.c - -MESA_SWRAST_HEADERS = \ -s_aaline.h \ -s_aalinetemp.h \ -s_aatriangle.h \ -s_aatritemp.h \ -s_accum.h \ -s_alpha.h \ -s_arbshader.h \ -s_atifragshader.h \ -s_blend.h \ -s_context.h \ -s_depth.h \ -s_drawpix.h \ -s_feedback.h \ -s_fog.h \ -s_lines.h \ -s_linetemp.h \ -s_logic.h \ -s_masking.h \ -s_nvfragprog.h \ -s_points.h \ -s_pointtemp.h \ -s_span.h \ -s_spantemp.h \ -s_stencil.h \ -s_texcombine.h \ -s_texfilter.h \ -s_triangle.h \ -s_trispan.h \ -s_tritemp.h \ -s_zoom.h \ -swrast.h Removed: branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/swrast_setup/sources URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/swrast_setup/sources [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/swrast_setup/sources (removed) @@ -1,10 +1,0 @@ -MESA_SWRAST_SETUP_SOURCES = \ -ss_context.c \ -ss_triangle.c - -MESA_SWRAST_SETUP_HEADERS = \ -ss_context.h \ -ss_triangle.h \ -ss_tritmp.h \ -ss_vb.h \ -swrast_setup.h Removed: branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/tnl/sources URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/tnl/sources [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/src/tnl/sources (removed) @@ -1,34 +1,0 @@ -# List of source files in this directory used for X.org xserver build -MESA_TNL_SOURCES = \ -t_context.c \ -t_pipeline.c \ -t_vb_arbprogram.c \ -t_vb_arbprogram_sse.c \ -t_vb_arbshader.c \ -t_vb_cull.c \ -t_vb_fog.c \ -t_vb_light.c \ -t_vb_normals.c \ -t_vb_points.c \ -t_vb_program.c \ -t_vb_render.c \ -t_vb_texgen.c \ -t_vb_texmat.c \ -t_vb_vertex.c \ -t_vertex.c \ -t_vertex_generic.c \ -t_vertex_sse.c \ -t_vp_build.c - -MESA_TNL_HEADERS = \ -t_array_api.h \ -t_array_import.h \ -t_context.h \ -t_pipeline.h \ -t_vb_arbprogram.h \ -t_vb_cliptmp.h \ -t_vb_lighttmp.h \ -t_vb_rendertmp.h \ -t_vertex.h \ -t_vp_build.h \ -tnl.h

1 0

[tkreuzer] 40984: Fix mesa build on x64
by tkreuzer＠svn.reactos.org 19 May '09

19 May '09

Author: tkreuzer Date: Tue May 19 21:52:57 2009 New Revision: 40984 URL: http://svn.reactos.org/svn/reactos?rev=40984&view=rev Log: Fix mesa build on x64 Modified: branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/mesa32.rbuild Modified: branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/mesa32.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/3… ============================================================================== --- branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/mesa32.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/3rdparty/mesa32/mesa32.rbuild [iso-8859-1] Tue May 19 21:52:57 2009 @@ -12,10 +12,13 @@ <define name="BUILD_GL32" /> <define name="WIN32" /> <define name="USE_EXTERNAL_DXTN_LIB=1" /> - <define name="USE_X86_ASM" /> - <define name="USE_MMX_ASM" /> - <define name="USE_SSE_ASM" /> + <if property="ARCH" value="i386"> + <define name="USE_X86_ASM" /> + <define name="USE_MMX_ASM" /> + <define name="USE_SSE_ASM" /> + </if> <define name="USE_3DNOW_ASM" /> + <define name="GL_NO_STDCALL" /> <include base="mesa32">include</include> <include base="mesa32">src</include> <include base="mesa32">src/main</include> @@ -222,7 +225,9 @@ <file>t_vertex.c</file> <file>t_vertex_generic.c</file> <file>t_vp_build.c</file> - <file>t_vertex_sse.c</file> + <if property="ARCH" value="i386"> + <file>t_vertex_sse.c</file> + </if> </directory> <directory name="vbo"> <file>vbo_context.c</file> @@ -257,35 +262,44 @@ </directory> </directory> </directory> - <directory name="x86"> - <directory name="rtasm"> - <file>x86sse.c</file> - </directory> - <file>3dnow.c</file> - <file>3dnow_normal.S</file> - <file>3dnow_xform1.S</file> - <file>3dnow_xform2.S</file> - <file>3dnow_xform3.S</file> - <file>3dnow_xform4.S</file> - <file>common_x86.c</file> - <file>common_x86_asm.S</file> - <file>glapi_x86.S</file> - <file>mmx_blend.S</file> - <file>read_rgba_span_x86.S</file> - <file>sse_normal.S</file> - <file>sse_xform1.S</file> - <file>sse_xform2.S</file> - <file>sse_xform3.S</file> - <file>sse_xform4.S</file> - <file>x86.c</file> - <file>x86_cliptest.S</file> - <file>x86_xform2.S</file> - <file>x86_xform3.S</file> - <file>x86_xform4.S</file> - <file>sse.c</file> - </directory> - <directory name="x86-64"> - <file>x86-64.c</file> - </directory> -</directory> + + <if property="ARCH" value="i386"> + <directory name="x86"> + <directory name="rtasm"> + <file>x86sse.c</file> + </directory> + <file>3dnow.c</file> + <file>3dnow_normal.S</file> + <file>3dnow_xform1.S</file> + <file>3dnow_xform2.S</file> + <file>3dnow_xform3.S</file> + <file>3dnow_xform4.S</file> + <file>common_x86.c</file> + <file>common_x86_asm.S</file> + <file>glapi_x86.S</file> + <file>mmx_blend.S</file> + <file>read_rgba_span_x86.S</file> + <file>sse_normal.S</file> + <file>sse_xform1.S</file> + <file>sse_xform2.S</file> + <file>sse_xform3.S</file> + <file>sse_xform4.S</file> + <file>x86.c</file> + <file>x86_cliptest.S</file> + <file>x86_xform2.S</file> + <file>x86_xform3.S</file> + <file>x86_xform4.S</file> + <file>sse.c</file> + </directory> + </if> + + <if property="ARCH" value="amd64"> + <directory name="x86-64"> + <file>x86-64.c</file> +  + <file>xform4.S</file> + </directory> + </if> + + </directory> </module>

1 0

[dgoette] 420: fix typo
by dgoette＠svn.reactos.org 19 May '09

19 May '09

Author: dgoette Date: Tue May 19 20:53:11 2009 New Revision: 420 URL: http://svn.reactos.org/svn/reactos?rev=420&view=rev Log: fix typo Modified: branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Profile.cl… Modified: branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Profile.cl… URL: http://svn.reactos.org/svn/reactos/branches/danny-web/www/www.reactos.org/r… ============================================================================== --- branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Profile.cl… [iso-8859-1] (original) +++ branches/danny-web/www/www.reactos.org/roscms/lib/view/HTML_User_Profile.cl… [iso-8859-1] Tue May 19 20:53:11 2009 @@ -263,7 +263,7 @@ else { echo_strip(' <div class="u-link"> - <a href="'.$config->pathInstance().'?page=search">raquo; Profile Search</a> + <a href="'.$config->pathInstance().'?page=search">» Profile Search</a> </div>'); } echo_strip('

1 0

[dgorbachev] 40983: Fix build
by dgorbachev＠svn.reactos.org 19 May '09

19 May '09

Author: dgorbachev Date: Tue May 19 20:28:22 2009 New Revision: 40983 URL: http://svn.reactos.org/svn/reactos?rev=40983&view=rev Log: Fix build Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] Tue May 19 20:28:22 2009 @@ -1,7 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// // Romanian resources +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL +#pragma code_page(1250) +#endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// // @@ -156,20 +160,6 @@ // // Dialog // - -IDD_ABOUTBOX DIALOGEX DISCARDABLE 22, 17, 259, 210 -STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU -CAPTION "Despre Gestionarul de activitãþi" -FONT 8, "MS Shell Dlg" -BEGIN - CONTROL "Gestionar de activitãþi v1.0\nDrept de autor (C) 1999 - 2001\nde Brian Palmer (brianp(a)reactos.org)\ntradus de Dimitriu Petru", - IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, - 122,26 - DEFPUSHBUTTON "OK",IDOK,183,189,44,14,WS_GROUP - ICON IDI_TASKMANAGER,IDC_STATIC,19,30,20,20 - EDITTEXT IDC_LICENSE_EDIT,53,63,174,107,ES_MULTILINE | - ES_READONLY | WS_VSCROLL -END IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | @@ -598,7 +588,6 @@ ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL "Seteazã prioritatea" ID_PROCESS_PAGE_SETPRIORITY_LOW "Seteazã prioritatea" - IDS_LICENSE "Tradus în limba românã de Petru Dimitriu.\r\nAcest program este software liber; puteþi redistribui sau modifica programul sub termenii licenþei publice GNU aºa cum este publicatã de Free Software Foundation - fie versiunea 2 a licenþei, sau (la alegerea dvs.) oricare versiune ulterioarã.\r\n\r\nAcest program este distribuit în speranþa cã va fi de folos, dar FÃRÃ NICIO GARANÞIE, nici mãcar garanþia VANDABILITÃÞII sau a POTRIVIRII PENTRU UN SCOP ANUME. Vedeþi Licenþa GNU GPL pentru detalii.\r\n\r\nDvs. ar trebui sã fi primit o copie a licenþei împreunã cu acest program; dacã nu, scrieþi la Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." END

1 0

[dgorbachev] 40982: Romanian translations by Petru Dimitriu. Bug #4518.
by dgorbachev＠svn.reactos.org 19 May '09

19 May '09

Author: dgorbachev Date: Tue May 19 20:06:10 2009 New Revision: 40982 URL: http://svn.reactos.org/svn/reactos?rev=40982&view=rev Log: Romanian translations by Petru Dimitriu. Bug #4518. Added: trunk/reactos/base/applications/fontview/lang/ro-RO.rc (with props) trunk/reactos/base/applications/magnify/lang/ro-RO.rc (with props) trunk/reactos/base/applications/msconfig/lang/ro-RO.rc (with props) trunk/reactos/base/applications/paint/lang/ro-RO.rc (with props) trunk/reactos/base/applications/screensavers/logon/lang/ro-RO.rc (with props) trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc (with props) trunk/reactos/base/system/winlogon/lang/ro-RO.rc (with props) Modified: trunk/reactos/base/applications/fontview/fontview.rc trunk/reactos/base/applications/magnify/rsrc.rc trunk/reactos/base/applications/msconfig/rsrc.rc trunk/reactos/base/applications/paint/rsrc.rc trunk/reactos/base/applications/screensavers/logon/logon.rc trunk/reactos/base/applications/taskmgr/rsrc.rc trunk/reactos/base/system/winlogon/rsrc.rc trunk/reactos/dll/win32/user32/lang/ro-RO.rc Modified: trunk/reactos/base/applications/fontview/fontview.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/fontview.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/fontview.rc [iso-8859-1] Tue May 19 20:06:10 2009 @@ -20,6 +20,7 @@ #include "lang/fr-FR.rc" #include "lang/lt-LT.rc" #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/fontview/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/fontview/lang/ro-RO.rc [iso-8859-1] Tue May 19 20:06:10 2009 @@ -1,0 +1,16 @@ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_QUIT, "Ieºire" + IDS_PRINT, "Imprimare" + IDS_STRING, "Profesoara mea de chimie scrie multe poezii frumoase. 1234567890" + IDS_ERROR, "Eroare" + IDS_ERROR_NOMEM, "Nu e destulã memorie pentru a încheia operaþia." + IDS_ERROR_NOFONT, "Fiºierul %1 este un fiºier font deteriorat." + IDS_ERROR_NOCLASS, "Nu s-a putut iniþializa clasa de ferestre." + IDS_ERROR_BADCMD, "Niciun font specificat.\nSintaxã:\n fontview.exe <fiºier font>" +END + + + Propchange: trunk/reactos/base/applications/fontview/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/magnify/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/magnify/lang/ro-RO.rc [iso-8859-1] Tue May 19 20:06:10 2009 @@ -1,0 +1,64 @@ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +IDC_MAGNIFIER MENU +BEGIN + POPUP "&Fiºier" + BEGIN + MENUITEM "Ieºire", IDM_EXIT + MENUITEM "&Opþiuni", IDM_OPTIONS + MENUITEM SEPARATOR + MENUITEM "&Despre ...", IDM_ABOUT + END +END + +IDC_MAGNIFIER ACCELERATORS +BEGIN + "?", IDM_ABOUT, ASCII, ALT + "/", IDM_ABOUT, ASCII, ALT +END + +IDD_ABOUTBOX DIALOGEX 22, 17, 220, 75 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION | WS_SYSMENU +CAPTION "Despre" +FONT 8, "MS Shell Dlg", 0, 0, 0x0 +BEGIN + ICON IDI_ICON,IDC_MYICON,14,9,20,20 + LTEXT "Lupa Versiunea 1.0",IDC_STATIC,49,10,119,8,SS_NOPREFIX + LTEXT "Drept de autor (C) 2007 Marc Piulachs (marc.piulachs(a)codexchange.net)",IDC_STATIC,48,24,125,22 + PUSHBUTTON "OK",IDOK,162,48,50,14 +END + +IDD_DIALOGOPTIONS DIALOGEX 0, 0, 153, 182 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Setãri Lupã" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "Ieºire",IDOK,96,161,50,14 + PUSHBUTTON "Ajutor",IDC_BUTTON_HELP,38,161,50,14 + LTEXT "Nivel mãrire:",IDC_STATIC,6,8,68,8 + COMBOBOX IDC_ZOOM,72,6,63,66,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + GROUPBOX "Urmãrire",IDC_STATIC,7,25,139,59 + GROUPBOX "Presentare",IDC_STATIC,7,87,139,57 + CONTROL "Urmãrire cursor maus",IDC_FOLLOWMOUSECHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,42,114,10 + CONTROL "Urmãrire focalizare tastaturã",IDC_FOLLOWKEYBOARDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,54,114,10 + CONTROL "Urmãrire editare text",IDC_FOLLOWTEXTEDITINGCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,66,114,10 + CONTROL "Inversare culori",IDC_INVERTCOLORSCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,102,114,10 + CONTROL "Pornire minimizat",IDC_STARTMINIMIZEDCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,114,114,10 + CONTROL "Afiºare lupã",IDC_SHOWMAGNIFIERCHECK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,126,114,10 +END + +IDD_WARNINGDIALOG DIALOGEX 0, 0, 250, 97 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION +CAPTION "ReactOS Magnifier" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "OK",IDOK,193,76,50,14 + ICON IDI_ICON,IDC_STATIC,7,17,20,20 + LTEXT "Acest instrument este destinat celor cu deficienþe vizuale minore. Pentru rezultate mai bune, folosiþi un instrument mai sofisticat.",IDC_STATIC,36,7,207,33 + CONTROL "Nu mai afiºa acest mesaj",IDC_SHOWWARNINGCHECK, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,43,80,137,10 +END + +STRINGTABLE +BEGIN + IDS_APP_TITLE "Lupã" +END Propchange: trunk/reactos/base/applications/magnify/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/magnify/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… ============================================================================== --- trunk/reactos/base/applications/magnify/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/magnify/rsrc.rc [iso-8859-1] Tue May 19 20:06:10 2009 @@ -9,6 +9,7 @@ #include "lang/it-IT.rc" #include "lang/no-NO.rc" #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/msconfig/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/msconfig/lang/ro-RO.rc [iso-8859-1] Tue May 19 20:06:10 2009 @@ -1,0 +1,174 @@ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +IDD_MSCONFIG_DIALOG DIALOGEX DISCARDABLE 0, 0, 378, 220 +STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "Programul de configurare a sistemului" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,2,2,374,195 + DEFPUSHBUTTON "OK", IDOK, 211, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "&Ajutor", IDC_BTN_HELP, 2, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Anulare", IDCANCEL, 267, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Aplicare", IDC_BTN_APPLY, 323, 201, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_STARTUP_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List3",IDC_STARTUP_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 148 + PUSHBUTTON "&Activare toate",IDC_BTN_STARTUP_ACTIVATE,223,155,66,14 + PUSHBUTTON "&Dezactivare toate",IDC_BTN_STARTUP_DEACTIVATE,295,155,66,14 +END + +IDD_SYSTEM_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", 237, "SysTreeView32", TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_EDITLABELS | TVS_SHOWSELALWAYS | WS_CHILD | WS_VISIBLE | WS_BORDER | WS_TABSTOP, 2, 1, 280, 148 + PUSHBUTTON "În &sus", IDC_BTN_SYSTEM_UP, 290, 5, 66, 14 + PUSHBUTTON "În &jos", IDC_BTN_SYSTEM_DOWN, 290, 25, 66, 14 + + PUSHBUTTON "&Activare", IDC_BTN_SYSTEM_ENABLE, 290, 50, 66, 14 + PUSHBUTTON "D&ezactivare", IDC_BTN_SYSTEM_DISABLE, 290, 70, 66, 14 + + PUSHBUTTON "&Gãsire", IDC_BTN_SYSTEM_FIND, 290, 95, 66, 14 + PUSHBUTTON "&Nou", IDC_BTN_SYSTEM_NEW, 290, 115, 66, 14 + PUSHBUTTON "Edi&tare", IDC_BTN_SYSTEM_EDIT, 290, 135, 66, 14 + + PUSHBUTTON "Activare toate", IDC_BTN_SYSTEM_ACTIVATE, 123, 155, 66, 14 + PUSHBUTTON "Dezactivare toate",IDC_BTN_SYSTEM_DEACTIVATE, 195, 155, 66, 14 +END + +IDD_TOOLS_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",IDC_TOOLS_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 2, 1, 360, 134 + EDITTEXT IDC_TOOLS_CMDLINE, 1, 139, 360, 12, ES_READONLY + PUSHBUTTON "&Rulare", IDC_BTN_RUN, 311, 155, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END + +IDD_SERVICES_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List1",IDC_SERVICES_LIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | WS_BORDER | WS_TABSTOP,2,1,360,148 + PUSHBUTTON "&Activare toate",IDC_BTN_SERVICES_ACTIVATE,223,155,66,14 + PUSHBUTTON "&Dezactivare toate",IDC_BTN_SERVICES_DEACTIVATE,295,155,66,14 +END + +IDD_GENERAL_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Pornire sistem", -1, 10, 10, 340, 150,0,WS_EX_TRANSPARENT + CONTROL "&Pornire normalã - încarcã toate driverele ºi serviciile", IDC_CBX_NORMAL_START, "Button", 0x50010009, 20, 30, 180, 10 + CONTROL "&Pornire de diagnostic - încarcã doar driverele de bazã", IDC_CBX_DIAGNOSTIC_START, "Button", 0x50010009, 20, 45, 195, 10 + CONTROL "Pornire selectivã", IDC_CBX_SELECTIVE_STARTUP, "Button", 0x50010009, 20, 60, 70, 10 + AUTOCHECKBOX "P&rocesare SYSTEM.INI", IDC_CBX_SYSTEM_INI, 30, 80, 95, 10 + AUTOCHECKBOX "&Încãrcare servicii de sistem", IDC_CBX_SYSTEM_SERVICE, 30, 95, 90, 10 + AUTOCHECKBOX "Încãrcare &elemente pornire", IDC_CBX_STARTUP_ITEM, 30, 110, 75, 10 +END + +IDD_FREELDR_PAGE DIALOGEX DISCARDABLE 0, 0, 362, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_LIST_BOX, "ListBox", 0x50010141, 10, 10, 340, 50, 0x00000200 + PUSHBUTTON "&Verificare toate cãile de pornire", IDC_BTN_CHECK_BOOT_PATH, 10, 65, 70, 12 + PUSHBUTTON "&Setare implicit", IDC_BTN_SET_DEFAULT_BOOT, 100, 65, 70, 12 + PUSHBUTTON "În &sus", IDC_BTN_MOVE_UP_BOOT_OPTION, 190, 65, 70, 12 + PUSHBUTTON "În &jos", IDC_BTN_MOVE_DOWN_BOOT_OPTION, 280, 65, 70, 12 + GROUPBOX "Opþiuni pornire", -1, 10, 80, 250, 90,0,WS_EX_TRANSPARENT + CHECKBOX "/SA&FEBOOT", IDC_CBX_SAFE_BOOT, 15, 90, 55, 10 + CHECKBOX "/&NOGUIBOOT", IDC_CBX_NO_GUI_BOOT, 15, 105, 60, 10 + CHECKBOX "/&BOOTLOG", IDC_CBX_BOOT_LOG, 15, 120, 50, 10 + CHECKBOX "/BAS&EVIDEO", IDC_CBX_BASE_VIDEO, 15, 135, 55, 10 + CHECKBOX "/S&OS", IDC_CBX_SOS, 15, 150, 50, 10 + PUSHBUTTON "Opþiuni avansate...", IDC_BTN_ADVANCED_OPTIONS, 100, 150, 70, 12 + LTEXT "&Timeout:", -1, 280, 91, 30, 10 + EDITTEXT IDC_TXT_BOOT_TIMEOUT, 310, 90, 25, 12, ES_LEFT + LTEXT "sec.", -1, 340, 91, 15, 10 +END + +IDD_FREELDR_ADVANCED_PAGE DIALOGEX DISCARDABLE 0, 0, 175, 175 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CHECKBOX "/&MAXMEM=", IDC_CBX_MAX_MEM, 10, 10, 50, 10 + EDITTEXT IDC_TXT_MAX_MEM, 80, 10, 60, 12 + CONTROL "",IDC_SCR_MAX_MEM, "msctls_updown32", 0x50000000, 140, 10, 11, 11 + CHECKBOX "/&NUMPROC=", IDC_CBX_NUM_PROC, 10, 25, 50, 10 + COMBOBOX IDC_DRP_NUM_PROC, 80, 25, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&PCILOCK", IDC_CBX_PCI_LOCK, 10, 40, 50, 10 + CHECKBOX "/P&ROFILE", IDC_CBX_PROFILE, 10, 55, 50, 10 + CHECKBOX "/&IRQ", IDC_CBX_IRQ, 10, 70, 40, 12 + EDITTEXT IDC_TXT_IRQ, 80, 70, 60, 12, ES_LEFT + CHECKBOX "/&DEBUG", IDC_CBX_DEBUG, 10, 85, 40, 10 + CHECKBOX "/D&EBUGPORT", IDC_CBX_DEBUG_PORT, 20, 100, 60, 10 + COMBOBOX IDC_DRP_DEBUG_PORT, 80, 100, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&BAUDRATE", IDC_CBX_BAUD_RATE, 20, 115, 50, 10 + COMBOBOX IDC_DRP_DRP_BAUD_RATE, 80, 115, 60, 10, CBS_DROPDOWNLIST | CBS_SORT | WS_CHILD | WS_VISIBLE | WS_TABSTOP + CHECKBOX "/&CHANNEL", IDC_CBX_CHANNEL, 20, 130, 50, 10 + EDITTEXT IDC_TXT_CHANNEL, 80, 130, 60, 12, ES_LEFT + CONTROL "",IDC_SCR_CHANNEL, "msctls_updown32", 0x50000000, 140, 130, 11, 11 + PUSHBUTTON "OK", IDC_OK, 20, 160, 50, 12 + PUSHBUTTON "Anulare", IDC_CANCEL, 100, 160, 50, 12 +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_MSCONFIG "Programul de configurare a sistemului" + IDS_TAB_GENERAL "General" + IDS_TAB_SYSTEM "SYSTEM.INI" + IDS_TAB_FREELDR "FREELDR.INI" + IDS_TAB_SERVICES "Servicii" + IDS_TAB_STARTUP "Pornire" + IDS_TAB_TOOLS "Instrumente" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_COLUMN_SERVICE "Servicii" + IDS_SERVICES_COLUMN_REQ "Necesar" + IDS_SERVICES_COLUMN_VENDOR "Vânzãtor" + IDS_SERVICES_COLUMN_STATUS "Stare" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TOOLS_COLUMN_NAME "Nume" + IDS_TOOLS_COLUMN_DESCR "Descriere" + + IDS_TOOLS_CMD_NAME "Consolã" + IDS_TOOLS_CMD_DESCR "" + IDS_TOOLS_CMD_CMD "cmd.exe" + + IDS_TOOLS_INFO_NAME "Versiune" + IDS_TOOLS_INFO_DESCR "Afiºeazã informaþii despre versiune" + IDS_TOOLS_INFO_CMD "winver.exe" + + IDS_TOOLS_REGEDIT_NAME "Editor de registre" + IDS_TOOLS_REGEDIT_DESCR "Porneºte Registry-Editor." + IDS_TOOLS_REGEDIT_CMD "regedit.exe" + + IDS_TOOLS_SYSDM_NAME "Proprietãþi sistem" + IDS_TOOLS_SYSDM_DESCR "Aratã informaþii despre acest computer" + IDS_TOOLS_SYSDM_CMD "control.exe" + IDS_TOOLS_SYSDM_PARAM "sysdm.cpl" + + IDS_STARTUP_COLUMN_ELEMENT "Element" + IDS_STARTUP_COLUMN_CMD "Comandã" + IDS_STARTUP_COLUMN_PATH "Cale" +END + +STRINGTABLE DISCARDABLE +BEGIN + IDS_SERVICES_STATUS_RUNNING "Ruleazã" + IDS_SERVICES_STATUS_STOPPED "Oprit" + IDS_SERVICES_YES "Da" + IDS_SERVICES_UNKNOWN "Necunoscut" +END Propchange: trunk/reactos/base/applications/msconfig/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/msconfig/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… ============================================================================== --- trunk/reactos/base/applications/msconfig/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/msconfig/rsrc.rc [iso-8859-1] Tue May 19 20:06:10 2009 @@ -25,6 +25,7 @@ #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/th-TH.rc" Added: trunk/reactos/base/applications/paint/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/la… ============================================================================== --- trunk/reactos/base/applications/paint/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/paint/lang/ro-RO.rc [iso-8859-1] Tue May 19 20:06:10 2009 @@ -1,0 +1,193 @@ +/* + * Romanian Language resource file + * Translated by: Petru Dimitriu + */ + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +ID_MENU MENU +BEGIN + POPUP "&Fiºier" + BEGIN + MENUITEM "Nou\tCtrl+N", IDM_FILENEW + MENUITEM "Deschidere...\tCtrl+O", IDM_FILEOPEN + MENUITEM "Salvare\tCtrl+S", IDM_FILESAVE + MENUITEM "Salvare ca...", IDM_FILESAVEAS + MENUITEM SEPARATOR + MENUITEM "Setare ca fundal (în carou)", IDM_FILEASWALLPAPERPLANE + MENUITEM "Setare ca fundal (centrat)", IDM_FILEASWALLPAPERCENTERED + MENUITEM "Setare ca fundal (întins)", IDM_FILEASWALLPAPERSTRETCHED + MENUITEM SEPARATOR + MENUITEM "Ieºire\tAlt+F4", IDM_FILEEXIT + END + + POPUP "&Editare" + BEGIN + MENUITEM "Anulare\tCtrl+Z", IDM_EDITUNDO + MENUITEM "Refacere\tCtrl+Y", IDM_EDITREDO + MENUITEM SEPARATOR + MENUITEM "Decupare\tCtrl+X", IDM_EDITCUT + MENUITEM "Copiere\tCtrl+C", IDM_EDITCOPY + MENUITEM "Lipire\tCtrl+V", IDM_EDITPASTE + MENUITEM "ªtergere selecþie\tDel", IDM_EDITDELETESELECTION + MENUITEM "Inversare selecþie", IDM_EDITINVERTSELECTION + MENUITEM "Selectare totalã\tCtrl+A", IDM_EDITSELECTALL + MENUITEM SEPARATOR + MENUITEM "Copiere în...", IDM_EDITCOPYTO + MENUITEM "Lipire din...", IDM_EDITPASTEFROM + END + + POPUP "&Vizualizare" + BEGIN + MENUITEM "Instrumente\tCtrl+T", IDM_VIEWTOOLBOX, CHECKED + MENUITEM "Paletã de culori\tCtrl+L", IDM_VIEWCOLORPALETTE, CHECKED + MENUITEM "Barã de stare", IDM_VIEWSTATUSBAR, CHECKED + MENUITEM "Barã de instrumente text", IDM_FORMATICONBAR, CHECKED, GRAYED + MENUITEM SEPARATOR + POPUP "Panoramare" + BEGIN + MENUITEM "12,5%", IDM_VIEWZOOM125 + MENUITEM "25%", IDM_VIEWZOOM25 + MENUITEM "50%", IDM_VIEWZOOM50 + MENUITEM "100%", IDM_VIEWZOOM100 + MENUITEM "200%", IDM_VIEWZOOM200 + MENUITEM "400%", IDM_VIEWZOOM400 + MENUITEM "800%", IDM_VIEWZOOM800 + END + MENUITEM "Pe tot ecranul\tCtrl+F", IDM_VIEWFULLSCREEN + END + + POPUP "&Imagine" + BEGIN + MENUITEM "Rotire/Oglindire...\tCtrl+R", IDM_IMAGEROTATEMIRROR + MENUITEM "Redimensionare...\tCtrl+W", IDM_IMAGECHANGESIZE + MENUITEM "Tãiere", IDM_IMAGECROP + MENUITEM "Inversare culori\tCtrl+I", IDM_IMAGEINVERTCOLORS + MENUITEM "Atribute...\tCtrl+E", IDM_IMAGEATTRIBUTES + MENUITEM "ªtergere imagine", IDM_IMAGEDELETEIMAGE + MENUITEM "Desenare opacã", IDM_IMAGEDRAWOPAQUE + END + + POPUP "&Culori" + BEGIN + MENUITEM "Editare paletã...", IDM_COLORSEDITPALETTE + END + + POPUP "&Ajutor" + BEGIN + MENUITEM "Topici de ajutor", IDM_HELPHELPTOPICS + MENUITEM SEPARATOR + MENUITEM "Despre", IDM_HELPINFO + END +END + +ID_ACCELERATORS ACCELERATORS +BEGIN + "^N", IDM_FILENEW + "^O", IDM_FILEOPEN + "^S", IDM_FILESAVE + "^Z", IDM_EDITUNDO + "^Y", IDM_EDITREDO + "^X", IDM_EDITCUT + "^C", IDM_EDITCOPY + "^V", IDM_EDITPASTE + VK_DELETE, IDM_EDITDELETESELECTION, VIRTKEY + "^A", IDM_EDITSELECTALL + "^T", IDM_VIEWTOOLBOX + "^L", IDM_VIEWCOLORPALETTE + "^F", IDM_VIEWFULLSCREEN + "^R", IDM_IMAGEROTATEMIRROR + "^W", IDM_IMAGECHANGESIZE + "^I", IDM_IMAGEINVERTCOLORS + "^E", IDM_IMAGEATTRIBUTES + "N", IDM_IMAGEDELETEIMAGE, CONTROL, SHIFT, VIRTKEY +END + +IDD_MIRRORROTATE DIALOGEX 100, 100, 180, 100 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Rotire ºi oglindire imagine" +BEGIN + GROUPBOX "Rotire sau oglindire", IDD_MIRRORROTATEGROUP, 6, 6, 112, 86 + AUTORADIOBUTTON "Oglindire orizontalã", IDD_MIRRORROTATERB1, 12, 18, 100, 10, WS_GROUP + AUTORADIOBUTTON "Oglindire verticalã", IDD_MIRRORROTATERB2, 12, 30, 100, 10 + AUTORADIOBUTTON "Rotire la un unghi de:", IDD_MIRRORROTATERB3, 12, 42, 100, 10 + AUTORADIOBUTTON "90°", IDD_MIRRORROTATERB4, 42, 54, 50, 10, WS_GROUP | WS_DISABLED + AUTORADIOBUTTON "180°", IDD_MIRRORROTATERB5, 42, 66, 50, 10, WS_DISABLED + AUTORADIOBUTTON "270°", IDD_MIRRORROTATERB6, 42, 78, 50, 10, WS_DISABLED + DEFPUSHBUTTON "OK", IDOK, 125, 8, 48, 14 + PUSHBUTTON "Anulare", IDCANCEL, 125, 24, 48, 14 +END + +IDD_ATTRIBUTES DIALOGEX 100, 100, 210, 120 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Atribute" +BEGIN + EDITTEXT IDD_ATTRIBUTESEDIT1, 40, 40, 35, 12 + EDITTEXT IDD_ATTRIBUTESEDIT2, 110, 40, 35, 12 + LTEXT "Lãþime:", IDD_ATTRIBUTESTEXT1, 10, 40, 30, 10 + LTEXT "Înãlþime:", IDD_ATTRIBUTESTEXT2, 80, 40, 30, 10 + LTEXT "Datã:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10 + LTEXT "Mãrime:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10 + LTEXT "Rezoluþie:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10 + LTEXT "Indisponibil", IDD_ATTRIBUTESTEXT6, 70, 5, 60, 10 + LTEXT "Indisponibil", IDD_ATTRIBUTESTEXT7, 70, 15, 60, 10 + LTEXT "Indisponibil", IDD_ATTRIBUTESTEXT8, 70, 25, 60, 10 + GROUPBOX "Unitate", IDD_ATTRIBUTESGROUP1, 6, 57, 139, 27 + AUTORADIOBUTTON "Þoli", IDD_ATTRIBUTESRB1, 12, 69, 35, 10, WS_GROUP + AUTORADIOBUTTON "cm", IDD_ATTRIBUTESRB2, 52, 69, 35, 10 + AUTORADIOBUTTON "Pixeli", IDD_ATTRIBUTESRB3, 92, 69, 35, 10 + GROUPBOX "Culori", IDD_ATTRIBUTESGROUP2, 6, 88, 139, 27 + AUTORADIOBUTTON "Alb ºi negru", IDD_ATTRIBUTESRB4, 12, 100, 70, 10, WS_GROUP + AUTORADIOBUTTON "Color", IDD_ATTRIBUTESRB5, 92, 100, 35, 10 + DEFPUSHBUTTON "OK", IDOK, 155, 8, 48, 14 + PUSHBUTTON "Anulare", IDCANCEL, 155, 24, 48, 14 + PUSHBUTTON "Standard", IDD_ATTRIBUTESSTANDARD, 155, 40, 48, 14 +END + +IDD_CHANGESIZE DIALOGEX 100, 100, 210, 80 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Schimbare dimensiune" +BEGIN + GROUPBOX "Schimbare dimensiune", IDD_CHANGESIZEGROUP, 6, 6, 142, 66 + ICON IDI_HORZSTRETCH, IDD_CHANGESIZEICON1, 12, 18 + LTEXT "Orizontal:", IDD_CHANGESIZETEXT1, 45, 24, 40, 10 + EDITTEXT IDD_CHANGESIZEEDIT1, 90, 23, 32, 12 + LTEXT "%", IDD_CHANGESIZETEXT2, 125, 24, 15, 10 + ICON IDI_VERTSTRETCH, IDD_CHANGESIZEICON2, 12, 43 + LTEXT "Vertical:", IDD_CHANGESIZETEXT3, 45, 49, 40, 10 + EDITTEXT IDD_CHANGESIZEEDIT2, 90, 48, 32, 12 + LTEXT "%", IDD_CHANGESIZETEXT4, 125, 49, 15, 10 + DEFPUSHBUTTON "OK", IDOK, 155, 8, 48, 14 + PUSHBUTTON "Anulare", IDCANCEL, 155, 24, 48, 14 +END + +STRINGTABLE +BEGIN + IDS_PROGRAMNAME, "Paint" + IDS_WINDOWTITLE, "%s - Paint" + IDS_INFOTITLE, "Paint pentru ReactOS" + IDS_INFOTEXT, "Paint for ReactOS este disponibil sub licenþa GNU Lesser General Public versiunea 3 (vedeþi www.gnu.org)" + IDS_SAVEPROMPTTEXT, "Vreþi sã salvaþi schimbãrile la %s?" + IDS_DEFAULTFILENAME, "FãrãNume.bmp" + IDS_TOOLTIP1, "Golire selecþie" + IDS_TOOLTIP2, "Selecþie" + IDS_TOOLTIP3, "Radierã" + IDS_TOOLTIP4, "Umplere cu culoare" + IDS_TOOLTIP5, "Selectare culoare" + IDS_TOOLTIP6, "Panoramare" + IDS_TOOLTIP7, "Creion" + IDS_TOOLTIP8, "Pensulã" + IDS_TOOLTIP9, "Pulverizator" + IDS_TOOLTIP10, "Text" + IDS_TOOLTIP11, "Linie" + IDS_TOOLTIP12, "Curbã bezier" + IDS_TOOLTIP13, "Dreptunghi" + IDS_TOOLTIP14, "Poligon" + IDS_TOOLTIP15, "Oval" + IDS_TOOLTIP16, "Dreptunghi rotunjit" + IDS_OPENFILTER, "Fiºiere bitmap (*.bmp;*.dib)\1*.bmp;*.dib\1All files (*.*)\1*.*\1" + IDS_SAVEFILTER, "Bitmap pe 24 biþi (*.bmp;*.dib)\1*.bmp;*.dib\1" +END Propchange: trunk/reactos/base/applications/paint/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/paint/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/paint/rs… ============================================================================== --- trunk/reactos/base/applications/paint/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/paint/rsrc.rc [iso-8859-1] Tue May 19 20:06:10 2009 @@ -18,16 +18,17 @@ #include "lang/en-GB.rc" #include "lang/en-US.rc" #include "lang/es-ES.rc" -#include "lang/no-NO.rc" #include "lang/fr-FR.rc" #include "lang/it-IT.rc" +#include "lang/nl-NL.rc" +#include "lang/no-NO.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" #include "lang/pt-PT.rc" -#include "lang/nl-NL.rc" // cp 1250 languages +#include "lang/cs-CZ.rc" +#include "lang/ro-RO.rc" #include "lang/sk-SK.rc" -#include "lang/cs-CZ.rc" // cp 1251 languages #include "lang/ru-RU.rc" #include "lang/uk-UA.rc" Added: trunk/reactos/base/applications/screensavers/logon/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/screensavers/logon/lang/ro-RO.rc [iso-8859-1] Tue May 19 20:06:10 2009 @@ -1,0 +1,7 @@ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +STRINGTABLE DISCARDABLE +BEGIN + IDS_DESCRIPTION "Economizor Siglã" + IDS_TEXT "Acest economizor nu are opþiuni." +END Propchange: trunk/reactos/base/applications/screensavers/logon/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/screensavers/logon/logon.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… ============================================================================== --- trunk/reactos/base/applications/screensavers/logon/logon.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/screensavers/logon/logon.rc [iso-8859-1] Tue May 19 20:06:10 2009 @@ -24,6 +24,7 @@ #include "lang/lt-LT.rc" #include "lang/nl-NL.rc" #include "lang/no-NO.rc" +#include "lang/ro-RO.rc" #include "lang/sk-SK.rc" #include "lang/uk-UA.rc" #include "lang/ru-RU.rc" Added: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc (added) +++ trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc [iso-8859-1] Tue May 19 20:06:10 2009 @@ -1,0 +1,682 @@ +///////////////////////////////////////////////////////////////////////////// +// Romanian resources + +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +///////////////////////////////////////////////////////////////////////////// +// +// Menu +// + +IDR_TASKMANAGER MENU DISCARDABLE +BEGIN + POPUP "&Fiºier" + BEGIN + MENUITEM "&Program nou (Executare...)", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "I&eºire", ID_FILE_EXIT + END + POPUP "&Opþiuni" + BEGIN + MENUITEM "&Mereu deasupra", ID_OPTIONS_ALWAYSONTOP + , CHECKED + MENUITEM "&Minimizare când se face Salt", ID_OPTIONS_MINIMIZEONUSE + , CHECKED + MENUITEM "&Ascundere la minimizare", ID_OPTIONS_HIDEWHENMINIMIZED + , CHECKED + MENUITEM "&Afiºare programe pe 16 biþi", ID_OPTIONS_SHOW16BITTASKS + , CHECKED + END + POPUP "&Vizualizare" + BEGIN + MENUITEM "&Reîmprospãtare", ID_VIEW_REFRESH + POPUP "&Vitezã de reîmprospãtare" + BEGIN + MENUITEM "&Ridicatã", ID_VIEW_UPDATESPEED_HIGH + MENUITEM "&Normalã", ID_VIEW_UPDATESPEED_NORMAL + , CHECKED + MENUITEM "&Micã", ID_VIEW_UPDATESPEED_LOW + MENUITEM "&Stagnantã", ID_VIEW_UPDATESPEED_PAUSED + + END + MENUITEM SEPARATOR + MENUITEM "Pictograme mari", ID_VIEW_LARGE + MENUITEM "Pictograme mici", ID_VIEW_SMALL + MENUITEM "&Detalii", ID_VIEW_DETAILS, CHECKED + MENUITEM "&Selectare coloane...", ID_VIEW_SELECTCOLUMNS + POPUP "&Istoric procesor" + BEGIN + MENUITEM "&Un grafic pentru toate procesoarele", ID_VIEW_CPUHISTORY_ONEGRAPHALL + + MENUITEM "Câte un grafic pentru fiecare procesor", ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU + , CHECKED + END + MENUITEM "&Afiºare timpi kernel", ID_VIEW_SHOWKERNELTIMES + END + POPUP "&Ferestre" + BEGIN + MENUITEM "Aranjare orizontalã", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Aranjare verticalã", ID_WINDOWS_TILEVERTICALLY + MENUITEM "&Minimizare", ID_WINDOWS_MINIMIZE + MENUITEM "Ma&ximizare", ID_WINDOWS_MAXIMIZE + MENUITEM "&În cascadã", ID_WINDOWS_CASCADE + MENUITEM "&Aducere în prim plan", ID_WINDOWS_BRINGTOFRONT + END + POPUP "&Ajutor" + BEGIN + MENUITEM "Topici de ajutor", ID_HELP_TOPICS + MENUITEM SEPARATOR + MENUITEM "&Despre Gestionarul de Activitãþi", ID_HELP_ABOUT + END +END + +IDR_WINDOWSMENU MENU DISCARDABLE +BEGIN + MENUITEM "Aranjare orizontalã", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Aranjare verticalã", ID_WINDOWS_TILEVERTICALLY + MENUITEM "&Minimizare", ID_WINDOWS_MINIMIZE + MENUITEM "Ma&ximizare", ID_WINDOWS_MAXIMIZE + MENUITEM "&În cascadã", ID_WINDOWS_CASCADE + MENUITEM "&Aducere în prim plan", ID_WINDOWS_BRINGTOFRONT +END + +IDR_APPLICATION_PAGE_CONTEXT1 MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Program nou (Executare...)", ID_FILE_NEW + MENUITEM SEPARATOR + MENUITEM "Pictograme mari", ID_VIEW_LARGE + MENUITEM "Pictograme mici", ID_VIEW_SMALL + MENUITEM "&Detalii", ID_VIEW_DETAILS, CHECKED + END +END + +IDR_APPLICATION_PAGE_CONTEXT2 MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Salt la", ID_APPLICATION_PAGE_SWITCHTO + MENUITEM "&Aducere în prin plan", ID_WINDOWS_BRINGTOFRONT + MENUITEM SEPARATOR + MENUITEM "Aranjare orizontalã", ID_WINDOWS_TILEHORIZONTALLY + MENUITEM "Aranjare verticalã", ID_WINDOWS_TILEVERTICALLY + MENUITEM "&Minimizare", ID_WINDOWS_MINIMIZE + MENUITEM "Ma&ximizare", ID_WINDOWS_MAXIMIZE + MENUITEM "&În cascadã", ID_WINDOWS_CASCADE + MENUITEM SEPARATOR + MENUITEM "&Oprire program", ID_APPLICATION_PAGE_ENDTASK + MENUITEM "&Indicare proces", ID_APPLICATION_PAGE_GOTOPROCESS + + END +END + +IDR_TRAY_POPUP MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Restabilire", ID_RESTORE + MENUITEM "&Închidere", ID_FILE_EXIT + MENUITEM SEPARATOR + MENUITEM "&Mereu deasupra", ID_OPTIONS_ALWAYSONTOP + END +END + +IDR_PROCESS_PAGE_CONTEXT MENU DISCARDABLE +BEGIN + POPUP "DUMMY" + BEGIN + MENUITEM "&Oprire proces", ID_PROCESS_PAGE_ENDPROCESS + MENUITEM "Oprire a&rbore proces", ID_PROCESS_PAGE_ENDPROCESSTREE + + MENUITEM "&Depanare", ID_PROCESS_PAGE_DEBUG + MENUITEM SEPARATOR + POPUP "Setare &prioritate" + BEGIN + MENUITEM "&Timp real", ID_PROCESS_PAGE_SETPRIORITY_REALTIME + + MENUITEM "&Mare", ID_PROCESS_PAGE_SETPRIORITY_HIGH + + MENUITEM "&NormalãSpreMare", ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL + + MENUITEM "&Normalã", ID_PROCESS_PAGE_SETPRIORITY_NORMAL + + MENUITEM "&NormalãSpreMicã", ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL + + MENUITEM "&Micã", ID_PROCESS_PAGE_SETPRIORITY_LOW + + END + MENUITEM "Setare &afinitate", ID_PROCESS_PAGE_SETAFFINITY + MENUITEM "Edit Debug &Channels...", ID_PROCESS_PAGE_DEBUGCHANNELS + END +END + + +///////////////////////////////////////////////////////////////////////////// +// +// Dialog +// + +IDD_ABOUTBOX DIALOGEX DISCARDABLE 22, 17, 259, 210 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Despre Gestionarul de activitãþi" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Gestionar de activitãþi v1.0\nDrept de autor (C) 1999 - 2001\nde Brian Palmer (brianp(a)reactos.org)\ntradus de Dimitriu Petru", + IDC_STATIC,"Static",SS_LEFTNOWORDWRAP | WS_GROUP,53,28, + 122,26 + DEFPUSHBUTTON "OK",IDOK,183,189,44,14,WS_GROUP + ICON IDI_TASKMANAGER,IDC_STATIC,19,30,20,20 + EDITTEXT IDC_LICENSE_EDIT,53,63,174,107,ES_MULTILINE | + ES_READONLY | WS_VSCROLL +END + +IDD_TASKMGR_DIALOG DIALOGEX DISCARDABLE 0, 0, 264, 246 +STYLE DS_SHELLFONT | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | + WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | + WS_THICKFRAME +CAPTION "Gestionarul de activitãþi ReactOS" +MENU IDR_TASKMANAGER +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Tab1",IDC_TAB,"SysTabControl32",WS_TABSTOP,3,3,257,228 +END + +IDD_APPLICATION_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",IDC_APPLIST,"SysListView32",LVS_REPORT | + LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP,7,7,233,177 + PUSHBUTTON "&Program nou",IDC_NEWTASK,187,189,53,14 + PUSHBUTTON "&Salt la",IDC_SWITCHTO,131,189,53,14,WS_DISABLED + PUSHBUTTON "&Încheiere execuþie",IDC_ENDTASK,75,189,53,14,WS_DISABLED +END + +IDD_PROCESS_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",IDC_PROCESSLIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_OWNERDATA | + WS_BORDER | WS_TABSTOP,7,7,233,177 + PUSHBUTTON "&Oprire proces",IDC_ENDPROCESS,171,189,69,14 + CONTROL "&Afiºare procese de la toþi utilizatorii",IDC_SHOWALLPROCESSES, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,191,111,10 +END + +//IDD_PERFORMANCE_PAGE DIALOGEX 0, 0, 247, 210 +IDD_PERFORMANCE_PAGE DIALOGEX DISCARDABLE 0, 0, 247, 210 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPCHILDREN +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Uz proc.",IDC_CPU_USAGE_FRAME,5,5,60,54,WS_TABSTOP, WS_EX_TRANSPARENT + GROUPBOX "Uz mem.",IDC_MEM_USAGE_FRAME,5,63,60,54,BS_LEFTTEXT, WS_EX_TRANSPARENT + GROUPBOX "Total",IDC_TOTALS_FRAME,5,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Lucru (K)",IDC_COMMIT_CHARGE_FRAME,5,166,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Memorie fizicã(K)",IDC_PHYSICAL_MEMORY_FRAME,131,122,111,39,0,WS_EX_TRANSPARENT + GROUPBOX "Memorie kernel (K)",IDC_KERNEL_MEMORY_FRAME,131,166,111,39,0,WS_EX_TRANSPARENT + LTEXT "Handles",IDS_TOTALS_HANDLE_COUNT,12,131,27,8 + LTEXT "Threads",IDS_TOTALS_THREAD_COUNT,12,140,27,8 + LTEXT "Procese",IDS_TOTALS_PROCESS_COUNT,12,149,34,8 + EDITTEXT IDC_TOTALS_HANDLE_COUNT,65,131,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_TOTALS_THREAD_COUNT,65,140,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_TOTALS_PROCESS_COUNT,65,149,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + LTEXT "Total",IDS_COMMIT_CHARGE_TOTAL,12,175,27,8 + LTEXT "Limitã",IDS_COMMIT_CHARGE_LIMIT,12,184,15,8 + LTEXT "Vârf",IDS_COMMIT_CHARGE_PEAK,12,193,34,8 + EDITTEXT IDC_COMMIT_CHARGE_TOTAL,65,174,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_COMMIT_CHARGE_LIMIT,65,184,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_COMMIT_CHARGE_PEAK,65,193,45,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + LTEXT "Total",IDS_PHYSICAL_MEMORY_TOTAL,137,131,27,8 + LTEXT "Disponbil",IDS_PHYSICAL_MEMORY_AVAILABLE,137,140,30,8 + LTEXT "Memorie tampon",IDS_PHYSICAL_MEMORY_SYSTEM_CACHE,137,149,46,8 + EDITTEXT IDC_PHYSICAL_MEMORY_TOTAL,185,131,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_PHYSICAL_MEMORY_AVAILABLE,185,140,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_PHYSICAL_MEMORY_SYSTEM_CACHE,185,149,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + LTEXT "Totalã",IDS_KERNEL_MEMORY_TOTAL,137,174,27,8 + LTEXT "Paged",IDS_KERNEL_MEMORY_PAGED,137,184,21,8 + LTEXT "Nonpaged",IDS_KERNEL_MEMORY_NONPAGED,137,193,34,8 + EDITTEXT IDC_KERNEL_MEMORY_TOTAL,185,174,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_KERNEL_MEMORY_PAGED,185,184,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + EDITTEXT IDC_KERNEL_MEMORY_NONPAGED,185,193,48,8,ES_RIGHT | + ES_READONLY | ES_NUMBER | NOT WS_BORDER + GROUPBOX "Istoric uz procesor",IDC_CPU_USAGE_HISTORY_FRAME,74,5,168,54,0,WS_EX_TRANSPARENT + GROUPBOX "Istoric uz memorie",IDC_MEMORY_USAGE_HISTORY_FRAME,74,63,168,54,0,WS_EX_TRANSPARENT + PUSHBUTTON "Afiºaj uz procesor",IDC_CPU_USAGE_GRAPH,12,17,47,37,0, + WS_EX_CLIENTEDGE + PUSHBUTTON "Afiºaj uz memorie",IDC_MEM_USAGE_GRAPH,12,75,47,37,0, + WS_EX_CLIENTEDGE + PUSHBUTTON "Istoric uz procesor",IDC_CPU_USAGE_HISTORY_GRAPH,81,17, + 153,37,0,WS_EX_CLIENTEDGE + PUSHBUTTON "Istoric uz memorie",IDC_MEM_USAGE_HISTORY_GRAPH,81,75, + 153,37,0,WS_EX_CLIENTEDGE +END + +IDD_DEBUG_CHANNELS_DIALOG DIALOGEX DISCARDABLE 0, 0, 247, 210 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Canale de depanare" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "List2",IDC_DEBUG_CHANNELS_LIST,"SysListView32",LVS_REPORT | + LVS_SINGLESEL | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP | + LVS_SORTASCENDING,7,7,233,177 + PUSHBUTTON "Închidere",IDOK,171,189,69,14 +END + +IDD_AFFINITY_DIALOG DIALOGEX DISCARDABLE 0, 0, 231, 154 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Afinitate procesor" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,120,133,50,14 + PUSHBUTTON "Anulare",IDCANCEL,174,133,50,14 + LTEXT "Aceastã setare controleazã repartiþia calculelor efectuate de fiecare procesor în parte.", + IDC_STATIC,5,5,220,16 + CONTROL "CPU 0",IDC_CPU0,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, + 11,28,37,10 + CONTROL "CPU 1",IDC_CPU1,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,41,37,10 + CONTROL "CPU 2",IDC_CPU2,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,54,37,10 + CONTROL "CPU 3",IDC_CPU3,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,67,37,10 + CONTROL "CPU 4",IDC_CPU4,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,80,37,10 + CONTROL "CPU 5",IDC_CPU5,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,93,37,10 + CONTROL "CPU 6",IDC_CPU6,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,106,37,10 + CONTROL "CPU 7",IDC_CPU7,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,11,119,37,10 + CONTROL "CPU 8",IDC_CPU8,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,61,28,37,10 + CONTROL "CPU 9",IDC_CPU9,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,61,41,37,10 + CONTROL "CPU 10",IDC_CPU10,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,54,41,10 + CONTROL "CPU 11",IDC_CPU11,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,67,41,10 + CONTROL "CPU 12",IDC_CPU12,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,80,41,10 + CONTROL "CPU 13",IDC_CPU13,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,93,41,10 + CONTROL "CPU 14",IDC_CPU14,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,106,41,10 + CONTROL "CPU 15",IDC_CPU15,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,61,119,41,10 + CONTROL "CPU 16",IDC_CPU16,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,28,41,10 + CONTROL "CPU 17",IDC_CPU17,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,41,41,10 + CONTROL "CPU 18",IDC_CPU18,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,54,41,10 + CONTROL "CPU 19",IDC_CPU19,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,67,41,10 + CONTROL "CPU 20",IDC_CPU20,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,80,41,10 + CONTROL "CPU 21",IDC_CPU21,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,93,41,10 + CONTROL "CPU 22",IDC_CPU22,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,106,41,10 + CONTROL "CPU 23",IDC_CPU23,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,116,119,41,10 + CONTROL "CPU 24",IDC_CPU24,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,28,41,10 + CONTROL "CPU 25",IDC_CPU25,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,41,41,10 + CONTROL "CPU 26",IDC_CPU26,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,54,41,10 + CONTROL "CPU 27",IDC_CPU27,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,67,41,10 + CONTROL "CPU 28",IDC_CPU28,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,80,41,10 + CONTROL "CPU 29",IDC_CPU29,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,93,41,10 + CONTROL "CPU 30",IDC_CPU30,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,106,41,10 + CONTROL "CPU 31",IDC_CPU31,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,175,119,41,10 +END + +IDD_COLUMNS_DIALOG DIALOGEX DISCARDABLE 0, 0, 195, 199 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Alegeþi coloanele" +FONT 8, "MS Shell Dlg" +BEGIN + DEFPUSHBUTTON "OK",IDOK,84,178,50,14 + PUSHBUTTON "Anulare",IDCANCEL,138,178,50,14 + LTEXT "Alegeþi coloanele care vor apãrea în fila Procese din Gestionarul de activitãþi.", + IDC_STATIC,7,7,181,17 + CONTROL "&Nume imagine",IDC_IMAGENAME,"Button",BS_AUTOCHECKBOX | + WS_DISABLED | WS_TABSTOP,7,28,56,10 + CONTROL "&PID (Identificator proces)",IDC_PID,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,39,88,10 + CONTROL "&Uz procesor",IDC_CPUUSAGE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,50,53,10 + CONTROL "T&imp procesor",IDC_CPUTIME,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,61,48,10 + CONTROL "&Uz memorie",IDC_MEMORYUSAGE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,72,63,10 + CONTROL "&Delta uz memorie",IDC_MEMORYUSAGEDELTA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,83,82,10 + CONTROL "V&ârf uz memorie",IDC_PEAKMEMORYUSAGE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,94,82,10 + CONTROL "&Greºeli paginare",IDC_PAGEFAULTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,105,53,10 + CONTROL "&Obiecte USER",IDC_USEROBJECTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,116,62,10 + CONTROL "Citiri I/O",IDC_IOREADS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,127,49,10 + CONTROL "Octeþi citiri I/O",IDC_IOREADBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,7,138,65,10 + CONTROL "&ID sesiune",IDC_SESSIONID,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,149,50,10 + CONTROL "Nume utilizator",IDC_USERNAME,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,7,160,51,10 + CONTROL "Delta g&reºeli paginare",IDC_PAGEFAULTSDELTA,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,28,72,10 + CONTROL "&Mãrime memorie virtualã",IDC_VIRTUALMEMORYSIZE,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,39,77,10 + CONTROL "Pool paginat",IDC_PAGEDPOOL,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,50,53,10 + CONTROL "Pool nepaginat",IDC_NONPAGEDPOOL,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,61,67,10 + CONTROL "Prioritate de bazã",IDC_BASEPRIORITY,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,72,55,10 + CONTROL "&Numãr handle-uri",IDC_HANDLECOUNT,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,83,59,10 + CONTROL "&Numãr subprocese",IDC_THREADCOUNT,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,94,59,10 + CONTROL "Obiecte GDI",IDC_GDIOBJECTS,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,105,55,10 + CONTROL "Scrieri I/O",IDC_IOWRITES,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,116,49,10 + CONTROL "Octeþi scrieri I/O",IDC_IOWRITEBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,127,65,10 + CONTROL "Altele I/O",IDC_IOOTHER,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,107,138,46,10 + CONTROL "Octeþi alte I/O",IDC_IOOTHERBYTES,"Button", + BS_AUTOCHECKBOX | WS_TABSTOP,107,149,65,10 +END + + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""windows.h""\r\n" + "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" + "#include ""resource.h""\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// DESIGNINFO +// + +#ifdef APSTUDIO_INVOKED +GUIDELINES DESIGNINFO DISCARDABLE +BEGIN + IDD_ABOUTBOX, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 252 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_TASKMGR_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 3 + RIGHTMARGIN, 260 + TOPMARGIN, 3 + BOTTOMMARGIN, 231 + END + + IDD_APPLICATION_PAGE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 240 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_PROCESS_PAGE, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 240 + TOPMARGIN, 7 + BOTTOMMARGIN, 203 + END + + IDD_PERFORMANCE_PAGE, DIALOG + BEGIN + LEFTMARGIN, 5 + RIGHTMARGIN, 242 + VERTGUIDE, 12 + VERTGUIDE, 65 + VERTGUIDE, 110 + TOPMARGIN, 5 + BOTTOMMARGIN, 205 + END + + IDD_AFFINITY_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 224 + VERTGUIDE, 11 + VERTGUIDE, 61 + VERTGUIDE, 116 + VERTGUIDE, 175 + TOPMARGIN, 7 + BOTTOMMARGIN, 147 + HORZGUIDE, 28 + HORZGUIDE, 38 + HORZGUIDE, 51 + HORZGUIDE, 64 + HORZGUIDE, 77 + HORZGUIDE, 90 + HORZGUIDE, 103 + HORZGUIDE, 116 + HORZGUIDE, 129 + END + + IDD_COLUMNS_DIALOG, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 188 + VERTGUIDE, 107 + TOPMARGIN, 7 + BOTTOMMARGIN, 192 + HORZGUIDE, 28 + END +END +#endif // APSTUDIO_INVOKED + +///////////////////////////////////////////////////////////////////////////// +// +// String Table +// + +STRINGTABLE DISCARDABLE +BEGIN + IDS_APP_TITLE "Gestionar de activitãþi" + IDC_TASKMGR "Gestoinar de activitãþi" + IDS_IDLE_PROCESS "Proces sistem inactiv" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_FILE_NEW "Porneºte un nou program" + ID_OPTIONS_ALWAYSONTOP "Gestionarul rãmâne deasupra celorlaltor ferestre pânã când e minimizat." + ID_OPTIONS_MINIMIZEONUSE + "Gestionarul se minimizeazã automat când se face un salt la o aplicaþie." + ID_OPTIONS_HIDEWHENMINIMIZED "Ascunde permanent Gestionarul când acesta se minimizeazã." + ID_VIEW_REFRESH "Forþeazã Gestionarul sã se actualizeze acum, indiferent de setãrile de vitezã." + ID_VIEW_LARGE "Afiºeazã aplicaþii folosind pictograme mari" + ID_VIEW_SMALL "Afiºeazã aplicaþii folosind pictograme mici" + ID_VIEW_DETAILS "Afiºeazã informaþii despre fiecare aplicaþie" + ID_VIEW_UPDATESPEED_HIGH "Actualizeazã fereastra de douã ori pe secundã" + ID_VIEW_UPDATESPEED_NORMAL "Actualizeazã fereastra o datã la douã secunde" + ID_VIEW_UPDATESPEED_LOW "Actualizeazã fereastra o datã la patru secunde" +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_VIEW_UPDATESPEED_PAUSED "Nu actualizeazã automat" + ID_WINDOWS_TILEHORIZONTALLY + "Aranjeazã ferestrele orizontal pe ecran" + ID_WINDOWS_TILEVERTICALLY "Aranjeazã ferestrele vertical pe ecran" + ID_WINDOWS_MINIMIZE "Minimizazã ferestrele" + ID_WINDOWS_MAXIMIZE "Maximizeazã ferestrele" + ID_WINDOWS_CASCADE "Aranjeazã ferestrele astfel încât barele de titlu sunt în cascadã" + ID_WINDOWS_BRINGTOFRONT "Aduce fereastra în prin plan, fãrã a o activa" + ID_HELP_TOPICS "Afiºeazã topicile de ajutor ale Gestionarului" + ID_HELP_ABOUT "Afiºeazã informaþii despre program, versiune ºi drepturi de autor." + ID_FILE_EXIT "Închide Gestionarul de aplicaþii" + ID_OPTIONS_SHOW16BITTASKS + "Afiºeazã aplicaþiile pe 16 biþi care ruleazã sub mediul ntvdm.exe" + ID_VIEW_SELECTCOLUMNS "Vã permite sã selectaþi coloanele ce vor fi afiºate în fila Procese" + ID_VIEW_SHOWKERNELTIMES "Afiºeazã timpi kernel în graficele de performanþã" + ID_VIEW_CPUHISTORY_ONEGRAPHALL + "Foloseºte un singur grafic pentru toate procesoarele" + ID_VIEW_CPUHISTORY_ONEGRAPHPERCPU "Foloseºte câte un grafic pentru fiecare procesor" + ID_APPLICATION_PAGE_SWITCHTO + "Aduce o fereastra unei aplicaþii în prin plan, activând-o." +END + +STRINGTABLE DISCARDABLE +BEGIN + ID_ENDTASK "Anunþã aplicaþia sã sã se închidã." + ID_GOTOPROCESS "Aratã procesul aplicaþiei selectate." + ID_RESTORE "Restabileºte Gestionarul din starea ascunsã." + ID_PROCESS_PAGE_ENDPROCESS "Eliminã procesul din sistem." + ID_PROCESS_PAGE_ENDPROCESSTREE + "Eliminã procesul ºi toate procesele pornite de acesta." + ID_PROCESS_PAGE_DEBUG "Ataºeazã aplicaþia de deparare de acest proces." + ID_PROCESS_PAGE_SETAFFINITY + "Controleazã pe ce procesoare va putea rula acest proces." + ID_PROCESS_PAGE_SETPRIORITY_REALTIME + "Seteazã prioritatea" + ID_PROCESS_PAGE_SETPRIORITY_HIGH "Seteazã prioritatea" + ID_PROCESS_PAGE_SETPRIORITY_ABOVENORMAL + "Seteazã prioritatea" + ID_PROCESS_PAGE_SETPRIORITY_NORMAL + "Seteazã prioritatea" + ID_PROCESS_PAGE_SETPRIORITY_BELOWNORMAL + "Seteazã prioritatea" + ID_PROCESS_PAGE_SETPRIORITY_LOW "Seteazã prioritatea" + IDS_LICENSE "Tradus în limba românã de Petru Dimitriu.\r\nAcest program este software liber; puteþi redistribui sau modifica programul sub termenii licenþei publice GNU aºa cum este publicatã de Free Software Foundation - fie versiunea 2 a licenþei, sau (la alegerea dvs.) oricare versiune ulterioarã.\r\n\r\nAcest program este distribuit în speranþa cã va fi de folos, dar FÃRÃ NICIO GARANÞIE, nici mãcar garanþia VANDABILITÃÞII sau a POTRIVIRII PENTRU UN SCOP ANUME. Vedeþi Licenþa GNU GPL pentru detalii.\r\n\r\nDvs. ar trebui sã fi primit o copie a licenþei împreunã cu acest program; dacã nu, scrieþi la Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA." +END + + +STRINGTABLE DISCARDABLE +BEGIN + IDS_TAB_APPS "Aplicaþii" + IDS_TAB_PROCESSES "Procese" + IDS_TAB_PERFORMANCE "Performanþã" + IDS_TAB_TASK "Aplicaþie" + IDS_TAB_STATUS "Staare" + IDS_TAB_IMAGENAME "Nume imagine" + IDS_TAB_PID "PID" + IDS_TAB_USERNAME "Nume utilizator" + IDS_TAB_SESSIONID "ID sesiune" + IDS_TAB_CPU "CPU" + IDS_TAB_CPUTIME "Timp CPU" + IDS_TAB_MEMUSAGE "Uz mem" + IDS_TAB_PEAKMEMUSAGE "Vârf uz mem" + IDS_TAB_MEMDELTA "Delta mem" + IDS_TAB_PAGEFAULT "PF" + IDS_TAB_PFDELTA "Delta PF" + IDS_TAB_VMSIZE "Mãrime VM" + IDS_TAB_PAGEDPOOL "Pool paginat" + IDS_TAB_NPPOOL "Pool nepaginat" + IDS_TAB_BASEPRI "Prioritate" + IDS_TAB_HANDLES "Handles" + IDS_TAB_THREADS "Threads" + IDS_TAB_USERPBJECTS "Obiecte USER" + IDS_TAB_GDIOBJECTS "Obiect GDI" + IDS_TAB_IOREADS "Citiri I/O" + IDS_TAB_IOWRITES "Scrieri I/O" + IDS_TAB_IOOTHER "Alte I/O" + IDS_TAB_IOREADBYTES "Octeþi I/O citiþi" + IDS_TAB_IOWRITESBYTES "Octeþi I/O scriºi" + IDS_TAB_IOOTHERBYTES "Octeþi I/O (altele)" + IDS_MENU_SELECTCOLUMNS "&Alegere coloane..." + IDS_MENU_16BITTASK "&Afiºare aplicaþii 16-biþi" + IDS_MENU_WINDOWS "&Ferestre" + IDS_MENU_LARGEICONS "Pictograme mari" + IDS_MENU_SMALLICONS "Pictograme mici" + IDS_MENU_DETAILS "&Detalii" + IDS_MENU_ONEGRAPHALLCPUS "&Un grafic pt toate procesoarele" + IDS_MENU_ONEGRAPHPERCPU "Un grafic pe procesor" + IDS_MENU_CPUHISTORY "&Istoric CPU" + IDS_MENU_SHOWKERNELTIMES "&Afiºare timpi kernel" + IDS_CREATENEWTASK "Creare activitate nouã" + IDS_CREATENEWTASK_DESC "Scrieþi numele unui program, dosar, document sau paginã de web iar Gestionarul o va deschide imediat." + IDS_MSG_ACCESSPROCESSAFF "Nu se poate seta sau accesa afinitatea." + IDS_MSG_PROCESSONEPRO "Procesul trebuie sã aibã o afinitate de cel puþin un procesor." + IDS_MSG_INVALIDOPTION "Opþiune invalidã" + IDS_MSG_UNABLEDEBUGPROCESS "Nu se poate depana procesul" + IDS_MSG_WARNINGDEBUG "AVERTISMENT: Procesul de depanare poate duce la pierderi de date.\nSigur vreþi sã ataºaþi aplicaþia de depanare?" + IDS_MSG_TASKMGRWARNING "Avertisemnt Gestionar de Activitãþi" + IDS_MSG_WARNINGTERMINATING "AVERTISMENT: Oprirea forþatã a unui proces poate duce la pierderi\nde date sau la instabilitatea sistemului. \nProcesului nu îi va fi permis sã îºi salveze starea\nsau datele înainte sã fie oprit. Sigur vreþi sã \ndistrugeþi procesul?" + IDS_MSG_UNABLETERMINATEPRO "Nu se poate opri procesul" + IDS_MSG_UNABLECHANGEPRIORITY "Nu se poate schimba prioritatea" + IDS_MSG_WARNINGCHANGEPRIORITY "AVERTISMENT: Schimbarea prioritãþii poate duce la efecte precum\ninstabilitatea sistemului. Sigur\n vreþi sã schimbaþi prioritatea procesului?" + IDS_MSG_TRAYICONCPUUSAGE "Uz procesor: %d%%" + IDS_STATUS_MEMUSAGE "Uz mem: %dK / %dK" + IDS_STATUS_CPUUSAGE "Uz CPU: %3d%%" + IDS_STATUS_PROCESSES "Procese: %d" + IDS_Not_Responding "Nu Rãspunde" + IDS_Running "Ruleazã" +END + + +#endif // Romanian resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + Propchange: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/taskmgr/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… ============================================================================== --- trunk/reactos/base/applications/taskmgr/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/taskmgr/rsrc.rc [iso-8859-1] Tue May 19 20:06:10 2009 @@ -20,6 +20,7 @@ #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" #include "lang/pt-BR.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sk-SK.rc" #include "lang/sv-SE.rc" Added: trunk/reactos/base/system/winlogon/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… ============================================================================== --- trunk/reactos/base/system/winlogon/lang/ro-RO.rc (added) +++ trunk/reactos/base/system/winlogon/lang/ro-RO.rc [iso-8859-1] Tue May 19 20:06:10 2009 @@ -1,0 +1,45 @@ +LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL + +IDD_SHUTDOWNCOMPUTER DIALOGEX 45, 22, 164, 52 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Oprire computer" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Acum puteþi închide computerul în siguranþã.", IDC_SHUTDOWNCOMPUTER, 31, 13, 132, 8 + ICON IDI_WINLOGON, IDC_SHTDOWNICON, 6, 7, 18, 20 + DEFPUSHBUTTON "&Repornire", IDC_BTNSHTDOWNCOMPUTER, 62, 32, 40, 14 +END + +IDD_GINALOADFAILED DIALOGEX 58, 83, 231, 119 +STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Eroare interfaþã de utilizator" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Fiºierul DLL al interfeþei %s nu a putut fi încãrcat.", IDC_GINALOADFAILED, 39, 16, 156, 24 + LTEXT "Reinstalaþi ReactOS pentru a rezolva aceastã problemã.", IDC_GINALOADFAILEDCONTACT, 39, 53, 151, 25 + DEFPUSHBUTTON "&Repornire", 1, 80, 91, 68, 14 +END + +STRINGTABLE +BEGIN + IDS_PREPARENETWORKCONNECTIONS "Se pregãtesc conexiunile la reþea..." + IDS_APPLYINGCOMPUTERSETTINGS "Se aplicã setãrile generale..." + IDS_RUNNINGSTARTUPSCRIPTS "Se executã operaþiile de pornire..." + IDS_RUNNINGSHUTDOWNSCRIPTS "Se executã operaþiile de oprire..." + IDS_APPLYINGYOURPERSONALSETTINGS "Se aplicã setãrile personale..." + IDS_RUNNINGLOGOFFSCRIPTS "Se executã operaþiile de ieºire..." + IDS_RUNNINGLOGONSCRIPTS "Se executã operaþiile de ieºire..." + IDS_LOADINGYOURPERSONALSETTINGS "Se încarcã setãrile personale..." + IDS_CLOSINGNETWORKCONNECTIONS "Se închid conexiunile la reþea..." + IDS_REACTOSISSHUTTINGDOWN "ReactOS se închide..." + IDS_PREPARETOSTANDBY "Pregãtire pentru stare de veghe..." + IDS_PREPARETOHIBERNATE "Pregãtire pentru hibernare..." + IDS_SAVEYOURSETTINGS "Salvare setãri..." + IDS_REACTOSISSTARTINGUP "ReactOS porneºte..." +END + +STRINGTABLE +BEGIN + IDS_FAILEDACTIVATEUSERSHELL "Winlogon nu a putut porni nucleul sistemului!" +END + Propchange: trunk/reactos/base/system/winlogon/lang/ro-RO.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/system/winlogon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/rsrc.… ============================================================================== --- trunk/reactos/base/system/winlogon/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/system/winlogon/rsrc.rc [iso-8859-1] Tue May 19 20:06:10 2009 @@ -20,6 +20,7 @@ #include "lang/no-NO.rc" #include "lang/nl-NL.rc" #include "lang/pl-PL.rc" +#include "lang/ro-RO.rc" #include "lang/ru-RU.rc" #include "lang/sv-SE.rc" #include "lang/sk-SK.rc" Modified: trunk/reactos/dll/win32/user32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/lang/ro-R… ============================================================================== --- trunk/reactos/dll/win32/user32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/lang/ro-RO.rc [iso-8859-1] Tue May 19 20:06:10 2009 @@ -57,7 +57,7 @@ BEGIN IDS_ERROR, "Eroare" IDS_OK, "OK" - IDS_CANCEL, "Revocare" + IDS_CANCEL, "Anulare" IDS_ABORT, "&Abandon" IDS_RETRY, "&Reîncercare" IDS_IGNORE, "&Ignorare"

1 0

[jimtabor] 40981: - Cleanup Real/GetInputState.
by jimtabor＠svn.reactos.org 19 May '09

19 May '09

Author: jimtabor Date: Tue May 19 19:47:16 2009 New Revision: 40981 URL: http://svn.reactos.org/svn/reactos?rev=40981&view=rev Log: - Cleanup Real/GetInputState. Modified: trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/misc.c trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Tue May 19 19:47:16 2009 @@ -2198,51 +2198,27 @@ /* - * @unimplemented + * @implemented */ DWORD WINAPI RealGetQueueStatus(UINT flags) { - DWORD ret; - WORD changed_bits, wake_bits; - -#if 0 /* wine stuff. don't know what it does... */ - - /* check for pending X events */ - if (USER_Driver.pMsgWaitForMultipleObjectsEx) - USER_Driver.pMsgWaitForMultipleObjectsEx( 0, NULL, 0, 0, 0 ); -#endif - - ret = NtUserCallOneParam(TRUE, ONEPARAM_ROUTINE_GETQUEUESTATUS); - - changed_bits = LOWORD(ret); - wake_bits = HIWORD(ret); - - return MAKELONG(changed_bits & flags, wake_bits & flags); -} - - -/* - * @unimplemented + return NtUserCallOneParam(flags, ONEPARAM_ROUTINE_GETQUEUESTATUS); +} + + +/* + * @implemented */ BOOL WINAPI GetInputState(VOID) { - DWORD ret; - WORD wake_bits; - -#if 0 /* wine stuff. don't know what it does... */ - - /* check for pending X events */ - if (USER_Driver.pMsgWaitForMultipleObjectsEx) - USER_Driver.pMsgWaitForMultipleObjectsEx( 0, NULL, 0, 0, 0 ); -#endif - - ret = NtUserCallOneParam(FALSE, ONEPARAM_ROUTINE_GETQUEUESTATUS); - - wake_bits = HIWORD(ret); - - return wake_bits & (QS_KEY | QS_MOUSEBUTTON); + PCLIENTTHREADINFO pcti = GetWin32ClientInfo()->pClientThreadInfo; + + if ((!pcti) || (pcti->fsChangeBits & (QS_KEY|QS_MOUSEBUTTON))) + return (BOOL)NtUserGetThreadState(THREADSTATE_GETINPUTSTATE); + + return FALSE; } Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue May 19 19:47:16 2009 @@ -1718,7 +1718,8 @@ THREADSTATE_CAPTUREWINDOW, THREADSTATE_PROGMANWINDOW, THREADSTATE_TASKMANWINDOW, - THREADSTATE_GETMESSAGETIME + THREADSTATE_GETMESSAGETIME, + THREADSTATE_GETINPUTSTATE }; DWORD Modified: trunk/reactos/subsystems/win32/win32k/ntuser/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/misc.c [iso-8859-1] Tue May 19 19:47:16 2009 @@ -118,6 +118,9 @@ case THREADSTATE_GETMESSAGETIME: /* FIXME Needs more work! */ RETURN( ((PTHREADINFO)PsGetCurrentThreadWin32Thread())->timeLast); + + case THREADSTATE_GETINPUTSTATE: + RETURN( HIWORD(IntGetQueueStatus(FALSE)) & (QS_KEY | QS_MOUSEBUTTON)); } RETURN( 0); Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Tue May 19 19:47:16 2009 @@ -397,8 +397,14 @@ RETURN (UserRealizePalette((HDC) Param)); case ONEPARAM_ROUTINE_GETQUEUESTATUS: - RETURN (IntGetQueueStatus((BOOL) Param)); - + { + DWORD Ret; + WORD changed_bits, wake_bits; + Ret = IntGetQueueStatus(FALSE); + changed_bits = LOWORD(Ret); + wake_bits = HIWORD(Ret); + RETURN( MAKELONG(changed_bits & Param, wake_bits & Param)); + } case ONEPARAM_ROUTINE_ENUMCLIPBOARDFORMATS: /* FIXME: Should use UserEnterShared */ RETURN(IntEnumClipboardFormats(Param));

1 0

[spetreolle] 40980: fix tabs/spaces, thanks to Christoph
by spetreolle＠svn.reactos.org 19 May '09

19 May '09

Author: spetreolle Date: Tue May 19 18:37:43 2009 New Revision: 40980 URL: http://svn.reactos.org/svn/reactos?rev=40980&view=rev Log: fix tabs/spaces, thanks to Christoph Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c Modified: trunk/reactos/dll/win32/advapi32/reg/reg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/reg/reg… ============================================================================== --- trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/reg/reg.c [iso-8859-1] Tue May 19 18:37:43 2009 @@ -3338,7 +3338,7 @@ TRACE("RegOpenKeyExA hKey 0x%x lpSubKey %s ulOptions 0x%x samDesired 0x%x phkResult %p\n", hKey, lpSubKey, ulOptions, samDesired, phkResult); - if (!phkResult) + if (!phkResult) { return ERROR_INVALID_PARAMETER; } @@ -3393,7 +3393,7 @@ TRACE("RegOpenKeyExW hKey 0x%x lpSubKey %S ulOptions 0x%x samDesired 0x%x phkResult %p\n", hKey, lpSubKey, ulOptions, samDesired, phkResult); - if (!phkResult) + if (!phkResult) { return ERROR_INVALID_PARAMETER; } @@ -4273,10 +4273,10 @@ TRACE("hKey 0x%X lpSubKey %S lpValue %p lpcbValue %d\n", hKey, lpSubKey, lpValue, lpcbValue ? *lpcbValue : 0); - if (hKey == NULL) - { - return ERROR_INVALID_HANDLE; - } + if (hKey == NULL) + { + return ERROR_INVALID_HANDLE; + } Status = MapDefaultKey(&KeyHandle, hKey); if (!NT_SUCCESS(Status))

1 0

← Newer
1
...
23
24
25
26
27
28
29
...
51
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2009