wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Henri Verbeet : ddraw: AddAttachedSurface() just references whatever we pass it.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: 0d8e6719d524ad7bbaf616dff90a1ed6ca15937b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d8e6719d524ad7bbaf616dff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jan 30 21:19:48 2012 +0100 ddraw: AddAttachedSurface() just references whatever we pass it. --- dlls/ddraw/surface.c | 16 ++++++++-------- dlls/ddraw/tests/ddraw1.c | 4 +++- dlls/ddraw/tests/ddraw2.c | 4 +++- dlls/ddraw/tests/ddraw4.c | 4 +++- dlls/ddraw/tests/ddraw7.c | 4 +++- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index f4a4d56..ced64a9 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1605,8 +1605,8 @@ static HRESULT WINAPI ddraw_surface7_AddAttachedSurface(IDirectDrawSurface7 *ifa { return hr; } - ddraw_surface7_AddRef(&attachment_impl->IDirectDrawSurface7_iface); attachment_impl->attached_iface = (IUnknown *)attachment; + IUnknown_AddRef(attachment_impl->attached_iface); return hr; } @@ -1624,9 +1624,9 @@ static HRESULT WINAPI ddraw_surface4_AddAttachedSurface(IDirectDrawSurface4 *ifa { return hr; } - ddraw_surface4_AddRef(&attachment_impl->IDirectDrawSurface4_iface); - ddraw_surface7_Release(&attachment_impl->IDirectDrawSurface7_iface); attachment_impl->attached_iface = (IUnknown *)attachment; + IUnknown_AddRef(attachment_impl->attached_iface); + ddraw_surface7_Release(&attachment_impl->IDirectDrawSurface7_iface); return hr; } static HRESULT WINAPI ddraw_surface3_AddAttachedSurface(IDirectDrawSurface3 *iface, IDirectDrawSurface3 *attachment) @@ -1670,8 +1670,8 @@ static HRESULT WINAPI ddraw_surface3_AddAttachedSurface(IDirectDrawSurface3 *ifa { return hr; } - ddraw_surface3_AddRef(&attachment_impl->IDirectDrawSurface3_iface); attachment_impl->attached_iface = (IUnknown *)attachment; + IUnknown_AddRef(attachment_impl->attached_iface); return hr; } @@ -1689,9 +1689,9 @@ static HRESULT WINAPI ddraw_surface2_AddAttachedSurface(IDirectDrawSurface2 *ifa { return hr; } - ddraw_surface2_AddRef(&attachment_impl->IDirectDrawSurface2_iface); - ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); attachment_impl->attached_iface = (IUnknown *)attachment; + IUnknown_AddRef(attachment_impl->attached_iface); + ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); return hr; } @@ -1709,9 +1709,9 @@ static HRESULT WINAPI ddraw_surface1_AddAttachedSurface(IDirectDrawSurface *ifac { return hr; } - ddraw_surface1_AddRef(&attachment_impl->IDirectDrawSurface_iface); - ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); attachment_impl->attached_iface = (IUnknown *)attachment; + IUnknown_AddRef(attachment_impl->attached_iface); + ddraw_surface3_Release(&attachment_impl->IDirectDrawSurface3_iface); return hr; } diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 3542564..233d013 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -662,6 +662,7 @@ static void test_surface_interface_mismatch(void) IDirect3DMaterial *background = NULL; DDSURFACEDESC surface_desc; DWORD z_depth = 0; + ULONG refcount; HRESULT hr; D3DCOLOR color; HWND window; @@ -728,7 +729,8 @@ static void test_surface_interface_mismatch(void) /* Using a different surface interface version still works */ hr = IDirectDrawSurface3_AddAttachedSurface(surface3, (IDirectDrawSurface3 *)ds); ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); - IDirectDrawSurface_Release(ds); + refcount = IDirectDrawSurface_Release(ds); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); if (FAILED(hr)) goto cleanup; diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 5fa6028..3a62f57 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -687,6 +687,7 @@ static void test_surface_interface_mismatch(void) IDirect3DMaterial2 *background = NULL; DDSURFACEDESC surface_desc; DWORD z_depth = 0; + ULONG refcount; HRESULT hr; D3DCOLOR color; HWND window; @@ -753,7 +754,8 @@ static void test_surface_interface_mismatch(void) /* Using a different surface interface version still works */ hr = IDirectDrawSurface3_AddAttachedSurface(surface3, (IDirectDrawSurface3 *)ds); ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); - IDirectDrawSurface_Release(ds); + refcount = IDirectDrawSurface_Release(ds); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); if (FAILED(hr)) goto cleanup; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 34cab7f..b242f86 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -875,6 +875,7 @@ static void test_surface_interface_mismatch(void) IDirect3DViewport3 *viewport = NULL; DDSURFACEDESC2 surface_desc; DDPIXELFORMAT z_fmt; + ULONG refcount; HRESULT hr; D3DCOLOR color; HWND window; @@ -936,7 +937,8 @@ static void test_surface_interface_mismatch(void) /* Using a different surface interface version still works */ hr = IDirectDrawSurface3_AddAttachedSurface(surface3, (IDirectDrawSurface3 *)ds); ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); - IDirectDrawSurface4_Release(ds); + refcount = IDirectDrawSurface4_Release(ds); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); if (FAILED(hr)) goto cleanup; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 8eb7098..0460a3f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -841,6 +841,7 @@ static void test_surface_interface_mismatch(void) IDirect3DDevice7 *device = NULL; DDSURFACEDESC2 surface_desc; DDPIXELFORMAT z_fmt; + ULONG refcount; HRESULT hr; D3DCOLOR color; HWND window; @@ -900,7 +901,8 @@ static void test_surface_interface_mismatch(void) /* Using a different surface interface version still works */ hr = IDirectDrawSurface3_AddAttachedSurface(surface3, (IDirectDrawSurface3 *)ds); ok(SUCCEEDED(hr), "Failed to attach depth buffer, hr %#x.\n", hr); - IDirectDrawSurface7_Release(ds); + refcount = IDirectDrawSurface7_Release(ds); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); if (FAILED(hr)) goto cleanup;

1 0

Alexandre Julliard : winex11: Reset clipping when a fullscreen window is unmapped.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: a534925a4817cf5afa8fd692f9502c91c95ad58b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a534925a4817cf5afa8fd692f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 31 13:45:04 2012 +0100 winex11: Reset clipping when a fullscreen window is unmapped. --- dlls/winex11.drv/window.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index fcf5e0e..a172cd2 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2543,7 +2543,10 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags if (((swp_flags & SWP_HIDEWINDOW) && !(new_style & WS_VISIBLE)) || (!event_type && !is_window_rect_mapped( rectWindow ) && is_window_rect_mapped( &old_window_rect ))) + { unmap_window( display, data ); + if (is_window_rect_fullscreen( &old_window_rect )) reset_clipping_window(); + } } /* don't change position if we are about to minimize or maximize a managed window */

1 0

Alexandre Julliard : kernel32: Only change the Unix current after exec_process to make sure it' s inherited properly.
by Alexandre Julliard 31 Jan '12

31 Jan '12

Module: wine Branch: master Commit: e31dd6dba1e77ca0d2a6073424a0cf65c8f82ab5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e31dd6dba1e77ca0d2a607342… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 31 13:44:40 2012 +0100 kernel32: Only change the Unix current after exec_process to make sure it's inherited properly. --- dlls/kernel32/process.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index ad389ec..21f0817 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -904,7 +904,6 @@ static void init_current_directory( CURDIR *cur_dir ) HeapFree( GetProcessHeap(), 0, cwd ); done: - if (!cur_dir->Handle) chdir("/"); /* change to root directory so as not to lock cdroms */ TRACE( "starting in %s %p\n", debugstr_w( cur_dir->DosPath.Buffer ), cur_dir->Handle ); } @@ -1251,6 +1250,8 @@ void CDECL __wine_kernel_init(void) ExitProcess( error ); } + if (!params->CurrentDirectory.Handle) chdir("/"); /* avoid locking removable devices */ + LdrInitializeThunk( start_process, 0, 0, 0 ); error:

1 0

Piotr Caban : urlmon: Fix debug message in canonicalize_scheme.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 01947e08dabd0cb9305ba845cb381de9d4a6d32c URL: http://source.winehq.org/git/wine.git/?a=commit;h=01947e08dabd0cb9305ba845c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 30 18:36:53 2012 +0100 urlmon: Fix debug message in canonicalize_scheme. --- dlls/urlmon/uri.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 1e25952..4cefaa0 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3301,7 +3301,7 @@ static BOOL canonicalize_scheme(const parse_data *data, Uri *uri, DWORD flags, B uri->scheme_start = pos; TRACE("(%p %p %x): Canonicalized scheme=%s, len=%d.\n", data, uri, flags, - debugstr_wn(uri->canon_uri, uri->scheme_len), data->scheme_len); + debugstr_wn(uri->canon_uri+uri->scheme_start, data->scheme_len), data->scheme_len); } /* This happens in both computation modes. */

1 0

Thomas Faber : comctl32: Fix MSVC build in imagelist.c.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 2fb139ffe750e57942acd78e8ec915ee0d40e531 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb139ffe750e57942acd78e8… Author: Thomas Faber <thfabba(a)gmx.de> Date: Mon Jan 30 18:26:43 2012 +0100 comctl32: Fix MSVC build in imagelist.c. --- dlls/comctl32/imagelist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index ccc594f..28e2968 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -3094,7 +3094,7 @@ static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count) if ((ilc >= ILC_COLOR4 && ilc <= ILC_COLOR32) || ilc == ILC_COLOR) { - char buffer[FIELD_OFFSET( BITMAPINFO, bmiColors[256] )]; + char buffer[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)]; BITMAPINFO *bmi = (BITMAPINFO *)buffer; TRACE("Creating DIBSection %d x %d, %d Bits per Pixel\n",

1 0

Andrew Eikum : mmdevapi: Correctly convert UINT32 to LONG32.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 5860a5b386a5d3c0acbe0d5e59f94e8a259cb490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5860a5b386a5d3c0acbe0d5e5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 30 11:04:17 2012 -0600 mmdevapi: Correctly convert UINT32 to LONG32. --- dlls/winealsa.drv/mmdevdrv.c | 2 +- dlls/wineoss.drv/mmdevdrv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index ba29fde..0bedcc5 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -117,7 +117,7 @@ struct ACImpl { HANDLE timer; BYTE *local_buffer, *tmp_buffer; - long getbuf_last; /* <0 when using tmp_buffer */ + LONG32 getbuf_last; /* <0 when using tmp_buffer */ CRITICAL_SECTION lock; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 650c46d..22ee924 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -121,7 +121,7 @@ struct ACImpl { BYTE *local_buffer, *tmp_buffer; int buf_state; - long getbuf_last; /* <0 when using tmp_buffer */ + LONG32 getbuf_last; /* <0 when using tmp_buffer */ HANDLE timer; CRITICAL_SECTION lock;

1 0

Piotr Caban : msvcp60: Fix _Lockit class implementation.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: e3174d93d8c898ea6ecd9c8d8f9bb5b9ff41b9b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3174d93d8c898ea6ecd9c8d8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Jan 30 17:47:36 2012 +0100 msvcp60: Fix _Lockit class implementation. --- dlls/msvcp60/misc.c | 59 ++++++------------------------------------------- dlls/msvcp60/msvcp.h | 2 +- 2 files changed, 9 insertions(+), 52 deletions(-) diff --git a/dlls/msvcp60/misc.c b/dlls/msvcp60/misc.c index 94b673b..61cf4a5 100644 --- a/dlls/msvcp60/misc.c +++ b/dlls/msvcp60/misc.c @@ -89,56 +89,21 @@ void CDECL mutex_mutex_dtor(mutex *m) mutex_dtor(m); } -static CRITICAL_SECTION lockit_cs[_MAX_LOCK]; - -/* ?_Lockit_ctor@_Lockit@std@@SAXH@Z */ -void __cdecl _Lockit_init(int locktype) { - InitializeCriticalSection(&lockit_cs[locktype]); - lockit_cs[locktype].DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Lockit critical section"); -} - -/* ?_Lockit_dtor@_Lockit@std@@SAXH@Z */ -void __cdecl _Lockit_free(int locktype) -{ - lockit_cs[locktype].DebugInfo->Spare[0] = 0; - DeleteCriticalSection(&lockit_cs[locktype]); -} +static CRITICAL_SECTION lockit_cs; void init_lockit(void) { - int i; - - for(i=0; i<_MAX_LOCK; i++) - _Lockit_init(i); + InitializeCriticalSection(&lockit_cs); + lockit_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": _Lockit critical section"); } void free_lockit(void) { - int i; - - for(i=0; i<_MAX_LOCK; i++) - _Lockit_free(i); + lockit_cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&lockit_cs); } -/* ?_Lockit_ctor@_Lockit@std@@CAXPAV12@H@Z */ -/* ?_Lockit_ctor@_Lockit@std@@CAXPEAV12@H@Z */ -void __cdecl _Lockit__Lockit_ctor_locktype(_Lockit *lockit, int locktype) -{ - lockit->locktype = locktype; - EnterCriticalSection(&lockit_cs[locktype]); -} - -/* ?_Lockit_ctor@_Lockit@std@@CAXPAV12@@Z */ -/* ?_Lockit_ctor@_Lockit@std@@CAXPEAV12@@Z */ -void __cdecl _Lockit__Lockit_ctor(_Lockit *lockit) -{ - _Lockit__Lockit_ctor_locktype(lockit, 0); -} - -/* ??0_Lockit@std@@QAE@H@Z */ -/* ??0_Lockit@std@@QEAA@H@Z */ -DEFINE_THISCALL_WRAPPER(_Lockit_ctor_locktype, 8) _Lockit* __thiscall _Lockit_ctor_locktype(_Lockit *this, int locktype) { - _Lockit__Lockit_ctor_locktype(this, locktype); + EnterCriticalSection(&lockit_cs); return this; } @@ -147,15 +112,7 @@ _Lockit* __thiscall _Lockit_ctor_locktype(_Lockit *this, int locktype) DEFINE_THISCALL_WRAPPER(_Lockit_ctor, 4) _Lockit* __thiscall _Lockit_ctor(_Lockit *this) { - _Lockit__Lockit_ctor_locktype(this, 0); - return this; -} - -/* ?_Lockit_dtor@_Lockit@std@@CAXPAV12@@Z */ -/* ?_Lockit_dtor@_Lockit@std@@CAXPEAV12@@Z */ -void __cdecl _Lockit__Lockit_dtor(_Lockit *lockit) -{ - LeaveCriticalSection(&lockit_cs[lockit->locktype]); + return _Lockit_ctor_locktype(this, 0); } /* ??1_Lockit@std@@QAE@XZ */ @@ -163,7 +120,7 @@ void __cdecl _Lockit__Lockit_dtor(_Lockit *lockit) DEFINE_THISCALL_WRAPPER(_Lockit_dtor, 4) void __thiscall _Lockit_dtor(_Lockit *this) { - _Lockit__Lockit_dtor(this); + LeaveCriticalSection(&lockit_cs); } /* wctype */ diff --git a/dlls/msvcp60/msvcp.h b/dlls/msvcp60/msvcp.h index ed31419..ef6f864 100644 --- a/dlls/msvcp60/msvcp.h +++ b/dlls/msvcp60/msvcp.h @@ -256,7 +256,7 @@ void __thiscall locale_dtor(locale*); /* class _Lockit */ typedef struct { - int locktype; + char empty_struct; } _Lockit; #define _LOCK_LOCALE 0

1 0

Stefan Leichter : msi: Update version resource.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: f3caa7684695edb2aab932bd2987ff8f55af5932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3caa7684695edb2aab932bd2… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Mon Jan 30 14:27:39 2012 +0100 msi: Update version resource. --- dlls/msi/msi.rc | 8 ++++---- programs/msiexec/rsrc.rc | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msi/msi.rc b/dlls/msi/msi.rc index f58de7e..fd67807 100644 --- a/dlls/msi/msi.rc +++ b/dlls/msi/msi.rc @@ -77,9 +77,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #define WINE_FILEDESCRIPTION_STR "Wine MSI dll" #define WINE_FILENAME_STR "msi.dll" -#define WINE_FILEVERSION 4,5,6001,22159 -#define WINE_FILEVERSION_STR "4.5.6001.22159" -#define WINE_PRODUCTVERSION 4,5,6001,22159 -#define WINE_PRODUCTVERSION_STR "4.5.6001.22159" +#define WINE_FILEVERSION 4,5,6001,22299 +#define WINE_FILEVERSION_STR "4.5.6001.22299" +#define WINE_PRODUCTVERSION 4,5,6001,22299 +#define WINE_PRODUCTVERSION_STR "4.5.6001.22299" #include "wine/wine_common_ver.rc" diff --git a/programs/msiexec/rsrc.rc b/programs/msiexec/rsrc.rc index 2594c51..b9994ef 100644 --- a/programs/msiexec/rsrc.rc +++ b/programs/msiexec/rsrc.rc @@ -21,10 +21,10 @@ #define WINE_FILEDESCRIPTION_STR "Wine Installer" #define WINE_FILENAME_STR "msiexec.exe" #define WINE_FILETYPE VFT_APP -#define WINE_FILEVERSION 3,1,4000,1823 -#define WINE_FILEVERSION_STR "3.1.4000.1823" -#define WINE_PRODUCTVERSION 3,1,4000,1823 -#define WINE_PRODUCTVERSION_STR "3.1.4000.1823" +#define WINE_FILEVERSION 4,5,6001,22299 +#define WINE_FILEVERSION_STR "4.5.6001.22299" +#define WINE_PRODUCTVERSION 4,5,6001,22299 +#define WINE_PRODUCTVERSION_STR "4.5.6001.22299" #define WINE_PRODUCTNAME_STR "Wine Installer" #include "wine/wine_common_ver.rc"

1 0

Alexandre Julliard : winex11: Disallow clipping to fullscreen rectangle if XInput2 is not available.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: 1592b9c9de2338a70835ecbdd5a48318162b123f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1592b9c9de2338a70835ecbdd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 30 17:46:32 2012 +0100 winex11: Disallow clipping to fullscreen rectangle if XInput2 is not available. --- dlls/winex11.drv/mouse.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 07a420e..85df63b 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -388,6 +388,11 @@ static BOOL grab_clipping_window( const RECT *clip, BOOL only_with_xinput ) /* don't clip to 1x1 rectangle if we don't have XInput */ if (clip->right - clip->left == 1 && clip->bottom - clip->top == 1) only_with_xinput = TRUE; + /* don't clip to fullscreen rectangle either (with 1-pixel offset to catch the dinput case) */ + if (clip->left <= virtual_screen_rect.left + 1 || clip->right >= virtual_screen_rect.right - 1 || + clip->top <= virtual_screen_rect.top + 1 || clip->bottom >= virtual_screen_rect.bottom - 1) + only_with_xinput = TRUE; + if (only_with_xinput && data->xi2_state != xi_enabled) { WARN( "XInput2 not supported, refusing to clip to %s\n", wine_dbgstr_rect(clip) );

1 0

Alexandre Julliard : dinput: Catch unsuccessful clipping attempts and fall back to warping.
by Alexandre Julliard 30 Jan '12

30 Jan '12

Module: wine Branch: master Commit: b0657c8623e7ed8745ffb87b3ed47afb55589bc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0657c8623e7ed8745ffb87b3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 30 17:46:23 2012 +0100 dinput: Catch unsuccessful clipping attempts and fall back to warping. --- dlls/dinput/mouse.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 20de328..ead6c25 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -421,7 +421,7 @@ static void warp_check( SysMouseImpl* This, BOOL force ) if (force || (This->need_warp && (now - This->last_warped > interval))) { - RECT rect; + RECT rect, new_rect; POINT mapped_center; This->last_warped = now; @@ -442,7 +442,8 @@ static void warp_check( SysMouseImpl* This, BOOL force ) rect.right = min( rect.right, rect.left + GetSystemMetrics( SM_CXVIRTUALSCREEN ) - 2 ); rect.bottom = min( rect.bottom, rect.top + GetSystemMetrics( SM_CYVIRTUALSCREEN ) - 2 ); TRACE("Clipping mouse to %s\n", wine_dbgstr_rect( &rect )); - This->clipped = ClipCursor( &rect ); + ClipCursor( &rect ); + This->clipped = GetClipCursor( &new_rect ) && EqualRect( &rect, &new_rect ); } } }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2012