Changeset 21954 in vbox for trunk/src/VBox/Additions

Timestamp:

Aug 4, 2009 11:49:32 AM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: fix stack corruption leading to crash when running call of duty

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• wgl.c (modified) (1 diff)
• windows_getprocaddress.py (modified) (4 diffs)

trunk/src/VBox/Additions/common/crOpenGL/wgl.c

@@ -697 +697 @@
 }
 
-const GLubyte * WINAPI wglGetExtensionsStringEXT_prox( HDC hdc )
-{
-    static GLubyte *retval = "WGL_EXT_pixel_format WGL_ARB_pixel_format WGL_ARB_multisample";
-
+BOOL WINAPI wglSwapIntervalEXT_prox(int interval)
+{
+    return TRUE;
+}
+
+int  WINAPI wglGetSwapIntervalEXT_prox()
+{
+    return 1;
+}
+
+static GLubyte *gsz_wgl_extensions = "WGL_EXT_pixel_format WGL_ARB_pixel_format WGL_ARB_multisample";
+
+const GLubyte * WINAPI wglGetExtensionsStringEXT_prox()
+{
+    return gsz_wgl_extensions;
+}
+
+const GLubyte * WINAPI wglGetExtensionsStringARB_prox(HDC hdc)
+{
     (void) hdc;
 
-    return retval;
-}
-
+    return gsz_wgl_extensions;
+}

trunk/src/VBox/Additions/common/crOpenGL/windows_getprocaddress.py

@@ -92 +92 @@
 };
 
-extern const GLubyte * WINAPI wglGetExtensionsStringEXT_prox( HDC hdc );
+extern const GLubyte * WINAPI wglGetExtensionsStringEXT_prox(void);
+extern const GLubyte * WINAPI wglGetExtensionsStringARB_prox(HDC hdc);
 extern BOOL WINAPI wglChoosePixelFormatEXT_prox(HDC hdc, const int *piAttributes, const FLOAT *pfAttributes, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
 extern BOOL WINAPI wglGetPixelFormatAttribivEXT_prox(HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *pValues);
@@ -101 +102 @@
     int i;
     wglGetExtensionsStringEXTFunc_t wglGetExtensionsStringEXT = wglGetExtensionsStringEXT_prox;
+    wglGetExtensionsStringARBFunc_t wglGetExtensionsStringARB = wglGetExtensionsStringARB_prox;
     wglChoosePixelFormatEXTFunc_t wglChoosePixelFormatEXT = wglChoosePixelFormatEXT_prox;
     wglGetPixelFormatAttribivEXTFunc_t wglGetPixelFormatAttribivEXT = wglGetPixelFormatAttribivEXT_prox;
@@ -115 +117 @@
 
     if (!crStrcmp( name, "wglGetExtensionsStringEXT" )) return (CR_PROC) wglGetExtensionsStringEXT;
-    if (!crStrcmp( name, "wglGetExtensionsStringARB" )) return (CR_PROC) wglGetExtensionsStringEXT;
+    if (!crStrcmp( name, "wglGetExtensionsStringARB" )) return (CR_PROC) wglGetExtensionsStringARB;
 
     if (!crStrcmp( name, "wglChoosePixelFormatEXT" )) return (CR_PROC) wglChoosePixelFormatEXT;
@@ -123 +125 @@
     if (!crStrcmp( name, "wglChoosePixelFormatARB" )) return (CR_PROC) wglChoosePixelFormatEXT;
     if (!crStrcmp( name, "wglGetPixelFormatAttribivARB" )) return (CR_PROC) wglGetPixelFormatAttribivEXT;
-    if (!crStrcmp( name, "wglGetPixelFormatAttribfvARB" )) return (CR_PROC) wglGetPixelFormatAttribfvEXT;  
+    if (!crStrcmp( name, "wglGetPixelFormatAttribfvARB" )) return (CR_PROC) wglGetPixelFormatAttribfvEXT;
 
     crDebug("Returning GetProcAddress:NULL for %s", name);