Ros-diffs October 2013

ros-diffs@reactos.org

14 participants
325 discussions

[jgardou] 60581: [MESA] - leaner build part 15 of X - Get rid of ARB_pixel_buffer_object, ARB_robustness, ARB_texture_border_clamp, EXT_multi_draw_arrays, EXT_pixel_buffer_object, EXT_stencil_two_s...

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Oct 7 18:23:53 2013 New Revision: 60581 URL: http://svn.reactos.org/svn/reactos?rev=60581&view=rev Log: [MESA] - leaner build part 15 of X - Get rid of ARB_pixel_buffer_object, ARB_robustness, ARB_texture_border_clamp, EXT_multi_draw_arrays, EXT_pixel_buffer_object, EXT_stencil_two_side, ARB_texture_edge_clamp, EXT_texture_mirror_clamp, ATI_separate_stencil, ATI_texture_mirror_once, SGIS_texture_border_clamp, SGIS_texture_edge_clamp, SUN_multi_draw_arrays CORE-7499 Removed: trunk/reactos/dll/opengl/mesa/main/pbo.c trunk/reactos/dll/opengl/mesa/main/pbo.h Modified: trunk/reactos/dll/opengl/mesa/drivers/common/driverfuncs.c trunk/reactos/dll/opengl/mesa/drivers/common/meta.c trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt trunk/reactos/dll/opengl/mesa/main/api_exec.c trunk/reactos/dll/opengl/mesa/main/attrib.c trunk/reactos/dll/opengl/mesa/main/bufferobj.c trunk/reactos/dll/opengl/mesa/main/colortab.c trunk/reactos/dll/opengl/mesa/main/context.c trunk/reactos/dll/opengl/mesa/main/convolve.c trunk/reactos/dll/opengl/mesa/main/dd.h trunk/reactos/dll/opengl/mesa/main/dispatch.h trunk/reactos/dll/opengl/mesa/main/dlist.c trunk/reactos/dll/opengl/mesa/main/drawpix.c trunk/reactos/dll/opengl/mesa/main/enable.c trunk/reactos/dll/opengl/mesa/main/eval.c trunk/reactos/dll/opengl/mesa/main/extensions.c trunk/reactos/dll/opengl/mesa/main/get.c trunk/reactos/dll/opengl/mesa/main/get.h trunk/reactos/dll/opengl/mesa/main/getstring.c trunk/reactos/dll/opengl/mesa/main/histogram.c trunk/reactos/dll/opengl/mesa/main/mtypes.h trunk/reactos/dll/opengl/mesa/main/pack.c trunk/reactos/dll/opengl/mesa/main/pixel.c trunk/reactos/dll/opengl/mesa/main/pixelstore.c trunk/reactos/dll/opengl/mesa/main/polygon.c trunk/reactos/dll/opengl/mesa/main/polygon.h trunk/reactos/dll/opengl/mesa/main/readpix.c trunk/reactos/dll/opengl/mesa/main/readpix.h trunk/reactos/dll/opengl/mesa/main/state.c trunk/reactos/dll/opengl/mesa/main/state.h trunk/reactos/dll/opengl/mesa/main/stencil.c trunk/reactos/dll/opengl/mesa/main/stencil.h trunk/reactos/dll/opengl/mesa/main/texgetimage.c trunk/reactos/dll/opengl/mesa/main/texgetimage.h trunk/reactos/dll/opengl/mesa/main/texparam.c trunk/reactos/dll/opengl/mesa/main/texstore.c trunk/reactos/dll/opengl/mesa/main/varray.c trunk/reactos/dll/opengl/mesa/main/varray.h trunk/reactos/dll/opengl/mesa/main/version.c trunk/reactos/dll/opengl/mesa/swrast/s_aalinetemp.h trunk/reactos/dll/opengl/mesa/swrast/s_aatritemp.h trunk/reactos/dll/opengl/mesa/swrast/s_bitmap.c trunk/reactos/dll/opengl/mesa/swrast/s_context.c trunk/reactos/dll/opengl/mesa/swrast/s_context.h trunk/reactos/dll/opengl/mesa/swrast/s_drawpix.c trunk/reactos/dll/opengl/mesa/swrast/s_linetemp.h trunk/reactos/dll/opengl/mesa/swrast/s_points.c trunk/reactos/dll/opengl/mesa/swrast/s_span.h trunk/reactos/dll/opengl/mesa/swrast/s_stencil.c trunk/reactos/dll/opengl/mesa/swrast/s_texfilter.c trunk/reactos/dll/opengl/mesa/swrast/s_tritemp.h trunk/reactos/dll/opengl/mesa/swrast/swrast.h trunk/reactos/dll/opengl/mesa/swrast_setup/ss_context.c trunk/reactos/dll/opengl/mesa/swrast_setup/ss_triangle.c trunk/reactos/dll/opengl/mesa/vbo/vbo_exec_array.c trunk/reactos/dll/opengl/mesa/vbo/vbo_exec_draw.c trunk/reactos/dll/opengl/mesa/vbo/vbo_save_draw.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/opengl/mesa/drivers/common/driverfuncs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/drivers/co… Modified: trunk/reactos/dll/opengl/mesa/drivers/common/meta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/drivers/co… Modified: trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/CMake… Modified: trunk/reactos/dll/opengl/mesa/main/api_exec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/api_e… Modified: trunk/reactos/dll/opengl/mesa/main/attrib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/attri… Modified: trunk/reactos/dll/opengl/mesa/main/bufferobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/buffe… Modified: trunk/reactos/dll/opengl/mesa/main/colortab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/color… Modified: trunk/reactos/dll/opengl/mesa/main/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/conte… Modified: trunk/reactos/dll/opengl/mesa/main/convolve.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/convo… Modified: trunk/reactos/dll/opengl/mesa/main/dd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/dd.h?… Modified: trunk/reactos/dll/opengl/mesa/main/dispatch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/dispa… Modified: trunk/reactos/dll/opengl/mesa/main/dlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/dlist… Modified: trunk/reactos/dll/opengl/mesa/main/drawpix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/drawp… Modified: trunk/reactos/dll/opengl/mesa/main/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/enabl… Modified: trunk/reactos/dll/opengl/mesa/main/eval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/eval.… Modified: trunk/reactos/dll/opengl/mesa/main/extensions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/exten… Modified: trunk/reactos/dll/opengl/mesa/main/get.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/get.c… Modified: trunk/reactos/dll/opengl/mesa/main/get.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/get.h… Modified: trunk/reactos/dll/opengl/mesa/main/getstring.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/getst… Modified: trunk/reactos/dll/opengl/mesa/main/histogram.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/histo… Modified: trunk/reactos/dll/opengl/mesa/main/mtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/mtype… Modified: trunk/reactos/dll/opengl/mesa/main/pack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/pack.… Removed: trunk/reactos/dll/opengl/mesa/main/pbo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/pbo.c… Removed: trunk/reactos/dll/opengl/mesa/main/pbo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/pbo.h… Modified: trunk/reactos/dll/opengl/mesa/main/pixel.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/pixel… Modified: trunk/reactos/dll/opengl/mesa/main/pixelstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/pixel… Modified: trunk/reactos/dll/opengl/mesa/main/polygon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/polyg… Modified: trunk/reactos/dll/opengl/mesa/main/polygon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/polyg… Modified: trunk/reactos/dll/opengl/mesa/main/readpix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/readp… Modified: trunk/reactos/dll/opengl/mesa/main/readpix.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/readp… Modified: trunk/reactos/dll/opengl/mesa/main/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/state… Modified: trunk/reactos/dll/opengl/mesa/main/state.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/state… Modified: trunk/reactos/dll/opengl/mesa/main/stencil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/stenc… Modified: trunk/reactos/dll/opengl/mesa/main/stencil.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/stenc… Modified: trunk/reactos/dll/opengl/mesa/main/texgetimage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/texge… Modified: trunk/reactos/dll/opengl/mesa/main/texgetimage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/texge… Modified: trunk/reactos/dll/opengl/mesa/main/texparam.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/texpa… Modified: trunk/reactos/dll/opengl/mesa/main/texstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/texst… Modified: trunk/reactos/dll/opengl/mesa/main/varray.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/varra… Modified: trunk/reactos/dll/opengl/mesa/main/varray.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/varra… Modified: trunk/reactos/dll/opengl/mesa/main/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/versi… Modified: trunk/reactos/dll/opengl/mesa/swrast/s_aalinetemp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast/s_a… Modified: trunk/reactos/dll/opengl/mesa/swrast/s_aatritemp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast/s_a… Modified: trunk/reactos/dll/opengl/mesa/swrast/s_bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast/s_b… Modified: trunk/reactos/dll/opengl/mesa/swrast/s_context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast/s_c… Modified: trunk/reactos/dll/opengl/mesa/swrast/s_context.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast/s_c… Modified: trunk/reactos/dll/opengl/mesa/swrast/s_drawpix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast/s_d… Modified: trunk/reactos/dll/opengl/mesa/swrast/s_linetemp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast/s_l… Modified: trunk/reactos/dll/opengl/mesa/swrast/s_points.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast/s_p… Modified: trunk/reactos/dll/opengl/mesa/swrast/s_span.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast/s_s… Modified: trunk/reactos/dll/opengl/mesa/swrast/s_stencil.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast/s_s… Modified: trunk/reactos/dll/opengl/mesa/swrast/s_texfilter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast/s_t… Modified: trunk/reactos/dll/opengl/mesa/swrast/s_tritemp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast/s_t… Modified: trunk/reactos/dll/opengl/mesa/swrast/swrast.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast/swr… Modified: trunk/reactos/dll/opengl/mesa/swrast_setup/ss_context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast_set… Modified: trunk/reactos/dll/opengl/mesa/swrast_setup/ss_triangle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast_set… Modified: trunk/reactos/dll/opengl/mesa/vbo/vbo_exec_array.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/vbo/vbo_ex… Modified: trunk/reactos/dll/opengl/mesa/vbo/vbo_exec_draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/vbo/vbo_ex… Modified: trunk/reactos/dll/opengl/mesa/vbo/vbo_save_draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/vbo/vbo_sa…

11 years, 2 months

