Ros-diffs October 2013

ros-diffs@reactos.org

14 participants
325 discussions

[akhaldi] 60521: [LIBWINE] * Use atl100.dll directly to create a registrar instance. CORE-7469
by akhaldi＠svn.reactos.org 04 Oct '13

04 Oct '13

Author: akhaldi Date: Fri Oct 4 11:02:39 2013 New Revision: 60521 URL: http://svn.reactos.org/svn/reactos?rev=60521&view=rev Log: [LIBWINE] * Use atl100.dll directly to create a registrar instance. CORE-7469 Modified: trunk/reactos/lib/3rdparty/libwine/register.c Modified: trunk/reactos/lib/3rdparty/libwine/register.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/libwine/regis… ============================================================================== --- trunk/reactos/lib/3rdparty/libwine/register.c [iso-8859-1] (original) +++ trunk/reactos/lib/3rdparty/libwine/register.c [iso-8859-1] Fri Oct 4 11:02:39 2013 @@ -30,7 +30,7 @@ #include "rpcproxy.h" #include "atliface.h" -static const WCHAR ole32W[] = {'o','l','e','3','2','.','d','l','l',0}; +static const WCHAR atl100W[] = {'a','t','l','1','0','0','.','d','l','l',0}; static const WCHAR regtypeW[] = {'W','I','N','E','_','R','E','G','I','S','T','R','Y',0}; static const WCHAR moduleW[] = {'M','O','D','U','L','E',0}; @@ -38,32 +38,25 @@ { IRegistrar *registrar; BOOL do_register; - BOOL uninit; HRESULT result; }; -static HMODULE ole32; -static HRESULT (WINAPI *pCoInitialize)(LPVOID); -static void (WINAPI *pCoUninitialize)(void); -static HRESULT (WINAPI *pCoCreateInstance)(REFCLSID,LPUNKNOWN,DWORD,REFIID,LPVOID*); +static HMODULE atl100; +static HRESULT (WINAPI *pAtlCreateRegistrar)(IRegistrar**); static IRegistrar *create_registrar( HMODULE inst, struct reg_info *info ) { - if (!pCoCreateInstance) + if (!pAtlCreateRegistrar) { - if (!(ole32 = LoadLibraryW( ole32W )) || - !(pCoInitialize = (void *)GetProcAddress( ole32, "CoInitialize" )) || - !(pCoUninitialize = (void *)GetProcAddress( ole32, "CoUninitialize" )) || - !(pCoCreateInstance = (void *)GetProcAddress( ole32, "CoCreateInstance" ))) + if (!(atl100 = LoadLibraryW( atl100W )) || + !(pAtlCreateRegistrar = (void *)GetProcAddress( atl100, "AtlCreateRegistrar" ))) { info->result = E_NOINTERFACE; return NULL; } } - info->uninit = SUCCEEDED( pCoInitialize( NULL )); - info->result = pCoCreateInstance( &CLSID_Registrar, NULL, CLSCTX_INPROC_SERVER, - &IID_IRegistrar, (void **)&info->registrar ); + info->result = pAtlCreateRegistrar( &info->registrar ); if (SUCCEEDED( info->result )) { WCHAR str[MAX_PATH]; @@ -108,11 +101,9 @@ info.registrar = NULL; info.do_register = TRUE; - info.uninit = FALSE; info.result = S_OK; EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&info ); if (info.registrar) IRegistrar_Release( info.registrar ); - if (info.uninit) pCoUninitialize(); return info.result; } @@ -122,10 +113,8 @@ info.registrar = NULL; info.do_register = FALSE; - info.uninit = FALSE; info.result = S_OK; EnumResourceNamesW( module, regtypeW, register_resource, (LONG_PTR)&info ); if (info.registrar) IRegistrar_Release( info.registrar ); - if (info.uninit) pCoUninitialize(); return info.result; }

1 0

[jgardou] 60520: [MESA] - fix build CORE-7499
by jgardou＠svn.reactos.org 04 Oct '13

04 Oct '13

Author: jgardou Date: Fri Oct 4 10:51:37 2013 New Revision: 60520 URL: http://svn.reactos.org/svn/reactos?rev=60520&view=rev Log: [MESA] - fix build CORE-7499 Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/debug.c trunk/reactos/dll/opengl/mesa/src/mesa/main/debug.h Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/context.c trunk/reactos/dll/opengl/mesa/src/mesa/main/state.c 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… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/context.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/context.c [iso-8859-1] Fri Oct 4 10:51:37 2013 @@ -88,7 +88,6 @@ #include "bufferobj.h" #include "context.h" #include "cpuinfo.h" -#include "debug.h" #include "depth.h" #include "dlist.h" #include "eval.h" @@ -654,7 +653,6 @@ _mesa_init_color( ctx ); _mesa_init_current( ctx ); _mesa_init_depth( ctx ); - _mesa_init_debug( ctx ); _mesa_init_display_list( ctx ); _mesa_init_eval( ctx ); _mesa_init_feedback( ctx ); @@ -1323,15 +1321,6 @@ check_context_limits(newCtx); - /* We can use this to help debug user's problems. Tell them to set - * the MESA_INFO env variable before running their app. Then the - * first time each context is made current we'll print some useful - * information. - */ - if (_mesa_getenv("MESA_INFO")) { - _mesa_print_info(); - } - newCtx->FirstTimeCurrent = GL_FALSE; } } Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/debug.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/debug.c (removed) @@ -1,617 +0,0 @@ -/* - * Mesa 3-D graphics library - * Version: 6.5 - * - * Copyright (C) 1999-2005 Brian Paul All Rights Reserved. - * Copyright (C) 2009 VMware, Inc. All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -#include "mtypes.h" -#include "attrib.h" -#include "colormac.h" -#include "enums.h" -#include "formats.h" -#include "hash.h" -#include "imports.h" -#include "debug.h" -#include "get.h" -#include "pixelstore.h" -#include "readpix.h" -#include "texobj.h" - - -static const char * -tex_target_name(GLenum tgt) -{ - static const struct { - GLenum target; - const char *name; - } tex_targets[] = { - { GL_TEXTURE_1D, "GL_TEXTURE_1D" }, - { GL_TEXTURE_2D, "GL_TEXTURE_2D" }, - { GL_TEXTURE_3D, "GL_TEXTURE_3D" }, - { GL_TEXTURE_CUBE_MAP, "GL_TEXTURE_CUBE_MAP" } - }; - GLuint i; - for (i = 0; i < Elements(tex_targets); i++) { - if (tex_targets[i].target == tgt) - return tex_targets[i].name; - } - return "UNKNOWN TEX TARGET"; -} - - -void -_mesa_print_state( const char *msg, GLuint state ) -{ - _mesa_debug(NULL, - "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s%s\n", - msg, - state, - (state & _NEW_MODELVIEW) ? "ctx->ModelView, " : "", - (state & _NEW_PROJECTION) ? "ctx->Projection, " : "", - (state & _NEW_TEXTURE_MATRIX) ? "ctx->TextureMatrix, " : "", - (state & _NEW_COLOR) ? "ctx->Color, " : "", - (state & _NEW_DEPTH) ? "ctx->Depth, " : "", - (state & _NEW_EVAL) ? "ctx->Eval/EvalMap, " : "", - (state & _NEW_FOG) ? "ctx->Fog, " : "", - (state & _NEW_HINT) ? "ctx->Hint, " : "", - (state & _NEW_LIGHT) ? "ctx->Light, " : "", - (state & _NEW_LINE) ? "ctx->Line, " : "", - (state & _NEW_PIXEL) ? "ctx->Pixel, " : "", - (state & _NEW_POINT) ? "ctx->Point, " : "", - (state & _NEW_POLYGON) ? "ctx->Polygon, " : "", - (state & _NEW_POLYGONSTIPPLE) ? "ctx->PolygonStipple, " : "", - (state & _NEW_SCISSOR) ? "ctx->Scissor, " : "", - (state & _NEW_STENCIL) ? "ctx->Stencil, " : "", - (state & _NEW_TEXTURE) ? "ctx->Texture, " : "", - (state & _NEW_TRANSFORM) ? "ctx->Transform, " : "", - (state & _NEW_VIEWPORT) ? "ctx->Viewport, " : "", - (state & _NEW_PACKUNPACK) ? "ctx->Pack/Unpack, " : "", - (state & _NEW_ARRAY) ? "ctx->Array, " : "", - (state & _NEW_RENDERMODE) ? "ctx->RenderMode, " : "", - (state & _NEW_BUFFERS) ? "ctx->Visual, ctx->DrawBuffer,, " : ""); -} - - - -void -_mesa_print_tri_caps( const char *name, GLuint flags ) -{ - _mesa_debug(NULL, - "%s: (0x%x) %s%s%s%s%s%s%s%s%s%s%s%s%s\n", - name, - flags, - (flags & DD_FLATSHADE) ? "flat-shade, " : "", - (flags & DD_SEPARATE_SPECULAR) ? "separate-specular, " : "", - (flags & DD_TRI_LIGHT_TWOSIDE) ? "tri-light-twoside, " : "", - (flags & DD_TRI_TWOSTENCIL) ? "tri-twostencil, " : "", - (flags & DD_TRI_UNFILLED) ? "tri-unfilled, " : "", - (flags & DD_TRI_STIPPLE) ? "tri-stipple, " : "", - (flags & DD_TRI_OFFSET) ? "tri-offset, " : "", - (flags & DD_TRI_SMOOTH) ? "tri-smooth, " : "", - (flags & DD_LINE_SMOOTH) ? "line-smooth, " : "", - (flags & DD_LINE_STIPPLE) ? "line-stipple, " : "", - (flags & DD_POINT_SMOOTH) ? "point-smooth, " : "", - (flags & DD_POINT_ATTEN) ? "point-atten, " : "", - (flags & DD_TRI_CULL_FRONT_BACK) ? "cull-all, " : "" - ); -} - - -/** - * Print information about this Mesa version and build options. - */ -void _mesa_print_info( void ) -{ - _mesa_debug(NULL, "Mesa GL_VERSION = %s\n", - (char *) _mesa_GetString(GL_VERSION)); - _mesa_debug(NULL, "Mesa GL_RENDERER = %s\n", - (char *) _mesa_GetString(GL_RENDERER)); - _mesa_debug(NULL, "Mesa GL_VENDOR = %s\n", - (char *) _mesa_GetString(GL_VENDOR)); - _mesa_debug(NULL, "Mesa GL_EXTENSIONS = %s\n", - (char *) _mesa_GetString(GL_EXTENSIONS)); -#if defined(THREADS) - _mesa_debug(NULL, "Mesa thread-safe: YES\n"); -#else - _mesa_debug(NULL, "Mesa thread-safe: NO\n"); -#endif -#if defined(USE_X86_ASM) - _mesa_debug(NULL, "Mesa x86-optimized: YES\n"); -#else - _mesa_debug(NULL, "Mesa x86-optimized: NO\n"); -#endif -#if defined(USE_SPARC_ASM) - _mesa_debug(NULL, "Mesa sparc-optimized: YES\n"); -#else - _mesa_debug(NULL, "Mesa sparc-optimized: NO\n"); -#endif -} - - -/** - * Set the debugging flags. - * - * \param debug debug string - * - * If compiled with debugging support then search for keywords in \p debug and - * enables the verbose debug output of the respective feature. - */ -static void add_debug_flags( const char *debug ) -{ -#ifdef DEBUG - struct debug_option { - const char *name; - GLbitfield flag; - }; - static const struct debug_option debug_opt[] = { - { "varray", VERBOSE_VARRAY }, - { "tex", VERBOSE_TEXTURE }, - { "mat", VERBOSE_MATERIAL }, - { "pipe", VERBOSE_PIPELINE }, - { "driver", VERBOSE_DRIVER }, - { "state", VERBOSE_STATE }, - { "api", VERBOSE_API }, - { "list", VERBOSE_DISPLAY_LIST }, - { "lighting", VERBOSE_LIGHTING }, - { "disassem", VERBOSE_DISASSEM }, - { "draw", VERBOSE_DRAW }, - { "swap", VERBOSE_SWAPBUFFERS } - }; - GLuint i; - - MESA_VERBOSE = 0x0; - for (i = 0; i < Elements(debug_opt); i++) { - if (strstr(debug, debug_opt[i].name) || strcmp(debug, "all") == 0) - MESA_VERBOSE |= debug_opt[i].flag; - } - - /* Debug flag: - */ - if (strstr(debug, "flush")) - MESA_DEBUG_FLAGS |= DEBUG_ALWAYS_FLUSH; - -#else - (void) debug; -#endif -} - - -void -_mesa_init_debug( struct gl_context *ctx ) -{ - char *c; - c = _mesa_getenv("MESA_DEBUG"); - if (c) - add_debug_flags(c); - - c = _mesa_getenv("MESA_VERBOSE"); - if (c) - add_debug_flags(c); -} - - -/* - * Write ppm file - */ -static void -write_ppm(const char *filename, const GLubyte *buffer, int width, int height, - int comps, int rcomp, int gcomp, int bcomp, GLboolean invert) -{ - FILE *f = fopen( filename, "w" ); - if (f) { - int x, y; - const GLubyte *ptr = buffer; - fprintf(f,"P6\n"); - fprintf(f,"# ppm-file created by osdemo.c\n"); - fprintf(f,"%i %i\n", width,height); - fprintf(f,"255\n"); - fclose(f); - f = fopen( filename, "ab" ); /* reopen in binary append mode */ - for (y=0; y < height; y++) { - for (x = 0; x < width; x++) { - int yy = invert ? (height - 1 - y) : y; - int i = (yy * width + x) * comps; - fputc(ptr[i+rcomp], f); /* write red */ - fputc(ptr[i+gcomp], f); /* write green */ - fputc(ptr[i+bcomp], f); /* write blue */ - } - } - fclose(f); - } - else { - fprintf(stderr, "Unable to create %s in write_ppm()\n", filename); - } -} - - -/** - * Write a texture image to a ppm file. - * \param face cube face in [0,5] - * \param level mipmap level - */ -static void -write_texture_image(struct gl_texture_object *texObj, - GLuint face, GLuint level) -{ - struct gl_texture_image *img = texObj->Image[face][level]; - if (img) { - GET_CURRENT_CONTEXT(ctx); - struct gl_pixelstore_attrib store; - GLubyte *buffer; - char s[100]; - - buffer = (GLubyte *) malloc(img->Width * img->Height - * img->Depth * 4); - - store = ctx->Pack; /* save */ - ctx->Pack = ctx->DefaultPacking; - - ctx->Driver.GetTexImage(ctx, GL_RGBA, GL_UNSIGNED_BYTE, buffer, img); - - /* make filename */ - _mesa_snprintf(s, sizeof(s), "/tmp/tex%u.l%u.f%u.ppm", texObj->Name, level, face); - - printf(" Writing image level %u to %s\n", level, s); - write_ppm(s, buffer, img->Width, img->Height, 4, 0, 1, 2, GL_FALSE); - - ctx->Pack = store; /* restore */ - - free(buffer); - } -} - - -/** - * Write renderbuffer image to a ppm file. - */ -void -_mesa_write_renderbuffer_image(const struct gl_renderbuffer *rb) -{ - GET_CURRENT_CONTEXT(ctx); - GLubyte *buffer; - char s[100]; - GLenum format, type; - - if (rb->_BaseFormat == GL_RGB || - rb->_BaseFormat == GL_RGBA) { - format = GL_RGBA; - type = GL_UNSIGNED_BYTE; - } - else { - _mesa_debug(NULL, - "Unsupported BaseFormat 0x%x in " - "_mesa_write_renderbuffer_image()\n", - rb->_BaseFormat); - return; - } - - buffer = (GLubyte *) malloc(rb->Width * rb->Height * 4); - - ctx->Driver.ReadPixels(ctx, 0, 0, rb->Width, rb->Height, - format, type, &ctx->DefaultPacking, buffer); - - /* make filename */ - _mesa_snprintf(s, sizeof(s), "/tmp/renderbuffer.ppm"); - _mesa_snprintf(s, sizeof(s), "C:\\renderbuffer.ppm"); - - printf(" Writing renderbuffer image to %s\n", s); - - _mesa_debug(NULL, " Writing renderbuffer image to %s\n", s); - - write_ppm(s, buffer, rb->Width, rb->Height, 4, 0, 1, 2, GL_TRUE); - - free(buffer); -} - - -/** How many texture images (mipmap levels, faces) to write to files */ -#define WRITE_NONE 0 -#define WRITE_ONE 1 -#define WRITE_ALL 2 - -static GLuint WriteImages; - - -static void -dump_texture(struct gl_texture_object *texObj, GLuint writeImages) -{ - const GLuint numFaces = texObj->Target == GL_TEXTURE_CUBE_MAP ? 6 : 1; - GLboolean written = GL_FALSE; - GLuint i, j; - - printf("Texture %u\n", texObj->Name); - printf(" Target %s\n", tex_target_name(texObj->Target)); - for (i = 0; i < MAX_TEXTURE_LEVELS; i++) { - for (j = 0; j < numFaces; j++) { - struct gl_texture_image *texImg = texObj->Image[j][i]; - if (texImg) { - printf(" Face %u level %u: %d x %d x %d, format %s\n", - j, i, - texImg->Width, texImg->Height, texImg->Depth, - _mesa_get_format_name(texImg->TexFormat)); - if (writeImages == WRITE_ALL || - (writeImages == WRITE_ONE && !written)) { - write_texture_image(texObj, j, i); - written = GL_TRUE; - } - } - } - } -} - - -/** - * Dump a single texture. - */ -void -_mesa_dump_texture(GLuint texture, GLuint writeImages) -{ - GET_CURRENT_CONTEXT(ctx); - struct gl_texture_object *texObj = _mesa_lookup_texture(ctx, texture); - if (texObj) { - dump_texture(texObj, writeImages); - } -} - - -static void -dump_texture_cb(GLuint id, void *data, void *userData) -{ - struct gl_texture_object *texObj = (struct gl_texture_object *) data; - (void) userData; - dump_texture(texObj, WriteImages); -} - - -/** - * Print basic info about all texture objext to stdout. - * If dumpImages is true, write PPM of level[0] image to a file. - */ -void -_mesa_dump_textures(GLuint writeImages) -{ - GET_CURRENT_CONTEXT(ctx); - WriteImages = writeImages; - _mesa_HashWalk(ctx->Shared->TexObjects, dump_texture_cb, ctx); -} - - -static void -dump_renderbuffer(const struct gl_renderbuffer *rb, GLboolean writeImage) -{ - printf("Renderbuffer: %u x %u IntFormat = %s\n", - rb->Width, rb->Height, - _mesa_lookup_enum_by_nr(rb->InternalFormat)); - if (writeImage) { - _mesa_write_renderbuffer_image(rb); - } -} - - -static void -dump_renderbuffer_cb(GLuint id, void *data, void *userData) -{ - const struct gl_renderbuffer *rb = (const struct gl_renderbuffer *) data; - (void) userData; - dump_renderbuffer(rb, WriteImages); -} - - -/** - * Print basic info about all renderbuffers to stdout. - * If dumpImages is true, write PPM of level[0] image to a file. - */ -void -_mesa_dump_renderbuffers(GLboolean writeImages) -{ - GET_CURRENT_CONTEXT(ctx); - WriteImages = writeImages; - _mesa_HashWalk(ctx->Shared->RenderBuffers, dump_renderbuffer_cb, ctx); -} - - - -void -_mesa_dump_color_buffer(const char *filename) -{ - GET_CURRENT_CONTEXT(ctx); - const GLuint w = ctx->DrawBuffer->Width; - const GLuint h = ctx->DrawBuffer->Height; - GLubyte *buf; - - buf = (GLubyte *) malloc(w * h * 4); - - _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT); - _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1); - _mesa_PixelStorei(GL_PACK_INVERT_MESA, GL_TRUE); - - _mesa_ReadPixels(0, 0, w, h, GL_RGBA, GL_UNSIGNED_BYTE, buf); - - printf("ReadBuffer %p 0x%x DrawBuffer %p 0x%x\n", - (void *) ctx->ReadBuffer->_ColorReadBuffer, - ctx->ReadBuffer->ColorReadBuffer, - (void *) ctx->DrawBuffer->_ColorDrawBuffer, - ctx->DrawBuffer->ColorDrawBuffer); - printf("Writing %d x %d color buffer to %s\n", w, h, filename); - write_ppm(filename, buf, w, h, 4, 0, 1, 2, GL_TRUE); - - _mesa_PopClientAttrib(); - - free(buf); -} - - -void -_mesa_dump_depth_buffer(const char *filename) -{ - GET_CURRENT_CONTEXT(ctx); - const GLuint w = ctx->DrawBuffer->Width; - const GLuint h = ctx->DrawBuffer->Height; - GLuint *buf; - GLubyte *buf2; - GLuint i; - - buf = (GLuint *) malloc(w * h * 4); /* 4 bpp */ - buf2 = (GLubyte *) malloc(w * h * 3); /* 3 bpp */ - - _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT); - _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1); - _mesa_PixelStorei(GL_PACK_INVERT_MESA, GL_TRUE); - - _mesa_ReadPixels(0, 0, w, h, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, buf); - - /* spread 24 bits of Z across R, G, B */ - for (i = 0; i < w * h; i++) { - buf2[i*3+0] = (buf[i] >> 24) & 0xff; - buf2[i*3+1] = (buf[i] >> 16) & 0xff; - buf2[i*3+2] = (buf[i] >> 8) & 0xff; - } - - printf("Writing %d x %d depth buffer to %s\n", w, h, filename); - write_ppm(filename, buf2, w, h, 3, 0, 1, 2, GL_TRUE); - - _mesa_PopClientAttrib(); - - free(buf); - free(buf2); -} - - -void -_mesa_dump_stencil_buffer(const char *filename) -{ - GET_CURRENT_CONTEXT(ctx); - const GLuint w = ctx->DrawBuffer->Width; - const GLuint h = ctx->DrawBuffer->Height; - GLubyte *buf; - GLubyte *buf2; - GLuint i; - - buf = (GLubyte *) malloc(w * h); /* 1 bpp */ - buf2 = (GLubyte *) malloc(w * h * 3); /* 3 bpp */ - - _mesa_PushClientAttrib(GL_CLIENT_PIXEL_STORE_BIT); - _mesa_PixelStorei(GL_PACK_ALIGNMENT, 1); - _mesa_PixelStorei(GL_PACK_INVERT_MESA, GL_TRUE); - - _mesa_ReadPixels(0, 0, w, h, GL_STENCIL_INDEX, GL_UNSIGNED_BYTE, buf); - - for (i = 0; i < w * h; i++) { - buf2[i*3+0] = buf[i]; - buf2[i*3+1] = (buf[i] & 127) * 2; - buf2[i*3+2] = (buf[i] - 128) * 2; - } - - printf("Writing %d x %d stencil buffer to %s\n", w, h, filename); - write_ppm(filename, buf2, w, h, 3, 0, 1, 2, GL_TRUE); - - _mesa_PopClientAttrib(); - - free(buf); - free(buf2); -} - - -void -_mesa_dump_image(const char *filename, const void *image, GLuint w, GLuint h, - GLenum format, GLenum type) -{ - GLboolean invert = GL_TRUE; - - if (format == GL_RGBA && type == GL_UNSIGNED_BYTE) { - write_ppm(filename, image, w, h, 4, 0, 1, 2, invert); - } - else if (format == GL_BGRA && type == GL_UNSIGNED_BYTE) { - write_ppm(filename, image, w, h, 4, 2, 1, 0, invert); - } - else if (format == GL_LUMINANCE_ALPHA && type == GL_UNSIGNED_BYTE) { - write_ppm(filename, image, w, h, 2, 1, 0, 0, invert); - } - else { - _mesa_problem(NULL, "Unsupported format/type in _mesa_dump_image()"); - } -} - - -/** - * Quick and dirty function to "print" a texture to stdout. - */ -void -_mesa_print_texture(struct gl_context *ctx, struct gl_texture_image *img) -{ - const GLint slice = 0; - GLint srcRowStride; - GLuint i, j, c; - GLubyte *data; - - ctx->Driver.MapTextureImage(ctx, img, slice, - 0, 0, img->Width, img->Height, GL_MAP_READ_BIT, - &data, &srcRowStride); - - if (!data) { - printf("No texture data\n"); - } - else { - /* XXX add more formats or make into a new format utility function */ - switch (img->TexFormat) { - case MESA_FORMAT_A8: - case MESA_FORMAT_L8: - case MESA_FORMAT_I8: - c = 1; - break; - case MESA_FORMAT_AL88: - case MESA_FORMAT_AL88_REV: - c = 2; - break; - case MESA_FORMAT_RGB888: - case MESA_FORMAT_BGR888: - c = 3; - break; - case MESA_FORMAT_RGBA8888: - case MESA_FORMAT_ARGB8888: - c = 4; - break; - default: - _mesa_problem(NULL, "error in PrintTexture\n"); - return; - } - - for (i = 0; i < img->Height; i++) { - for (j = 0; j < img->Width; j++) { - if (c==1) - printf("%02x ", data[0]); - else if (c==2) - printf("%02x%02x ", data[0], data[1]); - else if (c==3) - printf("%02x%02x%02x ", data[0], data[1], data[2]); - else if (c==4) - printf("%02x%02x%02x%02x ", data[0], data[1], data[2], data[3]); - data += (srcRowStride - img->Width) * c; - } - /* XXX use img->ImageStride here */ - printf("\n"); - - } - } - - ctx->Driver.UnmapTextureImage(ctx, img, slice); -} Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/debug.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/debug.h [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/debug.h (removed) @@ -1,94 +0,0 @@ -/* - * Mesa 3-D graphics library - * Version: 6.1 - * - * Copyright (C) 1999-2004 Brian Paul All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS - * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -/** - * \file debug.h - * Debugging functions. - * - * \if subset - * (No-op) - * - * \endif - */ - - -#ifndef _DEBUG_H -#define _DEBUG_H - -#include "glheader.h" -#include "mfeatures.h" - -struct gl_context; -struct gl_texture_image; - -#if _HAVE_FULL_GL - -extern void _mesa_print_tri_caps( const char *name, GLuint flags ); -extern void _mesa_print_enable_flags( const char *msg, GLuint flags ); -extern void _mesa_print_state( const char *msg, GLuint state ); -extern void _mesa_print_info( void ); -extern void _mesa_init_debug( struct gl_context *ctx ); - -#else - -/** No-op */ -#define _mesa_print_state( m, s ) ((void)0) - -/** No-op */ -#define _mesa_print_info() ((void)0) - -/** No-op */ -#define _mesa_init_debug( c ) ((void)0) - -#endif - -extern void -_mesa_write_renderbuffer_image(const struct gl_renderbuffer *rb); - -extern void -_mesa_dump_texture(GLuint texture, GLuint writeImages); - -extern void -_mesa_dump_textures(GLuint writeImages); - -extern void -_mesa_dump_renderbuffers(GLboolean writeImages); - -extern void -_mesa_dump_color_buffer(const char *filename); - -extern void -_mesa_dump_depth_buffer(const char *filename); - -extern void -_mesa_dump_stencil_buffer(const char *filename); - -extern void -_mesa_dump_image(const char *filename, const void *image, GLuint w, GLuint h, - GLenum format, GLenum type); - -extern void -_mesa_print_texture(struct gl_context *ctx, struct gl_texture_image *img); - -#endif 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… ============================================================================== --- trunk/reactos/dll/opengl/mesa/src/mesa/main/state.c [iso-8859-1] (original) +++ trunk/reactos/dll/opengl/mesa/src/mesa/main/state.c [iso-8859-1] Fri Oct 4 10:51:37 2013 @@ -34,7 +34,6 @@ #include "glheader.h" #include "mtypes.h" #include "context.h" -#include "debug.h" #include "macros.h" #include "framebuffer.h" #include "light.h" @@ -487,9 +486,6 @@ if (new_state == _NEW_CURRENT_ATTRIB) goto out; - if (MESA_VERBOSE & VERBOSE_STATE) - _mesa_print_state("_mesa_update_state", new_state); - /* * Now update derived state info */

1 0

[jgardou] 60519: [OPENGL32] - Assorted changes of previous commit CORE-7499
by jgardou＠svn.reactos.org 04 Oct '13

04 Oct '13

Author: jgardou Date: Fri Oct 4 10:44:43 2013 New Revision: 60519 URL: http://svn.reactos.org/svn/reactos?rev=60519&view=rev Log: [OPENGL32] - Assorted changes of previous commit CORE-7499 Modified: trunk/reactos/dll/opengl/opengl32/swimpl.c 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] Fri Oct 4 10:44:43 2013 @@ -480,8 +480,7 @@ pixel_formats[fb->format_index].accum_bits, pixel_formats[fb->format_index].accum_bits, pixel_formats[fb->format_index].alpha_bits ? - pixel_formats[fb->format_index].accum_bits : 0, - 1 /* One sampling level */); + pixel_formats[fb->format_index].accum_bits : 0); if(!fb->gl_visual) {

1 0

[jgardou] 60518: [MESA] - leaner build part 12 of X - Get rid of ARB_color_buffer_float, ARB_framebuffer_object, EXT_texture_lod_bias, SGIS_generate_mipmap and SGIS_texture_lod extensions. CORE-7499
by jgardou＠svn.reactos.org 04 Oct '13

04 Oct '13

Author: jgardou Date: Fri Oct 4 10:33:03 2013 New Revision: 60518 URL: http://svn.reactos.org/svn/reactos?rev=60518&view=rev Log: [MESA] - leaner build part 12 of X - Get rid of ARB_color_buffer_float, ARB_framebuffer_object, EXT_texture_lod_bias, SGIS_generate_mipmap and SGIS_texture_lod extensions. CORE-7499 Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/fbobject.c trunk/reactos/dll/opengl/mesa/src/mesa/main/fbobject.h trunk/reactos/dll/opengl/mesa/src/mesa/main/mipmap.c trunk/reactos/dll/opengl/mesa/src/mesa/main/mipmap.h trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_blit.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texrender.c Modified: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapitable.h 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/accum.c trunk/reactos/dll/opengl/mesa/src/mesa/main/api_exec.c trunk/reactos/dll/opengl/mesa/src/mesa/main/attrib.c trunk/reactos/dll/opengl/mesa/src/mesa/main/blend.c trunk/reactos/dll/opengl/mesa/src/mesa/main/blend.h trunk/reactos/dll/opengl/mesa/src/mesa/main/bufferobj.c trunk/reactos/dll/opengl/mesa/src/mesa/main/buffers.c trunk/reactos/dll/opengl/mesa/src/mesa/main/clear.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/context.h trunk/reactos/dll/opengl/mesa/src/mesa/main/dd.h trunk/reactos/dll/opengl/mesa/src/mesa/main/debug.c 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/extensions.c trunk/reactos/dll/opengl/mesa/src/mesa/main/fog.c trunk/reactos/dll/opengl/mesa/src/mesa/main/framebuffer.c trunk/reactos/dll/opengl/mesa/src/mesa/main/framebuffer.h trunk/reactos/dll/opengl/mesa/src/mesa/main/get.c trunk/reactos/dll/opengl/mesa/src/mesa/main/hint.c trunk/reactos/dll/opengl/mesa/src/mesa/main/light.c trunk/reactos/dll/opengl/mesa/src/mesa/main/mtypes.h trunk/reactos/dll/opengl/mesa/src/mesa/main/readpix.c trunk/reactos/dll/opengl/mesa/src/mesa/main/renderbuffer.c trunk/reactos/dll/opengl/mesa/src/mesa/main/renderbuffer.h trunk/reactos/dll/opengl/mesa/src/mesa/main/state.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texenv.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/texstore.c trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c trunk/reactos/dll/opengl/mesa/src/mesa/program/prog_statevars.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/CMakeLists.txt trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_drawpix.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_renderbuffer.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_renderbuffer.h trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_span.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texcombine.c 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/swrast.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/opengl/mesa/src/mapi/glapi/glapitable.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mapi/g… 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/accum.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/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/blend.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/blend.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/bufferobj.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/buffers.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/clear.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/context.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/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/debug.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/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/extensions.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/fbobject.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/fbobject.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/fog.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/framebuffer.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/framebuffer.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/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/light.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/mipmap.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/mipmap.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/mtypes.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/readpix.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/renderbuffer.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/renderbuffer.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/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/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/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/texstore.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.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/prog_statevars.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_blit.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_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_renderbuffer.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_renderbuffer.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_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_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_texfilter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texrender.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/swrast.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s…

1 0

[ekohl] 60517: [NTMARTA] AccRewriteSetEntriesInAcl: Do not allocate an empty ACL.
by ekohl＠svn.reactos.org 03 Oct '13

03 Oct '13

Author: ekohl Date: Thu Oct 3 20:58:47 2013 New Revision: 60517 URL: http://svn.reactos.org/svn/reactos?rev=60517&view=rev Log: [NTMARTA] AccRewriteSetEntriesInAcl: Do not allocate an empty ACL. Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c Modified: trunk/reactos/dll/win32/ntmarta/ntmarta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ntmarta/ntmarta.… ============================================================================== --- trunk/reactos/dll/win32/ntmarta/ntmarta.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ntmarta/ntmarta.c [iso-8859-1] Thu Oct 3 20:58:47 2013 @@ -1333,6 +1333,10 @@ LocalFree((HLOCAL)pSid1); } + /* Succeed, if no ACL needs to be allocated */ + if (SizeInformation.AclBytesInUse == 0) + goto Cleanup; + /* OK, now create the new ACL */ DPRINT("Allocating %u bytes for the new ACL\n", SizeInformation.AclBytesInUse); pNew = (PACL)LocalAlloc(LMEM_FIXED, SizeInformation.AclBytesInUse);

1 0

[jgardou] 60516: [MESA] - leaner build part 11 of X - Get rid of ARB_draw_buffers, ARB_draw_buffers2, ARB_draw_buffers_blend extensions. CORE-7499
by jgardou＠svn.reactos.org 03 Oct '13

03 Oct '13

Author: jgardou Date: Thu Oct 3 20:56:51 2013 New Revision: 60516 URL: http://svn.reactos.org/svn/reactos?rev=60516&view=rev Log: [MESA] - leaner build part 11 of X - Get rid of ARB_draw_buffers, ARB_draw_buffers2, ARB_draw_buffers_blend extensions. CORE-7499 Modified: trunk/reactos/dll/opengl/mesa/generated/mesa/program/program_parse.tab.c trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.cpp trunk/reactos/dll/opengl/mesa/src/glsl/linker.cpp trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/driverfuncs.c trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/driverfuncs.h 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/accum.c trunk/reactos/dll/opengl/mesa/src/mesa/main/api_exec.c trunk/reactos/dll/opengl/mesa/src/mesa/main/attrib.c trunk/reactos/dll/opengl/mesa/src/mesa/main/blend.c trunk/reactos/dll/opengl/mesa/src/mesa/main/blend.h trunk/reactos/dll/opengl/mesa/src/mesa/main/buffers.c trunk/reactos/dll/opengl/mesa/src/mesa/main/buffers.h trunk/reactos/dll/opengl/mesa/src/mesa/main/clear.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/debug.c 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/extensions.c trunk/reactos/dll/opengl/mesa/src/mesa/main/fbobject.c trunk/reactos/dll/opengl/mesa/src/mesa/main/framebuffer.c trunk/reactos/dll/opengl/mesa/src/mesa/main/get.c trunk/reactos/dll/opengl/mesa/src/mesa/main/mtypes.h trunk/reactos/dll/opengl/mesa/src/mesa/main/shader_query.cpp trunk/reactos/dll/opengl/mesa/src/mesa/program/prog_print.c trunk/reactos/dll/opengl/mesa/src/mesa/program/program.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_blend.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_blit.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_clear.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_context.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_copypix.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_drawpix.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_masking.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_masking.h trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_renderbuffer.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_span.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_triangle.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/opengl/mesa/generated/mesa/program/program_parse.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/generated/… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/linker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/l… 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/driverfuncs.h 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/accum.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/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/blend.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/blend.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/buffers.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/buffers.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/clear.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/debug.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/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/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/fbobject.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/framebuffer.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/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/mtypes.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/shader_query.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/m… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/prog_print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/program.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_blend.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_blit.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_clear.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_copypix.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_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_masking.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_masking.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_renderbuffer.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_triangle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/s…

1 0

[aandrejevic] 60515: [SOFT386] Halfplement MOVS, STOS and LODS. Stubplement CMPS and SCAS.
by aandrejevic＠svn.reactos.org 03 Oct '13

03 Oct '13

