Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
8de5a80d
Commit
8de5a80d
authored
Jan 15, 2013
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
DirectX: use DirectDrawEnumerateExA/W when GetProcAddress
parent
4775b482
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
2 deletions
+9
-2
modules/video_output/msw/directx.c
modules/video_output/msw/directx.c
+9
-2
No files found.
modules/video_output/msw/directx.c
View file @
8de5a80d
...
@@ -55,6 +55,13 @@
...
@@ -55,6 +55,13 @@
# warning "Unicode mode not tested"
# warning "Unicode mode not tested"
#endif
#endif
#ifdef UNICODE
# define DIRECTDRAWENUMERATEEX_NAME "DirectDrawEnumerateExW"
#else
# define DIRECTDRAWENUMERATEEX_NAME "DirectDrawEnumerateExA"
#endif
/*****************************************************************************
/*****************************************************************************
* Module descriptor
* Module descriptor
*****************************************************************************/
*****************************************************************************/
...
@@ -575,7 +582,7 @@ static int DirectXOpenDDraw(vout_display_t *vd)
...
@@ -575,7 +582,7 @@ static int DirectXOpenDDraw(vout_display_t *vd)
/* */
/* */
HRESULT
(
WINAPI
*
OurDirectDrawEnumerateEx
)(
LPDDENUMCALLBACKEX
,
LPVOID
,
DWORD
);
HRESULT
(
WINAPI
*
OurDirectDrawEnumerateEx
)(
LPDDENUMCALLBACKEX
,
LPVOID
,
DWORD
);
OurDirectDrawEnumerateEx
=
OurDirectDrawEnumerateEx
=
(
void
*
)
GetProcAddress
(
sys
->
hddraw_dll
,
"DirectDrawEnumerateEx"
);
(
void
*
)
GetProcAddress
(
sys
->
hddraw_dll
,
DIRECTDRAWENUMERATEEX_NAME
);
if
(
OurDirectDrawEnumerateEx
)
{
if
(
OurDirectDrawEnumerateEx
)
{
char
*
device
=
var_GetString
(
vd
,
"directx-device"
);
char
*
device
=
var_GetString
(
vd
,
"directx-device"
);
...
@@ -1452,7 +1459,7 @@ static int FindDevicesCallback(vlc_object_t *object, const char *name,
...
@@ -1452,7 +1459,7 @@ static int FindDevicesCallback(vlc_object_t *object, const char *name,
/* Enumerate displays */
/* Enumerate displays */
HRESULT
(
WINAPI
*
OurDirectDrawEnumerateEx
)(
LPDDENUMCALLBACKEX
,
HRESULT
(
WINAPI
*
OurDirectDrawEnumerateEx
)(
LPDDENUMCALLBACKEX
,
LPVOID
,
DWORD
)
=
LPVOID
,
DWORD
)
=
(
void
*
)
GetProcAddress
(
hddraw_dll
,
"DirectDrawEnumerateEx"
);
(
void
*
)
GetProcAddress
(
hddraw_dll
,
DIRECTDRAWENUMERATEEX_NAME
);
if
(
OurDirectDrawEnumerateEx
!=
NULL
)
if
(
OurDirectDrawEnumerateEx
!=
NULL
)
OurDirectDrawEnumerateEx
(
DirectXEnumCallback2
,
&
ctx
,
OurDirectDrawEnumerateEx
(
DirectXEnumCallback2
,
&
ctx
,
DDENUM_ATTACHEDSECONDARYDEVICES
);
DDENUM_ATTACHEDSECONDARYDEVICES
);
...
...
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