Ros-diffs May 2005

ros-diffs@reactos.org

26 participants
814 discussions

[ion] 15098: Start by adding current w32api headers from HEAD

by ion＠svn.reactos.com

Start by adding current w32api headers from HEAD Added: branches/new_headers/reactos/include/ Added: branches/new_headers/reactos/include/GL/ Added: branches/new_headers/reactos/include/GL/gl.h Added: branches/new_headers/reactos/include/GL/glext.h Added: branches/new_headers/reactos/include/GL/glu.h Added: branches/new_headers/reactos/include/GdiPlus.h Added: branches/new_headers/reactos/include/GdiPlusBase.h Added: branches/new_headers/reactos/include/GdiPlusBrush.h Added: branches/new_headers/reactos/include/GdiPlusColor.h Added: branches/new_headers/reactos/include/GdiPlusColorMatrix.h Added: branches/new_headers/reactos/include/GdiPlusEffects.h Added: branches/new_headers/reactos/include/GdiPlusEnums.h Added: branches/new_headers/reactos/include/GdiPlusFlat.h Added: branches/new_headers/reactos/include/GdiPlusGpStubs.h Added: branches/new_headers/reactos/include/GdiPlusGraphics.h Added: branches/new_headers/reactos/include/GdiPlusHeaders.h Added: branches/new_headers/reactos/include/GdiPlusImageAttributes.h Added: branches/new_headers/reactos/include/GdiPlusImaging.h Added: branches/new_headers/reactos/include/GdiPlusInit.h Added: branches/new_headers/reactos/include/GdiPlusLineCaps.h Added: branches/new_headers/reactos/include/GdiPlusMatrix.h Added: branches/new_headers/reactos/include/GdiPlusMem.h Added: branches/new_headers/reactos/include/GdiPlusMetaFile.h Added: branches/new_headers/reactos/include/GdiPlusMetaHeader.h Added: branches/new_headers/reactos/include/GdiPlusPath.h Added: branches/new_headers/reactos/include/GdiPlusPen.h Added: branches/new_headers/reactos/include/GdiPlusPixelFormats.h Added: branches/new_headers/reactos/include/GdiPlusStringFormat.h Added: branches/new_headers/reactos/include/GdiPlusTypes.h Added: branches/new_headers/reactos/include/accctrl.h Added: branches/new_headers/reactos/include/aclapi.h Added: branches/new_headers/reactos/include/aclui.h Added: branches/new_headers/reactos/include/afxres.h Added: branches/new_headers/reactos/include/basetsd.h Added: branches/new_headers/reactos/include/basetyps.h Added: branches/new_headers/reactos/include/cderr.h Added: branches/new_headers/reactos/include/cguid.h Added: branches/new_headers/reactos/include/comcat.h Added: branches/new_headers/reactos/include/commctrl.h Added: branches/new_headers/reactos/include/commdlg.h Added: branches/new_headers/reactos/include/cpl.h Added: branches/new_headers/reactos/include/cplext.h Added: branches/new_headers/reactos/include/custcntl.h Added: branches/new_headers/reactos/include/dbt.h Added: branches/new_headers/reactos/include/dde.h Added: branches/new_headers/reactos/include/ddeml.h Added: branches/new_headers/reactos/include/ddk/ Added: branches/new_headers/reactos/include/ddk/afilter.h Added: branches/new_headers/reactos/include/ddk/atm.h Added: branches/new_headers/reactos/include/ddk/batclass.h Added: branches/new_headers/reactos/include/ddk/cfg.h Added: branches/new_headers/reactos/include/ddk/cfgmgr32.h Added: branches/new_headers/reactos/include/ddk/d4drvif.h Added: branches/new_headers/reactos/include/ddk/d4iface.h Added: branches/new_headers/reactos/include/ddk/ddkmapi.h Added: branches/new_headers/reactos/include/ddk/hidclass.h Added: branches/new_headers/reactos/include/ddk/hidpi.h Added: branches/new_headers/reactos/include/ddk/hidusage.h Added: branches/new_headers/reactos/include/ddk/mcd.h Added: branches/new_headers/reactos/include/ddk/miniport.h Added: branches/new_headers/reactos/include/ddk/minitape.h Added: branches/new_headers/reactos/include/ddk/mountdev.h Added: branches/new_headers/reactos/include/ddk/mountmgr.h Added: branches/new_headers/reactos/include/ddk/ndis.h Added: branches/new_headers/reactos/include/ddk/ndisguid.h Added: branches/new_headers/reactos/include/ddk/ndistapi.h Added: branches/new_headers/reactos/include/ddk/ndiswan.h Added: branches/new_headers/reactos/include/ddk/netevent.h Added: branches/new_headers/reactos/include/ddk/netpnp.h Added: branches/new_headers/reactos/include/ddk/newdev.h Added: branches/new_headers/reactos/include/ddk/ntagp.h Added: branches/new_headers/reactos/include/ddk/ntapi.h Added: branches/new_headers/reactos/include/ddk/ntdd8042.h Added: branches/new_headers/reactos/include/ddk/ntddbeep.h Added: branches/new_headers/reactos/include/ddk/ntddcdrm.h Added: branches/new_headers/reactos/include/ddk/ntddcdvd.h Added: branches/new_headers/reactos/include/ddk/ntddchgr.h Added: branches/new_headers/reactos/include/ddk/ntdddisk.h Added: branches/new_headers/reactos/include/ddk/ntddk.h Added: branches/new_headers/reactos/include/ddk/ntddkbd.h Added: branches/new_headers/reactos/include/ddk/ntddmou.h Added: branches/new_headers/reactos/include/ddk/ntddndis.h Added: branches/new_headers/reactos/include/ddk/ntddpar.h Added: branches/new_headers/reactos/include/ddk/ntddpcm.h Added: branches/new_headers/reactos/include/ddk/ntddscsi.h Added: branches/new_headers/reactos/include/ddk/ntddser.h Added: branches/new_headers/reactos/include/ddk/ntddstor.h Added: branches/new_headers/reactos/include/ddk/ntddtape.h Added: branches/new_headers/reactos/include/ddk/ntddtdi.h Added: branches/new_headers/reactos/include/ddk/ntddvdeo.h Added: branches/new_headers/reactos/include/ddk/ntddvol.h Added: branches/new_headers/reactos/include/ddk/ntifs.h Added: branches/new_headers/reactos/include/ddk/ntpoapi.h Added: branches/new_headers/reactos/include/ddk/ntstatus.h Added: branches/new_headers/reactos/include/ddk/parallel.h Added: branches/new_headers/reactos/include/ddk/pfhook.h Added: branches/new_headers/reactos/include/ddk/poclass.h Added: branches/new_headers/reactos/include/ddk/prntfont.h Added: branches/new_headers/reactos/include/ddk/scsi.h Added: branches/new_headers/reactos/include/ddk/scsiscan.h [truncated at 100 lines; 198 more skipped] _____ Added: branches/new_headers/reactos/include/GL/gl.h --- branches/new_headers/reactos/include/GL/gl.h 2005-05-08 01:30:30 UTC (rev 15097) +++ branches/new_headers/reactos/include/GL/gl.h 2005-05-08 01:32:28 UTC (rev 15098) @@ -0,0 +1,1472 @@ +/* $Id: gl.h 12852 2005-01-06 13:58:04Z mf $ */ + +/* + * Mesa 3-D graphics library + * Version: 4.0 + * + * 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. + */ + + +/********************************************************************** ** + * 2002-Apr-22, JosÚ Fonseca: + * Removed non Win32 system-specific stuff + * + * 2002-Apr-17, Marcus Geelnard: + * For win32, OpenGL 1.2 & 1.3 definitions are not made in this file + * anymore, since under Windows those are regarded as extensions, and + * are better defined in glext.h (especially the function prototypes may + * conflict with extension function pointers). A few "cosmetical" + * changes were also made to this file. + * + * 2002-Apr-15, Marcus Geelnard: + * Modified this file to better fit a wider range of compilers, removed + * Mesa specific stuff, and removed extension definitions (this file now + * relies on GL/glext.h). Hopefully this file should now function as a + * generic OpenGL gl.h include file for most compilers and environments. + * Changed GLAPIENTRY to APIENTRY (to be consistent with GL/glext.h). + ************************************************************************ / + + +#ifndef __gl_h_ +#define __gl_h_ + + + +/********************************************************************** ** + * Begin system-specific stuff. + */ +/* __WIN32__ */ +#if !defined(__WIN32__) && (defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__)) +# define __WIN32__ +#endif + +/* GLAPI, part 1 (use WINGDIAPI, if defined) */ +#if defined(__WIN32__) && defined(WINGDIAPI) +# define GLAPI WINGDIAPI +#endif + +/* GLAPI, part 2 */ +#if !defined(GLAPI) +# if defined(_MSC_VER) /* Microsoft Visual C++ */ +# define GLAPI __declspec(dllimport) +# elif defined(__LCC__) && defined(__WIN32__) /* LCC-Win32 */ +# define GLAPI __stdcall +# else /* Others (e.g. MinGW, Cygwin, non-win32) */ +# define GLAPI extern +# endif +#endif + +/* APIENTRY */ +#if !defined(APIENTRY) +# if defined(__WIN32__) +# define APIENTRY __stdcall +# else +# define APIENTRY +# endif +#endif +/* + * End system-specific stuff. + ************************************************************************ / + + + +#ifdef __cplusplus +extern "C" { +#endif + + + +#define GL_VERSION_1_1 1 + +#if !defined(__WIN32__) +#define GL_VERSION_1_2 1 +#define GL_VERSION_1_3 1 +#define GL_ARB_imaging 1 +#endif + + +/* + * + * Datatypes + * + */ +#ifdef CENTERLINE_CLPP +#define signed +#endif +typedef unsigned int GLenum; +typedef unsigned char GLboolean; +typedef unsigned int GLbitfield; +typedef void GLvoid; +typedef signed char GLbyte; /* 1-byte signed */ +typedef short GLshort; /* 2-byte signed */ +typedef int GLint; /* 4-byte signed */ +typedef unsigned char GLubyte; /* 1-byte unsigned */ +typedef unsigned short GLushort; /* 2-byte unsigned */ +typedef unsigned int GLuint; /* 4-byte unsigned */ +typedef int GLsizei; /* 4-byte signed */ +typedef float GLfloat; /* single precision float */ +typedef float GLclampf; /* single precision float in [0,1] */ +typedef double GLdouble; /* double precision float */ +typedef double GLclampd; /* double precision float in [0,1] */ + + + +/********************************************************************** ** + * + * Constants + * + ************************************************************************ / + +/* Boolean values */ +#define GL_FALSE 0x0 +#define GL_TRUE 0x1 + +/* Data types */ +#define GL_BYTE 0x1400 +#define GL_UNSIGNED_BYTE 0x1401 +#define GL_SHORT 0x1402 +#define GL_UNSIGNED_SHORT 0x1403 +#define GL_INT 0x1404 +#define GL_UNSIGNED_INT 0x1405 +#define GL_FLOAT 0x1406 +#define GL_DOUBLE 0x140A +#define GL_2_BYTES 0x1407 +#define GL_3_BYTES 0x1408 +#define GL_4_BYTES 0x1409 + +/* Primitives */ +#define GL_POINTS 0x0000 +#define GL_LINES 0x0001 +#define GL_LINE_LOOP 0x0002 +#define GL_LINE_STRIP 0x0003 +#define GL_TRIANGLES 0x0004 +#define GL_TRIANGLE_STRIP 0x0005 +#define GL_TRIANGLE_FAN 0x0006 +#define GL_QUADS 0x0007 +#define GL_QUAD_STRIP 0x0008 +#define GL_POLYGON 0x0009 + +/* Vertex Arrays */ +#define GL_VERTEX_ARRAY 0x8074 +#define GL_NORMAL_ARRAY 0x8075 +#define GL_COLOR_ARRAY 0x8076 +#define GL_INDEX_ARRAY 0x8077 +#define GL_TEXTURE_COORD_ARRAY 0x8078 +#define GL_EDGE_FLAG_ARRAY 0x8079 +#define GL_VERTEX_ARRAY_SIZE 0x807A +#define GL_VERTEX_ARRAY_TYPE 0x807B +#define GL_VERTEX_ARRAY_STRIDE 0x807C +#define GL_NORMAL_ARRAY_TYPE 0x807E +#define GL_NORMAL_ARRAY_STRIDE 0x807F +#define GL_COLOR_ARRAY_SIZE 0x8081 +#define GL_COLOR_ARRAY_TYPE 0x8082 +#define GL_COLOR_ARRAY_STRIDE 0x8083 +#define GL_INDEX_ARRAY_TYPE 0x8085 +#define GL_INDEX_ARRAY_STRIDE 0x8086 +#define GL_TEXTURE_COORD_ARRAY_SIZE 0x8088 +#define GL_TEXTURE_COORD_ARRAY_TYPE 0x8089 +#define GL_TEXTURE_COORD_ARRAY_STRIDE 0x808A +#define GL_EDGE_FLAG_ARRAY_STRIDE 0x808C +#define GL_VERTEX_ARRAY_POINTER 0x808E +#define GL_NORMAL_ARRAY_POINTER 0x808F +#define GL_COLOR_ARRAY_POINTER 0x8090 +#define GL_INDEX_ARRAY_POINTER 0x8091 +#define GL_TEXTURE_COORD_ARRAY_POINTER 0x8092 +#define GL_EDGE_FLAG_ARRAY_POINTER 0x8093 +#define GL_V2F 0x2A20 +#define GL_V3F 0x2A21 +#define GL_C4UB_V2F 0x2A22 +#define GL_C4UB_V3F 0x2A23 +#define GL_C3F_V3F 0x2A24 +#define GL_N3F_V3F 0x2A25 +#define GL_C4F_N3F_V3F 0x2A26 +#define GL_T2F_V3F 0x2A27 +#define GL_T4F_V4F 0x2A28 +#define GL_T2F_C4UB_V3F 0x2A29 +#define GL_T2F_C3F_V3F 0x2A2A +#define GL_T2F_N3F_V3F 0x2A2B +#define GL_T2F_C4F_N3F_V3F 0x2A2C +#define GL_T4F_C4F_N3F_V4F 0x2A2D + +/* Matrix Mode */ +#define GL_MATRIX_MODE 0x0BA0 +#define GL_MODELVIEW 0x1700 +#define GL_PROJECTION 0x1701 +#define GL_TEXTURE 0x1702 + +/* Points */ +#define GL_POINT_SMOOTH 0x0B10 +#define GL_POINT_SIZE 0x0B11 +#define GL_POINT_SIZE_GRANULARITY 0x0B13 +#define GL_POINT_SIZE_RANGE 0x0B12 + +/* Lines */ +#define GL_LINE_SMOOTH 0x0B20 +#define GL_LINE_STIPPLE 0x0B24 +#define GL_LINE_STIPPLE_PATTERN 0x0B25 +#define GL_LINE_STIPPLE_REPEAT 0x0B26 +#define GL_LINE_WIDTH 0x0B21 +#define GL_LINE_WIDTH_GRANULARITY 0x0B23 +#define GL_LINE_WIDTH_RANGE 0x0B22 + +/* Polygons */ +#define GL_POINT 0x1B00 +#define GL_LINE 0x1B01 +#define GL_FILL 0x1B02 +#define GL_CW 0x0900 +#define GL_CCW 0x0901 +#define GL_FRONT 0x0404 +#define GL_BACK 0x0405 +#define GL_POLYGON_MODE 0x0B40 +#define GL_POLYGON_SMOOTH 0x0B41 +#define GL_POLYGON_STIPPLE 0x0B42 +#define GL_EDGE_FLAG 0x0B43 +#define GL_CULL_FACE 0x0B44 +#define GL_CULL_FACE_MODE 0x0B45 +#define GL_FRONT_FACE 0x0B46 +#define GL_POLYGON_OFFSET_FACTOR 0x8038 +#define GL_POLYGON_OFFSET_UNITS 0x2A00 +#define GL_POLYGON_OFFSET_POINT 0x2A01 +#define GL_POLYGON_OFFSET_LINE 0x2A02 +#define GL_POLYGON_OFFSET_FILL 0x8037 + +/* Display Lists */ +#define GL_COMPILE 0x1300 +#define GL_COMPILE_AND_EXECUTE 0x1301 +#define GL_LIST_BASE 0x0B32 +#define GL_LIST_INDEX 0x0B33 +#define GL_LIST_MODE 0x0B30 + +/* Depth buffer */ +#define GL_NEVER 0x0200 +#define GL_LESS 0x0201 +#define GL_EQUAL 0x0202 +#define GL_LEQUAL 0x0203 +#define GL_GREATER 0x0204 +#define GL_NOTEQUAL 0x0205 +#define GL_GEQUAL 0x0206 +#define GL_ALWAYS 0x0207 +#define GL_DEPTH_TEST 0x0B71 +#define GL_DEPTH_BITS 0x0D56 +#define GL_DEPTH_CLEAR_VALUE 0x0B73 +#define GL_DEPTH_FUNC 0x0B74 +#define GL_DEPTH_RANGE 0x0B70 +#define GL_DEPTH_WRITEMASK 0x0B72 +#define GL_DEPTH_COMPONENT 0x1902 + +/* Lighting */ +#define GL_LIGHTING 0x0B50 +#define GL_LIGHT0 0x4000 +#define GL_LIGHT1 0x4001 +#define GL_LIGHT2 0x4002 +#define GL_LIGHT3 0x4003 +#define GL_LIGHT4 0x4004 +#define GL_LIGHT5 0x4005 +#define GL_LIGHT6 0x4006 +#define GL_LIGHT7 0x4007 +#define GL_SPOT_EXPONENT 0x1205 +#define GL_SPOT_CUTOFF 0x1206 +#define GL_CONSTANT_ATTENUATION 0x1207 +#define GL_LINEAR_ATTENUATION 0x1208 +#define GL_QUADRATIC_ATTENUATION 0x1209 +#define GL_AMBIENT 0x1200 +#define GL_DIFFUSE 0x1201 +#define GL_SPECULAR 0x1202 +#define GL_SHININESS 0x1601 +#define GL_EMISSION 0x1600 +#define GL_POSITION 0x1203 +#define GL_SPOT_DIRECTION 0x1204 +#define GL_AMBIENT_AND_DIFFUSE 0x1602 +#define GL_COLOR_INDEXES 0x1603 +#define GL_LIGHT_MODEL_TWO_SIDE 0x0B52 +#define GL_LIGHT_MODEL_LOCAL_VIEWER 0x0B51 +#define GL_LIGHT_MODEL_AMBIENT 0x0B53 +#define GL_FRONT_AND_BACK 0x0408 +#define GL_SHADE_MODEL 0x0B54 +#define GL_FLAT 0x1D00 +#define GL_SMOOTH 0x1D01 +#define GL_COLOR_MATERIAL 0x0B57 +#define GL_COLOR_MATERIAL_FACE 0x0B55 +#define GL_COLOR_MATERIAL_PARAMETER 0x0B56 +#define GL_NORMALIZE 0x0BA1 + +/* User clipping planes */ +#define GL_CLIP_PLANE0 0x3000 +#define GL_CLIP_PLANE1 0x3001 +#define GL_CLIP_PLANE2 0x3002 +#define GL_CLIP_PLANE3 0x3003 +#define GL_CLIP_PLANE4 0x3004 +#define GL_CLIP_PLANE5 0x3005 + +/* Accumulation buffer */ +#define GL_ACCUM_RED_BITS 0x0D58 +#define GL_ACCUM_GREEN_BITS 0x0D59 +#define GL_ACCUM_BLUE_BITS 0x0D5A +#define GL_ACCUM_ALPHA_BITS 0x0D5B +#define GL_ACCUM_CLEAR_VALUE 0x0B80 +#define GL_ACCUM 0x0100 +#define GL_ADD 0x0104 +#define GL_LOAD 0x0101 +#define GL_MULT 0x0103 +#define GL_RETURN 0x0102 + +/* Alpha testing */ +#define GL_ALPHA_TEST 0x0BC0 +#define GL_ALPHA_TEST_REF 0x0BC2 +#define GL_ALPHA_TEST_FUNC 0x0BC1 + +/* Blending */ +#define GL_BLEND 0x0BE2 +#define GL_BLEND_SRC 0x0BE1 +#define GL_BLEND_DST 0x0BE0 +#define GL_ZERO 0x0 +#define GL_ONE 0x1 +#define GL_SRC_COLOR 0x0300 +#define GL_ONE_MINUS_SRC_COLOR 0x0301 +#define GL_SRC_ALPHA 0x0302 +#define GL_ONE_MINUS_SRC_ALPHA 0x0303 +#define GL_DST_ALPHA 0x0304 +#define GL_ONE_MINUS_DST_ALPHA 0x0305 +#define GL_DST_COLOR 0x0306 +#define GL_ONE_MINUS_DST_COLOR 0x0307 +#define GL_SRC_ALPHA_SATURATE 0x0308 +#define GL_CONSTANT_COLOR 0x8001 +#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 +#define GL_CONSTANT_ALPHA 0x8003 +#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 + +/* Render Mode */ +#define GL_FEEDBACK 0x1C01 +#define GL_RENDER 0x1C00 +#define GL_SELECT 0x1C02 + +/* Feedback */ +#define GL_2D 0x0600 +#define GL_3D 0x0601 +#define GL_3D_COLOR 0x0602 +#define GL_3D_COLOR_TEXTURE 0x0603 +#define GL_4D_COLOR_TEXTURE 0x0604 +#define GL_POINT_TOKEN 0x0701 +#define GL_LINE_TOKEN 0x0702 +#define GL_LINE_RESET_TOKEN 0x0707 +#define GL_POLYGON_TOKEN 0x0703 +#define GL_BITMAP_TOKEN 0x0704 +#define GL_DRAW_PIXEL_TOKEN 0x0705 +#define GL_COPY_PIXEL_TOKEN 0x0706 +#define GL_PASS_THROUGH_TOKEN 0x0700 +#define GL_FEEDBACK_BUFFER_POINTER 0x0DF0 +#define GL_FEEDBACK_BUFFER_SIZE 0x0DF1 +#define GL_FEEDBACK_BUFFER_TYPE 0x0DF2 + +/* Selection */ +#define GL_SELECTION_BUFFER_POINTER 0x0DF3 +#define GL_SELECTION_BUFFER_SIZE 0x0DF4 + +/* Fog */ +#define GL_FOG 0x0B60 +#define GL_FOG_MODE 0x0B65 +#define GL_FOG_DENSITY 0x0B62 +#define GL_FOG_COLOR 0x0B66 +#define GL_FOG_INDEX 0x0B61 +#define GL_FOG_START 0x0B63 +#define GL_FOG_END 0x0B64 +#define GL_LINEAR 0x2601 +#define GL_EXP 0x0800 +#define GL_EXP2 0x0801 + +/* Logic Ops */ +#define GL_LOGIC_OP 0x0BF1 +#define GL_INDEX_LOGIC_OP 0x0BF1 +#define GL_COLOR_LOGIC_OP 0x0BF2 +#define GL_LOGIC_OP_MODE 0x0BF0 +#define GL_CLEAR 0x1500 +#define GL_SET 0x150F +#define GL_COPY 0x1503 +#define GL_COPY_INVERTED 0x150C +#define GL_NOOP 0x1505 +#define GL_INVERT 0x150A +#define GL_AND 0x1501 +#define GL_NAND 0x150E +#define GL_OR 0x1507 +#define GL_NOR 0x1508 +#define GL_XOR 0x1506 +#define GL_EQUIV 0x1509 +#define GL_AND_REVERSE 0x1502 +#define GL_AND_INVERTED 0x1504 +#define GL_OR_REVERSE 0x150B +#define GL_OR_INVERTED 0x150D + +/* Stencil */ +#define GL_STENCIL_TEST 0x0B90 +#define GL_STENCIL_WRITEMASK 0x0B98 +#define GL_STENCIL_BITS 0x0D57 +#define GL_STENCIL_FUNC 0x0B92 +#define GL_STENCIL_VALUE_MASK 0x0B93 +#define GL_STENCIL_REF 0x0B97 +#define GL_STENCIL_FAIL 0x0B94 +#define GL_STENCIL_PASS_DEPTH_PASS 0x0B96 +#define GL_STENCIL_PASS_DEPTH_FAIL 0x0B95 +#define GL_STENCIL_CLEAR_VALUE 0x0B91 +#define GL_STENCIL_INDEX 0x1901 +#define GL_KEEP 0x1E00 +#define GL_REPLACE 0x1E01 +#define GL_INCR 0x1E02 +#define GL_DECR 0x1E03 + +/* Buffers, Pixel Drawing/Reading */ +#define GL_NONE 0x0 +#define GL_LEFT 0x0406 +#define GL_RIGHT 0x0407 +/*GL_FRONT 0x0404 */ +/*GL_BACK 0x0405 */ +/*GL_FRONT_AND_BACK 0x0408 */ +#define GL_FRONT_LEFT 0x0400 +#define GL_FRONT_RIGHT 0x0401 +#define GL_BACK_LEFT 0x0402 +#define GL_BACK_RIGHT 0x0403 +#define GL_AUX0 0x0409 +#define GL_AUX1 0x040A +#define GL_AUX2 0x040B +#define GL_AUX3 0x040C +#define GL_COLOR_INDEX 0x1900 +#define GL_RED 0x1903 +#define GL_GREEN 0x1904 +#define GL_BLUE 0x1905 +#define GL_ALPHA 0x1906 +#define GL_LUMINANCE 0x1909 +#define GL_LUMINANCE_ALPHA 0x190A +#define GL_ALPHA_BITS 0x0D55 +#define GL_RED_BITS 0x0D52 +#define GL_GREEN_BITS 0x0D53 +#define GL_BLUE_BITS 0x0D54 +#define GL_INDEX_BITS 0x0D51 +#define GL_SUBPIXEL_BITS 0x0D50 +#define GL_AUX_BUFFERS 0x0C00 +#define GL_READ_BUFFER 0x0C02 +#define GL_DRAW_BUFFER 0x0C01 +#define GL_DOUBLEBUFFER 0x0C32 +#define GL_STEREO 0x0C33 +#define GL_BITMAP 0x1A00 +#define GL_COLOR 0x1800 +#define GL_DEPTH 0x1801 +#define GL_STENCIL 0x1802 +#define GL_DITHER 0x0BD0 +#define GL_RGB 0x1907 +#define GL_RGBA 0x1908 + +/* Implementation limits */ +#define GL_MAX_LIST_NESTING 0x0B31 +#define GL_MAX_ATTRIB_STACK_DEPTH 0x0D35 +#define GL_MAX_MODELVIEW_STACK_DEPTH 0x0D36 +#define GL_MAX_NAME_STACK_DEPTH 0x0D37 +#define GL_MAX_PROJECTION_STACK_DEPTH 0x0D38 +#define GL_MAX_TEXTURE_STACK_DEPTH 0x0D39 +#define GL_MAX_EVAL_ORDER 0x0D30 +#define GL_MAX_LIGHTS 0x0D31 +#define GL_MAX_CLIP_PLANES 0x0D32 +#define GL_MAX_TEXTURE_SIZE 0x0D33 +#define GL_MAX_PIXEL_MAP_TABLE 0x0D34 +#define GL_MAX_VIEWPORT_DIMS 0x0D3A +#define GL_MAX_CLIENT_ATTRIB_STACK_DEPTH 0x0D3B + +/* Gets */ +#define GL_ATTRIB_STACK_DEPTH 0x0BB0 +#define GL_CLIENT_ATTRIB_STACK_DEPTH 0x0BB1 +#define GL_COLOR_CLEAR_VALUE 0x0C22 +#define GL_COLOR_WRITEMASK 0x0C23 +#define GL_CURRENT_INDEX 0x0B01 +#define GL_CURRENT_COLOR 0x0B00 +#define GL_CURRENT_NORMAL 0x0B02 +#define GL_CURRENT_RASTER_COLOR 0x0B04 +#define GL_CURRENT_RASTER_DISTANCE 0x0B09 +#define GL_CURRENT_RASTER_INDEX 0x0B05 +#define GL_CURRENT_RASTER_POSITION 0x0B07 +#define GL_CURRENT_RASTER_TEXTURE_COORDS 0x0B06 +#define GL_CURRENT_RASTER_POSITION_VALID 0x0B08 +#define GL_CURRENT_TEXTURE_COORDS 0x0B03 +#define GL_INDEX_CLEAR_VALUE 0x0C20 +#define GL_INDEX_MODE 0x0C30 +#define GL_INDEX_WRITEMASK 0x0C21 +#define GL_MODELVIEW_MATRIX 0x0BA6 +#define GL_MODELVIEW_STACK_DEPTH 0x0BA3 +#define GL_NAME_STACK_DEPTH 0x0D70 +#define GL_PROJECTION_MATRIX 0x0BA7 +#define GL_PROJECTION_STACK_DEPTH 0x0BA4 +#define GL_RENDER_MODE 0x0C40 +#define GL_RGBA_MODE 0x0C31 +#define GL_TEXTURE_MATRIX 0x0BA8 +#define GL_TEXTURE_STACK_DEPTH 0x0BA5 +#define GL_VIEWPORT 0x0BA2 + +/* Evaluators */ +#define GL_AUTO_NORMAL 0x0D80 +#define GL_MAP1_COLOR_4 0x0D90 +#define GL_MAP1_GRID_DOMAIN 0x0DD0 +#define GL_MAP1_GRID_SEGMENTS 0x0DD1 +#define GL_MAP1_INDEX 0x0D91 +#define GL_MAP1_NORMAL 0x0D92 +#define GL_MAP1_TEXTURE_COORD_1 0x0D93 +#define GL_MAP1_TEXTURE_COORD_2 0x0D94 +#define GL_MAP1_TEXTURE_COORD_3 0x0D95 +#define GL_MAP1_TEXTURE_COORD_4 0x0D96 +#define GL_MAP1_VERTEX_3 0x0D97 +#define GL_MAP1_VERTEX_4 0x0D98 +#define GL_MAP2_COLOR_4 0x0DB0 +#define GL_MAP2_GRID_DOMAIN 0x0DD2 +#define GL_MAP2_GRID_SEGMENTS 0x0DD3 +#define GL_MAP2_INDEX 0x0DB1 +#define GL_MAP2_NORMAL 0x0DB2 +#define GL_MAP2_TEXTURE_COORD_1 0x0DB3 +#define GL_MAP2_TEXTURE_COORD_2 0x0DB4 +#define GL_MAP2_TEXTURE_COORD_3 0x0DB5 +#define GL_MAP2_TEXTURE_COORD_4 0x0DB6 +#define GL_MAP2_VERTEX_3 0x0DB7 +#define GL_MAP2_VERTEX_4 0x0DB8 +#define GL_COEFF 0x0A00 +#define GL_DOMAIN 0x0A02 +#define GL_ORDER 0x0A01 + +/* Hints */ +#define GL_FOG_HINT 0x0C54 +#define GL_LINE_SMOOTH_HINT 0x0C52 +#define GL_PERSPECTIVE_CORRECTION_HINT 0x0C50 +#define GL_POINT_SMOOTH_HINT 0x0C51 +#define GL_POLYGON_SMOOTH_HINT 0x0C53 +#define GL_DONT_CARE 0x1100 +#define GL_FASTEST 0x1101 +#define GL_NICEST 0x1102 + +/* Scissor box */ +#define GL_SCISSOR_TEST 0x0C11 +#define GL_SCISSOR_BOX 0x0C10 + +/* Pixel Mode / Transfer */ +#define GL_MAP_COLOR 0x0D10 +#define GL_MAP_STENCIL 0x0D11 +#define GL_INDEX_SHIFT 0x0D12 +#define GL_INDEX_OFFSET 0x0D13 +#define GL_RED_SCALE 0x0D14 +#define GL_RED_BIAS 0x0D15 +#define GL_GREEN_SCALE 0x0D18 +#define GL_GREEN_BIAS 0x0D19 +#define GL_BLUE_SCALE 0x0D1A +#define GL_BLUE_BIAS 0x0D1B +#define GL_ALPHA_SCALE 0x0D1C +#define GL_ALPHA_BIAS 0x0D1D +#define GL_DEPTH_SCALE 0x0D1E +#define GL_DEPTH_BIAS 0x0D1F +#define GL_PIXEL_MAP_S_TO_S_SIZE 0x0CB1 +#define GL_PIXEL_MAP_I_TO_I_SIZE 0x0CB0 +#define GL_PIXEL_MAP_I_TO_R_SIZE 0x0CB2 +#define GL_PIXEL_MAP_I_TO_G_SIZE 0x0CB3 +#define GL_PIXEL_MAP_I_TO_B_SIZE 0x0CB4 +#define GL_PIXEL_MAP_I_TO_A_SIZE 0x0CB5 +#define GL_PIXEL_MAP_R_TO_R_SIZE 0x0CB6 +#define GL_PIXEL_MAP_G_TO_G_SIZE 0x0CB7 +#define GL_PIXEL_MAP_B_TO_B_SIZE 0x0CB8 +#define GL_PIXEL_MAP_A_TO_A_SIZE 0x0CB9 +#define GL_PIXEL_MAP_S_TO_S 0x0C71 +#define GL_PIXEL_MAP_I_TO_I 0x0C70 +#define GL_PIXEL_MAP_I_TO_R 0x0C72 +#define GL_PIXEL_MAP_I_TO_G 0x0C73 +#define GL_PIXEL_MAP_I_TO_B 0x0C74 +#define GL_PIXEL_MAP_I_TO_A 0x0C75 +#define GL_PIXEL_MAP_R_TO_R 0x0C76 +#define GL_PIXEL_MAP_G_TO_G 0x0C77 +#define GL_PIXEL_MAP_B_TO_B 0x0C78 +#define GL_PIXEL_MAP_A_TO_A 0x0C79 +#define GL_PACK_ALIGNMENT 0x0D05 +#define GL_PACK_LSB_FIRST 0x0D01 +#define GL_PACK_ROW_LENGTH 0x0D02 +#define GL_PACK_SKIP_PIXELS 0x0D04 +#define GL_PACK_SKIP_ROWS 0x0D03 +#define GL_PACK_SWAP_BYTES 0x0D00 +#define GL_UNPACK_ALIGNMENT 0x0CF5 +#define GL_UNPACK_LSB_FIRST 0x0CF1 +#define GL_UNPACK_ROW_LENGTH 0x0CF2 +#define GL_UNPACK_SKIP_PIXELS 0x0CF4 +#define GL_UNPACK_SKIP_ROWS 0x0CF3 +#define GL_UNPACK_SWAP_BYTES 0x0CF0 +#define GL_ZOOM_X 0x0D16 +#define GL_ZOOM_Y 0x0D17 + +/* Texture mapping */ +#define GL_TEXTURE_ENV 0x2300 +#define GL_TEXTURE_ENV_MODE 0x2200 +#define GL_TEXTURE_1D 0x0DE0 +#define GL_TEXTURE_2D 0x0DE1 +#define GL_TEXTURE_WRAP_S 0x2802 +#define GL_TEXTURE_WRAP_T 0x2803 +#define GL_TEXTURE_MAG_FILTER 0x2800 +#define GL_TEXTURE_MIN_FILTER 0x2801 +#define GL_TEXTURE_ENV_COLOR 0x2201 +#define GL_TEXTURE_GEN_S 0x0C60 +#define GL_TEXTURE_GEN_T 0x0C61 +#define GL_TEXTURE_GEN_MODE 0x2500 +#define GL_TEXTURE_BORDER_COLOR 0x1004 +#define GL_TEXTURE_WIDTH 0x1000 +#define GL_TEXTURE_HEIGHT 0x1001 +#define GL_TEXTURE_BORDER 0x1005 +#define GL_TEXTURE_COMPONENTS 0x1003 +#define GL_TEXTURE_RED_SIZE 0x805C +#define GL_TEXTURE_GREEN_SIZE 0x805D +#define GL_TEXTURE_BLUE_SIZE 0x805E +#define GL_TEXTURE_ALPHA_SIZE 0x805F +#define GL_TEXTURE_LUMINANCE_SIZE 0x8060 +#define GL_TEXTURE_INTENSITY_SIZE 0x8061 +#define GL_NEAREST_MIPMAP_NEAREST 0x2700 +#define GL_NEAREST_MIPMAP_LINEAR 0x2702 +#define GL_LINEAR_MIPMAP_NEAREST 0x2701 +#define GL_LINEAR_MIPMAP_LINEAR 0x2703 +#define GL_OBJECT_LINEAR 0x2401 +#define GL_OBJECT_PLANE 0x2501 +#define GL_EYE_LINEAR 0x2400 +#define GL_EYE_PLANE 0x2502 +#define GL_SPHERE_MAP 0x2402 +#define GL_DECAL 0x2101 +#define GL_MODULATE 0x2100 +#define GL_NEAREST 0x2600 +#define GL_REPEAT 0x2901 +#define GL_CLAMP 0x2900 +#define GL_S 0x2000 +#define GL_T 0x2001 +#define GL_R 0x2002 +#define GL_Q 0x2003 +#define GL_TEXTURE_GEN_R 0x0C62 +#define GL_TEXTURE_GEN_Q 0x0C63 + +/* Utility */ +#define GL_VENDOR 0x1F00 +#define GL_RENDERER 0x1F01 +#define GL_VERSION 0x1F02 +#define GL_EXTENSIONS 0x1F03 + +/* Errors */ +#define GL_NO_ERROR 0x0 +#define GL_INVALID_VALUE 0x0501 +#define GL_INVALID_ENUM 0x0500 +#define GL_INVALID_OPERATION 0x0502 +#define GL_STACK_OVERFLOW 0x0503 +#define GL_STACK_UNDERFLOW 0x0504 +#define GL_OUT_OF_MEMORY 0x0505 + +/* glPush/PopAttrib bits */ +#define GL_CURRENT_BIT 0x00000001 +#define GL_POINT_BIT 0x00000002 +#define GL_LINE_BIT 0x00000004 +#define GL_POLYGON_BIT 0x00000008 +#define GL_POLYGON_STIPPLE_BIT 0x00000010 +#define GL_PIXEL_MODE_BIT 0x00000020 +#define GL_LIGHTING_BIT 0x00000040 +#define GL_FOG_BIT 0x00000080 +#define GL_DEPTH_BUFFER_BIT 0x00000100 +#define GL_ACCUM_BUFFER_BIT 0x00000200 +#define GL_STENCIL_BUFFER_BIT 0x00000400 +#define GL_VIEWPORT_BIT 0x00000800 +#define GL_TRANSFORM_BIT 0x00001000 +#define GL_ENABLE_BIT 0x00002000 +#define GL_COLOR_BUFFER_BIT 0x00004000 +#define GL_HINT_BIT 0x00008000 +#define GL_EVAL_BIT 0x00010000 +#define GL_LIST_BIT 0x00020000 +#define GL_TEXTURE_BIT 0x00040000 +#define GL_SCISSOR_BIT 0x00080000 +#define GL_ALL_ATTRIB_BITS 0x000FFFFF + + +/* OpenGL 1.1 */ +#define GL_PROXY_TEXTURE_1D 0x8063 +#define GL_PROXY_TEXTURE_2D 0x8064 +#define GL_TEXTURE_PRIORITY 0x8066 +#define GL_TEXTURE_RESIDENT 0x8067 +#define GL_TEXTURE_BINDING_1D 0x8068 +#define GL_TEXTURE_BINDING_2D 0x8069 +#define GL_TEXTURE_INTERNAL_FORMAT 0x1003 +#define GL_ALPHA4 0x803B +#define GL_ALPHA8 0x803C +#define GL_ALPHA12 0x803D +#define GL_ALPHA16 0x803E +#define GL_LUMINANCE4 0x803F +#define GL_LUMINANCE8 0x8040 +#define GL_LUMINANCE12 0x8041 +#define GL_LUMINANCE16 0x8042 +#define GL_LUMINANCE4_ALPHA4 0x8043 +#define GL_LUMINANCE6_ALPHA2 0x8044 +#define GL_LUMINANCE8_ALPHA8 0x8045 +#define GL_LUMINANCE12_ALPHA4 0x8046 +#define GL_LUMINANCE12_ALPHA12 0x8047 +#define GL_LUMINANCE16_ALPHA16 0x8048 +#define GL_INTENSITY 0x8049 +#define GL_INTENSITY4 0x804A +#define GL_INTENSITY8 0x804B +#define GL_INTENSITY12 0x804C +#define GL_INTENSITY16 0x804D +#define GL_R3_G3_B2 0x2A10 +#define GL_RGB4 0x804F +#define GL_RGB5 0x8050 +#define GL_RGB8 0x8051 +#define GL_RGB10 0x8052 +#define GL_RGB12 0x8053 +#define GL_RGB16 0x8054 +#define GL_RGBA2 0x8055 +#define GL_RGBA4 0x8056 +#define GL_RGB5_A1 0x8057 +#define GL_RGBA8 0x8058 +#define GL_RGB10_A2 0x8059 +#define GL_RGBA12 0x805A +#define GL_RGBA16 0x805B +#define GL_CLIENT_PIXEL_STORE_BIT 0x00000001 +#define GL_CLIENT_VERTEX_ARRAY_BIT 0x00000002 +#define GL_ALL_CLIENT_ATTRIB_BITS 0xFFFFFFFF +#define GL_CLIENT_ALL_ATTRIB_BITS 0xFFFFFFFF + + +/* Under Windows, we do not define OpenGL 1.2 & 1.3 functionality, since + it is treated as extensions (defined in glext.h) */ +#if !defined(__WIN32__) + +/* OpenGL 1.2 */ +#define GL_RESCALE_NORMAL 0x803A +#define GL_CLAMP_TO_EDGE 0x812F +#define GL_MAX_ELEMENTS_VERTICES 0x80E8 +#define GL_MAX_ELEMENTS_INDICES 0x80E9 +#define GL_BGR 0x80E0 +#define GL_BGRA 0x80E1 +#define GL_UNSIGNED_BYTE_3_3_2 0x8032 +#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362 +#define GL_UNSIGNED_SHORT_5_6_5 0x8363 +#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364 +#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033 +#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365 +#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 +#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366 +#define GL_UNSIGNED_INT_8_8_8_8 0x8035 +#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 +#define GL_UNSIGNED_INT_10_10_10_2 0x8036 +#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 +#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8 +#define GL_SINGLE_COLOR 0x81F9 +#define GL_SEPARATE_SPECULAR_COLOR 0x81FA +#define GL_TEXTURE_MIN_LOD 0x813A +#define GL_TEXTURE_MAX_LOD 0x813B +#define GL_TEXTURE_BASE_LEVEL 0x813C +#define GL_TEXTURE_MAX_LEVEL 0x813D +#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12 +#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13 +#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22 +#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23 +#define GL_ALIASED_POINT_SIZE_RANGE 0x846D +#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E +#define GL_PACK_SKIP_IMAGES 0x806B +#define GL_PACK_IMAGE_HEIGHT 0x806C +#define GL_UNPACK_SKIP_IMAGES 0x806D +#define GL_UNPACK_IMAGE_HEIGHT 0x806E +#define GL_TEXTURE_3D 0x806F +#define GL_PROXY_TEXTURE_3D 0x8070 +#define GL_TEXTURE_DEPTH 0x8071 +#define GL_TEXTURE_WRAP_R 0x8072 +#define GL_MAX_3D_TEXTURE_SIZE 0x8073 +#define GL_TEXTURE_BINDING_3D 0x806A + +/* OpenGL 1.2 imaging subset */ +/* GL_EXT_color_table */ +#define GL_COLOR_TABLE 0x80D0 +#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1 +#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2 +#define GL_PROXY_COLOR_TABLE 0x80D3 +#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4 +#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5 +#define GL_COLOR_TABLE_SCALE 0x80D6 +#define GL_COLOR_TABLE_BIAS 0x80D7 +#define GL_COLOR_TABLE_FORMAT 0x80D8 +#define GL_COLOR_TABLE_WIDTH 0x80D9 +#define GL_COLOR_TABLE_RED_SIZE 0x80DA +#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB +#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC +#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD +#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE +#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF +/* GL_EXT_convolution and GL_HP_convolution_border_modes */ +#define GL_CONVOLUTION_1D 0x8010 +#define GL_CONVOLUTION_2D 0x8011 +#define GL_SEPARABLE_2D 0x8012 +#define GL_CONVOLUTION_BORDER_MODE 0x8013 +#define GL_CONVOLUTION_FILTER_SCALE 0x8014 +#define GL_CONVOLUTION_FILTER_BIAS 0x8015 +#define GL_REDUCE 0x8016 +#define GL_CONVOLUTION_FORMAT 0x8017 +#define GL_CONVOLUTION_WIDTH 0x8018 +#define GL_CONVOLUTION_HEIGHT 0x8019 +#define GL_MAX_CONVOLUTION_WIDTH 0x801A +#define GL_MAX_CONVOLUTION_HEIGHT 0x801B +#define GL_POST_CONVOLUTION_RED_SCALE 0x801C +#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D +#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E +#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F +#define GL_POST_CONVOLUTION_RED_BIAS 0x8020 +#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021 +#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022 +#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023 +#define GL_CONSTANT_BORDER 0x8151 +#define GL_REPLICATE_BORDER 0x8153 +#define GL_CONVOLUTION_BORDER_COLOR 0x8154 +/* GL_SGI_color_matrix */ +#define GL_COLOR_MATRIX 0x80B1 +#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2 +#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3 +#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4 +#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5 +#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6 +#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7 +#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8 +#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9 +#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA +#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB +/* GL_EXT_histogram */ +#define GL_HISTOGRAM 0x8024 +#define GL_PROXY_HISTOGRAM 0x8025 +#define GL_HISTOGRAM_WIDTH 0x8026 +#define GL_HISTOGRAM_FORMAT 0x8027 +#define GL_HISTOGRAM_RED_SIZE 0x8028 +#define GL_HISTOGRAM_GREEN_SIZE 0x8029 +#define GL_HISTOGRAM_BLUE_SIZE 0x802A +#define GL_HISTOGRAM_ALPHA_SIZE 0x802B +#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C +#define GL_HISTOGRAM_SINK 0x802D +#define GL_MINMAX 0x802E +#define GL_MINMAX_FORMAT 0x802F +#define GL_MINMAX_SINK 0x8030 +#define GL_TABLE_TOO_LARGE 0x8031 +/* GL_EXT_blend_color, GL_EXT_blend_minmax */ +#define GL_BLEND_EQUATION 0x8009 +#define GL_MIN 0x8007 +#define GL_MAX 0x8008 +#define GL_FUNC_ADD 0x8006 +#define GL_FUNC_SUBTRACT 0x800A +#define GL_FUNC_REVERSE_SUBTRACT 0x800B +#define GL_BLEND_COLOR 0x8005 + + +/* OpenGL 1.3 */ +/* multitexture */ +#define GL_TEXTURE0 0x84C0 +#define GL_TEXTURE1 0x84C1 +#define GL_TEXTURE2 0x84C2 +#define GL_TEXTURE3 0x84C3 +#define GL_TEXTURE4 0x84C4 +#define GL_TEXTURE5 0x84C5 +#define GL_TEXTURE6 0x84C6 +#define GL_TEXTURE7 0x84C7 +#define GL_TEXTURE8 0x84C8 +#define GL_TEXTURE9 0x84C9 +#define GL_TEXTURE10 0x84CA +#define GL_TEXTURE11 0x84CB +#define GL_TEXTURE12 0x84CC +#define GL_TEXTURE13 0x84CD +#define GL_TEXTURE14 0x84CE +#define GL_TEXTURE15 0x84CF +#define GL_TEXTURE16 0x84D0 +#define GL_TEXTURE17 0x84D1 +#define GL_TEXTURE18 0x84D2 +#define GL_TEXTURE19 0x84D3 +#define GL_TEXTURE20 0x84D4 +#define GL_TEXTURE21 0x84D5 +#define GL_TEXTURE22 0x84D6 +#define GL_TEXTURE23 0x84D7 +#define GL_TEXTURE24 0x84D8 +#define GL_TEXTURE25 0x84D9 +#define GL_TEXTURE26 0x84DA +#define GL_TEXTURE27 0x84DB +#define GL_TEXTURE28 0x84DC +#define GL_TEXTURE29 0x84DD +#define GL_TEXTURE30 0x84DE +#define GL_TEXTURE31 0x84DF +#define GL_ACTIVE_TEXTURE 0x84E0 +#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1 +#define GL_MAX_TEXTURE_UNITS 0x84E2 +/* texture_cube_map */ +#define GL_NORMAL_MAP 0x8511 +#define GL_REFLECTION_MAP 0x8512 +#define GL_TEXTURE_CUBE_MAP 0x8513 +#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518 +#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519 +#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A +#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B +#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C +/* texture_compression */ +#define GL_COMPRESSED_ALPHA 0x84E9 +#define GL_COMPRESSED_LUMINANCE 0x84EA +#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB +#define GL_COMPRESSED_INTENSITY 0x84EC +#define GL_COMPRESSED_RGB 0x84ED +#define GL_COMPRESSED_RGBA 0x84EE +#define GL_TEXTURE_COMPRESSION_HINT 0x84EF +#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0 +#define GL_TEXTURE_COMPRESSED 0x86A1 +#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 +#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 +/* multisample */ +#define GL_MULTISAMPLE 0x809D +#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E +#define GL_SAMPLE_ALPHA_TO_ONE 0x809F +#define GL_SAMPLE_COVERAGE 0x80A0 +#define GL_SAMPLE_BUFFERS 0x80A8 +#define GL_SAMPLES 0x80A9 +#define GL_SAMPLE_COVERAGE_VALUE 0x80AA +#define GL_SAMPLE_COVERAGE_INVERT 0x80AB +#define GL_MULTISAMPLE_BIT 0x20000000 +/* transpose_matrix */ +#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3 +#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4 +#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5 +#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6 +/* texture_env_combine */ +#define GL_COMBINE 0x8570 +#define GL_COMBINE_RGB 0x8571 +#define GL_COMBINE_ALPHA 0x8572 +#define GL_SOURCE0_RGB 0x8580 +#define GL_SOURCE1_RGB 0x8581 +#define GL_SOURCE2_RGB 0x8582 +#define GL_SOURCE0_ALPHA 0x8588 +#define GL_SOURCE1_ALPHA 0x8589 +#define GL_SOURCE2_ALPHA 0x858A +#define GL_OPERAND0_RGB 0x8590 +#define GL_OPERAND1_RGB 0x8591 +#define GL_OPERAND2_RGB 0x8592 +#define GL_OPERAND0_ALPHA 0x8598 +#define GL_OPERAND1_ALPHA 0x8599 +#define GL_OPERAND2_ALPHA 0x859A +#define GL_RGB_SCALE 0x8573 +#define GL_ADD_SIGNED 0x8574 +#define GL_INTERPOLATE 0x8575 +#define GL_SUBTRACT 0x84E7 +#define GL_CONSTANT 0x8576 +#define GL_PRIMARY_COLOR 0x8577 +#define GL_PREVIOUS 0x8578 +/* texture_env_dot3 */ +#define GL_DOT3_RGB 0x86AE +#define GL_DOT3_RGBA 0x86AF +/* texture_border_clamp */ +#define GL_CLAMP_TO_BORDER 0x812D + +#endif /* __WIN32__ */ + + + +/********************************************************************** ** + * + * Function prototypes + * + ************************************************************************ / + +/* Miscellaneous */ +GLAPI void APIENTRY glClearIndex( GLfloat c ); +GLAPI void APIENTRY glClearColor( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha ); +GLAPI void APIENTRY glClear( GLbitfield mask ); +GLAPI void APIENTRY glIndexMask( GLuint mask ); +GLAPI void APIENTRY glColorMask( GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha ); +GLAPI void APIENTRY glAlphaFunc( GLenum func, GLclampf ref ); +GLAPI void APIENTRY glBlendFunc( GLenum sfactor, GLenum dfactor ); +GLAPI void APIENTRY glLogicOp( GLenum opcode ); +GLAPI void APIENTRY glCullFace( GLenum mode ); +GLAPI void APIENTRY glFrontFace( GLenum mode ); +GLAPI void APIENTRY glPointSize( GLfloat size ); [truncated at 1000 lines; 132131 more skipped]

