d3d8: Silence implicit enum conversion warnings for D3DFormat (clang)
Frédéric Delanoy
frederic.delanoy at gmail.com
Wed May 18 11:41:52 CDT 2011
---
dlls/d3d8/device.c | 6 +++---
dlls/d3d8/directx.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c
index ada7ee6..736b22f 100644
--- a/dlls/d3d8/device.c
+++ b/dlls/d3d8/device.c
@@ -41,7 +41,7 @@ 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 (int) format;
switch(format)
{
@@ -92,7 +92,7 @@ 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 (int) format;
switch(format)
{
@@ -729,7 +729,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetDisplayMode(IDirect3DDevice8 *ifac
hr = wined3d_device_get_display_mode(This->wined3d_device, 0, (WINED3DDISPLAYMODE *)pMode);
wined3d_mutex_unlock();
- if (SUCCEEDED(hr)) pMode->Format = d3dformat_from_wined3dformat(pMode->Format);
+ if (SUCCEEDED(hr)) pMode->Format = d3dformat_from_wined3dformat((int) pMode->Format);
return hr;
}
diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c
index 1b62c19..c46081d 100644
--- a/dlls/d3d8/directx.c
+++ b/dlls/d3d8/directx.c
@@ -178,7 +178,7 @@ static HRESULT WINAPI IDirect3D8Impl_EnumAdapterModes(LPDIRECT3D8 iface, UINT Ad
hr = wined3d_enum_adapter_modes(This->WineD3D, Adapter, WINED3DFMT_UNKNOWN, Mode, (WINED3DDISPLAYMODE *)pMode);
wined3d_mutex_unlock();
- if (SUCCEEDED(hr)) pMode->Format = d3dformat_from_wined3dformat(pMode->Format);
+ if (SUCCEEDED(hr)) pMode->Format = d3dformat_from_wined3dformat((int) pMode->Format);
return hr;
}
@@ -196,7 +196,7 @@ static HRESULT WINAPI IDirect3D8Impl_GetAdapterDisplayMode(LPDIRECT3D8 iface, UI
hr = wined3d_get_adapter_display_mode(This->WineD3D, Adapter, (WINED3DDISPLAYMODE *)pMode);
wined3d_mutex_unlock();
- if (SUCCEEDED(hr)) pMode->Format = d3dformat_from_wined3dformat(pMode->Format);
+ if (SUCCEEDED(hr)) pMode->Format = d3dformat_from_wined3dformat((int) pMode->Format);
return hr;
}
--
1.7.5.1
More information about the wine-patches
mailing list