Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[tfaber] 60156: [NTOS:MM] - Correctly use POOL_BLOCK_SIZE in ExAllocatePoolWithQuotaTag

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Sep 15 23:05:59 2013 New Revision: 60156 URL: http://svn.reactos.org/svn/reactos?rev=60156&view=rev Log: [NTOS:MM] - Correctly use POOL_BLOCK_SIZE in ExAllocatePoolWithQuotaTag Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Sun Sep 15 23:05:59 2013 @@ -2536,7 +2536,7 @@ // this isn't the system process, which never gets charged quota // ASSERT(NumberOfBytes != 0); - if ((NumberOfBytes <= (PAGE_SIZE - sizeof(POOL_BLOCK_SIZE) - sizeof(PVOID))) && + if ((NumberOfBytes <= (PAGE_SIZE - POOL_BLOCK_SIZE - sizeof(PVOID))) && (Process != PsInitialSystemProcess)) { // @@ -2589,7 +2589,7 @@ Entry = POOL_ENTRY(Buffer); Status = PsChargeProcessPoolQuota(Process, PoolType & BASE_POOL_TYPE_MASK, - Entry->BlockSize * sizeof(POOL_BLOCK_SIZE)); + Entry->BlockSize * POOL_BLOCK_SIZE); if (!NT_SUCCESS(Status)) { //

11 years

[jgardou] 60155: [OSMESA] - enable x86 optimisations for GCC builds

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Sep 15 22:25:43 2013 New Revision: 60155 URL: http://svn.reactos.org/svn/reactos?rev=60155&view=rev Log: [OSMESA] - enable x86 optimisations for GCC builds Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/CMakeLists.txt (with props) trunk/reactos/dll/opengl/mesa/src/mesa/x86/matypes.h (with props) Modified: trunk/reactos/dll/opengl/mesa/src/mesa/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/mesa/drivers/osmesa/CMakeLists.txt Modified: trunk/reactos/dll/opengl/mesa/src/mesa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/C… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/CMakeLists.txt [iso-8859-1] Sun Sep 15 22:25:43 2013 @@ -13,6 +13,19 @@ -DBUILD_GL32 # declare gl* as __declspec(dllexport) in Mesa headers -D_GLAPI_NO_EXPORTS # prevent _glapi_* from being declared __declspec(dllimport) ) + +if((ARCH STREQUAL "i386") AND (NOT MSVC)) + add_definitions( + -DUSE_X86_ASM + -DUSE_MMX_ASM + -DUSE_3DNOW_ASM + -DUSE_SSE_ASM + ) + add_subdirectory(x86) + set(mesa_asm_lib mesa_x86) +else() + set(mesa_asm_lib) +endif() add_subdirectory(drivers/common) add_subdirectory(drivers/osmesa) Modified: trunk/reactos/dll/opengl/mesa/src/mesa/drivers/osmesa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/d… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/drivers/osmesa/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/drivers/osmesa/CMakeLists.txt [iso-8859-1] Sun Sep 15 22:25:43 2013 @@ -15,7 +15,9 @@ mesa_vbo mesa_program mesa_math - mesa_glsl) + mesa_glsl + ${mesa_asm_lib} +) set_module_type(osmesa win32dll) add_importlibs(osmesa msvcrt kernel32 ntdll) Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/x86/CMakeLists.txt (added) +++ trunk/reactos/dll/opengl/mesa/src/mesa/x86/CMakeLists.txt [iso-8859-1] Sun Sep 15 22:25:43 2013 @@ -0,0 +1,31 @@ + +list(APPEND SOURCE + common_x86.c + x86_xform.c + 3dnow.c + sse.c + common_x86_asm.S + x86_xform2.S + x86_xform3.S + x86_xform4.S + x86_cliptest.S + mmx_blend.S + 3dnow_xform1.S + 3dnow_xform2.S + 3dnow_xform3.S + 3dnow_xform4.S + 3dnow_normal.S + sse_xform1.S + sse_xform2.S + sse_xform3.S + sse_xform4.S + sse_normal.S + read_rgba_span_x86.S + rtasm/x86sse.c +) + +add_library(mesa_x86 STATIC ${SOURCE}) + +if(NOT MSVC) + add_compile_flags("-Wno-format") +endif() Propchange: trunk/reactos/dll/opengl/mesa/src/mesa/x86/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/opengl/mesa/src/mesa/x86/matypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/x86/matypes.h (added) +++ trunk/reactos/dll/opengl/mesa/src/mesa/x86/matypes.h [iso-8859-1] Sun Sep 15 22:25:43 2013 @@ -0,0 +1,162 @@ +/* + * This file is automatically generated from the Mesa internal type + * definitions. Do not edit directly. + */ + +#ifndef __ASM_TYPES_H__ +#define __ASM_TYPES_H__ + + + +/* ============================================================= + * Offsets for struct gl_context + */ + +#define CTX_DRIVER_CTX 880 + +#define CTX_LIGHT_ENABLED 39952 +#define CTX_LIGHT_SHADE_MODEL 39956 +#define CTX_LIGHT_COLOR_MAT_FACE 39964 +#define CTX_LIGHT_COLOR_MAT_MODE 39968 +#define CTX_LIGHT_COLOR_MAT_MASK 39972 +#define CTX_LIGHT_COLOR_MAT_ENABLED 39976 +#define CTX_LIGHT_ENABLED_LIST 39988 +#define CTX_LIGHT_NEED_VERTS 44341 +#define CTX_LIGHT_FLAGS 44344 +#define CTX_LIGHT_BASE_COLOR 44348 + + +/* ============================================================= + * Offsets for struct vertex_buffer + */ + +#define VB_SIZE 0 +#define VB_COUNT 4 + +#define VB_ELTS 8 +#define VB_OBJ_PTR 60 +#define VB_EYE_PTR 12 +#define VB_CLIP_PTR 16 +#define VB_PROJ_CLIP_PTR 20 +#define VB_CLIP_OR_MASK 24 +#define VB_CLIP_MASK 28 +#define VB_NORMAL_PTR 68 +#define VB_EDGE_FLAG 36 +#define VB_TEX0_COORD_PTR 92 +#define VB_TEX1_COORD_PTR 96 +#define VB_TEX2_COORD_PTR 100 +#define VB_TEX3_COORD_PTR 104 +#define VB_INDEX_PTR 84 +#define VB_COLOR_PTR 72 +#define VB_SECONDARY_COLOR_PTR 76 +#define VB_FOG_COORD_PTR 80 +#define VB_PRIMITIVE 52 + + +/* + * Flags for struct vertex_buffer + */ + +#define VERT_BIT_OBJ 0x1 +#define VERT_BIT_NORM 0x4 +#define VERT_BIT_RGBA 0x8 +#define VERT_BIT_SPEC_RGB 0x10 +#define VERT_BIT_FOG_COORD 0x20 +#define VERT_BIT_TEX0 0x100 +#define VERT_BIT_TEX1 0x200 +#define VERT_BIT_TEX2 0x400 +#define VERT_BIT_TEX3 0x800 + + +/* ============================================================= + * Offsets for GLvector4f + */ + +#define V4F_DATA 0 +#define V4F_START 4 +#define V4F_COUNT 8 +#define V4F_STRIDE 12 +#define V4F_SIZE 16 +#define V4F_FLAGS 20 + +/* + * Flags for GLvector4f + */ + +#define VEC_MALLOC 0x10 +#define VEC_NOT_WRITEABLE 0x40 +#define VEC_BAD_STRIDE 0x100 + +#define VEC_SIZE_1 0x1 +#define VEC_SIZE_2 0x3 +#define VEC_SIZE_3 0x7 +#define VEC_SIZE_4 0xf + + +/* ============================================================= + * Offsets for GLmatrix + */ + +#define MATRIX_DATA 0 +#define MATRIX_INV 4 +#define MATRIX_FLAGS 8 +#define MATRIX_TYPE 12 + + +/* ============================================================= + * Offsets for struct gl_light + */ + +#define LIGHT_NEXT 0 +#define LIGHT_PREV 4 + +#define LIGHT_AMBIENT 8 +#define LIGHT_DIFFUSE 24 +#define LIGHT_SPECULAR 40 +#define LIGHT_EYE_POSITION 56 +#define LIGHT_SPOT_DIRECTION 72 +#define LIGHT_SPOT_EXPONENT 88 +#define LIGHT_SPOT_CUTOFF 92 +#define LIGHT_COS_CUTOFF 100 +#define LIGHT_CONST_ATTEN 104 +#define LIGHT_LINEAR_ATTEN 108 +#define LIGHT_QUADRATIC_ATTEN 112 +#define LIGHT_ENABLED 116 + +#define LIGHT_FLAGS 120 + +#define LIGHT_POSITION 124 +#define LIGHT_VP_INF_NORM 140 +#define LIGHT_H_INF_NORM 152 +#define LIGHT_NORM_DIRECTION 164 +#define LIGHT_VP_INF_SPOT_ATTEN 180 + +#define LIGHT_SPOT_EXP_TABLE 184 +#define LIGHT_MAT_AMBIENT 4280 +#define LIGHT_MAT_DIFFUSE 4304 +#define LIGHT_MAT_SPECULAR 4328 + +#define SIZEOF_GL_LIGHT 4352 + +/* + * Flags for struct gl_light + */ + +#define LIGHT_SPOT 0x1 +#define LIGHT_LOCAL_VIEWER 0x2 +#define LIGHT_POSITIONAL 0x4 + +#define LIGHT_NEED_VERTICES 0x6 + + +/* ============================================================= + * Offsets for struct gl_lightmodel + */ + +#define LIGHT_MODEL_AMBIENT 0 +#define LIGHT_MODEL_LOCAL_VIEWER 16 +#define LIGHT_MODEL_TWO_SIDE 17 +#define LIGHT_MODEL_COLOR_CONTROL 20 + + +#endif /* __ASM_TYPES_H__ */ Propchange: trunk/reactos/dll/opengl/mesa/src/mesa/x86/matypes.h ------------------------------------------------------------------------------ svn:eol-style = native

11 years

[jgardou] 60154: [OPENGL32_NEW] - try to fix jim's build

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Sep 15 22:12:09 2013 New Revision: 60154 URL: http://svn.reactos.org/svn/reactos?rev=60154&view=rev Log: [OPENGL32_NEW] - try to fix jim's build Modified: trunk/reactos/dll/opengl/opengl32_new/CMakeLists.txt Modified: trunk/reactos/dll/opengl/opengl32_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32_new/CM… ============================================================================== --- trunk/reactos/dll/opengl/opengl32_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32_new/CMakeLists.txt [iso-8859-1] Sun Sep 15 22:12:09 2013 @@ -1,5 +1,5 @@ -spec2def(opengl32.dll opengl32.spec ADD_IMPORTLIB) +spec2def(opengl32.dll opengl32.spec) add_definitions( -D_GDI32_ # prevent gl* being declared __declspec(dllimport) in MS headers

11 years

[jgardou] 60153: [OPENGL32_NEW] - Actually enable the build

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Sep 15 21:34:42 2013 New Revision: 60153 URL: http://svn.reactos.org/svn/reactos?rev=60153&view=rev Log: [OPENGL32_NEW] - Actually enable the build Modified: trunk/reactos/dll/opengl/CMakeLists.txt Modified: trunk/reactos/dll/opengl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/CMakeLists.txt?… ============================================================================== --- trunk/reactos/dll/opengl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/CMakeLists.txt [iso-8859-1] Sun Sep 15 21:34:42 2013 @@ -1,3 +1,6 @@ +include_directories(mesa/include) + add_subdirectory(glu32) add_subdirectory(mesa) add_subdirectory(opengl32) +add_subdirectory(opengl32_new)

11 years

[jgardou] 60152: [PSDK/WINGDI.H] - add wglSwapMultipleBuffers prototype

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Sep 15 21:33:37 2013 New Revision: 60152 URL: http://svn.reactos.org/svn/reactos?rev=60152&view=rev Log: [PSDK/WINGDI.H] - add wglSwapMultipleBuffers prototype Modified: trunk/reactos/include/psdk/wingdi.h Modified: trunk/reactos/include/psdk/wingdi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wingdi.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wingdi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wingdi.h [iso-8859-1] Sun Sep 15 21:33:37 2013 @@ -4036,6 +4036,20 @@ BOOL WINAPI wglUseFontOutlinesA(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,LPGLYPHMETRICSFLOAT); BOOL WINAPI wglUseFontOutlinesW(HDC,DWORD,DWORD,DWORD,FLOAT,FLOAT,int,LPGLYPHMETRICSFLOAT); +#if (WINVER >= 0x0500) + +typedef struct _WGLSWAP +{ + HDC hdc; + UINT uiFlags; +} WGLSWAP, *PWGLSWAP, FAR *LPWGLSWAP; + +#define WGL_SWAPMULTIPLE_MAX 16 + +DWORD WINAPI wglSwapMultipleBuffers(UINT, CONST WGLSWAP *); + +#endif // (WINVER >= 0x0500) + #if (WINVER>= 0x0500) BOOL WINAPI AlphaBlend(_In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ HDC, _In_ int, _In_ int, _In_ int, _In_ int, _In_ BLENDFUNCTION);