19 years, 8 months

[ion] 15097: Wipe out current includes to start fresh.

by ion＠svn.reactos.com

Wipe out current includes to start fresh. Deleted: branches/new_headers/reactos/include/ Deleted: branches/new_headers/reactos/w32api/

19 years, 8 months

[ion] 15096: New Headers Branch. Final version.

by ion＠svn.reactos.com

New Headers Branch. Final version. Added: branches/new_headers/reactos/ _____ Copied: branches/new_headers/reactos (from rev 15095, trunk/reactos)

19 years, 8 months

[ion] 15095: New Headers Branch. Final version.

by ion＠svn.reactos.com

New Headers Branch. Final version. Added: branches/new_headers/

19 years, 8 months

[ion] 15094: Delete my outdated headers branch.

by ion＠svn.reactos.com

Delete my outdated headers branch. Deleted: branches/new_headers/

19 years, 8 months

[ion] 15093: Delete my branch. Everything has been merged in

by ion＠svn.reactos.com

Delete my branch. Everything has been merged in Deleted: branches/alex_devel_branch/

19 years, 8 months

[greatlrd] 15092: Fireball patch for fixing RtlUnicodeStringToInteger and RtlCharToInteger

by greatlrd＠svn.reactos.com

Fireball patch for fixing RtlUnicodeStringToInteger and RtlCharToInteger <Fireball> Imported WINE's RtlUnicodeStringToInteger and RtlCharToInteger - they were seriously broken in our revision. Thanks to GreatLord for his help pointing out this bug with me :) Modified: trunk/reactos/lib/rtl/unicode.c _____ Modified: trunk/reactos/lib/rtl/unicode.c --- trunk/reactos/lib/rtl/unicode.c 2005-05-07 21:24:31 UTC (rev 15091) +++ trunk/reactos/lib/rtl/unicode.c 2005-05-07 22:17:03 UTC (rev 15092) @@ -154,50 +154,95 @@ } -/* +/********************************************************************** **** + * RtlCharToInteger (NTDLL.@) * @implemented + * Converts a character string into its integer equivalent. + * + * RETURNS + * Success: STATUS_SUCCESS. value contains the converted number + * Failure: STATUS_INVALID_PARAMETER, if base is not 0, 2, 8, 10 or 16. + * STATUS_ACCESS_VIOLATION, if value is NULL. + * + * NOTES + * For base 0 it uses 10 as base and the string should be in the format + * "{whitespace} [+|-] [0[x|o|b]] {digits}". + * For other bases the string should be in the format + * "{whitespace} [+|-] {digits}". + * No check is made for value overflow, only the lower 32 bits are assigned. + * If str is NULL it crashes, as the native function does. + * + * DIFFERENCES + * This function does not read garbage behind '\0' as the native version does. */ NTSTATUS STDCALL RtlCharToInteger( - IN PCSZ String, - IN ULONG Base, - IN OUT PULONG Value) + PCSZ str, /* [I] '\0' terminated single-byte string containing a number */ + ULONG base, /* [I] Number base for conversion (allowed 0, 2, 8, 10 or 16) */ + PULONG value) /* [O] Destination for the converted value */ { - ULONG Val; + CHAR chCurrent; + int digit; + ULONG RunningTotal = 0; + char bMinus = 0; - *Value = 0; + while (*str != '\0' && *str <= ' ') { + str++; + } /* while */ - if (Base == 0) - { - Base = 10; - if (*String == '0') - { - Base = 8; - String++; - if ((*String == 'x') && isxdigit (String[1])) - { - String++; - Base = 16; - } - } - } + if (*str == '+') { + str++; + } else if (*str == '-') { + bMinus = 1; + str++; + } /* if */ - if (!isxdigit (*String)) - return STATUS_INVALID_PARAMETER; + if (base == 0) { + base = 10; + if (str[0] == '0') { + if (str[1] == 'b') { + str += 2; + base = 2; + } else if (str[1] == 'o') { + str += 2; + base = 8; + } else if (str[1] == 'x') { + str += 2; + base = 16; + } /* if */ + } /* if */ + } else if (base != 2 && base != 8 && base != 10 && base != 16) { + return STATUS_INVALID_PARAMETER; + } /* if */ - while (isxdigit (*String) && - (Val = isdigit (*String) ? * String - '0' : (islower (*String) - ? toupper (*String) : *String) - 'A' + 10) < Base) - { - *Value = *Value * Base + Val; - String++; - } + if (value == NULL) { + return STATUS_ACCESS_VIOLATION; + } /* if */ - return STATUS_SUCCESS; -} + while (*str != '\0') { + chCurrent = *str; + if (chCurrent >= '0' && chCurrent <= '9') { + digit = chCurrent - '0'; + } else if (chCurrent >= 'A' && chCurrent <= 'Z') { + digit = chCurrent - 'A' + 10; + } else if (chCurrent >= 'a' && chCurrent <= 'z') { + digit = chCurrent - 'a' + 10; + } else { + digit = -1; + } /* if */ + if (digit < 0 || digit >= base) { + *value = bMinus ? -RunningTotal : RunningTotal; + return STATUS_SUCCESS; + } /* if */ + RunningTotal = RunningTotal * base + digit; + str++; + } /* while */ + *value = bMinus ? -RunningTotal : RunningTotal; + return STATUS_SUCCESS; +} /* * @implemented @@ -807,113 +852,113 @@ return FALSE; } - - -/* +/********************************************************************** **** + * RtlUnicodeStringToInteger (NTDLL.@) * @implemented + * Converts an unicode string into its integer equivalent. * - * Note that regardless of success or failure status, we should leave the - * partial value in Value. An error is never returned based on the chars - * in the string. + * RETURNS + * Success: STATUS_SUCCESS. value contains the converted number + * Failure: STATUS_INVALID_PARAMETER, if base is not 0, 2, 8, 10 or 16. + * STATUS_ACCESS_VIOLATION, if value is NULL. * - * This function does check the base. Only 2, 8, 10, 16 are permitted, - * else STATUS_INVALID_PARAMETER is returned. + * NOTES + * For base 0 it uses 10 as base and the string should be in the format + * "{whitespace} [+|-] [0[x|o|b]] {digits}". + * For other bases the string should be in the format + * "{whitespace} [+|-] {digits}". + * No check is made for value overflow, only the lower 32 bits are assigned. + * If str is NULL it crashes, as the native function does. + * + * Note that regardless of success or failure status, we should leave the + * partial value in Value. An error is never returned based on the chars + * in the string. + * + * DIFFERENCES + * This function does not read garbage on string length 0 as the native + * version does. */ NTSTATUS STDCALL RtlUnicodeStringToInteger( - IN PUNICODE_STRING String, - IN ULONG Base, - OUT PULONG Value) + PUNICODE_STRING str, /* [I] Unicode string to be converted */ + ULONG base, /* [I] Number base for conversion (allowed 0, 2, 8, 10 or 16) */ + PULONG value) /* [O] Destination for the converted value */ { - PWCHAR Str; - ULONG lenmin = 0; - ULONG i; - ULONG Val; - BOOLEAN addneg = FALSE; - NTSTATUS Status = STATUS_SUCCESS; + LPWSTR lpwstr = str->Buffer; + USHORT CharsRemaining = str->Length / sizeof(WCHAR); + WCHAR wchCurrent; + int digit; + ULONG RunningTotal = 0; + char bMinus = 0; - *Value = 0; - Str = String->Buffer; + while (CharsRemaining >= 1 && *lpwstr <= ' ') { + lpwstr++; + CharsRemaining--; + } /* while */ - if( Base && Base != 2 && Base != 8 && Base != 10 && Base != 16 ) - return STATUS_INVALID_PARAMETER; + if (CharsRemaining >= 1) { + if (*lpwstr == '+') { + lpwstr++; + CharsRemaining--; + } else if (*lpwstr == '-') { + bMinus = 1; + lpwstr++; + CharsRemaining--; + } /* if */ + } /* if */ - for (i = 0; i < String->Length / sizeof(WCHAR); i++) - { - if (*Str == L'b') - { - Base = 2; - lenmin++; - } - else if (*Str == L'o') - { - Base = 8; - lenmin++; - } - else if (*Str == L'd') - { - Base = 10; - lenmin++; - } - else if (*Str == L'x') - { - Base = 16; - lenmin++; - } - else if (*Str == L'+') - { - lenmin++; - } - else if (*Str == L'-') - { - addneg = TRUE; - lenmin++; - } - else if ((*Str > L'1') && (Base == 2)) - { - break; - } - else if (((*Str > L'7') || (*Str < L'0')) && (Base == 8)) - { - break; - } - else if (((*Str > L'9') || (*Str < L'0')) && (Base == 10)) - { - break; - } - else if ( ((*Str > L'9') || (*Str < L'0')) && - ((towupper (*Str) > L'F') || (towupper (*Str) < L'A')) && - (Base == 16)) - { - break; - } - Str++; - } + if (base == 0) { + base = 10; + if (CharsRemaining >= 2 && lpwstr[0] == '0') { + if (lpwstr[1] == 'b') { + lpwstr += 2; + CharsRemaining -= 2; + base = 2; + } else if (lpwstr[1] == 'o') { + lpwstr += 2; + CharsRemaining -= 2; + base = 8; + } else if (lpwstr[1] == 'x') { + lpwstr += 2; + CharsRemaining -= 2; + base = 16; + } /* if */ + } /* if */ + } else if (base != 2 && base != 8 && base != 10 && base != 16) { + return STATUS_INVALID_PARAMETER; + } /* if */ - Str = String->Buffer + lenmin; + if (value == NULL) { + return STATUS_ACCESS_VIOLATION; + } /* if */ - if (Base == 0) - Base = 10; + while (CharsRemaining >= 1) { + wchCurrent = *lpwstr; + if (wchCurrent >= '0' && wchCurrent <= '9') { + digit = wchCurrent - '0'; + } else if (wchCurrent >= 'A' && wchCurrent <= 'Z') { + digit = wchCurrent - 'A' + 10; + } else if (wchCurrent >= 'a' && wchCurrent <= 'z') { + digit = wchCurrent - 'a' + 10; + } else { + digit = -1; + } /* if */ + if (digit < 0 || digit >= base) { + *value = bMinus ? -RunningTotal : RunningTotal; + return STATUS_SUCCESS; + } /* if */ - while (iswxdigit (*Str) && - (Val = - iswdigit (*Str) ? - *Str - L'0' : - (towupper (*Str) - L'A' + 10)) < Base) - { - *Value = *Value * Base + Val; - Str++; - } + RunningTotal = RunningTotal * base + digit; + lpwstr++; + CharsRemaining--; + } /* while */ - if (addneg == TRUE) - *Value *= -1; - - return Status; + *value = bMinus ? -RunningTotal : RunningTotal; + return STATUS_SUCCESS; } - /* * @implemented *

