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

ddraw: Replace the various BOOLs in struct ddraw with a flags field.

This commit is contained in:
Henri Verbeet 2013-05-30 10:05:32 +02:00 committed by Alexandre Julliard
parent d8b98efb4f
commit b886d06737
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/ddraw/ddraw.c
View File

@ -392,7 +392,7 @@ void ddraw_destroy_swapchain(struct ddraw *ddraw)
}
}
ddraw->d3d_initialized = FALSE;
ddraw->flags &= ~DDRAW_D3D_INITIALIZED;
}
else
{
@ -586,11 +586,11 @@ static HRESULT ddraw_attach_d3d_device(struct ddraw *ddraw,
/* Set this NOW, otherwise creating the depth stencil surface will cause a
* recursive loop until ram or emulated video memory is full. */
ddraw->d3d_initialized = TRUE;
ddraw->flags |= DDRAW_D3D_INITIALIZED;
hr = wined3d_device_init_3d(ddraw->wined3d_device, swapchain_desc);
if (FAILED(hr))
{
ddraw->d3d_initialized = FALSE;
ddraw->flags &= ~DDRAW_D3D_INITIALIZED;
return hr;
}
@ -1025,7 +1025,7 @@ static HRESULT WINAPI ddraw7_SetDisplayMode(IDirectDraw7 *iface, DWORD width, DW
/* TODO: Lose the primary surface. */
if (SUCCEEDED(hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &mode)))
{
ddraw->restore_mode = TRUE;
ddraw->flags |= DDRAW_RESTORE_MODE;
restore_mode = TRUE;
}
@ -1088,7 +1088,7 @@ static HRESULT WINAPI ddraw7_RestoreDisplayMode(IDirectDraw7 *iface)
wined3d_mutex_lock();
if (!ddraw->restore_mode)
if (!(ddraw->flags & DDRAW_RESTORE_MODE))
{
wined3d_mutex_unlock();
return DD_OK;
@ -1102,7 +1102,7 @@ static HRESULT WINAPI ddraw7_RestoreDisplayMode(IDirectDraw7 *iface)
if (SUCCEEDED(hr = wined3d_set_adapter_display_mode(ddraw->wined3d, WINED3DADAPTER_DEFAULT, &original_mode)))
{
ddraw->restore_mode = FALSE;
ddraw->flags &= ~DDRAW_RESTORE_MODE;
restore_mode = FALSE;
}
@ -1687,7 +1687,7 @@ static HRESULT WINAPI ddraw7_Initialize(IDirectDraw7 *iface, GUID *guid)
TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid));
if (ddraw->initialized)
if (ddraw->flags & DDRAW_INITIALIZED)
return DDERR_ALREADYINITIALIZED;
/* FIXME: To properly take the GUID into account we should call
@ -1695,7 +1695,7 @@ static HRESULT WINAPI ddraw7_Initialize(IDirectDraw7 *iface, GUID *guid)
if (guid)
FIXME("Ignoring guid %s.\n", debugstr_guid(guid));
ddraw->initialized = TRUE;
ddraw->flags |= DDRAW_INITIALIZED;
return DD_OK;
}
@ -4473,7 +4473,7 @@ static HRESULT WINAPI d3d7_EvictManagedTextures(IDirect3D7 *iface)
TRACE("iface %p!\n", iface);
wined3d_mutex_lock();
if (ddraw->d3d_initialized)
if (ddraw->flags & DDRAW_D3D_INITIALIZED)
wined3d_device_evict_managed_resources(ddraw->wined3d_device);
wined3d_mutex_unlock();

8
dlls/ddraw/ddraw_private.h
View File

@ -56,6 +56,10 @@ struct FvfToDecl
struct wined3d_vertex_declaration *decl;
};
#define DDRAW_INITIALIZED 0x00000001
#define DDRAW_D3D_INITIALIZED 0x00000002
#define DDRAW_RESTORE_MODE 0x00000004
struct ddraw
{
/* Interfaces */
@ -71,12 +75,10 @@ struct ddraw
/* See comment in IDirectDraw::AddRef */
LONG ref7, ref4, ref2, ref3, ref1, numIfaces;
BOOL initialized;
struct wined3d *wined3d;
struct wined3d_device *wined3d_device;
BOOL d3d_initialized;
BOOL restore_mode;
DWORD flags;
struct ddraw_surface *primary;
RECT primary_lock;