Ros-diffs

ros-diffs@reactos.org

81390 discussions

[akhaldi] 60159: [CRYPTUI] * Move resource files to the appropriate folders.
by akhaldi＠svn.reactos.org 16 Sep '13

16 Sep '13

Author: akhaldi Date: Mon Sep 16 13:45:33 2013 New Revision: 60159 URL: http://svn.reactos.org/svn/reactos?rev=60159&view=rev Log: [CRYPTUI] * Move resource files to the appropriate folders. Added: trunk/reactos/dll/win32/cryptui/lang/ (with props) trunk/reactos/dll/win32/cryptui/lang/cryptui_De.rc - copied unchanged from r60158, trunk/reactos/dll/win32/cryptui/cryptui_De.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_En.rc - copied unchanged from r60158, trunk/reactos/dll/win32/cryptui/cryptui_En.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Fr.rc - copied unchanged from r60158, trunk/reactos/dll/win32/cryptui/cryptui_Fr.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_He.rc - copied unchanged from r60158, trunk/reactos/dll/win32/cryptui/cryptui_He.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_It.rc - copied unchanged from r60158, trunk/reactos/dll/win32/cryptui/cryptui_It.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Ko.rc - copied unchanged from r60158, trunk/reactos/dll/win32/cryptui/cryptui_Ko.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Lt.rc - copied unchanged from r60158, trunk/reactos/dll/win32/cryptui/cryptui_Lt.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Nl.rc - copied unchanged from r60158, trunk/reactos/dll/win32/cryptui/cryptui_Nl.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_No.rc - copied unchanged from r60158, trunk/reactos/dll/win32/cryptui/cryptui_No.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Pl.rc - copied unchanged from r60158, trunk/reactos/dll/win32/cryptui/cryptui_Pl.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Pt.rc - copied unchanged from r60158, trunk/reactos/dll/win32/cryptui/cryptui_Pt.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Ro.rc - copied unchanged from r60158, trunk/reactos/dll/win32/cryptui/cryptui_Ro.rc trunk/reactos/dll/win32/cryptui/lang/cryptui_Uk.rc - copied unchanged from r60158, trunk/reactos/dll/win32/cryptui/cryptui_Uk.rc trunk/reactos/dll/win32/cryptui/res/ (with props) trunk/reactos/dll/win32/cryptui/res/cert.bmp - copied unchanged from r60158, trunk/reactos/dll/win32/cryptui/cert.bmp trunk/reactos/dll/win32/cryptui/res/certerror.bmp - copied unchanged from r60158, trunk/reactos/dll/win32/cryptui/certerror.bmp trunk/reactos/dll/win32/cryptui/res/certheader.bmp - copied unchanged from r60158, trunk/reactos/dll/win32/cryptui/certheader.bmp trunk/reactos/dll/win32/cryptui/res/certwarning.bmp - copied unchanged from r60158, trunk/reactos/dll/win32/cryptui/certwarning.bmp trunk/reactos/dll/win32/cryptui/res/certwatermark.bmp - copied unchanged from r60158, trunk/reactos/dll/win32/cryptui/certwatermark.bmp trunk/reactos/dll/win32/cryptui/res/checks.bmp - copied unchanged from r60158, trunk/reactos/dll/win32/cryptui/checks.bmp trunk/reactos/dll/win32/cryptui/res/smallicons.bmp - copied unchanged from r60158, trunk/reactos/dll/win32/cryptui/smallicons.bmp Removed: trunk/reactos/dll/win32/cryptui/cert.bmp trunk/reactos/dll/win32/cryptui/certerror.bmp trunk/reactos/dll/win32/cryptui/certheader.bmp trunk/reactos/dll/win32/cryptui/certwarning.bmp trunk/reactos/dll/win32/cryptui/certwatermark.bmp trunk/reactos/dll/win32/cryptui/checks.bmp trunk/reactos/dll/win32/cryptui/cryptui_De.rc trunk/reactos/dll/win32/cryptui/cryptui_En.rc trunk/reactos/dll/win32/cryptui/cryptui_Fr.rc trunk/reactos/dll/win32/cryptui/cryptui_He.rc trunk/reactos/dll/win32/cryptui/cryptui_It.rc trunk/reactos/dll/win32/cryptui/cryptui_Ko.rc trunk/reactos/dll/win32/cryptui/cryptui_Lt.rc trunk/reactos/dll/win32/cryptui/cryptui_Nl.rc trunk/reactos/dll/win32/cryptui/cryptui_No.rc trunk/reactos/dll/win32/cryptui/cryptui_Pl.rc trunk/reactos/dll/win32/cryptui/cryptui_Pt.rc trunk/reactos/dll/win32/cryptui/cryptui_Ro.rc trunk/reactos/dll/win32/cryptui/cryptui_Uk.rc trunk/reactos/dll/win32/cryptui/smallicons.bmp Modified: trunk/reactos/dll/win32/cryptui/cryptui.rc [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/dll/win32/cryptui/cert.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cert.bmp… Removed: trunk/reactos/dll/win32/cryptui/certerror.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/certerro… Removed: trunk/reactos/dll/win32/cryptui/certheader.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/certhead… Removed: trunk/reactos/dll/win32/cryptui/certwarning.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/certwarn… Removed: trunk/reactos/dll/win32/cryptui/certwatermark.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/certwate… Removed: trunk/reactos/dll/win32/cryptui/checks.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/checks.b… Modified: trunk/reactos/dll/win32/cryptui/cryptui.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui.… Removed: trunk/reactos/dll/win32/cryptui/cryptui_De.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Removed: trunk/reactos/dll/win32/cryptui/cryptui_En.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Removed: trunk/reactos/dll/win32/cryptui/cryptui_Fr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Removed: trunk/reactos/dll/win32/cryptui/cryptui_He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Removed: trunk/reactos/dll/win32/cryptui/cryptui_It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Removed: trunk/reactos/dll/win32/cryptui/cryptui_Ko.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Removed: trunk/reactos/dll/win32/cryptui/cryptui_Lt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Removed: trunk/reactos/dll/win32/cryptui/cryptui_Nl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Removed: trunk/reactos/dll/win32/cryptui/cryptui_No.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Removed: trunk/reactos/dll/win32/cryptui/cryptui_Pl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Removed: trunk/reactos/dll/win32/cryptui/cryptui_Pt.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Removed: trunk/reactos/dll/win32/cryptui/cryptui_Ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Removed: trunk/reactos/dll/win32/cryptui/cryptui_Uk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/cryptui_… Removed: trunk/reactos/dll/win32/cryptui/smallicons.bmp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptui/smallico…

1 0

[khornicek] 60158: [CRT] Check global_locale directly in setmbcp_l to prevent an endless recursion (__get_MSVCRT_locale -> __init_global_locale -> MSVCRT__create_locale -> _setmbcp_l -> __get_MSVCR...
by khornicek＠svn.reactos.org 16 Sep '13

16 Sep '13

Author: khornicek Date: Mon Sep 16 11:55:50 2013 New Revision: 60158 URL: http://svn.reactos.org/svn/reactos?rev=60158&view=rev Log: [CRT] Check global_locale directly in setmbcp_l to prevent an endless recursion (__get_MSVCRT_locale -> __init_global_locale -> MSVCRT__create_locale -> _setmbcp_l -> __get_MSVCRT_locale...) when global_locale is NULL. [NLS] Add c_20127.nls generated using Wine's CP tables. Added: trunk/reactos/media/nls/c_20127.nls (with props) Modified: trunk/reactos/boot/bootdata/hivesys.inf trunk/reactos/lib/sdk/crt/mbstring/_setmbcp.c trunk/reactos/media/nls/CMakeLists.txt Modified: trunk/reactos/boot/bootdata/hivesys.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys.inf [iso-8859-1] Mon Sep 16 11:55:50 2013 @@ -830,6 +830,7 @@ HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","10029",0x00000000,"c_10029.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","10079",0x00000000,"c_10079.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","10081",0x00000000,"c_10081.nls" +HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","20127",0x00000000,"c_20127.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","20866",0x00000000,"c_20866.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","21866",0x00000000,"c_21866.nls" HKLM,"SYSTEM\CurrentControlSet\Control\Nls\CodePage","28591",0x00000000,"c_28591.nls" Modified: trunk/reactos/lib/sdk/crt/mbstring/_setmbcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/mbstring/_setm… ============================================================================== --- trunk/reactos/lib/sdk/crt/mbstring/_setmbcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/mbstring/_setmbcp.c [iso-8859-1] Mon Sep 16 11:55:50 2013 @@ -206,7 +206,7 @@ } mbcinfo->mbcodepage = newcp; - if(MSVCRT_locale && mbcinfo == MSVCRT_locale->mbcinfo) + if(global_locale && mbcinfo == MSVCRT_locale->mbcinfo) memcpy(_mbctype, MSVCRT_locale->mbcinfo->mbctype, sizeof(_mbctype)); return 0; Modified: trunk/reactos/media/nls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/media/nls/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/media/nls/CMakeLists.txt [iso-8859-1] Mon Sep 16 11:55:50 2013 @@ -44,6 +44,7 @@ c_10029.nls c_10079.nls c_10081.nls + c_20127.nls c_20866.nls c_21866.nls c_28591.nls Added: trunk/reactos/media/nls/c_20127.nls URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/nls/c_20127.nls?rev=… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/media/nls/c_20127.nls ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

1 0

[hbelusca] 60157: [NTOS] - Enable a call to ExAllocatePoolWithQuotaTag now that the function is implemented. - Fix a typo.
by hbelusca＠svn.reactos.org 15 Sep '13

15 Sep '13

Author: hbelusca Date: Sun Sep 15 23:17:24 2013 New Revision: 60157 URL: http://svn.reactos.org/svn/reactos?rev=60157&view=rev Log: [NTOS] - Enable a call to ExAllocatePoolWithQuotaTag now that the function is implemented. - Fix a typo. Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/mm/ARM3/expool.c Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Sun Sep 15 23:17:24 2013 @@ -591,9 +591,7 @@ /* Check if we should charge quota */ if (ChargeQuota) { - /* Irp = ExAllocatePoolWithQuotaTag(NonPagedPool, Size, TAG_IRP); */ - /* FIXME */ - Irp = ExAllocatePoolWithTag(NonPagedPool, Size, TAG_IRP); + Irp = ExAllocatePoolWithQuotaTag(NonPagedPool, Size, TAG_IRP); } else { 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:17:24 2013 @@ -2518,7 +2518,7 @@ PEPROCESS Process = PsGetCurrentProcess(); // - // Check if we should fail intead of raising an exception + // Check if we should fail instead of raising an exception // if (PoolType & POOL_QUOTA_FAIL_INSTEAD_OF_RAISE) {

1 0

[tfaber] 60156: [NTOS:MM] - Correctly use POOL_BLOCK_SIZE in ExAllocatePoolWithQuotaTag
by tfaber＠svn.reactos.org 15 Sep '13

15 Sep '13

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)) { //

1 0

[jgardou] 60155: [OSMESA] - enable x86 optimisations for GCC builds
by jgardou＠svn.reactos.org 15 Sep '13

15 Sep '13

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

1 0

[jgardou] 60154: [OPENGL32_NEW] - try to fix jim's build
by jgardou＠svn.reactos.org 15 Sep '13

15 Sep '13

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

1 0

[jgardou] 60153: [OPENGL32_NEW] - Actually enable the build
by jgardou＠svn.reactos.org 15 Sep '13

15 Sep '13

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)

1 0

[jgardou] 60152: [PSDK/WINGDI.H] - add wglSwapMultipleBuffers prototype
by jgardou＠svn.reactos.org 15 Sep '13

15 Sep '13

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);

1 0

[jgardou] 60151: [OSMESA] - In a galaxy far, far away, I don't break the builds.
by jgardou＠svn.reactos.org 15 Sep '13

15 Sep '13

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

1 0

[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 15 Sep '13

15 Sep '13

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…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs