Commit 8de5a80d authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

DirectX: use DirectDrawEnumerateExA/W when GetProcAddress

parent 4775b482
...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment