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

ddraw: Introduce a separate function for setting the focus window.

Browse Source
This commit is contained in:
Henri Verbeet 2011-08-29 18:58:59 +02:00 committed by Alexandre Julliard
parent 93b5f681d9
commit 8f46cb6b8b
1 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
dlls/ddraw/ddraw.c
View File

@ -596,6 +596,31 @@ static ULONG WINAPI d3d1_Release(IDirect3D *iface)
* IDirectDraw methods * IDirectDraw methods
*****************************************************************************/ *****************************************************************************/
static HRESULT ddraw_set_focus_window(IDirectDrawImpl *ddraw, HWND window)
{
/* FIXME: This looks wrong, exclusive mode should imply a destination
* window. */
if ((ddraw->cooperative_level & DDSCL_EXCLUSIVE) && ddraw->dest_window)
{
TRACE("Setting DDSCL_SETFOCUSWINDOW with an already set window, returning DDERR_HWNDALREADYSET.\n");
return DDERR_HWNDALREADYSET;
}
ddraw->focuswindow = window;
/* Use the focus window for drawing too. */
ddraw->dest_window = ddraw->focuswindow;
/* Destroy the device window, if we have one. */
if (ddraw->devicewindow)
{
DestroyWindow(ddraw->devicewindow);
ddraw->devicewindow = NULL;
}
return DD_OK;
}
/***************************************************************************** /*****************************************************************************
* IDirectDraw7::SetCooperativeLevel * IDirectDraw7::SetCooperativeLevel
* *
@ -644,6 +669,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd,
{ {
IDirectDrawImpl *This = impl_from_IDirectDraw7(iface); IDirectDrawImpl *This = impl_from_IDirectDraw7(iface);
HWND window; HWND window;
HRESULT hr;
TRACE("iface %p, window %p, flags %#x.\n", iface, hwnd, cooplevel); TRACE("iface %p, window %p, flags %#x.\n", iface, hwnd, cooplevel);
DDRAW_dump_cooperativelevel(cooplevel); DDRAW_dump_cooperativelevel(cooplevel);
@ -683,29 +709,9 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd,
return DDERR_INVALIDPARAMS; return DDERR_INVALIDPARAMS;
} }
if( (This->cooperative_level & DDSCL_EXCLUSIVE) && window ) hr = ddraw_set_focus_window(This, hwnd);
{
TRACE("Setting DDSCL_SETFOCUSWINDOW with an already set window, returning DDERR_HWNDALREADYSET\n");
LeaveCriticalSection(&ddraw_cs); LeaveCriticalSection(&ddraw_cs);
return DDERR_HWNDALREADYSET; return hr;
}
This->focuswindow = hwnd;
/* Won't use the hwnd param for anything else */
hwnd = NULL;
/* Use the focus window for drawing too */
This->dest_window = This->focuswindow;
/* Destroy the device window, if we have one */
if(This->devicewindow)
{
DestroyWindow(This->devicewindow);
This->devicewindow = NULL;
}
LeaveCriticalSection(&ddraw_cs);
return DD_OK;
} }
if(cooplevel & DDSCL_EXCLUSIVE) if(cooplevel & DDSCL_EXCLUSIVE)
@ -740,7 +746,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd,
if ((cooplevel & DDSCL_EXCLUSIVE) if ((cooplevel & DDSCL_EXCLUSIVE)
&& (hwnd != window || !(This->cooperative_level & DDSCL_EXCLUSIVE))) && (hwnd != window || !(This->cooperative_level & DDSCL_EXCLUSIVE)))
{ {
HRESULT hr = wined3d_device_acquire_focus_window(This->wined3d_device, hwnd); hr = wined3d_device_acquire_focus_window(This->wined3d_device, hwnd);
if (FAILED(hr)) if (FAILED(hr))
{ {
ERR("Failed to acquire focus window, hr %#x.\n", hr); ERR("Failed to acquire focus window, hr %#x.\n", hr);