April 2011 - Wine-Commits - list.winehq.org

Matteo Bruni : d3dx9: Remove some redundant and compiler-unfriendly pixel format checking code.
by Alexandre Julliard April 26, 2011

April 26, 2011

Module: wine Branch: master Commit: e1ac6078b53385cfa68960cf24a7c0d35cb7652a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1ac6078b53385cfa68960cf2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Apr 5 17:26:57 2011 +0200 d3dx9: Remove some redundant and compiler-unfriendly pixel format checking code. Spotted by Gerald Pfeifer and Nicolas Le Cam. --- dlls/d3dx9_36/surface.c | 16 ++++++---------- 1 files changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 1bc2d54..77cad08 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -702,13 +702,11 @@ static void copy_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsize, for(x = 0;x < minwidth;x++) { /* extract source color components */ - if(srcformat->type == FORMAT_ARGB) { - pixel = dword_from_bytes(srcptr, srcformat->bytes_per_pixel); - get_relevant_argb_components(&conv_info, pixel, channels); - } + pixel = dword_from_bytes(srcptr, srcformat->bytes_per_pixel); + get_relevant_argb_components(&conv_info, pixel, channels); /* recombine the components */ - if(destformat->type == FORMAT_ARGB) val = make_argb_color(&conv_info, channels); + val = make_argb_color(&conv_info, channels); if(colorkey) { get_relevant_argb_components(&ck_conv_info, pixel, channels); @@ -769,13 +767,11 @@ static void point_filter_simple_data(CONST BYTE *src, UINT srcpitch, POINT srcsi DWORD val = 0; /* extract source color components */ - if(srcformat->type == FORMAT_ARGB) { - pixel = dword_from_bytes(srcptr, srcformat->bytes_per_pixel); - get_relevant_argb_components(&conv_info, pixel, channels); - } + pixel = dword_from_bytes(srcptr, srcformat->bytes_per_pixel); + get_relevant_argb_components(&conv_info, pixel, channels); /* recombine the components */ - if(destformat->type == FORMAT_ARGB) val = make_argb_color(&conv_info, channels); + val = make_argb_color(&conv_info, channels); if(colorkey) { get_relevant_argb_components(&ck_conv_info, pixel, channels);

1 0

Matteo Bruni : d3dx9: Print a FIXME when encountering an unknown surface format.
by Alexandre Julliard April 26, 2011

April 26, 2011

Module: wine Branch: master Commit: b17fd2a3afe6f7ebaed7c5311fcf1b7e1f84dbfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b17fd2a3afe6f7ebaed7c5311… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jan 24 21:52:01 2011 +0100 d3dx9: Print a FIXME when encountering an unknown surface format. --- dlls/d3dx9_36/util.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/util.c b/dlls/d3dx9_36/util.c index f7f3cf1..ddb54c3 100644 --- a/dlls/d3dx9_36/util.c +++ b/dlls/d3dx9_36/util.c @@ -151,6 +151,8 @@ const PixelFormatDesc *get_format_info(D3DFORMAT format) { unsigned int i = 0; while(formats[i].format != format && formats[i].format != D3DFMT_UNKNOWN) i++; + if(formats[i].format == D3DFMT_UNKNOWN) + FIXME("Unknown format %#x\n", format); return &formats[i]; }

1 0

Stefan Dösinger : d3d8: Add more tests for NULL render targets.
by Alexandre Julliard April 26, 2011

April 26, 2011

Module: wine Branch: master Commit: e140077cc7008dcb83d76bca24c823c534950fc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e140077cc7008dcb83d76bca2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 25 20:22:50 2011 +0200 d3d8: Add more tests for NULL render targets. --- dlls/d3d8/device.c | 16 +++++++++++++++- dlls/d3d8/tests/device.c | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index ae90a16..99481bf 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1028,11 +1028,25 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetRenderTarget(IDirect3DDevice8 *ifa { struct wined3d_resource_desc ds_desc, rt_desc; struct wined3d_resource *wined3d_resource; + IDirect3DSurface8 *orig_rt = NULL; + + /* If no render target is passed in check the size against the current RT */ + if (!pRenderTarget) + { + hr = IDirect3DDevice8_GetRenderTarget(iface, &orig_rt); + if (FAILED(hr)) + { + wined3d_mutex_unlock(); + return hr; + } + pSurface = (IDirect3DSurface8Impl *)orig_rt; + } wined3d_resource = IWineD3DSurface_GetResource(pZSurface->wineD3DSurface); wined3d_resource_get_desc(wined3d_resource, &ds_desc); wined3d_resource = IWineD3DSurface_GetResource(pSurface->wineD3DSurface); wined3d_resource_get_desc(wined3d_resource, &rt_desc); + if (orig_rt) IDirect3DSurface8_Release(orig_rt); if (ds_desc.width < rt_desc.width || ds_desc.height < rt_desc.height) { @@ -1046,7 +1060,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetRenderTarget(IDirect3DDevice8 *ifa if (hr == WINED3D_OK || hr == WINED3DERR_NOTFOUND) { hr = IWineD3DDevice_SetDepthStencilSurface(This->WineD3DDevice, pZSurface ? pZSurface->wineD3DSurface : NULL); - if (SUCCEEDED(hr) && pSurface) + if (SUCCEEDED(hr) && pRenderTarget) { hr = IWineD3DDevice_SetRenderTarget(This->WineD3DDevice, 0, pSurface->wineD3DSurface, TRUE); if (FAILED(hr)) IWineD3DDevice_SetDepthStencilSurface(This->WineD3DDevice, original_ds); diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a9fe6f3..557eec1 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -1409,7 +1409,7 @@ static void test_depth_stencil_reset(void) { D3DPRESENT_PARAMETERS present_parameters; D3DDISPLAYMODE display_mode; - IDirect3DSurface8 *surface; + IDirect3DSurface8 *surface, *orig_rt; IDirect3DDevice8 *device = NULL; IDirect3D8 *d3d8; UINT refcount; @@ -1438,6 +1438,9 @@ static void test_depth_stencil_reset(void) goto cleanup; } + hr = IDirect3DDevice8_GetRenderTarget(device, &orig_rt); + ok(hr == D3D_OK, "GetRenderTarget failed with 0x%08x\n", hr); + hr = IDirect3DDevice8_TestCooperativeLevel(device); ok(SUCCEEDED(hr), "TestCooperativeLevel failed with %#x\n", hr); @@ -1446,8 +1449,9 @@ static void test_depth_stencil_reset(void) hr = IDirect3DDevice8_GetRenderTarget(device, &surface); ok(hr == D3D_OK, "GetRenderTarget failed with 0x%08x\n", hr); - ok(surface != NULL, "Render target should not be NULL\n"); + ok(surface == orig_rt, "Render target is %p, should be %p\n", surface, orig_rt); if (surface) IDirect3DSurface8_Release(surface); + IDirect3DSurface8_Release(orig_rt); hr = IDirect3DDevice8_GetDepthStencilSurface(device, &surface); ok(hr == D3DERR_NOTFOUND, "GetDepthStencilSurface returned 0x%08x, expected D3DERR_NOTFOUND\n", hr); @@ -2120,7 +2124,8 @@ cleanup: static void test_depth_stencil_size(void) { IDirect3DDevice8 *device; - IDirect3DSurface8 *ds, *rt, *ds_bigger; + IDirect3DSurface8 *ds, *rt, *ds_bigger, *ds_bigger2; + IDirect3DSurface8 *surf; IDirect3D8 *d3d8; HRESULT hr; HWND hwnd; @@ -2140,15 +2145,37 @@ static void test_depth_stencil_size(void) ok(SUCCEEDED(hr), "IDirect3DDevice8_CreateDepthStencilSurface failed, hr %#x.\n", hr); hr = IDirect3DDevice8_CreateDepthStencilSurface(device, 128, 128, D3DFMT_D24X8, D3DMULTISAMPLE_NONE, &ds_bigger); ok(SUCCEEDED(hr), "IDirect3DDevice8_CreateDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateDepthStencilSurface(device, 128, 128, D3DFMT_D24X8, D3DMULTISAMPLE_NONE, &ds_bigger2); + ok(SUCCEEDED(hr), "IDirect3DDevice8_CreateDepthStencilSurface failed, hr %#x.\n", hr); hr = IDirect3DDevice8_SetRenderTarget(device, rt, ds); ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_SetRenderTarget returned %#x, expected D3DERR_INVALIDCALL.\n", hr); hr = IDirect3DDevice8_SetRenderTarget(device, rt, ds_bigger); ok(SUCCEEDED(hr), "IDirect3DDevice8_CreateDepthStencilSurface failed, hr %#x.\n", hr); + /* try to set the small ds without changing the render target at the same time */ + hr = IDirect3DDevice8_SetRenderTarget(device, NULL, ds); + ok(hr == D3DERR_INVALIDCALL, "IDirect3DDevice8_SetRenderTarget returned %#x, expected D3DERR_INVALIDCALL.\n", hr); + hr = IDirect3DDevice8_SetRenderTarget(device, NULL, ds_bigger2); + ok(SUCCEEDED(hr), "IDirect3DDevice8_CreateDepthStencilSurface failed, hr %#x.\n", hr); + + hr = IDirect3DDevice8_GetRenderTarget(device, &surf); + ok(surf == rt, "The render target is %p, expected %p\n", surf, rt); + IDirect3DSurface8_Release(surf); + hr = IDirect3DDevice8_GetDepthStencilSurface(device, &surf); + ok(surf == ds_bigger2, "The depth stencil is %p, expected %p\n", surf, ds_bigger2); + IDirect3DSurface8_Release(surf); + + hr = IDirect3DDevice8_SetRenderTarget(device, NULL, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice8_CreateDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice8_GetDepthStencilSurface(device, &surf); + ok(surf == NULL, "The depth stencil is %p, expected NULL\n", surf); + if (surf) IDirect3DSurface8_Release(surf); + IDirect3DSurface8_Release(rt); IDirect3DSurface8_Release(ds); IDirect3DSurface8_Release(ds_bigger); + IDirect3DSurface8_Release(ds_bigger2); cleanup: if (d3d8) IDirect3D8_Release(d3d8);

1 0

Alexandre Julliard : dinput: Add a helper function for mouse warping.
by Alexandre Julliard April 26, 2011

April 26, 2011

Module: wine Branch: master Commit: 5f2daff124b269f641f3903a5fb0b088432f9be4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f2daff124b269f641f3903a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 26 12:28:25 2011 +0200 dinput: Add a helper function for mouse warping. --- dlls/dinput/mouse.c | 61 ++++++++++++++++---------------------------------- 1 files changed, 20 insertions(+), 41 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 9434888..ec67b02 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -427,6 +427,21 @@ static BOOL dinput_window_check(SysMouseImpl* This) { return TRUE; } +static HRESULT warp_check( SysMouseImpl* This, BOOL force ) +{ + DWORD now = GetCurrentTime(); + + if (force || (This->need_warp && (now - This->last_warped > 10))) + { + This->last_warped = now; + This->need_warp = FALSE; + if (!dinput_window_check(This)) return DIERR_GENERIC; + TRACE("Warping mouse to %d - %d\n", This->mapped_center.x, This->mapped_center.y); + SetCursorPos( This->mapped_center.x, This->mapped_center.y ); + } + return DI_OK; +} + /****************************************************************************** * Acquire : gets exclusive control of the mouse @@ -434,7 +449,6 @@ static BOOL dinput_window_check(SysMouseImpl* This) { static HRESULT WINAPI SysMouseWImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) { SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); - RECT rect; POINT point; HRESULT res; @@ -473,23 +487,12 @@ static HRESULT WINAPI SysMouseWImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) ERR("Failed to get RECT: %d\n", GetLastError()); } - /* Need a window to warp mouse in. */ - if (This->warp_override == WARP_FORCE_ON && !This->base.win) - This->base.win = GetDesktopWindow(); - - /* Get the window dimension and find the center */ - GetWindowRect(This->base.win, &rect); - This->mapped_center.x = (rect.left + rect.right) / 2; - This->mapped_center.y = (rect.top + rect.bottom) / 2; - /* Warp the mouse to the center of the window */ if (This->base.dwCoopLevel & DISCL_EXCLUSIVE || This->warp_override == WARP_FORCE_ON) { - TRACE("Warping mouse to %d - %d\n", This->mapped_center.x, This->mapped_center.y); - SetCursorPos( This->mapped_center.x, This->mapped_center.y ); - This->last_warped = GetCurrentTime(); - - This->need_warp = FALSE; + /* Need a window to warp mouse in. */ + if (!This->base.win) This->base.win = GetDesktopWindow(); + warp_check( This, TRUE ); } return DI_OK; @@ -563,19 +566,7 @@ static HRESULT WINAPI SysMouseWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W iface, } LeaveCriticalSection(&This->base.crit); - /* Check if we need to do a mouse warping */ - if (This->need_warp && (GetCurrentTime() - This->last_warped > 10)) - { - if(!dinput_window_check(This)) - return DIERR_GENERIC; - TRACE("Warping mouse to %d - %d\n", This->mapped_center.x, This->mapped_center.y); - SetCursorPos( This->mapped_center.x, This->mapped_center.y ); - This->last_warped = GetCurrentTime(); - - This->need_warp = FALSE; - } - - return DI_OK; + return warp_check( This, FALSE ); } static HRESULT WINAPI SysMouseAImpl_GetDeviceState(LPDIRECTINPUTDEVICE8A iface, DWORD len, LPVOID ptr) @@ -594,19 +585,7 @@ static HRESULT WINAPI SysMouseWImpl_GetDeviceData(LPDIRECTINPUTDEVICE8W iface, HRESULT res; res = IDirectInputDevice2WImpl_GetDeviceData(iface, dodsize, dod, entries, flags); - if (FAILED(res)) return res; - - /* Check if we need to do a mouse warping */ - if (This->need_warp && (GetCurrentTime() - This->last_warped > 10)) - { - if(!dinput_window_check(This)) - return DIERR_GENERIC; - TRACE("Warping mouse to %d - %d\n", This->mapped_center.x, This->mapped_center.y); - SetCursorPos( This->mapped_center.x, This->mapped_center.y ); - This->last_warped = GetCurrentTime(); - - This->need_warp = FALSE; - } + if (SUCCEEDED(res)) res = warp_check( This, FALSE ); return res; }

1 0

Stefan Dösinger : d3d8: Don' t reapply the old DS if SetDepthStencilSurface failed.
by Alexandre Julliard April 26, 2011

April 26, 2011

Module: wine Branch: master Commit: 463162b4143ee03193aade846acb7202ba3f7f5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=463162b4143ee03193aade846… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Apr 25 16:51:27 2011 +0200 d3d8: Don't reapply the old DS if SetDepthStencilSurface failed. --- dlls/d3d8/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 47a727d..ae90a16 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1047,8 +1047,10 @@ static HRESULT WINAPI IDirect3DDevice8Impl_SetRenderTarget(IDirect3DDevice8 *ifa { hr = IWineD3DDevice_SetDepthStencilSurface(This->WineD3DDevice, pZSurface ? pZSurface->wineD3DSurface : NULL); if (SUCCEEDED(hr) && pSurface) + { hr = IWineD3DDevice_SetRenderTarget(This->WineD3DDevice, 0, pSurface->wineD3DSurface, TRUE); - if (FAILED(hr)) IWineD3DDevice_SetDepthStencilSurface(This->WineD3DDevice, original_ds); + if (FAILED(hr)) IWineD3DDevice_SetDepthStencilSurface(This->WineD3DDevice, original_ds); + } } if (original_ds) IWineD3DSurface_Release(original_ds);

1 0

Alexandre Julliard : dinput: Pass mouse messages through if the request to clip the cursor is rejected.
by Alexandre Julliard April 26, 2011

April 26, 2011

Module: wine Branch: master Commit: 0036e438db3b5382ee0a2c53478960fabb892a2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0036e438db3b5382ee0a2c534… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 26 14:41:51 2011 +0200 dinput: Pass mouse messages through if the request to clip the cursor is rejected. --- dlls/dinput/mouse.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index f011de9..b890c73 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -66,6 +66,7 @@ struct SysMouseImpl /* These are used in case of relative -> absolute transitions */ POINT org_coords; POINT mapped_center; + BOOL clipped; /* warping: whether we need to move mouse back to middle once we * reach window borders (for e.g. shooters, "surface movement" games) */ BOOL need_warp; @@ -319,21 +320,20 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM { MSLLHOOKSTRUCT *hook = (MSLLHOOKSTRUCT *)lparam; SysMouseImpl* This = impl_from_IDirectInputDevice8A(iface); - DWORD dwCoop; int wdata = 0, inst_id = -1, ret; TRACE("msg %lx @ (%d %d)\n", wparam, hook->pt.x, hook->pt.y); EnterCriticalSection(&This->base.crit); - dwCoop = This->base.dwCoopLevel; - ret = dwCoop & DISCL_EXCLUSIVE; + ret = This->clipped; switch(wparam) { case WM_MOUSEMOVE: { POINT pt, pt1; - GetCursorPos(&pt); + if (This->clipped) pt = This->mapped_center; + else GetCursorPos(&pt); This->m_state.lX += pt.x = hook->pt.x - pt.x; This->m_state.lY += pt.y = hook->pt.y - pt.y; @@ -422,28 +422,29 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM static HRESULT warp_check( SysMouseImpl* This, BOOL force ) { DWORD now = GetCurrentTime(); - const DWORD interval = (This->base.dwCoopLevel & DISCL_EXCLUSIVE) ? 500 : 10; + const DWORD interval = This->clipped ? 500 : 10; if (force || (This->need_warp && (now - This->last_warped > interval))) { - RECT rect; + RECT rect, new_rect; This->last_warped = now; This->need_warp = FALSE; if (!GetWindowRect(This->base.win, &rect)) return DIERR_GENERIC; This->mapped_center.x = (rect.left + rect.right) / 2; This->mapped_center.y = (rect.top + rect.bottom) / 2; + if (!This->clipped) + { + TRACE("Warping mouse to %d - %d\n", This->mapped_center.x, This->mapped_center.y); + SetCursorPos( This->mapped_center.x, This->mapped_center.y ); + } if (This->base.dwCoopLevel & DISCL_EXCLUSIVE) { SetRect( &rect, This->mapped_center.x, This->mapped_center.y, This->mapped_center.x + 1, This->mapped_center.y + 1 ); TRACE("Clipping mouse to %s\n", wine_dbgstr_rect( &rect )); ClipCursor( &rect ); - } - else - { - TRACE("Warping mouse to %d - %d\n", This->mapped_center.x, This->mapped_center.y); - SetCursorPos( This->mapped_center.x, This->mapped_center.y ); + This->clipped = GetClipCursor( &new_rect ) && EqualRect( &rect, &new_rect ); } } return DI_OK;

1 0

Maarten Lankhorst : winealsa: Zero buffer, only write data if needed.
by Alexandre Julliard April 26, 2011

April 26, 2011

Module: wine Branch: master Commit: c385a9350597022ad6ebfb75acf39c571140cf8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c385a9350597022ad6ebfb75a… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue Apr 26 13:22:45 2011 +0200 winealsa: Zero buffer, only write data if needed. --- dlls/winealsa.drv/mmdevdrv.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 37e03a0..056f9f0 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -479,6 +479,10 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, hr = E_OUTOFMEMORY; goto exit; } + if (fmt->wBitsPerSample == 8) + memset(This->local_buffer, 128, This->bufsize_frames * fmt->nBlockAlign); + else + memset(This->local_buffer, 0, This->bufsize_frames * fmt->nBlockAlign); if((err = snd_pcm_sw_params_get_boundary(sw_params, &boundary)) < 0){ WARN("Unable to get boundary: %d (%s)\n", err, snd_strerror(err)); @@ -1110,7 +1114,7 @@ static void CALLBACK alsa_push_buffer_data(void *user, BOOLEAN timer) EnterCriticalSection(&This->lock); - if(This->dataflow == eRender) + if(This->dataflow == eRender && This->held_frames) alsa_write_data(This); else if(This->dataflow == eCapture) alsa_read_data(This);

1 0

Alexandre Julliard : dinput: Use a 1x1 clipping rect instead of warping the mouse in exclusive mode.
by Alexandre Julliard April 26, 2011

April 26, 2011

Module: wine Branch: master Commit: c52f41541578f5a11a596ca3d56aa1eb1aca51ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=c52f41541578f5a11a596ca3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 26 12:54:39 2011 +0200 dinput: Use a 1x1 clipping rect instead of warping the mouse in exclusive mode. --- dlls/dinput/mouse.c | 62 +++++++++++++++++++++++--------------------------- 1 files changed, 29 insertions(+), 33 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index ec67b02..f011de9 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -359,9 +359,12 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM wdata = pt1.y; } - This->need_warp = This->warp_override != WARP_DISABLE && - (pt.x || pt.y) && - (dwCoop & DISCL_EXCLUSIVE || This->warp_override == WARP_FORCE_ON); + if (pt.x || pt.y) + { + if ((This->warp_override == WARP_FORCE_ON) || + (This->warp_override != WARP_DISABLE && (This->base.dwCoopLevel & DISCL_EXCLUSIVE))) + This->need_warp = TRUE; + } break; } case WM_MOUSEWHEEL: @@ -416,28 +419,32 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM return ret; } -static BOOL dinput_window_check(SysMouseImpl* This) { - RECT rect; - - /* make sure the window hasn't moved */ - if(!GetWindowRect(This->base.win, &rect)) - return FALSE; - This->mapped_center.x = (rect.left + rect.right) / 2; - This->mapped_center.y = (rect.top + rect.bottom) / 2; - return TRUE; -} - static HRESULT warp_check( SysMouseImpl* This, BOOL force ) { DWORD now = GetCurrentTime(); + const DWORD interval = (This->base.dwCoopLevel & DISCL_EXCLUSIVE) ? 500 : 10; - if (force || (This->need_warp && (now - This->last_warped > 10))) + if (force || (This->need_warp && (now - This->last_warped > interval))) { + RECT rect; + This->last_warped = now; This->need_warp = FALSE; - if (!dinput_window_check(This)) return DIERR_GENERIC; - TRACE("Warping mouse to %d - %d\n", This->mapped_center.x, This->mapped_center.y); - SetCursorPos( This->mapped_center.x, This->mapped_center.y ); + if (!GetWindowRect(This->base.win, &rect)) return DIERR_GENERIC; + This->mapped_center.x = (rect.left + rect.right) / 2; + This->mapped_center.y = (rect.top + rect.bottom) / 2; + if (This->base.dwCoopLevel & DISCL_EXCLUSIVE) + { + SetRect( &rect, This->mapped_center.x, This->mapped_center.y, + This->mapped_center.x + 1, This->mapped_center.y + 1 ); + TRACE("Clipping mouse to %s\n", wine_dbgstr_rect( &rect )); + ClipCursor( &rect ); + } + else + { + TRACE("Warping mouse to %d - %d\n", This->mapped_center.x, This->mapped_center.y); + SetCursorPos( This->mapped_center.x, This->mapped_center.y ); + } } return DI_OK; } @@ -471,24 +478,13 @@ static HRESULT WINAPI SysMouseWImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) This->m_state.rgbButtons[0] = GetKeyState(VK_LBUTTON) & 0x80; This->m_state.rgbButtons[1] = GetKeyState(VK_RBUTTON) & 0x80; This->m_state.rgbButtons[2] = GetKeyState(VK_MBUTTON) & 0x80; - - /* Install our mouse hook */ + if (This->base.dwCoopLevel & DISCL_EXCLUSIVE) { - RECT rc; - - ShowCursor(FALSE); /* hide cursor */ - if (GetWindowRect(This->base.win, &rc)) - { - FIXME("Clipping cursor to %s\n", wine_dbgstr_rect( &rc )); - ClipCursor(&rc); - } - else - ERR("Failed to get RECT: %d\n", GetLastError()); + ShowCursor(FALSE); /* hide cursor */ + warp_check( This, TRUE ); } - - /* Warp the mouse to the center of the window */ - if (This->base.dwCoopLevel & DISCL_EXCLUSIVE || This->warp_override == WARP_FORCE_ON) + else if (This->warp_override == WARP_FORCE_ON) { /* Need a window to warp mouse in. */ if (!This->base.win) This->base.win = GetDesktopWindow();

1 0

Alexandre Julliard : dinput: Get rid of some redundant coordinate mappings.
by Alexandre Julliard April 26, 2011

April 26, 2011

Module: wine Branch: master Commit: 8578f9c37579ea8b9856aa1838244afe44ba0996 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8578f9c37579ea8b9856aa183… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 26 12:26:16 2011 +0200 dinput: Get rid of some redundant coordinate mappings. --- dlls/dinput/mouse.c | 20 ++++---------------- 1 files changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index ace9fe2..9434888 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -66,7 +66,6 @@ struct SysMouseImpl /* These are used in case of relative -> absolute transitions */ POINT org_coords; POINT mapped_center; - DWORD win_centerX, win_centerY; /* warping: whether we need to move mouse back to middle once we * reach window borders (for e.g. shooters, "surface movement" games) */ BOOL need_warp; @@ -419,20 +418,12 @@ static int dinput_mouse_hook( LPDIRECTINPUTDEVICE8A iface, WPARAM wparam, LPARAM static BOOL dinput_window_check(SysMouseImpl* This) { RECT rect; - DWORD centerX, centerY; /* make sure the window hasn't moved */ if(!GetWindowRect(This->base.win, &rect)) return FALSE; - centerX = (rect.right - rect.left) / 2; - centerY = (rect.bottom - rect.top ) / 2; - if (This->win_centerX != centerX || This->win_centerY != centerY) { - This->win_centerX = centerX; - This->win_centerY = centerY; - } - This->mapped_center.x = This->win_centerX; - This->mapped_center.y = This->win_centerY; - MapWindowPoints(This->base.win, HWND_DESKTOP, &This->mapped_center, 1); + This->mapped_center.x = (rect.left + rect.right) / 2; + This->mapped_center.y = (rect.top + rect.bottom) / 2; return TRUE; } @@ -488,15 +479,12 @@ static HRESULT WINAPI SysMouseWImpl_Acquire(LPDIRECTINPUTDEVICE8W iface) /* Get the window dimension and find the center */ GetWindowRect(This->base.win, &rect); - This->win_centerX = (rect.right - rect.left) / 2; - This->win_centerY = (rect.bottom - rect.top ) / 2; + This->mapped_center.x = (rect.left + rect.right) / 2; + This->mapped_center.y = (rect.top + rect.bottom) / 2; /* Warp the mouse to the center of the window */ if (This->base.dwCoopLevel & DISCL_EXCLUSIVE || This->warp_override == WARP_FORCE_ON) { - This->mapped_center.x = This->win_centerX; - This->mapped_center.y = This->win_centerY; - MapWindowPoints(This->base.win, HWND_DESKTOP, &This->mapped_center, 1); TRACE("Warping mouse to %d - %d\n", This->mapped_center.x, This->mapped_center.y); SetCursorPos( This->mapped_center.x, This->mapped_center.y ); This->last_warped = GetCurrentTime();

1 0

Alexandre Julliard : winex11: Refuse to clip cursor to a 1x1 window if we don't have XInput2 support.
by Alexandre Julliard April 26, 2011

April 26, 2011

Module: wine Branch: master Commit: 897fdfd423bbc0093b19775577ea4910de4d1a33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=897fdfd423bbc0093b1977557… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 26 14:40:59 2011 +0200 winex11: Refuse to clip cursor to a 1x1 window if we don't have XInput2 support. --- dlls/winex11.drv/mouse.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 1e783d2..c4e0b59 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -410,7 +410,20 @@ static BOOL grab_clipping_window( const RECT *clip ) if (!clip_window) return TRUE; /* create a clip message window unless we are already clipping */ - if (!data->clip_hwnd && !(msg_hwnd = create_clipping_msg_window())) return TRUE; + if (!data->clip_hwnd) + { + if (!(msg_hwnd = create_clipping_msg_window())) return TRUE; + enable_xinput2(); + } + + /* don't clip to 1x1 rectangle if we don't have XInput */ + if (data->xi2_state != xi_enabled && clip->right - clip->left == 1 && clip->bottom - clip->top == 1) + { + WARN( "XInput2 not supported, refusing to clip to %s\n", wine_dbgstr_rect(clip) ); + if (msg_hwnd) DestroyWindow( msg_hwnd ); + ClipCursor( NULL ); + return TRUE; + } TRACE( "clipping to %s\n", wine_dbgstr_rect(clip) ); @@ -428,13 +441,13 @@ static BOOL grab_clipping_window( const RECT *clip ) if (!clipping_cursor) { + disable_xinput2(); if (msg_hwnd) DestroyWindow( msg_hwnd ); return FALSE; } if (msg_hwnd) { data->clip_hwnd = msg_hwnd; - enable_xinput2(); sync_window_cursor( clip_window ); clip_rect = *clip; SendMessageW( GetDesktopWindow(), WM_X11DRV_CLIP_CURSOR, 0, (LPARAM)msg_hwnd );

1 0