ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: wined3d_device_get_creation_parameters() never fails.

This commit is contained in:
Henri Verbeet 2012-10-01 22:48:12 +02:00 committed by Alexandre Julliard
parent 6e5cf8c698
commit 2ad5808996
5 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/d3d8/device.c
View File

@ -479,16 +479,15 @@ static HRESULT WINAPI d3d8_device_GetCreationParameters(IDirect3DDevice8 *iface,
D3DDEVICE_CREATION_PARAMETERS *parameters) D3DDEVICE_CREATION_PARAMETERS *parameters)
{ {
struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct d3d8_device *device = impl_from_IDirect3DDevice8(iface);
HRESULT hr;
TRACE("iface %p, parameters %p.\n", iface, parameters); TRACE("iface %p, parameters %p.\n", iface, parameters);
wined3d_mutex_lock(); wined3d_mutex_lock();
hr = wined3d_device_get_creation_parameters(device->wined3d_device, wined3d_device_get_creation_parameters(device->wined3d_device,
(struct wined3d_device_creation_parameters *)parameters); (struct wined3d_device_creation_parameters *)parameters);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
return hr; return D3D_OK;
} }
static HRESULT WINAPI d3d8_device_SetCursorProperties(IDirect3DDevice8 *iface, static HRESULT WINAPI d3d8_device_SetCursorProperties(IDirect3DDevice8 *iface,

5
dlls/d3d9/device.c
View File

@ -422,16 +422,15 @@ static HRESULT WINAPI d3d9_device_GetCreationParameters(IDirect3DDevice9Ex *ifac
D3DDEVICE_CREATION_PARAMETERS *parameters) D3DDEVICE_CREATION_PARAMETERS *parameters)
{ {
struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface);
HRESULT hr;
TRACE("iface %p, parameters %p.\n", iface, parameters); TRACE("iface %p, parameters %p.\n", iface, parameters);
wined3d_mutex_lock(); wined3d_mutex_lock();
hr = wined3d_device_get_creation_parameters(device->wined3d_device, wined3d_device_get_creation_parameters(device->wined3d_device,
(struct wined3d_device_creation_parameters *)parameters); (struct wined3d_device_creation_parameters *)parameters);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
return hr; return D3D_OK;
} }
static HRESULT WINAPI d3d9_device_SetCursorProperties(IDirect3DDevice9Ex *iface, static HRESULT WINAPI d3d9_device_SetCursorProperties(IDirect3DDevice9Ex *iface,

10
dlls/dxgi/device.c
View File

@ -141,19 +141,11 @@ static HRESULT STDMETHODCALLTYPE dxgi_device_GetAdapter(IWineDXGIDevice *iface,
{ {
struct dxgi_device *This = impl_from_IWineDXGIDevice(iface); struct dxgi_device *This = impl_from_IWineDXGIDevice(iface);
struct wined3d_device_creation_parameters create_parameters; struct wined3d_device_creation_parameters create_parameters;
HRESULT hr;
TRACE("iface %p, adapter %p\n", iface, adapter); TRACE("iface %p, adapter %p\n", iface, adapter);
EnterCriticalSection(&dxgi_cs); EnterCriticalSection(&dxgi_cs);
wined3d_device_get_creation_parameters(This->wined3d_device, &create_parameters);
hr = wined3d_device_get_creation_parameters(This->wined3d_device, &create_parameters);
if (FAILED(hr))
{
LeaveCriticalSection(&dxgi_cs);
return hr;
}
LeaveCriticalSection(&dxgi_cs); LeaveCriticalSection(&dxgi_cs);
return IWineDXGIFactory_EnumAdapters(This->factory, create_parameters.adapter_idx, adapter); return IWineDXGIFactory_EnumAdapters(This->factory, create_parameters.adapter_idx, adapter);

3
dlls/wined3d/device.c
View File

@ -5263,13 +5263,12 @@ HRESULT CDECL wined3d_device_set_dialog_box_mode(struct wined3d_device *device,
} }
HRESULT CDECL wined3d_device_get_creation_parameters(const struct wined3d_device *device, void CDECL wined3d_device_get_creation_parameters(const struct wined3d_device *device,
struct wined3d_device_creation_parameters *parameters) struct wined3d_device_creation_parameters *parameters)
{ {
TRACE("device %p, parameters %p.\n", device, parameters); TRACE("device %p, parameters %p.\n", device, parameters);
*parameters = device->create_parms; *parameters = device->create_parms;
return WINED3D_OK;
} }
void CDECL wined3d_device_set_gamma_ramp(const struct wined3d_device *device, void CDECL wined3d_device_set_gamma_ramp(const struct wined3d_device *device,

2
include/wine/wined3d.h
View File

@ -2114,7 +2114,7 @@ HRESULT __cdecl wined3d_device_get_clip_plane(const struct wined3d_device *devic
UINT plane_idx, struct wined3d_vec4 *plane); UINT plane_idx, struct wined3d_vec4 *plane);
HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device, HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *device,
struct wined3d_clip_status *clip_status); struct wined3d_clip_status *clip_status);
HRESULT __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device, void __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device,
struct wined3d_device_creation_parameters *creation_parameters); struct wined3d_device_creation_parameters *creation_parameters);
struct wined3d_surface * __cdecl wined3d_device_get_depth_stencil(const struct wined3d_device *device); struct wined3d_surface * __cdecl wined3d_device_get_depth_stencil(const struct wined3d_device *device);
HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps);