Commit 77c6cbf1 authored by Felix Abecassis's avatar Felix Abecassis Committed by Jean-Baptiste Kempf

DirectDraw: DirectDrawEnumerateExW does not work, use DirectDrawEnumerateExA instead.

Fix #10189, #10307.
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent fd35fe04
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
#endif #endif
#ifdef UNICODE #ifdef UNICODE
# define DIRECTDRAWENUMERATEEX_NAME "DirectDrawEnumerateExW" # define DIRECTDRAWENUMERATEEX_NAME "DirectDrawEnumerateExA"
#else #else
# define DIRECTDRAWENUMERATEEX_NAME "DirectDrawEnumerateExA" # define DIRECTDRAWENUMERATEEX_NAME "DirectDrawEnumerateExA"
#endif #endif
...@@ -453,8 +453,8 @@ static BOOL WINAPI DirectXOpenDDrawCallback(GUID *guid, LPTSTR desc, ...@@ -453,8 +453,8 @@ static BOOL WINAPI DirectXOpenDDrawCallback(GUID *guid, LPTSTR desc,
if (!hmon) if (!hmon)
return TRUE; return TRUE;
char *psz_drivername = FromT(drivername); char *psz_drivername = (char*)drivername;
char *psz_desc = FromT(desc); char *psz_desc = (char*)desc;
msg_Dbg(vd, "DirectXEnumCallback: %s, %s", psz_desc, psz_drivername); msg_Dbg(vd, "DirectXEnumCallback: %s, %s", psz_desc, psz_drivername);
...@@ -493,8 +493,6 @@ static BOOL WINAPI DirectXOpenDDrawCallback(GUID *guid, LPTSTR desc, ...@@ -493,8 +493,6 @@ static BOOL WINAPI DirectXOpenDDrawCallback(GUID *guid, LPTSTR desc,
*sys->display_driver = *guid; *sys->display_driver = *guid;
} }
free(psz_drivername);
free(psz_desc);
return TRUE; return TRUE;
} }
/** /**
...@@ -1420,7 +1418,7 @@ static BOOL WINAPI DirectXEnumCallback2(GUID *guid, LPTSTR desc, ...@@ -1420,7 +1418,7 @@ static BOOL WINAPI DirectXEnumCallback2(GUID *guid, LPTSTR desc,
VLC_UNUSED(guid); VLC_UNUSED(desc); VLC_UNUSED(hmon); VLC_UNUSED(guid); VLC_UNUSED(desc); VLC_UNUSED(hmon);
char *psz_drivername = FromT(drivername); char *psz_drivername = (char*)(drivername);
ctx->values = xrealloc(ctx->values, (ctx->count + 1) * sizeof(char *)); ctx->values = xrealloc(ctx->values, (ctx->count + 1) * sizeof(char *));
ctx->descs = xrealloc(ctx->descs, (ctx->count + 1) * sizeof(char *)); ctx->descs = xrealloc(ctx->descs, (ctx->count + 1) * sizeof(char *));
...@@ -1428,7 +1426,6 @@ static BOOL WINAPI DirectXEnumCallback2(GUID *guid, LPTSTR desc, ...@@ -1428,7 +1426,6 @@ static BOOL WINAPI DirectXEnumCallback2(GUID *guid, LPTSTR desc,
ctx->descs[ctx->count] = strdup(psz_drivername); ctx->descs[ctx->count] = strdup(psz_drivername);
ctx->count++; ctx->count++;
free(psz_drivername);
return TRUE; /* Keep enumerating */ return TRUE; /* Keep enumerating */
} }
......
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