Chip Davis : d3d8: Explicitly cast FourCC formats in d3dformat_from_wined3dformat() and wined3dformat_from_d3dformat().
Alexandre Julliard
julliard at winehq.org
Mon Apr 6 15:53:22 CDT 2020
Module: wine
Branch: master
Commit: 36cd136a6b440b22b7fc2420377de8449b58930b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=36cd136a6b440b22b7fc2420377de8449b58930b
Author: Chip Davis <cdavis at codeweavers.com>
Date: Mon Apr 6 16:01:18 2020 +0430
d3d8: Explicitly cast FourCC formats in d3dformat_from_wined3dformat() and wined3dformat_from_d3dformat().
Signed-off-by: Chip Davis <cdavis at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d8/device.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index cde7664515..6a67f81778 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -35,7 +35,8 @@ D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format)
BYTE *c = (BYTE *)&format;
/* Don't translate FOURCC formats */
- if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3])) return format;
+ if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3]))
+ return (D3DFORMAT)format;
switch(format)
{
@@ -85,7 +86,8 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format)
BYTE *c = (BYTE *)&format;
/* Don't translate FOURCC formats */
- if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3])) return format;
+ if (isprint(c[0]) && isprint(c[1]) && isprint(c[2]) && isprint(c[3]))
+ return (enum wined3d_format_id)format;
switch(format)
{
More information about the wine-cvs
mailing list