19 years, 8 months

[sedwards] 15091: remove trailing whitespace at end of lines

by sedwards＠svn.reactos.com

remove trailing whitespace at end of lines Modified: trunk/rosapps/cmdutils/mode/mode.c Modified: trunk/rosapps/cmdutils/more.c Modified: trunk/rosapps/cmdutils/tee.c Modified: trunk/rosapps/cmdutils/touch/touch.c Modified: trunk/rosapps/cmdutils/y.c Modified: trunk/rosapps/demos/maze/maze.c Modified: trunk/rosapps/demos/maze/resource.h Modified: trunk/rosapps/devutils/zoomin/framewnd.c Modified: trunk/rosapps/devutils/zoomin/main.c Modified: trunk/rosapps/dflat32/applicat.c Modified: trunk/rosapps/dflat32/classes.h Modified: trunk/rosapps/dflat32/config.c Modified: trunk/rosapps/dflat32/dialbox.c Modified: trunk/rosapps/dflat32/fileopen.c Modified: trunk/rosapps/dflat32/listbox.c Modified: trunk/rosapps/dflat32/memopad.c Modified: trunk/rosapps/dflat32/menu.h Modified: trunk/rosapps/dflat32/menubar.c Modified: trunk/rosapps/dflat32/message.c Modified: trunk/rosapps/dflat32/msgbox.c Modified: trunk/rosapps/dflat32/pictbox.c Modified: trunk/rosapps/dflat32/popdown.c Modified: trunk/rosapps/dflat32/statbar.c Modified: trunk/rosapps/dflat32/sysmenu.c Modified: trunk/rosapps/dflat32/textbox.c Modified: trunk/rosapps/games/solitaire/resource.h Modified: trunk/rosapps/lib/dflat32/applicat.c Modified: trunk/rosapps/lib/dflat32/config.c Modified: trunk/rosapps/lib/dflat32/dialbox.c Modified: trunk/rosapps/lib/dflat32/dllmain.c Modified: trunk/rosapps/lib/dflat32/listbox.c Modified: trunk/rosapps/lib/dflat32/menubar.c Modified: trunk/rosapps/lib/dflat32/message.c Modified: trunk/rosapps/lib/dflat32/msgbox.c Modified: trunk/rosapps/lib/dflat32/pictbox.c Modified: trunk/rosapps/lib/dflat32/popdown.c Modified: trunk/rosapps/lib/dflat32/statbar.c Modified: trunk/rosapps/lib/dflat32/stubs.c Modified: trunk/rosapps/lib/dflat32/sysmenu.c Modified: trunk/rosapps/mc/acconfig.h Modified: trunk/rosapps/mc/config.h Modified: trunk/rosapps/mc/edit/edit.c Modified: trunk/rosapps/mc/edit/edit.h Modified: trunk/rosapps/mc/edit/edit_key_translator.c Modified: trunk/rosapps/mc/edit/editcmd.c Modified: trunk/rosapps/mc/edit/editdraw.c Modified: trunk/rosapps/mc/edit/editmenu.c Modified: trunk/rosapps/mc/edit/editwidget.c Modified: trunk/rosapps/mc/edit/syntax.c Modified: trunk/rosapps/mc/edit/wordproc.c Modified: trunk/rosapps/mc/pc/chmod.c Modified: trunk/rosapps/mc/pc/config.h Modified: trunk/rosapps/mc/pc/cons_nt.c Modified: trunk/rosapps/mc/pc/cons_os2.c Modified: trunk/rosapps/mc/pc/dirent_nt.c Modified: trunk/rosapps/mc/pc/dirent_os2.c Modified: trunk/rosapps/mc/pc/drive.c Modified: trunk/rosapps/mc/pc/key_nt.c Modified: trunk/rosapps/mc/pc/key_os2.c Modified: trunk/rosapps/mc/pc/slint_pc.c Modified: trunk/rosapps/mc/pc/trace_nt.c Modified: trunk/rosapps/mc/pc/trace_nt.h Modified: trunk/rosapps/mc/pc/util_nt.c Modified: trunk/rosapps/mc/pc/util_os2.c Modified: trunk/rosapps/mc/pc/util_win32.c Modified: trunk/rosapps/mc/pc/util_win32.h Modified: trunk/rosapps/mc/pc/util_winnt.c Modified: trunk/rosapps/mc/slang/_slang.h Modified: trunk/rosapps/mc/slang/jdmacros.h Modified: trunk/rosapps/mc/slang/slang.h Modified: trunk/rosapps/mc/slang/sldisply.c Modified: trunk/rosapps/mc/slang/slerr.c Modified: trunk/rosapps/mc/slang/slgetkey.c Modified: trunk/rosapps/mc/slang/slmemcpy.c Modified: trunk/rosapps/mc/slang/slmemset.c Modified: trunk/rosapps/mc/slang/slos2tty.c Modified: trunk/rosapps/mc/slang/slsignal.c Modified: trunk/rosapps/mc/slang/slsmg.c Modified: trunk/rosapps/mc/slang/sltermin.c Modified: trunk/rosapps/mc/slang/sltoken.c Modified: trunk/rosapps/mc/slang/slutty.c Modified: trunk/rosapps/mc/slang/slvideo.c Modified: trunk/rosapps/mc/slang/slw32tty.c Modified: trunk/rosapps/mc/src/achown.c Modified: trunk/rosapps/mc/src/background.c Modified: trunk/rosapps/mc/src/boxes.c Modified: trunk/rosapps/mc/src/chmod.c Modified: trunk/rosapps/mc/src/chown.c Modified: trunk/rosapps/mc/src/cmd.c Modified: trunk/rosapps/mc/src/cmd.h Modified: trunk/rosapps/mc/src/color.c Modified: trunk/rosapps/mc/src/color.h Modified: trunk/rosapps/mc/src/command.c Modified: trunk/rosapps/mc/src/complete.c Modified: trunk/rosapps/mc/src/cons.handler.c Modified: trunk/rosapps/mc/src/cons.saver.c Modified: trunk/rosapps/mc/src/dialog.c Modified: trunk/rosapps/mc/src/dir.c Modified: trunk/rosapps/mc/src/dir.h Modified: trunk/rosapps/mc/src/dlg.c [truncated at 100 lines; 285 more skipped] _____ Modified: trunk/rosapps/cmdutils/mode/mode.c --- trunk/rosapps/cmdutils/mode/mode.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/cmdutils/mode/mode.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -32,7 +32,7 @@ #define NUM_ELEMENTS(a) (sizeof(a)/sizeof(a[0])) #define ASSERT(a) -const TCHAR* const usage_strings[] = { +const TCHAR* const usage_strings[] = { _T("Device Status: MODE [device] [/STATUS]"), _T("Select code page: MODE CON[:] CP SELECT=yyy"), _T("Code page status: MODE CON[:] CP [/STATUS]"), @@ -45,7 +45,7 @@ _T(" [rts=on|off|hs|tg] [idsr=on|off]"), }; -const TCHAR* const parity_strings[] = { +const TCHAR* const parity_strings[] = { _T("None"), // default _T("Odd"), // only symbol in this set to have a 'd' in it _T("Even"), // ... 'v' in it @@ -75,7 +75,7 @@ TCHAR buffer[10240]; int len; TCHAR* ptr = buffer; - + *ptr = '\0'; if (QueryDosDevice(NULL, buffer, NUM_ELEMENTS(buffer))) { while (*ptr != '\0') { @@ -146,7 +146,7 @@ return 0; } -static +static BOOL SerialPortQuery(int nPortNum, LPDCB pDCB, LPCOMMTIMEOUTS pCommTimeouts, BOOL bWrite) { BOOL result; @@ -270,7 +270,7 @@ return 0; } -static +static int ExtractModeSerialParams(const TCHAR* param) { if ( _tcsstr(param, _T("OFF"))) { @@ -428,7 +428,7 @@ goto show_status; } else if (_tcsstr(param1, _T("lpt"))) { nPortNum = find_portnum(param1); - if (nPortNum != -1) + if (nPortNum != -1) return ShowParallelStatus(nPortNum); } else if (_tcsstr(param1, _T("con"))) { return ShowConsoleStatus(); _____ Modified: trunk/rosapps/cmdutils/more.c --- trunk/rosapps/cmdutils/more.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/cmdutils/more.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -1,10 +1,10 @@ -/* +/* * MORE.C - external command. * * clone from 4nt more command * * 26 Sep 1999 - Paolo Pantaleo <paolopan(a)freemail.it> - * started + * started * Oct 2003 - Timothy Schepens <tischepe at fastmail dot fm> * use window size instead of buffer size. */ _____ Modified: trunk/rosapps/cmdutils/tee.c --- trunk/rosapps/cmdutils/tee.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/cmdutils/tee.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -1,10 +1,10 @@ -/* +/* * TEE.C - external command. * * clone from 4nt tee command * * 01 Sep 1999 - Paolo Pantaleo <paolopan(a)freemail.it> - * started + * started * * */ @@ -69,7 +69,7 @@ /*handle for file and console*/ HANDLE hConsoleIn,hConsoleOut; - + /*bytes written by WriteFile and ReadFile*/ DWORD dwRead,dwWritten; @@ -82,7 +82,7 @@ INT i; BOOL bQuote; - /*file list implementation*/ + /*file list implementation*/ LPTSTR *files; INT iFileCounter=0; HANDLE *hFile; @@ -140,7 +140,7 @@ /* if( iFileCounter >= sizeof(files) / sizeof(*files) ) { - ConErrPrintf("too many files, maximum is %d\n",sizeof(files) / sizeof(*files)); + ConErrPrintf("too many files, maximum is %d\n",sizeof(files) / sizeof(*files)); return 1; } */ @@ -150,7 +150,7 @@ /*open file(s)*/ for(i=0;i<iFileCounter;i++) - { + { //l=0; hFile[i] = CreateFile(files[i],GENERIC_WRITE, 0,NULL, _____ Modified: trunk/rosapps/cmdutils/touch/touch.c --- trunk/rosapps/cmdutils/touch/touch.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/cmdutils/touch/touch.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -204,10 +204,10 @@ { struct tm *t; int yearset; - char *p; + char *p; /* Start with the current time. */ if ((t = localtime(&tvp[0])) == NULL) - err(1, "localtime"); DbgPrint("[%s]", "[23]"); + err(1, "localtime"); DbgPrint("[%s]", "[23]"); /* [[CC]YY]MMDDhhmm[.SS] */ if ((p = strchr(arg, '.')) == NULL) t->tm_sec = 0; /* Seconds defaults to 0. */ @@ -217,7 +217,7 @@ *p++ = '\0'; t->tm_sec = ATOI2(p); } - + yearset = 0; switch(strlen(arg)) { case 12: /* CCYYMMDDhhmm */ _____ Modified: trunk/rosapps/cmdutils/y.c --- trunk/rosapps/cmdutils/y.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/cmdutils/y.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -80,7 +80,7 @@ for (i = 1; i < argc; i++) { hFind=FindFirstFile(argv[i],&FindData); - + if (hFind==INVALID_HANDLE_VALUE) { ConErrPrintf("File not found - %s\n",argv[i]); @@ -107,7 +107,7 @@ if (dwRead>0 && bRet) WriteFile(hConsoleOut,buff,dwRead,&dwWritten,NULL); - + } while(dwRead>0 && bRet); CloseHandle(hFile); _____ Modified: trunk/rosapps/demos/maze/maze.c --- trunk/rosapps/demos/maze/maze.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/demos/maze/maze.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -13,36 +13,36 @@ * screenhack stuff. There's still some work that could * be done on this, particularly allowing a resource to * specify how big the squares are. - * modified: [ 10-4-88 ] Richard Hess ...!uunet!cimshop!rhess + * modified: [ 10-4-88 ] Richard Hess ...!uunet!cimshop!rhess * [ Revised primary execution loop within main()... * [ Extended X event handler, check_events()... - * modified: [ 1-29-88 ] Dave Lemke lemke(a)sun.com + * modified: [ 1-29-88 ] Dave Lemke lemke(a)sun.com * [ Hacked for X11... - * [ Note the word "hacked" -- this is extremely ugly, but at - * [ least it does the job. NOT a good programming example + * [ Note the word "hacked" -- this is extremely ugly, but at + * [ least it does the job. NOT a good programming example * [ for X. * original: [ 6/21/85 ] Martin Weiss Sun Microsystems [ SunView ] * ************************************************************************ ****** Copyright 1988 by Sun Microsystems, Inc. Mountain View, CA. - + All Rights Reserved - + Permission to use, copy, modify, and distribute this software and its - documentation for any purpose and without fee is hereby granted, + documentation for any purpose and without fee is hereby granted, provided that the above copyright notice appear in all copies and that - both that copyright notice and this permission notice appear in + both that copyright notice and this permission notice appear in supporting documentation, and that the names of Sun or MIT not be used in advertising or publicity pertaining to distribution of the - software without specific prior written permission. Sun and M.I.T. - make no representations about the suitability of this software for + software without specific prior written permission. Sun and M.I.T. + make no representations about the suitability of this software for any purpose. It is provided "as is" without any express or implied warranty. - + SUN DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SUN BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS - OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ************************************************************************ *****/ @@ -115,7 +115,7 @@ unsigned char x; unsigned char y; unsigned char dir; - unsigned char dummy; + unsigned char dummy; } move_list[MOVE_LIST_SIZE], save_path[MOVE_LIST_SIZE], path[MOVE_LIST_SIZE]; static int maze_size_x, maze_size_y; @@ -139,50 +139,50 @@ initialize_maze() /* draw the surrounding wall and start/end squares */ { register int i, j, wall; - + /* initialize all squares */ for ( i=0; i<maze_size_x; i++) { for ( j=0; j<maze_size_y; j++) { maze[i][j] = 0; } } - + /* top wall */ for ( i=0; i<maze_size_x; i++ ) { maze[i][0] |= WALL_TOP; } - + /* right wall */ for ( j=0; j<maze_size_y; j++ ) { maze[maze_size_x-1][j] |= WALL_RIGHT; } - + /* bottom wall */ for ( i=0; i<maze_size_x; i++ ) { maze[i][maze_size_y-1] |= WALL_BOTTOM; } - + /* left wall */ for ( j=0; j<maze_size_y; j++ ) { maze[0][j] |= WALL_LEFT; } - + /* set start square */ wall = get_random(4); switch (wall) { - case 0: + case 0: i = get_random(maze_size_x); j = 0; break; - case 1: + case 1: i = maze_size_x - 1; j = get_random(maze_size_y); break; - case 2: + case 2: i = get_random(maze_size_x); j = maze_size_y - 1; break; - case 3: + case 3: i = 0; j = get_random(maze_size_y); break; @@ -196,7 +196,7 @@ start_y = j; start_dir = wall; sqnum = 0; - + /* set end square */ wall = (wall + 2)%4; switch (wall) { @@ -236,7 +236,7 @@ { register int i, newdoor = 0; HDC hDC; - + hDC = GetDC(hWnd); do { move_list[sqnum].x = cur_sq_x; @@ -248,10 +248,10 @@ return; /* done ... return */ } } - + /* mark the out door */ maze[cur_sq_x][cur_sq_y] |= ( DOOR_OUT_TOP >> newdoor ); - + switch (newdoor) { case 0: cur_sq_y--; break; @@ -263,10 +263,10 @@ break; } sqnum++; - + /* mark the in door */ maze[cur_sq_x][cur_sq_y] |= ( DOOR_IN_TOP >> ((newdoor+2)%4) ); - + /* if end square set path length and save path */ if ( maze[cur_sq_x][cur_sq_y] & END_SQUARE ) { path_length = sqnum; @@ -276,9 +276,9 @@ save_path[i].dir = move_list[i].dir; } } - + } while (1); - + } @@ -287,9 +287,9 @@ { int candidates[3]; register int num_candidates; - + num_candidates = 0; - + /* top wall */ if ( maze[cur_sq_x][cur_sq_y] & DOOR_IN_TOP ) goto rightwall; @@ -304,7 +304,7 @@ goto rightwall; } candidates[num_candidates++] = 0; - + rightwall: /* right wall */ if ( maze[cur_sq_x][cur_sq_y] & DOOR_IN_RIGHT ) @@ -320,7 +320,7 @@ goto bottomwall; } candidates[num_candidates++] = 1; - + bottomwall: /* bottom wall */ if ( maze[cur_sq_x][cur_sq_y] & DOOR_IN_BOTTOM ) @@ -336,7 +336,7 @@ goto leftwall; } candidates[num_candidates++] = 2; - + leftwall: /* left wall */ if ( maze[cur_sq_x][cur_sq_y] & DOOR_IN_LEFT ) @@ -352,14 +352,14 @@ goto donewall; } candidates[num_candidates++] = 3; - + donewall: if (num_candidates == 0) return ( -1 ); if (num_candidates == 1) return ( candidates[0] ); return ( candidates[ get_random(num_candidates) ] ); - + } @@ -385,19 +385,19 @@ RECT rc; switch (dir) { - case 0: + case 0: rc.left = border_x + bw + grid_width * i; rc.right = rc.left + grid_width - (bw + bw); rc.top = border_y - bw + grid_height * j; rc.bottom = rc.top + grid_height; break; - case 1: + case 1: rc.left = border_x + bw + grid_width * i; rc.right = rc.left + grid_width; rc.top = border_y + bw + grid_height * j; rc.bottom = rc.top + grid_height - (bw + bw); break; - case 2: + case 2: rc.left = border_x + bw + grid_width * i; rc.right = rc.left + grid_width - (bw + bw); rc.top = border_y + bw + grid_height * j; @@ -418,8 +418,8 @@ { register int i, j; HBRUSH hBrush; - - + + for ( i=0; i<maze_size_x; i++) { if ( maze[i][0] & WALL_TOP ) { MoveToEx(hDC, border_x + grid_width * i, border_y, NULL); @@ -459,7 +459,7 @@ switch (dir) { case 0: MoveToEx(hDC, border_x + grid_width * i, border_y + grid_height * j, NULL); - (void) LineTo(hDC, border_x + grid_width * (i+1), + (void) LineTo(hDC, border_x + grid_width * (i+1), border_y + grid_height * j); break; case 1: @@ -471,13 +471,13 @@ case 2: MoveToEx(hDC, border_x + grid_width * i, border_y + grid_height * (j+1), NULL); - (void) LineTo(hDC, border_x + grid_width * (i+1), + (void) LineTo(hDC, border_x + grid_width * (i+1), border_y + grid_height * (j+1)); break; case 3: MoveToEx(hDC, border_x + grid_width * i, border_y + grid_height * j, NULL); - (void) LineTo(hDC, border_x + grid_width * i, + (void) LineTo(hDC, border_x + grid_width * i, border_y + grid_height * (j+1)); break; } @@ -497,11 +497,11 @@ 0xaaaaaaaa }; static RGBQUAD argbq[] = { - { 0, 0, 255, 0 }, + { 0, 0, 255, 0 }, { 255, 255, 255, 0 } }; BITMAPINFO *pbmi; - + hDC = GetDC(hWnd); pbmi = malloc(sizeof(BITMAPINFOHEADER) + sizeof(argbq) + sizeof(grayPattern)); pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); @@ -525,31 +525,31 @@ /* plug up the surrounding wall */ maze[start_x][start_y] |= (WALL_TOP >> start_dir); maze[end_x][end_y] |= (WALL_TOP >> end_dir); - + /* initialize search path */ pathi = 0; path[pathi].x = end_x; path[pathi].y = end_y; path[pathi].dir = -1; } - + static int solve_maze() /* solve it with graphical feedback */ { int ret; int action_done; - + do { action_done = 1; if ( ++path[pathi].dir >= 4 ) { pathi--; - draw_solid_square( (int)(path[pathi].x), (int)(path[pathi].y), + draw_solid_square( (int)(path[pathi].x), (int)(path[pathi].y), (int)(path[pathi].dir), hDC, hBrushDead); ret = 0; } - else if ( ! (maze[path[pathi].x][path[pathi].y] & - (WALL_TOP >> path[pathi].dir)) && - ( (pathi == 0) || ( (path[pathi].dir != + else if ( ! (maze[path[pathi].x][path[pathi].y] & + (WALL_TOP >> path[pathi].dir)) && + ( (pathi == 0) || ( (path[pathi].dir != (int)(path[pathi-1].dir+2)%4) ) ) ) { enter_square(pathi, hDC, hBrushLiving); pathi++; @@ -567,15 +567,15 @@ } while (! action_done); return ret; -} +} static void enter_square(int n, HDC hDC, HBRUSH hBrush) /* move into a neighboring square */ { - draw_solid_square( (int)path[n].x, (int)path[n].y, + draw_solid_square( (int)path[n].x, (int)path[n].y, (int)path[n].dir, hDC, hBrush); - + path[n+1].dir = -1; switch (path[n].dir) { case 0: path[n+1].x = path[n].x; _____ Modified: trunk/rosapps/demos/maze/resource.h --- trunk/rosapps/demos/maze/resource.h 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/demos/maze/resource.h 2005-05-07 21:24:31 UTC (rev 15091) @@ -4,7 +4,7 @@ // // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS _____ Modified: trunk/rosapps/devutils/zoomin/framewnd.c --- trunk/rosapps/devutils/zoomin/framewnd.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/devutils/zoomin/framewnd.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -23,7 +23,7 @@ #define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers #include <windows.h> #include <tchar.h> - + #include "main.h" #include "framewnd.h" _____ Modified: trunk/rosapps/devutils/zoomin/main.c --- trunk/rosapps/devutils/zoomin/main.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/devutils/zoomin/main.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -25,7 +25,7 @@ #include <tchar.h> #include <stdlib.h> #include <stdio.h> - + #include "main.h" #include "framewnd.h" @@ -109,7 +109,7 @@ // Initialize global strings LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); LoadString(hInstance, IDC_ZOOMIN, szFrameClass, MAX_LOADSTRING); - + // Store instance handle in our global variable hInst = hInstance; _____ Modified: trunk/rosapps/dflat32/applicat.c --- trunk/rosapps/dflat32/applicat.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/applicat.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -81,7 +81,7 @@ if (wnd->StatusBar != NULL) { if (p1 && *(char *)p1) DfSendMessage(wnd->StatusBar, DFM_SETTEXT, p1, 0); - else + else DfSendMessage(wnd->StatusBar, DFM_CLEARTEXT, 0, 0); DfSendMessage(wnd->StatusBar, DFM_PAINT, 0, 0); } @@ -95,7 +95,7 @@ DfInFocus = p1 ? wnd : NULL; if (DfIsVisible(wnd)) DfSendMessage(wnd, DFM_BORDER, 0, 0); - else + else DfSendMessage(wnd, DFM_SHOW_WINDOW, 0, 0); } @@ -195,7 +195,7 @@ if (DfDialogBox(wnd, &Display, TRUE, NULL)) { if (DfInFocus == wnd->MenuBarWnd || DfInFocus == wnd->StatusBar) oldFocus = DfApplicationWindow; - else + else oldFocus = DfInFocus; DfSendMessage(wnd, DFM_HIDE_WINDOW, 0, 0); SelectColors(wnd); @@ -389,7 +389,7 @@ { if (DfGetClass(wnd) == DF_DIALOG) return ((DF_DBOX *)(wnd->extension))->HelpName; - else + else return "Untitled"; } else _____ Modified: trunk/rosapps/dflat32/classes.h --- trunk/rosapps/dflat32/classes.h 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/classes.h 2005-05-07 21:24:31 UTC (rev 15091) @@ -7,7 +7,7 @@ * You must add entries to the DfColor tables in * DFCONFIG.C for new classes. * - * Class Name Base Class Processor Attribute + * Class Name Base Class Processor Attribute * ------------ --------- --------------- ----------- */ DfClassDef( DF_NORMAL, -1, DfNormalProc, 0 ) _____ Modified: trunk/rosapps/dflat32/config.c --- trunk/rosapps/dflat32/config.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/config.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -449,7 +449,7 @@ cp = strrchr(path, '\\'); if (cp == NULL) cp = path; - else + else cp++; strcpy(cp, DFlatApplication); strcat(cp, ext); _____ Modified: trunk/rosapps/dflat32/dialbox.c --- trunk/rosapps/dflat32/dialbox.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/dialbox.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -529,11 +529,11 @@ int oldattr = DfGetAttribute(wnd); if (wnd->wlines > DfClientHeight(wnd)) DfAddAttribute(wnd, DF_VSCROLLBAR); - else + else DfClearAttribute(wnd, DF_VSCROLLBAR); if (wnd->textwidth > DfClientWidth(wnd)) DfAddAttribute(wnd, DF_HSCROLLBAR); - else + else DfClearAttribute(wnd, DF_HSCROLLBAR); if (DfGetAttribute(wnd) != oldattr) DfSendMessage(wnd, DFM_BORDER, 0, 0); @@ -643,15 +643,15 @@ { if (ct->class != DF_SPINBUTTON && ct->class != DF_COMBOBOX) { - wnd->WindowColors[DF_FRAME_COLOR][DF_FG] = + wnd->WindowColors[DF_FRAME_COLOR][DF_FG] = DfGetParent(wnd)->WindowColors[DF_FRAME_COLOR][DF_FG]; - wnd->WindowColors[DF_FRAME_COLOR][DF_BG] = + wnd->WindowColors[DF_FRAME_COLOR][DF_BG] = DfGetParent(wnd)->WindowColors[DF_FRAME_COLOR][DF_BG]; if (ct->class != DF_EDITBOX && ct->class != DF_LISTBOX) { - wnd->WindowColors[DF_STD_COLOR][DF_FG] = + wnd->WindowColors[DF_STD_COLOR][DF_FG] = DfGetParent(wnd)->WindowColors[DF_STD_COLOR][DF_FG]; - wnd->WindowColors[DF_STD_COLOR][DF_BG] = + wnd->WindowColors[DF_STD_COLOR][DF_BG] = DfGetParent(wnd)->WindowColors[DF_STD_COLOR][DF_BG]; } } _____ Modified: trunk/rosapps/dflat32/fileopen.c --- trunk/rosapps/dflat32/fileopen.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/fileopen.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -183,7 +183,7 @@ DfGetItemText(wnd, DF_ID_PATH, FileSpec, 65); strcat(FileSpec, FileName); } - else + else strcpy(FileSpec, FileName); } break; _____ Modified: trunk/rosapps/dflat32/listbox.c --- trunk/rosapps/dflat32/listbox.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/listbox.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -398,7 +398,7 @@ } static int ExtendSelections(DFWINDOW wnd, int sel, int shift) -{ +{ if (shift & (DF_LEFTSHIFT | DF_RIGHTSHIFT) && wnd->AnchorPoint != -1) { int i = sel; _____ Modified: trunk/rosapps/dflat32/memopad.c --- trunk/rosapps/dflat32/memopad.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/memopad.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -125,7 +125,7 @@ case DF_ID_PRINT: PrintPad(DfInFocus); return TRUE; - case DF_ID_EXIT: + case DF_ID_EXIT: if (!DfYesNoBox("Exit Memopad?")) return FALSE; break; @@ -144,7 +144,7 @@ FixTabMenu(); return TRUE; case DF_ID_TAB6: - DfCfg.Tabs = 6; + DfCfg.Tabs = 6; FixTabMenu(); return TRUE; case DF_ID_TAB8: @@ -254,7 +254,7 @@ } DfSendMessage(wwnd, DFM_CLOSE_WINDOW, 0, 0); DfSendMessage(wnd1, DFM_SETFOCUS, TRUE, 0); - DfSendMessage(wnd1, DFM_MAXIMIZE, 0, 0); + DfSendMessage(wnd1, DFM_MAXIMIZE, 0, 0); } /* --- Load the notepad file into the editor text buffer --- */ @@ -414,7 +414,7 @@ rtn = DfDefaultWndProc(wnd, msg, p1, p2); if ((int)p1 == FALSE) DfSendMessage(DfGetParent(wnd), DFM_ADDSTATUS, 0, 0); - else + else ShowPosition(wnd); return rtn; case DFM_KEYBOARD_CURSOR: _____ Modified: trunk/rosapps/dflat32/menu.h --- trunk/rosapps/dflat32/menu.h 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/menu.h 2005-05-07 21:24:31 UTC (rev 15091) @@ -49,7 +49,7 @@ #define DF_INACTIVE 1 #define DF_CHECKED 2 #define DF_TOGGLE 4 -#define DF_CASCADED 8 +#define DF_CASCADED 8 /* --------- the standard menus ---------- */ extern DF_MBAR DfMainMenu; _____ Modified: trunk/rosapps/dflat32/menubar.c --- trunk/rosapps/dflat32/menubar.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/menubar.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -196,7 +196,7 @@ if (mwnd != NULL) DfSendMessage(wnd, DFM_MB_SELECTION, DfActiveMenuBar->ActiveSelection, 0); - else + else DfSendMessage(wnd, DFM_PAINT, 0, 0); break; case DF_BS: @@ -207,7 +207,7 @@ if (mwnd != NULL) DfSendMessage(wnd, DFM_MB_SELECTION, DfActiveMenuBar->ActiveSelection, 0); - else + else DfSendMessage(wnd, DFM_PAINT, 0, 0); break; default: _____ Modified: trunk/rosapps/dflat32/message.c --- trunk/rosapps/dflat32/message.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/message.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -593,7 +593,7 @@ while (EventQueueCtr > 0) { struct events ev; - + ev = EventQueue[EventQueueOffCtr]; if (++EventQueueOffCtr == DF_MAXMESSAGES) EventQueueOffCtr = 0; _____ Modified: trunk/rosapps/dflat32/msgbox.c --- trunk/rosapps/dflat32/msgbox.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/msgbox.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -123,7 +123,7 @@ InputText = text; TextLength = len; InputBoxDB.dwnd.title = ttl; - InputBoxDB.dwnd.w = 4 + + InputBoxDB.dwnd.w = 4 + max(20, max(len, max((int)strlen(ttl), (int)strlen(msg)))); InputBoxDB.ctl[1].dwnd.x = (InputBoxDB.dwnd.w-2-len)/2; InputBoxDB.ctl[0].dwnd.w = strlen(msg); _____ Modified: trunk/rosapps/dflat32/pictbox.c --- trunk/rosapps/dflat32/pictbox.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/pictbox.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -74,7 +74,7 @@ coll = 0; else if (rc.lf+x == rcc.rt) coll = 2; - else + else coll = 1; } } @@ -88,7 +88,7 @@ coll = 0; else if (rc.tp+y == rcc.bt) coll = 2; - else + else coll = 1; } } _____ Modified: trunk/rosapps/dflat32/popdown.c --- trunk/rosapps/dflat32/popdown.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/popdown.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -228,7 +228,7 @@ case DF_F1: if (ActivePopDown == NULL) DfSendMessage(DfGetParent(wnd), DFM_KEYBOARD, p1, p2); - else + else DfDisplayHelp(wnd, (ActivePopDown+wnd->selection)->help); return TRUE; _____ Modified: trunk/rosapps/dflat32/statbar.c --- trunk/rosapps/dflat32/statbar.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/statbar.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -14,7 +14,7 @@ if ((int)p1 == DF_CTRL_F4) return TRUE; break; - case DFM_PAINT: + case DFM_PAINT: if (!DfIsVisible(wnd)) break; statusbar = DfCalloc(1, DfWindowWidth(wnd)+1); _____ Modified: trunk/rosapps/dflat32/sysmenu.c --- trunk/rosapps/dflat32/sysmenu.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/sysmenu.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -45,7 +45,7 @@ int lf, tp, ht, wd; DFWINDOW SystemMenuWnd; - DfSystemMenu.PullDown[0].Selections[6].Accelerator = + DfSystemMenu.PullDown[0].Selections[6].Accelerator = (DfGetClass(wnd) == DF_APPLICATION) ? DF_ALT_F4 : DF_CTRL_F4; lf = DfGetLeft(wnd)+1; _____ Modified: trunk/rosapps/dflat32/textbox.c --- trunk/rosapps/dflat32/textbox.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/dflat32/textbox.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -713,7 +713,7 @@ if (*(lp+i) && i < wnd->wleft+3) { if (wnd->wleft+4 > lnlen) trunc = TRUE; - else + else lp += 4; } else { _____ Modified: trunk/rosapps/games/solitaire/resource.h --- trunk/rosapps/games/solitaire/resource.h 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/games/solitaire/resource.h 2005-05-07 21:24:31 UTC (rev 15091) @@ -14,7 +14,7 @@ #define IDM_HELP_ABOUT 40006 // Next default values for new objects -// +// #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 105 _____ Modified: trunk/rosapps/lib/dflat32/applicat.c --- trunk/rosapps/lib/dflat32/applicat.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/lib/dflat32/applicat.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -81,7 +81,7 @@ if (wnd->StatusBar != NULL) { if (p1 && *(char *)p1) DfSendMessage(wnd->StatusBar, SETTEXT, p1, 0); - else + else DfSendMessage(wnd->StatusBar, CLEARTEXT, 0, 0); DfSendMessage(wnd->StatusBar, PAINT, 0, 0); } @@ -95,7 +95,7 @@ inFocus = p1 ? wnd : NULL; if (isVisible(wnd)) DfSendMessage(wnd, BORDER, 0, 0); - else + else DfSendMessage(wnd, SHOW_WINDOW, 0, 0); } @@ -195,7 +195,7 @@ if (DfDialogBox(wnd, &Display, TRUE, NULL)) { if (inFocus == wnd->MenuBarWnd || inFocus == wnd->StatusBar) oldFocus = ApplicationWindow; - else + else oldFocus = inFocus; DfSendMessage(wnd, DFM_HIDE_WINDOW, 0, 0); SelectColors(wnd); @@ -389,7 +389,7 @@ { if (GetClass(wnd) == DIALOG) return ((DBOX *)(wnd->extension))->HelpName; - else + else return "Untitled"; } else _____ Modified: trunk/rosapps/lib/dflat32/config.c --- trunk/rosapps/lib/dflat32/config.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/lib/dflat32/config.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -449,7 +449,7 @@ cp = strrchr(path, '\\'); if (cp == NULL) cp = path; - else + else cp++; strcpy(cp, DFlatApplication); strcat(cp, ext); _____ Modified: trunk/rosapps/lib/dflat32/dialbox.c --- trunk/rosapps/lib/dflat32/dialbox.c 2005-05-07 20:47:57 UTC (rev 15090) +++ trunk/rosapps/lib/dflat32/dialbox.c 2005-05-07 21:24:31 UTC (rev 15091) @@ -529,11 +529,11 @@ int oldattr = GetAttribute(wnd); if (wnd->wlines > ClientHeight(wnd)) AddAttribute(wnd, VSCROLLBAR); - else + else ClearAttribute(wnd, VSCROLLBAR); if (wnd->textwidth > ClientWidth(wnd)) AddAttribute(wnd, HSCROLLBAR); - else + else ClearAttribute(wnd, HSCROLLBAR); if (GetAttribute(wnd) != oldattr) DfSendMessage(wnd, BORDER, 0, 0); @@ -643,15 +643,15 @@ { if (ct->class != SPINBUTTON && ct->class != COMBOBOX) { - wnd->WindowColors[FRAME_COLOR][FG] = + wnd->WindowColors[FRAME_COLOR][FG] = GetParent(wnd)->WindowColors[FRAME_COLOR][FG]; - wnd->WindowColors[FRAME_COLOR][BG] = + wnd->WindowColors[FRAME_COLOR][BG] = GetParent(wnd)->WindowColors[FRAME_COLOR][BG]; if (ct->class != EDITBOX && ct->class != LISTBOX) { - wnd->WindowColors[STD_COLOR][FG] = + wnd->WindowColors[STD_COLOR][FG] = GetParent(wnd)->WindowColors[STD_COLOR][FG]; - wnd->WindowColors[STD_COLOR][BG] = + wnd->WindowColors[STD_COLOR][BG] = GetParent(wnd)->WindowColors[STD_COLOR][BG]; } } _____ Modified: trunk/rosapps/lib/dflat32/dllmain.c [truncated at 1000 lines; 37354 more skipped]

