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

d3drm: Store reference to render target in IDirect3DRM*::CreateDeviceFromD3D. 

Signed-off-by: Aaryaman Vasishta <jem456.vasishta@gmail.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Aaryaman Vasishta 2016-08-10 21:07:02 +05:30 committed by Alexandre Julliard
parent dca0e38d82
commit 3987417688
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/d3drm/device.c
View File

@ -213,7 +213,7 @@ static HRESULT d3drm_device_set_ddraw_device_d3d(struct d3drm_device *device, ID
{ {
IDirectDraw *ddraw; IDirectDraw *ddraw;
IDirectDrawSurface *surface; IDirectDrawSurface *surface;
IDirect3DDevice2 *d3d_device2; IDirect3DDevice2 *d3d_device2 = NULL;
DDSURFACEDESC desc; DDSURFACEDESC desc;
HRESULT hr; HRESULT hr;
@ -223,9 +223,6 @@ static HRESULT d3drm_device_set_ddraw_device_d3d(struct d3drm_device *device, ID
IDirect3DRM_AddRef(device->d3drm); IDirect3DRM_AddRef(device->d3drm);
IDirect3DDevice_AddRef(d3d_device); IDirect3DDevice_AddRef(d3d_device);
if (device->ddraw)
return D3DRMERR_BADOBJECT;
/* Fetch render target and get width/height from there */ /* Fetch render target and get width/height from there */
if (FAILED(hr = IDirect3DDevice_QueryInterface(d3d_device, &IID_IDirectDrawSurface, (void **)&surface))) if (FAILED(hr = IDirect3DDevice_QueryInterface(d3d_device, &IID_IDirectDrawSurface, (void **)&surface)))
{ {
@ -237,16 +234,26 @@ static HRESULT d3drm_device_set_ddraw_device_d3d(struct d3drm_device *device, ID
return hr; return hr;
} }
if (device->ddraw)
{
if (d3d_device2)
IDirectDrawSurface_Release(surface);
return D3DRMERR_BADOBJECT;
}
desc.dwSize = sizeof(desc); desc.dwSize = sizeof(desc);
hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc); hr = IDirectDrawSurface_GetSurfaceDesc(surface, &desc);
IDirectDrawSurface_Release(surface);
if (FAILED(hr)) if (FAILED(hr))
{
IDirectDrawSurface_Release(surface);
return hr; return hr;
}
device->ddraw = ddraw; device->ddraw = ddraw;
device->width = desc.dwWidth; device->width = desc.dwWidth;
device->height = desc.dwHeight; device->height = desc.dwHeight;
device->device = d3d_device; device->device = d3d_device;
device->render_target = surface;
return hr; return hr;
} }