Alexandre Julliard : glu32: Make gluGetString return the same data as on Windows.
Alexandre Julliard
julliard at winehq.org
Thu Apr 6 15:05:23 CDT 2017
Module: wine
Branch: master
Commit: 0128e1a18f25848e6f47146580a8f0db69687dd6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0128e1a18f25848e6f47146580a8f0db69687dd6
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Apr 6 15:35:59 2017 +0200
glu32: Make gluGetString return the same data as on Windows.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/glu32/glu.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c
index de634ba..87a9952 100644
--- a/dlls/glu32/glu.c
+++ b/dlls/glu32/glu.c
@@ -74,6 +74,9 @@ typedef struct {
#define GLU_TESS_EDGE_FLAG_DATA 100110
#define GLU_TESS_COMBINE_DATA 100111
+#define GLU_VERSION 100800
+#define GLU_EXTENSIONS 100801
+
#define GLU_INVALID_ENUM 100900
#define GLU_INVALID_VALUE 100901
#define GLU_OUT_OF_MEMORY 100902
@@ -97,7 +100,6 @@ static void (*p_gluEndSurface)( GLUnurbs* nurb );
static void (*p_gluEndTrim)( GLUnurbs* nurb );
static const GLubyte * (*p_gluErrorString)( GLenum error );
static void (*p_gluGetNurbsProperty)( GLUnurbs* nurb, GLenum property, GLfloat* data );
-static const GLubyte * (*p_gluGetString)( GLenum name );
static void (*p_gluGetTessProperty)( GLUtesselator* tess, GLenum which, GLdouble* data );
static void (*p_gluLoadSamplingMatrices)( GLUnurbs* nurb, const GLfloat *model, const GLfloat *perspective, const GLint *view );
static void (*p_gluLookAt)( GLdouble eyeX, GLdouble eyeY, GLdouble eyeZ, GLdouble centerX, GLdouble centerY, GLdouble centerZ, GLdouble upX, GLdouble upY, GLdouble upZ );
@@ -510,8 +512,12 @@ void WINAPI wine_gluNurbsCallback( GLUnurbs *nobj, GLenum which, void (CALLBACK
*/
const GLubyte * WINAPI wine_gluGetString( GLenum name )
{
- if (!LOAD_FUNCPTR( gluGetString )) return NULL;
- return p_gluGetString( name );
+ switch (name)
+ {
+ case GLU_VERSION: return (const GLubyte *)"1.2.2.0 Microsoft Corporation"; /* sic */
+ case GLU_EXTENSIONS: return (const GLubyte *)"";
+ }
+ return NULL;
}
/***********************************************************************
More information about the wine-cvs
mailing list