Hallo. I'm sending patch again. Sorry for my bugs (my Mozilla...). I removed patching 'configure' and dlls/Makefile.in, so they should be re-generated. Jacek Caban, jack@itma.pwr.wroc.pl --- /dev/null 2003-01-30 11:24:37.000000000 +0100 +++ dlls/glut32/glut.c 2003-11-21 20:04:10.000000000 +0100 @@ -0,0 +1,935 @@ + +#include "windef.h" + +/**************************************************** + * glutGetColor (glut32.@) + */ +extern float glutGetColor(int arg1, int arg2); +float WINAPI wine_glutGetColor(int arg1, int arg2) { + return glutGetColor(arg1, arg2); +} + +/**************************************************** + * glutBitmapLength (glut32.@) + */ +extern int glutBitmapLength(void *arg1, void *arg2); +int WINAPI wine_glutBitmapLength(void *arg1, void *arg2) { + return glutBitmapLength(arg1, arg2); +} + +/**************************************************** + * glutBitmapWith (glut32.@) + */ +extern int glutBitmapWidth(void *arg1, int arg2); +int WINAPI wine_glutBitmapWidth(void *arg1, int arg2) { + return glutBitmapWidth(arg1, arg2); +} + +/**************************************************** + * glutCreateMenu (glut32.@) + */ +extern int glutCreateMenu(void *arg); +int WINAPI wine_glutCreateMenu(void *arg) { + return glutCreateMenu(arg); +} + +/**************************************************** + * __glutCreateMenuWithExit (glut32.@) + */ +int WINAPI wine___glutCreateMenuWithExit(void *arg1, void *arg2) { + return glutCreateMenu(arg1); +} + +/***************************************************** + * glutCreateSubWindow (glut32.@) + */ +extern int glutCreateSubWindow(int arg1, int arg2, int arg3, int arg4, int arg5); +int WINAPI wine_glutCreateSubWindow(int arg1, int arg2, int arg3, int arg4, int arg5) { + return glutCreateSubWindow(arg1, arg2, arg3, arg4, arg5); +} + +/***************************************************** + * glutCreateWindow (glut32.@) + */ +extern int glutCreateWindow(void *arg); +int WINAPI wine_glutCreateWindow(void *arg) { + return glutCreateWindow(arg); +} + +/**************************************************** + * __glutCreateWindowWithExit (glut32.@) + */ +int WINAPI wine___glutCreateWindowWithExit(void *arg, void *arg2) { + return glutCreateWindow(arg); +} + +/***************************************************** + * glutDeviceGet (glut32.@) + */ +extern int glutDeviceGet(int arg); +int WINAPI wine_glutDeviceGet(int arg) { + return glutDeviceGet(arg); +} + +/**************************************************** + * glutEnterGameMode (glut32.@) + */ +extern int glutEnterGameMode(); +int WINAPI wine_glutEnterGameMode() { + return glutEnterGameMode(); +} + +/**************************************************** + * glutExtensionSupported (glut32.@) + */ +extern int glutExtensionSupported(void *arg); +int WINAPI wine_glutExtensionSupported(void *arg) { + return glutExtensionSupported(arg); +} + +/**************************************************** + * glutGameModeGet (glut32.@) + */ +extern int glutGameModeGet(int arg); +int WINAPI wine_glutGameModeGet(int arg) { + return glutGameModeGet(arg); +} + +/**************************************************** + * glutGetMenu (glut32.@) + */ +extern int glutGetMenu(); +int WINAPI wine_glutGetMenu() { + return wine_glutGetMenu(); +} + +/**************************************************** + * glutGetModifiers (glut32.@) + */ +extern int glutGetModifiers(); +int WINAPI wine_glutGetModifiers() { + return glutGetModifiers(); +} + +/**************************************************** + * glutGet (glut32.@) + */ +extern int glutGet(int arg); +int WINAPI wine_glutGet(int arg) { + return glutGet(arg); +} + +/**************************************************** + * glutGetWindow (glut32.@) + */ +extern int glutGetWindow(); +int WINAPI wine_glutGetWindow() { + return glutGetWindow(); +} + +/**************************************************** + * glutLayerGet (glut32.@) + */ +extern int glutLayerGet(int arg); +int WINAPI wine_glutLayerGet(int arg) { + return glutLayerGet(arg); +} + +/**************************************************** + * glutStrokeLength (glut32.@) + */ +extern int glutStrokeLength(void *arg1, void* arg2); +int WINAPI wine_glutStrokeLength(void *arg1, void *arg2) { + return glutStrokeLength(arg1, arg2); +} + +/**************************************************** + * glutStrokeWidth (glut32.@) + */ +extern int glutStrokeWidth(void *arg1, int arg2); +int WINAPI wine_glutStrokeWidth(void *arg1, int arg2) { + return glutStrokeWidth(arg1, arg2); +} + +/**************************************************** + * glutVideoResizeGet (glut32.@) + */ +extern int glutVideoResizeGet(int arg); +int WINAPI wine_glutVideoResizeGet(int arg) { + return glutVideoResizeGet(arg); +} + +/**************************************************** + * glutAddMenuEntry (glut32.@) + */ +extern void glutAddMenuEntry(void *arg1, int arg2); +void WINAPI wine_glutAddMenuEntry(void *arg1, int arg2) { + glutAddMenuEntry(arg1, arg2); +} + +/**************************************************** + * glutAddSubMenu (glut32.@) + */ +extern void glutAddSubMenu(void *arg1, int arg2); +void WINAPI wine_glutAddSubMenu(void *arg1, int arg2) { + glutAddSubMenu(arg1, arg2); +} + +/**************************************************** + * glutAttachMenu (glut32.@) + */ +extern void glutAttachMenu(int arg); +void WINAPI wine_glutAttachMenu(int arg) { + glutAttachMenu(arg); +} + +/**************************************************** + * glutBitmapCharacter (glut32.@) + */ +extern void glutBitmapCharacter(void *arg1, int arg2); +void WINAPI wine_glutBitmapCharacter(void *arg1, int arg2) { + glutBitmapCharacter(arg1, arg2); +} + +/**************************************************** + * glutButtonBoxFunc (glut32.@) + */ +extern void glutButtonBoxFunc(void *arg); +void WINAPI wine_glutButtonBoxFunc(void *arg) { + glutButtonBoxFunc(arg); +} + +/**************************************************** + * glutChangeToMenuEntry (glut32.@) + */ +extern void glutChangeToMenuEntry(int arg1, void *arg2, int arg3); +void WINAPI wine_glutChangeToMenuEntry(int arg1, void *arg2, int arg3) { + glutChangeToMenuEntry(arg1, arg2, arg3); +} + +/**************************************************** + * glutChangeToSubMenu (glut32.@) + */ +extern void glutChangeToSubMenu(int arg1, void *arg2, int arg3); +void WINAPI wine_glutChangeToSubMenu(int arg1, void *arg2, int arg3) { + glutChangeToSubMenu(arg1, arg2, arg3); +} + +/**************************************************** + * glutCopyColormap (glut32.@) + */ +extern void glutCopyColormap(int arg); +void WINAPI wine_glutCopyColormap(int arg) { + glutCopyColormap(arg); +} + +/**************************************************** + * glutDestroyMenu (glut32.@) + */ +extern void glutDestroyMenu(int arg); +void WINAPI wine_glutDestroyMenu(int arg) { + glutDestroyMenu(arg); +} + +/**************************************************** + * glutDestroyWindow (glut32.@) + */ +extern void glutDestroyWindow(int arg); +void WINAPI wine_glutDestroyWindow(int arg) { + glutDestroyWindow(arg); +} + +/**************************************************** + * glutDetachMenu (glut32.@) + */ +extern void glutDetachMenu(int arg); +void WINAPI wine_glutDetachMenu(int arg) { + glutDetachMenu(arg); +} + +/**************************************************** + * glutDialsFunc (glut32.@) + */ +extern void glutDialsFunc(void *arg); +void WINAPI wine_glutDialsFunc(void *arg) { + glutDialsFunc(arg); +} + +/******************************************************* + * glutDisplayFunc (glut32.@) + */ +extern void glutDisplayFunc(void *arg); +void WINAPI wine_glutDisplayFunc(void *arg) { + glutDisplayFunc(arg); +} + +/******************************************************* + * glutEntryFunc (glut32.@) + */ +extern void glutEntryFunc(void *arg); +void WINAPI wine_glutEntryFunc(void *arg) { + glutEntryFunc(arg); +} + +/******************************************************* + * glutEstablishOverlay (glut32.@) + */ +extern void glutEstablishOverlay(); +void WINAPI wine_glutEstablishOverlay() { + glutEstablishOverlay(); +} + +/******************************************************* + * glutForceJoystickFunc (glut32.@) + */ +extern void glutForceJoystickFunc(); +void WINAPI wine_glutForceJoystickFunc() { + glutForceJoystickFunc(); +} + +/******************************************************* + * glutFullScreen (glut32.@) + */ +extern void glutFullScreen(); +void WINAPI wine_glutFullScreen() { + glutFullScreen(); +} + +/******************************************************* + * glutGameModeString (glut32.@) + */ +extern void glutGameModeString(void *arg); +void WINAPI wine_glutGameModeString(void *arg) { + glutGameModeString(arg); +} + +/******************************************************* + * glutHideOverlay (glut32.@) + */ +extern void glutHideOverlay(); +void WINAPI wine_glutHideOverlay() { + glutHideOverlay(); +} + +/******************************************************* + * glutHideWindow (glut32.@) + */ +extern void glutHideWindow(); +void WINAPI wine_glutHideWindow() { + glutHideWindow(); +} + +/******************************************************* + * glutIconifyWindow (glut32.@) + */ +extern void glutIconifyWindow(); +void WINAPI wine_glutIconifyWindow() { + glutIconifyWindow(); +} + +/********************************************* + * glutIdleFunc (glut32.@) + */ +extern void glutIdleFunc(void *arg); +void WINAPI wine_glutIdleFunc(void *arg) { + glutIdleFunc(arg); +} + +/********************************************* + * glutIgnoreKeyRepeat (glut32.@) + */ +extern void glutIgnoreKeyRepeat(int arg); +void WINAPI wine_glutIgnoreKeyRepeat(int arg) { + glutIgnoreKeyRepeat(arg); +} + +/********************************************** + * glutInitDisplayMode (glut32.@) + */ +extern void glutInitDisplayMode(unsigned int arg); +void WINAPI wine_glutInitDisplayMode(unsigned int arg) { + glutInitDisplayMode(arg); +} + +/********************************************** + * glutInitDisplayString (glut32.@) + */ +extern void glutInitDisplayString(void *arg); +void WINAPI wine_glutInitDisplayString(void *arg) { + glutInitDisplayString(arg); +} + +/********************************************** + * glutInit (glut32.@) + */ +extern void glutInit(void *arg1, void *arg2); +void WINAPI wine_glutInit(void *arg1, void **arg2) { + glutInit(arg1, arg2); +} + +/********************************************** + * __glutInitWithExit (glut32.@) + */ +void WINAPI wine___glutInitWithExit(void *arg1, void *arg2, void *arg3) { + glutInit(arg1, arg2); +} + +/*********************************************** + * glutInitWindowPosition (glut32.@) + */ +extern void glutInitWindowPosition(int arg1, int arg2); +void WINAPI wine_glutInitWindowPosition(int arg1, int arg2) { + glutInitWindowPosition(arg1, arg2); +} + +/*********************************************** + * glutInitWindowSize (glut32.@) + */ +extern void glutInitWindowSize(int arg1, int arg2); +void WINAPI wine_glutInitWindowSize(int arg1, int arg2) { + glutInitWindowSize(arg1, arg2); +} + +/*********************************************** + * glutJoystickFunc (glut32.@) + */ +extern void glutJoystickFunc(void *arg1, int arg2); +void WINAPI wine_glutJoystickFunc(void *arg1, int arg2) { + glutJoystickFunc(arg1, arg2); +} + +/*********************************************** + * glutKeyboardFunc (glut32.@) + */ +extern void glutKeyboardFunc(void *arg); +void WINAPI wine_glutKeyboardFunc(void *arg) { + glutKeyboardFunc(arg); +} + +/*********************************************** + * glutKeyboardUpFunc (glut32.@) + */ +extern void glutKeyboardUpFunc(void *arg); +void WINAPI wine_glutKeyboardUpFunc(void *arg) { + glutKeyboardUpFunc(arg); +} + +/*********************************************** + * glutLeaveGameMode (glut32.@) + */ +extern void glutLeaveGameMode(); +void WINAPI wine_glutLeaveGameMode() { + glutLeaveGameMode(); +} + +/*********************************************** + * glutMainLoop (glut32.@) + */ +extern void glutMainLoop(); +void WINAPI wine_glutMainLoop() { + glutMainLoop(); +} + +/*********************************************** + * glutMenuStateFunc(glut32.@) + */ +extern void glutMenuStateFunc(void *arg); +void WINAPI wine_glutMenuStateFunc(void *arg) { + glutMenuStateFunc(arg); +} + +/*********************************************** + * glutMenuStatusFunc (glut32.@) + */ +extern void glutMenuStatusFunc(void *arg); +void WINAPI wine_glutMenuStatusFunc(void *arg) { + glutMenuStatusFunc(arg); +} + +/*********************************************** + * glutMotionFunc (glut32.@) + */ +extern void glutMotionFunc(void *arg); +void WINAPI wine_glutMotionFunc(void *arg) { + glutMotionFunc(arg); +} + +/******************************************** + * glutMouseFunc (glut32.@) + */ +extern void glutMouseFunc(void *arg); +void WINAPI wine_glutMouseFunc(void *arg) { + glutMouseFunc(arg); +} + +/******************************************** + * glutOverlayDisplayFunc (glut32.@) + */ +extern void glutOverlayDisplayFunc(void *arg); +void WINAPI wine_glutOverlayDisplayFunc(void *arg) { + glutOverlayDisplayFunc(arg); +} + +/******************************************** + * glutPassiveMotionFunc (glut32.@) + */ +extern void glutPassiveMotionFunc(void *arg); +void WINAPI wine_glutPassiveMotionFunc(void *arg) { + glutPassiveMotionFunc(arg); +} + +/******************************************** + * glutPopWindow (glut32.@) + */ +extern void glutPopWindow(); +void WINAPI wine_glutPopWindow() { + glutPopWindow(); +} + +/******************************************** + * glutPositionWindow (glut32.@) + */ +extern void glutPositionWindow(int arg1, int arg2); +void WINAPI wine_glutPositionWindow(int arg1, int arg2) { + glutPositionWindow(arg1, arg2); +} + +/******************************************** + * glutPostOverlayRedisplay (glut32.@) + */ +extern void glutPostOverlayRedisplay(); +void WINAPI wine_glutPostOverlayRedisplay() { + glutPostOverlayRedisplay(); +} + +/******************************************** + * glutPostRedisplay (glut32.@) + */ +extern void glutPostRedisplay(); +void WINAPI wine_glutPostRedisplay() { + glutPostRedisplay(); +} + +/******************************************** + * glutPostWindowOverlayRedisplay (glut32.@) + */ +extern void glutPostWindowOverlayRedisplay(int arg); +void WINAPI wine_glutPostWindowOverlayRedisplay(int arg) { + glutPostWindowOverlayRedisplay(arg); +} + +/******************************************** + * glutPostWindowRedisplay (glut32.@) + */ +extern void glutPostWindowRedisplay(int arg); +void WINAPI wine_glutPostWindowRedisplay(int arg) { + glutPostWindowRedisplay(arg); +} + +/******************************************** + * glutPushWindow (glut32.@) + */ +extern void glutPushWindow(); +void WINAPI wine_glutPushWindow() { + glutPushWindow(); +} + +/******************************************** + * glutRemoveMenuItem (glut32.@) + */ +extern void glutRemoveMenuItem(int arg); +void WINAPI wine_glutRemoveMenuItem(int arg) { + glutRemoveMenuItem(arg); +} + +/******************************************** + * glutRemoveOverlay (glut32.@) + */ +extern void glutRemoveOverlay(); +void WINAPI wine_glutRemoveOverlay() { + glutRemoveOverlay(); +} + +/******************************************** + * glutReportErrors (glut32.@) + */ +extern void glutReportErrors(); +void WINAPI wine_glutReportErrors() { + glutReportErrors(); +} + +/******************************************** + * glutReshapeFunc (glut32.@) + */ +extern void glutReshapeFunc(void *arg); +void WINAPI wine_glutReshapeFunc(void *arg) { + glutReshapeFunc(arg); +} + +/******************************************** + * glutReshapeWindow (glut32.@) + */ +extern void glutReshapeWindow(int arg1, int arg2); +void WINAPI wine_glutReshapeWindow(int arg1, int arg2) { + glutReshapeWindow(arg1, arg2); +} + +/******************************************** + * glutSetColor (glut32.@) + */ +extern void glutSetColor(float arg1, float arg2, float arg3); +void WINAPI wine_glutSetColor(float arg1, float arg2, float arg3) { + glutSetColor(arg1, arg2, arg3); +} + +/******************************************** + * glutSetCursor (glut32.@) + */ +extern void glutSetCursor(int arg); +void WINAPI wine_glutSetCursor(int arg) { + glutSetCursor(arg); +} + +/******************************************** + * glutSetIconTitle (glut32.@) + */ +extern void glutSetIconTitle(void *arg); +void WINAPI wine_glutSetIconTitle(void *arg) { + glutSetIconTitle(arg); +} + +/******************************************** + * glutSetKeyRepeat (glut32.@) + */ +extern void glutSetKeyRepeat(int arg); +void WINAPI wine_glutSetKeyRepeat(int arg) { + glutSetKeyRepeat(arg); +} + +/******************************************** + * glutSetMenu (glut32.@) + */ +extern void glutSetMenu(int arg); +void WINAPI wine_glutSetMenu(int arg) { + glutSetMenu(arg); +} + +/******************************************** + * glutSetupVideoResizing (glut32.@) + */ +extern void glutSetupVideoResizing(); +void WINAPI wine_glutSetupVideoResizing() { +// glutSetupVideoResizing(); +} + +/******************************************** + * glutSetWindow (glut32.@) + */ +extern void glutSetWindow(int arg); +void WINAPI wine_glutSetWindow(int arg) { + glutSetWindow(arg); +} + +/******************************************** + * glutSetWindowTitle (glut32.@) + */ +extern void glutSetWindowTitle(void *arg); +void WINAPI wine_glutSetWindowTitle(void *arg) { + glutSetWindowTitle(arg); +} + +/******************************************** + * glutShowOverlay (glut32.@) + */ +extern void glutShowOverlay(); +void WINAPI wine_glutShowOverlay() { + glutShowOverlay(); +} + +/******************************************** + * glutShowWindow (glut32.@) + */ +extern void glutShowWindow(); +void WINAPI wine_glutShowWindow() { + glutShowWindow(); +} + +/********************************************* + * glutSolidCone (glut.dll) + */ +extern void glutSolidCone(double arg1, double arg2, int arg3, int arg4); +void WINAPI wine_glutSolidCone(double arg1, double arg2, int arg3, int arg4) { + glutSolidCone(arg1, arg2, arg3, arg4); +} + +/********************************************** + * glutSolidCube (glut32.@) + */ +extern void glutSolidCube(double arg); +void WINAPI wine_glutSolidCube(double arg) { + glutSolidCube(arg); +} + +/********************************************** + * glutSolidDodecahedron (glut32.@) + */ +extern void glutSolidDodecahedron(); +void WINAPI wine_glutSolidDodecahedron() { + glutSolidDodecahedron(); +} + +/********************************************** + * glutSolidIcosahedron (glut32.@) + */ +extern void glutSolidIcosahedron(); +void WINAPI wine_glutSolidIcosahedron() { + glutSolidIcosahedron(); +} + +/********************************************** + * glutSolidOctahedron (glut32.@) + */ +extern void glutSolidOctahedron(); +void WINAPI wine_glutSolidOctahedron() { + glutSolidOctahedron(); +} + +/********************************************** + * glutSolidSphere (glut32.@) + */ +extern void glutSolidSphere(double arg1, int arg2, int arg3); +void WINAPI wine_glutSolidSphere(double arg1, int arg2, int arg3) { + glutSolidSphere(arg1, arg2, arg3); +} + +/********************************************** + * glutSolidTeapot (glut32.@) + */ +extern void glutSolidTeapot(double arg); +void WINAPI wine_glutSolidTeapot(double arg) { + glutSolidTeapot(arg); +} + +/********************************************** + * glutSolidTetrahedron (glut32.@) + */ +extern void glutSolidTetrahedron(); +void WINAPI wine_glutSolidTetrahedron() { + glutSolidTetrahedron(); +} + +/********************************************** + * glutSolidTetrahedron (glut32.@) + */ +extern void glutSolidTorus(double arg1, double arg2,int arg3, int arg4); +void WINAPI wine_glutSolidTorus(double arg1, double arg2,int arg3, int arg4) { + glutSolidTetrahedron(arg1, arg2, arg3, arg4); +} + +/********************************************** + * glutSpaceballButtonFunc (glut32.@) + */ +extern void glutSpaceballButtonFunc(void *arg); +void WINAPI wine_glutSpaceballButtonFunc(void *arg) { + glutSpaceballButtonFunc(arg); +} + +/********************************************** + * glutSpaceballMotionFunc (glut32.@) + */ +extern void glutSpaceballMotionFunc(void *arg); +void WINAPI wine_glutSpaceballMotionFunc(void *arg) { + glutSpaceballMotionFunc(arg); +} + +/********************************************** + * glutSpaceballRotateFunc (glut32.@) + */ +extern void glutSpaceballRotateFunc(void *arg); +void WINAPI wine_glutSpaceballRotateFunc(void *arg) { + glutSpaceballRotateFunc(arg); +} + +/********************************************** + * glutSpecialFunc (glut32.@) + */ +extern void glutSpecialFunc(void *arg); +void WINAPI wine_glutSpecialFunc(void *arg) { + glutSpecialFunc(arg); +} + +/********************************************** + * glutSpecialUpFunc (glut32.@) + */ +extern void glutSpecialUpFunc(void *arg); +void WINAPI wine_glutSpecialUpFunc(void *arg) { + glutSpecialUpFunc(arg); +} + +/********************************************** + * glutStopVideoResizing (glut32.@) + */ +extern void glutStopVideoResizing(); +void WINAPI wine_glutStopVideoResizing() { + glutStopVideoResizing(); +} + +/********************************************** + * glutStrokeCharacter (glut32.@) + */ +extern void glutStrokeCharacter(void *arg1, int arg2); +void WINAPI wine_glutStrokeCharacter(void *arg1, int arg2) { + glutStrokeCharacter(arg1, arg2); +} + +/************************************************** + * glutSwapBuffers (glut32.@) + */ +extern void glutSwapBuffers(); +void WINAPI wine_glutSwapBuffers() { + glutSwapBuffers(); +} + +/********************************************** + * glutTabletButtonFunc (glut32.@) + */ +extern void glutTabletButtonFunc(void *arg); +void WINAPI wine_glutTabletButtonFunc(void *arg) { + glutTabletButtonFunc(arg); +} + +/********************************************** + * glutTabletMotionFunc (glut32.@) + */ +extern void glutTabletMotionFunc(void *arg); +void WINAPI wine_glutTabletMotionFunc(void *arg) { + glutTabletMotionFunc(arg); +} + +/********************************************** + * glutTimerFunc (glut32.@) + */ +extern void glutTimerFunc(int arg1, void *arg2, int arg3); +void WINAPI wine_glutTimerFunc(int arg1, void *arg2, int arg3) { + glutTimerFunc(arg1, arg2, arg3); +} + +/********************************************** + * glutUseLayer (glut32.@) + */ +extern void glutUseLayer(int arg); +void WINAPI wine_glutUseLayer(int arg) { + glutUseLayer(arg); +} + +/********************************************** + * glutVideoPan (glut32.@) + */ +extern void glutVideoPan(int arg1, int arg2, int arg3, int arg4); +void WINAPI wine_glutVideoPan(int arg1, int arg2, int arg3, int arg4) { + glutVideoPan(arg1, arg2, arg3, arg4); +} + +/********************************************** + * glutVideoResize (glut32.@) + */ +extern void glutVideoResize(int arg1, int arg2, int arg3, int arg4); +void WINAPI wine_glutVideoResize(int arg1, int arg2, int arg3, int arg4) { + glutVideoResize(arg1, arg2, arg3, arg4); +} + +/********************************************** + * glutVisibilityFunc (glut32.@) + */ +extern void glutVisibilityFunc(void *arg); +void WINAPI wine_glutVisibilityFunc(void *arg) { + glutVisibilityFunc(arg); +} + +/********************************************** + * glutWarpPointer (glut32.@) + */ +extern void glutWarpPointer(int arg1, int arg2); +void WINAPI wine_glutWarpPointer(int arg1, int arg2) { + glutWarpPointer(arg1, arg2); +} + +/********************************************** + * glutWindowStatusFunc (glut32.@) + */ +extern void glutWindowStatusFunc(void *arg); +void WINAPI wine_glutWindowStatusFunc(void *arg) { + glutWindowStatusFunc(arg); +} + +/********************************************** + * glutWireCone (glut32.@) + */ +extern void glutWireCone(double arg1, double arg2, int arg3, int arg4); +void WINAPI wine_glutWireCone(double arg1, double arg2, int arg3,int arg4) { + glutWireCone(arg1, arg2, arg3, arg4); +} + +/********************************************** + * glutWireCube (glut32.@) + */ +extern void glutWireCube(double arg); +void WINAPI wine_glutWireCube(double arg) { + glutWireCube(arg); +} + +/********************************************** + * glutWireDodecahedron (glut32.@) + */ +extern void glutWireDodecahedron(); +void WINAPI wine_glutWireDodecahedron() { + glutWireDodecahedron(); +} + +/********************************************** + * glutWireIcosahedron (glut32.@) + */ +extern void glutWireIcosahedron(); +void WINAPI wine_glutWireIcosahedron() { + glutWireIcosahedron(); +} + +/********************************************** + * glutWireOctahedron (glut32.@) + */ +extern void glutWireOctahedron(); +void WINAPI wine_glutWireOctahedron() { + glutWireOctahedron(); +} + +/********************************************** + * glutWireSphere (glut32.@) + */ +extern void glutWireSphere(double arg1, int arg2, int arg3); +void WINAPI wine_glutWireSphere(double arg1, int arg2, int arg3) { + glutWireSphere(arg1, arg2, arg3); +} + +/********************************************** + * glutWireTeapot (glut32.@) + */ +extern void glutWireTeapot(double arg); +void WINAPI wine_glutWireTeapot(double arg) { + glutWireTeapot(arg); +} + +/********************************************** + * glutWireTetrahedron (glut32.@) + */ +extern void glutWireTetrahedron(); +void WINAPI wine_glutWireTetrahedron() { + glutWireTetrahedron(); +} + +/*********************************************** + * glutWireTorus (glut32.@) + */ +extern void glutWireTorus(double arg1, double arg2, int arg3, int arg4); +void WINAPI wine_glutWireTorus(double arg1, double arg2, int arg3, int arg4) { + glutWireTorus(arg1, arg2, arg3, arg4); +} --- /dev/null 2003-01-30 11:24:37.000000000 +0100 +++ dlls/glut32/glut32.spec 2003-11-17 19:57:04.000000000 +0100 @@ -0,0 +1,117 @@ +@ stdcall glutAddMenuEntry(ptr long) wine_glutAddMenuEntry +@ stdcall glutAddSubMenu(ptr long) wine_glutAddSubMenu +@ stdcall glutAttachMenu(long) wine_glutAttachMenu +@ stdcall glutBitmapCharacter(ptr long) wine_glutBitmapCharacter +@ stdcall glutBitmapLength(ptr ptr) wine_glutBitmapLength +@ stdcall glutBitmapWidth(ptr long) wine_glutBitmapWidth +@ stdcall glutButtonBoxFunc(ptr) wine_glutButtonBoxFunc +@ stdcall glutChangeToMenuEntry(long ptr long) wine_glutChangeToMenuEntry +@ stdcall glutChangeToSubMenu(long ptr long) wine_glutChangeToSubMenu +@ stdcall glutCopyColormap(long) wine_glutCopyColormap +@ stdcall glutCreateMenu(ptr) wine_glutCreateMenu +@ stdcall __glutCreateMenuWithExit(ptr ptr) wine___glutCreateMenuWithExit +@ stdcall glutCreateSubWindow(long long long long long) wine_glutCreateSubWindow +@ stdcall glutCreateWindow(ptr) wine_glutCreateWindow +@ stdcall __glutCreateWindowWithExit(ptr ptr) wine___glutCreateWindowWithExit +@ stdcall glutDestroyMenu(long) wine_glutDestroyMenu +@ stdcall glutDestroyWindow(long) wine_glutDestroyWindow +@ stdcall glutDetachMenu(long) wine_glutDetachMenu +@ stdcall glutDeviceGet(long) wine_glutDeviceGet +@ stdcall glutDialsFunc(ptr) wine_glutDialsFunc +@ stdcall glutDisplayFunc(ptr) wine_glutDisplayFunc +@ stdcall glutEnterGameMode() wine_glutEnterGameMode +@ stdcall glutEntryFunc(ptr) wine_glutEntryFunc +@ stdcall glutEstablishOverlay() wine_glutEstablishOverlay +@ stdcall glutExtensionSupported(ptr) wine_glutExtensionSupported +@ stdcall glutForceJoystickFunc() wine_glutForceJoystickFunc +@ stdcall glutFullScreen() wine_glutFullScreen +@ stdcall glutGameModeGet(long) wine_glutGameModeGet +@ stdcall glutGameModeString(ptr) wine_glutGameModeString +@ stdcall glutGetColor(long long) wine_glutGetColor +@ stdcall glutGet(long) wine_glutGet +@ stdcall glutGetMenu() wine_glutGetMenu +@ stdcall glutGetModifiers() wine_glutGetModifiers +@ stdcall glutGetWindow() wine_glutGetWindow +@ stdcall glutHideOverlay() wine_glutHideOverlay +@ stdcall glutHideWindow() wine_glutHideWindow +@ stdcall glutIconifyWindow() wine_glutIconifyWindow +@ stdcall glutIdleFunc(ptr) wine_glutIdleFunc +@ stdcall glutIgnoreKeyRepeat(long) wine_glutIgnoreKeyRepeat +@ stdcall glutInitDisplayMode(long) wine_glutInitDisplayMode +@ stdcall glutInitDisplayString(ptr) wine_glutInitDisplayString +@ stdcall glutInit(ptr ptr) wine_glutInit +@ stdcall glutInitWindowPosition(long long) wine_glutInitWindowPosition +@ stdcall glutInitWindowSize(long long) wine_glutInitWindowSize +@ stdcall __glutInitWithExit(ptr ptr ptr) wine___glutInitWithExit +@ stdcall glutJoystickFunc(ptr long) wine_glutJoystickFunc +@ stdcall glutKeyboardFunc(ptr) wine_glutKeyboardFunc +@ stdcall glutKeyboardUpFunc(ptr) wine_glutKeyboardUpFunc +@ stdcall glutLayerGet(long) wine_glutLayerGet +@ stdcall glutLeaveGameMode() wine_glutLeaveGameMode +@ stdcall glutMainLoop() wine_glutMainLoop +@ stdcall glutMenuStateFunc(ptr) wine_glutMenuStateFunc +@ stdcall glutMenuStatusFunc(ptr) wine_glutMenuStatusFunc +@ stdcall glutMotionFunc(ptr) wine_glutMotionFunc +@ stdcall glutMouseFunc(ptr) wine_glutMouseFunc +@ stdcall glutOverlayDisplayFunc(ptr) wine_glutOverlayDisplayFunc +@ stdcall glutPassiveMotionFunc(ptr) wine_glutPassiveMotionFunc +@ stdcall glutPopWindow() wine_glutPopWindow +@ stdcall glutPositionWindow(long long) wine_glutPositionWindow +@ stdcall glutPostOverlayRedisplay() wine_glutPostOverlayRedisplay +@ stdcall glutPostRedisplay() wine_glutPostRedisplay +@ stdcall glutPostWindowOverlayRedisplay(long) wine_glutPostWindowOverlayRedisplay +@ stdcall glutPostWindowRedisplay(long) wine_glutPostWindowRedisplay +@ stdcall glutPushWindow() wine_glutPushWindow +@ stdcall glutRemoveMenuItem(long) wine_glutRemoveMenuItem +@ stdcall glutRemoveOverlay() wine_glutRemoveOverlay +@ stdcall glutReportErrors() wine_glutReportErrors +@ stdcall glutReshapeFunc(ptr) wine_glutReshapeFunc +@ stdcall glutReshapeWindow(long long) wine_glutReshapeWindow +@ stdcall glutSetColor(long long long) wine_glutSetColor +@ stdcall glutSetCursor(long) wine_glutSetCursor +@ stdcall glutSetIconTitle(ptr) wine_glutSetIconTitle +@ stdcall glutSetKeyRepeat(long) wine_glutSetKeyRepeat +@ stdcall glutSetMenu(long) wine_glutSetMenu +@ stdcall glutSetupVideoResizing() wine_glutSetupVideoResizing +@ stdcall glutSetWindow(long) wine_glutSetWindow +@ stdcall glutSetWindowTitle(ptr) wine_glutSetWindowTitle +@ stdcall glutShowOverlay() wine_glutShowOverlay +@ stdcall glutShowWindow() wine_glutShowWindow +@ stdcall glutSolidCone(double double long long) wine_glutSolidCone +@ stdcall glutSolidCube(double) wine_glutSolidCube +@ stdcall glutSolidDodecahedron() wine_glutSolidDodecahedron +@ stdcall glutSolidIcosahedron() wine_glutSolidIcosahedron +@ stdcall glutSolidOctahedron() wine_glutSolidOctahedron +@ stdcall glutSolidSphere(double long long) wine_glutSolidSphere +@ stdcall glutSolidTeapot(double) wine_glutSolidTeapot +@ stdcall glutSolidTetrahedron() wine_glutSolidTetrahedron +@ stdcall glutSolidTorus(double double long long) wine_glutSolidTorus +@ stdcall glutSpaceballButtonFunc(ptr) wine_glutSpaceballButtonFunc +@ stdcall glutSpaceballMotionFunc(ptr) wine_glutSpaceballMotionFunc +@ stdcall glutSpaceballRotateFunc(ptr) wine_glutSpaceballRotateFunc +@ stdcall glutSpecialFunc(ptr) wine_glutSpecialFunc +@ stdcall glutSpecialUpFunc(ptr) wine_glutSpecialUpFunc +@ stdcall glutStopVideoResizing() wine_glutStopVideoResizing +@ stdcall glutStrokeCharacter(ptr long) wine_glutStrokeCharacter +@ stdcall glutStrokeLength(ptr ptr) wine_glutStrokeLength +@ stdcall glutStrokeWidth(ptr long) wine_glutStrokeWidth +@ stdcall glutSwapBuffers() wine_glutSwapBuffers +@ stdcall glutTabletButtonFunc(ptr) wine_glutTabletButtonFunc +@ stdcall glutTabletMotionFunc(ptr) wine_glutTabletMotionFunc +@ stdcall glutTimerFunc(long ptr long) wine_glutTimerFunc +@ stdcall glutUseLayer(long) wine_glutUseLayer +@ stdcall glutVideoPan(long long long long) wine_glutVideoPan +@ stdcall glutVideoResizeGet(long) wine_glutVideoResizeGet +@ stdcall glutVideoResize(long long long long) wine_glutVideoResize +@ stdcall glutVisibilityFunc(ptr) wine_glutVisibilityFunc +@ stdcall glutWarpPointer(long long) wine_glutWarpPointer +@ stdcall glutWindowStatusFunc(ptr) wine_glutWindowStatusFunc +@ stdcall glutWireCone(double double long long) wine_glutWireCone +@ stdcall glutWireCube(double) wine_glutWireCube +@ stdcall glutWireDodecahedron() wine_glutWireDodecahedron +@ stdcall glutWireIcosahedron() wine_glutWireIcosahedron +@ stdcall glutWireOctahedron() wine_glutWireOctahedron +@ stdcall glutWireSphere(double long long) wine_glutWireSphere +@ stdcall glutWireTeapot(double) wine_glutWireTeapot +@ stdcall glutWireTetrahedron() wine_glutWireTetrahedron +@ stdcall glutWireTorus(double double long long) wine_glutWireTorus --- /dev/null 2003-01-30 11:24:37.000000000 +0100 +++ dlls/glut32/Makefile.in 2003-11-17 19:57:04.000000000 +0100 @@ -0,0 +1,17 @@ +TOPSRCDIR = @top_srcdir@ +TOPOBJDIR = ../.. +SRCDIR = @srcdir@ +VPATH = @srcdir@ +MODULE = glut32.dll +IMPORTS = kernel32 +EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@ @OPENGL_LIBS@ @GLUT_LIBS@ + +LDDLLFLAGS = @LDDLLFLAGS@ +SYMBOLFILE = $(MODULE).tmp.o + +C_SRCS = \ + glut.c + +@MAKE_DLL_RULES@ + +### Dependencies: --- dlls/make_dlls 2003-11-19 22:51:29.000000000 +0100 +++ dlls/make_dlls 2003-11-19 22:51:29.000000000 +0100 @@ -33,6 +33,7 @@ ( "ddraw" => "XFILES", "glu32" => "GLU32FILES", + "glut32" => "GLUT32FILES", "opengl32" => "OPENGLFILES", "d3d8" => "OPENGLFILES", "d3d9" => "OPENGLFILES", --- configure.ac 2003-11-20 18:08:49.000000000 +0100 +++ configure.ac 2003-11-20 18:08:49.000000000 +0100 @@ -167,6 +167,11 @@ GLU32FILES="" AC_SUBST(OPENGL_LIBS) OPENGL_LIBS="" +AC_SUBST(GLUT32FILES) +GLUT32FILES="" +AC_SUBST(GLUT_LIBS) +GLUT_LIBS="" + if test "$have_x" = "yes" then XLIB="-lXext -lX11" @@ -337,6 +342,19 @@ ,, $OPENGL_LIBS $X_LIBS $X_PRE_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS ) + + dnl Check for glut32 library. + AC_CHECK_LIB(glut,glutMainLoop, + [GLUT_LIBS="-lglut" + GLUT32FILES='$(GLUT32FILES)'] + ,, + $OPENGL_LIBS $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS $XLIB -lglut -lXi -lXmu -lm + ) + if test "$ac_cv_lib_glut_glutMainLoop" = "yes" + then + GLUTFILES='$(GLUTFILES)' + AC_DEFINE(HAVE_GLUT, 1, [Define if glut is present on the system]) + fi fi fi fi @@ -455,7 +473,10 @@ freetype/ftsnames.h \ freetype/ttnameid.h \ freetype/ftoutln.h \ - freetype/internal/sfnt.h) + freetype/internal/sfnt.h,,, + [#if HAVE_FT2BUILD_H + #include + #endif]) AC_TRY_CPP([#include #include ], [AC_DEFINE(HAVE_FREETYPE_FTTRIGON_H, 1, @@ -1494,6 +1515,7 @@ dlls/gdi/Makefile dlls/gdi/tests/Makefile dlls/glu32/Makefile +dlls/glut32/Makefile dlls/icmp/Makefile dlls/imagehlp/Makefile dlls/imm32/Makefile