[jgardou] 60580: [MESA] - leaner build part 14 of X - Flatten source tree CORE-7499

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Oct 7 14:57:57 2013 New Revision: 60580 URL: http://svn.reactos.org/svn/reactos?rev=60580&view=rev Log: [MESA] - leaner build part 14 of X - Flatten source tree CORE-7499 Added: trunk/reactos/dll/opengl/mesa/drivers/ - copied from r60579, trunk/reactos/dll/opengl/mesa/src/mesa/drivers/ trunk/reactos/dll/opengl/mesa/main/ - copied from r60579, trunk/reactos/dll/opengl/mesa/src/mesa/main/ trunk/reactos/dll/opengl/mesa/math/ - copied from r60579, trunk/reactos/dll/opengl/mesa/src/mesa/math/ trunk/reactos/dll/opengl/mesa/swrast/ - copied from r60579, trunk/reactos/dll/opengl/mesa/src/mesa/swrast/ trunk/reactos/dll/opengl/mesa/swrast_setup/ - copied from r60579, trunk/reactos/dll/opengl/mesa/src/mesa/swrast_setup/ trunk/reactos/dll/opengl/mesa/tnl/ - copied from r60579, trunk/reactos/dll/opengl/mesa/src/mesa/tnl/ trunk/reactos/dll/opengl/mesa/vbo/ - copied from r60579, trunk/reactos/dll/opengl/mesa/src/mesa/vbo/ trunk/reactos/dll/opengl/mesa/x86/ - copied from r60579, trunk/reactos/dll/opengl/mesa/src/mesa/x86/ trunk/reactos/dll/opengl/mesa/x86-64/ - copied from r60579, trunk/reactos/dll/opengl/mesa/src/mesa/x86-64/ Removed: trunk/reactos/dll/opengl/mesa/generated/ trunk/reactos/dll/opengl/mesa/include/ trunk/reactos/dll/opengl/mesa/main/querymatrix.c trunk/reactos/dll/opengl/mesa/src/ Modified: trunk/reactos/dll/opengl/CMakeLists.txt trunk/reactos/dll/opengl/mesa/CMakeLists.txt trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt trunk/reactos/dll/opengl/mesa/main/api_loopback.c trunk/reactos/dll/opengl/mesa/main/attrib.c trunk/reactos/dll/opengl/mesa/main/context.c trunk/reactos/dll/opengl/mesa/main/dispatch.h trunk/reactos/dll/opengl/mesa/main/dlist.c trunk/reactos/dll/opengl/mesa/main/execmem.c trunk/reactos/dll/opengl/mesa/main/glheader.h trunk/reactos/dll/opengl/mesa/main/hash.c trunk/reactos/dll/opengl/mesa/main/mtypes.h trunk/reactos/dll/opengl/mesa/swrast/s_span.c trunk/reactos/dll/opengl/mesa/vbo/vbo_save_loopback.c trunk/reactos/dll/opengl/opengl32/CMakeLists.txt trunk/reactos/dll/opengl/opengl32/swimpl.c 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] Mon Oct 7 14:57:57 2013 @@ -1,3 +1,6 @@ + +#unset this if you want to use the current TEB instead of TLS +set(OPENGL32_USE_TLS TRUE) add_subdirectory(glu32) add_subdirectory(mesa) Modified: trunk/reactos/dll/opengl/mesa/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/CMakeLists… ============================================================================== --- trunk/reactos/dll/opengl/mesa/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/CMakeLists.txt [iso-8859-1] Mon Oct 7 14:57:57 2013 @@ -1,36 +1,37 @@ -set(CMAKE_INCLUDE_CURRENT_DIR OFF) +include_directories(.) -# From Sconstruct -include_directories(BEFORE - include) - -include_directories( - src/gallium/include - src/gallium/auxiliary - src/gallium/drivers - src/gallium/winsys) - -if(NOT MSVC) - add_compile_flags_language("-std=gnu99" "C") - add_compile_flags("-Wno-deprecated-declarations -Wno-error=unused-local-typedefs -Wno-unused-but-set-variable") - add_compile_flags_language("-Wno-delete-non-virtual-dtor -Wno-narrowing" "CXX") - # optimizations (builtin memcmp is slow on some gcc versions) used in SConsript files - add_compile_flags("-ffast-math -fno-builtin-memcmp") -else() - include_directories(include/c99) - add_compile_flags("/wd4996") -endif() +# our DBG definitions conflict with mesa source code +remove_definitions(-DDBG=1 -DDBG=0) add_definitions( -DWIN32 -D_WINDOWS - -DPIPE_SUBSYSTEM_WINDOWS_USER -D_DLL -# -DDEBUG + -DFEATURE_GL=1 + -D_GDI32_ # prevent gl* being declared __declspec(dllimport) in MS headers + -DBUILD_GL32 # declare gl* as __declspec(dllexport) in Mesa headers + -D_GLAPI_NO_EXPORTS # prevent _glapi_* from being declared __declspec(dllimport) ) -# our DBG definitions conflict with mesa source code -remove_definitions(-DDBG=1 -DDBG=0) +if(OPENGL32_USE_TLS) + add_definitions(-DOPENGL32_USE_TLS) +endif() -add_subdirectory(src) +if((ARCH STREQUAL "i386") AND (NOT MSVC)) + add_definitions( + -DUSE_X86_ASM + -DUSE_MMX_ASM + -DUSE_3DNOW_ASM + -DUSE_SSE_ASM + ) + add_subdirectory(x86) +endif() + +add_subdirectory(drivers/common) +add_subdirectory(main) +add_subdirectory(math) +add_subdirectory(swrast) +add_subdirectory(swrast_setup) +add_subdirectory(tnl) +add_subdirectory(vbo) Modified: trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/CMake… ============================================================================== --- trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/main/CMakeLists.txt [iso-8859-1] Mon Oct 7 14:57:57 2013 @@ -50,7 +50,6 @@ pixeltransfer.c points.c polygon.c - querymatrix.c rastpos.c readpix.c renderbuffer.c Modified: trunk/reactos/dll/opengl/mesa/main/api_loopback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/api_l… ============================================================================== --- trunk/reactos/dll/opengl/mesa/main/api_loopback.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/main/api_loopback.c [iso-8859-1] Mon Oct 7 14:57:57 2013 @@ -33,8 +33,6 @@ #include "macros.h" #include "api_loopback.h" #include "mtypes.h" -#include "glapi/glapi.h" -#include "glapi/glthread.h" #include "main/dispatch.h" #include "mfeatures.h" Modified: trunk/reactos/dll/opengl/mesa/main/attrib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/attri… ============================================================================== --- trunk/reactos/dll/opengl/mesa/main/attrib.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/main/attrib.c [iso-8859-1] Mon Oct 7 14:57:57 2013 @@ -60,7 +60,6 @@ #include "mtypes.h" #include "main/dispatch.h" #include "hash.h" -#include <stdbool.h> /** @@ -1152,7 +1151,7 @@ copy_array_attrib(struct gl_context *ctx, struct gl_array_attrib *dest, struct gl_array_attrib *src, - bool vbo_deleted) + GLboolean vbo_deleted) { /* skip ArrayObj */ /* skip DefaultArrayObj, Objects */ @@ -1180,7 +1179,7 @@ * Needs to match value in the object hash. */ dest->ArrayObj->Name = src->ArrayObj->Name; /* And copy all of the rest. */ - copy_array_attrib(ctx, dest, src, false); + copy_array_attrib(ctx, dest, src, GL_FALSE); /* Just reference them here */ _mesa_reference_buffer_object(ctx, &dest->ArrayBufferObj, @@ -1209,7 +1208,7 @@ * The semantics of objects created using APPLE_vertex_array_objects behave * differently. These objects expect to be recreated by pop. Alas. */ - const bool arb_vao = (src->ArrayObj->Name != 0 + const GLboolean arb_vao = (src->ArrayObj->Name != 0 && src->ArrayObj->ARBsemantics); if (arb_vao && !_mesa_IsVertexArrayAPPLE(src->ArrayObj->Name)) @@ -1222,12 +1221,12 @@ || src->ArrayBufferObj->Name == 0 || _mesa_IsBufferARB(src->ArrayBufferObj->Name)) { /* ... and restore its content */ - copy_array_attrib(ctx, dest, src, false); + copy_array_attrib(ctx, dest, src, GL_FALSE); _mesa_BindBufferARB(GL_ARRAY_BUFFER_ARB, src->ArrayBufferObj->Name); } else { - copy_array_attrib(ctx, dest, src, true); + copy_array_attrib(ctx, dest, src, GL_TRUE); } if (!arb_vao Modified: trunk/reactos/dll/opengl/mesa/main/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/conte… ============================================================================== --- trunk/reactos/dll/opengl/mesa/main/context.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/main/context.c [iso-8859-1] Mon Oct 7 14:57:57 2013 @@ -128,8 +128,6 @@ #include "sparc/sparc.h" #endif -#include <stdbool.h> - #ifndef MESA_VERBOSE int MESA_VERBOSE = 0; Modified: trunk/reactos/dll/opengl/mesa/main/dispatch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/dispa… ============================================================================== --- trunk/reactos/dll/opengl/mesa/main/dispatch.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/main/dispatch.h [iso-8859-1] Mon Oct 7 14:57:57 2013 @@ -27,6 +27,8 @@ #if !defined( _DISPATCH_H_ ) # define _DISPATCH_H_ + +typedef PROC _glapi_proc; /** Modified: trunk/reactos/dll/opengl/mesa/main/dlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/dlist… ============================================================================== --- trunk/reactos/dll/opengl/mesa/main/dlist.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/main/dlist.c [iso-8859-1] Mon Oct 7 14:57:57 2013 @@ -44,7 +44,6 @@ #include "enums.h" #include "eval.h" #include "framebuffer.h" -#include "glapi/glapi.h" #include "hash.h" #include "image.h" #include "light.h" Modified: trunk/reactos/dll/opengl/mesa/main/execmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/execm… ============================================================================== --- trunk/reactos/dll/opengl/mesa/main/execmem.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/main/execmem.c [iso-8859-1] Mon Oct 7 14:57:57 2013 @@ -32,7 +32,6 @@ #include "imports.h" -#include "glapi/glthread.h" Modified: trunk/reactos/dll/opengl/mesa/main/glheader.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/glhea… ============================================================================== --- trunk/reactos/dll/opengl/mesa/main/glheader.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/main/glheader.h [iso-8859-1] Mon Oct 7 14:57:57 2013 @@ -52,6 +52,25 @@ #define GL_GLEXT_PROTOTYPES #include <GL/gl.h> #include <GL/glext.h> + +/* Threading glue for WINAPI */ +#include <stdarg.h> +#include <winbase.h> +typedef CRITICAL_SECTION _glthread_Mutex; +#define _glthread_DECLARE_STATIC_MUTEX(name) static _glthread_Mutex name = {(PCRITICAL_SECTION_DEBUG)-1, -1, 0, 0, 0, 0} +#define _glthread_INIT_MUTEX(name) InitializeCriticalSection(&name) +#define _glthread_DESTROY_MUTEX(name) DeleteCriticalSection(&name) +#define _glthread_LOCK_MUTEX(name) EnterCriticalSection(&name) +#define _glthread_UNLOCK_MUTEX(name) LeaveCriticalSection(&name) + +/* Context glue with opengl32 */ +#include "../opengl32/opengl32.h" +#define GET_CURRENT_CONTEXT(__ctx__) struct gl_context* __ctx__ = (struct gl_context*)IntGetCurrentICDPrivate() +#define GET_DISPATCH() ((struct _glapi_table*)IntGetCurrentDispatchTable()) +#define _glapi_set_dispatch(table) IntSetCurrentDispatchTable((const GLDISPATCHTABLE*)(table)) +#define _glapi_get_dispatch_table_size() (OPENGL_VERSION_110_ENTRIES) +#define _glapi_get_context() ((void*)IntGetCurrentICDPrivate()) +#define _glapi_set_context(__ctx__) IntSetCurrentICDPrivate((void*)(__ctx__)) #ifdef __cplusplus Modified: trunk/reactos/dll/opengl/mesa/main/hash.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/hash.… ============================================================================== --- trunk/reactos/dll/opengl/mesa/main/hash.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/main/hash.c [iso-8859-1] Mon Oct 7 14:57:57 2013 @@ -37,7 +37,6 @@ #include "glheader.h" #include "imports.h" -#include "glapi/glthread.h" #include "hash.h" Modified: trunk/reactos/dll/opengl/mesa/main/mtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/main/mtype… ============================================================================== --- trunk/reactos/dll/opengl/mesa/main/mtypes.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/main/mtypes.h [iso-8859-1] Mon Oct 7 14:57:57 2013 @@ -37,7 +37,6 @@ #include "main/glheader.h" #include "main/config.h" #include "main/mfeatures.h" -#include "glapi/glapi.h" #include "math/m_matrix.h" /* GLmatrix */ #include "main/simple_list.h" /* struct simple_node */ #include "main/formats.h" /* MESA_FORMAT_COUNT */ Removed: trunk/reactos/dll/opengl/mesa/main/querymatrix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/main/querymatrix.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/main/querymatrix.c (removed) @@ -1,212 +0,0 @@ -/************************************************************************** - * - * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas. - * All Rights Reserved. - * - **************************************************************************/ - - -/** - * Code to implement GL_OES_query_matrix. See the spec at: - * http://www.khronos.org/registry/gles/extensions/OES/OES_query_matrix.txt - */ - - -#include <stdlib.h> -#include <math.h> -#include "GLES/gl.h" -#include "GLES/glext.h" - - -/** - * This is from the GL_OES_query_matrix extension specification: - * - * GLbitfield glQueryMatrixxOES( GLfixed mantissa[16], - * GLint exponent[16] ) - * mantissa[16] contains the contents of the current matrix in GLfixed - * format. exponent[16] contains the unbiased exponents applied to the - * matrix components, so that the internal representation of component i - * is close to mantissa[i] * 2^exponent[i]. The function returns a status - * word which is zero if all the components are valid. If - * status & (1<<i) != 0, the component i is invalid (e.g., NaN, Inf). - * The implementations are not required to keep track of overflows. In - * that case, the invalid bits are never set. - */ - -#define INT_TO_FIXED(x) ((GLfixed) ((x) << 16)) -#define FLOAT_TO_FIXED(x) ((GLfixed) ((x) * 65536.0)) - -#if defined(_MSC_VER) -/* Oddly, the fpclassify() function doesn't exist in such a form - * on MSVC. This is an implementation using slightly different - * lower-level Windows functions. - */ -#include <float.h> - -enum {FP_NAN, FP_INFINITE, FP_ZERO, FP_SUBNORMAL, FP_NORMAL} -fpclassify(double x) -{ - switch(_fpclass(x)) { - case _FPCLASS_SNAN: /* signaling NaN */ - case _FPCLASS_QNAN: /* quiet NaN */ - return FP_NAN; - case _FPCLASS_NINF: /* negative infinity */ - case _FPCLASS_PINF: /* positive infinity */ - return FP_INFINITE; - case _FPCLASS_NN: /* negative normal */ - case _FPCLASS_PN: /* positive normal */ - return FP_NORMAL; - case _FPCLASS_ND: /* negative denormalized */ - case _FPCLASS_PD: /* positive denormalized */ - return FP_SUBNORMAL; - case _FPCLASS_NZ: /* negative zero */ - case _FPCLASS_PZ: /* positive zero */ - return FP_ZERO; - default: - /* Should never get here; but if we do, this will guarantee - * that the pattern is not treated like a number. - */ - return FP_NAN; - } -} - -#elif defined(__APPLE__) || defined(__CYGWIN__) || defined(__FreeBSD__) || \ - defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || \ - (defined(__sun) && defined(__C99FEATURES__)) || defined(__MINGW32__) || \ - (defined(__sun) && defined(__GNUC__)) || defined(ANDROID) || defined(__HAIKU__) - -/* fpclassify is available. */ - -#elif !defined(_XOPEN_SOURCE) || _XOPEN_SOURCE < 600 - -enum {FP_NAN, FP_INFINITE, FP_ZERO, FP_SUBNORMAL, FP_NORMAL} -fpclassify(double x) -{ - /* XXX do something better someday */ - return FP_NORMAL; -} - -#endif - -extern GLbitfield GL_APIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]); - -/* The Mesa functions we'll need */ -extern void GL_APIENTRY _mesa_GetIntegerv(GLenum pname, GLint *params); -extern void GL_APIENTRY _mesa_GetFloatv(GLenum pname, GLfloat *params); - -GLbitfield GL_APIENTRY _es_QueryMatrixxOES(GLfixed mantissa[16], GLint exponent[16]) -{ - GLfloat matrix[16]; - GLint tmp; - GLenum currentMode = GL_FALSE; - GLenum desiredMatrix = GL_FALSE; - /* The bitfield returns 1 for each component that is invalid (i.e. - * NaN or Inf). In case of error, everything is invalid. - */ - GLbitfield rv; - register unsigned int i; - unsigned int bit; - - /* This data structure defines the mapping between the current matrix - * mode and the desired matrix identifier. - */ - static struct { - GLenum currentMode; - GLenum desiredMatrix; - } modes[] = { - {GL_MODELVIEW, GL_MODELVIEW_MATRIX}, - {GL_PROJECTION, GL_PROJECTION_MATRIX}, - {GL_TEXTURE, GL_TEXTURE_MATRIX}, - }; - - /* Call Mesa to get the current matrix in floating-point form. First, - * we have to figure out what the current matrix mode is. - */ - _mesa_GetIntegerv(GL_MATRIX_MODE, &tmp); - currentMode = (GLenum) tmp; - - /* The mode is either GL_FALSE, if for some reason we failed to query - * the mode, or a given mode from the above table. Search for the - * returned mode to get the desired matrix; if we don't find it, - * we can return immediately, as _mesa_GetInteger() will have - * logged the necessary error already. - */ - for (i = 0; i < sizeof(modes)/sizeof(modes[0]); i++) { - if (modes[i].currentMode == currentMode) { - desiredMatrix = modes[i].desiredMatrix; - break; - } - } - if (desiredMatrix == GL_FALSE) { - /* Early error means all values are invalid. */ - return 0xffff; - } - - /* Now pull the matrix itself. */ - _mesa_GetFloatv(desiredMatrix, matrix); - - rv = 0; - for (i = 0, bit = 1; i < 16; i++, bit<<=1) { - float normalizedFraction; - int exp; - - switch (fpclassify(matrix[i])) { - /* A "subnormal" or denormalized number is too small to be - * represented in normal format; but despite that it's a - * valid floating point number. FP_ZERO and FP_NORMAL - * are both valid as well. We should be fine treating - * these three cases as legitimate floating-point numbers. - */ - case FP_SUBNORMAL: - case FP_NORMAL: - case FP_ZERO: - normalizedFraction = (GLfloat)frexp(matrix[i], &exp); - mantissa[i] = FLOAT_TO_FIXED(normalizedFraction); - exponent[i] = (GLint) exp; - break; - - /* If the entry is not-a-number or an infinity, then the - * matrix component is invalid. The invalid flag for - * the component is already set; might as well set the - * other return values to known values. We'll set - * distinct values so that a savvy end user could determine - * whether the matrix component was a NaN or an infinity, - * but this is more useful for debugging than anything else - * since the standard doesn't specify any such magic - * values to return. - */ - case FP_NAN: - mantissa[i] = INT_TO_FIXED(0); - exponent[i] = (GLint) 0; - rv |= bit; - break; - - case FP_INFINITE: - /* Return +/- 1 based on whether it's a positive or - * negative infinity. - */ - if (matrix[i] > 0) { - mantissa[i] = INT_TO_FIXED(1); - } - else { - mantissa[i] = -INT_TO_FIXED(1); - } - exponent[i] = (GLint) 0; - rv |= bit; - break; - - /* We should never get here; but here's a catching case - * in case fpclassify() is returnings something unexpected. - */ - default: - mantissa[i] = INT_TO_FIXED(2); - exponent[i] = (GLint) 0; - rv |= bit; - break; - } - - } /* for each component */ - - /* All done */ - return rv; -} Modified: trunk/reactos/dll/opengl/mesa/swrast/s_span.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/swrast/s_s… ============================================================================== --- trunk/reactos/dll/opengl/mesa/swrast/s_span.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/swrast/s_span.c [iso-8859-1] Mon Oct 7 14:57:57 2013 @@ -49,8 +49,6 @@ #include "s_span.h" #include "s_stencil.h" #include "s_texcombine.h" - -#include <stdbool.h> /** * Set default fragment attributes for the span using the Modified: trunk/reactos/dll/opengl/mesa/vbo/vbo_save_loopback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/vbo/vbo_sa… ============================================================================== --- trunk/reactos/dll/opengl/mesa/vbo/vbo_save_loopback.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/vbo/vbo_save_loopback.c [iso-8859-1] Mon Oct 7 14:57:57 2013 @@ -32,7 +32,6 @@ #include "main/mfeatures.h" #include "main/mtypes.h" #include "main/dispatch.h" -#include "glapi/glapi.h" #include "vbo_context.h" Modified: trunk/reactos/dll/opengl/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/CMakeL… ============================================================================== --- trunk/reactos/dll/opengl/opengl32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32/CMakeLists.txt [iso-8859-1] Mon Oct 7 14:57:57 2013 @@ -1,18 +1,13 @@ spec2def(opengl32.dll opengl32.spec ADD_IMPORTLIB) -include_directories( - ../mesa/src/mesa - ../mesa/src/mapi) +include_directories(../mesa) add_definitions( -D_GDI32_ # prevent gl* being declared __declspec(dllimport) in MS headers -DBUILD_GL32 # declare gl* as __declspec(dllexport) in Mesa headers -D_GLAPI_NO_EXPORTS # prevent _glapi_* from being declared __declspec(dllimport) ) - -# useful to test under windows <> w2k3 -set(OPENGL32_USE_TLS TRUE) if(OPENGL32_USE_TLS) add_definitions(-DOPENGL32_USE_TLS) Modified: trunk/reactos/dll/opengl/opengl32/swimpl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/swimpl… ============================================================================== --- trunk/reactos/dll/opengl/opengl32/swimpl.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/opengl32/swimpl.c [iso-8859-1] Mon Oct 7 14:57:57 2013 @@ -22,7 +22,6 @@ #include <tnl/tnl.h> #include <drivers/common/driverfuncs.h> #include <drivers/common/meta.h> -#include <glapi/glapitable.h> #include <wine/debug.h> WINE_DEFAULT_DEBUG_CHANNEL(opengl32); @@ -815,39 +814,3 @@ &fb->bmi, DIB_RGB_COLORS) != 0); } - -/* mesa threading glue */ -void* _glapi_Context = NULL; -struct _glapi_table *_glapi_Dispatch = NULL; - -void* _glapi_get_context() -{ - return IntGetCurrentICDPrivate(); -} - -struct _glapi_table * -_glapi_get_dispatch(void) -{ - return (struct _glapi_table *)IntGetCurrentDispatchTable(); -} - -void _glapi_set_dispatch(struct _glapi_table * table) -{ - IntSetCurrentDispatchTable((const GLDISPATCHTABLE*)table); -} - -unsigned int -_glapi_get_dispatch_table_size(void) -{ - return OPENGL_VERSION_110_ENTRIES; -} - -void -_glapi_set_context(void *context) -{ - /* - * It happens that mesa changes the context, most notably on context deletion. - * Use the space reserved to the ICD for this. - */ - IntSetCurrentICDPrivate(context); -}

11 years, 2 months

[akhaldi] 60579: [MSHTML_WINETEST] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 7 14:23:51 2013 New Revision: 60579 URL: http://svn.reactos.org/svn/reactos?rev=60579&view=rev Log: [MSHTML_WINETEST] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/rostests/winetests/mshtml/CMakeLists.txt trunk/rostests/winetests/mshtml/dom.c trunk/rostests/winetests/mshtml/htmldoc.c trunk/rostests/winetests/mshtml/jstest.html trunk/rostests/winetests/mshtml/protocol.c trunk/rostests/winetests/mshtml/rsrc.rc trunk/rostests/winetests/mshtml/script.c trunk/rostests/winetests/mshtml/style.c trunk/rostests/winetests/mshtml/testlist.c Modified: trunk/rostests/winetests/mshtml/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/CMakeLis… ============================================================================== --- trunk/rostests/winetests/mshtml/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/CMakeLists.txt [iso-8859-1] Mon Oct 7 14:23:51 2013 @@ -1,5 +1,3 @@ - -add_definitions(-D__ROS_LONG64__) add_idl_Headers(test_tlb_header test_tlb.idl) add_typelib(test_tlb.idl) Modified: trunk/rostests/winetests/mshtml/dom.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/dom.c?re… ============================================================================== --- trunk/rostests/winetests/mshtml/dom.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/dom.c [iso-8859-1] Mon Oct 7 14:23:51 2013 @@ -781,6 +781,17 @@ return node; } +#define get_htmldoc5_iface(u) _get_htmldoc5_iface(__LINE__,u) +static IHTMLDocument5 *_get_htmldoc5_iface(unsigned line, IUnknown *unk) +{ + IHTMLDocument5 *doc; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLDocument5, (void**)&doc); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLDocument5: %08x\n", hres); + return doc; +} + #define get_img_iface(u) _get_img_iface(__LINE__,u) static IHTMLImgElement *_get_img_iface(unsigned line, IUnknown *unk) { @@ -910,6 +921,28 @@ hres = IUnknown_QueryInterface(unk, &IID_IHTMLIFrameElement2, (void**)&ret); ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLIFrameElement: %08x\n", hres); + return ret; +} + +#define get_button_iface(u) _get_button_iface(__LINE__,u) +static IHTMLButtonElement *_get_button_iface(unsigned line, IUnknown *unk) +{ + IHTMLButtonElement *ret; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLButtonElement, (void**)&ret); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLButtonElement: %08x\n", hres); + return ret; +} + +#define get_label_iface(u) _get_label_iface(__LINE__,u) +static IHTMLLabelElement *_get_label_iface(unsigned line, IUnknown *unk) +{ + IHTMLLabelElement *ret; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLLabelElement, (void**)&ret); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLLabelElement: %08x\n", hres); return ret; } @@ -1330,6 +1363,35 @@ _test_disp_value(line, unk, exhref); } +#define test_anchor_rel(a,h) _test_anchor_rel(__LINE__,a,h) +static void _test_anchor_rel(unsigned line, IUnknown *unk, const char *exrel) +{ + IHTMLAnchorElement *anchor = _get_anchor_iface(line, unk); + BSTR str; + HRESULT hres; + + hres = IHTMLAnchorElement_get_rel(anchor, &str); + ok_(__FILE__,line)(hres == S_OK, "get_rel failed: %08x\n", hres); + if(exrel) + ok_(__FILE__,line)(!strcmp_wa(str, exrel), "rel = %s, expected %s\n", wine_dbgstr_w(str), exrel); + else + ok_(__FILE__,line)(!str, "rel = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + +#define test_anchor_put_rel(a,h) _test_anchor_put_rel(__LINE__,a,h) +static void _test_anchor_put_rel(unsigned line, IUnknown *unk, const char *exrel) +{ + IHTMLAnchorElement *anchor = _get_anchor_iface(line, unk); + BSTR str; + HRESULT hres; + + str = a2bstr(exrel); + hres = IHTMLAnchorElement_put_rel(anchor, str); + ok_(__FILE__,line)(hres == S_OK, "get_rel failed: %08x\n", hres); + SysFreeString(str); +} + #define test_anchor_get_target(a,h) _test_anchor_get_target(__LINE__,a,h) static void _test_anchor_get_target(unsigned line, IUnknown *unk, const char *target) { @@ -1403,6 +1465,22 @@ ok_(__FILE__,line)(!strcmp_wa(str, hostname), "hostname = %s, expected %s\n", wine_dbgstr_w(str), hostname); else ok_(__FILE__,line)(str == NULL, "hostname = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); +} + +#define test_anchor_hash(a,h) _test_anchor_hash(__LINE__,a,h) +static void _test_anchor_hash(unsigned line, IHTMLElement *elem, const char *exhash) +{ + IHTMLAnchorElement *anchor = _get_anchor_iface(line, (IUnknown*)elem); + BSTR str; + HRESULT hres; + + hres = IHTMLAnchorElement_get_hash(anchor, &str); + ok_(__FILE__,line)(hres == S_OK, "get_hash failed: %08x\n", hres); + if(exhash) + ok_(__FILE__,line)(!strcmp_wa(str, exhash), "hash = %s, expected %s\n", wine_dbgstr_w(str), exhash); + else + ok_(__FILE__,line)(!str, "hash = %s, expected NULL\n", wine_dbgstr_w(str)); SysFreeString(str); } @@ -2013,8 +2091,6 @@ VARIANT name, index; IDispatch *disp, *disp2; HRESULT hres; - - ok(1,"[_test_elem_collection]\n"); hres = IUnknown_QueryInterface(unk, &IID_IHTMLElementCollection, (void**)&col); ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElementCollection: %08x\n", hres); @@ -2410,6 +2486,33 @@ ok_(__FILE__,line)(hres == S_OK, "get_length failed: %08x\n", hres); ok_(__FILE__,line)(length == l, "length = %d, expected %d\n", length, l); IHTMLDOMTextNode_Release(text); +} + +#define test_text_data(a,b) _test_text_data(__LINE__,a,b) +static void _test_text_data(unsigned line, IUnknown *unk, const char *exdata) +{ + IHTMLDOMTextNode *text = _get_text_iface(line, unk); + BSTR str; + HRESULT hres; + + hres = IHTMLDOMTextNode_get_data(text, &str); + ok_(__FILE__,line)(hres == S_OK, "get_data failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(str, exdata), "data = %s, expected %s\n", wine_dbgstr_w(str), exdata); + IHTMLDOMTextNode_Release(text); + SysFreeString(str); +} + +#define set_text_data(a,b) _set_text_data(__LINE__,a,b) +static void _set_text_data(unsigned line, IUnknown *unk, const char *data) +{ + IHTMLDOMTextNode *text = _get_text_iface(line, unk); + BSTR str = a2bstr(data); + HRESULT hres; + + hres = IHTMLDOMTextNode_put_data(text, str); + ok_(__FILE__,line)(hres == S_OK, "get_data failed: %08x\n", hres); + IHTMLDOMTextNode_Release(text); + SysFreeString(str); } #define test_select_set_disabled(i,b) _test_select_set_disabled(__LINE__,i,b) @@ -4469,22 +4572,18 @@ IHTMLTxtRange_Release(range); } -static void test_compatmode(IHTMLDocument2 *doc) -{ - IHTMLDocument5 *doc5; - BSTR mode; - HRESULT hres; - - hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); - ok(hres == S_OK, "Could not get IHTMLDocument5 interface: %08x\n", hres); - if(FAILED(hres)) - return; - - hres = IHTMLDocument5_get_compatMode(doc5, &mode); - IHTMLDocument5_Release(doc5); - ok(hres == S_OK, "get_compatMode failed: %08x\n", hres); - ok(!strcmp_wa(mode, "BackCompat"), "compatMode=%s\n", wine_dbgstr_w(mode)); - SysFreeString(mode); +#define test_compatmode(a,b) _test_compatmode(__LINE__,a,b) +static void _test_compatmode(unsigned line, IHTMLDocument2 *doc2, const char *excompat) +{ + IHTMLDocument5 *doc = get_htmldoc5_iface((IUnknown*)doc2); + BSTR str; + HRESULT hres; + + hres = IHTMLDocument5_get_compatMode(doc, &str); + ok_(__FILE__,line)(hres == S_OK, "get_compatMode failed: %08x\n", hres); + ok_(__FILE__,line)(!strcmp_wa(str, excompat), "compatMode = %s, expected %s\n", wine_dbgstr_w(str), excompat); + + IHTMLDocument5_Release(doc); } static void test_location(IHTMLDocument2 *doc) @@ -5304,7 +5403,7 @@ SysFreeString(str); test_window(doc); - test_compatmode(doc); + test_compatmode(doc, "BackCompat"); test_location(doc); test_navigator(doc); test_plugins_col(doc); @@ -5350,6 +5449,73 @@ test_doc_title(doc, ""); } +#define test_button_name(a,b) _test_button_name(__LINE__,a,b) +static void _test_button_name(unsigned line, IHTMLElement *elem, const char *exname) +{ + IHTMLButtonElement *button = _get_button_iface(line, (IUnknown*)elem); + BSTR str; + HRESULT hres; + + str = (void*)0xdeadbeef; + hres = IHTMLButtonElement_get_name(button, &str); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + if(exname) + ok_(__FILE__,line)(!strcmp_wa(str, exname), "name = %s, expected %s\n", wine_dbgstr_w(str), exname); + else + ok_(__FILE__,line)(!str, "name = %s, expected NULL\n", wine_dbgstr_w(str)); + SysFreeString(str); + IHTMLButtonElement_Release(button); +} + +#define set_button_name(a,b) _set_button_name(__LINE__,a,b) +static void _set_button_name(unsigned line, IHTMLElement *elem, const char *name) +{ + IHTMLButtonElement *button = _get_button_iface(line, (IUnknown*)elem); + BSTR str = a2bstr(name); + HRESULT hres; + + hres = IHTMLButtonElement_put_name(button, str); + ok_(__FILE__,line)(hres == S_OK, "get_name failed: %08x\n", hres); + SysFreeString(str); + IHTMLButtonElement_Release(button); + + _test_button_name(line, elem, name); +} + +#define test_button_get_disabled(i,b) _test_button_get_disabled(__LINE__,i,b) +static void _test_button_get_disabled(unsigned line, IHTMLElement *elem, VARIANT_BOOL exb) +{ + IHTMLButtonElement *button = _get_button_iface(line, (IUnknown*)elem); + VARIANT_BOOL disabled = 100; + HRESULT hres; + + hres = IHTMLButtonElement_get_disabled(button, &disabled); + ok_(__FILE__,line) (hres == S_OK, "get_disabled failed: %08x\n", hres); + ok_(__FILE__,line) (disabled == exb, "disabled=%x, expected %x\n", disabled, exb); + IHTMLButtonElement_Release(button); + + _test_elem3_get_disabled(line, (IUnknown*)elem, exb); +} + +#define test_button_set_disabled(i,b) _test_button_set_disabled(__LINE__,i,b) +static void _test_button_set_disabled(unsigned line, IHTMLElement *elem, VARIANT_BOOL b) +{ + IHTMLButtonElement *button = _get_button_iface(line, (IUnknown*)elem); + HRESULT hres; + + hres = IHTMLButtonElement_put_disabled(button, b); + ok_(__FILE__,line) (hres == S_OK, "put_disabled failed: %08x\n", hres); + IHTMLButtonElement_Release(button); + + _test_button_get_disabled(line, elem, b); +} + +static void test_button_elem(IHTMLElement *elem) +{ + test_button_name(elem, NULL); + set_button_name(elem, "button name"); +} + static void test_tr_elem(IHTMLElement *elem) { IHTMLElementCollection *col; @@ -5374,15 +5540,72 @@ IHTMLTableRow_Release(row); } +static void test_label_elem(IHTMLElement *elem) +{ + IHTMLLabelElement *label; + BSTR str; + HRESULT hres; + + label = get_label_iface((IUnknown*)elem); + + str = NULL; + hres = IHTMLLabelElement_get_htmlFor(label, &str); + ok(hres == S_OK, "get_htmlFor failed: %08x\n", hres); + ok(!strcmp_wa(str, "in"), "htmlFor = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + str = a2bstr(""); + hres = IHTMLLabelElement_put_htmlFor(label, str); + ok(hres == S_OK, "put_htmlFor failed: %08x\n", hres); + SysFreeString(str); + + str = (void*)0xdeadbeef; + hres = IHTMLLabelElement_get_htmlFor(label, &str); + ok(hres == S_OK, "get_htmlFor failed: %08x\n", hres); + ok(!strcmp_wa(str, ""), "htmlFor = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("abc"); + hres = IHTMLLabelElement_put_htmlFor(label, str); + ok(hres == S_OK, "put_htmlFor failed: %08x\n", hres); + SysFreeString(str); + + str = NULL; + hres = IHTMLLabelElement_get_htmlFor(label, &str); + ok(hres == S_OK, "get_htmlFor failed: %08x\n", hres); + ok(!strcmp_wa(str, "abc"), "htmlFor = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + IHTMLLabelElement_Release(label); +} + +#define test_table_cell_spacing(a,b) _test_table_cell_spacing(__LINE__,a,b) +static void _test_table_cell_spacing(unsigned line, IHTMLTable *table, const char *exstr) +{ + VARIANT v; + HRESULT hres; + + V_VT(&v) = VT_ERROR; + hres = IHTMLTable_get_cellSpacing(table, &v); + ok_(__FILE__,line)(hres == S_OK, "get_cellSpacing failed: %08x\n", hres); + ok_(__FILE__,line)(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + if(exstr) + ok_(__FILE__,line)(!strcmp_wa(V_BSTR(&v), exstr), "cellSpacing = %s, expected %s\n", wine_dbgstr_w(V_BSTR(&v)), exstr); + else + ok_(__FILE__,line)(!V_BSTR(&v), "cellSpacing = %s, expected NULL\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); +} + static void test_table_elem(IHTMLElement *elem) { IHTMLElementCollection *col; IHTMLTable *table; IHTMLDOMNode *node; + VARIANT v; HRESULT hres; static const elem_type_t row_types[] = {ET_TR,ET_TR}; static const elem_type_t all_types[] = {ET_TBODY,ET_TR,ET_TR,ET_TD,ET_TD}; + static const elem_type_t tbodies_types[] = {ET_TBODY}; hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLTable, (void**)&table); ok(hres == S_OK, "Could not get IHTMLTable iface: %08x\n", hres); @@ -5392,7 +5615,7 @@ col = NULL; hres = IHTMLTable_get_rows(table, &col); ok(hres == S_OK, "get_rows failed: %08x\n", hres); - ok(col != NULL, "get_ros returned NULL\n"); + ok(col != NULL, "get_rows returned NULL\n"); test_elem_collection((IUnknown*)col, row_types, sizeof(row_types)/sizeof(*row_types)); IHTMLElementCollection_Release(col); @@ -5408,6 +5631,29 @@ test_elem_tag((IUnknown*)node, "TABLE"); test_elem_all((IUnknown*)node, NULL, 0); IHTMLDOMNode_Release(node); + + col = NULL; + hres = IHTMLTable_get_tBodies(table, &col); + ok(hres == S_OK, "get_tBodies failed: %08x\n", hres); + ok(col != NULL, "get_tBodies returned NULL\n"); + + test_elem_collection((IUnknown*)col, tbodies_types, sizeof(tbodies_types)/sizeof(*tbodies_types)); + IHTMLElementCollection_Release(col); + + test_table_cell_spacing(table, NULL); + + V_VT(&v) = VT_I4; + V_I4(&v) = 10; + hres = IHTMLTable_put_cellSpacing(table, v); + ok(hres == S_OK, "put_cellSpacing = %08x\n", hres); + test_table_cell_spacing(table, "10"); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("11"); + hres = IHTMLTable_put_cellSpacing(table, v); + ok(hres == S_OK, "put_cellSpacing = %08x\n", hres); + test_table_cell_spacing(table, "11"); + VariantClear(&v); IHTMLTable_Release(table); } @@ -5657,6 +5903,8 @@ IHTMLStyleSheetRulesCollection *col = NULL; IHTMLStyleSheet *stylesheet; HRESULT hres; + + test_disp2((IUnknown*)disp, &DIID_DispHTMLStyleSheet, &IID_IHTMLStyleSheet, "[object]"); hres = IDispatch_QueryInterface(disp, &IID_IHTMLStyleSheet, (void**)&stylesheet); ok(hres == S_OK, "Could not get IHTMLStyleSheet: %08x\n", hres); @@ -5843,6 +6091,14 @@ IHTMLElementCollection_Release(collection); } + hres = IHTMLDocument2_get_scripts(doc, &collection); + ok(hres == S_OK, "get_scripts failed: %08x\n", hres); + if(hres == S_OK) { + static const elem_type_t script_types[] = {ET_SCRIPT}; + test_elem_collection((IUnknown*)collection, script_types, 1); + IHTMLElementCollection_Release(collection); + } + test_plugins_col(doc); elem = get_doc_elem(doc); @@ -6085,6 +6341,13 @@ IHTMLElement_Release(elem); } + elem = get_doc_elem_by_id(doc, "labelid"); + ok(elem != NULL, "elem == NULL\n"); + if(elem) { + test_label_elem(elem); + IHTMLElement_Release(elem); + } + elem = get_doc_elem_by_id(doc, "row2"); ok(elem != NULL, "elem == NULL\n"); if(elem) { @@ -6096,6 +6359,17 @@ ok(elem != NULL, "elem == NULL\n"); if(elem) { test_iframe_elem(elem); + IHTMLElement_Release(elem); + } + + elem = get_doc_elem_by_id(doc, "btnid"); + ok(elem != NULL, "elem == NULL\n"); + if(elem) { + test_button_elem(elem); + test_button_get_disabled(elem, VARIANT_FALSE); + test_button_set_disabled(elem, VARIANT_TRUE); + test_elem3_set_disabled((IUnknown*)elem, VARIANT_FALSE); + test_button_get_disabled(elem, VARIANT_FALSE); IHTMLElement_Release(elem); } @@ -6122,9 +6396,14 @@ test_anchor_put_href((IUnknown*)elem, "http://test/"); test_anchor_href((IUnknown*)elem, "http://test/"); test_anchor_hostname((IUnknown*)elem, "test"); + test_anchor_hash(elem, NULL); /* target */ test_anchor_get_target((IUnknown*)elem, NULL); + + test_anchor_rel((IUnknown*)elem, NULL); + test_anchor_put_rel((IUnknown*)elem, "Next"); + test_anchor_rel((IUnknown*)elem, "Next"); /* Change the target */ test_anchor_put_target((IUnknown*)elem, "wine"); @@ -6138,6 +6417,9 @@ test_anchor_put_name((IUnknown*)elem, "anchor name"); test_anchor_put_name((IUnknown*)elem, NULL); test_anchor_put_name((IUnknown*)elem, "x"); + + test_anchor_put_href((IUnknown*)elem, "http://test/#hash"); + test_anchor_hash(elem, "#hash"); IHTMLElement_Release(elem); } @@ -6537,10 +6819,13 @@ IHTMLElement_Release(elem); IHTMLDOMNode_Release(node); - node = test_create_text(doc, "test"); + node = test_create_text(doc, "abc"); test_ifaces((IUnknown*)node, text_iids); test_disp((IUnknown*)node, &DIID_DispHTMLDOMTextNode, "[object]"); - test_text_length((IUnknown*)node, 4); + test_text_length((IUnknown*)node, 3); + test_text_data((IUnknown*)node, "abc"); + set_text_data((IUnknown*)node, "test"); + test_text_data((IUnknown*)node, "test"); V_VT(&var) = VT_NULL; node2 = test_node_insertbefore((IUnknown*)body, node, &var); @@ -6565,9 +6850,8 @@ test_elem_innertext(body, "insert test Test"); IHTMLDOMNode_Release(node); - hres = IHTMLDocument2_QueryInterface(doc, &IID_IHTMLDocument5, (void**)&doc5); - if(hres == S_OK) - { + doc5 = get_htmldoc5_iface((IUnknown*)doc); + if(doc5) { str = a2bstr("testing"); hres = IHTMLDocument5_createComment(doc5, str, &comment); SysFreeString(str); @@ -6834,12 +7118,37 @@ IHTMLElementCollection_Release(col); } +static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + ok(IsEqualGUID(riid, &IID_IServiceProvider), "riid = %s\n", dbgstr_guid(riid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI Unknown_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI Unknown_Release(IUnknown *iface) +{ + return 1; +} + +static const IUnknownVtbl UnknownVtbl = { + Unknown_QueryInterface, + Unknown_AddRef, + Unknown_Release, +}; +static IUnknown obj_ident_test = { &UnknownVtbl }; + static void test_frame(IDispatch *disp, const char *exp_id) { IHTMLWindow2 *frame2, *parent, *top; IHTMLDocument2 *parent_doc, *top_doc; IHTMLWindow4 *frame; IHTMLFrameBase *frame_elem; + IObjectIdentity *obj_ident; + ITravelLogClient *tlc; HRESULT hres; hres = IDispatch_QueryInterface(disp, &IID_IHTMLWindow4, (void**)&frame); @@ -6869,6 +7178,29 @@ IHTMLWindow2_Release(frame2); return; } + + hres = IHTMLWindow2_QueryInterface(frame2, &IID_IObjectIdentity, (void**)&obj_ident); + ok(hres == S_OK, "Could not get IObjectIdentity interface: %08x\n", hres); + hres = IHTMLWindow2_QueryInterface(frame2, &IID_ITravelLogClient, (void**)&tlc); + if(hres == E_NOINTERFACE) { + win_skip("IID_ITravelLogClient not available\n"); + tlc = NULL; + }else { + ok(hres == S_OK, "Could not get ITravelLogClient interface: %08x\n", hres); + + hres = IObjectIdentity_IsEqualObject(obj_ident, (IUnknown*)tlc); + ok(hres == S_OK, "IsEqualObject returned: 0x%08x\n", hres); + ITravelLogClient_Release(tlc); + } + + hres = IObjectIdentity_IsEqualObject(obj_ident, (IUnknown*)obj_ident); + ok(hres == S_OK, "IsEqualObject returned: 0x%08x\n", hres); + hres = IObjectIdentity_IsEqualObject(obj_ident, (IUnknown*)parent); + ok(hres == S_FALSE, "IsEqualObject returned: 0x%08x\n", hres); + hres = IObjectIdentity_IsEqualObject(obj_ident, &obj_ident_test); + ok(hres == E_NOINTERFACE, "IsEqualObject returned: 0x%08x\n", hres); + + IObjectIdentity_Release(obj_ident); hres = IHTMLWindow2_get_document(parent, &parent_doc); ok(hres == S_OK, "IHTMLWindow2_get_document failed: 0x%08x\n", hres); @@ -7081,6 +7413,16 @@ IHTMLDocument2_Release(frag); } +static void check_quirks_mode(IHTMLDocument2 *doc) +{ + test_compatmode(doc, "BackCompat"); +} + +static void check_strict_mode(IHTMLDocument2 *doc) +{ + test_compatmode(doc, "CSS1Compat"); +} + static IHTMLDocument2 *notif_doc; static BOOL doc_complete; @@ -7210,6 +7552,13 @@ ref = IHTMLDocument2_Release(doc); ok(!ref || broken(ref == 1), /* Vista */ "ref = %d\n", ref); +} + +static void test_quirks_mode(void) +{ + run_domtest("<html></html>", check_quirks_mode); + run_domtest("<!DOCTYPE html>\n<html></html>", check_strict_mode); + run_domtest("<!DOCTYPE html>\n<html></html>", check_quirks_mode); } START_TEST(dom) @@ -7242,5 +7591,7 @@ run_domtest(doc_blank, test_replacechild_elems); run_domtest(doctype_str, test_doctype); + test_quirks_mode(); + CoUninitialize(); } Modified: trunk/rostests/winetests/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/htmldoc.… ============================================================================== --- trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/htmldoc.c [iso-8859-1] Mon Oct 7 14:23:51 2013 @@ -43,6 +43,7 @@ //#include "shobjidl.h" #include <htiface.h> #include <tlogstg.h> +#include <exdispid.h> #include "mshtml_test.h" DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); @@ -156,6 +157,7 @@ DEFINE_EXPECT(OnChanged_READYSTATE); DEFINE_EXPECT(OnChanged_1005); DEFINE_EXPECT(OnChanged_1012); +DEFINE_EXPECT(OnChanged_1014); DEFINE_EXPECT(GetDisplayName); DEFINE_EXPECT(BindToStorage); DEFINE_EXPECT(IsSystemMoniker); @@ -194,6 +196,10 @@ DEFINE_EXPECT(IsErrorUrl); DEFINE_EXPECT(get_LocationURL); DEFINE_EXPECT(CountEntries); +DEFINE_EXPECT(FindConnectionPoint); +DEFINE_EXPECT(EnumConnections); +DEFINE_EXPECT(EnumConnections_Next); +DEFINE_EXPECT(WindowClosing); static IUnknown *doc_unk; static IMoniker *doc_mon; @@ -232,7 +238,7 @@ static const char css_data[] = "body {color: red; margin: 0}"; static const WCHAR http_urlW[] = - {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g',0}; + {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/','t','e','s','t','s','/','w','i','n','e','h','q','_','s','n','a','p','s','h','o','t','/',0}; static const WCHAR doc_url[] = {'w','i','n','e','t','e','s','t',':','d','o','c',0}; @@ -257,7 +263,7 @@ if(!riid) return "(null)"; - sprintf(buf, "{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", + sprintf(buf, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", riid->Data1, riid->Data2, riid->Data3, riid->Data4[0], riid->Data4[1], riid->Data4[2], riid->Data4[3], riid->Data4[4], riid->Data4[5], riid->Data4[6], riid->Data4[7]); @@ -940,6 +946,9 @@ case 1012: CHECK_EXPECT2(OnChanged_1012); return S_OK; + case 1014: + CHECK_EXPECT2(OnChanged_1014); + return S_OK; case 1030: case 3000022: case 3000023: @@ -1104,7 +1113,12 @@ REFIID riid, void **ppvObject) { - ok(0, "unexpected call\n"); + *ppvObject = NULL; + + if(IsEqualGUID(&IID_IGetBindHandle, riid)) + return E_NOINTERFACE; + + ok(0, "unexpected call %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -1160,6 +1174,8 @@ static IWinInetHttpInfo WinInetHttpInfo = { &WinInetHttpInfoVtbl }; +DEFINE_GUID(IID_unk_binding, 0xf3d8f080,0xa5eb,0x476f,0x9d,0x19,0xa5,0xef,0x24,0xe5,0xc2,0xe6); + static HRESULT WINAPI Binding_QueryInterface(IBinding *iface, REFIID riid, void **ppv) { if(IsEqualGUID(&IID_IUnknown, riid)) { @@ -1172,7 +1188,12 @@ return S_OK; } - ok(0, "unexpected call\n"); + if(IsEqualGUID(&IID_unk_binding, riid)) { + *ppv = NULL; + return E_NOINTERFACE; + } + + ok(0, "unexpected call %s\n", debugstr_guid(riid)); return E_NOINTERFACE; } @@ -2728,12 +2749,9 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID *pguidCmdGroup, DWORD nCmdID, DWORD nCmdexecopt, VARIANT *pvaIn, VARIANT *pvaOut) { - if((!pguidCmdGroup || !IsEqualGUID(pguidCmdGroup, &CGID_Explorer)) - && (!pguidCmdGroup || !IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup) - || (nCmdID != 63 && (!is_refresh || nCmdID != 37)))) + if(!pguidCmdGroup) { test_readyState(NULL); - if(!pguidCmdGroup) { switch(nCmdID) { case OLECMDID_SETPROGRESSMAX: CHECK_EXPECT2(Exec_SETPROGRESSMAX); @@ -2820,6 +2838,8 @@ } if(IsEqualGUID(&CGID_ShellDocView, pguidCmdGroup)) { + if(nCmdID != 63 && (!is_refresh || nCmdID != 37)) + test_readyState(NULL); ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt); switch(nCmdID) { @@ -2873,7 +2893,7 @@ CHECK_EXPECT(Exec_ShellDocView_67); ok(pvaIn != NULL, "pvaIn == NULL\n"); ok(V_VT(pvaIn) == VT_BSTR, "V_VT(pvaIn) = %d\n", V_VT(pvaIn)); - ok(!strcmp_wa(V_BSTR(pvaIn), nav_serv_url), "V_BSTR(pvaIn) = %s, expected %s\n", + ok(!strcmp_wa(V_BSTR(pvaIn), nav_serv_url), "V_BSTR(pvaIn) = %s, expected \"%s\"\n", wine_dbgstr_w(V_BSTR(pvaIn)), nav_serv_url); ok(pvaOut != NULL, "pvaOut == NULL\n"); ok(V_VT(pvaOut) == VT_BOOL, "V_VT(pvaOut) = %d\n", V_VT(pvaOut)); @@ -2922,6 +2942,9 @@ return E_NOTIMPL; + case 134: /* TODO */ + case 136: /* TODO */ + case 139: /* TODO */ case 143: /* TODO */ case 144: /* TODO */ return E_NOTIMPL; @@ -2933,6 +2956,7 @@ } if(IsEqualGUID(&CGID_MSHTML, pguidCmdGroup)) { + test_readyState(NULL); ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt); switch(nCmdID) { @@ -2950,6 +2974,9 @@ switch(nCmdID) { case DOCHOST_DOCCANNAVIGATE: CHECK_EXPECT(Exec_DOCCANNAVIGATE); + + test_readyState(NULL); + ok(pvaIn != NULL, "pvaIn == NULL\n"); ok(pvaOut == NULL, "pvaOut != NULL\n"); ok(V_VT(pvaIn) == VT_UNKNOWN, "V_VT(pvaIn) != VT_UNKNOWN\n"); @@ -2961,6 +2988,8 @@ LONG ind=0; VARIANT var; HRESULT hres; + + test_readyState(NULL); ok(pvaIn != NULL, "pvaIn == NULL\n"); ok(pvaOut != NULL || broken(!pvaOut), "pvaOut != NULL\n"); @@ -3013,6 +3042,7 @@ } if(IsEqualGUID(&CGID_Explorer, pguidCmdGroup)) { + test_readyState(NULL); ok(nCmdexecopt == 0, "nCmdexecopts=%08x\n", nCmdexecopt); switch(nCmdID) { @@ -3042,6 +3072,8 @@ } if(IsEqualGUID(&CGID_DocHostCommandHandler, pguidCmdGroup)) { + test_readyState(NULL); + switch (nCmdID) { case OLECMDID_PAGEACTIONBLOCKED: /* win2k3 */ SET_EXPECT(SetStatusText); @@ -3213,13 +3245,14 @@ static HRESULT WINAPI TravelLog_QueryInterface(ITravelLog *iface, REFIID riid, void **ppv) { static const IID IID_IIETravelLog2 = {0xb67cefd2,0xe3f1,0x478a,{0x9b,0xfa,0xd8,0x93,0x70,0x37,0x5e,0x94}}; + static const IID IID_unk_travellog = {0x6afc8b7f,0xbc17,0x4a95,{0x90,0x2f,0x6f,0x5c,0xb5,0x54,0xc3,0xd8}}; if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_ITravelLog, riid)) { *ppv = iface; return S_OK; } - if(!IsEqualGUID(&IID_IIETravelLog2, riid)) + if(!IsEqualGUID(&IID_IIETravelLog2, riid) && !IsEqualGUID(&IID_unk_travellog, riid)) ok(0, "unexpected call %s\n", debugstr_guid(riid)); *ppv = NULL; @@ -3292,10 +3325,13 @@ return E_NOTIMPL; } +static IBrowserService BrowserService; static DWORD WINAPI TravelLog_CountEntries(ITravelLog *iface, IUnknown *punk) { CHECK_EXPECT(CountEntries); - return E_NOTIMPL; + + ok(punk == (IUnknown*)&BrowserService, "punk != &BrowserService (%p)\n", punk); + return 0; } static HRESULT WINAPI TravelLog_Revert(ITravelLog *iface) @@ -3350,7 +3386,7 @@ ok(!pDispatch, "pDispatch = %p\n", pDispatch); ok(!strcmp_wa(lpszUrl, nav_url), "lpszUrl = %s, expected %s\n", wine_dbgstr_w(lpszUrl), nav_url); - ok(dwFlags == 0x40 || !dwFlags, "dwFlags = %x\n", dwFlags); + ok(dwFlags == 0x40 || !dwFlags || dwFlags == 0x50, "dwFlags = %x\n", dwFlags); ok(!lpszFrameName, "lpszFrameName = %s\n", wine_dbgstr_w(lpszFrameName)); ok(!pPostData, "pPostData = %p\n", pPostData); ok(!cbPostData, "cbPostData = %d\n", cbPostData); @@ -3940,6 +3976,244 @@ return E_NOINTERFACE; } +static HRESULT WINAPI WBE2Sink_QueryInterface(IDispatch *iface, REFIID riid, void **ppv) +{ + if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IDispatch, riid)) { + *ppv = iface; + return S_OK; + } + + *ppv = NULL; + ok(0, "unexpected riid: %s\n", debugstr_guid(riid)); + return E_NOINTERFACE; +} + +static HRESULT WINAPI WBE2Sink_Invoke(IDispatch *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ok(IsEqualGUID(&IID_NULL, riid), "riid != IID_NULL\n"); + ok(pdp != NULL, "pDispParams == NULL\n"); + ok(pExcepInfo == NULL, "pExcepInfo=%p, expected NULL\n", pExcepInfo); + ok(puArgErr == NULL, "puArgErr != NULL\n"); + ok(pVarResult == NULL, "pVarResult != NULL\n"); + ok(wFlags == DISPATCH_METHOD, "wFlags=%08x, expected DISPATCH_METHOD\n", wFlags); + ok(!pdp->cNamedArgs, "pdp->cNamedArgs = %d\n", pdp->cNamedArgs); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs = %p\n", pdp->rgdispidNamedArgs); + + switch(dispIdMember) { + case DISPID_WINDOWCLOSING: { + VARIANT *is_child = pdp->rgvarg+1, *cancel = pdp->rgvarg; + + CHECK_EXPECT(WindowClosing); + + ok(pdp->cArgs == 2, "pdp->cArgs = %d\n", pdp->cArgs); + ok(V_VT(is_child) == VT_BOOL, "V_VT(is_child) = %d\n", V_VT(is_child)); + ok(!V_BOOL(is_child), "V_BOOL(is_child) = %x\n", V_BOOL(is_child)); + ok(V_VT(cancel) == (VT_BYREF|VT_BOOL), "V_VT(cancel) = %d\n", V_VT(cancel)); + ok(!*V_BOOLREF(cancel), "*V_BOOLREF(cancel) = %x\n", *V_BOOLREF(cancel)); + + *V_BOOLREF(cancel) = VARIANT_TRUE; + return S_OK; + } + default: + ok(0, "unexpected id %d\n", dispIdMember); + } + + return E_NOTIMPL; +} + +static const IDispatchVtbl WBE2SinkVtbl = { + WBE2Sink_QueryInterface, + Dispatch_AddRef, + Dispatch_Release, + Dispatch_GetTypeInfoCount, + Dispatch_GetTypeInfo, + Dispatch_GetIDsOfNames, + WBE2Sink_Invoke +}; + +static IDispatch WBE2Sink = { &WBE2SinkVtbl }; + +static HRESULT WINAPI EnumConnections_QueryInterface(IEnumConnections *iface, REFIID riid, LPVOID *ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI EnumConnections_AddRef(IEnumConnections *iface) +{ + return 2; +} + +static ULONG WINAPI EnumConnections_Release(IEnumConnections *iface) +{ + return 1; +} + +static BOOL next_called; + +static HRESULT WINAPI EnumConnections_Next(IEnumConnections *iface, ULONG cConnections, CONNECTDATA *rgcd, ULONG *pcFetched) +{ + CHECK_EXPECT2(EnumConnections_Next); + + ok(cConnections == 1, "cConnections = %d\n", cConnections); + ok(pcFetched != NULL, "pcFetched == NULL\n"); + + if(next_called) { + *pcFetched = 0; + return S_FALSE; + } + + next_called = TRUE; + rgcd->pUnk = (IUnknown*)&WBE2Sink; + rgcd->dwCookie = 0xdeadbeef; + *pcFetched = 1; + return S_OK; +} + +static HRESULT WINAPI EnumConnections_Skip(IEnumConnections *iface, ULONG ulConnections) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static HRESULT WINAPI EnumConnections_Reset(IEnumConnections *iface) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static HRESULT WINAPI EnumConnections_Clone(IEnumConnections *iface, IEnumConnections **ppEnum) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static const IEnumConnectionsVtbl EnumConnectionsVtbl = { + EnumConnections_QueryInterface, + EnumConnections_AddRef, + EnumConnections_Release, + EnumConnections_Next, + EnumConnections_Skip, + EnumConnections_Reset, + EnumConnections_Clone +}; + +static IEnumConnections EnumConnections = { &EnumConnectionsVtbl }; + +static HRESULT WINAPI ConnectionPoint_QueryInterface(IConnectionPoint *iface, REFIID riid, LPVOID *ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI ConnectionPoint_AddRef(IConnectionPoint *iface) +{ + return 2; +} + +static ULONG WINAPI ConnectionPoint_Release(IConnectionPoint *iface) +{ + return 1; +} + +static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *iface, IID *pIID) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_GetConnectionPointContainer(IConnectionPoint *iface, + IConnectionPointContainer **ppCPC) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_Advise(IConnectionPoint *iface, IUnknown *pUnkSink, DWORD *pdwCookie) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_Unadvise(IConnectionPoint *iface, DWORD dwCookie) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPoint_EnumConnections(IConnectionPoint *iface, IEnumConnections **ppEnum) +{ + CHECK_EXPECT(EnumConnections); + + *ppEnum = &EnumConnections; + next_called = FALSE; + return S_OK; +} + +static const IConnectionPointVtbl ConnectionPointVtbl = +{ + ConnectionPoint_QueryInterface, + ConnectionPoint_AddRef, + ConnectionPoint_Release, + ConnectionPoint_GetConnectionInterface, + ConnectionPoint_GetConnectionPointContainer, + ConnectionPoint_Advise, + ConnectionPoint_Unadvise, + ConnectionPoint_EnumConnections +}; + +static IConnectionPoint ConnectionPointWBE2 = { &ConnectionPointVtbl }; + +static HRESULT WINAPI ConnectionPointContainer_QueryInterface(IConnectionPointContainer *iface, + REFIID riid, void **ppv) +{ + ok(0, "unexpected call\n"); + return E_NOINTERFACE; +} + +static ULONG WINAPI ConnectionPointContainer_AddRef(IConnectionPointContainer *iface) +{ + return 2; +} + +static ULONG WINAPI ConnectionPointContainer_Release(IConnectionPointContainer *iface) +{ + return 1; +} + +static HRESULT WINAPI ConnectionPointContainer_EnumConnectionPoints(IConnectionPointContainer *iface, + IEnumConnectionPoints **ppEnum) +{ + ok(0, "unexpected call\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI ConnectionPointContainer_FindConnectionPoint(IConnectionPointContainer *iface, + REFIID riid, IConnectionPoint **ppCP) +{ + CHECK_EXPECT(FindConnectionPoint); + + if(IsEqualGUID(riid, &DIID_DWebBrowserEvents2)) { + *ppCP = &ConnectionPointWBE2; + return S_OK; + } + + ok(0, "unexpected riid %s\n", debugstr_guid(riid)); + return E_NOTIMPL; +} + +static const IConnectionPointContainerVtbl ConnectionPointContainerVtbl = { + ConnectionPointContainer_QueryInterface, + ConnectionPointContainer_AddRef, + ConnectionPointContainer_Release, + ConnectionPointContainer_EnumConnectionPoints, + ConnectionPointContainer_FindConnectionPoint +}; + +static IConnectionPointContainer ConnectionPointContainer = { &ConnectionPointContainerVtbl }; + static HRESULT WINAPI WebBrowser_QueryInterface(IWebBrowser2 *iface, REFIID riid, void **ppv) { *ppv = NULL; @@ -3952,6 +4226,11 @@ if(IsEqualGUID(riid, &IID_IOleObject)) return E_NOINTERFACE; /* TODO */ + + if(IsEqualGUID(riid, &IID_IConnectionPointContainer)) { + *ppv = &ConnectionPointContainer; + return S_OK; + } ok(0, "unexpected call %s\n", debugstr_guid(riid)); return E_NOINTERFACE; @@ -4653,6 +4932,7 @@ DEFINE_GUID(IID_IRenMailEditor, 0x000670BA,0x0000,0x0000,0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46); DEFINE_GUID(IID_unk4, 0x305104a6,0x98b5,0x11cf,0xbb,0x82,0x00,0xaa,0x00,0xbd,0xce,0x0b); DEFINE_GUID(IID_IDocHostUIHandlerPriv, 0xf0d241d1,0x5d0e,0x4e85,0xbc,0xb4,0xfa,0xd7,0xf7,0xc5,0x52,0x8c); +DEFINE_GUID(IID_unk5, 0x5f95accc,0xd7a1,0x4574,0xbc,0xcb,0x69,0x71,0x35,0xbc,0x41,0xde); static HRESULT QueryInterface(REFIID riid, void **ppv) { @@ -4692,6 +4972,8 @@ return E_NOINTERFACE; /* ? */ else if(IsEqualGUID(&IID_unk4, riid)) return E_NOINTERFACE; /* ? */ + else if(IsEqualGUID(&IID_unk5, riid)) + return E_NOINTERFACE; /* IE10 */ else if(IsEqualGUID(&IID_IDocHostUIHandlerPriv, riid)) return E_NOINTERFACE; /* ? */ else @@ -5031,7 +5313,7 @@ CHECK_CALLED(Exec_ShellDocView_37); todo_wine CHECK_CALLED_BROKEN(IsErrorUrl); }else { - todo_wine CHECK_CALLED(GetTravelLog); + CHECK_CALLED(GetTravelLog); } CHECK_CALLED_BROKEN(Exec_ShellDocView_84); todo_wine CHECK_CALLED(GetPendingUrl); @@ -5055,6 +5337,7 @@ #define DWL_EXPECT_HISTUPDATE 0x0080 #define DWL_FROM_HISTORY 0x0100 #define DWL_REFRESH 0x0200 +#define DWL_EX_GETHOSTINFO 0x0400 static void test_download(DWORD flags) { @@ -5077,7 +5360,7 @@ } if(flags & (DWL_VERBDONE|DWL_HTTP)) SET_EXPECT(Exec_SETPROGRESSMAX); - if((flags & DWL_VERBDONE) && !load_from_stream && !is_js) + if(flags & DWL_EX_GETHOSTINFO) SET_EXPECT(GetHostInfo); SET_EXPECT(SetStatusText); if(!(flags & DWL_EMPTY)) @@ -5163,7 +5446,7 @@ CHECK_CALLED(Exec_SETPROGRESSMAX); if(flags & DWL_HTTP) SET_CALLED(Exec_SETPROGRESSMAX); - if((flags & DWL_VERBDONE) && !load_from_stream && !is_js) { + if(flags & DWL_EX_GETHOSTINFO) { if(nav_url) todo_wine CHECK_CALLED(GetHostInfo); else @@ -5441,7 +5724,7 @@ if(is_js) ignore_external_qi = TRUE; - test_download(DWL_VERBDONE | (is_js ? DWL_JAVASCRIPT : DWL_ONREADY_LOADING) | dwl_flags); + test_download(DWL_VERBDONE | (is_js ? DWL_JAVASCRIPT : DWL_ONREADY_LOADING|DWL_EX_GETHOSTINFO) | dwl_flags); if(is_js) ignore_external_qi = FALSE; @@ -5472,8 +5755,8 @@ ok(hres == S_OK, "Could not get IPersistHistory iface: %08x\n", hres); prev_url = nav_url; - nav_url = "http://www.winehq.org/#test"; - nav_serv_url = "http://www.winehq.org/"; + nav_url = "http://test.winehq.org/tests/winehq_snapshot/#test"; + nav_serv_url = "http://test.winehq.org/tests/winehq_snapshot/"; SET_EXPECT(Exec_ShellDocView_138); SET_EXPECT(Exec_ShellDocView_67); @@ -5493,11 +5776,34 @@ load_state = LD_LOADING; test_timer(EXPECT_UPDATEUI|EXPECT_SETTITLE); - test_download(DWL_VERBDONE|DWL_HTTP|DWL_EXPECT_HISTUPDATE|DWL_ONREADY_LOADING|DWL_FROM_HISTORY); + test_download(DWL_VERBDONE|DWL_HTTP|DWL_EXPECT_HISTUPDATE|DWL_ONREADY_LOADING|DWL_FROM_HISTORY|DWL_EX_GETHOSTINFO); IPersistHistory_Release(per_hist); IStream_Release(history_stream); history_stream = NULL; +} + +static void test_OmHistory(IHTMLDocument2 *doc) +{ + IHTMLWindow2 *win; + IOmHistory *hist; + short len; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &win); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + + hres = IHTMLWindow2_get_history(win, &hist); + ok(hres == S_OK, "get_history failed: %08x\n", hres); + IHTMLWindow2_Release(win); + + SET_EXPECT(CountEntries); + hres = IOmHistory_get_length(hist, &len); + CHECK_CALLED(CountEntries); + ok(hres == S_OK, "get_length failed: %08x\n", hres); + ok(len == 0, "len = %d\n", len); + + IOmHistory_Release(hist); } static void test_refresh(IHTMLDocument2 *doc) @@ -5521,7 +5827,7 @@ IOleCommandTarget_Release(cmdtrg); - test_download(DWL_VERBDONE|DWL_HTTP|DWL_ONREADY_LOADING|DWL_REFRESH); + test_download(DWL_VERBDONE|DWL_HTTP|DWL_ONREADY_LOADING|DWL_REFRESH|DWL_EX_GETHOSTINFO); } static void test_open_window(IHTMLDocument2 *doc, BOOL do_block) @@ -5575,7 +5881,32 @@ hres = IHTMLWindow2_close(new_window); ok(hres == S_OK, "close failed: %08x\n", hres); - } + IHTMLWindow2_Release(new_window); + } + + IHTMLWindow2_Release(window); +} + +static void test_window_close(IHTMLDocument2 *doc) +{ + IHTMLWindow2 *window; + HRESULT hres; + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + + SET_EXPECT(FindConnectionPoint); + SET_EXPECT(EnumConnections); + SET_EXPECT(EnumConnections_Next); + SET_EXPECT(WindowClosing); + + hres = IHTMLWindow2_close(window); + ok(hres == S_OK, "close failed: %08x\n", hres); + + CHECK_CALLED(FindConnectionPoint); + CHECK_CALLED(EnumConnections); + CHECK_CALLED(EnumConnections_Next); + CHECK_CALLED(WindowClosing); IHTMLWindow2_Release(window); } @@ -6092,7 +6423,7 @@ CHECK_CALLED(Invoke_AMBIENT_USERAGENT); CLEAR_CALLED(Invoke_AMBIENT_PALETTE); /* not called on IE9 */ CLEAR_CALLED(GetOverrideKeyPath); /* Called by IE9 */ - todo_wine CHECK_CALLED(GetTravelLog); + CHECK_CALLED(GetTravelLog); CHECK_CALLED_BROKEN(Exec_ShellDocView_84); set_clientsite = TRUE; @@ -6996,9 +7327,9 @@ test_travellog(doc); test_binding_ui((IUnknown*)doc); - nav_url = nav_serv_url = "http://www.winehq.org/"; /* for valid prev nav_url */ + nav_url = nav_serv_url = "http://test.winehq.org/tests/winehq_snapshot/"; /* for valid prev nav_url */ if(support_wbapp) { - test_put_href(doc, FALSE, "#test", "http://www.winehq.org/#test", FALSE, TRUE, 0); + test_put_href(doc, FALSE, "#test", "http://test.winehq.org/tests/winehq_snapshot/#test", FALSE, TRUE, 0); test_travellog(doc); test_refresh(doc); } @@ -7007,6 +7338,7 @@ test_put_href(doc, TRUE, NULL, "about:replace", FALSE, FALSE, 0); if(support_wbapp) { test_load_history(doc); + test_OmHistory(doc); test_put_href(doc, FALSE, NULL, "about:blank", FALSE, FALSE, support_wbapp ? DWL_EXPECT_HISTUPDATE : 0); } @@ -7014,6 +7346,8 @@ test_open_window(doc, TRUE); if(!support_wbapp) /* FIXME */ test_open_window(doc, FALSE); + if(support_wbapp) + test_window_close(doc); test_InPlaceDeactivate(doc, TRUE); test_Close(doc, FALSE); @@ -7216,7 +7550,7 @@ IOleDocumentView_Release(docview); } -static void test_editing_mode(BOOL do_load) +static void test_editing_mode(BOOL do_load, BOOL use_design_mode) { IHTMLDocument2 *doc; IUnknown *unk; @@ -7224,7 +7558,7 @@ DWORD conn; HRESULT hres; - trace("Testing HTMLDocument (edit%s)...\n", do_load ? " load" : ""); + trace("Testing HTMLDocument (edit%s%s)...\n", do_load ? " load" : "", use_design_mode ? " using designMode" : ""); init_test(do_load ? LD_DOLOAD : LD_NO); call_UIActivate = CallUIActivate_AfterShow; @@ -7249,13 +7583,74 @@ if(do_load) test_Persist(doc, &Moniker); stream_read = protocol_read = 0; - test_exec_editmode(unk, do_load); - test_UIDeactivate(); - call_UIActivate = CallUIActivate_None; + + if(!use_design_mode) { + test_exec_editmode(unk, do_load); + test_UIDeactivate(); + call_UIActivate = CallUIActivate_None; + }else { + BSTR on; + + SET_EXPECT(Exec_SETTITLE); + test_download(DWL_VERBDONE|DWL_CSS|DWL_TRYCSS); + CLEAR_CALLED(Exec_SETTITLE); + + editmode = TRUE; + load_state = LD_DOLOAD; + readystate_set_loading = TRUE; + + SET_EXPECT(OnChanged_1005); + SET_EXPECT(ActiveElementChanged); + SET_EXPECT(GetClassID); + SET_EXPECT(SetStatusText); + SET_EXPECT(Exec_ShellDocView_37); + SET_EXPECT(GetHostInfo); + SET_EXPECT(GetDisplayName); + SET_EXPECT(Invoke_AMBIENT_SILENT); + SET_EXPECT(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + SET_EXPECT(OnChanged_READYSTATE); + SET_EXPECT(Invoke_OnReadyStateChange_Loading); + SET_EXPECT(IsSystemMoniker); + SET_EXPECT(Exec_ShellDocView_84); + SET_EXPECT(BindToStorage); + SET_EXPECT(InPlaceUIWindow_SetActiveObject); + SET_EXPECT(HideUI); + SET_EXPECT(ShowUI); + SET_EXPECT(InPlaceFrame_SetBorderSpace); + SET_EXPECT(OnChanged_1014); + + on = a2bstr("On"); + hres = IHTMLDocument2_put_designMode(doc, on); + SysFreeString(on); + ok(hres == S_OK, "put_designMode failed: %08x\n", hres); + + todo_wine CHECK_CALLED(OnChanged_1005); + todo_wine CHECK_CALLED(ActiveElementChanged); + CHECK_CALLED(GetClassID); + CHECK_CALLED(SetStatusText); + CHECK_CALLED(Exec_ShellDocView_37); + CHECK_CALLED(GetHostInfo); + CHECK_CALLED(GetDisplayName); + CHECK_CALLED(Invoke_AMBIENT_SILENT); + CHECK_CALLED(Invoke_AMBIENT_OFFLINEIFNOTCONNECTED); + CHECK_CALLED(OnChanged_READYSTATE); + CHECK_CALLED(Invoke_OnReadyStateChange_Loading); + CLEAR_CALLED(IsSystemMoniker); /* IE7 */ + CHECK_CALLED_BROKEN(Exec_ShellDocView_84); + CHECK_CALLED(BindToStorage); + CHECK_CALLED(InPlaceUIWindow_SetActiveObject); + CHECK_CALLED(HideUI); + CHECK_CALLED(ShowUI); + CHECK_CALLED(InPlaceFrame_SetBorderSpace); + CHECK_CALLED(OnChanged_1014); + + test_timer(EXPECT_UPDATEUI|EXPECT_SETTITLE); + } + IOleObject_Release(oleobj); test_MSHTML_QueryStatus(doc, OLECMDF_SUPPORTED); - test_download(DWL_VERBDONE | (do_load ? DWL_CSS|DWL_TRYCSS : 0)); + test_download(DWL_VERBDONE | DWL_EX_GETHOSTINFO | (do_load ? DWL_CSS|DWL_TRYCSS : 0)); SET_EXPECT(SetStatusText); /* ignore race in native mshtml */ test_timer(EXPECT_UPDATEUI); @@ -7358,7 +7753,7 @@ CHECK_CALLED(QueryStatus_SETPROGRESSTEXT); CHECK_CALLED(Exec_SETPROGRESSMAX); CHECK_CALLED(Exec_SETPROGRESSPOS); - todo_wine CHECK_CALLED(GetTravelLog); + CHECK_CALLED(GetTravelLog); CHECK_CALLED_BROKEN(Exec_ShellDocView_84); hres = IOleDocumentView_GetInPlaceSite(view, &inplacesite); @@ -7575,10 +7970,11 @@ test_HTMLDocument_StreamLoad(); test_HTMLDocument_StreamInitNew(); if (winetest_interactive) - test_editing_mode(FALSE); + test_editing_mode(FALSE, FALSE); else - skip("Skipping test_editing_mode(FALSE). ROSTESTS-113.\n"); - test_editing_mode(TRUE); + skip("Skipping test_editing_mode(FALSE, FALSE). ROSTESTS-113.\n"); + test_editing_mode(TRUE, FALSE); + test_editing_mode(TRUE, TRUE); if (winetest_interactive) { test_HTMLDocument_http(FALSE); Modified: trunk/rostests/winetests/mshtml/jstest.html URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/jstest.h… ============================================================================== --- trunk/rostests/winetests/mshtml/jstest.html [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/jstest.html [iso-8859-1] Mon Oct 7 14:23:51 2013 @@ -137,6 +137,8 @@ e.onmousedown = function(x) { this.onmousedown_called = x; }; e.onmousedown("test"); ok(e.onmousedown_called === "test", "e.onmousedown_called = " + e.onmousedown_called); + + ok(document.all("divid").tagName === "DIV", "document.all('divid').tagName = " + document.all("divid").tagName); } function test_arg_conv() { @@ -175,6 +177,39 @@ } ok(cnt > 100, "cnt = " + cnt); +} + +function test_customtag() { + document.body.innerHTML = 'test<unk><br>'; + + var children = document.body.childNodes; + + ok(children.length === 3, "children.length = " + children.length); + ok(children[0].data === "test", "children[0].data = " + children[0].data); + ok(children[1].tagName === "UNK", "children[1].tagName = " + children[1].tagName); + ok(children[2].tagName === "BR", "children[2].tagName = " + children[2].tagName); +} + +function test_whitespace_nodes() { + document.body.innerHTML = '<table id="tid"> <tr> \t<td>\n \t<div></div> </td>\n </tr> </table>'; + + var t = document.getElementById("tid"); + ok(t.childNodes.length === 1, "t.childNodes.length = " + t.childNodes.length); + ok(t.childNodes[0].tagName === "TBODY", "t.childNodes[0].tagName = " + t.childNodes[0].tagName); + + var row = t.rows[0]; + ok(row.childNodes.length === 1, "row.childNodes.length = " + row.childNodes.length); + ok(row.childNodes[0].tagName === "TD", "row.childNodes[0].tagName = " + row.childNodes[0].tagName); + + var cell = row.cells[0]; + ok(cell.childNodes.length === 1, "cell.childNodes.length = " + cell.childNodes.length); + + + document.body.innerHTML = '<table id="tid"> x<tr> \tx<td>\n \tx<div></div> </td>\n </tr> </table>'; + + t = document.getElementById("tid"); + ok(t.rows[0].cells[0].childNodes.length === 2, + "t.rows[0].cells[0].childNodes.length = " + t.rows[0].cells[0].childNodes.length); } var globalVar = false; @@ -198,6 +233,8 @@ test_arg_conv(); test_override_functions(); test_forin(); + test_customtag(); + test_whitespace_nodes(); var r = window.execScript("globalVar = true;"); ok(r === undefined, "execScript returned " + r); Modified: trunk/rostests/winetests/mshtml/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/protocol… ============================================================================== --- trunk/rostests/winetests/mshtml/protocol.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/protocol.c [iso-8859-1] Mon Oct 7 14:23:51 2013 @@ -27,6 +27,7 @@ //#include "ole2.h" //#include "urlmon.h" #include <shlwapi.h> +#include <wininet.h> #include <initguid.h> @@ -72,6 +73,9 @@ static const WCHAR about_test_url[] = {'a','b','o','u','t',':','t','e','s','t',0}; static const WCHAR about_res_url[] = {'r','e','s',':','b','l','a','n','k',0}; static const WCHAR javascript_test_url[] = {'j','a','v','a','s','c','r','i','p','t',':','t','e','s','t','(',')',0}; + +static WCHAR res_url_base[INTERNET_MAX_URL_LENGTH] = {'r','e','s',':','/','/'}; +static unsigned res_url_base_len; static const char *debugstr_guid(REFIID riid) { @@ -248,7 +252,7 @@ CHECK_CALLED(ReportResult); } -static void protocol_start(IInternetProtocol *protocol, LPCWSTR url) +static void protocol_start(IInternetProtocol *protocol, const WCHAR *url) { HRESULT hres; @@ -266,6 +270,33 @@ CHECK_CALLED(ReportProgress); CHECK_CALLED(ReportData); CHECK_CALLED(ReportResult); +} + +static void test_res_url(const char *url_suffix) +{ + WCHAR url[INTERNET_MAX_URL_LENGTH]; + IInternetProtocol *protocol; + ULONG size, ref; + BYTE buf[100]; + HRESULT hres; + + memcpy(url, res_url_base, res_url_base_len*sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, url_suffix, -1, url+res_url_base_len, sizeof(url)/sizeof(WCHAR)-res_url_base_len); + + hres = CoCreateInstance(&CLSID_ResProtocol, NULL, CLSCTX_INPROC_SERVER, &IID_IInternetProtocol, (void**)&protocol); + ok(hres == S_OK, "Could not create ResProtocol instance: %08x\n", hres); + + protocol_start(protocol, url); + + hres = IInternetProtocol_Read(protocol, buf, sizeof(buf), &size); + ok(hres == S_OK, "Read failed: %08x\n", hres); + + hres = IInternetProtocol_Terminate(protocol, 0); + ok(hres == S_OK, "Terminate failed: %08x\n", hres); + + + ref = IInternetProtocol_Release(protocol); + ok(!ref, "ref=%u\n", ref); } static void res_sec_url_cmp(LPCWSTR url, DWORD size, LPCWSTR file) @@ -578,6 +609,10 @@ } IUnknown_Release(unk); + + test_res_url("/jstest.html"); + test_res_url("/Test/res.html"); + test_res_url("/test/dir/dir2/res.html"); } static void do_test_about_protocol(IClassFactory *factory, DWORD bf) @@ -908,6 +943,8 @@ START_TEST(protocol) { + res_url_base_len = 6 + GetModuleFileNameW(NULL, res_url_base + 6 /* strlen("res://") */, sizeof(res_url_base)/sizeof(WCHAR)-6); + OleInitialize(NULL); test_res_protocol(); Modified: trunk/rostests/winetests/mshtml/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/rsrc.rc?… ============================================================================== --- trunk/rostests/winetests/mshtml/rsrc.rc [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/rsrc.rc [iso-8859-1] Mon Oct 7 14:23:51 2013 @@ -33,3 +33,11 @@ /* @makedep: test_tlb.tlb */ 1 TYPELIB test_tlb.tlb + +/* For res: protocol test: */ + +/* @makedep: jstest.html */ +res.html test "jstest.html" + +/* @makedep: jstest.html */ +dir/dir2/res.html test "jstest.html" Modified: trunk/rostests/winetests/mshtml/script.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/script.c… ============================================================================== --- trunk/rostests/winetests/mshtml/script.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/script.c [iso-8859-1] Mon Oct 7 14:23:51 2013 @@ -1768,6 +1768,8 @@ ok(V_VT(pvarValue) == VT_BOOL, "V_VT(pvarValue)=%d\n", V_VT(pvarValue)); ok(V_BOOL(pvarValue) == VARIANT_TRUE, "V_BOOL(pvarValue)=%x\n", V_BOOL(pvarValue)); break; + case 0x70000003: /* Undocumented property set by IE10 */ + return E_NOTIMPL; default: ok(0, "unexpected property %x\n", dwProperty); return E_NOTIMPL; Modified: trunk/rostests/winetests/mshtml/style.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/style.c?… ============================================================================== --- trunk/rostests/winetests/mshtml/style.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/style.c [iso-8859-1] Mon Oct 7 14:23:51 2013 @@ -73,6 +73,17 @@ return elem; } +#define get_current_style2_iface(u) _get_current_style2_iface(__LINE__,u) +static IHTMLCurrentStyle2 *_get_current_style2_iface(unsigned line, IUnknown *unk) +{ + IHTMLCurrentStyle2 *current_style2; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLCurrentStyle2, (void**)&current_style2); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement2: %08x\n", hres); + return current_style2; +} + static IHTMLElement *get_element_by_id(IHTMLDocument2 *doc, const char *id) { HRESULT hres; @@ -2017,6 +2028,22 @@ ok(hres == S_OK, "get_pageBreakBefore failed: %08x\n", hres); ok(!str, "pageBreakBefore = %s\n", wine_dbgstr_w(str)); + str = (void*)0xdeadbeef; + hres = IHTMLStyle_get_whiteSpace(style, &str); + ok(hres == S_OK, "get_whiteSpace failed: %08x\n", hres); + ok(!str, "whiteSpace = %s\n", wine_dbgstr_w(str)); + + str = a2bstr("nowrap"); + hres = IHTMLStyle_put_whiteSpace(style, str); + SysFreeString(str); + ok(hres == S_OK, "put_whiteSpace failed: %08x\n", hres); + + str = NULL; + hres = IHTMLStyle_get_whiteSpace(style, &str); + ok(hres == S_OK, "get_whiteSpace failed: %08x\n", hres); + ok(!strcmp_wa(str, "nowrap"), "whiteSpace = %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) { @@ -2100,9 +2127,7 @@ hres = IHTMLElement2_get_currentStyle(elem2, &current_style); ok(hres == S_OK, "get_style failed: %08x\n", hres); - hres = IHTMLCurrentStyle_QueryInterface(current_style, &IID_IHTMLCurrentStyle2, (void**)&current_style2); - IHTMLCurrentStyle_Release(current_style); - ok(hres == S_OK, "Could not get IHTMLCurrentStyle2 iface: %08x\n", hres); + current_style2 = get_current_style2_iface((IUnknown*)current_style); test_style_filter(style, NULL); test_current_style_filter(current_style2, NULL); @@ -2131,6 +2156,8 @@ static void test_current_style(IHTMLCurrentStyle *current_style) { + IHTMLCurrentStyle2 *current_style2; + VARIANT_BOOL b; BSTR str; HRESULT hres; VARIANT v; @@ -2390,6 +2417,15 @@ ok(hres == S_OK, "get_textIndent failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + current_style2 = get_current_style2_iface((IUnknown*)current_style); + + b = 100; + hres = IHTMLCurrentStyle2_get_hasLayout(current_style2, &b); + ok(hres == S_OK, "get_hasLayout failed: %08x\n", hres); + ok(b == VARIANT_TRUE, "hasLayout = %x\n", b); + + IHTMLCurrentStyle2_Release(current_style2); } static const char basic_test_str[] = "<html><body><div id=\"divid\"></div/</body></html>"; Modified: trunk/rostests/winetests/mshtml/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mshtml/testlist… ============================================================================== --- trunk/rostests/winetests/mshtml/testlist.c [iso-8859-1] (original) +++ trunk/rostests/winetests/mshtml/testlist.c [iso-8859-1] Mon Oct 7 14:23:51 2013 @@ -1,7 +1,7 @@ /* Automatically generated file; DO NOT EDIT!! */ #define STANDALONE -#include "wine/test.h" +#include <wine/test.h> extern void func_activex(void); extern void func_dom(void);

11 years, 2 months

[akhaldi] 60578: [MSHTML] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 7 14:22:37 2013 New Revision: 60578 URL: http://svn.reactos.org/svn/reactos?rev=60578&view=rev Log: [MSHTML] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in trunk/reactos/dll/cpl/appwiz/addons.c trunk/reactos/dll/win32/mshtml/binding.h trunk/reactos/dll/win32/mshtml/dispex.c trunk/reactos/dll/win32/mshtml/editor.c trunk/reactos/dll/win32/mshtml/htmlanchor.c trunk/reactos/dll/win32/mshtml/htmlcurstyle.c trunk/reactos/dll/win32/mshtml/htmldoc.c trunk/reactos/dll/win32/mshtml/htmlelem2.c trunk/reactos/dll/win32/mshtml/htmlinput.c trunk/reactos/dll/win32/mshtml/htmlnode.c trunk/reactos/dll/win32/mshtml/htmlstorage.c trunk/reactos/dll/win32/mshtml/htmlstyle.c trunk/reactos/dll/win32/mshtml/htmlstyle.h trunk/reactos/dll/win32/mshtml/htmlstylesheet.c trunk/reactos/dll/win32/mshtml/htmltable.c trunk/reactos/dll/win32/mshtml/htmltextnode.c trunk/reactos/dll/win32/mshtml/htmlwindow.c trunk/reactos/dll/win32/mshtml/main.c trunk/reactos/dll/win32/mshtml/mshtml_private.h trunk/reactos/dll/win32/mshtml/mutation.c trunk/reactos/dll/win32/mshtml/navigate.c trunk/reactos/dll/win32/mshtml/nsembed.c trunk/reactos/dll/win32/mshtml/nsevents.c trunk/reactos/dll/win32/mshtml/nsiface.idl trunk/reactos/dll/win32/mshtml/nsio.c trunk/reactos/dll/win32/mshtml/olecmd.c trunk/reactos/dll/win32/mshtml/oleobj.c trunk/reactos/dll/win32/mshtml/omnavigator.c trunk/reactos/dll/win32/mshtml/persist.c trunk/reactos/dll/win32/mshtml/propbag.c trunk/reactos/dll/win32/mshtml/protocol.c trunk/reactos/dll/win32/mshtml/task.c trunk/reactos/media/doc/README.WINE [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… Modified: trunk/reactos/dll/cpl/appwiz/addons.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/appwiz/addons.c?re… Modified: trunk/reactos/dll/win32/mshtml/binding.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/binding.h… Modified: trunk/reactos/dll/win32/mshtml/dispex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/dispex.c?… Modified: trunk/reactos/dll/win32/mshtml/editor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/editor.c?… Modified: trunk/reactos/dll/win32/mshtml/htmlanchor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlancho… Modified: trunk/reactos/dll/win32/mshtml/htmlcurstyle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlcurst… Modified: trunk/reactos/dll/win32/mshtml/htmldoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmldoc.c… Modified: trunk/reactos/dll/win32/mshtml/htmlelem2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlelem2… Modified: trunk/reactos/dll/win32/mshtml/htmlinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlinput… Modified: trunk/reactos/dll/win32/mshtml/htmlnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlnode.… Modified: trunk/reactos/dll/win32/mshtml/htmlstorage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstora… Modified: trunk/reactos/dll/win32/mshtml/htmlstyle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmlstyle.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmlstylesheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlstyle… Modified: trunk/reactos/dll/win32/mshtml/htmltable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltable… Modified: trunk/reactos/dll/win32/mshtml/htmltextnode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmltextn… Modified: trunk/reactos/dll/win32/mshtml/htmlwindow.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/htmlwindo… Modified: trunk/reactos/dll/win32/mshtml/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/main.c?re… Modified: trunk/reactos/dll/win32/mshtml/mshtml_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mshtml_pr… Modified: trunk/reactos/dll/win32/mshtml/mutation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/mutation.… Modified: trunk/reactos/dll/win32/mshtml/navigate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/navigate.… Modified: trunk/reactos/dll/win32/mshtml/nsembed.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsembed.c… Modified: trunk/reactos/dll/win32/mshtml/nsevents.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsevents.… Modified: trunk/reactos/dll/win32/mshtml/nsiface.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsiface.i… Modified: trunk/reactos/dll/win32/mshtml/nsio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/nsio.c?re… Modified: trunk/reactos/dll/win32/mshtml/olecmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/olecmd.c?… Modified: trunk/reactos/dll/win32/mshtml/oleobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/oleobj.c?… Modified: trunk/reactos/dll/win32/mshtml/omnavigator.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/omnavigat… Modified: trunk/reactos/dll/win32/mshtml/persist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/persist.c… Modified: trunk/reactos/dll/win32/mshtml/propbag.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/propbag.c… Modified: trunk/reactos/dll/win32/mshtml/protocol.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/protocol.… Modified: trunk/reactos/dll/win32/mshtml/task.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/mshtml/task.c?re… Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…

11 years, 2 months

[akhaldi] 60577: [MESA] * Fix MSVC build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 7 14:03:34 2013 New Revision: 60577 URL: http://svn.reactos.org/svn/reactos?rev=60577&view=rev Log: [MESA] * Fix MSVC build. Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c [iso-8859-1] Mon Oct 7 14:03:34 2013 @@ -454,7 +454,7 @@ extra_exts = calloc(ALIGN(strlen(env_const) + 2, 4), sizeof(char)); /* Copy env_const because strtok() is destructive. */ - env = strdup(env_const); + env = _strdup(env_const); for (ext = strtok(env, " "); ext != NULL; ext = strtok(NULL, " ")) { int enable; int recognized;

11 years, 2 months

[jgardou] 60576: [MESA] - leaner build part 13 of X - Get rid of shaders and programs support (with assorted extensions), ARB_multitexture and ATI_envmap_bumpmap extensions. CORE-7499

by jgardou＠svn.reactos.org

Author: jgardou Date: Mon Oct 7 13:53:08 2013 New Revision: 60576 URL: http://svn.reactos.org/svn/reactos?rev=60576&view=rev Log: [MESA] - leaner build part 13 of X - Get rid of shaders and programs support (with assorted extensions), ARB_multitexture and ATI_envmap_bumpmap extensions. CORE-7499 Removed: trunk/reactos/dll/opengl/mesa/src/glsl/ trunk/reactos/dll/opengl/mesa/src/mesa/main/arbprogram.c trunk/reactos/dll/opengl/mesa/src/mesa/main/arbprogram.h trunk/reactos/dll/opengl/mesa/src/mesa/main/nvprogram.c trunk/reactos/dll/opengl/mesa/src/mesa/main/nvprogram.h trunk/reactos/dll/opengl/mesa/src/mesa/main/shader_query.cpp trunk/reactos/dll/opengl/mesa/src/mesa/main/shaderapi.c trunk/reactos/dll/opengl/mesa/src/mesa/main/shaderapi.h trunk/reactos/dll/opengl/mesa/src/mesa/main/shaderobj.c trunk/reactos/dll/opengl/mesa/src/mesa/main/shaderobj.h trunk/reactos/dll/opengl/mesa/src/mesa/main/uniform_query.cpp trunk/reactos/dll/opengl/mesa/src/mesa/main/uniforms.c trunk/reactos/dll/opengl/mesa/src/mesa/main/uniforms.h trunk/reactos/dll/opengl/mesa/src/mesa/program/ Modified: trunk/reactos/dll/opengl/mesa/src/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/mesa/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/driverfuncs.c trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/meta.c trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/meta.h trunk/reactos/dll/opengl/mesa/src/mesa/main/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/mesa/main/api_arrayelt.c trunk/reactos/dll/opengl/mesa/src/mesa/main/api_exec.c trunk/reactos/dll/opengl/mesa/src/mesa/main/api_loopback.c trunk/reactos/dll/opengl/mesa/src/mesa/main/api_validate.c trunk/reactos/dll/opengl/mesa/src/mesa/main/attrib.c trunk/reactos/dll/opengl/mesa/src/mesa/main/config.h trunk/reactos/dll/opengl/mesa/src/mesa/main/context.c trunk/reactos/dll/opengl/mesa/src/mesa/main/dd.h trunk/reactos/dll/opengl/mesa/src/mesa/main/dispatch.h trunk/reactos/dll/opengl/mesa/src/mesa/main/dlist.c trunk/reactos/dll/opengl/mesa/src/mesa/main/drawpix.c trunk/reactos/dll/opengl/mesa/src/mesa/main/enable.c trunk/reactos/dll/opengl/mesa/src/mesa/main/eval.c trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c trunk/reactos/dll/opengl/mesa/src/mesa/main/format_pack.c trunk/reactos/dll/opengl/mesa/src/mesa/main/format_unpack.c trunk/reactos/dll/opengl/mesa/src/mesa/main/formats.c trunk/reactos/dll/opengl/mesa/src/mesa/main/formats.h trunk/reactos/dll/opengl/mesa/src/mesa/main/get.c trunk/reactos/dll/opengl/mesa/src/mesa/main/getstring.c trunk/reactos/dll/opengl/mesa/src/mesa/main/hint.c trunk/reactos/dll/opengl/mesa/src/mesa/main/image.c trunk/reactos/dll/opengl/mesa/src/mesa/main/image.h trunk/reactos/dll/opengl/mesa/src/mesa/main/matrix.c trunk/reactos/dll/opengl/mesa/src/mesa/main/mtypes.h trunk/reactos/dll/opengl/mesa/src/mesa/main/pack.c trunk/reactos/dll/opengl/mesa/src/mesa/main/pack.h trunk/reactos/dll/opengl/mesa/src/mesa/main/points.c trunk/reactos/dll/opengl/mesa/src/mesa/main/rastpos.c trunk/reactos/dll/opengl/mesa/src/mesa/main/shared.c trunk/reactos/dll/opengl/mesa/src/mesa/main/state.c trunk/reactos/dll/opengl/mesa/src/mesa/main/state.h trunk/reactos/dll/opengl/mesa/src/mesa/main/texenv.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texenv.h trunk/reactos/dll/opengl/mesa/src/mesa/main/texformat.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texgen.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texgetimage.c trunk/reactos/dll/opengl/mesa/src/mesa/main/teximage.c trunk/reactos/dll/opengl/mesa/src/mesa/main/teximage.h trunk/reactos/dll/opengl/mesa/src/mesa/main/texobj.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texparam.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texstate.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texstate.h trunk/reactos/dll/opengl/mesa/src/mesa/main/texstorage.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texstore.c trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.c trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.h trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c trunk/reactos/dll/opengl/mesa/src/mesa/main/version.h trunk/reactos/dll/opengl/mesa/src/mesa/main/vtxfmt.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_aaline.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_aalinetemp.h trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_aatriangle.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_context.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_context.h trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_drawpix.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_feedback.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_lines.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_points.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_span.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_span.h trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texcombine.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfetch.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfetch_tmp.h trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfilter.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texture.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_triangle.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_tritemp.h trunk/reactos/dll/opengl/mesa/src/mesa/swrast/swrast.h trunk/reactos/dll/opengl/mesa/src/mesa/swrast_setup/ss_context.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast_setup/ss_triangle.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast_setup/ss_tritmp.h trunk/reactos/dll/opengl/mesa/src/mesa/swrast_setup/swrast_setup.h trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_context.c trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_context.h trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_draw.c trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_pipeline.c trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_rasterpos.c trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_fog.c trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_light.c trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_normals.c trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_points.c trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_texgen.c trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_texmat.c trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_vertex.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo.h trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_attrib.h trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_attrib_tmp.h trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_context.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_context.h trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec.h trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_api.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_array.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_draw.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_eval.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_noop.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_rebase.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_save.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_save_api.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_save_draw.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_split_copy.c trunk/reactos/dll/opengl/mesa/src/mesa/x86/gen_matypes.c trunk/reactos/dll/opengl/opengl32/CMakeLists.txt [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/opengl/mesa/src/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/CMakeL… 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… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/driverfuncs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/d… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/meta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/d… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/meta.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/d… Modified: 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… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/api_arrayelt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/api_exec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/api_loopback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/api_validate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/arbprogram.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/arbprogram.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/attrib.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/dd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/dispatch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/dlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/drawpix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/enable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/eval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/format_pack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/format_unpack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/formats.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/formats.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/get.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/getstring.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/hint.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/image.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/image.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/matrix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/mtypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/nvprogram.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/nvprogram.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/pack.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/pack.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/points.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/rastpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/shader_query.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/shaderapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/shaderapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/shaderobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/shaderobj.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/shared.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/state.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/state.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texenv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texenv.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texgen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texgetimage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/teximage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/teximage.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texparam.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texstate.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texstate.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texstorage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texstore.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/uniform_query.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/uniforms.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/uniforms.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/varray.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/version.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/vtxfmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_aaline.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_aalinetemp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_aatriangle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_context.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_drawpix.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_feedback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_lines.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_points.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_span.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_span.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texcombine.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfetch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfetch_tmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texfilter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texture.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_triangle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_tritemp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/swrast.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast_setup/ss_context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast_setup/ss_triangle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast_setup/ss_tritmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast_setup/swrast_setup.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_context.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_pipeline.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_rasterpos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_fog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_light.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_normals.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_points.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_texgen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_texmat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/tnl/t_vb_vertex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/t… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_attrib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_attrib_tmp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_context.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_array.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_eval.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_noop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_rebase.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_save.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_save_api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_save_draw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_split_copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/x86/gen_matypes.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/x… Modified: trunk/reactos/dll/opengl/opengl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/opengl32/CMakeL…

