Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
8a576c99
Commit
8a576c99
authored
May 01, 2019
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
include: Add DECLSPEC_IMPORT on OpenGL functions when not building opengl32.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
74799527
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
18 deletions
+25
-18
Makefile.in
dlls/opengl32/Makefile.in
+1
-0
wingdi.h
include/wingdi.h
+24
-18
No files found.
dlls/opengl32/Makefile.in
View file @
8a576c99
MODULE
=
opengl32.dll
MODULE
=
opengl32.dll
EXTRADEFS
=
-D_OPENGL32_
IMPORTLIB
=
opengl32
IMPORTLIB
=
opengl32
IMPORTS
=
user32 gdi32 advapi32
IMPORTS
=
user32 gdi32 advapi32
DELAYIMPORTS
=
glu32
DELAYIMPORTS
=
glu32
...
...
include/wingdi.h
View file @
8a576c99
...
@@ -30,6 +30,12 @@ extern "C" {
...
@@ -30,6 +30,12 @@ extern "C" {
#define WINGDIAPI DECLSPEC_IMPORT
#define WINGDIAPI DECLSPEC_IMPORT
#endif
#endif
#ifdef _OPENGL32_
#define WGLAPI
#else
#define WGLAPI DECLSPEC_IMPORT
#endif
typedef
struct
_ABCFLOAT
{
typedef
struct
_ABCFLOAT
{
FLOAT
abcfA
;
FLOAT
abcfA
;
FLOAT
abcfB
;
FLOAT
abcfB
;
...
@@ -3994,25 +4000,25 @@ WINGDIAPI BOOL WINAPI PolyTextOutW(HDC,const POLYTEXTW*,INT);
...
@@ -3994,25 +4000,25 @@ WINGDIAPI BOOL WINAPI PolyTextOutW(HDC,const POLYTEXTW*,INT);
#define WGL_FONT_POLYGONS 1
#define WGL_FONT_POLYGONS 1
/* WGL prototypes */
/* WGL prototypes */
W
INGDI
API
HGLRC
WINAPI
wglCreateContext
(
HDC
);
W
GL
API
HGLRC
WINAPI
wglCreateContext
(
HDC
);
W
INGDI
API
HGLRC
WINAPI
wglCreateLayerContext
(
HDC
,
INT
);
W
GL
API
HGLRC
WINAPI
wglCreateLayerContext
(
HDC
,
INT
);
W
INGDI
API
BOOL
WINAPI
wglCopyContext
(
HGLRC
,
HGLRC
,
UINT
);
W
GL
API
BOOL
WINAPI
wglCopyContext
(
HGLRC
,
HGLRC
,
UINT
);
W
INGDI
API
BOOL
WINAPI
wglDeleteContext
(
HGLRC
);
W
GL
API
BOOL
WINAPI
wglDeleteContext
(
HGLRC
);
W
INGDI
API
BOOL
WINAPI
wglDescribeLayerPlane
(
HDC
,
INT
,
INT
,
UINT
,
LPLAYERPLANEDESCRIPTOR
);
W
GL
API
BOOL
WINAPI
wglDescribeLayerPlane
(
HDC
,
INT
,
INT
,
UINT
,
LPLAYERPLANEDESCRIPTOR
);
W
INGDI
API
HGLRC
WINAPI
wglGetCurrentContext
(
void
);
W
GL
API
HGLRC
WINAPI
wglGetCurrentContext
(
void
);
W
INGDI
API
HDC
WINAPI
wglGetCurrentDC
(
void
);
W
GL
API
HDC
WINAPI
wglGetCurrentDC
(
void
);
W
INGDI
API
INT
WINAPI
wglGetLayerPaletteEntries
(
HDC
,
INT
,
INT
,
INT
,
const
COLORREF
*
);
W
GL
API
INT
WINAPI
wglGetLayerPaletteEntries
(
HDC
,
INT
,
INT
,
INT
,
const
COLORREF
*
);
W
INGDI
API
PROC
WINAPI
wglGetProcAddress
(
LPCSTR
);
W
GL
API
PROC
WINAPI
wglGetProcAddress
(
LPCSTR
);
W
INGDI
API
BOOL
WINAPI
wglMakeCurrent
(
HDC
,
HGLRC
);
W
GL
API
BOOL
WINAPI
wglMakeCurrent
(
HDC
,
HGLRC
);
W
INGDI
API
BOOL
WINAPI
wglRealizeLayerPalette
(
HDC
,
INT
,
BOOL
);
W
GL
API
BOOL
WINAPI
wglRealizeLayerPalette
(
HDC
,
INT
,
BOOL
);
W
INGDI
API
INT
WINAPI
wglSetLayerPaletteEntries
(
HDC
,
INT
,
INT
,
INT
,
const
COLORREF
*
);
W
GL
API
INT
WINAPI
wglSetLayerPaletteEntries
(
HDC
,
INT
,
INT
,
INT
,
const
COLORREF
*
);
W
INGDI
API
BOOL
WINAPI
wglShareLists
(
HGLRC
,
HGLRC
);
W
GL
API
BOOL
WINAPI
wglShareLists
(
HGLRC
,
HGLRC
);
W
INGDI
API
BOOL
WINAPI
wglSwapLayerBuffers
(
HDC
,
UINT
);
W
GL
API
BOOL
WINAPI
wglSwapLayerBuffers
(
HDC
,
UINT
);
W
INGDI
API
BOOL
WINAPI
wglUseFontBitmapsA
(
HDC
,
DWORD
,
DWORD
,
DWORD
);
W
GL
API
BOOL
WINAPI
wglUseFontBitmapsA
(
HDC
,
DWORD
,
DWORD
,
DWORD
);
W
INGDI
API
BOOL
WINAPI
wglUseFontBitmapsW
(
HDC
,
DWORD
,
DWORD
,
DWORD
);
W
GL
API
BOOL
WINAPI
wglUseFontBitmapsW
(
HDC
,
DWORD
,
DWORD
,
DWORD
);
#define wglUseFontBitmaps WINELIB_NAME_AW(wglUseFontBitmaps)
#define wglUseFontBitmaps WINELIB_NAME_AW(wglUseFontBitmaps)
W
INGDI
API
BOOL
WINAPI
wglUseFontOutlinesA
(
HDC
,
DWORD
,
DWORD
,
DWORD
,
FLOAT
,
FLOAT
,
INT
,
LPGLYPHMETRICSFLOAT
);
W
GL
API
BOOL
WINAPI
wglUseFontOutlinesA
(
HDC
,
DWORD
,
DWORD
,
DWORD
,
FLOAT
,
FLOAT
,
INT
,
LPGLYPHMETRICSFLOAT
);
W
INGDI
API
BOOL
WINAPI
wglUseFontOutlinesW
(
HDC
,
DWORD
,
DWORD
,
DWORD
,
FLOAT
,
FLOAT
,
INT
,
LPGLYPHMETRICSFLOAT
);
W
GL
API
BOOL
WINAPI
wglUseFontOutlinesW
(
HDC
,
DWORD
,
DWORD
,
DWORD
,
FLOAT
,
FLOAT
,
INT
,
LPGLYPHMETRICSFLOAT
);
#define wglUseFontOutlines WINELIB_NAME_AW(wglUseFontOutlines)
#define wglUseFontOutlines WINELIB_NAME_AW(wglUseFontOutlines)
#ifdef __cplusplus
#ifdef __cplusplus
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment