Changeset 45484 in vbox

Timestamp:

Apr 11, 2013 2:29:37 PM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: correct VBoxOGL exports defs

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• defs.py (modified) (1 diff)
• wgl.c (modified) (34 diffs)

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

@@ -455 +455 @@
            "wglGetPixelFormatAttribfvEXT",
            "wglGetExtensionsStringEXT"):
-    print "%s@%d = %s_prox" % (func_name,stack_sizes[func_name],func_name)
+    print "%s = %s_prox" % (func_name,func_name)
 
 """

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

@@ -16 +16 @@
 #include <windows.h>
 #include <stdio.h>
+
+#include <iprt/cdefs.h>
 
 /* Currently host part will misbehave re-creating context with proper visual bits
@@ -66 +68 @@
 #endif
 
-int WINAPI wglChoosePixelFormat_prox( HDC hdc, CONST PIXELFORMATDESCRIPTOR *pfd )
+DECLEXPORT(int) WINAPI wglChoosePixelFormat_prox( HDC hdc, CONST PIXELFORMATDESCRIPTOR *pfd )
 {
     DWORD okayFlags;
@@ -163 +165 @@
 }
 
-BOOL WINAPI wglSetPixelFormat_prox( HDC hdc, int pixelFormat, 
+DECLEXPORT(BOOL) WINAPI wglSetPixelFormat_prox( HDC hdc, int pixelFormat,
         CONST PIXELFORMATDESCRIPTOR *pdf )
 {
@@ -175 +177 @@
 }
 
-BOOL WINAPI wglDeleteContext_prox( HGLRC hglrc )
+DECLEXPORT(BOOL) WINAPI wglDeleteContext_prox( HGLRC hglrc )
 {
     CR_DDI_PROLOGUE();
@@ -182 +184 @@
 }
 
-BOOL WINAPI wglMakeCurrent_prox( HDC hdc, HGLRC hglrc )
+DECLEXPORT(BOOL) WINAPI wglMakeCurrent_prox( HDC hdc, HGLRC hglrc )
 {
     ContextInfo *context;
@@ -209 +211 @@
 }
 
-HGLRC WINAPI wglGetCurrentContext_prox( void )
+DECLEXPORT(HGLRC) WINAPI wglGetCurrentContext_prox( void )
 {
     ContextInfo *context = stubGetCurrentContext();
@@ -216 +218 @@
 }
 
-HDC WINAPI wglGetCurrentDC_prox( void )
+DECLEXPORT(HDC) WINAPI wglGetCurrentDC_prox( void )
 {
     ContextInfo *context = stubGetCurrentContext();
@@ -226 +228 @@
 }
 
-int WINAPI wglGetPixelFormat_prox( HDC hdc )
+DECLEXPORT(int) WINAPI wglGetPixelFormat_prox( HDC hdc )
 {
     CR_DDI_PROLOGUE();
@@ -233 +235 @@
 }
 
-int WINAPI wglDescribePixelFormat_prox( HDC hdc, int pixelFormat, UINT nBytes,
+DECLEXPORT(int) WINAPI wglDescribePixelFormat_prox( HDC hdc, int pixelFormat, UINT nBytes,
         LPPIXELFORMATDESCRIPTOR pfd )
 {
@@ -287 +289 @@
 }
 
-BOOL WINAPI wglShareLists_prox( HGLRC hglrc1, HGLRC hglrc2 )
+DECLEXPORT(BOOL) WINAPI wglShareLists_prox( HGLRC hglrc1, HGLRC hglrc2 )
 {
     CR_DDI_PROLOGUE();
@@ -295 +297 @@
 
 
-HGLRC WINAPI VBoxCreateContext( HDC hdc, struct VBOXUHGSMI *pHgsmi )
+DECLEXPORT(HGLRC) WINAPI VBoxCreateContext( HDC hdc, struct VBOXUHGSMI *pHgsmi )
 {
     char dpyName[MAX_DPY_NAME];
@@ -325 +327 @@
 }
 
-GLint WINAPI VBoxGetWindowId( HDC hdc )
+DECLEXPORT(GLint) WINAPI VBoxGetWindowId( HDC hdc )
 {
     WindowInfo *window = stubGetWindowInfo(hdc);
@@ -343 +345 @@
 }
 
-HGLRC WINAPI wglCreateContext_prox( HDC hdc )
+DECLEXPORT(HGLRC) WINAPI wglCreateContext_prox( HDC hdc )
 {
     return VBoxCreateContext(hdc, NULL);
 }
 
-void WINAPI VBoxFlushToHost ( HGLRC hglrc )
+DECLEXPORT(void) WINAPI VBoxFlushToHost ( HGLRC hglrc )
 {
     ContextInfo *context;
@@ -366 +368 @@
 }
 
-BOOL WINAPI
+DECLEXPORT(BOOL) WINAPI
 wglSwapBuffers_prox( HDC hdc )
 {
@@ -375 +377 @@
 }
 
-BOOL WINAPI wglCopyContext_prox( HGLRC src, HGLRC dst, UINT mask )
+DECLEXPORT(BOOL) WINAPI wglCopyContext_prox( HGLRC src, HGLRC dst, UINT mask )
 {
     CR_DDI_PROLOGUE();
@@ -382 +384 @@
 }
 
-HGLRC WINAPI wglCreateLayerContext_prox( HDC hdc, int layerPlane )
+DECLEXPORT(HGLRC) WINAPI wglCreateLayerContext_prox( HDC hdc, int layerPlane )
 {
     CR_DDI_PROLOGUE();
@@ -390 +392 @@
 }
 
-PROC WINAPI wglGetProcAddress_prox( LPCSTR name )
+DECLEXPORT(PROC) WINAPI wglGetProcAddress_prox( LPCSTR name )
 {
     CR_DDI_PROLOGUE();
@@ -396 +398 @@
 }
 
-BOOL WINAPI wglUseFontBitmapsA_prox( HDC hdc, DWORD first, DWORD count, DWORD listBase )
+DECLEXPORT(BOOL) WINAPI wglUseFontBitmapsA_prox( HDC hdc, DWORD first, DWORD count, DWORD listBase )
 {
     CR_DDI_PROLOGUE();
@@ -403 +405 @@
 }
 
-BOOL WINAPI wglUseFontBitmapsW_prox( HDC hdc, DWORD first, DWORD count, DWORD listBase )
+DECLEXPORT(BOOL) WINAPI wglUseFontBitmapsW_prox( HDC hdc, DWORD first, DWORD count, DWORD listBase )
 {
     CR_DDI_PROLOGUE();
@@ -410 +412 @@
 }
 
-BOOL WINAPI wglDescribeLayerPlane_prox( HDC hdc, int pixelFormat, int layerPlane,
+DECLEXPORT(BOOL) WINAPI wglDescribeLayerPlane_prox( HDC hdc, int pixelFormat, int layerPlane,
         UINT nBytes, LPLAYERPLANEDESCRIPTOR lpd )
 {
@@ -418 +420 @@
 }
 
-int WINAPI wglSetLayerPaletteEntries_prox( HDC hdc, int layerPlane, int start,
+DECLEXPORT(int) WINAPI wglSetLayerPaletteEntries_prox( HDC hdc, int layerPlane, int start,
         int entries, CONST COLORREF *cr )
 {
@@ -426 +428 @@
 }
 
-int WINAPI wglGetLayerPaletteEntries_prox( HDC hdc, int layerPlane, int start,
+DECLEXPORT(int) WINAPI wglGetLayerPaletteEntries_prox( HDC hdc, int layerPlane, int start,
         int entries, COLORREF *cr )
 {
@@ -434 +436 @@
 }
 
-BOOL WINAPI wglRealizeLayerPalette_prox( HDC hdc, int layerPlane, BOOL realize )
+DECLEXPORT(BOOL) WINAPI wglRealizeLayerPalette_prox( HDC hdc, int layerPlane, BOOL realize )
 {
     CR_DDI_PROLOGUE();
@@ -441 +443 @@
 }
 
-DWORD WINAPI wglSwapMultipleBuffers_prox( UINT a, CONST void *b )
+DECLEXPORT(DWORD) WINAPI wglSwapMultipleBuffers_prox( UINT a, CONST void *b )
 {
     CR_DDI_PROLOGUE();
@@ -448 +450 @@
 }
 
-BOOL WINAPI wglUseFontOutlinesA_prox( HDC hdc, DWORD first, DWORD count, DWORD listBase,
+DECLEXPORT(BOOL) WINAPI wglUseFontOutlinesA_prox( HDC hdc, DWORD first, DWORD count, DWORD listBase,
         FLOAT deviation, FLOAT extrusion, int format,
         LPGLYPHMETRICSFLOAT gmf )
@@ -457 +459 @@
 }
 
-BOOL WINAPI wglUseFontOutlinesW_prox( HDC hdc, DWORD first, DWORD count, DWORD listBase,
+DECLEXPORT(BOOL) WINAPI wglUseFontOutlinesW_prox( HDC hdc, DWORD first, DWORD count, DWORD listBase,
         FLOAT deviation, FLOAT extrusion, int format,
         LPGLYPHMETRICSFLOAT gmf )
@@ -466 +468 @@
 }
 
-BOOL WINAPI wglSwapLayerBuffers_prox( HDC hdc, UINT planes )
+DECLEXPORT(BOOL) WINAPI wglSwapLayerBuffers_prox( HDC hdc, UINT planes )
 {
     CR_DDI_PROLOGUE();
@@ -480 +482 @@
 }
 
-BOOL WINAPI wglChoosePixelFormatEXT_prox
+DECLEXPORT(BOOL) WINAPI wglChoosePixelFormatEXT_prox
 (HDC hdc, const int *piAttributes, const FLOAT *pfAttributes, UINT nMaxFormats, int *piFormats, UINT *nNumFormats)
 {
@@ -602 +604 @@
 }
 
-BOOL WINAPI wglGetPixelFormatAttribivEXT_prox
+DECLEXPORT(BOOL) WINAPI wglGetPixelFormatAttribivEXT_prox
 (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, int *pValues)
 {
@@ -737 +739 @@
 }
 
-BOOL WINAPI wglGetPixelFormatAttribfvEXT_prox
+DECLEXPORT(BOOL) WINAPI wglGetPixelFormatAttribfvEXT_prox
 (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, int *piAttributes, float *pValues)
 {
@@ -872 +874 @@
 }
 
-BOOL WINAPI wglSwapIntervalEXT_prox(int interval)
+DECLEXPORT(BOOL) WINAPI wglSwapIntervalEXT_prox(int interval)
 {
     CR_DDI_PROLOGUE();
@@ -878 +880 @@
 }
 
-int  WINAPI wglGetSwapIntervalEXT_prox()
+DECLEXPORT(int)  WINAPI wglGetSwapIntervalEXT_prox()
 {
     CR_DDI_PROLOGUE();
@@ -886 +888 @@
 static GLubyte *gsz_wgl_extensions = "WGL_EXT_pixel_format WGL_ARB_pixel_format WGL_ARB_multisample";
 
-const GLubyte * WINAPI wglGetExtensionsStringEXT_prox()
+DECLEXPORT(const GLubyte *) WINAPI wglGetExtensionsStringEXT_prox()
 {
     CR_DDI_PROLOGUE();
@@ -892 +894 @@
 }
 
-const GLubyte * WINAPI wglGetExtensionsStringARB_prox(HDC hdc)
+DECLEXPORT(const GLubyte *) WINAPI wglGetExtensionsStringARB_prox(HDC hdc)
 {
     CR_DDI_PROLOGUE();