[PATCH 4/4] wined3d: Use SetWindowPos() to make the focus window active.
Henri Verbeet
hverbeet at codeweavers.com
Fri Nov 5 08:11:38 CDT 2010
---
dlls/d3d8/tests/device.c | 1 +
dlls/d3d9/tests/device.c | 1 +
dlls/ddraw/tests/d3d.c | 1 +
dlls/wined3d/device.c | 2 +-
4 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c
index 2774b6a..1adedc3 100644
--- a/dlls/d3d8/tests/device.c
+++ b/dlls/d3d8/tests/device.c
@@ -1621,6 +1621,7 @@ static void test_wndproc(void)
static const struct message messages[] =
{
+ {WM_WINDOWPOSCHANGING, FOCUS_WINDOW},
{WM_ACTIVATE, FOCUS_WINDOW},
{WM_SETFOCUS, FOCUS_WINDOW},
{WM_WINDOWPOSCHANGING, DEVICE_WINDOW},
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index 870ca49..bb57917 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -2465,6 +2465,7 @@ static void test_wndproc(void)
static const struct message messages[] =
{
+ {WM_WINDOWPOSCHANGING, FOCUS_WINDOW},
{WM_ACTIVATE, FOCUS_WINDOW},
{WM_SETFOCUS, FOCUS_WINDOW},
{0, 0},
diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c
index bbd4bbd..afa1d84 100644
--- a/dlls/ddraw/tests/d3d.c
+++ b/dlls/ddraw/tests/d3d.c
@@ -3272,6 +3272,7 @@ static void test_wndproc(void)
static const UINT messages[] =
{
+ WM_WINDOWPOSCHANGING,
WM_ACTIVATE,
WM_SETFOCUS,
0,
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 6e78f04..17a940f 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1763,7 +1763,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_AcquireFocusWindow(IWineD3DDevice *ifac
}
device->focus_window = window;
- SetForegroundWindow(window);
+ SetWindowPos(window, 0, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
return WINED3D_OK;
}
--
1.7.2.2
More information about the wine-patches
mailing list