11 years

[jgardou] 60151: [OSMESA] - In a galaxy far, far away, I don't break the builds.

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Sep 15 20:57:30 2013 New Revision: 60151 URL: http://svn.reactos.org/svn/reactos?rev=60151&view=rev Log: [OSMESA] - In a galaxy far, far away, I don't break the builds. Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/CMakeLists.txt Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/swrast/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/swrast/CMakeLists.txt [iso-8859-1] Sun Sep 15 20:57:30 2013 @@ -3,7 +3,7 @@ s_aaline.c s_aatriangle.c s_alpha.c - s_atifragshader.C + s_atifragshader.c s_bitmap.c s_blend.c s_blit.c

11 years

[jgardou] 60150: [OPENGL32_NEW] Introduce a new opengl32 implementation, the 3D library with better perspectives (tm), featuring: - A new software rendering implementation on top of osmesa. - Rende...

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Sep 15 20:54:01 2013 New Revision: 60150 URL: http://svn.reactos.org/svn/reactos?rev=60150&view=rev Log: [OPENGL32_NEW] Introduce a new opengl32 implementation, the 3D library with better perspectives (tm), featuring: - A new software rendering implementation on top of osmesa. - Rendering to bitmaps - Thread safety. - A try to be really compatible with ICD DLLs (WIP) - Other cool stuff, check log for details. WIP, the SW implementation already works. Added: trunk/reactos/dll/opengl/opengl32_new/ (with props) trunk/reactos/dll/opengl/opengl32_new/CMakeLists.txt (with props) trunk/reactos/dll/opengl/opengl32_new/apistubs.c (with props) trunk/reactos/dll/opengl/opengl32_new/dllmain.c (with props) trunk/reactos/dll/opengl/opengl32_new/glfuncs.h (with props) trunk/reactos/dll/opengl/opengl32_new/icd.h (with props) trunk/reactos/dll/opengl/opengl32_new/icdload.c (with props) trunk/reactos/dll/opengl/opengl32_new/opengl32.h (with props) trunk/reactos/dll/opengl/opengl32_new/opengl32.spec (with props) trunk/reactos/dll/opengl/opengl32_new/swimpl.c (with props) trunk/reactos/dll/opengl/opengl32_new/wgl.c (with props) [This mail would be too long, it was shortened to contain the URLs only.] Added: trunk/reactos/dll/opengl/opengl32_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32_new/CM… Added: trunk/reactos/dll/opengl/opengl32_new/apistubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32_new/ap… Added: trunk/reactos/dll/opengl/opengl32_new/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32_new/dl… Added: trunk/reactos/dll/opengl/opengl32_new/glfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32_new/gl… Added: trunk/reactos/dll/opengl/opengl32_new/icd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32_new/ic… Added: trunk/reactos/dll/opengl/opengl32_new/icdload.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32_new/ic… Added: trunk/reactos/dll/opengl/opengl32_new/opengl32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32_new/op… Added: trunk/reactos/dll/opengl/opengl32_new/opengl32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32_new/op… Added: trunk/reactos/dll/opengl/opengl32_new/swimpl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32_new/sw… Added: trunk/reactos/dll/opengl/opengl32_new/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32_new/wg…

11 years

[jgardou] 60149: [OSMESA] - Add to build

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun Sep 15 20:44:50 2013 New Revision: 60149 URL: http://svn.reactos.org/svn/reactos?rev=60149&view=rev Log: [OSMESA] - Add to build Added: trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/CMakeLists.txt (with props) trunk/reactos/dll/opengl/mesa/src/mesa/drivers/osmesa/CMakeLists.txt (with props) trunk/reactos/dll/opengl/mesa/src/mesa/drivers/osmesa/osmesa.spec (with props) trunk/reactos/dll/opengl/mesa/src/mesa/main/CMakeLists.txt (with props) trunk/reactos/dll/opengl/mesa/src/mesa/math/CMakeLists.txt (with props) trunk/reactos/dll/opengl/mesa/src/mesa/program/CMakeLists.txt (with props) trunk/reactos/dll/opengl/mesa/src/mesa/swrast/CMakeLists.txt (with props) trunk/reactos/dll/opengl/mesa/src/mesa/swrast_setup/CMakeLists.txt (with props) trunk/reactos/dll/opengl/mesa/src/mesa/tnl/CMakeLists.txt (with props) trunk/reactos/dll/opengl/mesa/src/mesa/vbo/CMakeLists.txt (with props) Modified: trunk/reactos/dll/opengl/mesa/src/mesa/CMakeLists.txt Modified: trunk/reactos/dll/opengl/mesa/src/mesa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/C… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/CMakeLists.txt [iso-8859-1] Sun Sep 15 20:44:50 2013 @@ -1,5 +1,11 @@ set_cpp(WITH_STL) + +include_directories( + ../mapi + ../glsl + . +) add_definitions( -DFEATURE_GL=1 @@ -8,11 +14,18 @@ -D_GLAPI_NO_EXPORTS # prevent _glapi_* from being declared __declspec(dllimport) ) +add_subdirectory(drivers/common) +add_subdirectory(drivers/osmesa) +add_subdirectory(main) +add_subdirectory(math) +add_subdirectory(program) +add_subdirectory(swrast) +add_subdirectory(swrast_setup) +add_subdirectory(tnl) +add_subdirectory(vbo) + # From Sconscript include_directories( - ../mapi - ../glsl - . ../../generated/mesa) if((ARCH STREQUAL "i386") AND (NOT MSVC)) Added: trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/d… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/CMakeLists.txt (added) +++ trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/CMakeLists.txt [iso-8859-1] Sun Sep 15 20:44:50 2013 @@ -0,0 +1,7 @@ + +list(APPEND SOURCE + driverfuncs.c + meta.c +) + +add_library(mesa_drv_common STATIC ${SOURCE}) Propchange: trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/opengl/mesa/src/mesa/drivers/osmesa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/d… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/drivers/osmesa/CMakeLists.txt (added) +++ trunk/reactos/dll/opengl/mesa/src/mesa/drivers/osmesa/CMakeLists.txt [iso-8859-1] Sun Sep 15 20:44:50 2013 @@ -0,0 +1,22 @@ + +spec2def(osmesa.dll osmesa.spec) + +add_library(osmesa SHARED + osmesa.c + ${CMAKE_CURRENT_BINARY_DIR}/osmesa.def) + +target_link_libraries(osmesa + mesa_drv_common + mesa_glapi + mesa_swrast + mesa_swrast_setup + mesa_tnl + mesa_main + mesa_vbo + mesa_program + mesa_math + mesa_glsl) + +set_module_type(osmesa win32dll) +add_importlibs(osmesa msvcrt kernel32 ntdll) +add_cd_file(TARGET osmesa DESTINATION reactos/system32 FOR all) Propchange: trunk/reactos/dll/opengl/mesa/src/mesa/drivers/osmesa/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/opengl/mesa/src/mesa/drivers/osmesa/osmesa.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/d… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/drivers/osmesa/osmesa.spec (added) +++ trunk/reactos/dll/opengl/mesa/src/mesa/drivers/osmesa/osmesa.spec [iso-8859-1] Sun Sep 15 20:44:50 2013 @@ -0,0 +1,348 @@ +@ stdcall glAccum( long long ) +@ stdcall glAlphaFunc( long long ) +@ stdcall glAreTexturesResident( long ptr ptr ) +@ stdcall glArrayElement( long ) +@ stdcall glBegin( long ) +@ stdcall glBindTexture( long long ) +@ stdcall glBitmap( long long long long long long ptr ) +@ stdcall glBlendFunc( long long ) +@ stdcall glCallList( long ) +@ stdcall glCallLists( long long ptr ) +@ stdcall glClear( long ) +@ stdcall glClearAccum( long long long long ) +@ stdcall glClearColor( long long long long ) +@ stdcall glClearDepth( double ) +@ stdcall glClearIndex( long ) +@ stdcall glClearStencil( long ) +@ stdcall glClipPlane( long ptr ) +@ stdcall glColor3b( long long long ) +@ stdcall glColor3bv( ptr ) +@ stdcall glColor3d( double double double ) +@ stdcall glColor3dv( ptr ) +@ stdcall glColor3f( long long long ) +@ stdcall glColor3fv( ptr ) +@ stdcall glColor3i( long long long ) +@ stdcall glColor3iv( ptr ) +@ stdcall glColor3s( long long long ) +@ stdcall glColor3sv( ptr ) +@ stdcall glColor3ub( long long long ) +@ stdcall glColor3ubv( ptr ) +@ stdcall glColor3ui( long long long ) +@ stdcall glColor3uiv( ptr ) +@ stdcall glColor3us( long long long ) +@ stdcall glColor3usv( ptr ) +@ stdcall glColor4b( long long long long ) +@ stdcall glColor4bv( ptr ) +@ stdcall glColor4d( double double double double ) +@ stdcall glColor4dv( ptr ) +@ stdcall glColor4f( long long long long ) +@ stdcall glColor4fv( ptr ) +@ stdcall glColor4i( long long long long ) +@ stdcall glColor4iv( ptr ) +@ stdcall glColor4s( long long long long ) +@ stdcall glColor4sv( ptr ) +@ stdcall glColor4ub( long long long long ) +@ stdcall glColor4ubv( ptr ) +@ stdcall glColor4ui( long long long long ) +@ stdcall glColor4uiv( ptr ) +@ stdcall glColor4us( long long long long ) +@ stdcall glColor4usv( ptr ) +@ stdcall glColorMask( long long long long ) +@ stdcall glColorMaterial( long long ) +@ stdcall glColorPointer( long long long ptr ) +@ stdcall glCopyPixels( long long long long long ) +@ stdcall glCopyTexImage1D( long long long long long long long ) +@ stdcall glCopyTexImage2D( long long long long long long long long ) +@ stdcall glCopyTexSubImage1D( long long long long long long ) +@ stdcall glCopyTexSubImage2D( long long long long long long long long ) +@ stdcall glCullFace( long ) +@ stdcall glDeleteLists( long long ) +@ stdcall glDeleteTextures( long ptr ) +@ stdcall glDepthFunc( long ) +@ stdcall glDepthMask( long ) +@ stdcall glDepthRange( double double ) +@ stdcall glDisable( long ) +@ stdcall glDisableClientState( long ) +@ stdcall glDrawArrays( long long long ) +@ stdcall glDrawBuffer( long ) +@ stdcall glDrawElements( long long long ptr ) +@ stdcall glDrawPixels( long long long long ptr ) +@ stdcall glEdgeFlag( long ) +@ stdcall glEdgeFlagPointer( long ptr ) +@ stdcall glEdgeFlagv( ptr ) +@ stdcall glEnable( long ) +@ stdcall glEnableClientState( long ) +@ stdcall glEnd( ) +@ stdcall glEndList( ) +@ stdcall glEvalCoord1d( double ) +@ stdcall glEvalCoord1dv( ptr ) +@ stdcall glEvalCoord1f( long ) +@ stdcall glEvalCoord1fv( ptr ) +@ stdcall glEvalCoord2d( double double ) +@ stdcall glEvalCoord2dv( ptr ) +@ stdcall glEvalCoord2f( long long ) +@ stdcall glEvalCoord2fv( ptr ) +@ stdcall glEvalMesh1( long long long ) +@ stdcall glEvalMesh2( long long long long long ) +@ stdcall glEvalPoint1( long ) +@ stdcall glEvalPoint2( long long ) +@ stdcall glFeedbackBuffer( long long ptr ) +@ stdcall glFinish( ) +@ stdcall glFlush( ) +@ stdcall glFogf( long long ) +@ stdcall glFogfv( long ptr ) +@ stdcall glFogi( long long ) +@ stdcall glFogiv( long ptr ) +@ stdcall glFrontFace( long ) +@ stdcall glFrustum( double double double double double double ) +@ stdcall glGenLists( long ) +@ stdcall glGenTextures( long ptr ) +@ stdcall glGetBooleanv( long ptr ) +@ stdcall glGetClipPlane( long ptr ) +@ stdcall glGetDoublev( long ptr ) +@ stdcall glGetError( ) +@ stdcall glGetFloatv( long ptr ) +@ stdcall glGetIntegerv( long ptr ) +@ stdcall glGetLightfv( long long ptr ) +@ stdcall glGetLightiv( long long ptr ) +@ stdcall glGetMapdv( long long ptr ) +@ stdcall glGetMapfv( long long ptr ) +@ stdcall glGetMapiv( long long ptr ) +@ stdcall glGetMaterialfv( long long ptr ) +@ stdcall glGetMaterialiv( long long ptr ) +@ stdcall glGetPixelMapfv( long ptr ) +@ stdcall glGetPixelMapuiv( long ptr ) +@ stdcall glGetPixelMapusv( long ptr ) +@ stdcall glGetPointerv( long ptr ) +@ stdcall glGetPolygonStipple( ptr ) +@ stdcall glGetString( long ) +@ stdcall glGetTexEnvfv( long long ptr ) +@ stdcall glGetTexEnviv( long long ptr ) +@ stdcall glGetTexGendv( long long ptr ) +@ stdcall glGetTexGenfv( long long ptr ) +@ stdcall glGetTexGeniv( long long ptr ) +@ stdcall glGetTexImage( long long long long ptr ) +@ stdcall glGetTexLevelParameterfv( long long long ptr ) +@ stdcall glGetTexLevelParameteriv( long long long ptr ) +@ stdcall glGetTexParameterfv( long long ptr ) +@ stdcall glGetTexParameteriv( long long ptr ) +@ stdcall glHint( long long ) +@ stdcall glIndexMask( long ) +@ stdcall glIndexPointer( long long ptr ) +@ stdcall glIndexd( double ) +@ stdcall glIndexdv( ptr ) +@ stdcall glIndexf( long ) +@ stdcall glIndexfv( ptr ) +@ stdcall glIndexi( long ) +@ stdcall glIndexiv( ptr ) +@ stdcall glIndexs( long ) +@ stdcall glIndexsv( ptr ) +@ stdcall glIndexub( long ) +@ stdcall glIndexubv( ptr ) +@ stdcall glInitNames( ) +@ stdcall glInterleavedArrays( long long ptr ) +@ stdcall glIsEnabled( long ) +@ stdcall glIsList( long ) +@ stdcall glIsTexture( long ) +@ stdcall glLightModelf( long long ) +@ stdcall glLightModelfv( long ptr ) +@ stdcall glLightModeli( long long ) +@ stdcall glLightModeliv( long ptr ) +@ stdcall glLightf( long long long ) +@ stdcall glLightfv( long long ptr ) +@ stdcall glLighti( long long long ) +@ stdcall glLightiv( long long ptr ) +@ stdcall glLineStipple( long long ) +@ stdcall glLineWidth( long ) +@ stdcall glListBase( long ) +@ stdcall glLoadIdentity( ) +@ stdcall glLoadMatrixd( ptr ) +@ stdcall glLoadMatrixf( ptr ) +@ stdcall glLoadName( long ) +@ stdcall glLogicOp( long ) +@ stdcall glMap1d( long double double long long ptr ) +@ stdcall glMap1f( long long long long long ptr ) +@ stdcall glMap2d( long double double long long double double long long ptr ) +@ stdcall glMap2f( long long long long long long long long long ptr ) +@ stdcall glMapGrid1d( long double double ) +@ stdcall glMapGrid1f( long long long ) +@ stdcall glMapGrid2d( long double double long double double ) +@ stdcall glMapGrid2f( long long long long long long ) +@ stdcall glMaterialf( long long long ) +@ stdcall glMaterialfv( long long ptr ) +@ stdcall glMateriali( long long long ) +@ stdcall glMaterialiv( long long ptr ) +@ stdcall glMatrixMode( long ) +@ stdcall glMultMatrixd( ptr ) +@ stdcall glMultMatrixf( ptr ) +@ stdcall glNewList( long long ) +@ stdcall glNormal3b( long long long ) +@ stdcall glNormal3bv( ptr ) +@ stdcall glNormal3d( double double double ) +@ stdcall glNormal3dv( ptr ) +@ stdcall glNormal3f( long long long ) +@ stdcall glNormal3fv( ptr ) +@ stdcall glNormal3i( long long long ) +@ stdcall glNormal3iv( ptr ) +@ stdcall glNormal3s( long long long ) +@ stdcall glNormal3sv( ptr ) +@ stdcall glNormalPointer( long long ptr ) +@ stdcall glOrtho( double double double double double double ) +@ stdcall glPassThrough( long ) +@ stdcall glPixelMapfv( long long ptr ) +@ stdcall glPixelMapuiv( long long ptr ) +@ stdcall glPixelMapusv( long long ptr ) +@ stdcall glPixelStoref( long long ) +@ stdcall glPixelStorei( long long ) +@ stdcall glPixelTransferf( long long ) +@ stdcall glPixelTransferi( long long ) +@ stdcall glPixelZoom( long long ) +@ stdcall glPointSize( long ) +@ stdcall glPolygonMode( long long ) +@ stdcall glPolygonOffset( long long ) +@ stdcall glPolygonStipple( ptr ) +@ stdcall glPopAttrib( ) +@ stdcall glPopClientAttrib( ) +@ stdcall glPopMatrix( ) +@ stdcall glPopName( ) +@ stdcall glPrioritizeTextures( long ptr ptr ) +@ stdcall glPushAttrib( long ) +@ stdcall glPushClientAttrib( long ) +@ stdcall glPushMatrix( ) +@ stdcall glPushName( long ) +@ stdcall glRasterPos2d( double double ) +@ stdcall glRasterPos2dv( ptr ) +@ stdcall glRasterPos2f( long long ) +@ stdcall glRasterPos2fv( ptr ) +@ stdcall glRasterPos2i( long long ) +@ stdcall glRasterPos2iv( ptr ) +@ stdcall glRasterPos2s( long long ) +@ stdcall glRasterPos2sv( ptr ) +@ stdcall glRasterPos3d( double double double ) +@ stdcall glRasterPos3dv( ptr ) +@ stdcall glRasterPos3f( long long long ) +@ stdcall glRasterPos3fv( ptr ) +@ stdcall glRasterPos3i( long long long ) +@ stdcall glRasterPos3iv( ptr ) +@ stdcall glRasterPos3s( long long long ) +@ stdcall glRasterPos3sv( ptr ) +@ stdcall glRasterPos4d( double double double double ) +@ stdcall glRasterPos4dv( ptr ) +@ stdcall glRasterPos4f( long long long long ) +@ stdcall glRasterPos4fv( ptr ) +@ stdcall glRasterPos4i( long long long long ) +@ stdcall glRasterPos4iv( ptr ) +@ stdcall glRasterPos4s( long long long long ) +@ stdcall glRasterPos4sv( ptr ) +@ stdcall glReadBuffer( long ) +@ stdcall glReadPixels( long long long long long long ptr ) +@ stdcall glRectd( double double double double ) +@ stdcall glRectdv( ptr ptr ) +@ stdcall glRectf( long long long long ) +@ stdcall glRectfv( ptr ptr ) +@ stdcall glRecti( long long long long ) +@ stdcall glRectiv( ptr ptr ) +@ stdcall glRects( long long long long ) +@ stdcall glRectsv( ptr ptr ) +@ stdcall glRenderMode( long ) +@ stdcall glRotated( double double double double ) +@ stdcall glRotatef( long long long long ) +@ stdcall glScaled( double double double ) +@ stdcall glScalef( long long long ) +@ stdcall glScissor( long long long long ) +@ stdcall glSelectBuffer( long ptr ) +@ stdcall glShadeModel( long ) +@ stdcall glStencilFunc( long long long ) +@ stdcall glStencilMask( long ) +@ stdcall glStencilOp( long long long ) +@ stdcall glTexCoord1d( double ) +@ stdcall glTexCoord1dv( ptr ) +@ stdcall glTexCoord1f( long ) +@ stdcall glTexCoord1fv( ptr ) +@ stdcall glTexCoord1i( long ) +@ stdcall glTexCoord1iv( ptr ) +@ stdcall glTexCoord1s( long ) +@ stdcall glTexCoord1sv( ptr ) +@ stdcall glTexCoord2d( double double ) +@ stdcall glTexCoord2dv( ptr ) +@ stdcall glTexCoord2f( long long ) +@ stdcall glTexCoord2fv( ptr ) +@ stdcall glTexCoord2i( long long ) +@ stdcall glTexCoord2iv( ptr ) +@ stdcall glTexCoord2s( long long ) +@ stdcall glTexCoord2sv( ptr ) +@ stdcall glTexCoord3d( double double double ) +@ stdcall glTexCoord3dv( ptr ) +@ stdcall glTexCoord3f( long long long ) +@ stdcall glTexCoord3fv( ptr ) +@ stdcall glTexCoord3i( long long long ) +@ stdcall glTexCoord3iv( ptr ) +@ stdcall glTexCoord3s( long long long ) +@ stdcall glTexCoord3sv( ptr ) +@ stdcall glTexCoord4d( double double double double ) +@ stdcall glTexCoord4dv( ptr ) +@ stdcall glTexCoord4f( long long long long ) +@ stdcall glTexCoord4fv( ptr ) +@ stdcall glTexCoord4i( long long long long ) +@ stdcall glTexCoord4iv( ptr ) +@ stdcall glTexCoord4s( long long long long ) +@ stdcall glTexCoord4sv( ptr ) +@ stdcall glTexCoordPointer( long long long ptr ) +@ stdcall glTexEnvf( long long long ) +@ stdcall glTexEnvfv( long long ptr ) +@ stdcall glTexEnvi( long long long ) +@ stdcall glTexEnviv( long long ptr ) +@ stdcall glTexGend( long long double ) +@ stdcall glTexGendv( long long ptr ) +@ stdcall glTexGenf( long long long ) +@ stdcall glTexGenfv( long long ptr ) +@ stdcall glTexGeni( long long long ) +@ stdcall glTexGeniv( long long ptr ) +@ stdcall glTexImage1D( long long long long long long long ptr ) +@ stdcall glTexImage2D( long long long long long long long long ptr ) +@ stdcall glTexParameterf( long long long ) +@ stdcall glTexParameterfv( long long ptr ) +@ stdcall glTexParameteri( long long long ) +@ stdcall glTexParameteriv( long long ptr ) +@ stdcall glTexSubImage1D( long long long long long long ptr ) +@ stdcall glTexSubImage2D( long long long long long long long long ptr ) +@ stdcall glTranslated( double double double ) +@ stdcall glTranslatef( long long long ) +@ stdcall glVertex2d( double double ) +@ stdcall glVertex2dv( ptr ) +@ stdcall glVertex2f( long long ) +@ stdcall glVertex2fv( ptr ) +@ stdcall glVertex2i( long long ) +@ stdcall glVertex2iv( ptr ) +@ stdcall glVertex2s( long long ) +@ stdcall glVertex2sv( ptr ) +@ stdcall glVertex3d( double double double ) +@ stdcall glVertex3dv( ptr ) +@ stdcall glVertex3f( long long long ) +@ stdcall glVertex3fv( ptr ) +@ stdcall glVertex3i( long long long ) +@ stdcall glVertex3iv( ptr ) +@ stdcall glVertex3s( long long long ) +@ stdcall glVertex3sv( ptr ) +@ stdcall glVertex4d( double double double double ) +@ stdcall glVertex4dv( ptr ) +@ stdcall glVertex4f( long long long long ) +@ stdcall glVertex4fv( ptr ) +@ stdcall glVertex4i( long long long long ) +@ stdcall glVertex4iv( ptr ) +@ stdcall glVertex4s( long long long long ) +@ stdcall glVertex4sv( ptr ) +@ stdcall glVertexPointer( long long long ptr ) +@ stdcall glViewport( long long long long ) + +@ stdcall OSMesaColorClamp(long) +@ stdcall OSMesaCreateContext(long ptr) +@ stdcall OSMesaCreateContextExt(long long long long ptr) +@ stdcall OSMesaDestroyContext(ptr) +@ stdcall OSMesaMakeCurrent(ptr ptr long long long) +@ stdcall OSMesaGetCurrentContext() +@ stdcall OSMesaPixelStore(long long) +@ stdcall OSMesaGetIntegerv(long ptr) +@ stdcall OSMesaGetDepthBuffer(ptr ptr ptr ptr ptr) +@ stdcall OSMesaGetColorBuffer(ptr ptr ptr ptr ptr) +@ stdcall OSMesaGetProcAddress(str) Propchange: trunk/reactos/dll/opengl/mesa/src/mesa/drivers/osmesa/osmesa.spec ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/opengl/mesa/src/mesa/main/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/CMakeLists.txt (added) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/CMakeLists.txt [iso-8859-1] Sun Sep 15 20:44:50 2013 @@ -0,0 +1,106 @@ + +list(APPEND SOURCE + api_arrayelt.c + api_exec.c + api_exec_es1.c + api_exec_es2.c + api_loopback.c + api_validate.c + accum.c + arbprogram.c + atifragshader.c + attrib.c + arrayobj.c + blend.c + bufferobj.c + buffers.c + clear.c + clip.c + colortab.c + condrender.c + context.c + convolve.c + cpuinfo.c + debug.c + depth.c + dlist.c + dlopen.c + drawpix.c + drawtex.c + enable.c + enums.c + eval.c + execmem.c + extensions.c + fbobject.c + feedback.c + ff_fragment_shader.cpp + ffvertex_prog.c + fog.c + formats.c + format_pack.c + format_unpack.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 + multisample.c + nvprogram.c + pack.c + pbo.c + pixel.c + pixelstore.c + pixeltransfer.c + points.c + polygon.c + querymatrix.c + queryobj.c + rastpos.c + readpix.c + remap.c + renderbuffer.c + samplerobj.c + scissor.c + shaderapi.c + shaderobj.c + shader_query.cpp + shared.c + state.c + stencil.c + syncobj.c + texcompress.c + texcompress_rgtc.c + texcompress_s3tc.c + texcompress_fxt1.c + texcompress_etc.c + texenv.c + texformat.c + texgen.c + texgetimage.c + teximage.c + texobj.c + texpal.c + texparam.c + texstate.c + texstorage.c + texstore.c + texturebarrier.c + transformfeedback.c + uniform_query.cpp + uniforms.c + varray.c + version.c + viewport.c + vtxfmt.c +) + +add_library(mesa_main STATIC ${SOURCE}) Propchange: trunk/reactos/dll/opengl/mesa/src/mesa/main/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/opengl/mesa/src/mesa/math/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/math/CMakeLists.txt (added) +++ trunk/reactos/dll/opengl/mesa/src/mesa/math/CMakeLists.txt [iso-8859-1] Sun Sep 15 20:44:50 2013 @@ -0,0 +1,13 @@ + +list(APPEND SOURCE + 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 +) + +add_library(mesa_math STATIC ${SOURCE}) Propchange: trunk/reactos/dll/opengl/mesa/src/mesa/math/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/opengl/mesa/src/mesa/program/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/program/CMakeLists.txt (added) +++ trunk/reactos/dll/opengl/mesa/src/mesa/program/CMakeLists.txt [iso-8859-1] Sun Sep 15 20:44:50 2013 @@ -0,0 +1,32 @@ + +list(APPEND SOURCE + ../../../generated/mesa/program/lex.yy.c + ../../../generated/mesa/program/program_parse.tab.c + arbprogparse.c + hash_table.c + ir_to_mesa.cpp + nvfragparse.c + nvvertparse.c + program.c + program_parse_extra.c + prog_cache.c + prog_execute.c + prog_instruction.c + prog_noise.c + prog_optimize.c + prog_opt_constant_fold.c + prog_parameter.c + prog_parameter_layout.c + prog_print.c + prog_statevars.c + programopt.c + sampler.cpp + symbol_table.c + string_to_uint_map.cpp +) + +if(NOT MSVC) + add_compile_flags("-Wno-format") +endif() + +add_library(mesa_program STATIC ${SOURCE}) Propchange: trunk/reactos/dll/opengl/mesa/src/mesa/program/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/swrast/CMakeLists.txt (added) +++ trunk/reactos/dll/opengl/mesa/src/mesa/swrast/CMakeLists.txt [iso-8859-1] Sun Sep 15 20:44:50 2013 @@ -0,0 +1,34 @@ + +list(APPEND SOURCE + s_aaline.c + s_aatriangle.c + s_alpha.c + s_atifragshader.C + s_bitmap.c + s_blend.c + s_blit.c + s_clear.c + s_context.c + s_copypix.c + s_depth.c + s_drawpix.c + s_feedback.c + s_fog.c + s_fragprog.c + s_lines.c + s_logic.c + s_masking.c + s_points.c + s_renderbuffer.c + s_span.c + s_stencil.c + s_texcombine.c + s_texfetch.c + s_texfilter.c + s_texrender.c + s_texture.c + s_triangle.c + s_zoom.c +) + +add_library(mesa_swrast STATIC ${SOURCE}) Propchange: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/opengl/mesa/src/mesa/swrast_setup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/swrast_setup/CMakeLists.txt (added) +++ trunk/reactos/dll/opengl/mesa/src/mesa/swrast_setup/CMakeLists.txt [iso-8859-1] Sun Sep 15 20:44:50 2013 @@ -0,0 +1,7 @@ + +list(APPEND SOURCE + ss_context.c + ss_triangle.c +) + +add_library(mesa_swrast_setup STATIC ${SOURCE}) Propchange: trunk/reactos/dll/opengl/mesa/src/mesa/swrast_setup/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/tnl/CMakeLists.txt (added) +++ trunk/reactos/dll/opengl/mesa/src/mesa/tnl/CMakeLists.txt [iso-8859-1] Sun Sep 15 20:44:50 2013 @@ -0,0 +1,22 @@ + +list(APPEND SOURCE + t_context.c + t_draw.c + t_pipeline.c + t_rasterpos.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 +) + +add_library(mesa_tnl STATIC ${SOURCE}) Propchange: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/vbo/CMakeLists.txt (added) +++ trunk/reactos/dll/opengl/mesa/src/mesa/vbo/CMakeLists.txt [iso-8859-1] Sun Sep 15 20:44:50 2013 @@ -0,0 +1,20 @@ + +list(APPEND SOURCE + vbo_context.c + vbo_exec.c + vbo_exec_api.c + vbo_exec_array.c + vbo_exec_draw.c + vbo_exec_eval.c + vbo_noop.c + vbo_rebase.c + vbo_split.c + vbo_split_copy.c + vbo_split_inplace.c + vbo_save.c + vbo_save_api.c + vbo_save_draw.c + vbo_save_loopback.c +) + +add_library(mesa_vbo STATIC ${SOURCE}) Propchange: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

11 years

[tkreuzer] 60148: [EXPLORER] Fix x64 build

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun Sep 15 18:39:50 2013 New Revision: 60148 URL: http://svn.reactos.org/svn/reactos?rev=60148&view=rev Log: [EXPLORER] Fix x64 build Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt trunk/reactos/base/shell/explorer/explorer.cpp trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp Modified: trunk/reactos/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/CMakeL… ============================================================================== --- trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/CMakeLists.txt [iso-8859-1] Sun Sep 15 18:39:50 2013 @@ -26,7 +26,6 @@ shell/winfs.cpp dialogs/searchprogram.cpp dialogs/settings.cpp - i386-stub-win32.c taskbar/taskbar.cpp taskbar/favorites.cpp taskbar/quicklaunch.cpp @@ -47,6 +46,11 @@ utility/window.cpp utility/shellbrowserimpl.cpp) # utility/shelltests.cpp +if(ARCH MATCHES i386) + list(APPEND SOURCE + i386-stub-win32.c) +endif() + add_executable(explorer ${SOURCE}) target_link_libraries(explorer comsupp wine uuid) set_module_type(explorer win32gui UNICODE) Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] Sun Sep 15 18:39:50 2013 @@ -1186,19 +1186,17 @@ if (_tcsstr(ext_options,TEXT("-break"))) { LOG(TEXT("debugger breakpoint")); -#ifdef _MSC_VER - __asm int 3 -#else - asm("int3"); -#endif - } - + __debugbreak(); + } + +#ifdef _M_IX86 // activate GDB remote debugging stub if no other debugger is running if (use_gdb_stub) { LOG(TEXT("waiting for debugger connection...\n")); initialize_gdb_stub(); } +#endif g_Globals.init(hInstance); Modified: trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba… ============================================================================== --- trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/taskbar/taskbar.cpp [iso-8859-1] Sun Sep 15 18:39:50 2013 @@ -328,13 +328,13 @@ { HICON hIcon = 0; - SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon); - - if (!hIcon) - SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon); - - if (!hIcon) - SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon); + SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); + + if (!hIcon) + SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); + + if (!hIcon) + SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); if (!hIcon) hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICONSM); @@ -343,7 +343,7 @@ hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICON); if (!hIcon) - SendMessageTimeout(hwnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (LPDWORD)&hIcon); + SendMessageTimeout(hwnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (PDWORD_PTR)&hIcon); return hIcon; } @@ -352,13 +352,13 @@ { HICON hIcon = 0; - SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon); - - if (!hIcon) - SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon); - - if (!hIcon) - SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon); + SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); + + if (!hIcon) + SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); + + if (!hIcon) + SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); if (allow_from_class) { if (!hIcon) @@ -369,7 +369,7 @@ } if (!hIcon) - SendMessageTimeout(hwnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (LPDWORD)&hIcon); + SendMessageTimeout(hwnd, WM_QUERYDRAGICON, 0, 0, 0, 1000, (PDWORD_PTR)&hIcon); return hIcon; } @@ -519,7 +519,7 @@ if (!SendMessage(_htoolbar, TB_DELETEBUTTON, idx, 0)) MessageBoxW(NULL, L"failed to delete button", NULL, MB_OK); - + for(TaskBarMap::iterator it2=_map.begin(); it2!=_map.end(); ++it2) { TaskBarEntry& entry = it2->second; @@ -528,7 +528,7 @@ --entry._btn_idx; #if 0 --entry._bmp_idx; - + TBBUTTONINFO info; info.cbSize = sizeof(TBBUTTONINFO); @@ -540,7 +540,7 @@ #endif } } - + } for(set<HBITMAP>::iterator it=hbmp_to_delete.begin(); it!=hbmp_to_delete.end(); ++it) {

11 years

[aandrejevic] 60147: [SOFT386] Implement the direct relative near call (CALL rel16/32) instruction.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Sun Sep 15 18:26:25 2013 New Revision: 60147 URL: http://svn.reactos.org/svn/reactos?rev=60147&view=rev Log: [SOFT386] Implement the direct relative near call (CALL rel16/32) instruction. Modified: branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Sun Sep 15 18:26:25 2013 @@ -4204,67 +4204,117 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeCall) { + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xE8); + + if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + else if (State->PrefixFlags != 0) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Push the current value of the instruction pointer */ + if (!Soft386StackPush(State, State->InstPtr.Long)) + { + /* Exception occurred */ + return FALSE; + } + + if (Size) + { + LONG Offset = 0; + + /* Fetch the offset */ + if (!Soft386FetchDword(State, (PULONG)&Offset)) + { + /* An exception occurred */ + return FALSE; + } + + /* Move the instruction pointer */ + State->InstPtr.Long += Offset; + } + else + { + SHORT Offset = 0; + + /* Fetch the offset */ + if (!Soft386FetchWord(State, (PUSHORT)&Offset)) + { + /* An exception occurred */ + return FALSE; + } + + /* Move the instruction pointer */ + State->InstPtr.LowWord += Offset; + } + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeJmp) +{ + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0xE9); + + if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + else if (State->PrefixFlags != 0) + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (Size) + { + LONG Offset = 0; + + /* Fetch the offset */ + if (!Soft386FetchDword(State, (PULONG)&Offset)) + { + /* An exception occurred */ + return FALSE; + } + + /* Move the instruction pointer */ + State->InstPtr.Long += Offset; + } + else + { + SHORT Offset = 0; + + /* Fetch the offset */ + if (!Soft386FetchWord(State, (PUSHORT)&Offset)) + { + /* An exception occurred */ + return FALSE; + } + + /* Move the instruction pointer */ + State->InstPtr.LowWord += Offset; + } + + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeJmpAbs) +{ // TODO: NOT IMPLEMENTED UNIMPLEMENTED; return FALSE; } - -SOFT386_OPCODE_HANDLER(Soft386OpcodeJmp) -{ - BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; - - /* Make sure this is the right instruction */ - ASSERT(Opcode == 0xE9); - - if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) - { - /* The OPSIZE prefix toggles the size */ - Size = !Size; - } - else if (State->PrefixFlags != 0) - { - /* Invalid prefix */ - Soft386Exception(State, SOFT386_EXCEPTION_UD); - return FALSE; - } - - if (Size) - { - LONG Offset = 0; - - /* Fetch the offset */ - if (!Soft386FetchDword(State, (PULONG)&Offset)) - { - /* An exception occurred */ - return FALSE; - } - - /* Move the instruction pointer */ - State->InstPtr.Long += Offset; - } - else - { - SHORT Offset = 0; - - /* Fetch the offset */ - if (!Soft386FetchWord(State, (PUSHORT)&Offset)) - { - /* An exception occurred */ - return FALSE; - } - - /* Move the instruction pointer */ - State->InstPtr.LowWord += Offset; - } - - return TRUE; -} - -SOFT386_OPCODE_HANDLER(Soft386OpcodeJmpAbs) -{ - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; -}

11 years

← Newer
1
...
31
32
33
34
35
36
37
...
56
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs September 2013