Ros-diffs

ros-diffs@reactos.org

81390 discussions

[jgardou] 60149: [OSMESA] - Add to build
by jgardou＠svn.reactos.org 15 Sep '13

15 Sep '13

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

1 0

[tkreuzer] 60148: [EXPLORER] Fix x64 build
by tkreuzer＠svn.reactos.org 15 Sep '13

15 Sep '13

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

1 0

[aandrejevic] 60147: [SOFT386] Implement the direct relative near call (CALL rel16/32) instruction.
by aandrejevic＠svn.reactos.org 15 Sep '13

15 Sep '13

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

1 0

[aandrejevic] 60146: [SOFT386] Implement JMP rel16/32
by aandrejevic＠svn.reactos.org 15 Sep '13

15 Sep '13

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

1 0

[hbelusca] 60145: [ROSAPPS] Missing _SEH2_YIELD.
by hbelusca＠svn.reactos.org 15 Sep '13

15 Sep '13

Author: hbelusca Date: Sun Sep 15 18:17:25 2013 New Revision: 60145 URL: http://svn.reactos.org/svn/reactos?rev=60145&view=rev Log: [ROSAPPS] Missing _SEH2_YIELD. Modified: trunk/rosapps/applications/net/tditest/tditest/tditest.c Modified: trunk/rosapps/applications/net/tditest/tditest/tditest.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/applications/net/tditest/t… ============================================================================== --- trunk/rosapps/applications/net/tditest/tditest/tditest.c [iso-8859-1] (original) +++ trunk/rosapps/applications/net/tditest/tditest/tditest.c [iso-8859-1] Sun Sep 15 18:17:25 2013 @@ -555,7 +555,7 @@ IoFreeMdl(Mdl); IoFreeIrp(Irp); ExFreePool(ConnectInfo); - return STATUS_UNSUCCESSFUL; + _SEH2_YIELD(return STATUS_UNSUCCESSFUL); } _SEH2_END; TdiBuildSendDatagram( @@ -683,7 +683,7 @@ IoFreeIrp(Irp); ExFreePool(MdlBuffer); ExFreePool(ReceiveInfo); - return STATUS_INSUFFICIENT_RESOURCES; + _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); } _SEH2_END; TdiBuildReceiveDatagram(

1 0

[aandrejevic] 60144: [SOFT386] Implement LAHF, SAHF, LEA and PUSH imm16/32
by aandrejevic＠svn.reactos.org 15 Sep '13

15 Sep '13