Author: aandrejevic Date: Thu Oct 3 20:56:36 2013 New Revision: 60515 URL: http://svn.reactos.org/svn/reactos?rev=60515&view=rev Log: [SOFT386] Halfplement MOVS, STOS and LODS. Stubplement CMPS and SCAS. Modified: branches/ntvdm/lib/soft386/opcodes.c branches/ntvdm/lib/soft386/opcodes.h 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] Thu Oct 3 20:56:36 2013 @@ -203,18 +203,18 @@ Soft386OpcodeMovEaxOffset, Soft386OpcodeMovOffsetAl, Soft386OpcodeMovOffsetEax, - NULL, // TODO: OPCODE 0xA4 NOT SUPPORTED - NULL, // TODO: OPCODE 0xA5 NOT SUPPORTED - NULL, // TODO: OPCODE 0xA6 NOT SUPPORTED - NULL, // TODO: OPCODE 0xA7 NOT SUPPORTED + Soft386OpcodeMovs, + Soft386OpcodeMovs, + Soft386OpcodeCmps, + Soft386OpcodeCmps, Soft386OpcodeTestAl, Soft386OpcodeTestEax, - NULL, // TODO: OPCODE 0xAA NOT SUPPORTED - NULL, // TODO: OPCODE 0xAB NOT SUPPORTED - NULL, // TODO: OPCODE 0xAC NOT SUPPORTED - NULL, // TODO: OPCODE 0xAD NOT SUPPORTED - NULL, // TODO: OPCODE 0xAE NOT SUPPORTED - NULL, // TODO: OPCODE 0xAF NOT SUPPORTED + Soft386OpcodeStos, + Soft386OpcodeStos, + Soft386OpcodeLods, + Soft386OpcodeLods, + Soft386OpcodeScas, + Soft386OpcodeScas, Soft386OpcodeMovByteRegImm, Soft386OpcodeMovByteRegImm, Soft386OpcodeMovByteRegImm, @@ -5606,3 +5606,263 @@ return TRUE; } + +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovs) +{ + ULONG Data, DataSize; + BOOLEAN OperandSize, AddressSize; + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFE) == 0xA4); + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + if ((State->PrefixFlags & SOFT386_PREFIX_REP) + || (State->PrefixFlags & SOFT386_PREFIX_REPNZ)) + { + // TODO: The REP/REPZ/REPNZ prefixes need to be implemented! + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Calculate the size */ + if (Opcode == 0xA4) DataSize = sizeof(UCHAR); + else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT); + + /* Read from the source operand */ + if (!Soft386ReadMemory(State, + SOFT386_REG_DS, + AddressSize ? State->GeneralRegs[SOFT386_REG_ESI].Long + : State->GeneralRegs[SOFT386_REG_ESI].LowWord, + FALSE, + &Data, + DataSize)) + { + /* Exception occurred */ + return FALSE; + } + + /* Write to the destination operand */ + if (!Soft386WriteMemory(State, + SOFT386_REG_ES, + AddressSize ? State->GeneralRegs[SOFT386_REG_EDI].Long + : State->GeneralRegs[SOFT386_REG_EDI].LowWord, + &Data, + DataSize)) + { + /* Exception occurred */ + return FALSE; + } + + /* Increment/decrement ESI and EDI */ + if (OperandSize) + { + if (State->Flags.Df) + { + State->GeneralRegs[SOFT386_REG_ESI].Long += DataSize; + State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; + } + else + { + State->GeneralRegs[SOFT386_REG_ESI].Long -= DataSize; + State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; + } + } + else + { + if (State->Flags.Df) + { + State->GeneralRegs[SOFT386_REG_ESI].LowWord += DataSize; + State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; + } + else + { + State->GeneralRegs[SOFT386_REG_ESI].LowWord -= DataSize; + State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; + } + } + + /* Return success */ + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeCmps) +{ + UNIMPLEMENTED; + return FALSE; // TODO: NOT IMPLEMENTED +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeStos) +{ + ULONG DataSize; + BOOLEAN OperandSize, AddressSize; + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFE) == 0xAA); + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + if ((State->PrefixFlags & SOFT386_PREFIX_REP) + || (State->PrefixFlags & SOFT386_PREFIX_REPNZ)) + { + // TODO: The REP/REPZ/REPNZ prefixes need to be implemented! + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Calculate the size */ + if (Opcode == 0xAA) DataSize = sizeof(UCHAR); + else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT); + + /* Write to the destination operand */ + if (!Soft386WriteMemory(State, + SOFT386_REG_ES, + AddressSize ? State->GeneralRegs[SOFT386_REG_EDI].Long + : State->GeneralRegs[SOFT386_REG_EDI].LowWord, + &State->GeneralRegs[SOFT386_REG_EAX].Long, + DataSize)) + { + /* Exception occurred */ + return FALSE; + } + + /* Increment/decrement ESI and EDI */ + if (OperandSize) + { + if (State->Flags.Df) + { + State->GeneralRegs[SOFT386_REG_ESI].Long += DataSize; + State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; + } + else + { + State->GeneralRegs[SOFT386_REG_ESI].Long -= DataSize; + State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; + } + } + else + { + if (State->Flags.Df) + { + State->GeneralRegs[SOFT386_REG_ESI].LowWord += DataSize; + State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; + } + else + { + State->GeneralRegs[SOFT386_REG_ESI].LowWord -= DataSize; + State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; + } + } + + /* Return success */ + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeLods) +{ + ULONG DataSize; + BOOLEAN OperandSize, AddressSize; + + OperandSize = AddressSize = State->SegmentRegs[SOFT386_REG_CS].Size; + + /* Make sure this is the right instruction */ + ASSERT((Opcode & 0xFE) == 0xAC); + + if (State->PrefixFlags & SOFT386_PREFIX_OPSIZE) + { + /* The OPSIZE prefix toggles the size */ + OperandSize = !OperandSize; + } + + if (State->PrefixFlags & SOFT386_PREFIX_ADSIZE) + { + /* The ADSIZE prefix toggles the size */ + AddressSize = !AddressSize; + } + + if ((State->PrefixFlags & SOFT386_PREFIX_REP) + || (State->PrefixFlags & SOFT386_PREFIX_REPNZ)) + { + // TODO: The REP/REPZ/REPNZ prefixes need to be implemented! + Soft386Exception(State, SOFT386_EXCEPTION_UD); + return FALSE; + } + + /* Calculate the size */ + if (Opcode == 0xAC) DataSize = sizeof(UCHAR); + else DataSize = OperandSize ? sizeof(ULONG) : sizeof(USHORT); + + /* Read from the source operand */ + if (!Soft386ReadMemory(State, + SOFT386_REG_DS, + AddressSize ? State->GeneralRegs[SOFT386_REG_ESI].Long + : State->GeneralRegs[SOFT386_REG_ESI].LowWord, + FALSE, + &State->GeneralRegs[SOFT386_REG_EAX].Long, + DataSize)) + { + /* Exception occurred */ + return FALSE; + } + + /* Increment/decrement ESI and EDI */ + if (OperandSize) + { + if (State->Flags.Df) + { + State->GeneralRegs[SOFT386_REG_ESI].Long += DataSize; + State->GeneralRegs[SOFT386_REG_EDI].Long += DataSize; + } + else + { + State->GeneralRegs[SOFT386_REG_ESI].Long -= DataSize; + State->GeneralRegs[SOFT386_REG_EDI].Long -= DataSize; + } + } + else + { + if (State->Flags.Df) + { + State->GeneralRegs[SOFT386_REG_ESI].LowWord += DataSize; + State->GeneralRegs[SOFT386_REG_EDI].LowWord += DataSize; + } + else + { + State->GeneralRegs[SOFT386_REG_ESI].LowWord -= DataSize; + State->GeneralRegs[SOFT386_REG_EDI].LowWord -= DataSize; + } + } + + /* Return success */ + return TRUE; +} + +SOFT386_OPCODE_HANDLER(Soft386OpcodeScas) +{ + UNIMPLEMENTED; + return FALSE; // TODO: NOT IMPLEMENTED +} Modified: branches/ntvdm/lib/soft386/opcodes.h URL: http://svn.reactos.org/svn/reactos/branches/ntvdm/lib/soft386/opcodes.h?rev… ============================================================================== --- branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] (original) +++ branches/ntvdm/lib/soft386/opcodes.h [iso-8859-1] Thu Oct 3 20:56:36 2013 @@ -148,5 +148,10 @@ SOFT386_OPCODE_HANDLER(Soft386OpcodeMovOffsetAl); SOFT386_OPCODE_HANDLER(Soft386OpcodeMovOffsetEax); SOFT386_OPCODE_HANDLER(Soft386OpcodeSalc); +SOFT386_OPCODE_HANDLER(Soft386OpcodeMovs); +SOFT386_OPCODE_HANDLER(Soft386OpcodeCmps); +SOFT386_OPCODE_HANDLER(Soft386OpcodeStos); +SOFT386_OPCODE_HANDLER(Soft386OpcodeLods); +SOFT386_OPCODE_HANDLER(Soft386OpcodeScas); #endif // _OPCODES_H_

1 0

[jgardou] 60514: [MESA] - leaner build part 10 of X - Get rid of ARB_copy_buffer, ARB_depth_buffer_float, ARB_draw_instanced, ARB_texrure_buffer_object, ARB_uniform_buffer_object, EXT_framebuffer_s...
by jgardou＠svn.reactos.org 03 Oct '13

03 Oct '13

Author: jgardou Date: Thu Oct 3 18:35:20 2013 New Revision: 60514 URL: http://svn.reactos.org/svn/reactos?rev=60514&view=rev Log: [MESA] - leaner build part 10 of X - Get rid of ARB_copy_buffer, ARB_depth_buffer_float, ARB_draw_instanced, ARB_texrure_buffer_object, ARB_uniform_buffer_object, EXT_framebuffer_sRGB, EXT_packed_depth_stencil, {MESA,EXT}_texture_array, EXT_texture_sRGB extensions. CORE-7499 Modified: trunk/reactos/dll/opengl/mesa/generated/glsl/builtin_function.cpp trunk/reactos/dll/opengl/mesa/generated/glsl/glcpp/glcpp-parse.c trunk/reactos/dll/opengl/mesa/generated/mesa/program/program_parse.tab.c trunk/reactos/dll/opengl/mesa/src/glsl/builtin_types.h trunk/reactos/dll/opengl/mesa/src/glsl/builtin_variables.cpp trunk/reactos/dll/opengl/mesa/src/glsl/glcpp/glcpp-parse.c trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.cpp trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.h trunk/reactos/dll/opengl/mesa/src/glsl/glsl_types.cpp trunk/reactos/dll/opengl/mesa/src/glsl/glsl_types.h trunk/reactos/dll/opengl/mesa/src/glsl/standalone_scaffolding.cpp trunk/reactos/dll/opengl/mesa/src/mesa/drivers/common/meta.c trunk/reactos/dll/opengl/mesa/src/mesa/main/api_exec.c trunk/reactos/dll/opengl/mesa/src/mesa/main/api_validate.c trunk/reactos/dll/opengl/mesa/src/mesa/main/api_validate.h trunk/reactos/dll/opengl/mesa/src/mesa/main/attrib.c trunk/reactos/dll/opengl/mesa/src/mesa/main/bufferobj.c trunk/reactos/dll/opengl/mesa/src/mesa/main/bufferobj.h trunk/reactos/dll/opengl/mesa/src/mesa/main/clear.c trunk/reactos/dll/opengl/mesa/src/mesa/main/clear.h 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/debug.c 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/extensions.c trunk/reactos/dll/opengl/mesa/src/mesa/main/fbobject.c trunk/reactos/dll/opengl/mesa/src/mesa/main/format_pack.c trunk/reactos/dll/opengl/mesa/src/mesa/main/format_pack.h trunk/reactos/dll/opengl/mesa/src/mesa/main/format_unpack.c trunk/reactos/dll/opengl/mesa/src/mesa/main/format_unpack.h 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/framebuffer.c trunk/reactos/dll/opengl/mesa/src/mesa/main/get.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/mipmap.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/readpix.c trunk/reactos/dll/opengl/mesa/src/mesa/main/shaderapi.c trunk/reactos/dll/opengl/mesa/src/mesa/main/shared.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texformat.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/texstorage.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texstore.c trunk/reactos/dll/opengl/mesa/src/mesa/main/version.c trunk/reactos/dll/opengl/mesa/src/mesa/main/vtxfmt.c trunk/reactos/dll/opengl/mesa/src/mesa/program/ir_to_mesa.cpp trunk/reactos/dll/opengl/mesa/src/mesa/program/prog_print.c trunk/reactos/dll/opengl/mesa/src/mesa/program/program_parse.tab.c trunk/reactos/dll/opengl/mesa/src/mesa/program/program_parse_extra.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_blit.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_clear.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_copypix.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_depth.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_depth.h trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_drawpix.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_renderbuffer.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_stencil.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_texrender.c trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_texture.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_exec_array.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/opengl/mesa/generated/glsl/builtin_function.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/generated/… Modified: trunk/reactos/dll/opengl/mesa/generated/glsl/glcpp/glcpp-parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/generated/… Modified: trunk/reactos/dll/opengl/mesa/generated/mesa/program/program_parse.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/generated/… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/builtin_types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/b… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/builtin_variables.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/b… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glcpp/glcpp-parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glsl_types.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glsl_types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/standalone_scaffolding.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/s… 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/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_validate.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.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/bufferobj.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/bufferobj.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/clear.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/clear.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/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/debug.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/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/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/fbobject.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_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/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/format_unpack.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/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/framebuffer.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/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/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/mipmap.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… 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/readpix.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/shaderapi.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/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/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/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/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… 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/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/program/ir_to_mesa.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/prog_print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/program_parse.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/program_parse_extra.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_blit.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_clear.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_copypix.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_depth.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_depth.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_renderbuffer.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_stencil.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_texrender.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/vbo/vbo_exec_array.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v…

1 0

[ekohl] 60513: [msv1_0] - Fix pointer fix-up of domain name, user name and password. This failed for null pointers. - Update the dispatch table and create a logon session as part of the user logon.
by ekohl＠svn.reactos.org 03 Oct '13

03 Oct '13

Author: ekohl Date: Thu Oct 3 15:41:02 2013 New Revision: 60513 URL: http://svn.reactos.org/svn/reactos?rev=60513&view=rev Log: [msv1_0] - Fix pointer fix-up of domain name, user name and password. This failed for null pointers. - Update the dispatch table and create a logon session as part of the user logon. Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c trunk/reactos/dll/win32/msv1_0/msv1_0.h Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.c?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.c [iso-8859-1] Thu Oct 3 15:41:02 2013 @@ -882,13 +882,17 @@ Confidentiality, AuthenticationPackageName); /* Get the dispatch table entries */ + DispatchTable.CreateLogonSession = LsaDispatchTable->CreateLogonSession; + DispatchTable.DeleteLogonSession = LsaDispatchTable->DeleteLogonSession; + DispatchTable.AddCredential = LsaDispatchTable->AddCredential; + DispatchTable.GetCredentials = LsaDispatchTable->GetCredentials; + DispatchTable.DeleteCredential = LsaDispatchTable->DeleteCredential; DispatchTable.AllocateLsaHeap = LsaDispatchTable->AllocateLsaHeap; DispatchTable.FreeLsaHeap = LsaDispatchTable->FreeLsaHeap; DispatchTable.AllocateClientBuffer = LsaDispatchTable->AllocateClientBuffer; DispatchTable.FreeClientBuffer = LsaDispatchTable->FreeClientBuffer; DispatchTable.CopyToClientBuffer = LsaDispatchTable->CopyToClientBuffer; DispatchTable.CopyFromClientBuffer = LsaDispatchTable->CopyFromClientBuffer; - /* Return the package name */ NameString = DispatchTable.AllocateLsaHeap(sizeof(LSA_STRING)); @@ -953,6 +957,7 @@ SAMPR_ULONG_ARRAY Use = {0, NULL}; PSAMPR_USER_INFO_BUFFER UserInfo = NULL; UNICODE_STRING LogonServer; + BOOLEAN SessionCreated = FALSE; NTSTATUS Status; TRACE("()\n"); @@ -961,7 +966,6 @@ TRACE("AuthenticationInformation: %p\n", AuthenticationInformation); TRACE("AuthenticationInformationLength: %lu\n", AuthenticationInformationLength); - *ProfileBuffer = NULL; *ProfileBufferLength = 0; *SubStatus = STATUS_SUCCESS; @@ -977,9 +981,9 @@ /* Fix-up pointers in the authentication info */ PtrOffset = (ULONG_PTR)AuthenticationInformation - (ULONG_PTR)ClientAuthenticationBase; - LogonInfo->LogonDomainName.Buffer = (PWSTR)((ULONG_PTR)LogonInfo->LogonDomainName.Buffer + PtrOffset); - LogonInfo->UserName.Buffer = (PWSTR)((ULONG_PTR)LogonInfo->UserName.Buffer + PtrOffset); - LogonInfo->Password.Buffer = (PWSTR)((ULONG_PTR)LogonInfo->Password.Buffer + PtrOffset); + LogonInfo->LogonDomainName.Buffer = FIXUP_POINTER(LogonInfo->LogonDomainName.Buffer, PtrOffset); + LogonInfo->UserName.Buffer = FIXUP_POINTER(LogonInfo->UserName.Buffer, PtrOffset); + LogonInfo->Password.Buffer = FIXUP_POINTER(LogonInfo->Password.Buffer, PtrOffset); TRACE("Domain: %S\n", LogonInfo->LogonDomainName.Buffer); TRACE("User: %S\n", LogonInfo->UserName.Buffer); @@ -1089,6 +1093,16 @@ TRACE("NtAllocateLocallyUniqueId failed (Status %08lx)\n", Status); goto done; } + + /* Create the logon session */ + Status = DispatchTable.CreateLogonSession(LogonId); + if (!NT_SUCCESS(Status)) + { + TRACE("CreateLogonSession failed (Status %08lx)\n", Status); + goto done; + } + + SessionCreated = TRUE; /* Build and fill the interactve profile buffer */ Status = BuildInteractiveProfileBuffer(ClientRequest, @@ -1135,6 +1149,9 @@ if (!NT_SUCCESS(Status)) { + if (SessionCreated == TRUE) + DispatchTable.DeleteLogonSession(LogonId); + if (*ProfileBuffer != NULL) { DispatchTable.FreeClientBuffer(ClientRequest, @@ -1169,6 +1186,7 @@ /* * @unimplemented */ +#if 0 NTSTATUS NTAPI LsaApLogonUserEx(IN PLSA_CLIENT_REQUEST ClientRequest, @@ -1227,5 +1245,6 @@ return STATUS_NOT_IMPLEMENTED; } +#endif /* EOF */ Modified: trunk/reactos/dll/win32/msv1_0/msv1_0.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msv1_0/msv1_0.h?… ============================================================================== --- trunk/reactos/dll/win32/msv1_0/msv1_0.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msv1_0/msv1_0.h [iso-8859-1] Thu Oct 3 15:41:02 2013 @@ -35,6 +35,10 @@ //#include <lsass/lsasrv.h> #include <wine/debug.h> + + +#define FIXUP_POINTER(Pointer, Offset) ((Pointer != NULL) ? ((PWSTR)((ULONG_PTR)Pointer + Offset)) : NULL) + typedef struct _RPC_SID {

