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
37ee3870
Commit
37ee3870
authored
Nov 19, 2016
by
Daniel Lehman
Committed by
Alexandre Julliard
Nov 21, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
opengl32: Set last error on invalid share in wglCreateContextAttribsARB.
Signed-off-by:
Daniel Lehman
<
dlehman25@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ed4271fa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
opengl.c
dlls/opengl32/tests/opengl.c
+3
-2
wgl.c
dlls/opengl32/wgl.c
+5
-1
No files found.
dlls/opengl32/tests/opengl.c
View file @
37ee3870
...
...
@@ -898,12 +898,13 @@ static void test_opengl3(HDC hdc)
{
HGLRC
gl3Ctx
;
DWORD
error
;
SetLastError
(
0xdeadbeef
);
gl3Ctx
=
pwglCreateContextAttribsARB
(
hdc
,
(
HGLRC
)
0xdeadbeef
,
0
);
ok
(
gl3Ctx
==
0
,
"pwglCreateContextAttribsARB using an invalid shareList passed
\n
"
);
error
=
GetLastError
();
/* The Nvidia implementation seems to return hresults instead of win32 error codes */
todo_wine
ok
(
error
==
ERROR_INVALID_OPERATION
||
error
==
NVIDIA_HRESULT_FROM_WIN32
(
ERROR_INVALID_OPERATION
),
"Expected ERROR_INVALID_OPERATION, got error=%x
\n
"
,
error
);
ok
(
error
==
ERROR_INVALID_OPERATION
||
error
==
NVIDIA_HRESULT_FROM_WIN32
(
ERROR_INVALID_OPERATION
),
"Expected ERROR_INVALID_OPERATION, got error=%x
\n
"
,
error
);
wglDeleteContext
(
gl3Ctx
);
}
...
...
dlls/opengl32/wgl.c
View file @
37ee3870
...
...
@@ -280,7 +280,11 @@ HGLRC WINAPI wglCreateContextAttribsARB( HDC hdc, HGLRC share, const int *attrib
return
0
;
}
if
(
!
funcs
->
ext
.
p_wglCreateContextAttribsARB
)
return
0
;
if
(
share
&&
!
(
share_ptr
=
get_handle_ptr
(
share
,
HANDLE_CONTEXT
)))
return
0
;
if
(
share
&&
!
(
share_ptr
=
get_handle_ptr
(
share
,
HANDLE_CONTEXT
)))
{
SetLastError
(
ERROR_INVALID_OPERATION
);
return
0
;
}
if
((
drv_ctx
=
funcs
->
ext
.
p_wglCreateContextAttribsARB
(
hdc
,
share_ptr
?
share_ptr
->
u
.
context
->
drv_ctx
:
NULL
,
attribs
)))
{
...
...
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