Author: aandrejevic Date: Sun Sep 15 18:02:41 2013 New Revision: 60144 URL: http://svn.reactos.org/svn/reactos?rev=60144&view=rev Log: [SOFT386] Implement LAHF, SAHF, LEA and PUSH imm16/32 Modified: branches/ntvdm/lib/soft386/opcodes.c Modified: branches/ntvdm/lib/soft386/opcodes.c URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.c?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.c [iso-8859-1] Sun Sep 15 18:02:41 2013 @@ -3627,23 +3627,65 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodePushImm) { + BOOLEAN Size = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x68); + + if (State->PrefixFlags == SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + Size = !Size; + } + else + { + /* Invalid prefix */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + if (Size) + { + ULONG Data; + + if (!Soft386FetchDword(State, &Data)) + { + /* Exception occurred */ + return FALSE; + } + + /* Call the internal API */ + return Soft386StackPush(State, Data); + } + else + { + USHORT Data; + + if (!Soft386FetchWord(State, &Data)) + { + /* Exception occurred */ + return FALSE; + } + + /* Call the internal API */ + return Soft386StackPush(State, Data); + } +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeImulModrmImm) +{ // TODO: NOT IMPLEMENTED UNIMPLEMENTED; return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeImulModrmImm) -{ - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; -} - SOFT386_OPCODE_HANDLER(Soft386OpcodePushByteImm) { UCHAR Data; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x6A); if (!Soft386FetchByte(State, &Data)) { @@ -3811,10 +3853,57 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeLea) { - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; + SOFT386_MOD_REG_RM ModRegRm; + BOOLEAN OperandSize, AddressSize; + + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x8D); + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the address size */ + AddressSize = !AddressSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the operand size */ + OperandSize = !OperandSize; + } + + /* Get the operands */ + if (!Soft386ParseModRegRm(State, AddressSize, &ModRegRm)) + { + /* Exception occurred */ + return FALSE; + } + + /* The second operand must be memory */ + if (!ModRegRm.Memory) + { + /* Invalid */ + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Write the address to the register */ + if (OperandSize) + { + return Soft386WriteModrmDwordOperands(State, + &ModRegRm, + TRUE, + ModRegRm.MemoryAddress); + } + else + { + return Soft386WriteModrmWordOperands(State, + &ModRegRm, + TRUE, + ModRegRm.MemoryAddress); + + } } SOFT386_OPCODE_HANDLER(Soft386OpcodeMovLoadSeg) @@ -3936,13 +4025,40 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeSahf) { + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x9E); + + /* Set the low-order byte of FLAGS to AH */ + State->Flags.Long &= 0xFFFFFF00; + State->Flags.Long |= State->GeneralRegs[SOFT386_REG_EAX].HighByte; + + /* Restore the reserved bits of FLAGS */ + State->Flags.AlwaysSet = TRUE; + State->Flags.Reserved0 = State->Flags.Reserved1 = FALSE; + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeLahf) +{ + /* Make sure this is the right instruction */ + ASSERT(Opcode == 0x9F); + + /* Set AH to the low-order byte of FLAGS */ + State->GeneralRegs[SOFT386_REG_EAX].HighByte = LOBYTE(State->Flags.Long); + + return FALSE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeRetImm) +{ // TODO: NOT IMPLEMENTED UNIMPLEMENTED; return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeLahf) +SOFT386_OPCODE_HANDLER(Soft386OpcodeRet) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -3950,7 +4066,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeRetImm) +SOFT386_OPCODE_HANDLER(Soft386OpcodeLes) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -3958,7 +4074,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeRet) +SOFT386_OPCODE_HANDLER(Soft386OpcodeLds) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -3966,7 +4082,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeLes) +SOFT386_OPCODE_HANDLER(Soft386OpcodeEnter) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -3974,7 +4090,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeLds) +SOFT386_OPCODE_HANDLER(Soft386OpcodeLeave) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -3982,7 +4098,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeEnter) +SOFT386_OPCODE_HANDLER(Soft386OpcodeRetFarImm) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -3990,7 +4106,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeLeave) +SOFT386_OPCODE_HANDLER(Soft386OpcodeRetFar) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -3998,7 +4114,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeRetFarImm) +SOFT386_OPCODE_HANDLER(Soft386OpcodeInt3) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4006,7 +4122,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeRetFar) +SOFT386_OPCODE_HANDLER(Soft386OpcodeInt) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4014,7 +4130,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeInt3) +SOFT386_OPCODE_HANDLER(Soft386OpcodeIntOverflow) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4022,7 +4138,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeInt) +SOFT386_OPCODE_HANDLER(Soft386OpcodeIret) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4030,7 +4146,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeIntOverflow) +SOFT386_OPCODE_HANDLER(Soft386OpcodeAam) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4038,7 +4154,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeIret) +SOFT386_OPCODE_HANDLER(Soft386OpcodeAad) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4046,7 +4162,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeAam) +SOFT386_OPCODE_HANDLER(Soft386OpcodeXlat) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4054,7 +4170,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeAad) +SOFT386_OPCODE_HANDLER(Soft386OpcodeLoopnz) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4062,7 +4178,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeXlat) +SOFT386_OPCODE_HANDLER(Soft386OpcodeLoopz) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4070,7 +4186,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeLoopnz) +SOFT386_OPCODE_HANDLER(Soft386OpcodeLoop) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4078,7 +4194,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeLoopz) +SOFT386_OPCODE_HANDLER(Soft386OpcodeJecxz) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4086,7 +4202,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeLoop) +SOFT386_OPCODE_HANDLER(Soft386OpcodeCall) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4094,7 +4210,7 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeJecxz) +SOFT386_OPCODE_HANDLER(Soft386OpcodeJmp) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; @@ -4102,26 +4218,10 @@ return FALSE; } -SOFT386_OPCODE_HANDLER(Soft386OpcodeCall) +SOFT386_OPCODE_HANDLER(Soft386OpcodeJmpAbs) { // TODO: NOT IMPLEMENTED UNIMPLEMENTED; return FALSE; } - -SOFT386_OPCODE_HANDLER(Soft386OpcodeJmp) -{ - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; -} - -SOFT386_OPCODE_HANDLER(Soft386OpcodeJmpAbs) -{ - // TODO: NOT IMPLEMENTED - UNIMPLEMENTED; - - return FALSE; -}

1 0

[tkreuzer] 60143: [FRAMEDYN] Compile only for x86 [KERNEL32] Fix InterlockedExchangePointer usage [MSVCRT] Add some x64 c++ stubs
by tkreuzer＠svn.reactos.org 15 Sep '13

15 Sep '13

Author: tkreuzer Date: Sun Sep 15 17:50:38 2013 New Revision: 60143 URL: http://svn.reactos.org/svn/reactos?rev=60143&view=rev Log: [FRAMEDYN] Compile only for x86 [KERNEL32] Fix InterlockedExchangePointer usage [MSVCRT] Add some x64 c++ stubs Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/dll/win32/kernel32/client/except.c trunk/reactos/dll/win32/msvcrt/msvcrt.spec Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Sun Sep 15 17:50:38 2013 @@ -40,7 +40,9 @@ add_subdirectory(dwmapi) add_subdirectory(faultrep) add_subdirectory(fmifs) +if(ARCH STREQUAL "i386") add_subdirectory(framedyn) +endif() add_subdirectory(fusion) add_subdirectory(gdiplus) add_subdirectory(getuname) Modified: trunk/reactos/dll/win32/kernel32/client/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/except.c [iso-8859-1] Sun Sep 15 17:50:38 2013 @@ -436,7 +436,7 @@ PVOID EncodedPointer, EncodedOldPointer; EncodedPointer = RtlEncodePointer(lpTopLevelExceptionFilter); - EncodedOldPointer = InterlockedExchangePointer(&GlobalTopLevelExceptionFilter, + EncodedOldPointer = InterlockedExchangePointer((PVOID*)&GlobalTopLevelExceptionFilter, EncodedPointer); return RtlDecodePointer(EncodedOldPointer); } Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Sun Sep 15 17:50:38 2013 @@ -10,14 +10,20 @@ @ cdecl -i386 -norelay ??0bad_typeid@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT_bad_typeid_copy_ctor @ cdecl -i386 -norelay ??0bad_typeid@@QAE@PBD@Z(ptr) __thiscall_MSVCRT_bad_typeid_ctor @ cdecl -i386 -norelay ??0exception@@QAE@ABQBD@Z(ptr) __thiscall_MSVCRT_exception_ctor +@ cdecl -arch=x86_64 -stub -norelay ??0exception@@QEAA@AEBQEBD@Z(ptr) @ cdecl -i386 -norelay ??0exception@@QAE@ABQBDH@Z(ptr long) __thiscall_MSVCRT_exception_ctor_noalloc +@ cdecl -arch=x86_64 -stub -norelay ??0exception@@QEAA@AEBQEBDH@Z(ptr long) @ cdecl -i386 -norelay ??0exception@@QAE@ABV0@@Z(ptr) __thiscall_MSVCRT_exception_copy_ctor +@ cdecl -arch=x86_64 -stub -norelay ??0exception@@QEAA@AEBV0@@Z(ptr) @ cdecl -i386 -norelay ??0exception@@QAE@XZ() __thiscall_MSVCRT_exception_default_ctor +@ cdecl -arch=x86_64 -stub -norelay ??0exception@@QEAA@XZ() @ cdecl -i386 -norelay ??1__non_rtti_object@@UAE@XZ() __thiscall_MSVCRT___non_rtti_object_dtor @ cdecl -i386 -norelay ??1bad_cast@@UAE@XZ() __thiscall_MSVCRT_bad_cast_dtor @ cdecl -i386 -norelay ??1bad_typeid@@UAE@XZ() __thiscall_MSVCRT_bad_typeid_dtor @ cdecl -i386 -norelay ??1exception@@UAE@XZ() __thiscall_MSVCRT_exception_dtor +@ cdecl -arch=x86_64 -stub -norelay ??1exception@@UEAA@XZ() __thiscall_MSVCRT_exception_dtor @ cdecl -i386 -norelay ??1type_info@@UAE@XZ() __thiscall_MSVCRT_type_info_dtor +@ cdecl -arch=x86_64 -stub ??1type_info@@UEAA@XZ() __thiscall_MSVCRT_type_info_dtor @ cdecl -arch=win32 ??2@YAPAXI@Z(long) MSVCRT_operator_new @ cdecl -arch=win64 ??2@YAPEAX_K@Z(double) MSVCRT_operator_new # @ cdecl ??2@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg @@ -62,6 +68,7 @@ @ cdecl ?terminate@@YAXXZ() MSVCRT_terminate @ cdecl ?unexpected@@YAXXZ() MSVCRT_unexpected @ cdecl -i386 -norelay ?what@exception@@UBEPBDXZ() __thiscall_MSVCRT_what_exception +@ cdecl -arch=x86_64 -stub -norelay ?what@exception@@UEBAPEBDXZ() __thiscall_MSVCRT_what_exception @ cdecl -arch=i386 _CIacos() @ cdecl -arch=i386 _CIasin() @ cdecl -arch=i386 _CIatan() @@ -117,9 +124,9 @@ # stub __CxxCallUnwindVecDtor @ cdecl __CxxDetectRethrow(ptr) # stub __CxxExceptionFilter -@ cdecl -i386 -norelay __CxxFrameHandler(ptr ptr ptr ptr) -@ cdecl -i386 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler -@ cdecl -i386 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler +@ cdecl -arch=i386,x86_64 -norelay __CxxFrameHandler(ptr ptr ptr ptr) +@ cdecl -arch=i386,x86_64 -norelay __CxxFrameHandler2(ptr ptr ptr ptr) __CxxFrameHandler +@ cdecl -arch=i386,x86_64 -norelay __CxxFrameHandler3(ptr ptr ptr ptr) __CxxFrameHandler @ stdcall -arch=x86_64 __C_specific_handler(ptr long ptr ptr) @ stdcall -i386 __CxxLongjmpUnwind(ptr) @ cdecl __CxxQueryExceptionSize()

1 0

[tkreuzer] 60142: [DSOUND] Extend the lrint MSVC hack to support x64 as well See http://sourceforge.net/p/freeimage/discussion/36111/thread/b43c17c5
by tkreuzer＠svn.reactos.org 15 Sep '13

15 Sep '13

Author: tkreuzer Date: Sun Sep 15 17:31:25 2013 New Revision: 60142 URL: http://svn.reactos.org/svn/reactos?rev=60142&view=rev Log: [DSOUND] Extend the lrint MSVC hack to support x64 as well See http://sourceforge.net/p/freeimage/discussion/36111/thread/b43c17c5 Modified: trunk/reactos/dll/directx/dsound/dsound_convert.c Modified: trunk/reactos/dll/directx/dsound/dsound_convert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dsound/dsound_… ============================================================================== --- trunk/reactos/dll/directx/dsound/dsound_convert.c [iso-8859-1] (original) +++ trunk/reactos/dll/directx/dsound/dsound_convert.c [iso-8859-1] Sun Sep 15 17:31:25 2013 @@ -64,17 +64,26 @@ #endif /* This is an inlined version of lrintf. */ -#if defined(_M_IX86) && defined(_MSC_VER) +#if defined(_MSC_VER) +#if defined(_M_AMD64) +#include <xmmintrin.h> +#endif + FORCEINLINE int lrintf(float f) { +#if defined(_M_IX86) int result; __asm { fld f; fistp result; } + return result; +#elif defined(_M_AMD64) + return _mm_cvtss_si32(_mm_load_ss(&f)); +#endif } #endif

1 0

[akhaldi] 60141: [CRYPTNET] * Sync with Wine 1.7.1.
by akhaldi＠svn.reactos.org 15 Sep '13

15 Sep '13

Author: akhaldi Date: Sun Sep 15 17:20:13 2013 New Revision: 60141 URL: http://svn.reactos.org/svn/reactos?rev=60141&view=rev Log: [CRYPTNET] * Sync with Wine 1.7.1. Modified: trunk/reactos/dll/win32/cryptnet/CMakeLists.txt trunk/reactos/dll/win32/cryptnet/cryptnet_main.c trunk/reactos/media/doc/README.WINE Modified: trunk/reactos/dll/win32/cryptnet/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/cryptnet/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptnet/CMakeLists.txt [iso-8859-1] Sun Sep 15 17:20:13 2013 @@ -14,5 +14,4 @@ target_link_libraries(cryptnet wine) add_delay_importlibs(cryptnet wininet) add_importlibs(cryptnet crypt32 msvcrt kernel32 ntdll) - add_cd_file(TARGET cryptnet DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/cryptnet/cryptnet_main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/cryptnet/cryptne… ============================================================================== --- trunk/reactos/dll/win32/cryptnet/cryptnet_main.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/cryptnet/cryptnet_main.c [iso-8859-1] Sun Sep 15 17:20:13 2013 @@ -959,18 +959,12 @@ if (ret && !(dwRetrievalFlags & CRYPT_DONT_CACHE_RESULT)) { SYSTEMTIME st; + FILETIME ft; DWORD len = sizeof(st); - if (HttpQueryInfoW(hHttp, - HTTP_QUERY_EXPIRES | HTTP_QUERY_FLAG_SYSTEMTIME, &st, - &len, NULL)) - { - FILETIME ft; - - SystemTimeToFileTime(&st, &ft); - CRYPT_CacheURL(pszURL, pObject, dwRetrievalFlags, - ft); - } + if (HttpQueryInfoW(hHttp, HTTP_QUERY_EXPIRES | HTTP_QUERY_FLAG_SYSTEMTIME, + &st, &len, NULL) && SystemTimeToFileTime(&st, &ft)) + CRYPT_CacheURL(pszURL, pObject, dwRetrievalFlags, ft); } InternetCloseHandle(hHttp); } 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] Sun Sep 15 17:20:13 2013 @@ -66,7 +66,7 @@ reactos/dll/win32/crypt32 # Synced to Wine-1.7.1 reactos/dll/win32/cryptdlg # Synced to Wine-1.7.1 reactos/dll/win32/cryptdll # Synced to Wine-1.7.1 -reactos/dll/win32/cryptnet # Synced to Wine-1.5.26 +reactos/dll/win32/cryptnet # Synced to Wine-1.7.1 reactos/dll/win32/cryptui # Synced to Wine-1.5.26 reactos/dll/win32/dbghelp # Synced to Wine-1.5.26 reactos/dll/win32/dciman32 # Synced to Wine-1.5.19

1 0

[tkreuzer] 60140: [CPPRT] Add support for x64
by tkreuzer＠svn.reactos.org 15 Sep '13

15 Sep '13

Author: tkreuzer Date: Sun Sep 15 17:09:21 2013 New Revision: 60140 URL: http://svn.reactos.org/svn/reactos?rev=60140&view=rev Log: [CPPRT] Add support for x64 Added: trunk/reactos/lib/sdk/cpprt/amd64/ (with props) trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s (with props) Modified: trunk/reactos/lib/sdk/cpprt/CMakeLists.txt Modified: trunk/reactos/lib/sdk/cpprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/CMakeLists.t… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/cpprt/CMakeLists.txt [iso-8859-1] Sun Sep 15 17:09:21 2013 @@ -5,5 +5,9 @@ ehvec.cpp typeinfo.cpp) -add_asm_files(cpprt_asm i386/cpprt.s) +if(ARCH STREQUAL "i386") + add_asm_files(cpprt_asm i386/cpprt.s) +elseif(ARCH STREQUAL "amd64") + add_asm_files(cpprt_asm amd64/cpprt.s) +endif() add_library(cpprt ${SOURCE} ${cpprt_asm}) Propchange: trunk/reactos/lib/sdk/cpprt/amd64/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sun Sep 15 17:09:21 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/lib/sdk/cpprt/amd64/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/lib/sdk/cpprt/amd64/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/lib/sdk/cpprt/amd64/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/cpprt/amd64/cpprt.… ============================================================================== --- trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s (added) +++ trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s [iso-8859-1] Sun Sep 15 17:09:21 2013 @@ -0,0 +1,16 @@ +#include <asm.inc> + +.code + +MACRO(DEFINE_ALIAS, alias, orig, type) +EXTERN &orig:&type +ALIAS <&alias> = <&orig> +ENDM + +; void __cdecl `eh vector constructor iterator'(void *,unsigned __int64,int,void (__cdecl*)(void *),void (__cdecl*)(void *)) +DEFINE_ALIAS ??_L@YAXPEAX_KHP6AX0@Z2@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YAXPEAX_KHP6AX0@Z2@Z + +; void __cdecl `eh vector destructor iterator'(void *,unsigned __int64,int,void (__cdecl*)(void *)) +DEFINE_ALIAS ??_M@YAXPEAX_KHP6AX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YAXPEAX_KHP6AX0@Z@Z + +END Propchange: trunk/reactos/lib/sdk/cpprt/amd64/cpprt.s ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs