[PATCH v2] d3d8: Fix incorrect types.
Zhiyi Zhang
zzhang at codeweavers.com
Mon Nov 11 02:20:50 CST 2019
Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
---
v2: Supersede 173296
dlls/d3d8/directx.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c
index c5239844c3..742117bd71 100644
--- a/dlls/d3d8/directx.c
+++ b/dlls/d3d8/directx.c
@@ -101,15 +101,15 @@ static HRESULT WINAPI d3d8_RegisterSoftwareDevice(IDirect3D8 *iface, void *init_
static UINT WINAPI d3d8_GetAdapterCount(IDirect3D8 *iface)
{
struct d3d8 *d3d8 = impl_from_IDirect3D8(iface);
- HRESULT hr;
+ UINT count;
TRACE("iface %p.\n", iface);
wined3d_mutex_lock();
- hr = wined3d_get_adapter_count(d3d8->wined3d);
+ count = wined3d_get_adapter_count(d3d8->wined3d);
wined3d_mutex_unlock();
- return hr;
+ return count;
}
static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter,
@@ -146,16 +146,16 @@ static HRESULT WINAPI d3d8_GetAdapterIdentifier(IDirect3D8 *iface, UINT adapter,
static UINT WINAPI d3d8_GetAdapterModeCount(IDirect3D8 *iface, UINT adapter)
{
struct d3d8 *d3d8 = impl_from_IDirect3D8(iface);
- HRESULT hr;
+ UINT count;
TRACE("iface %p, adapter %u.\n", iface, adapter);
wined3d_mutex_lock();
- hr = wined3d_get_adapter_mode_count(d3d8->wined3d, adapter,
+ count = wined3d_get_adapter_mode_count(d3d8->wined3d, adapter,
WINED3DFMT_UNKNOWN, WINED3D_SCANLINE_ORDERING_UNKNOWN);
wined3d_mutex_unlock();
- return hr;
+ return count;
}
static HRESULT WINAPI d3d8_EnumAdapterModes(IDirect3D8 *iface, UINT adapter, UINT mode_idx, D3DDISPLAYMODE *mode)
--
2.23.0
More information about the wine-devel
mailing list