Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
e9c065e5
Commit
e9c065e5
authored
Nov 25, 2022
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
opengl32: Use the Unix call helpers.
parent
3b50ca0f
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
14 deletions
+4
-14
make_opengl
dlls/opengl32/make_opengl
+1
-2
unixlib.h
dlls/opengl32/unixlib.h
+1
-2
wgl.c
dlls/opengl32/wgl.c
+2
-10
No files found.
dlls/opengl32/make_opengl
View file @
e9c065e5
...
...
@@ -1054,8 +1054,7 @@ print OUT " GLsizei length;\n";
print
OUT
" const GLchar *message;\n"
;
print
OUT
"};\n\n"
;
print
OUT
"extern unixlib_handle_t unixlib_handle DECLSPEC_HIDDEN;\n"
;
print
OUT
"#define UNIX_CALL( func, params ) __wine_unix_call( unixlib_handle, unix_ ## func, params )\n\n"
;
print
OUT
"#define UNIX_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params )\n\n"
;
print
OUT
"#endif /* __WINE_OPENGL32_UNIXLIB_H */\n"
;
close
OUT
;
...
...
dlls/opengl32/unixlib.h
View file @
e9c065e5
...
...
@@ -25351,7 +25351,6 @@ struct wine_gl_debug_message_params
const
GLchar
*
message
;
};
extern
unixlib_handle_t
unixlib_handle
DECLSPEC_HIDDEN
;
#define UNIX_CALL( func, params ) __wine_unix_call( unixlib_handle, unix_ ## func, params )
#define UNIX_CALL( func, params ) WINE_UNIX_CALL( unix_ ## func, params )
#endif
/* __WINE_OPENGL32_UNIXLIB_H */
dlls/opengl32/wgl.c
View file @
e9c065e5
...
...
@@ -39,8 +39,6 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
opengl
);
WINE_DECLARE_DEBUG_CHANNEL
(
fps
);
unixlib_handle_t
unixlib_handle
=
0
;
static
const
MAT2
identity
=
{
{
0
,
1
},{
0
,
0
},{
0
,
0
},{
0
,
1
}
};
#ifndef _WIN64
...
...
@@ -1257,8 +1255,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
switch
(
reason
)
{
case
DLL_PROCESS_ATTACH
:
if
((
status
=
NtQueryVirtualMemory
(
GetCurrentProcess
(),
hinst
,
MemoryWineUnixFuncs
,
&
unixlib_handle
,
sizeof
(
unixlib_handle
),
NULL
)))
if
((
status
=
__wine_init_unix_call
()))
{
ERR
(
"Failed to load unixlib, status %#lx
\n
"
,
status
);
return
FALSE
;
...
...
@@ -1276,12 +1273,7 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
break
;
case
DLL_PROCESS_DETACH
:
if
(
!
unixlib_handle
)
return
TRUE
;
if
((
status
=
UNIX_CALL
(
process_detach
,
NULL
)))
{
WARN
(
"Failed to detach opengl32 unixlib, status %#lx
\n
"
,
status
);
return
FALSE
;
}
UNIX_CALL
(
process_detach
,
NULL
);
#ifndef _WIN64
cleanup_wow64_strings
();
#endif
...
...
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