wined3d: Turn off message filtering temporarily in the Reset() method to allow certain messages (e.g. WM_ACTIVATEAPP) through.

This commit is contained in:
John Edmonds 2011-05-03 20:22:32 -04:00 committed by Alexandre Julliard
parent 1772a043db
commit d9f8cba50f
2 changed files with 1 additions and 7 deletions

View File

@ -2859,7 +2859,7 @@ static void test_reset_fullscreen(void)
ok(SUCCEEDED(reset_device(device, device_window, FALSE)), "Failed to reset device.\n");
flush_events();
todo_wine ok(expect_messages->message == 0, "Expected to receive message %#x.\n", expect_messages->message);
ok(expect_messages->message == 0, "Expected to receive message %#x.\n", expect_messages->message);
expect_messages = NULL;
cleanup:

View File

@ -6544,9 +6544,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice *iface,
if (!pPresentationParameters->Windowed != !swapchain->presentParms.Windowed
|| DisplayModeChanged)
{
BOOL filter = This->filter_messages;
This->filter_messages = TRUE;
IWineD3DDevice_SetDisplayMode(iface, 0, &mode);
if (!pPresentationParameters->Windowed)
@ -6559,7 +6556,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice *iface,
{
ERR("Failed to acquire focus window, hr %#x.\n", hr);
wined3d_swapchain_decref(swapchain);
This->filter_messages = filter;
return hr;
}
@ -6583,8 +6579,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice *iface,
IWineD3DDevice_ReleaseFocusWindow(iface);
}
swapchain->presentParms.Windowed = pPresentationParameters->Windowed;
This->filter_messages = filter;
}
else if (!pPresentationParameters->Windowed)
{