11 years, 2 months

[akhaldi] 60575: [DMUSIC] * Sync with Wine 1.7.1. CORE-7469

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 7 12:41:25 2013 New Revision: 60575 URL: http://svn.reactos.org/svn/reactos?rev=60575&view=rev Log: [DMUSIC] * Sync with Wine 1.7.1. CORE-7469 Modified: trunk/reactos/dll/directx/wine/dmusic/CMakeLists.txt trunk/reactos/dll/directx/wine/dmusic/buffer.c trunk/reactos/dll/directx/wine/dmusic/dmusic_main.c trunk/reactos/dll/directx/wine/dmusic/port.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/directx/wine/dmusic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/CM… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/CMakeLists.txt [iso-8859-1] Mon Oct 7 12:41:25 2013 @@ -1,6 +1,3 @@ - -remove_definitions(-D_WIN32_WINNT=0x502) -add_definitions(-D_WIN32_WINNT=0x600) add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) @@ -15,13 +12,11 @@ download.c instrument.c port.c - version.rc ${CMAKE_CURRENT_BINARY_DIR}/dmusic.def) -add_library(dmusic SHARED ${SOURCE}) -set_module_type(dmusic win32dll UNICODE) +add_library(dmusic SHARED ${SOURCE} version.rc) +set_module_type(dmusic win32dll) target_link_libraries(dmusic dxguid uuid wine) add_importlibs(dmusic ole32 advapi32 winmm msvcrt kernel32 ntdll) -add_dependencies(dmusic psdk) add_pch(dmusic dmusic_private.h) add_cd_file(TARGET dmusic DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/directx/wine/dmusic/buffer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/bu… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/buffer.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/buffer.c [iso-8859-1] Mon Oct 7 12:41:25 2013 @@ -21,7 +21,7 @@ #include "dmusic_private.h" //#include "initguid.h" -#include "dmksctrl.h" +#include <dmksctrl.h> WINE_DEFAULT_DEBUG_CHANNEL(dmusic); Modified: trunk/reactos/dll/directx/wine/dmusic/dmusic_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/dm… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/dmusic_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/dmusic_main.c [iso-8859-1] Mon Oct 7 12:41:25 2013 @@ -120,9 +120,6 @@ if (fdwReason == DLL_PROCESS_ATTACH) { instance = hinstDLL; DisableThreadLibraryCalls(hinstDLL); - /* FIXME: Initialisation */ - } else if (fdwReason == DLL_PROCESS_DETACH) { - /* FIXME: Cleanup */ } return TRUE; Modified: trunk/reactos/dll/directx/wine/dmusic/port.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dmusic/po… ============================================================================== --- trunk/reactos/dll/directx/wine/dmusic/port.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/dmusic/port.c [iso-8859-1] Mon Oct 7 12:41:25 2013 @@ -108,7 +108,7 @@ return impl_from_IDirectMusicDownloadedInstrument(iface); } -HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(IDirectMusicDownloadedInstrument **instrument) +static HRESULT DMUSIC_CreateDirectMusicDownloadedInstrumentImpl(IDirectMusicDownloadedInstrument **instrument) { IDirectMusicDownloadedInstrumentImpl *object; @@ -263,7 +263,7 @@ nb_regions = instrument_object->header.cRegions; size = sizeof(DMUS_DOWNLOADINFO) + sizeof(ULONG) * (1 + nb_regions) + sizeof(DMUS_INSTRUMENT) + sizeof(DMUS_REGION) * nb_regions; - data = (BYTE*)HeapAlloc(GetProcessHeap(), 0, size); + data = HeapAlloc(GetProcessHeap(), 0, size); if (!data) return E_OUTOFMEMORY; Modified: trunk/reactos/media/doc/README.WINE URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=… ============================================================================== --- trunk/reactos/media/doc/README.WINE [iso-8859-1] (original) +++ trunk/reactos/media/doc/README.WINE [iso-8859-1] Mon Oct 7 12:41:25 2013 @@ -37,7 +37,7 @@ reactos/dll/directx/wine/devenum # Synced to Wine-1.7.1 reactos/dll/directx/wine/dinput # Synced to Wine-1.7.1 reactos/dll/directx/wine/dinput8 # Synced to Wine-1.5.26 -reactos/dll/directx/wine/dmusic # Synced to Wine-1.5.26 +reactos/dll/directx/wine/dmusic # Synced to Wine-1.7.1 reactos/dll/directx/wine/dplay # Synced to Wine-1.7.1 reactos/dll/directx/wine/dplayx # Synced to Wine-1.7.1 reactos/dll/directx/wine/dsound # Synced to Wine-1.7.1

11 years, 2 months

[akhaldi] 60574: [PSAPI_APITEST] * Speedup build.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 7 12:38:42 2013 New Revision: 60574 URL: http://svn.reactos.org/svn/reactos?rev=60574&view=rev Log: [PSAPI_APITEST] * Speedup build. Modified: trunk/rostests/apitests/psapi/CMakeLists.txt Modified: trunk/rostests/apitests/psapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/psapi/CMakeLists… ============================================================================== --- trunk/rostests/apitests/psapi/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/psapi/CMakeLists.txt [iso-8859-1] Mon Oct 7 12:38:42 2013 @@ -4,7 +4,6 @@ testlist.c) add_executable(psapi_apitest ${SOURCE}) -target_link_libraries(psapi_apitest wine) set_module_type(psapi_apitest win32cui) -add_importlibs(psapi_apitest psapi msvcrt kernel32 ntdll) +add_importlibs(psapi_apitest psapi msvcrt kernel32) add_cd_file(TARGET psapi_apitest DESTINATION reactos/bin FOR all)

11 years, 2 months

[akhaldi] 60573: [NTOSKRNL] * Fix several logically dead code blocks. CIDs 731580, 731581 and 731582. * Add a compile time assert to perform a preventive check as suggested by Thomas Faber. CORE-6681

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 7 12:33:03 2013 New Revision: 60573 URL: http://svn.reactos.org/svn/reactos?rev=60573&view=rev Log: [NTOSKRNL] * Fix several logically dead code blocks. CIDs 731580, 731581 and 731582. * Add a compile time assert to perform a preventive check as suggested by Thomas Faber. CORE-6681 Modified: trunk/reactos/ntoskrnl/mm/pagefile.c Modified: trunk/reactos/ntoskrnl/mm/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pagefile.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pagefile.c [iso-8859-1] Mon Oct 7 12:33:03 2013 @@ -115,6 +115,9 @@ #define OFFSET_FROM_ENTRY(i) ((i) >> 11) #define ENTRY_FROM_FILE_OFFSET(i, j) ((i) | ((j) << 11) | 0x400) +/* Make sure there can be only 16 paging files */ +C_ASSERT(FILE_FROM_ENTRY(0xffffffff) < MAX_PAGING_FILES); + static BOOLEAN MmSwapSpaceMessage = FALSE; /* FUNCTIONS *****************************************************************/ @@ -239,11 +242,6 @@ i = FILE_FROM_ENTRY(SwapEntry); offset = OFFSET_FROM_ENTRY(SwapEntry); - if (i >= MAX_PAGING_FILES) - { - DPRINT1("Bad swap entry 0x%.8X\n", SwapEntry); - KeBugCheck(MEMORY_MANAGEMENT); - } if (PagingFileList[i]->FileObject == NULL || PagingFileList[i]->FileObject->DeviceObject == NULL) { @@ -301,11 +299,6 @@ i = FILE_FROM_ENTRY(SwapEntry); offset = OFFSET_FROM_ENTRY(SwapEntry); - if (i >= MAX_PAGING_FILES) - { - DPRINT1("Bad swap entry 0x%.8X\n", SwapEntry); - KeBugCheck(MEMORY_MANAGEMENT); - } if (PagingFileList[i]->FileObject == NULL || PagingFileList[i]->FileObject->DeviceObject == NULL) { @@ -426,12 +419,6 @@ i = FILE_FROM_ENTRY(Entry); off = OFFSET_FROM_ENTRY(Entry); - - if (i >= MAX_PAGING_FILES) - { - DPRINT1("Bad swap entry 0x%.8X\n", Entry); - KeBugCheck(MEMORY_MANAGEMENT); - } KeAcquireSpinLock(&PagingFileListLock, &oldIrql); if (PagingFileList[i] == NULL)

11 years, 2 months

[akhaldi] 60572: [NTOSKRNL] * Fix several null pointer dereferences. CID 731608. CORE-6681

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Oct 7 12:08:33 2013 New Revision: 60572 URL: http://svn.reactos.org/svn/reactos?rev=60572&view=rev Log: [NTOSKRNL] * Fix several null pointer dereferences. CID 731608. CORE-6681 Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Mon Oct 7 12:08:33 2013 @@ -1064,8 +1064,11 @@ if ((GdiLink) && (NormalLink)) { /* It's not, it's importing stuff it shouldn't be! */ - MiDereferenceImports(LoadedImports); - if (LoadedImports) ExFreePoolWithTag(LoadedImports, TAG_LDR_IMPORTS); + if (LoadedImports) + { + MiDereferenceImports(LoadedImports); + ExFreePoolWithTag(LoadedImports, TAG_LDR_IMPORTS); + } return STATUS_PROCEDURE_NOT_FOUND; } @@ -1078,8 +1081,11 @@ !(_strnicmp(ImportName, "gdi32", sizeof("gdi32") - 1))) { /* This is not kernel code */ - MiDereferenceImports(LoadedImports); - if (LoadedImports) ExFreePoolWithTag(LoadedImports, TAG_LDR_IMPORTS); + if (LoadedImports) + { + MiDereferenceImports(LoadedImports); + ExFreePoolWithTag(LoadedImports, TAG_LDR_IMPORTS); + } return STATUS_PROCEDURE_NOT_FOUND; } @@ -1103,8 +1109,11 @@ if (!NT_SUCCESS(Status)) { /* Failed */ - MiDereferenceImports(LoadedImports); - if (LoadedImports) ExFreePoolWithTag(LoadedImports, TAG_LDR_IMPORTS); + if (LoadedImports) + { + MiDereferenceImports(LoadedImports); + ExFreePoolWithTag(LoadedImports, TAG_LDR_IMPORTS); + } return Status; } @@ -1226,8 +1235,11 @@ { /* Cleanup and return */ RtlFreeUnicodeString(&NameString); - MiDereferenceImports(LoadedImports); - if (LoadedImports) ExFreePoolWithTag(LoadedImports, TAG_LDR_IMPORTS); + if (LoadedImports) + { + MiDereferenceImports(LoadedImports); + ExFreePoolWithTag(LoadedImports, TAG_LDR_IMPORTS); + } return Status; } @@ -1259,8 +1271,11 @@ if (!ExportDirectory) { /* Cleanup and return */ - MiDereferenceImports(LoadedImports); - if (LoadedImports) ExFreePoolWithTag(LoadedImports, TAG_LDR_IMPORTS); + if (LoadedImports) + { + MiDereferenceImports(LoadedImports); + ExFreePoolWithTag(LoadedImports, TAG_LDR_IMPORTS); + } DPRINT1("Warning: Driver failed to load, %S not found\n", *MissingDriver); return STATUS_DRIVER_ENTRYPOINT_NOT_FOUND; } @@ -1289,8 +1304,11 @@ if (!NT_SUCCESS(Status)) { /* Cleanup and return */ - MiDereferenceImports(LoadedImports); - if (LoadedImports) ExFreePoolWithTag(LoadedImports, TAG_LDR_IMPORTS); + if (LoadedImports) + { + MiDereferenceImports(LoadedImports); + ExFreePoolWithTag(LoadedImports, TAG_LDR_IMPORTS); + } return Status; }

11 years, 2 months

← Newer
1
...
21
22
23
24
25
26
27
...
33
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 October 2013