1 0

[jgardou] 60512: [MESA] - leaner build part 9 of X - Get rid of NV_texture_rectangle, ARB_ES2_compatibility, NV_primitive_restart extensions and texture compression. CORE-7499
by jgardou＠svn.reactos.org 03 Oct '13

03 Oct '13

Author: jgardou Date: Thu Oct 3 15:35:52 2013 New Revision: 60512 URL: http://svn.reactos.org/svn/reactos?rev=60512&view=rev Log: [MESA] - leaner build part 9 of X - Get rid of NV_texture_rectangle, ARB_ES2_compatibility, NV_primitive_restart extensions and texture compression. CORE-7499 Removed: trunk/reactos/dll/opengl/mesa/src/mesa/SConscript trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress.h trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress_fxt1.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress_fxt1.h trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress_rgtc.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress_rgtc.h trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress_rgtc_tmp.h trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress_s3tc.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress_s3tc.h trunk/reactos/dll/opengl/mesa/src/mesa/main/texenvprogram.h Modified: trunk/reactos/dll/opengl/mesa/generated/glsl/builtin_function.cpp trunk/reactos/dll/opengl/mesa/generated/glsl/glcpp/glcpp-parse.c trunk/reactos/dll/opengl/mesa/generated/glsl/glsl_lexer.cpp trunk/reactos/dll/opengl/mesa/generated/glsl/glsl_parser.cpp trunk/reactos/dll/opengl/mesa/generated/mesa/program/lex.yy.c trunk/reactos/dll/opengl/mesa/generated/mesa/program/program_parse.tab.c trunk/reactos/dll/opengl/mesa/src/glsl/ast_function.cpp trunk/reactos/dll/opengl/mesa/src/glsl/ast_to_hir.cpp trunk/reactos/dll/opengl/mesa/src/glsl/builtin_types.h trunk/reactos/dll/opengl/mesa/src/glsl/glcpp/glcpp-parse.c trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.cpp trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.h trunk/reactos/dll/opengl/mesa/src/glsl/glsl_types.cpp trunk/reactos/dll/opengl/mesa/src/glsl/glsl_types.h trunk/reactos/dll/opengl/mesa/src/glsl/standalone_scaffolding.cpp 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/attrib.c trunk/reactos/dll/opengl/mesa/src/mesa/main/buffers.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/debug.c trunk/reactos/dll/opengl/mesa/src/mesa/main/depth.c trunk/reactos/dll/opengl/mesa/src/mesa/main/depth.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/enable.c trunk/reactos/dll/opengl/mesa/src/mesa/main/extensions.c trunk/reactos/dll/opengl/mesa/src/mesa/main/fbobject.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/image.c trunk/reactos/dll/opengl/mesa/src/mesa/main/image.h trunk/reactos/dll/opengl/mesa/src/mesa/main/mipmap.c trunk/reactos/dll/opengl/mesa/src/mesa/main/mtypes.h 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/shared.c trunk/reactos/dll/opengl/mesa/src/mesa/main/state.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texformat.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texgetimage.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texgetimage.h trunk/reactos/dll/opengl/mesa/src/mesa/main/teximage.c 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/texstorage.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texstore.c trunk/reactos/dll/opengl/mesa/src/mesa/main/texstore.h 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/viewport.c trunk/reactos/dll/opengl/mesa/src/mesa/main/viewport.h trunk/reactos/dll/opengl/mesa/src/mesa/main/vtxfmt.c trunk/reactos/dll/opengl/mesa/src/mesa/program/ir_to_mesa.cpp trunk/reactos/dll/opengl/mesa/src/mesa/program/lex.yy.c trunk/reactos/dll/opengl/mesa/src/mesa/program/nvfragparse.c trunk/reactos/dll/opengl/mesa/src/mesa/program/prog_print.c trunk/reactos/dll/opengl/mesa/src/mesa/program/program_parse.tab.c trunk/reactos/dll/opengl/mesa/src/mesa/program/program_parser.h trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_renderbuffer.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/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_noop.c trunk/reactos/dll/opengl/mesa/src/mesa/vbo/vbo_save_api.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/opengl/mesa/generated/glsl/builtin_function.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/generated/… Modified: trunk/reactos/dll/opengl/mesa/generated/glsl/glcpp/glcpp-parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/generated/… Modified: trunk/reactos/dll/opengl/mesa/generated/glsl/glsl_lexer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/generated/… Modified: trunk/reactos/dll/opengl/mesa/generated/glsl/glsl_parser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/generated/… Modified: trunk/reactos/dll/opengl/mesa/generated/mesa/program/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/generated/… Modified: trunk/reactos/dll/opengl/mesa/generated/mesa/program/program_parse.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/generated/… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/ast_function.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/a… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/ast_to_hir.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/a… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/builtin_types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/b… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glcpp/glcpp-parse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glsl_parser_extras.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glsl_types.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/glsl_types.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/g… Modified: trunk/reactos/dll/opengl/mesa/src/glsl/standalone_scaffolding.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/glsl/s… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/SConscript URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/S… 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/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/buffers.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/debug.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/depth.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/depth.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/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/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/fbobject.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/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/mipmap.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… Modified: 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… Modified: 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… 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… Removed: trunk/reactos/dll/opengl/mesa/src/mesa/main/texcompress.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/texcompress.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/texcompress_fxt1.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/texcompress_fxt1.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/texcompress_rgtc.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/texcompress_rgtc.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/texcompress_rgtc_tmp.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/texcompress_s3tc.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/texcompress_s3tc.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/texenvprogram.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/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/texgetimage.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/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/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/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… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/main/texstore.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/viewport.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/viewport.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/program/ir_to_mesa.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/lex.yy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/nvfragparse.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/prog_print.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/program_parse.tab.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/program/program_parser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/p… Modified: trunk/reactos/dll/opengl/mesa/src/mesa/swrast/s_renderbuffer.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/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_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_save_api.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/opengl/mesa/src/mesa/v…

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 October 2013