Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-27 09:34:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace EXT_QUERY_OPENGLDRIVERINFO define by OPENGL_GETINFO from winddi.h

Browse source 
Rename EXT_OPENGLDRIVERINFO struct to OPENGL_INFO and change member names a bit.

svn path=/trunk/; revision=18965
This commit is contained in:
Gregor Anich 2005-11-03 00:15:39 +00:00
parent cc0933a118
commit 54992254d7
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
reactos/lib/opengl32/wgl.c
View file

@ -11,10 +11,18 @@
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#define WIN32_NO_STATUS #define WIN32_NO_STATUS
#include <windows.h> #include <windows.h>
#define NTOS_MODE_USER
#include <ddraw.h>
#include <ddrawi.h>
#include <ddk/winddi.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "teb.h" #include "teb.h"
#define OPENGL32_GL_FUNC_PROTOTYPES #define OPENGL32_GL_FUNC_PROTOTYPES
#include "opengl32.h" #include "opengl32.h"
@ -27,13 +35,12 @@ extern "C" {
#endif #endif
#define EXT_QUERY_OPENGLDRIVERINFO 0x1101 /*!< ExtEscape code to get driver info */ typedef struct _OPENGL_INFO
typedef struct tagEXT_OPENGLDRIVERINFO
{ {
DWORD version; /*!< Driver interface version */ DWORD Version; /*!< Driver interface version */
DWORD driver_version; /*!< Driver version */ DWORD DriverVersion; /*!< Driver version */
WCHAR driver_name[256]; /*!< Driver name */ WCHAR DriverName[256]; /*!< Driver name */
} EXT_OPENGLDRIVERINFO; } OPENGL_INFO, *POPENGL_INFO;
/*! \brief Append OpenGL Rendering Context (GLRC) to list /*! \brief Append OpenGL Rendering Context (GLRC) to list
@ -295,7 +302,7 @@ ROSGL_ICDForHDC( HDC hdc )
if (dcdata->icd == NULL) if (dcdata->icd == NULL)
{ {
LPCWSTR driverName; LPCWSTR driverName;
EXT_OPENGLDRIVERINFO info; OPENGL_INFO info;
driverName = _wgetenv( L"OPENGL32_DRIVER" ); driverName = _wgetenv( L"OPENGL32_DRIVER" );
if (driverName == NULL) if (driverName == NULL)
@ -304,13 +311,13 @@ ROSGL_ICDForHDC( HDC hdc )
LONG ret; LONG ret;
/* get driver name */ /* get driver name */
dwInput = EXT_QUERY_OPENGLDRIVERINFO; dwInput = OPENGL_GETINFO;
ret = ExtEscape( hdc, QUERYESCSUPPORT, sizeof (dwInput), (LPCSTR)&dwInput, 0, NULL ); ret = ExtEscape( hdc, QUERYESCSUPPORT, sizeof (dwInput), (LPCSTR)&dwInput, 0, NULL );
if (ret > 0) if (ret > 0)
{ {
dwInput = 0; dwInput = 0;
ret = ExtEscape( hdc, EXT_QUERY_OPENGLDRIVERINFO, sizeof (dwInput), ret = ExtEscape( hdc, OPENGL_GETINFO, sizeof (dwInput),
(LPCSTR)&dwInput, sizeof (EXT_OPENGLDRIVERINFO), (LPCSTR)&dwInput, sizeof (OPENGL_INFO),
(LPSTR)&info ); (LPSTR)&info );
} }
if (ret <= 0) if (ret <= 0)
@ -338,8 +345,8 @@ ROSGL_ICDForHDC( HDC hdc )
} }
/* query value */ /* query value */
size = sizeof (info.driver_name); size = sizeof (info.DriverName);
ret = RegQueryValueExW( hKey, L"DefaultDriver", 0, &type, (LPBYTE)info.driver_name, &size ); ret = RegQueryValueExW( hKey, L"DefaultDriver", 0, &type, (LPBYTE)info.DriverName, &size );
RegCloseKey( hKey ); RegCloseKey( hKey );
if (ret != ERROR_SUCCESS || type != REG_SZ) if (ret != ERROR_SUCCESS || type != REG_SZ)
{ {
@ -351,10 +358,10 @@ ROSGL_ICDForHDC( HDC hdc )
} }
else else
{ {
wcsncpy( info.driver_name, driverName, sizeof (info.driver_name) / sizeof (info.driver_name[0]) ); wcsncpy( info.DriverName, driverName, sizeof (info.DriverName) / sizeof (info.DriverName[0]) );
} }
/* load driver (or get a reference) */ /* load driver (or get a reference) */
dcdata->icd = OPENGL32_LoadICD( info.driver_name ); dcdata->icd = OPENGL32_LoadICD( info.DriverName );
if (dcdata->icd == NULL) if (dcdata->icd == NULL)
{ {
WCHAR Buffer[256]; WCHAR Buffer[256];
@ -363,7 +370,7 @@ ROSGL_ICDForHDC( HDC hdc )
MessageBox(WindowFromDC( hdc ), Buffer, MessageBox(WindowFromDC( hdc ), Buffer,
L"OPENGL32.dll: Warning", L"OPENGL32.dll: Warning",
MB_OK | MB_ICONWARNING); MB_OK | MB_ICONWARNING);
} }
} }
return dcdata->icd; return dcdata->icd;