19 years, 8 months

[greatlrd] 15090: doubicate res id my fualt

by greatlrd＠svn.reactos.com

doubicate res id my fualt now everthing should print out right strings Modified: trunk/reactos/subsys/system/cmd/resource.h _____ Modified: trunk/reactos/subsys/system/cmd/resource.h --- trunk/reactos/subsys/system/cmd/resource.h 2005-05-07 20:20:46 UTC (rev 15089) +++ trunk/reactos/subsys/system/cmd/resource.h 2005-05-07 20:47:57 UTC (rev 15090) @@ -160,46 +160,46 @@ #define STRING_REN_HELP2 672 #define STRING_REN_HELP3 673 -#define STRING_RMDIR_HELP 672 +#define STRING_RMDIR_HELP 674 -#define STRING_SCREEN_HELP 673 +#define STRING_SCREEN_HELP 675 -#define STRING_SHIFT_HELP 674 +#define STRING_SHIFT_HELP 676 -#define STRING_SET_HELP 675 +#define STRING_SET_HELP 677 -#define STRING_START_HELP1 676 +#define STRING_START_HELP1 678 -#define STRING_TITLE_HELP 677 +#define STRING_TITLE_HELP 679 -#define STRING_TIME_HELP1 678 -#define STRING_TIME_HELP2 679 +#define STRING_TIME_HELP1 680 +#define STRING_TIME_HELP2 681 -#define STRING_TIMER_HELP1 680 -#define STRING_TIMER_HELP2 681 -#define STRING_TIMER_HELP3 682 +#define STRING_TIMER_HELP1 682 +#define STRING_TIMER_HELP2 683 +#define STRING_TIMER_HELP3 684 -#define STRING_TYPE_HELP1 683 +#define STRING_TYPE_HELP1 685 -#define STRING_VERIFY_HELP1 684 -#define STRING_VERIFY_HELP2 685 -#define STRING_VERIFY_HELP3 686 +#define STRING_VERIFY_HELP1 686 +#define STRING_VERIFY_HELP2 687 +#define STRING_VERIFY_HELP3 688 -#define STRING_VERSION_HELP1 687 -#define STRING_VERSION_HELP2 688 -#define STRING_VERSION_HELP3 689 -#define STRING_VERSION_HELP4 690 -#define STRING_VERSION_HELP5 691 -#define STRING_VERSION_HELP6 692 -#define STRING_VERSION_HELP7 693 +#define STRING_VERSION_HELP1 689 +#define STRING_VERSION_HELP2 690 +#define STRING_VERSION_HELP3 691 +#define STRING_VERSION_HELP4 692 +#define STRING_VERSION_HELP5 693 +#define STRING_VERSION_HELP6 694 +#define STRING_VERSION_HELP7 695 -#define STRING_VOL_HELP1 694 -#define STRING_VOL_HELP2 695 -#define STRING_VOL_HELP3 696 -#define STRING_VOL_HELP4 697 +#define STRING_VOL_HELP1 696 +#define STRING_VOL_HELP2 697 +#define STRING_VOL_HELP3 698 +#define STRING_VOL_HELP4 699 -#define STRING_WINDOW_HELP1 698 -#define STRING_WINDOW_HELP2 699 +#define STRING_WINDOW_HELP1 700 +#define STRING_WINDOW_HELP2 701 /* These strings are language independent (cmd.rc) */ #define STRING_FREEDOS_DEV 800

19 years, 8 months

[hbirr] 15089: - initialize a user profile before loading syssetup.dll.

by hbirr＠svn.reactos.com

- initialize a user profile before loading syssetup.dll. - this makes it possible to install ros over an existing ros. Modified: trunk/reactos/subsys/system/setup/makefile Modified: trunk/reactos/subsys/system/setup/setup.c _____ Modified: trunk/reactos/subsys/system/setup/makefile --- trunk/reactos/subsys/system/setup/makefile 2005-05-07 20:02:50 UTC (rev 15088) +++ trunk/reactos/subsys/system/setup/makefile 2005-05-07 20:20:46 UTC (rev 15089) @@ -10,7 +10,7 @@ TARGET_INSTALLDIR = system32 -TARGET_SDKLIBS = kernel32.a +TARGET_SDKLIBS = kernel32.a userenv.a ntdll.a TARGET_CFLAGS = -Wall -Werror -D__USE_W32API -D_WIN32_IE=0x0400 _____ Modified: trunk/reactos/subsys/system/setup/setup.c --- trunk/reactos/subsys/system/setup/setup.c 2005-05-07 20:02:50 UTC (rev 15088) +++ trunk/reactos/subsys/system/setup/setup.c 2005-05-07 20:20:46 UTC (rev 15089) @@ -27,6 +27,7 @@ #include <windows.h> #include <tchar.h> #include <syssetup.h> +#include <userenv.h> #define NDEBUG #include <debug.h> @@ -59,6 +60,9 @@ HMODULE hDll; PINSTALL_REACTOS InstallReactOS; + /* some dlls (loaded by syssetup) need a valid user profile */ + InitializeProfiles(); + hDll = LoadLibrary (TEXT("syssetup")); if (hDll == NULL) {

19 years, 8 months

← Newer
1
...
59
60
61
62
63
64
65
...
82
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 2005