Ros-diffs November 2017

ros-diffs@reactos.org

22 participants
186 discussions

[reactos] 02/05: [OPENGL32] - Fix a trace
by Jérôme Gardou 21 Nov '17

21 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=640af3f429a8bb9d85303… commit 640af3f429a8bb9d853035e1ba03f0d54e8e0e30 Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Sat Nov 18 13:50:33 2017 +0100 [OPENGL32] - Fix a trace --- dll/opengl/opengl32/wgl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/opengl/opengl32/wgl.c b/dll/opengl/opengl32/wgl.c index 82213d8800..cb50202310 100644 --- a/dll/opengl/opengl32/wgl.c +++ b/dll/opengl/opengl32/wgl.c @@ -379,7 +379,7 @@ HGLRC WINAPI wglCreateContext(HDC hdc) struct wgl_context* context; DHGLRC dhglrc; - TRACE("Creating context for %p, format %i\n", hdc); + TRACE("Creating context for %p.\n", hdc); if(!dc_data) {

1 0

[reactos] 01/05: [OPENGL32] - Implement storing thread data into the TEB CORE-14024
by Jérôme Gardou 21 Nov '17

21 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6aaf217b10ef05e6f27e3… commit 6aaf217b10ef05e6f27e335b3f0bc673e1359c8a Author: Jérôme Gardou <jerome.gardou(a)reactos.org> AuthorDate: Sat Nov 18 13:49:37 2017 +0100 [OPENGL32] - Implement storing thread data into the TEB CORE-14024 --- dll/opengl/mesa/main/glheader.h | 1 + dll/opengl/opengl32/apistubs.c | 673 ++++++++++++++++++++------------------- dll/opengl/opengl32/dllmain.c | 3 +- dll/opengl/opengl32/glapi_x86.s | 21 +- dll/opengl/opengl32/opengl32.h | 94 ++++-- sdk/include/asm/ks386.template.h | 1 + sdk/include/ndk/i386/asm.h | 1 + 7 files changed, 437 insertions(+), 357 deletions(-) diff --git a/dll/opengl/mesa/main/glheader.h b/dll/opengl/mesa/main/glheader.h index 56d5ab17c5..6f4a59de55 100644 --- a/dll/opengl/mesa/main/glheader.h +++ b/dll/opengl/mesa/main/glheader.h @@ -48,6 +48,7 @@ # endif /* _STATIC_MESA support */ #endif /* WIN32 / CYGWIN bracket */ +#define WIN32_NO_STATUS #define GL_GLEXT_PROTOTYPES #include <GL/gl.h> diff --git a/dll/opengl/opengl32/apistubs.c b/dll/opengl/opengl32/apistubs.c index 08276e142e..85c75874e5 100644 --- a/dll/opengl/opengl32/apistubs.c +++ b/dll/opengl/opengl32/apistubs.c @@ -7,1678 +7,1678 @@ #include "opengl32.h" -static void GLAPIENTRY nop_NewList(GLuint list, GLenum mode) +void GLAPIENTRY nop_NewList(GLuint list, GLenum mode) { (void) list; (void) mode; } -static void GLAPIENTRY nop_EndList(void) +void GLAPIENTRY nop_EndList(void) { } -static void GLAPIENTRY nop_CallList(GLuint list) +void GLAPIENTRY nop_CallList(GLuint list) { (void) list; } -static void GLAPIENTRY nop_CallLists(GLsizei n, GLenum type, const GLvoid * lists) +void GLAPIENTRY nop_CallLists(GLsizei n, GLenum type, const GLvoid * lists) { (void) n; (void) type; (void) lists; } -static void GLAPIENTRY nop_DeleteLists(GLuint list, GLsizei range) +void GLAPIENTRY nop_DeleteLists(GLuint list, GLsizei range) { (void) list; (void) range; } -static GLuint GLAPIENTRY nop_GenLists(GLsizei range) +GLuint GLAPIENTRY nop_GenLists(GLsizei range) { (void) range; return 0; } -static void GLAPIENTRY nop_ListBase(GLuint base) +void GLAPIENTRY nop_ListBase(GLuint base) { (void) base; } -static void GLAPIENTRY nop_Begin(GLenum mode) +void GLAPIENTRY nop_Begin(GLenum mode) { (void) mode; } -static void GLAPIENTRY nop_Bitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte * bitmap) +void GLAPIENTRY nop_Bitmap(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte * bitmap) { (void) width; (void) height; (void) xorig; (void) yorig; (void) xmove; (void) ymove; (void) bitmap; } -static void GLAPIENTRY nop_Color3b(GLbyte red, GLbyte green, GLbyte blue) +void GLAPIENTRY nop_Color3b(GLbyte red, GLbyte green, GLbyte blue) { (void) red; (void) green; (void) blue; } -static void GLAPIENTRY nop_Color3bv(const GLbyte * v) +void GLAPIENTRY nop_Color3bv(const GLbyte * v) { (void) v; } -static void GLAPIENTRY nop_Color3d(GLdouble red, GLdouble green, GLdouble blue) +void GLAPIENTRY nop_Color3d(GLdouble red, GLdouble green, GLdouble blue) { (void) red; (void) green; (void) blue; } -static void GLAPIENTRY nop_Color3dv(const GLdouble * v) +void GLAPIENTRY nop_Color3dv(const GLdouble * v) { (void) v; } -static void GLAPIENTRY nop_Color3f(GLfloat red, GLfloat green, GLfloat blue) +void GLAPIENTRY nop_Color3f(GLfloat red, GLfloat green, GLfloat blue) { (void) red; (void) green; (void) blue; } -static void GLAPIENTRY nop_Color3fv(const GLfloat * v) +void GLAPIENTRY nop_Color3fv(const GLfloat * v) { (void) v; } -static void GLAPIENTRY nop_Color3i(GLint red, GLint green, GLint blue) +void GLAPIENTRY nop_Color3i(GLint red, GLint green, GLint blue) { (void) red; (void) green; (void) blue; } -static void GLAPIENTRY nop_Color3iv(const GLint * v) +void GLAPIENTRY nop_Color3iv(const GLint * v) { (void) v; } -static void GLAPIENTRY nop_Color3s(GLshort red, GLshort green, GLshort blue) +void GLAPIENTRY nop_Color3s(GLshort red, GLshort green, GLshort blue) { (void) red; (void) green; (void) blue; } -static void GLAPIENTRY nop_Color3sv(const GLshort * v) +void GLAPIENTRY nop_Color3sv(const GLshort * v) { (void) v; } -static void GLAPIENTRY nop_Color3ub(GLubyte red, GLubyte green, GLubyte blue) +void GLAPIENTRY nop_Color3ub(GLubyte red, GLubyte green, GLubyte blue) { (void) red; (void) green; (void) blue; } -static void GLAPIENTRY nop_Color3ubv(const GLubyte * v) +void GLAPIENTRY nop_Color3ubv(const GLubyte * v) { (void) v; } -static void GLAPIENTRY nop_Color3ui(GLuint red, GLuint green, GLuint blue) +void GLAPIENTRY nop_Color3ui(GLuint red, GLuint green, GLuint blue) { (void) red; (void) green; (void) blue; } -static void GLAPIENTRY nop_Color3uiv(const GLuint * v) +void GLAPIENTRY nop_Color3uiv(const GLuint * v) { (void) v; } -static void GLAPIENTRY nop_Color3us(GLushort red, GLushort green, GLushort blue) +void GLAPIENTRY nop_Color3us(GLushort red, GLushort green, GLushort blue) { (void) red; (void) green; (void) blue; } -static void GLAPIENTRY nop_Color3usv(const GLushort * v) +void GLAPIENTRY nop_Color3usv(const GLushort * v) { (void) v; } -static void GLAPIENTRY nop_Color4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha) +void GLAPIENTRY nop_Color4b(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha) { (void) red; (void) green; (void) blue; (void) alpha; } -static void GLAPIENTRY nop_Color4bv(const GLbyte * v) +void GLAPIENTRY nop_Color4bv(const GLbyte * v) { (void) v; } -static void GLAPIENTRY nop_Color4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha) +void GLAPIENTRY nop_Color4d(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha) { (void) red; (void) green; (void) blue; (void) alpha; } -static void GLAPIENTRY nop_Color4dv(const GLdouble * v) +void GLAPIENTRY nop_Color4dv(const GLdouble * v) { (void) v; } -static void GLAPIENTRY nop_Color4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) +void GLAPIENTRY nop_Color4f(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) { (void) red; (void) green; (void) blue; (void) alpha; } -static void GLAPIENTRY nop_Color4fv(const GLfloat * v) +void GLAPIENTRY nop_Color4fv(const GLfloat * v) { (void) v; } -static void GLAPIENTRY nop_Color4i(GLint red, GLint green, GLint blue, GLint alpha) +void GLAPIENTRY nop_Color4i(GLint red, GLint green, GLint blue, GLint alpha) { (void) red; (void) green; (void) blue; (void) alpha; } -static void GLAPIENTRY nop_Color4iv(const GLint * v) +void GLAPIENTRY nop_Color4iv(const GLint * v) { (void) v; } -static void GLAPIENTRY nop_Color4s(GLshort red, GLshort green, GLshort blue, GLshort alpha) +void GLAPIENTRY nop_Color4s(GLshort red, GLshort green, GLshort blue, GLshort alpha) { (void) red; (void) green; (void) blue; (void) alpha; } -static void GLAPIENTRY nop_Color4sv(const GLshort * v) +void GLAPIENTRY nop_Color4sv(const GLshort * v) { (void) v; } -static void GLAPIENTRY nop_Color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha) +void GLAPIENTRY nop_Color4ub(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha) { (void) red; (void) green; (void) blue; (void) alpha; } -static void GLAPIENTRY nop_Color4ubv(const GLubyte * v) +void GLAPIENTRY nop_Color4ubv(const GLubyte * v) { (void) v; } -static void GLAPIENTRY nop_Color4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha) +void GLAPIENTRY nop_Color4ui(GLuint red, GLuint green, GLuint blue, GLuint alpha) { (void) red; (void) green; (void) blue; (void) alpha; } -static void GLAPIENTRY nop_Color4uiv(const GLuint * v) +void GLAPIENTRY nop_Color4uiv(const GLuint * v) { (void) v; } -static void GLAPIENTRY nop_Color4us(GLushort red, GLushort green, GLushort blue, GLushort alpha) +void GLAPIENTRY nop_Color4us(GLushort red, GLushort green, GLushort blue, GLushort alpha) { (void) red; (void) green; (void) blue; (void) alpha; } -static void GLAPIENTRY nop_Color4usv(const GLushort * v) +void GLAPIENTRY nop_Color4usv(const GLushort * v) { (void) v; } -static void GLAPIENTRY nop_EdgeFlag(GLboolean flag) +void GLAPIENTRY nop_EdgeFlag(GLboolean flag) { (void) flag; } -static void GLAPIENTRY nop_EdgeFlagv(const GLboolean * flag) +void GLAPIENTRY nop_EdgeFlagv(const GLboolean * flag) { (void) flag; } -static void GLAPIENTRY nop_End(void) +void GLAPIENTRY nop_End(void) { } -static void GLAPIENTRY nop_Indexd(GLdouble c) +void GLAPIENTRY nop_Indexd(GLdouble c) { (void) c; } -static void GLAPIENTRY nop_Indexdv(const GLdouble * c) +void GLAPIENTRY nop_Indexdv(const GLdouble * c) { (void) c; } -static void GLAPIENTRY nop_Indexf(GLfloat c) +void GLAPIENTRY nop_Indexf(GLfloat c) { (void) c; } -static void GLAPIENTRY nop_Indexfv(const GLfloat * c) +void GLAPIENTRY nop_Indexfv(const GLfloat * c) { (void) c; } -static void GLAPIENTRY nop_Indexi(GLint c) +void GLAPIENTRY nop_Indexi(GLint c) { (void) c; } -static void GLAPIENTRY nop_Indexiv(const GLint * c) +void GLAPIENTRY nop_Indexiv(const GLint * c) { (void) c; } -static void GLAPIENTRY nop_Indexs(GLshort c) +void GLAPIENTRY nop_Indexs(GLshort c) { (void) c; } -static void GLAPIENTRY nop_Indexsv(const GLshort * c) +void GLAPIENTRY nop_Indexsv(const GLshort * c) { (void) c; } -static void GLAPIENTRY nop_Normal3b(GLbyte nx, GLbyte ny, GLbyte nz) +void GLAPIENTRY nop_Normal3b(GLbyte nx, GLbyte ny, GLbyte nz) { (void) nx; (void) ny; (void) nz; } -static void GLAPIENTRY nop_Normal3bv(const GLbyte * v) +void GLAPIENTRY nop_Normal3bv(const GLbyte * v) { (void) v; } -static void GLAPIENTRY nop_Normal3d(GLdouble nx, GLdouble ny, GLdouble nz) +void GLAPIENTRY nop_Normal3d(GLdouble nx, GLdouble ny, GLdouble nz) { (void) nx; (void) ny; (void) nz; } -static void GLAPIENTRY nop_Normal3dv(const GLdouble * v) +void GLAPIENTRY nop_Normal3dv(const GLdouble * v) { (void) v; } -static void GLAPIENTRY nop_Normal3f(GLfloat nx, GLfloat ny, GLfloat nz) +void GLAPIENTRY nop_Normal3f(GLfloat nx, GLfloat ny, GLfloat nz) { (void) nx; (void) ny; (void) nz; } -static void GLAPIENTRY nop_Normal3fv(const GLfloat * v) +void GLAPIENTRY nop_Normal3fv(const GLfloat * v) { (void) v; } -static void GLAPIENTRY nop_Normal3i(GLint nx, GLint ny, GLint nz) +void GLAPIENTRY nop_Normal3i(GLint nx, GLint ny, GLint nz) { (void) nx; (void) ny; (void) nz; } -static void GLAPIENTRY nop_Normal3iv(const GLint * v) +void GLAPIENTRY nop_Normal3iv(const GLint * v) { (void) v; } -static void GLAPIENTRY nop_Normal3s(GLshort nx, GLshort ny, GLshort nz) +void GLAPIENTRY nop_Normal3s(GLshort nx, GLshort ny, GLshort nz) { (void) nx; (void) ny; (void) nz; } -static void GLAPIENTRY nop_Normal3sv(const GLshort * v) +void GLAPIENTRY nop_Normal3sv(const GLshort * v) { (void) v; } -static void GLAPIENTRY nop_RasterPos2d(GLdouble x, GLdouble y) +void GLAPIENTRY nop_RasterPos2d(GLdouble x, GLdouble y) { (void) x; (void) y; } -static void GLAPIENTRY nop_RasterPos2dv(const GLdouble * v) +void GLAPIENTRY nop_RasterPos2dv(const GLdouble * v) { (void) v; } -static void GLAPIENTRY nop_RasterPos2f(GLfloat x, GLfloat y) +void GLAPIENTRY nop_RasterPos2f(GLfloat x, GLfloat y) { (void) x; (void) y; } -static void GLAPIENTRY nop_RasterPos2fv(const GLfloat * v) +void GLAPIENTRY nop_RasterPos2fv(const GLfloat * v) { (void) v; } -static void GLAPIENTRY nop_RasterPos2i(GLint x, GLint y) +void GLAPIENTRY nop_RasterPos2i(GLint x, GLint y) { (void) x; (void) y; } -static void GLAPIENTRY nop_RasterPos2iv(const GLint * v) +void GLAPIENTRY nop_RasterPos2iv(const GLint * v) { (void) v; } -static void GLAPIENTRY nop_RasterPos2s(GLshort x, GLshort y) +void GLAPIENTRY nop_RasterPos2s(GLshort x, GLshort y) { (void) x; (void) y; } -static void GLAPIENTRY nop_RasterPos2sv(const GLshort * v) +void GLAPIENTRY nop_RasterPos2sv(const GLshort * v) { (void) v; } -static void GLAPIENTRY nop_RasterPos3d(GLdouble x, GLdouble y, GLdouble z) +void GLAPIENTRY nop_RasterPos3d(GLdouble x, GLdouble y, GLdouble z) { (void) x; (void) y; (void) z; } -static void GLAPIENTRY nop_RasterPos3dv(const GLdouble * v) +void GLAPIENTRY nop_RasterPos3dv(const GLdouble * v) { (void) v; } -static void GLAPIENTRY nop_RasterPos3f(GLfloat x, GLfloat y, GLfloat z) +void GLAPIENTRY nop_RasterPos3f(GLfloat x, GLfloat y, GLfloat z) { (void) x; (void) y; (void) z; } -static void GLAPIENTRY nop_RasterPos3fv(const GLfloat * v) +void GLAPIENTRY nop_RasterPos3fv(const GLfloat * v) { (void) v; } -static void GLAPIENTRY nop_RasterPos3i(GLint x, GLint y, GLint z) +void GLAPIENTRY nop_RasterPos3i(GLint x, GLint y, GLint z) { (void) x; (void) y; (void) z; } -static void GLAPIENTRY nop_RasterPos3iv(const GLint * v) +void GLAPIENTRY nop_RasterPos3iv(const GLint * v) { (void) v; } -static void GLAPIENTRY nop_RasterPos3s(GLshort x, GLshort y, GLshort z) +void GLAPIENTRY nop_RasterPos3s(GLshort x, GLshort y, GLshort z) { (void) x; (void) y; (void) z; } -static void GLAPIENTRY nop_RasterPos3sv(const GLshort * v) +void GLAPIENTRY nop_RasterPos3sv(const GLshort * v) { (void) v; } -static void GLAPIENTRY nop_RasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w) +void GLAPIENTRY nop_RasterPos4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w) { (void) x; (void) y; (void) z; (void) w; } -static void GLAPIENTRY nop_RasterPos4dv(const GLdouble * v) +void GLAPIENTRY nop_RasterPos4dv(const GLdouble * v) { (void) v; } -static void GLAPIENTRY nop_RasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) +void GLAPIENTRY nop_RasterPos4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) { (void) x; (void) y; (void) z; (void) w; } -static void GLAPIENTRY nop_RasterPos4fv(const GLfloat * v) +void GLAPIENTRY nop_RasterPos4fv(const GLfloat * v) { (void) v; } -static void GLAPIENTRY nop_RasterPos4i(GLint x, GLint y, GLint z, GLint w) +void GLAPIENTRY nop_RasterPos4i(GLint x, GLint y, GLint z, GLint w) { (void) x; (void) y; (void) z; (void) w; } -static void GLAPIENTRY nop_RasterPos4iv(const GLint * v) +void GLAPIENTRY nop_RasterPos4iv(const GLint * v) { (void) v; } -static void GLAPIENTRY nop_RasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w) +void GLAPIENTRY nop_RasterPos4s(GLshort x, GLshort y, GLshort z, GLshort w) { (void) x; (void) y; (void) z; (void) w; } -static void GLAPIENTRY nop_RasterPos4sv(const GLshort * v) +void GLAPIENTRY nop_RasterPos4sv(const GLshort * v) { (void) v; } -static void GLAPIENTRY nop_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2) +void GLAPIENTRY nop_Rectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2) { (void) x1; (void) y1; (void) x2; (void) y2; } -static void GLAPIENTRY nop_Rectdv(const GLdouble * v1, const GLdouble * v2) +void GLAPIENTRY nop_Rectdv(const GLdouble * v1, const GLdouble * v2) { (void) v1; (void) v2; } -static void GLAPIENTRY nop_Rectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) +void GLAPIENTRY nop_Rectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2) { (void) x1; (void) y1; (void) x2; (void) y2; } -static void GLAPIENTRY nop_Rectfv(const GLfloat * v1, const GLfloat * v2) +void GLAPIENTRY nop_Rectfv(const GLfloat * v1, const GLfloat * v2) { (void) v1; (void) v2; } -static void GLAPIENTRY nop_Recti(GLint x1, GLint y1, GLint x2, GLint y2) +void GLAPIENTRY nop_Recti(GLint x1, GLint y1, GLint x2, GLint y2) { (void) x1; (void) y1; (void) x2; (void) y2; } -static void GLAPIENTRY nop_Rectiv(const GLint * v1, const GLint * v2) +void GLAPIENTRY nop_Rectiv(const GLint * v1, const GLint * v2) { (void) v1; (void) v2; } -static void GLAPIENTRY nop_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2) +void GLAPIENTRY nop_Rects(GLshort x1, GLshort y1, GLshort x2, GLshort y2) { (void) x1; (void) y1; (void) x2; (void) y2; } -static void GLAPIENTRY nop_Rectsv(const GLshort * v1, const GLshort * v2) +void GLAPIENTRY nop_Rectsv(const GLshort * v1, const GLshort * v2) { (void) v1; (void) v2; } -static void GLAPIENTRY nop_TexCoord1d(GLdouble s) +void GLAPIENTRY nop_TexCoord1d(GLdouble s) { (void) s; } -static void GLAPIENTRY nop_TexCoord1dv(const GLdouble * v) +void GLAPIENTRY nop_TexCoord1dv(const GLdouble * v) { (void) v; } -static void GLAPIENTRY nop_TexCoord1f(GLfloat s) +void GLAPIENTRY nop_TexCoord1f(GLfloat s) { (void) s; } -static void GLAPIENTRY nop_TexCoord1fv(const GLfloat * v) +void GLAPIENTRY nop_TexCoord1fv(const GLfloat * v) { (void) v; } -static void GLAPIENTRY nop_TexCoord1i(GLint s) +void GLAPIENTRY nop_TexCoord1i(GLint s) { (void) s; } -static void GLAPIENTRY nop_TexCoord1iv(const GLint * v) +void GLAPIENTRY nop_TexCoord1iv(const GLint * v) { (void) v; } -static void GLAPIENTRY nop_TexCoord1s(GLshort s) +void GLAPIENTRY nop_TexCoord1s(GLshort s) { (void) s; } -static void GLAPIENTRY nop_TexCoord1sv(const GLshort * v) +void GLAPIENTRY nop_TexCoord1sv(const GLshort * v) { (void) v; } -static void GLAPIENTRY nop_TexCoord2d(GLdouble s, GLdouble t) +void GLAPIENTRY nop_TexCoord2d(GLdouble s, GLdouble t) { (void) s; (void) t; } -static void GLAPIENTRY nop_TexCoord2dv(const GLdouble * v) +void GLAPIENTRY nop_TexCoord2dv(const GLdouble * v) { (void) v; } -static void GLAPIENTRY nop_TexCoord2f(GLfloat s, GLfloat t) +void GLAPIENTRY nop_TexCoord2f(GLfloat s, GLfloat t) { (void) s; (void) t; } -static void GLAPIENTRY nop_TexCoord2fv(const GLfloat * v) +void GLAPIENTRY nop_TexCoord2fv(const GLfloat * v) { (void) v; } -static void GLAPIENTRY nop_TexCoord2i(GLint s, GLint t) +void GLAPIENTRY nop_TexCoord2i(GLint s, GLint t) { (void) s; (void) t; } -static void GLAPIENTRY nop_TexCoord2iv(const GLint * v) +void GLAPIENTRY nop_TexCoord2iv(const GLint * v) { (void) v; } -static void GLAPIENTRY nop_TexCoord2s(GLshort s, GLshort t) +void GLAPIENTRY nop_TexCoord2s(GLshort s, GLshort t) { (void) s; (void) t; } -static void GLAPIENTRY nop_TexCoord2sv(const GLshort * v) +void GLAPIENTRY nop_TexCoord2sv(const GLshort * v) { (void) v; } -static void GLAPIENTRY nop_TexCoord3d(GLdouble s, GLdouble t, GLdouble r) +void GLAPIENTRY nop_TexCoord3d(GLdouble s, GLdouble t, GLdouble r) { (void) s; (void) t; (void) r; } -static void GLAPIENTRY nop_TexCoord3dv(const GLdouble * v) +void GLAPIENTRY nop_TexCoord3dv(const GLdouble * v) { (void) v; } -static void GLAPIENTRY nop_TexCoord3f(GLfloat s, GLfloat t, GLfloat r) +void GLAPIENTRY nop_TexCoord3f(GLfloat s, GLfloat t, GLfloat r) { (void) s; (void) t; (void) r; } -static void GLAPIENTRY nop_TexCoord3fv(const GLfloat * v) +void GLAPIENTRY nop_TexCoord3fv(const GLfloat * v) { (void) v; } -static void GLAPIENTRY nop_TexCoord3i(GLint s, GLint t, GLint r) +void GLAPIENTRY nop_TexCoord3i(GLint s, GLint t, GLint r) { (void) s; (void) t; (void) r; } -static void GLAPIENTRY nop_TexCoord3iv(const GLint * v) +void GLAPIENTRY nop_TexCoord3iv(const GLint * v) { (void) v; } -static void GLAPIENTRY nop_TexCoord3s(GLshort s, GLshort t, GLshort r) +void GLAPIENTRY nop_TexCoord3s(GLshort s, GLshort t, GLshort r) { (void) s; (void) t; (void) r; } -static void GLAPIENTRY nop_TexCoord3sv(const GLshort * v) +void GLAPIENTRY nop_TexCoord3sv(const GLshort * v) { (void) v; } -static void GLAPIENTRY nop_TexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q) +void GLAPIENTRY nop_TexCoord4d(GLdouble s, GLdouble t, GLdouble r, GLdouble q) { (void) s; (void) t; (void) r; (void) q; } -static void GLAPIENTRY nop_TexCoord4dv(const GLdouble * v) +void GLAPIENTRY nop_TexCoord4dv(const GLdouble * v) { (void) v; } -static void GLAPIENTRY nop_TexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q) +void GLAPIENTRY nop_TexCoord4f(GLfloat s, GLfloat t, GLfloat r, GLfloat q) { (void) s; (void) t; (void) r; (void) q; } -static void GLAPIENTRY nop_TexCoord4fv(const GLfloat * v) +void GLAPIENTRY nop_TexCoord4fv(const GLfloat * v) { (void) v; } -static void GLAPIENTRY nop_TexCoord4i(GLint s, GLint t, GLint r, GLint q) +void GLAPIENTRY nop_TexCoord4i(GLint s, GLint t, GLint r, GLint q) { (void) s; (void) t; (void) r; (void) q; } -static void GLAPIENTRY nop_TexCoord4iv(const GLint * v) +void GLAPIENTRY nop_TexCoord4iv(const GLint * v) { (void) v; } -static void GLAPIENTRY nop_TexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q) +void GLAPIENTRY nop_TexCoord4s(GLshort s, GLshort t, GLshort r, GLshort q) { (void) s; (void) t; (void) r; (void) q; } -static void GLAPIENTRY nop_TexCoord4sv(const GLshort * v) +void GLAPIENTRY nop_TexCoord4sv(const GLshort * v) { (void) v; } -static void GLAPIENTRY nop_Vertex2d(GLdouble x, GLdouble y) +void GLAPIENTRY nop_Vertex2d(GLdouble x, GLdouble y) { (void) x; (void) y; } -static void GLAPIENTRY nop_Vertex2dv(const GLdouble * v) +void GLAPIENTRY nop_Vertex2dv(const GLdouble * v) { (void) v; } -static void GLAPIENTRY nop_Vertex2f(GLfloat x, GLfloat y) +void GLAPIENTRY nop_Vertex2f(GLfloat x, GLfloat y) { (void) x; (void) y; } -static void GLAPIENTRY nop_Vertex2fv(const GLfloat * v) +void GLAPIENTRY nop_Vertex2fv(const GLfloat * v) { (void) v; } -static void GLAPIENTRY nop_Vertex2i(GLint x, GLint y) +void GLAPIENTRY nop_Vertex2i(GLint x, GLint y) { (void) x; (void) y; } -static void GLAPIENTRY nop_Vertex2iv(const GLint * v) +void GLAPIENTRY nop_Vertex2iv(const GLint * v) { (void) v; } -static void GLAPIENTRY nop_Vertex2s(GLshort x, GLshort y) +void GLAPIENTRY nop_Vertex2s(GLshort x, GLshort y) { (void) x; (void) y; } -static void GLAPIENTRY nop_Vertex2sv(const GLshort * v) +void GLAPIENTRY nop_Vertex2sv(const GLshort * v) { (void) v; } -static void GLAPIENTRY nop_Vertex3d(GLdouble x, GLdouble y, GLdouble z) +void GLAPIENTRY nop_Vertex3d(GLdouble x, GLdouble y, GLdouble z) { (void) x; (void) y; (void) z; } -static void GLAPIENTRY nop_Vertex3dv(const GLdouble * v) +void GLAPIENTRY nop_Vertex3dv(const GLdouble * v) { (void) v; } -static void GLAPIENTRY nop_Vertex3f(GLfloat x, GLfloat y, GLfloat z) +void GLAPIENTRY nop_Vertex3f(GLfloat x, GLfloat y, GLfloat z) { (void) x; (void) y; (void) z; } -static void GLAPIENTRY nop_Vertex3fv(const GLfloat * v) +void GLAPIENTRY nop_Vertex3fv(const GLfloat * v) { (void) v; } -static void GLAPIENTRY nop_Vertex3i(GLint x, GLint y, GLint z) +void GLAPIENTRY nop_Vertex3i(GLint x, GLint y, GLint z) { (void) x; (void) y; (void) z; } -static void GLAPIENTRY nop_Vertex3iv(const GLint * v) +void GLAPIENTRY nop_Vertex3iv(const GLint * v) { (void) v; } -static void GLAPIENTRY nop_Vertex3s(GLshort x, GLshort y, GLshort z) +void GLAPIENTRY nop_Vertex3s(GLshort x, GLshort y, GLshort z) { (void) x; (void) y; (void) z; } -static void GLAPIENTRY nop_Vertex3sv(const GLshort * v) +void GLAPIENTRY nop_Vertex3sv(const GLshort * v) { (void) v; } -static void GLAPIENTRY nop_Vertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w) +void GLAPIENTRY nop_Vertex4d(GLdouble x, GLdouble y, GLdouble z, GLdouble w) { (void) x; (void) y; (void) z; (void) w; } -static void GLAPIENTRY nop_Vertex4dv(const GLdouble * v) +void GLAPIENTRY nop_Vertex4dv(const GLdouble * v) { (void) v; } -static void GLAPIENTRY nop_Vertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) +void GLAPIENTRY nop_Vertex4f(GLfloat x, GLfloat y, GLfloat z, GLfloat w) { (void) x; (void) y; (void) z; (void) w; } -static void GLAPIENTRY nop_Vertex4fv(const GLfloat * v) +void GLAPIENTRY nop_Vertex4fv(const GLfloat * v) { (void) v; } -static void GLAPIENTRY nop_Vertex4i(GLint x, GLint y, GLint z, GLint w) +void GLAPIENTRY nop_Vertex4i(GLint x, GLint y, GLint z, GLint w) { (void) x; (void) y; (void) z; (void) w; } -static void GLAPIENTRY nop_Vertex4iv(const GLint * v) +void GLAPIENTRY nop_Vertex4iv(const GLint * v) { (void) v; } -static void GLAPIENTRY nop_Vertex4s(GLshort x, GLshort y, GLshort z, GLshort w) +void GLAPIENTRY nop_Vertex4s(GLshort x, GLshort y, GLshort z, GLshort w) { (void) x; (void) y; (void) z; (void) w; } -static void GLAPIENTRY nop_Vertex4sv(const GLshort * v) +void GLAPIENTRY nop_Vertex4sv(const GLshort * v) { (void) v; } -static void GLAPIENTRY nop_ClipPlane(GLenum plane, const GLdouble * equation) +void GLAPIENTRY nop_ClipPlane(GLenum plane, const GLdouble * equation) { (void) plane; (void) equation; } -static void GLAPIENTRY nop_ColorMaterial(GLenum face, GLenum mode) +void GLAPIENTRY nop_ColorMaterial(GLenum face, GLenum mode) { (void) face; (void) mode; } -static void GLAPIENTRY nop_CullFace(GLenum mode) +void GLAPIENTRY nop_CullFace(GLenum mode) { (void) mode; } -static void GLAPIENTRY nop_Fogf(GLenum pname, GLfloat param) +void GLAPIENTRY nop_Fogf(GLenum pname, GLfloat param) { (void) pname; (void) param; } -static void GLAPIENTRY nop_Fogfv(GLenum pname, const GLfloat * params) +void GLAPIENTRY nop_Fogfv(GLenum pname, const GLfloat * params) { (void) pname; (void) params; } -static void GLAPIENTRY nop_Fogi(GLenum pname, GLint param) +void GLAPIENTRY nop_Fogi(GLenum pname, GLint param) { (void) pname; (void) param; } -static void GLAPIENTRY nop_Fogiv(GLenum pname, const GLint * params) +void GLAPIENTRY nop_Fogiv(GLenum pname, const GLint * params) { (void) pname; (void) params; } -static void GLAPIENTRY nop_FrontFace(GLenum mode) +void GLAPIENTRY nop_FrontFace(GLenum mode) { (void) mode; } -static void GLAPIENTRY nop_Hint(GLenum target, GLenum mode) +void GLAPIENTRY nop_Hint(GLenum target, GLenum mode) { (void) target; (void) mode; } -static void GLAPIENTRY nop_Lightf(GLenum light, GLenum pname, GLfloat param) +void GLAPIENTRY nop_Lightf(GLenum light, GLenum pname, GLfloat param) { (void) light; (void) pname; (void) param; } -static void GLAPIENTRY nop_Lightfv(GLenum light, GLenum pname, const GLfloat * params) +void GLAPIENTRY nop_Lightfv(GLenum light, GLenum pname, const GLfloat * params) { (void) light; (void) pname; (void) params; } -static void GLAPIENTRY nop_Lighti(GLenum light, GLenum pname, GLint param) +void GLAPIENTRY nop_Lighti(GLenum light, GLenum pname, GLint param) { (void) light; (void) pname; (void) param; } -static void GLAPIENTRY nop_Lightiv(GLenum light, GLenum pname, const GLint * params) +void GLAPIENTRY nop_Lightiv(GLenum light, GLenum pname, const GLint * params) { (void) light; (void) pname; (void) params; } -static void GLAPIENTRY nop_LightModelf(GLenum pname, GLfloat param) +void GLAPIENTRY nop_LightModelf(GLenum pname, GLfloat param) { (void) pname; (void) param; } -static void GLAPIENTRY nop_LightModelfv(GLenum pname, const GLfloat * params) +void GLAPIENTRY nop_LightModelfv(GLenum pname, const GLfloat * params) { (void) pname; (void) params; } -static void GLAPIENTRY nop_LightModeli(GLenum pname, GLint param) +void GLAPIENTRY nop_LightModeli(GLenum pname, GLint param) { (void) pname; (void) param; } -static void GLAPIENTRY nop_LightModeliv(GLenum pname, const GLint * params) +void GLAPIENTRY nop_LightModeliv(GLenum pname, const GLint * params) { (void) pname; (void) params; } -static void GLAPIENTRY nop_LineStipple(GLint factor, GLushort pattern) +void GLAPIENTRY nop_LineStipple(GLint factor, GLushort pattern) { (void) factor; (void) pattern; } -static void GLAPIENTRY nop_LineWidth(GLfloat width) +void GLAPIENTRY nop_LineWidth(GLfloat width) { (void) width; } -static void GLAPIENTRY nop_Materialf(GLenum face, GLenum pname, GLfloat param) +void GLAPIENTRY nop_Materialf(GLenum face, GLenum pname, GLfloat param) { (void) face; (void) pname; (void) param; } -static void GLAPIENTRY nop_Materialfv(GLenum face, GLenum pname, const GLfloat * params) +void GLAPIENTRY nop_Materialfv(GLenum face, GLenum pname, const GLfloat * params) { (void) face; (void) pname; (void) params; } -static void GLAPIENTRY nop_Materiali(GLenum face, GLenum pname, GLint param) +void GLAPIENTRY nop_Materiali(GLenum face, GLenum pname, GLint param) { (void) face; (void) pname; (void) param; } -static void GLAPIENTRY nop_Materialiv(GLenum face, GLenum pname, const GLint * params) +void GLAPIENTRY nop_Materialiv(GLenum face, GLenum pname, const GLint * params) { (void) face; (void) pname; (void) params; } -static void GLAPIENTRY nop_PointSize(GLfloat size) +void GLAPIENTRY nop_PointSize(GLfloat size) { (void) size; } -static void GLAPIENTRY nop_PolygonMode(GLenum face, GLenum mode) +void GLAPIENTRY nop_PolygonMode(GLenum face, GLenum mode) { (void) face; (void) mode; } -static void GLAPIENTRY nop_PolygonStipple(const GLubyte * mask) +void GLAPIENTRY nop_PolygonStipple(const GLubyte * mask) { (void) mask; } -static void GLAPIENTRY nop_Scissor(GLint x, GLint y, GLsizei width, GLsizei height) +void GLAPIENTRY nop_Scissor(GLint x, GLint y, GLsizei width, GLsizei height) { (void) x; (void) y; (void) width; (void) height; } -static void GLAPIENTRY nop_ShadeModel(GLenum mode) +void GLAPIENTRY nop_ShadeModel(GLenum mode) { (void) mode; } -static void GLAPIENTRY nop_TexParameterf(GLenum target, GLenum pname, GLfloat param) +void GLAPIENTRY nop_TexParameterf(GLenum target, GLenum pname, GLfloat param) { (void) target; (void) pname; (void) param; } -static void GLAPIENTRY nop_TexParameterfv(GLenum target, GLenum pname, const GLfloat * params) +void GLAPIENTRY nop_TexParameterfv(GLenum target, GLenum pname, const GLfloat * params) { (void) target; (void) pname; (void) params; } -static void GLAPIENTRY nop_TexParameteri(GLenum target, GLenum pname, GLint param) +void GLAPIENTRY nop_TexParameteri(GLenum target, GLenum pname, GLint param) { (void) target; (void) pname; (void) param; } -static void GLAPIENTRY nop_TexParameteriv(GLenum target, GLenum pname, const GLint * params) +void GLAPIENTRY nop_TexParameteriv(GLenum target, GLenum pname, const GLint * params) { (void) target; (void) pname; (void) params; } -static void GLAPIENTRY nop_TexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels) +void GLAPIENTRY nop_TexImage1D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid * pixels) { (void) target; (void) level; (void) internalformat; (void) width; (void) border; (void) format; (void) type; (void) pixels; } -static void GLAPIENTRY nop_TexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels) +void GLAPIENTRY nop_TexImage2D(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid * pixels) { (void) target; (void) level; (void) internalformat; (void) width; (void) height; (void) border; (void) format; (void) type; (void) pixels; } -static void GLAPIENTRY nop_TexEnvf(GLenum target, GLenum pname, GLfloat param) +void GLAPIENTRY nop_TexEnvf(GLenum target, GLenum pname, GLfloat param) { (void) target; (void) pname; (void) param; } -static void GLAPIENTRY nop_TexEnvfv(GLenum target, GLenum pname, const GLfloat * params) +void GLAPIENTRY nop_TexEnvfv(GLenum target, GLenum pname, const GLfloat * params) { (void) target; (void) pname; (void) params; } -static void GLAPIENTRY nop_TexEnvi(GLenum target, GLenum pname, GLint param) +void GLAPIENTRY nop_TexEnvi(GLenum target, GLenum pname, GLint param) { (void) target; (void) pname; (void) param; } -static void GLAPIENTRY nop_TexEnviv(GLenum target, GLenum pname, const GLint * params) +void GLAPIENTRY nop_TexEnviv(GLenum target, GLenum pname, const GLint * params) { (void) target; (void) pname; (void) params; } -static void GLAPIENTRY nop_TexGend(GLenum coord, GLenum pname, GLdouble param) +void GLAPIENTRY nop_TexGend(GLenum coord, GLenum pname, GLdouble param) { (void) coord; (void) pname; (void) param; } -static void GLAPIENTRY nop_TexGendv(GLenum coord, GLenum pname, const GLdouble * params) +void GLAPIENTRY nop_TexGendv(GLenum coord, GLenum pname, const GLdouble * params) { (void) coord; (void) pname; (void) params; } -static void GLAPIENTRY nop_TexGenf(GLenum coord, GLenum pname, GLfloat param) +void GLAPIENTRY nop_TexGenf(GLenum coord, GLenum pname, GLfloat param) { (void) coord; (void) pname; (void) param; } -static void GLAPIENTRY nop_TexGenfv(GLenum coord, GLenum pname, const GLfloat * params) +void GLAPIENTRY nop_TexGenfv(GLenum coord, GLenum pname, const GLfloat * params) { (void) coord; (void) pname; (void) params; } -static void GLAPIENTRY nop_TexGeni(GLenum coord, GLenum pname, GLint param) +void GLAPIENTRY nop_TexGeni(GLenum coord, GLenum pname, GLint param) { (void) coord; (void) pname; (void) param; } -static void GLAPIENTRY nop_TexGeniv(GLenum coord, GLenum pname, const GLint * params) +void GLAPIENTRY nop_TexGeniv(GLenum coord, GLenum pname, const GLint * params) { (void) coord; (void) pname; (void) params; } -static void GLAPIENTRY nop_FeedbackBuffer(GLsizei size, GLenum type, GLfloat * buffer) +void GLAPIENTRY nop_FeedbackBuffer(GLsizei size, GLenum type, GLfloat * buffer) { (void) size; (void) type; (void) buffer; } -static void GLAPIENTRY nop_SelectBuffer(GLsizei size, GLuint * buffer) +void GLAPIENTRY nop_SelectBuffer(GLsizei size, GLuint * buffer) { (void) size; (void) buffer; } -static GLint GLAPIENTRY nop_RenderMode(GLenum mode) +GLint GLAPIENTRY nop_RenderMode(GLenum mode) { (void) mode; return 0; } -static void GLAPIENTRY nop_InitNames(void) +void GLAPIENTRY nop_InitNames(void) { } -static void GLAPIENTRY nop_LoadName(GLuint name) +void GLAPIENTRY nop_LoadName(GLuint name) { (void) name; } -static void GLAPIENTRY nop_PassThrough(GLfloat token) +void GLAPIENTRY nop_PassThrough(GLfloat token) { (void) token; } -static void GLAPIENTRY nop_PopName(void) +void GLAPIENTRY nop_PopName(void) { } -static void GLAPIENTRY nop_PushName(GLuint name) +void GLAPIENTRY nop_PushName(GLuint name) { (void) name; } -static void GLAPIENTRY nop_DrawBuffer(GLenum mode) +void GLAPIENTRY nop_DrawBuffer(GLenum mode) { (void) mode; } -static void GLAPIENTRY nop_Clear(GLbitfield mask) +void GLAPIENTRY nop_Clear(GLbitfield mask) { (void) mask; } -static void GLAPIENTRY nop_ClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) +void GLAPIENTRY nop_ClearAccum(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha) { (void) red; (void) green; (void) blue; (void) alpha; } -static void GLAPIENTRY nop_ClearIndex(GLfloat c) +void GLAPIENTRY nop_ClearIndex(GLfloat c) { (void) c; } -static void GLAPIENTRY nop_ClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) +void GLAPIENTRY nop_ClearColor(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha) { (void) red; (void) green; (void) blue; (void) alpha; } -static void GLAPIENTRY nop_ClearStencil(GLint s) +void GLAPIENTRY nop_ClearStencil(GLint s) { (void) s; } -static void GLAPIENTRY nop_ClearDepth(GLclampd depth) +void GLAPIENTRY nop_ClearDepth(GLclampd depth) { (void) depth; } -static void GLAPIENTRY nop_StencilMask(GLuint mask) +void GLAPIENTRY nop_StencilMask(GLuint mask) { (void) mask; } -static void GLAPIENTRY nop_ColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha) +void GLAPIENTRY nop_ColorMask(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha) { (void) red; (void) green; (void) blue; (void) alpha; } -static void GLAPIENTRY nop_DepthMask(GLboolean flag) +void GLAPIENTRY nop_DepthMask(GLboolean flag) { (void) flag; } -static void GLAPIENTRY nop_IndexMask(GLuint mask) +void GLAPIENTRY nop_IndexMask(GLuint mask) { (void) mask; } -static void GLAPIENTRY nop_Accum(GLenum op, GLfloat value) +void GLAPIENTRY nop_Accum(GLenum op, GLfloat value) { (void) op; (void) value; } -static void GLAPIENTRY nop_Disable(GLenum cap) +void GLAPIENTRY nop_Disable(GLenum cap) { (void) cap; } -static void GLAPIENTRY nop_Enable(GLenum cap) +void GLAPIENTRY nop_Enable(GLenum cap) { (void) cap; } -static void GLAPIENTRY nop_Finish(void) +void GLAPIENTRY nop_Finish(void) { } -static void GLAPIENTRY nop_Flush(void) +void GLAPIENTRY nop_Flush(void) { } -static void GLAPIENTRY nop_PopAttrib(void) +void GLAPIENTRY nop_PopAttrib(void) { } -static void GLAPIENTRY nop_PushAttrib(GLbitfield mask) +void GLAPIENTRY nop_PushAttrib(GLbitfield mask) { (void) mask; } -static void GLAPIENTRY nop_Map1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble * points) +void GLAPIENTRY nop_Map1d(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble * points) { (void) target; (void) u1; (void) u2; (void) stride; (void) order; (void) points; } -static void GLAPIENTRY nop_Map1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat * points) +void GLAPIENTRY nop_Map1f(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat * points) { (void) target; (void) u1; (void) u2; (void) stride; (void) order; (void) points; } -static void GLAPIENTRY nop_Map2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble * points) +void GLAPIENTRY nop_Map2d(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble * points) { (void) target; (void) u1; (void) u2; (void) ustride; (void) uorder; (void) v1; (void) v2; (void) vstride; (void) vorder; (void) points; } -static void GLAPIENTRY nop_Map2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat * points) +void GLAPIENTRY nop_Map2f(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat * points) { (void) target; (void) u1; (void) u2; (void) ustride; (void) uorder; (void) v1; (void) v2; (void) vstride; (void) vorder; (void) points; } -static void GLAPIENTRY nop_MapGrid1d(GLint un, GLdouble u1, GLdouble u2) +void GLAPIENTRY nop_MapGrid1d(GLint un, GLdouble u1, GLdouble u2) { (void) un; (void) u1; (void) u2; } -static void GLAPIENTRY nop_MapGrid1f(GLint un, GLfloat u1, GLfloat u2) +void GLAPIENTRY nop_MapGrid1f(GLint un, GLfloat u1, GLfloat u2) { (void) un; (void) u1; (void) u2; } -static void GLAPIENTRY nop_MapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2) +void GLAPIENTRY nop_MapGrid2d(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2) { (void) un; (void) u1; (void) u2; (void) vn; (void) v1; (void) v2; } -static void GLAPIENTRY nop_MapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2) +void GLAPIENTRY nop_MapGrid2f(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2) { (void) un; (void) u1; (void) u2; (void) vn; (void) v1; (void) v2; } -static void GLAPIENTRY nop_EvalCoord1d(GLdouble u) +void GLAPIENTRY nop_EvalCoord1d(GLdouble u) { (void) u; } -static void GLAPIENTRY nop_EvalCoord1dv(const GLdouble * u) +void GLAPIENTRY nop_EvalCoord1dv(const GLdouble * u) { (void) u; } -static void GLAPIENTRY nop_EvalCoord1f(GLfloat u) +void GLAPIENTRY nop_EvalCoord1f(GLfloat u) { (void) u; } -static void GLAPIENTRY nop_EvalCoord1fv(const GLfloat * u) +void GLAPIENTRY nop_EvalCoord1fv(const GLfloat * u) { (void) u; } -static void GLAPIENTRY nop_EvalCoord2d(GLdouble u, GLdouble v) +void GLAPIENTRY nop_EvalCoord2d(GLdouble u, GLdouble v) { (void) u; (void) v; } -static void GLAPIENTRY nop_EvalCoord2dv(const GLdouble * u) +void GLAPIENTRY nop_EvalCoord2dv(const GLdouble * u) { (void) u; } -static void GLAPIENTRY nop_EvalCoord2f(GLfloat u, GLfloat v) +void GLAPIENTRY nop_EvalCoord2f(GLfloat u, GLfloat v) { (void) u; (void) v; } -static void GLAPIENTRY nop_EvalCoord2fv(const GLfloat * u) +void GLAPIENTRY nop_EvalCoord2fv(const GLfloat * u) { (void) u; } -static void GLAPIENTRY nop_EvalMesh1(GLenum mode, GLint i1, GLint i2) +void GLAPIENTRY nop_EvalMesh1(GLenum mode, GLint i1, GLint i2) { (void) mode; (void) i1; (void) i2; } -static void GLAPIENTRY nop_EvalPoint1(GLint i) +void GLAPIENTRY nop_EvalPoint1(GLint i) { (void) i; } -static void GLAPIENTRY nop_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2) +void GLAPIENTRY nop_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2) { (void) mode; (void) i1; (void) i2; (void) j1; (void) j2; } -static void GLAPIENTRY nop_EvalPoint2(GLint i, GLint j) +void GLAPIENTRY nop_EvalPoint2(GLint i, GLint j) { (void) i; (void) j; } -static void GLAPIENTRY nop_AlphaFunc(GLenum func, GLclampf ref) +void GLAPIENTRY nop_AlphaFunc(GLenum func, GLclampf ref) { (void) func; (void) ref; } -static void GLAPIENTRY nop_BlendFunc(GLenum sfactor, GLenum dfactor) +void GLAPIENTRY nop_BlendFunc(GLenum sfactor, GLenum dfactor) { (void) sfactor; (void) dfactor; } -static void GLAPIENTRY nop_LogicOp(GLenum opcode) +void GLAPIENTRY nop_LogicOp(GLenum opcode) { (void) opcode; } -static void GLAPIENTRY nop_StencilFunc(GLenum func, GLint ref, GLuint mask) +void GLAPIENTRY nop_StencilFunc(GLenum func, GLint ref, GLuint mask) { (void) func; (void) ref; (void) mask; } -static void GLAPIENTRY nop_StencilOp(GLenum fail, GLenum zfail, GLenum zpass) +void GLAPIENTRY nop_StencilOp(GLenum fail, GLenum zfail, GLenum zpass) { (void) fail; (void) zfail; (void) zpass; } -static void GLAPIENTRY nop_DepthFunc(GLenum func) +void GLAPIENTRY nop_DepthFunc(GLenum func) { (void) func; } -static void GLAPIENTRY nop_PixelZoom(GLfloat xfactor, GLfloat yfactor) +void GLAPIENTRY nop_PixelZoom(GLfloat xfactor, GLfloat yfactor) { (void) xfactor; (void) yfactor; } -static void GLAPIENTRY nop_PixelTransferf(GLenum pname, GLfloat param) +void GLAPIENTRY nop_PixelTransferf(GLenum pname, GLfloat param) { (void) pname; (void) param; } -static void GLAPIENTRY nop_PixelTransferi(GLenum pname, GLint param) +void GLAPIENTRY nop_PixelTransferi(GLenum pname, GLint param) { (void) pname; (void) param; } -static void GLAPIENTRY nop_PixelStoref(GLenum pname, GLfloat param) +void GLAPIENTRY nop_PixelStoref(GLenum pname, GLfloat param) { (void) pname; (void) param; } -static void GLAPIENTRY nop_PixelStorei(GLenum pname, GLint param) +void GLAPIENTRY nop_PixelStorei(GLenum pname, GLint param) { (void) pname; (void) param; } -static void GLAPIENTRY nop_PixelMapfv(GLenum map, GLsizei mapsize, const GLfloat * values) +void GLAPIENTRY nop_PixelMapfv(GLenum map, GLsizei mapsize, const GLfloat * values) { (void) map; (void) mapsize; (void) values; } -static void GLAPIENTRY nop_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint * values) +void GLAPIENTRY nop_PixelMapuiv(GLenum map, GLsizei mapsize, const GLuint * values) { (void) map; (void) mapsize; (void) values; } -static void GLAPIENTRY nop_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort * values) +void GLAPIENTRY nop_PixelMapusv(GLenum map, GLsizei mapsize, const GLushort * values) { (void) map; (void) mapsize; (void) values; } -static void GLAPIENTRY nop_ReadBuffer(GLenum mode) +void GLAPIENTRY nop_ReadBuffer(GLenum mode) { (void) mode; } -static void GLAPIENTRY nop_CopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type) +void GLAPIENTRY nop_CopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type) { (void) x; (void) y; (void) width; (void) height; (void) type; } -static void GLAPIENTRY nop_ReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid * pixels) +void GLAPIENTRY nop_ReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid * pixels) { (void) x; (void) y; (void) width; (void) height; (void) format; (void) type; (void) pixels; } -static void GLAPIENTRY nop_DrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels) +void GLAPIENTRY nop_DrawPixels(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels) { (void) width; (void) height; (void) format; (void) type; (void) pixels; } -static void GLAPIENTRY nop_GetBooleanv(GLenum pname, GLboolean * params) +void GLAPIENTRY nop_GetBooleanv(GLenum pname, GLboolean * params) { (void) pname; (void) params; } -static void GLAPIENTRY nop_GetClipPlane(GLenum plane, GLdouble * equation) +void GLAPIENTRY nop_GetClipPlane(GLenum plane, GLdouble * equation) { (void) plane; (void) equation; } -static void GLAPIENTRY nop_GetDoublev(GLenum pname, GLdouble * params) +void GLAPIENTRY nop_GetDoublev(GLenum pname, GLdouble * params) { (void) pname; (void) params; } -static GLenum GLAPIENTRY nop_GetError(void) +GLenum GLAPIENTRY nop_GetError(void) { return 0; } -static void GLAPIENTRY nop_GetFloatv(GLenum pname, GLfloat * params) +void GLAPIENTRY nop_GetFloatv(GLenum pname, GLfloat * params) { (void) pname; (void) params; } -static void GLAPIENTRY nop_GetIntegerv(GLenum pname, GLint * params) +void GLAPIENTRY nop_GetIntegerv(GLenum pname, GLint * params) { (void) pname; (void) params; } -static void GLAPIENTRY nop_GetLightfv(GLenum light, GLenum pname, GLfloat * params) +void GLAPIENTRY nop_GetLightfv(GLenum light, GLenum pname, GLfloat * params) { (void) light; (void) pname; (void) params; } -static void GLAPIENTRY nop_GetLightiv(GLenum light, GLenum pname, GLint * params) +void GLAPIENTRY nop_GetLightiv(GLenum light, GLenum pname, GLint * params) { (void) light; (void) pname; (void) params; } -static void GLAPIENTRY nop_GetMapdv(GLenum target, GLenum query, GLdouble * v) +void GLAPIENTRY nop_GetMapdv(GLenum target, GLenum query, GLdouble * v) { (void) target; (void) query; (void) v; } -static void GLAPIENTRY nop_GetMapfv(GLenum target, GLenum query, GLfloat * v) +void GLAPIENTRY nop_GetMapfv(GLenum target, GLenum query, GLfloat * v) { (void) target; (void) query; (void) v; } -static void GLAPIENTRY nop_GetMapiv(GLenum target, GLenum query, GLint * v) +void GLAPIENTRY nop_GetMapiv(GLenum target, GLenum query, GLint * v) { (void) target; (void) query; (void) v; } -static void GLAPIENTRY nop_GetMaterialfv(GLenum face, GLenum pname, GLfloat * params) +void GLAPIENTRY nop_GetMaterialfv(GLenum face, GLenum pname, GLfloat * params) { (void) face; (void) pname; (void) params; } -static void GLAPIENTRY nop_GetMaterialiv(GLenum face, GLenum pname, GLint * params) +void GLAPIENTRY nop_GetMaterialiv(GLenum face, GLenum pname, GLint * params) { (void) face; (void) pname; (void) params; } -static void GLAPIENTRY nop_GetPixelMapfv(GLenum map, GLfloat * values) +void GLAPIENTRY nop_GetPixelMapfv(GLenum map, GLfloat * values) { (void) map; (void) values; } -static void GLAPIENTRY nop_GetPixelMapuiv(GLenum map, GLuint * values) +void GLAPIENTRY nop_GetPixelMapuiv(GLenum map, GLuint * values) { (void) map; (void) values; } -static void GLAPIENTRY nop_GetPixelMapusv(GLenum map, GLushort * values) +void GLAPIENTRY nop_GetPixelMapusv(GLenum map, GLushort * values) { (void) map; (void) values; } -static void GLAPIENTRY nop_GetPolygonStipple(GLubyte * mask) +void GLAPIENTRY nop_GetPolygonStipple(GLubyte * mask) { (void) mask; } -static const GLubyte * GLAPIENTRY nop_GetString(GLenum name) +const GLubyte * GLAPIENTRY nop_GetString(GLenum name) { (void) name; return (const GLubyte*)""; } -static void GLAPIENTRY nop_GetTexEnvfv(GLenum target, GLenum pname, GLfloat * params) +void GLAPIENTRY nop_GetTexEnvfv(GLenum target, GLenum pname, GLfloat * params) { (void) target; (void) pname; (void) params; } -static void GLAPIENTRY nop_GetTexEnviv(GLenum target, GLenum pname, GLint * params) +void GLAPIENTRY nop_GetTexEnviv(GLenum target, GLenum pname, GLint * params) { (void) target; (void) pname; (void) params; } -static void GLAPIENTRY nop_GetTexGendv(GLenum coord, GLenum pname, GLdouble * params) +void GLAPIENTRY nop_GetTexGendv(GLenum coord, GLenum pname, GLdouble * params) { (void) coord; (void) pname; (void) params; } -static void GLAPIENTRY nop_GetTexGenfv(GLenum coord, GLenum pname, GLfloat * params) +void GLAPIENTRY nop_GetTexGenfv(GLenum coord, GLenum pname, GLfloat * params) { (void) coord; (void) pname; (void) params; } -static void GLAPIENTRY nop_GetTexGeniv(GLenum coord, GLenum pname, GLint * params) +void GLAPIENTRY nop_GetTexGeniv(GLenum coord, GLenum pname, GLint * params) { (void) coord; (void) pname; (void) params; } -static void GLAPIENTRY nop_GetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid * pixels) +void GLAPIENTRY nop_GetTexImage(GLenum target, GLint level, GLenum format, GLenum type, GLvoid * pixels) { (void) target; (void) level; (void) format; (void) type; (void) pixels; } -static void GLAPIENTRY nop_GetTexParameterfv(GLenum target, GLenum pname, GLfloat * params) +void GLAPIENTRY nop_GetTexParameterfv(GLenum target, GLenum pname, GLfloat * params) { (void) target; (void) pname; (void) params; } -static void GLAPIENTRY nop_GetTexParameteriv(GLenum target, GLenum pname, GLint * params) +void GLAPIENTRY nop_GetTexParameteriv(GLenum target, GLenum pname, GLint * params) { (void) target; (void) pname; (void) params; } -static void GLAPIENTRY nop_GetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat * params) +void GLAPIENTRY nop_GetTexLevelParameterfv(GLenum target, GLint level, GLenum pname, GLfloat * params) { (void) target; (void) level; (void) pname; (void) params; } -static void GLAPIENTRY nop_GetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint * params) +void GLAPIENTRY nop_GetTexLevelParameteriv(GLenum target, GLint level, GLenum pname, GLint * params) { (void) target; (void) level; (void) pname; (void) params; } -static GLboolean GLAPIENTRY nop_IsEnabled(GLenum cap) +GLboolean GLAPIENTRY nop_IsEnabled(GLenum cap) { (void) cap; return 0; } -static GLboolean GLAPIENTRY nop_IsList(GLuint list) +GLboolean GLAPIENTRY nop_IsList(GLuint list) { (void) list; return 0; } -static void GLAPIENTRY nop_DepthRange(GLclampd zNear, GLclampd zFar) +void GLAPIENTRY nop_DepthRange(GLclampd zNear, GLclampd zFar) { (void) zNear; (void) zFar; } -static void GLAPIENTRY nop_Frustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar) +void GLAPIENTRY nop_Frustum(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar) { (void) left; (void) right; (void) bottom; (void) top; (void) zNear; (void) zFar; } -static void GLAPIENTRY nop_LoadIdentity(void) +void GLAPIENTRY nop_LoadIdentity(void) { } -static void GLAPIENTRY nop_LoadMatrixf(const GLfloat * m) +void GLAPIENTRY nop_LoadMatrixf(const GLfloat * m) { (void) m; } -static void GLAPIENTRY nop_LoadMatrixd(const GLdouble * m) +void GLAPIENTRY nop_LoadMatrixd(const GLdouble * m) { (void) m; } -static void GLAPIENTRY nop_MatrixMode(GLenum mode) +void GLAPIENTRY nop_MatrixMode(GLenum mode) { (void) mode; } -static void GLAPIENTRY nop_MultMatrixf(const GLfloat * m) +void GLAPIENTRY nop_MultMatrixf(const GLfloat * m) { (void) m; } -static void GLAPIENTRY nop_MultMatrixd(const GLdouble * m) +void GLAPIENTRY nop_MultMatrixd(const GLdouble * m) { (void) m; } -static void GLAPIENTRY nop_Ortho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar) +void GLAPIENTRY nop_Ortho(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble zNear, GLdouble zFar) { (void) left; (void) right; (void) bottom; (void) top; (void) zNear; (void) zFar; } -static void GLAPIENTRY nop_PopMatrix(void) +void GLAPIENTRY nop_PopMatrix(void) { } -static void GLAPIENTRY nop_PushMatrix(void) +void GLAPIENTRY nop_PushMatrix(void) { } -static void GLAPIENTRY nop_Rotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z) +void GLAPIENTRY nop_Rotated(GLdouble angle, GLdouble x, GLdouble y, GLdouble z) { (void) angle; (void) x; (void) y; (void) z; } -static void GLAPIENTRY nop_Rotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z) +void GLAPIENTRY nop_Rotatef(GLfloat angle, GLfloat x, GLfloat y, GLfloat z) { (void) angle; (void) x; (void) y; (void) z; } -static void GLAPIENTRY nop_Scaled(GLdouble x, GLdouble y, GLdouble z) +void GLAPIENTRY nop_Scaled(GLdouble x, GLdouble y, GLdouble z) { (void) x; (void) y; (void) z; } -static void GLAPIENTRY nop_Scalef(GLfloat x, GLfloat y, GLfloat z) +void GLAPIENTRY nop_Scalef(GLfloat x, GLfloat y, GLfloat z) { (void) x; (void) y; (void) z; } -static void GLAPIENTRY nop_Translated(GLdouble x, GLdouble y, GLdouble z) +void GLAPIENTRY nop_Translated(GLdouble x, GLdouble y, GLdouble z) { (void) x; (void) y; (void) z; } -static void GLAPIENTRY nop_Translatef(GLfloat x, GLfloat y, GLfloat z) +void GLAPIENTRY nop_Translatef(GLfloat x, GLfloat y, GLfloat z) { (void) x; (void) y; (void) z; } -static void GLAPIENTRY nop_Viewport(GLint x, GLint y, GLsizei width, GLsizei height) +void GLAPIENTRY nop_Viewport(GLint x, GLint y, GLsizei width, GLsizei height) { (void) x; (void) y; (void) width; (void) height; } -static void GLAPIENTRY nop_ArrayElement(GLint i) +void GLAPIENTRY nop_ArrayElement(GLint i) { (void) i; } -static void GLAPIENTRY nop_BindTexture(GLenum target, GLuint texture) +void GLAPIENTRY nop_BindTexture(GLenum target, GLuint texture) { (void) target; (void) texture; } -static void GLAPIENTRY nop_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer) +void GLAPIENTRY nop_ColorPointer(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer) { (void) size; (void) type; (void) stride; (void) pointer; } -static void GLAPIENTRY nop_DisableClientState(GLenum array) +void GLAPIENTRY nop_DisableClientState(GLenum array) { (void) array; } -static void GLAPIENTRY nop_DrawArrays(GLenum mode, GLint first, GLsizei count) +void GLAPIENTRY nop_DrawArrays(GLenum mode, GLint first, GLsizei count) { (void) mode; (void) first; (void) count; } -static void GLAPIENTRY nop_DrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices) +void GLAPIENTRY nop_DrawElements(GLenum mode, GLsizei count, GLenum type, const GLvoid * indices) { (void) mode; (void) count; (void) type; (void) indices; } -static void GLAPIENTRY nop_EdgeFlagPointer(GLsizei stride, const GLvoid * pointer) +void GLAPIENTRY nop_EdgeFlagPointer(GLsizei stride, const GLvoid * pointer) { (void) stride; (void) pointer; } -static void GLAPIENTRY nop_EnableClientState(GLenum array) +void GLAPIENTRY nop_EnableClientState(GLenum array) { (void) array; } -static void GLAPIENTRY nop_IndexPointer(GLenum type, GLsizei stride, const GLvoid * pointer) +void GLAPIENTRY nop_IndexPointer(GLenum type, GLsizei stride, const GLvoid * pointer) { (void) type; (void) stride; (void) pointer; } -static void GLAPIENTRY nop_Indexub(GLubyte c) +void GLAPIENTRY nop_Indexub(GLubyte c) { (void) c; } -static void GLAPIENTRY nop_Indexubv(const GLubyte * c) +void GLAPIENTRY nop_Indexubv(const GLubyte * c) { (void) c; } -static void GLAPIENTRY nop_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid * pointer) +void GLAPIENTRY nop_InterleavedArrays(GLenum format, GLsizei stride, const GLvoid * pointer) { (void) format; (void) stride; (void) pointer; } -static void GLAPIENTRY nop_NormalPointer(GLenum type, GLsizei stride, const GLvoid * pointer) +void GLAPIENTRY nop_NormalPointer(GLenum type, GLsizei stride, const GLvoid * pointer) { (void) type; (void) stride; (void) pointer; } -static void GLAPIENTRY nop_PolygonOffset(GLfloat factor, GLfloat units) +void GLAPIENTRY nop_PolygonOffset(GLfloat factor, GLfloat units) { (void) factor; (void) units; } -static void GLAPIENTRY nop_TexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer) +void GLAPIENTRY nop_TexCoordPointer(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer) { (void) size; (void) type; (void) stride; (void) pointer; } -static void GLAPIENTRY nop_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer) +void GLAPIENTRY nop_VertexPointer(GLint size, GLenum type, GLsizei stride, const GLvoid * pointer) { (void) size; (void) type; (void) stride; (void) pointer; } -static GLboolean GLAPIENTRY nop_AreTexturesResident(GLsizei n, const GLuint * textures, GLboolean * residences) +GLboolean GLAPIENTRY nop_AreTexturesResident(GLsizei n, const GLuint * textures, GLboolean * residences) { (void) n; (void) textures; (void) residences; return 0; } -static void GLAPIENTRY nop_CopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border) +void GLAPIENTRY nop_CopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border) { (void) target; (void) level; (void) internalformat; (void) x; (void) y; (void) width; (void) border; } -static void GLAPIENTRY nop_CopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border) +void GLAPIENTRY nop_CopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border) { (void) target; (void) level; (void) internalformat; (void) x; (void) y; (void) width; (void) height; (void) border; } -static void GLAPIENTRY nop_CopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width) +void GLAPIENTRY nop_CopyTexSubImage1D(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width) { (void) target; (void) level; (void) xoffset; (void) x; (void) y; (void) width; } -static void GLAPIENTRY nop_CopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height) +void GLAPIENTRY nop_CopyTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height) { (void) target; (void) level; (void) xoffset; (void) yoffset; (void) x; (void) y; (void) width; (void) height; } -static void GLAPIENTRY nop_DeleteTextures(GLsizei n, const GLuint * textures) +void GLAPIENTRY nop_DeleteTextures(GLsizei n, const GLuint * textures) { (void) n; (void) textures; } -static void GLAPIENTRY nop_GenTextures(GLsizei n, GLuint * textures) +void GLAPIENTRY nop_GenTextures(GLsizei n, GLuint * textures) { (void) n; (void) textures; } -static void GLAPIENTRY nop_GetPointerv(GLenum pname, GLvoid ** params) +void GLAPIENTRY nop_GetPointerv(GLenum pname, GLvoid ** params) { (void) pname; (void) params; } -static GLboolean GLAPIENTRY nop_IsTexture(GLuint texture) +GLboolean GLAPIENTRY nop_IsTexture(GLuint texture) { (void) texture; return 0; } -static void GLAPIENTRY nop_PrioritizeTextures(GLsizei n, const GLuint * textures, const GLclampf * priorities) +void GLAPIENTRY nop_PrioritizeTextures(GLsizei n, const GLuint * textures, const GLclampf * priorities) { (void) n; (void) textures; (void) priorities; } -static void GLAPIENTRY nop_TexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid * pixels) +void GLAPIENTRY nop_TexSubImage1D(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid * pixels) { (void) target; (void) level; (void) xoffset; (void) width; (void) format; (void) type; (void) pixels; } -static void GLAPIENTRY nop_TexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels) +void GLAPIENTRY nop_TexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid * pixels) { (void) target; (void) level; (void) xoffset; (void) yoffset; (void) width; (void) height; (void) format; (void) type; (void) pixels; } -static void GLAPIENTRY nop_PopClientAttrib(void) +void GLAPIENTRY nop_PopClientAttrib(void) { } -static void GLAPIENTRY nop_PushClientAttrib(GLbitfield mask) +void GLAPIENTRY nop_PushClientAttrib(GLbitfield mask) { (void) mask; } @@ -2028,6 +2028,7 @@ const GLCLTPROCTABLE StubTable = #ifndef __i386__ + void GLAPIENTRY glNewList(GLuint list, GLenum mode) { IntGetCurrentDispatchTable()->NewList(list, mode); diff --git a/dll/opengl/opengl32/dllmain.c b/dll/opengl/opengl32/dllmain.c index dae16d28c9..6639d0decd 100644 --- a/dll/opengl/opengl32/dllmain.c +++ b/dll/opengl/opengl32/dllmain.c @@ -48,9 +48,8 @@ DllMain(HINSTANCE hInstance, DWORD Reason, LPVOID Reserved) #ifdef OPENGL32_USE_TLS if (!init_tls_data()) return FALSE; -#else - NtCurrentTeb()->glTable = &StubTable.glDispatchTable; #endif // defined(OPENGL32_USE_TLS) + IntSetCurrentDispatchTable(&StubTable.glDispatchTable); break; case DLL_THREAD_DETACH: diff --git a/dll/opengl/opengl32/glapi_x86.s b/dll/opengl/opengl32/glapi_x86.s index 2bfb61e7f7..81e697ea09 100644 --- a/dll/opengl/opengl32/glapi_x86.s +++ b/dll/opengl/opengl32/glapi_x86.s @@ -7,9 +7,11 @@ /* X86 opengl API entry points, fast forward to the current thread's dispatch table */ #include <asm.inc> +#include <ks386.inc> .code +#ifdef OPENG32_USE_TLS EXTERN _OglTlsIndex:DWORD EXTERN _TlsGetValue@4:PROC @@ -22,6 +24,23 @@ PUBLIC _gl&name&@&stack jmp dword ptr [eax+4*VAL(offset)] .ENDP ENDM +#else +MACRO(USE_GL_FUNC, name, offset, stack) +EXTERN _nop_&name@&stack:PROC +PUBLIC _gl&name&@&stack +.PROC _gl&name&@&stack + /* Get the TEB */ + mov eax, fs:[TEB_SELF] + /* Get the GL table */ + mov eax, [eax + TEB_GL_TABLE] + /* If we don't have a dispatch table, call the nop */ + test eax, eax + jz _nop_&name&@&stack + /* Jump into the ICD */ + jmp dword ptr [eax+4*VAL(offset)] +.ENDP +ENDM +#endif USE_GL_FUNC Accum, 213, 8 USE_GL_FUNC AlphaFunc, 240, 8 @@ -360,4 +379,4 @@ USE_GL_FUNC Vertex4sv, 149, 4 USE_GL_FUNC VertexPointer, 321, 16 USE_GL_FUNC Viewport, 305, 16 -END \ No newline at end of file +END diff --git a/dll/opengl/opengl32/opengl32.h b/dll/opengl/opengl32/opengl32.h index 0aadd6782a..b454ac5051 100644 --- a/dll/opengl/opengl32/opengl32.h +++ b/dll/opengl/opengl32/opengl32.h @@ -17,6 +17,10 @@ #include <winddi.h> #include <GL/gl.h> +#ifndef OPENGL32_USE_TLS +#include <pstypes.h> +#endif + #include <wine/debug.h> #include "icd.h" @@ -124,7 +128,7 @@ C_ASSERT(FIELD_OFFSET(struct Opengl32_ThreadData, glDispatchTable) == 0); /* dllmain.c */ BOOL init_tls_data(void); -static inline +FORCEINLINE void IntMakeCurrent(HGLRC hglrc, HDC hdc, struct wgl_dc_data* dc_data) { @@ -143,7 +147,7 @@ IntMakeCurrent(HGLRC hglrc, HDC hdc, struct wgl_dc_data* dc_data) thread_data->dc_data = dc_data; } -static inline +FORCEINLINE HGLRC IntGetCurrentRC(void) { @@ -151,16 +155,7 @@ IntGetCurrentRC(void) return data ? data->hglrc : NULL; } -static inline -DHGLRC -IntGetCurrentDHGLRC(void) -{ - struct wgl_context* ctx = (struct wgl_context*)IntGetCurrentRC(); - if(!ctx) return NULL; - return ctx->dhglrc; -} - -static inline +FORCEINLINE HDC IntGetCurrentDC(void) { @@ -168,7 +163,7 @@ IntGetCurrentDC(void) return data ? data->hdc : NULL; } -static inline +FORCEINLINE struct wgl_dc_data* IntGetCurrentDcData(void) { @@ -176,7 +171,7 @@ IntGetCurrentDcData(void) return data->dc_data; } -static inline +FORCEINLINE const GLDISPATCHTABLE * IntGetCurrentDispatchTable(void) { @@ -184,7 +179,7 @@ IntGetCurrentDispatchTable(void) return data->glDispatchTable; } -static inline +FORCEINLINE void IntSetCurrentDispatchTable(const GLDISPATCHTABLE* table) { @@ -192,7 +187,7 @@ IntSetCurrentDispatchTable(const GLDISPATCHTABLE* table) data->glDispatchTable = table; } -static inline +FORCEINLINE void IntSetCurrentICDPrivate(void* value) { @@ -200,7 +195,7 @@ IntSetCurrentICDPrivate(void* value) data->icdData = value; } -static inline +FORCEINLINE void* IntGetCurrentICDPrivate(void) { @@ -210,14 +205,77 @@ IntGetCurrentICDPrivate(void) #else -static inline +FORCEINLINE const GLDISPATCHTABLE* IntGetCurrentDispatchTable(void) { return (GLDISPATCHTABLE*)NtCurrentTeb()->glTable; } + +FORCEINLINE +void +IntSetCurrentDispatchTable(const GLDISPATCHTABLE* table) +{ + NtCurrentTeb()->glTable = (void*)table; +} + +FORCEINLINE +void +IntMakeCurrent(HGLRC hglrc, HDC hdc, struct wgl_dc_data* dc_data) +{ + TEB* CurrentTeb = NtCurrentTeb(); + + CurrentTeb->glCurrentRC = hglrc; + CurrentTeb->glReserved2 = hdc; + CurrentTeb->glContext = dc_data; +} + +FORCEINLINE +HGLRC +IntGetCurrentRC(void) +{ + return NtCurrentTeb()->glCurrentRC; +} + +FORCEINLINE +HDC +IntGetCurrentDC(void) +{ + return NtCurrentTeb()->glReserved2; +} + +static inline +struct wgl_dc_data* +IntGetCurrentDcData(void) +{ + return NtCurrentTeb()->glContext; +} + +FORCEINLINE +void +IntSetCurrentICDPrivate(void* value) +{ + NtCurrentTeb()->glReserved1[0] = (ULONG_PTR)value; +} + +FORCEINLINE +void* +IntGetCurrentICDPrivate(void) +{ + return (void*)NtCurrentTeb()->glReserved1[0]; +} + #endif // defined(OPENGL32_USE_TLS) +FORCEINLINE +DHGLRC +IntGetCurrentDHGLRC(void) +{ + struct wgl_context* ctx = (struct wgl_context*)IntGetCurrentRC(); + if(!ctx) return NULL; + return ctx->dhglrc; +} + /* Software implementation functions */ INT sw_DescribePixelFormat(HDC hdc, INT format, UINT size, PIXELFORMATDESCRIPTOR* descr); BOOL sw_SetPixelFormat(HDC hdc, struct wgl_dc_data*, INT format); diff --git a/sdk/include/asm/ks386.template.h b/sdk/include/asm/ks386.template.h index e6d53a3974..dedeefa0af 100644 --- a/sdk/include/asm/ks386.template.h +++ b/sdk/include/asm/ks386.template.h @@ -736,6 +736,7 @@ OFFSET(TEB_SELF, TEB, NtTib.Self), OFFSET(TEB_PEB, TEB, ProcessEnvironmentBlock), OFFSET(TEB_EXCEPTION_CODE, TEB, ExceptionCode), OFFSET(TEB_ACTIVATION_CONTEXT_STACK_POINTER, TEB, ActivationContextStackPointer), +OFFSET(TEB_GL_TABLE, TEB, glTable), OFFSET(TEB_DEALLOCATION_STACK, TEB, DeallocationStack), OFFSET(TEB_GDI_BATCH_COUNT, TEB, GdiBatchCount), OFFSET(TEB_GUARANTEED_STACK_BYTES, TEB, GuaranteedStackBytes), diff --git a/sdk/include/ndk/i386/asm.h b/sdk/include/ndk/i386/asm.h index 4c5318eaee..3c203e5890 100644 --- a/sdk/include/ndk/i386/asm.h +++ b/sdk/include/ndk/i386/asm.h @@ -414,6 +414,7 @@ Author: #define TEB_PEB 0x30 #define TEB_EXCEPTION_CODE 0x1A4 #define TEB_ACTIVATION_CONTEXT_STACK_POINTER 0x1A8 +#define TEB_GL_TABLE 0xBE8 #define TEB_DEALLOCATION_STACK 0xE0C #define TEB_GDI_BATCH_COUNT 0xF70 #define TEB_GUARANTEED_STACK_BYTES 0xF78

1 0

[reactos] 01/01: [COMCTL32] Button: Use double buffering when themes are enabled.
by Giannis Adamopoulos 20 Nov '17

20 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1bfbdb612305efa463d3f… commit 1bfbdb612305efa463d3fc5846e0c3b40dcc3a02 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Mon Nov 20 18:51:03 2017 +0200 [COMCTL32] Button: Use double buffering when themes are enabled. --- dll/win32/comctl32/theme_button.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dll/win32/comctl32/theme_button.c b/dll/win32/comctl32/theme_button.c index 755f4a7f06..4e72b0aa29 100644 --- a/dll/win32/comctl32/theme_button.c +++ b/dll/win32/comctl32/theme_button.c @@ -456,6 +456,36 @@ BOOL BUTTON_PaintWithTheme(HTHEME theme, HWND hwnd, HDC hParamDC, LPARAM prfFlag else drawState = STATE_NORMAL; + if (paint == PB_draw || paint == CB_draw) + { + HDC hdc; + HBITMAP hbmp; + RECT rc; + + GetClientRect(hwnd, &rc); + hdc = CreateCompatibleDC(hParamDC); + hbmp = CreateCompatibleBitmap(hParamDC, rc.right, rc.bottom); + if (hdc && hbmp) + { + SelectObject(hdc, hbmp); + + paint(theme, hwnd, hdc, drawState, dtFlags, state & BST_FOCUS, prfFlag); + + BitBlt(hParamDC, 0, 0, rc.right, rc.bottom, hdc, 0, 0, SRCCOPY); + DeleteObject(hbmp); + DeleteDC(hdc); + return TRUE; + } + else + { + ERR("Failed to create DC and bitmap for double buffering\n"); + if (hbmp) + DeleteObject(hbmp); + if (hdc) + DeleteDC(hdc); + } + } + paint(theme, hwnd, hParamDC, drawState, dtFlags, state & BST_FOCUS, prfFlag); return TRUE; }

1 0

[reactos] 01/01: [EXT2FS] For some reason we get error: conflicting types for 'do_split' when compiling with clang-cl so work around this with FIXMEs. CORE-11799 (#94)
by Amine Khaldi 19 Nov '17

19 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3172ae098ba64e16245d… commit b3172ae098ba64e16245d0517aa454417caa9336 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Nov 19 15:42:03 2017 +0100 [EXT2FS] For some reason we get error: conflicting types for 'do_split' when compiling with clang-cl so work around this with FIXMEs. CORE-11799 (#94) --- drivers/filesystems/ext2/inc/ext2fs.h | 3 ++- drivers/filesystems/ext2/src/ext3/htree.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/filesystems/ext2/inc/ext2fs.h b/drivers/filesystems/ext2/inc/ext2fs.h index 525a1d1bc9..10ec2eab5f 100644 --- a/drivers/filesystems/ext2/inc/ext2fs.h +++ b/drivers/filesystems/ext2/inc/ext2fs.h @@ -2495,7 +2495,8 @@ struct buffer_head *ext3_bread(struct ext2_icb *icb, struct inode *inode, int add_dirent_to_buf(struct ext2_icb *icb, struct dentry *dentry, struct inode *inode, struct ext3_dir_entry_2 *de, struct buffer_head *bh); -#if !defined(__REACTOS__) || defined(_MSC_VER) +#if !defined(__REACTOS__) || (defined(_MSC_VER) && !defined(__clang__)) +/* FIXME: Inspect the clang-cl code path */ struct ext3_dir_entry_2 * do_split(struct ext2_icb *icb, struct inode *dir, struct buffer_head **bh,struct dx_frame *frame, diff --git a/drivers/filesystems/ext2/src/ext3/htree.c b/drivers/filesystems/ext2/src/ext3/htree.c index 8d5bd4dab4..edf59350bc 100644 --- a/drivers/filesystems/ext2/src/ext3/htree.c +++ b/drivers/filesystems/ext2/src/ext3/htree.c @@ -1596,6 +1596,11 @@ int ext3_release_dir (struct inode * inode, struct file * filp) return 0; } +/* FIXME: Inspect the clang-cl code path */ +#if defined(__REACTOS__) && defined(__clang__) +struct ext3_dir_entry_2* do_split(struct ext2_icb *icb, struct inode *dir, struct buffer_head **bh,struct dx_frame *frame, struct dx_hash_info *hinfo, int *error); +#endif + /* * Returns 0 for success, or a negative error value */

1 0

[reactos] 01/01: [REISERFS] Do not take this code path when compiling with clang. CORE-11799 (#94)
by Amine Khaldi 19 Nov '17

19 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06b0cc74c5e44c143b69c… commit 06b0cc74c5e44c143b69cf36cf20afafb9e02227 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Nov 19 15:24:49 2017 +0100 [REISERFS] Do not take this code path when compiling with clang. CORE-11799 (#94) --- drivers/filesystems/reiserfs/src/read.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/filesystems/reiserfs/src/read.c b/drivers/filesystems/reiserfs/src/read.c index f0622669d5..b2580e096e 100644 --- a/drivers/filesystems/reiserfs/src/read.c +++ b/drivers/filesystems/reiserfs/src/read.c @@ -605,7 +605,7 @@ RfsdReadFile(IN PRFSD_IRP_CONTEXT IrpContext) Length = IoStackLocation->Parameters.Read.Length; ByteOffset = IoStackLocation->Parameters.Read.ByteOffset; -#ifdef _MSC_VER +#if defined(_MSC_VER) && !defined(__clang__) KdPrint(("$$$ " __FUNCTION__ " on key: %x,%xh to read %i bytes at the offset %xh in the file\n", Fcb->RfsdMcb->Key.k_dir_id, Fcb->RfsdMcb->Key.k_objectid, Length, ByteOffset.QuadPart));

1 0

[reactos] 01/01: [CRT/INTRIN] Leverage __has_builtin() with the intrinsics. Dedicated to Thomas. CORE-11799 (#94)
by Amine Khaldi 19 Nov '17

19 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b4393815233cad251bba3… commit b4393815233cad251bba38259fbef31bc6753436 Author: Amine Khaldi <amine.khaldi(a)reactos.org> AuthorDate: Sun Nov 19 15:09:06 2017 +0100 [CRT/INTRIN] Leverage __has_builtin() with the intrinsics. Dedicated to Thomas. CORE-11799 (#94) --- sdk/include/crt/mingw32/intrin.h | 2 + sdk/include/crt/mingw32/intrin_x86.h | 188 +++++++++++++++++++++++------------ 2 files changed, 126 insertions(+), 64 deletions(-) diff --git a/sdk/include/crt/mingw32/intrin.h b/sdk/include/crt/mingw32/intrin.h index 03edc8bfaf..d1377939f4 100644 --- a/sdk/include/crt/mingw32/intrin.h +++ b/sdk/include/crt/mingw32/intrin.h @@ -32,7 +32,9 @@ #ifdef __clang__ #define __INTRIN_INLINE __forceinline +#define HAS_BUILTIN(x) __has_builtin(x) #else +#define HAS_BUILTIN(x) 0 #define __ATTRIBUTE_ARTIFICIAL __attribute__((artificial)) #define __INTRIN_INLINE extern __inline__ __attribute__((__always_inline__,__gnu_inline__)) __ATTRIBUTE_ARTIFICIAL #endif diff --git a/sdk/include/crt/mingw32/intrin_x86.h b/sdk/include/crt/mingw32/intrin_x86.h index f474a818d5..368dab73d6 100644 --- a/sdk/include/crt/mingw32/intrin_x86.h +++ b/sdk/include/crt/mingw32/intrin_x86.h @@ -89,35 +89,41 @@ __INTRIN_INLINE void* __cdecl memcpy(void* dest, const void* source, size_t num) /*** Memory barriers ***/ -#ifndef __clang__ +#if !HAS_BUILTIN(_ReadWriteBarrier) __INTRIN_INLINE void _ReadWriteBarrier(void) { __asm__ __volatile__("" : : : "memory"); } +#endif /* GCC only supports full barriers */ #define _ReadBarrier _ReadWriteBarrier #define _WriteBarrier _ReadWriteBarrier +#if !HAS_BUILTIN(_mm_mfence) __INTRIN_INLINE void _mm_mfence(void) { __asm__ __volatile__("mfence" : : : "memory"); } +#endif +#if !HAS_BUILTIN(_mm_lfence) __INTRIN_INLINE void _mm_lfence(void) { _ReadBarrier(); __asm__ __volatile__("lfence"); _ReadBarrier(); } +#endif +#if !HAS_BUILTIN(_mm_sfence) __INTRIN_INLINE void _mm_sfence(void) { _WriteBarrier(); __asm__ __volatile__("sfence"); _WriteBarrier(); } -#endif /* !__clang__ */ +#endif #ifdef __x86_64__ __INTRIN_INLINE void __faststorefence(void) @@ -142,18 +148,18 @@ __INTRIN_INLINE short _InterlockedCompareExchange16(volatile short * Destination return __sync_val_compare_and_swap(Destination, Comperand, Exchange); } -#ifndef __clang__ - +#if !HAS_BUILTIN(_InterlockedCompareExchange) __INTRIN_INLINE long __cdecl _InterlockedCompareExchange(volatile long * Destination, long Exchange, long Comperand) { return __sync_val_compare_and_swap(Destination, Comperand, Exchange); } +#endif +#if !HAS_BUILTIN(_InterlockedCompareExchangePointer) __INTRIN_INLINE void * _InterlockedCompareExchangePointer(void * volatile * Destination, void * Exchange, void * Comperand) { return (void *)__sync_val_compare_and_swap(Destination, Comperand, Exchange); } - #endif __INTRIN_INLINE char _InterlockedExchange8(volatile char * Target, char Value) @@ -170,22 +176,22 @@ __INTRIN_INLINE short _InterlockedExchange16(volatile short * Target, short Valu return __sync_lock_test_and_set(Target, Value); } -#ifndef __clang__ - +#if !HAS_BUILTIN(_InterlockedExchange) __INTRIN_INLINE long __cdecl _InterlockedExchange(volatile long * Target, long Value) { /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ __sync_synchronize(); return __sync_lock_test_and_set(Target, Value); } +#endif +#if !HAS_BUILTIN(_InterlockedExchangePointer) __INTRIN_INLINE void * _InterlockedExchangePointer(void * volatile * Target, void * Value) { /* NOTE: __sync_lock_test_and_set would be an acquire barrier, so we force a full barrier */ __sync_synchronize(); return (void *)__sync_lock_test_and_set(Target, Value); } - #endif #if defined(__x86_64__) @@ -207,7 +213,7 @@ __INTRIN_INLINE short _InterlockedExchangeAdd16(volatile short * Addend, short V return __sync_fetch_and_add(Addend, Value); } -#ifndef __clang__ +#if !HAS_BUILTIN(_InterlockedExchangeAdd) __INTRIN_INLINE long __cdecl _InterlockedExchangeAdd(volatile long * Addend, long Value) { return __sync_fetch_and_add(Addend, Value); @@ -287,12 +293,14 @@ __INTRIN_INLINE long long _InterlockedXor64(volatile long long * value, long lon } #endif -#ifndef __clang__ +#if !HAS_BUILTIN(_InterlockedDecrement) __INTRIN_INLINE long __cdecl _InterlockedDecrement(volatile long * lpAddend) { return __sync_sub_and_fetch(lpAddend, 1); } +#endif +#if !HAS_BUILTIN(_InterlockedIncrement) __INTRIN_INLINE long __cdecl _InterlockedIncrement(volatile long * lpAddend) { return __sync_add_and_fetch(lpAddend, 1); @@ -323,85 +331,106 @@ __INTRIN_INLINE long long _InterlockedIncrement64(volatile long long * lpAddend) #else /* (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 */ -#ifndef __clang__ - +#if !HAS_BUILTIN(_InterlockedCompareExchange8) __INTRIN_INLINE char _InterlockedCompareExchange8(volatile char * Destination, char Exchange, char Comperand) { char retval = Comperand; __asm__("lock; cmpxchgb %b[Exchange], %[Destination]" : [retval] "+a" (retval) : [Destination] "m" (*Destination), [Exchange] "q" (Exchange) : "memory"); return retval; } +#endif +#if !HAS_BUILTIN(_InterlockedCompareExchange16) __INTRIN_INLINE short _InterlockedCompareExchange16(volatile short * Destination, short Exchange, short Comperand) { short retval = Comperand; __asm__("lock; cmpxchgw %w[Exchange], %[Destination]" : [retval] "+a" (retval) : [Destination] "m" (*Destination), [Exchange] "q" (Exchange): "memory"); return retval; } +#endif +#if !HAS_BUILTIN(_InterlockedCompareExchange) __INTRIN_INLINE long _InterlockedCompareExchange(volatile long * Destination, long Exchange, long Comperand) { long retval = Comperand; __asm__("lock; cmpxchgl %k[Exchange], %[Destination]" : [retval] "+a" (retval) : [Destination] "m" (*Destination), [Exchange] "q" (Exchange): "memory"); return retval; } +#endif +#if !HAS_BUILTIN(_InterlockedCompareExchangePointer) __INTRIN_INLINE void * _InterlockedCompareExchangePointer(void * volatile * Destination, void * Exchange, void * Comperand) { void * retval = (void *)Comperand; __asm__("lock; cmpxchgl %k[Exchange], %[Destination]" : [retval] "=a" (retval) : "[retval]" (retval), [Destination] "m" (*Destination), [Exchange] "q" (Exchange) : "memory"); return retval; } +#endif +#if !HAS_BUILTIN(_InterlockedExchange8) __INTRIN_INLINE char _InterlockedExchange8(volatile char * Target, char Value) { char retval = Value; __asm__("xchgb %[retval], %[Target]" : [retval] "+r" (retval) : [Target] "m" (*Target) : "memory"); return retval; } +#endif +#if !HAS_BUILTIN(_InterlockedExchange16) __INTRIN_INLINE short _InterlockedExchange16(volatile short * Target, short Value) { short retval = Value; __asm__("xchgw %[retval], %[Target]" : [retval] "+r" (retval) : [Target] "m" (*Target) : "memory"); return retval; } +#endif +#if !HAS_BUILTIN(_InterlockedExchange) __INTRIN_INLINE long _InterlockedExchange(volatile long * Target, long Value) { long retval = Value; __asm__("xchgl %[retval], %[Target]" : [retval] "+r" (retval) : [Target] "m" (*Target) : "memory"); return retval; } +#endif +#if !HAS_BUILTIN(_InterlockedExchangePointer) __INTRIN_INLINE void * _InterlockedExchangePointer(void * volatile * Target, void * Value) { void * retval = Value; __asm__("xchgl %[retval], %[Target]" : [retval] "+r" (retval) : [Target] "m" (*Target) : "memory"); return retval; } +#endif +#if !HAS_BUILTIN(_InterlockedExchangeAdd8) __INTRIN_INLINE char _InterlockedExchangeAdd8(char volatile * Addend, char Value) { char retval = Value; __asm__("lock; xaddb %[retval], %[Addend]" : [retval] "+r" (retval) : [Addend] "m" (*Addend) : "memory"); return retval; } +#endif +#if !HAS_BUILTIN(_InterlockedExchangeAdd16) __INTRIN_INLINE short _InterlockedExchangeAdd16(volatile short * Addend, short Value) { short retval = Value; __asm__("lock; xaddw %[retval], %[Addend]" : [retval] "+r" (retval) : [Addend] "m" (*Addend) : "memory"); return retval; } +#endif +#if !HAS_BUILTIN(_InterlockedExchangeAdd) __INTRIN_INLINE long _InterlockedExchangeAdd(volatile long * Addend, long Value) { long retval = Value; __asm__("lock; xaddl %[retval], %[Addend]" : [retval] "+r" (retval) : [Addend] "m" (*Addend) : "memory"); return retval; } +#endif +#if !HAS_BUILTIN(_InterlockedAnd8) __INTRIN_INLINE char _InterlockedAnd8(volatile char * value, char mask) { char x; @@ -418,7 +447,9 @@ __INTRIN_INLINE char _InterlockedAnd8(volatile char * value, char mask) return y; } +#endif +#if !HAS_BUILTIN(_InterlockedAnd16) __INTRIN_INLINE short _InterlockedAnd16(volatile short * value, short mask) { short x; @@ -435,7 +466,9 @@ __INTRIN_INLINE short _InterlockedAnd16(volatile short * value, short mask) return y; } +#endif +#if !HAS_BUILTIN(_InterlockedAnd) __INTRIN_INLINE long _InterlockedAnd(volatile long * value, long mask) { long x; @@ -452,7 +485,9 @@ __INTRIN_INLINE long _InterlockedAnd(volatile long * value, long mask) return y; } +#endif +#if !HAS_BUILTIN(_InterlockedOr8) __INTRIN_INLINE char _InterlockedOr8(volatile char * value, char mask) { char x; @@ -469,7 +504,9 @@ __INTRIN_INLINE char _InterlockedOr8(volatile char * value, char mask) return y; } +#endif +#if !HAS_BUILTIN(_InterlockedOr16) __INTRIN_INLINE short _InterlockedOr16(volatile short * value, short mask) { short x; @@ -486,7 +523,9 @@ __INTRIN_INLINE short _InterlockedOr16(volatile short * value, short mask) return y; } +#endif +#if !HAS_BUILTIN(_InterlockedOr) __INTRIN_INLINE long _InterlockedOr(volatile long * value, long mask) { long x; @@ -503,7 +542,9 @@ __INTRIN_INLINE long _InterlockedOr(volatile long * value, long mask) return y; } +#endif +#if !HAS_BUILTIN(_InterlockedXor8) __INTRIN_INLINE char _InterlockedXor8(volatile char * value, char mask) { char x; @@ -520,7 +561,9 @@ __INTRIN_INLINE char _InterlockedXor8(volatile char * value, char mask) return y; } +#endif +#if !HAS_BUILTIN(_InterlockedXor16) __INTRIN_INLINE short _InterlockedXor16(volatile short * value, short mask) { short x; @@ -537,7 +580,9 @@ __INTRIN_INLINE short _InterlockedXor16(volatile short * value, short mask) return y; } +#endif +#if !HAS_BUILTIN(_InterlockedXor) __INTRIN_INLINE long _InterlockedXor(volatile long * value, long mask) { long x; @@ -554,28 +599,35 @@ __INTRIN_INLINE long _InterlockedXor(volatile long * value, long mask) return y; } +#endif +#if !HAS_BUILTIN(_InterlockedDecrement) __INTRIN_INLINE long _InterlockedDecrement(volatile long * lpAddend) { return _InterlockedExchangeAdd(lpAddend, -1) - 1; } +#endif +#if !HAS_BUILTIN(_InterlockedIncrement) __INTRIN_INLINE long _InterlockedIncrement(volatile long * lpAddend) { return _InterlockedExchangeAdd(lpAddend, 1) + 1; } +#endif +#if !HAS_BUILTIN(_InterlockedDecrement16) __INTRIN_INLINE short _InterlockedDecrement16(volatile short * lpAddend) { return _InterlockedExchangeAdd16(lpAddend, -1) - 1; } +#endif +#if !HAS_BUILTIN(_InterlockedIncrement16) __INTRIN_INLINE short _InterlockedIncrement16(volatile short * lpAddend) { return _InterlockedExchangeAdd16(lpAddend, 1) + 1; } - -#endif /* !__clang__ */ +#endif #if defined(__x86_64__) __INTRIN_INLINE long long _InterlockedDecrement64(volatile long long * lpAddend) @@ -598,9 +650,9 @@ __INTRIN_INLINE long long _InterlockedCompareExchange64(volatile long long * Des return __sync_val_compare_and_swap(Destination, Comperand, Exchange); } -#else +#else /* (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 && defined(__x86_64__) */ -#ifndef __clang__ +#if !HAS_BUILTIN(_InterlockedCompareExchange64) __INTRIN_INLINE long long _InterlockedCompareExchange64(volatile long long * Destination, long long Exchange, long long Comperand) { long long retval = Comperand; @@ -617,10 +669,10 @@ __INTRIN_INLINE long long _InterlockedCompareExchange64(volatile long long * Des return retval; } -#endif /* !__clang__ */ - #endif +#endif /* (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100 && defined(__x86_64__) */ + #ifdef __i386__ __INTRIN_INLINE long _InterlockedAddLargeStatistic(volatile long long * Addend, long Value) { @@ -655,14 +707,14 @@ __INTRIN_INLINE unsigned char _interlockedbittestandreset64(volatile long long * } #endif -#ifndef __clang__ +#if !HAS_BUILTIN(_interlockedbittestandset) __INTRIN_INLINE unsigned char _interlockedbittestandset(volatile long * a, long b) { unsigned char retval; __asm__("lock; btsl %[b], %[a]; setc %b[retval]" : [retval] "=q" (retval), [a] "+m" (*a) : [b] "Ir" (b) : "memory"); return retval; } -#endif /* !__clang__ */ +#endif #if defined(__x86_64__) __INTRIN_INLINE unsigned char _interlockedbittestandset64(volatile long long * a, long long b) @@ -675,7 +727,7 @@ __INTRIN_INLINE unsigned char _interlockedbittestandset64(volatile long long * a /*** String operations ***/ -#ifndef __clang__ +#if !HAS_BUILTIN(__stosb) /* NOTE: we don't set a memory clobber in the __stosX functions because Visual C++ doesn't */ __INTRIN_INLINE void __stosb(unsigned char * Dest, unsigned char Data, size_t Count) { @@ -873,30 +925,32 @@ __INTRIN_INLINE void __writefsdword(unsigned long Offset, unsigned long Data) __asm__ __volatile__("movl %k[Data], %%fs:%a[Offset]" : : [Offset] "ir" (Offset), [Data] "ir" (Data) : "memory"); } -#ifndef __clang__ - +#if !HAS_BUILTIN(__readfsbyte) __INTRIN_INLINE unsigned char __readfsbyte(unsigned long Offset) { unsigned char value; __asm__ __volatile__("movb %%fs:%a[Offset], %b[value]" : [value] "=q" (value) : [Offset] "ir" (Offset)); return value; } +#endif +#if !HAS_BUILTIN(__readfsword) __INTRIN_INLINE unsigned short __readfsword(unsigned long Offset) { unsigned short value; __asm__ __volatile__("movw %%fs:%a[Offset], %w[value]" : [value] "=r" (value) : [Offset] "ir" (Offset)); return value; } +#endif +#if !HAS_BUILTIN(__readfsdword) __INTRIN_INLINE unsigned long __readfsdword(unsigned long Offset) { unsigned long value; __asm__ __volatile__("movl %%fs:%a[Offset], %k[value]" : [value] "=r" (value) : [Offset] "ir" (Offset)); return value; } - -#endif /* !__clang__ */ +#endif __INTRIN_INLINE void __incfsbyte(unsigned long Offset) { @@ -943,21 +997,21 @@ __INTRIN_INLINE void __addfsdword(unsigned long Offset, unsigned long Data) /*** Bit manipulation ***/ -#ifndef __clang__ - +#if !HAS_BUILTIN(_BitScanForward) __INTRIN_INLINE unsigned char _BitScanForward(unsigned long * Index, unsigned long Mask) { __asm__("bsfl %[Mask], %[Index]" : [Index] "=r" (*Index) : [Mask] "mr" (Mask)); return Mask ? 1 : 0; } +#endif +#if !HAS_BUILTIN(_BitScanReverse) __INTRIN_INLINE unsigned char _BitScanReverse(unsigned long * Index, unsigned long Mask) { __asm__("bsrl %[Mask], %[Index]" : [Index] "=r" (*Index) : [Mask] "mr" (Mask)); return Mask ? 1 : 0; } - -#endif /* !__clang__ */ +#endif /* NOTE: again, the bizarre implementation follows Visual C++ */ __INTRIN_INLINE unsigned char _bittest(const long * a, long b) @@ -1076,32 +1130,34 @@ __INTRIN_INLINE unsigned char _bittestandcomplement64(long long * a, long long b return retval; } -#endif - -#ifndef __clang__ +#endif /* __x86_64__ */ +#if !HAS_BUILTIN(_rotl8) __INTRIN_INLINE unsigned char __cdecl _rotl8(unsigned char value, unsigned char shift) { unsigned char retval; __asm__("rolb %b[shift], %b[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; } +#endif +#if !HAS_BUILTIN(_rotl16) __INTRIN_INLINE unsigned short __cdecl _rotl16(unsigned short value, unsigned char shift) { unsigned short retval; __asm__("rolw %b[shift], %w[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; } +#endif +#if !HAS_BUILTIN(_rotl) __INTRIN_INLINE unsigned int __cdecl _rotl(unsigned int value, int shift) { unsigned int retval; __asm__("roll %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; } - -#endif /* !__clang__ */ +#endif #ifdef __x86_64__ __INTRIN_INLINE unsigned long long _rotl64(unsigned long long value, int shift) @@ -1111,39 +1167,41 @@ __INTRIN_INLINE unsigned long long _rotl64(unsigned long long value, int shift) return retval; } #else /* __x86_64__ */ -#ifndef __clang__ +#if !HAS_BUILTIN(_rotl64) __INTRIN_INLINE unsigned long long __cdecl _rotl64(unsigned long long value, int shift) { /* FIXME: this is probably not optimal */ return (value << shift) | (value >> (64 - shift)); } -#endif /* !__clang__ */ +#endif /* !HAS_BUILTIN(_rotl64) */ #endif /* __x86_64__ */ -#ifndef __clang__ - +#if !HAS_BUILTIN(_rotr) __INTRIN_INLINE unsigned int __cdecl _rotr(unsigned int value, int shift) { unsigned int retval; __asm__("rorl %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; } +#endif +#if !HAS_BUILTIN(_rotr8) __INTRIN_INLINE unsigned char __cdecl _rotr8(unsigned char value, unsigned char shift) { unsigned char retval; __asm__("rorb %b[shift], %b[retval]" : [retval] "=qm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; } +#endif +#if !HAS_BUILTIN(_rotr16) __INTRIN_INLINE unsigned short __cdecl _rotr16(unsigned short value, unsigned char shift) { unsigned short retval; __asm__("rorw %b[shift], %w[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; } - -#endif /* !__clang__ */ +#endif #ifdef __x86_64__ __INTRIN_INLINE unsigned long long _rotr64(unsigned long long value, int shift) @@ -1153,32 +1211,32 @@ __INTRIN_INLINE unsigned long long _rotr64(unsigned long long value, int shift) return retval; } #else /* __x86_64__ */ -#ifndef __clang__ +#if !HAS_BUILTIN(_rotr64) __INTRIN_INLINE unsigned long long __cdecl _rotr64(unsigned long long value, int shift) { /* FIXME: this is probably not optimal */ return (value >> shift) | (value << (64 - shift)); } -#endif /* !__clang__ */ +#endif /* !HAS_BUILTIN(_rotr64) */ #endif /* __x86_64__ */ -#ifndef __clang__ - +#if !HAS_BUILTIN(_lrotl) __INTRIN_INLINE unsigned long __cdecl _lrotl(unsigned long value, int shift) { unsigned long retval; __asm__("roll %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; } +#endif +#if !HAS_BUILTIN(_lrotr) __INTRIN_INLINE unsigned long __cdecl _lrotr(unsigned long value, int shift) { unsigned long retval; __asm__("rorl %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; } - -#endif /* !__clang__ */ +#endif /* NOTE: in __ll_lshift, __ll_rshift and __ull_rshift we use the "A" @@ -1278,19 +1336,19 @@ __INTRIN_INLINE unsigned short __lzcnt16(unsigned short value) return __builtin_clz(value); } -#ifndef __clang__ - +#if !HAS_BUILTIN(__popcnt) __INTRIN_INLINE unsigned int __popcnt(unsigned int value) { return __builtin_popcount(value); } +#endif +#if !HAS_BUILTIN(__popcnt16) __INTRIN_INLINE unsigned short __popcnt16(unsigned short value) { return __builtin_popcount(value); } - -#endif /* !__clang__ */ +#endif #ifdef __x86_64__ __INTRIN_INLINE unsigned long long __lzcnt64(unsigned long long value) @@ -1306,23 +1364,23 @@ __INTRIN_INLINE unsigned long long __popcnt64(unsigned long long value) /*** 64-bit math ***/ -#ifndef __clang__ - +#if !HAS_BUILTIN(__emul) __INTRIN_INLINE long long __emul(int a, int b) { long long retval; __asm__("imull %[b]" : "=A" (retval) : [a] "a" (a), [b] "rm" (b)); return retval; } +#endif +#if !HAS_BUILTIN(__emulu) __INTRIN_INLINE unsigned long long __emulu(unsigned int a, unsigned int b) { unsigned long long retval; __asm__("mull %[b]" : "=A" (retval) : [a] "a" (a), [b] "rm" (b)); return retval; } - -#endif /* !__clang__ */ +#endif __INTRIN_INLINE long long __cdecl _abs64(long long value) { @@ -1479,7 +1537,7 @@ __INTRIN_INLINE void __cpuidex(int CPUInfo[4], int InfoType, int ECXValue) __asm__ __volatile__("cpuid" : "=a" (CPUInfo[0]), "=b" (CPUInfo[1]), "=c" (CPUInfo[2]), "=d" (CPUInfo[3]) : "a" (InfoType), "c" (ECXValue)); } -#ifndef __clang__ +#if !HAS_BUILTIN(__rdtsc) __INTRIN_INLINE unsigned long long __rdtsc(void) { #ifdef __x86_64__ @@ -1492,7 +1550,7 @@ __INTRIN_INLINE unsigned long long __rdtsc(void) return retval; #endif } -#endif /* !__clang__ */ +#endif /* !HAS_BUILTIN(__rdtsc) */ __INTRIN_INLINE void __writeeflags(uintptr_t Value) { @@ -1508,24 +1566,26 @@ __INTRIN_INLINE uintptr_t __readeflags(void) /*** Interrupts ***/ -#ifndef __clang__ - +#if !HAS_BUILTIN(__debugbreak) __INTRIN_INLINE void __cdecl __debugbreak(void) { __asm__("int $3"); } +#endif +#if !HAS_BUILTIN(__ud2) __INTRIN_INLINE void __ud2(void) { __asm__("ud2"); } +#endif +#if !HAS_BUILTIN(__int2c) __INTRIN_INLINE void __int2c(void) { __asm__("int $0x2c"); } - -#endif /* !__clang__ */ +#endif __INTRIN_INLINE void __cdecl _disable(void) { @@ -1542,7 +1602,7 @@ __INTRIN_INLINE void __halt(void) __asm__("hlt" : : : "memory"); } -#ifndef __clang__ +#if !HAS_BUILTIN(__fastfail) __declspec(noreturn) __INTRIN_INLINE void __fastfail(unsigned int Code) { @@ -1627,7 +1687,7 @@ __INTRIN_INLINE void __writecr4(unsigned int Data) __asm__("mov %[Data], %%cr4" : : [Data] "r" (Data) : "memory"); } -#ifndef __clang__ +#if !HAS_BUILTIN(__writecr8) __INTRIN_INLINE void __writecr8(unsigned int Data) { __asm__("mov %[Data], %%cr8" : : [Data] "r" (Data) : "memory"); @@ -1662,7 +1722,7 @@ __INTRIN_INLINE unsigned long __readcr4(void) return value; } -#ifndef __clang__ +#if !HAS_BUILTIN(__readcr8) __INTRIN_INLINE unsigned long __readcr8(void) { unsigned long value; @@ -1874,7 +1934,7 @@ __INTRIN_INLINE void _sgdt(void *Destination) /*** Misc operations ***/ -#ifndef __clang__ +#if !HAS_BUILTIN(_mm_pause) __INTRIN_INLINE void _mm_pause(void) { __asm__ __volatile__("pause" : : : "memory");

1 0

[reactos] 01/01: [UXTHEME] EnumThemes: Don't fail if a theme doesn't have a tooltip. CORE-13732
by Giannis Adamopoulos 19 Nov '17

19 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3a68bebf87e8254c97b19… commit 3a68bebf87e8254c97b1938f0f4609a034ab8e06 Author: Giannis Adamopoulos <gadamopoulos(a)reactos.org> AuthorDate: Sun Nov 19 16:02:44 2017 +0200 [UXTHEME] EnumThemes: Don't fail if a theme doesn't have a tooltip. CORE-13732 --- dll/win32/uxtheme/system.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/dll/win32/uxtheme/system.c b/dll/win32/uxtheme/system.c index 6496377111..84d703d157 100644 --- a/dll/win32/uxtheme/system.c +++ b/dll/win32/uxtheme/system.c @@ -1259,14 +1259,20 @@ HRESULT WINAPI EnumThemes(LPCWSTR pszThemePath, ENUMTHEMEPROC callback, wsprintfW(szPath, szFormat, szDir, wfd.cFileName, wfd.cFileName); hr = GetThemeDocumentationProperty(szPath, szDisplayName, szName, sizeof(szName)/sizeof(szName[0])); - if(SUCCEEDED(hr)) - hr = GetThemeDocumentationProperty(szPath, szTooltip, szTip, sizeof(szTip)/sizeof(szTip[0])); - if(SUCCEEDED(hr)) { - TRACE("callback(%s,%s,%s,%p)\n", debugstr_w(szPath), debugstr_w(szName), debugstr_w(szTip), lpData); - if(!callback(NULL, szPath, szName, szTip, NULL, lpData)) { - TRACE("callback ended enum\n"); - break; - } + if(FAILED(hr)) + { + ERR("Failed to get theme name from %S\n", szPath); + continue; + } + + hr = GetThemeDocumentationProperty(szPath, szTooltip, szTip, sizeof(szTip)/sizeof(szTip[0])); + if (FAILED(hr)) + szTip[0] = 0; + + TRACE("callback(%s,%s,%s,%p)\n", debugstr_w(szPath), debugstr_w(szName), debugstr_w(szTip), lpData); + if(!callback(NULL, szPath, szName, szTip, NULL, lpData)) { + TRACE("callback ended enum\n"); + break; } } } while(FindNextFileW(hFind, &wfd));

1 0

[reactos] 01/01: input: Overwrite font substitutes settings on lang change
by Katayama Hirofumi MZ 19 Nov '17

19 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3dbd44fde1487acdef673… commit 3dbd44fde1487acdef6739486232344e59d6c4aa Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Mon Nov 13 10:36:52 2017 +0900 input: Overwrite font substitutes settings on lang change --- dll/cpl/input/input_list.c | 126 +++++++++++++++++++++++++++++++++++++++++- dll/cpl/input/input_list.h | 2 +- dll/cpl/input/lang/bg-BG.rc | 1 + dll/cpl/input/lang/cs-CZ.rc | 1 + dll/cpl/input/lang/de-DE.rc | 1 + dll/cpl/input/lang/el-GR.rc | 1 + dll/cpl/input/lang/en-US.rc | 1 + dll/cpl/input/lang/es-ES.rc | 1 + dll/cpl/input/lang/fr-FR.rc | 1 + dll/cpl/input/lang/he-IL.rc | 1 + dll/cpl/input/lang/it-IT.rc | 1 + dll/cpl/input/lang/ja-JP.rc | 1 + dll/cpl/input/lang/no-NO.rc | 1 + dll/cpl/input/lang/pl-PL.rc | 1 + dll/cpl/input/lang/pt-BR.rc | 1 + dll/cpl/input/lang/ro-RO.rc | 1 + dll/cpl/input/lang/ru-RU.rc | 1 + dll/cpl/input/lang/sk-SK.rc | 1 + dll/cpl/input/lang/sq-AL.rc | 1 + dll/cpl/input/lang/tr-TR.rc | 1 + dll/cpl/input/lang/uk-UA.rc | 1 + dll/cpl/input/lang/zh-CN.rc | 1 + dll/cpl/input/lang/zh-TW.rc | 1 + dll/cpl/input/resource.h | 1 + dll/cpl/input/settings_page.c | 44 ++++++++++++++- 25 files changed, 189 insertions(+), 5 deletions(-) diff --git a/dll/cpl/input/input_list.c b/dll/cpl/input/input_list.c index 0d9718d7e7..1de3246af1 100644 --- a/dll/cpl/input/input_list.c +++ b/dll/cpl/input/input_list.c @@ -2,11 +2,129 @@ * PROJECT: input.dll * FILE: dll/cpl/input/input_list.c * PURPOSE: input.dll -* PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) +* PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) +* Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "input_list.h" +typedef struct +{ + PWCHAR FontName; + PWCHAR SubFontName; +} MUI_SUBFONT; + +#include "../../../base/setup/usetup/muifonts.h" + +BOOL UpdateRegistryForFontSubstitutes(MUI_SUBFONT *pSubstitutes) +{ + DWORD cbData; + HKEY hKey; + static const WCHAR pszKey[] = + L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes"; + + hKey = NULL; + RegOpenKeyExW(HKEY_LOCAL_MACHINE, pszKey, 0, KEY_ALL_ACCESS, &hKey); + if (hKey == NULL) + return FALSE; + + /* Overwrite only */ + for (; pSubstitutes->FontName; ++pSubstitutes) + { + cbData = (lstrlenW(pSubstitutes->SubFontName) + 1) * sizeof(WCHAR); + RegSetValueExW(hKey, pSubstitutes->FontName, 0, + REG_SZ, (LPBYTE)pSubstitutes->SubFontName, cbData); + } + + RegCloseKey(hKey); + + return TRUE; +} + +BOOL +InputList_SetFontSubstitutes(LCID dwLocaleId) +{ + MUI_SUBFONT *pSubstitutes; + WORD wLangID, wPrimaryLangID, wSubLangID; + + wLangID = LANGIDFROMLCID(dwLocaleId); + wPrimaryLangID = PRIMARYLANGID(wLangID); + wSubLangID = SUBLANGID(wLangID); + + /* FIXME: Add more if necessary */ + switch (wPrimaryLangID) + { + default: + pSubstitutes = LatinFonts; + break; + case LANG_AZERI: + case LANG_BELARUSIAN: + case LANG_BULGARIAN: + case LANG_KAZAK: + case LANG_RUSSIAN: + case LANG_SERBIAN: + case LANG_TATAR: + case LANG_UKRAINIAN: + case LANG_UZBEK: + pSubstitutes = CyrillicFonts; + break; + case LANG_GREEK: + pSubstitutes = GreekFonts; + break; + case LANG_HEBREW: + pSubstitutes = HebrewFonts; + break; + case LANG_CHINESE: + switch (wSubLangID) + { + case SUBLANG_CHINESE_SIMPLIFIED: + case SUBLANG_CHINESE_SINGAPORE: + case SUBLANG_CHINESE_MACAU: + pSubstitutes = ChineseSimplifiedFonts; + break; + case SUBLANG_CHINESE_TRADITIONAL: + case SUBLANG_CHINESE_HONGKONG: + pSubstitutes = ChineseTraditionalFonts; + break; + default: + pSubstitutes = NULL; + DebugBreak(); + break; + } + break; + case LANG_JAPANESE: + pSubstitutes = JapaneseFonts; + break; + case LANG_KOREAN: + pSubstitutes = KoreanFonts; + break; + case LANG_ARABIC: + case LANG_ARMENIAN: + case LANG_BENGALI: + case LANG_FARSI: + case LANG_GEORGIAN: + case LANG_GUJARATI: + case LANG_HINDI: + case LANG_KONKANI: + case LANG_MARATHI: + case LANG_PUNJABI: + case LANG_SANSKRIT: + case LANG_TAMIL: + case LANG_TELUGU: + case LANG_THAI: + case LANG_URDU: + case LANG_VIETNAMESE: + pSubstitutes = UnicodeFonts; + break; + } + + if (pSubstitutes) + { + UpdateRegistryForFontSubstitutes(pSubstitutes); + return TRUE; + } + return FALSE; +} static INPUT_LIST_NODE *_InputList = NULL; @@ -216,11 +334,12 @@ InputList_AddInputMethodToUserRegistry(DWORD dwIndex, INPUT_LIST_NODE *pNode) /* * Writes any changes in input methods to the registry */ -VOID +BOOL InputList_Process(VOID) { INPUT_LIST_NODE *pCurrent; DWORD dwIndex; + BOOL bRet = FALSE; /* Process deleted and edited input methods */ for (pCurrent = _InputList; pCurrent != NULL; pCurrent = pCurrent->pNext) @@ -246,6 +365,7 @@ InputList_Process(VOID) { if (pCurrent->wFlags & INPUT_LIST_NODE_FLAG_DEFAULT) { + bRet = InputList_SetFontSubstitutes(pCurrent->pLocale->dwId); InputList_AddInputMethodToUserRegistry(1, pCurrent); break; } @@ -279,6 +399,8 @@ InputList_Process(VOID) dwIndex++; } + + return bRet; } diff --git a/dll/cpl/input/input_list.h b/dll/cpl/input/input_list.h index d2659f306d..e578cc7042 100644 --- a/dll/cpl/input/input_list.h +++ b/dll/cpl/input/input_list.h @@ -30,7 +30,7 @@ typedef struct _INPUT_LIST_NODE VOID InputList_Create(VOID); -VOID +BOOL InputList_Process(VOID); BOOL diff --git a/dll/cpl/input/lang/bg-BG.rc b/dll/cpl/input/lang/bg-BG.rc index 4b119fba82..97e73c536d 100644 --- a/dll/cpl/input/lang/bg-BG.rc +++ b/dll/cpl/input/lang/bg-BG.rc @@ -106,6 +106,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Ляв Alt+Shift" IDS_SWITCH_BET_INLANG "Превключване на езиците за въвеждане" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/cs-CZ.rc b/dll/cpl/input/lang/cs-CZ.rc index 8d6d8e6b3f..54e97bff60 100644 --- a/dll/cpl/input/lang/cs-CZ.rc +++ b/dll/cpl/input/lang/cs-CZ.rc @@ -111,6 +111,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Levý Alt+Shift" IDS_SWITCH_BET_INLANG "Přepnout mezi vstupními jazyky" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/de-DE.rc b/dll/cpl/input/lang/de-DE.rc index 69dd9e5492..705148ac87 100644 --- a/dll/cpl/input/lang/de-DE.rc +++ b/dll/cpl/input/lang/de-DE.rc @@ -106,6 +106,7 @@ BEGIN IDS_CTRL_SHIFT "Strg+Umschalt" IDS_LEFT_ALT_SHIFT "Alt links+Umschalt" IDS_SWITCH_BET_INLANG "Zwischen Eingabesprachen umschalten" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/el-GR.rc b/dll/cpl/input/lang/el-GR.rc index 2eee60d0f6..332277b89d 100644 --- a/dll/cpl/input/lang/el-GR.rc +++ b/dll/cpl/input/lang/el-GR.rc @@ -106,6 +106,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Left Alt+Shift" IDS_SWITCH_BET_INLANG "Switch between input languages" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/en-US.rc b/dll/cpl/input/lang/en-US.rc index 8df67e0e8f..4d734791c6 100644 --- a/dll/cpl/input/lang/en-US.rc +++ b/dll/cpl/input/lang/en-US.rc @@ -106,6 +106,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Left Alt+Shift" IDS_SWITCH_BET_INLANG "Switch between input languages" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/es-ES.rc b/dll/cpl/input/lang/es-ES.rc index e18eb8ed7d..3a776808ca 100644 --- a/dll/cpl/input/lang/es-ES.rc +++ b/dll/cpl/input/lang/es-ES.rc @@ -108,6 +108,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Mayús" IDS_LEFT_ALT_SHIFT "Alt Izq+Mayús" IDS_SWITCH_BET_INLANG "Cambiar entre los idiomas de entrada" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/fr-FR.rc b/dll/cpl/input/lang/fr-FR.rc index 96584a96d4..e8da479877 100644 --- a/dll/cpl/input/lang/fr-FR.rc +++ b/dll/cpl/input/lang/fr-FR.rc @@ -106,6 +106,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Maj" IDS_LEFT_ALT_SHIFT "Alt Gauche+Maj" IDS_SWITCH_BET_INLANG "Changer les langues de saisie" + IDS_REBOOT_NOW, "Reboot now?" END /* FIXME : À améliorer/compléter */ diff --git a/dll/cpl/input/lang/he-IL.rc b/dll/cpl/input/lang/he-IL.rc index 515b5eeefa..076ba17295 100644 --- a/dll/cpl/input/lang/he-IL.rc +++ b/dll/cpl/input/lang/he-IL.rc @@ -108,6 +108,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Left Alt+Shift" IDS_SWITCH_BET_INLANG "החלף בין שפות כתיבה" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/it-IT.rc b/dll/cpl/input/lang/it-IT.rc index bc9c07c88a..dd6314f320 100644 --- a/dll/cpl/input/lang/it-IT.rc +++ b/dll/cpl/input/lang/it-IT.rc @@ -106,6 +106,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Alt sinistro+Shift" IDS_SWITCH_BET_INLANG "Cambia lingua di digitazione" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/ja-JP.rc b/dll/cpl/input/lang/ja-JP.rc index 100f79fd8e..8952da839f 100644 --- a/dll/cpl/input/lang/ja-JP.rc +++ b/dll/cpl/input/lang/ja-JP.rc @@ -106,6 +106,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "左Alt+Shift" IDS_SWITCH_BET_INLANG "入力言語の切り替え" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/no-NO.rc b/dll/cpl/input/lang/no-NO.rc index d2715043b2..e860a6798b 100644 --- a/dll/cpl/input/lang/no-NO.rc +++ b/dll/cpl/input/lang/no-NO.rc @@ -106,6 +106,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Venstre Alt+Shift" IDS_SWITCH_BET_INLANG "Bytt mellom inndataspråk" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/pl-PL.rc b/dll/cpl/input/lang/pl-PL.rc index e7aee52655..c30300005b 100644 --- a/dll/cpl/input/lang/pl-PL.rc +++ b/dll/cpl/input/lang/pl-PL.rc @@ -114,6 +114,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Lewy Alt+Shift" IDS_SWITCH_BET_INLANG "Przełącza pomiędzy układami klawiatury" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/pt-BR.rc b/dll/cpl/input/lang/pt-BR.rc index 4ac6977d16..36a281b6aa 100644 --- a/dll/cpl/input/lang/pt-BR.rc +++ b/dll/cpl/input/lang/pt-BR.rc @@ -106,6 +106,7 @@ BEGIN IDS_CTRL_SHIFT "CTRL+SHIFT" IDS_LEFT_ALT_SHIFT "ALT esquerdo+SHIFT" IDS_SWITCH_BET_INLANG "Alternar entre idiomas de entrada" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/ro-RO.rc b/dll/cpl/input/lang/ro-RO.rc index b7bf51666e..63dde21faf 100644 --- a/dll/cpl/input/lang/ro-RO.rc +++ b/dll/cpl/input/lang/ro-RO.rc @@ -108,6 +108,7 @@ BEGIN IDS_CTRL_SHIFT "«Ctrl» + «Shift»" IDS_LEFT_ALT_SHIFT "«Alt» (stâng) + «Shift»" IDS_SWITCH_BET_INLANG "Comutarea între limbile de intrare" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/ru-RU.rc b/dll/cpl/input/lang/ru-RU.rc index 057e302e07..ffd6e37c80 100644 --- a/dll/cpl/input/lang/ru-RU.rc +++ b/dll/cpl/input/lang/ru-RU.rc @@ -106,6 +106,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Alt слева+Shift" IDS_SWITCH_BET_INLANG "Переключение между языками ввода" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/sk-SK.rc b/dll/cpl/input/lang/sk-SK.rc index 09069c15e1..4adb1391ec 100644 --- a/dll/cpl/input/lang/sk-SK.rc +++ b/dll/cpl/input/lang/sk-SK.rc @@ -111,6 +111,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Ľavý Alt+Shift" IDS_SWITCH_BET_INLANG "Switch between input languages" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/sq-AL.rc b/dll/cpl/input/lang/sq-AL.rc index 2c7051fd24..02566a80de 100644 --- a/dll/cpl/input/lang/sq-AL.rc +++ b/dll/cpl/input/lang/sq-AL.rc @@ -110,6 +110,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Left Alt+Shift" IDS_SWITCH_BET_INLANG "Ndërro ndër gjuhët hyrese" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/tr-TR.rc b/dll/cpl/input/lang/tr-TR.rc index 1234b8c049..0caed2bc93 100644 --- a/dll/cpl/input/lang/tr-TR.rc +++ b/dll/cpl/input/lang/tr-TR.rc @@ -108,6 +108,7 @@ BEGIN IDS_CTRL_SHIFT "Denetim + Üst Damga" IDS_LEFT_ALT_SHIFT "Sol Seçenek + Üst Damga" IDS_SWITCH_BET_INLANG "Giriş dilleri arasında geçiş yap." + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/uk-UA.rc b/dll/cpl/input/lang/uk-UA.rc index af336ddfbb..bea4493668 100644 --- a/dll/cpl/input/lang/uk-UA.rc +++ b/dll/cpl/input/lang/uk-UA.rc @@ -114,6 +114,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "Alt зліва+Shift" IDS_SWITCH_BET_INLANG "Перемикання мов вводу" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/zh-CN.rc b/dll/cpl/input/lang/zh-CN.rc index cb25920bc1..378132452e 100644 --- a/dll/cpl/input/lang/zh-CN.rc +++ b/dll/cpl/input/lang/zh-CN.rc @@ -108,6 +108,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "左 Alt+Shift" IDS_SWITCH_BET_INLANG "在输入语言间切换" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/lang/zh-TW.rc b/dll/cpl/input/lang/zh-TW.rc index 01ec0c4286..39cc993129 100644 --- a/dll/cpl/input/lang/zh-TW.rc +++ b/dll/cpl/input/lang/zh-TW.rc @@ -108,6 +108,7 @@ BEGIN IDS_CTRL_SHIFT "Ctrl+Shift" IDS_LEFT_ALT_SHIFT "左 Alt+Shift" IDS_SWITCH_BET_INLANG "在輸入語言間切換" + IDS_REBOOT_NOW, "Reboot now?" END STRINGTABLE diff --git a/dll/cpl/input/resource.h b/dll/cpl/input/resource.h index b5ae953fde..fee7e9cda9 100644 --- a/dll/cpl/input/resource.h +++ b/dll/cpl/input/resource.h @@ -57,6 +57,7 @@ #define IDS_LEFT_ALT_SHIFT 15 #define IDS_SWITCH_BET_INLANG 16 #define IDC_TURNOFFTEXTSVCS_CB 17 +#define IDS_REBOOT_NOW 18 /* Layouts */ #define IDS_US_LAYOUT 5000 diff --git a/dll/cpl/input/settings_page.c b/dll/cpl/input/settings_page.c index 0404b63c45..72260a8bee 100644 --- a/dll/cpl/input/settings_page.c +++ b/dll/cpl/input/settings_page.c @@ -2,7 +2,8 @@ * PROJECT: input.dll * FILE: dll/cpl/input/settings_page.c * PURPOSE: input.dll - * PROGRAMMER: Dmitry Chapyshev (dmitry(a)reactos.org) + * PROGRAMMERS: Dmitry Chapyshev (dmitry(a)reactos.org) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include "input.h" @@ -357,6 +358,32 @@ OnCommandSettingsPage(HWND hwndDlg, WPARAM wParam) } } +BOOL EnableProcessPrivileges(LPCWSTR lpPrivilegeName, BOOL bEnable) +{ + HANDLE hToken; + LUID luid; + TOKEN_PRIVILEGES tokenPrivileges; + BOOL Ret; + + Ret = OpenProcessToken(GetCurrentProcess(), + TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, + &hToken); + if (!Ret) + return Ret; // failure + + Ret = LookupPrivilegeValueW(NULL, lpPrivilegeName, &luid); + if (Ret) + { + tokenPrivileges.PrivilegeCount = 1; + tokenPrivileges.Privileges[0].Luid = luid; + tokenPrivileges.Privileges[0].Attributes = bEnable ? SE_PRIVILEGE_ENABLED : 0; + + Ret = AdjustTokenPrivileges(hToken, FALSE, &tokenPrivileges, 0, 0, 0); + } + + CloseHandle(hToken); + return Ret; +} static VOID OnNotifySettingsPage(HWND hwndDlg, LPARAM lParam) @@ -405,7 +432,20 @@ OnNotifySettingsPage(HWND hwndDlg, LPARAM lParam) case PSN_APPLY: { /* Write Input Methods list to registry */ - InputList_Process(); + if (InputList_Process()) + { + /* Needs reboot */ + WCHAR szNeedsReboot[128], szLanguage[64]; + LoadStringW(hApplet, IDS_REBOOT_NOW, szNeedsReboot, _countof(szNeedsReboot)); + LoadStringW(hApplet, IDS_LANGUAGE, szLanguage, _countof(szLanguage)); + + if (MessageBoxW(hwndDlg, szNeedsReboot, szLanguage, + MB_ICONINFORMATION | MB_YESNOCANCEL) == IDYES) + { + EnableProcessPrivileges(SE_SHUTDOWN_NAME, TRUE); + ExitWindowsEx(EWX_REBOOT | EWX_FORCE, 0); + } + } } break; }

1 0

[reactos] 01/01: [CMD] Addendum to 26ff2c8 and to r40474 / 8cf1106: Fix CMD process exit code.
by Hermès Bélusca-Maïto 18 Nov '17

18 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7bd33ac4df4948609165e… commit 7bd33ac4df4948609165e99f98c7bd44b46bdf88 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Nov 19 00:45:33 2017 +0100 [CMD] Addendum to 26ff2c8 and to r40474 / 8cf1106: Fix CMD process exit code. As it appears, the process exit code of CMD /C is really the errorlevel, and not the "command's return value". --- base/shell/cmd/cmd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/base/shell/cmd/cmd.c b/base/shell/cmd/cmd.c index 549f10d59e..d9a03a265e 100644 --- a/base/shell/cmd/cmd.c +++ b/base/shell/cmd/cmd.c @@ -1800,7 +1800,7 @@ Initialize(VOID) HMODULE NtDllModule; TCHAR commandline[CMDLINE_LENGTH]; TCHAR ModuleName[_MAX_PATH + 1]; - INT nExitCode; + // INT nExitCode; HANDLE hIn, hOut; @@ -1985,11 +1985,11 @@ Initialize(VOID) /* Do the /C or /K command */ GetCmdLineCommand(commandline, &ptr[2], AlwaysStrip); bWaitForCommand = TRUE; - nExitCode = ParseCommandLine(commandline); + /* nExitCode = */ ParseCommandLine(commandline); bWaitForCommand = FALSE; if (option != _T('K')) { - nErrorLevel = nExitCode; + // nErrorLevel = nExitCode; bExit = TRUE; } }

1 0

[reactos] 02/02: [CMD] Fix the errorlevel value set by the EXIT command, and when a batch file has run. CORE-10495 CORE-13672
by Hermès Bélusca-Maïto 18 Nov '17

18 Nov '17

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=26ff2c8ef3ca97ab960be… commit 26ff2c8ef3ca97ab960be45b0005c93090e08cb3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sat Nov 18 23:41:31 2017 +0100 [CMD] Fix the errorlevel value set by the EXIT command, and when a batch file has run. CORE-10495 CORE-13672 - Fix the behaviour of the EXIT command, where it set the last errorlevel value ONLY when it was called with the /b switch and otherwise kept the ambient one, instead of always using the value that the user specified on the command-line. - When a batch file has terminated, make the Batch() helper returning the errorlevel value so that, when the batch file has been started with the CALL command, CALL can in turn set the correct errorlevel value. Verified with respect to Windows' cmd.exe. --- base/shell/cmd/batch.c | 6 +++++- base/shell/cmd/internal.c | 29 +++++++++++++++++++++-------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/base/shell/cmd/batch.c b/base/shell/cmd/batch.c index bf36ddb610..148943a990 100644 --- a/base/shell/cmd/batch.c +++ b/base/shell/cmd/batch.c @@ -299,7 +299,8 @@ INT Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) * return until this context has been exited */ new.prev = bc; /* copy some fields in the new structure if it is the same file */ - if (same_fn) { + if (same_fn) + { new.mem = bc->mem; new.memsize = bc->memsize; new.mempos = 0; @@ -366,6 +367,9 @@ INT Batch (LPTSTR fullname, LPTSTR firstword, LPTSTR param, PARSED_COMMAND *Cmd) FreeCommand(Cmd); } + /* Always return the current errorlevel */ + ret = nErrorLevel; + TRACE ("Batch: returns TRUE\n"); fc = saved_fc; diff --git a/base/shell/cmd/internal.c b/base/shell/cmd/internal.c index 4830660bbc..fc05119829 100644 --- a/base/shell/cmd/internal.c +++ b/base/shell/cmd/internal.c @@ -514,26 +514,39 @@ INT CommandExit(LPTSTR param) if (!_tcsncmp(param, _T("/?"), 2)) { ConOutResPaging(TRUE, STRING_EXIT_HELP); - /* Just make sure */ + + /* Just make sure we don't exit */ bExit = FALSE; - /* Don't exit */ return 0; } - if (bc != NULL && _tcsnicmp(param, _T("/b"), 2) == 0) + if (_tcsnicmp(param, _T("/b"), 2) == 0) { param += 2; - while (_istspace(*param)) - param++; - if (_istdigit(*param)) - nErrorLevel = _ttoi(param); - ExitBatch(); + + /* + * If a current batch file is running, exit it, + * otherwise exit this command interpreter instance. + */ + if (bc) + ExitBatch(); + else + bExit = TRUE; } else { + /* Exit this command interpreter instance */ bExit = TRUE; } + /* Search for an optional exit code */ + while (_istspace(*param)) + param++; + + /* Set the errorlevel to the exit code */ + if (_istdigit(*param)) + nErrorLevel = _ttoi(param); + return 0; }

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
19
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2017