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

André Hentschel : gdiplus: Add a FIXME.
by Alexandre Julliard April 13, 2011

April 13, 2011

Module: wine Branch: master Commit: 66f212e66715fb628c4366a7634e97a92ff40778 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66f212e66715fb628c4366a76… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Apr 12 20:17:02 2011 +0200 gdiplus: Add a FIXME. --- dlls/gdiplus/brush.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index d6fb62d..d1af903 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1253,11 +1253,16 @@ GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorsWithCount(GpPathGradient GpStatus WINGDIPAPI GdipGetPathGradientSurroundColorCount(GpPathGradient *brush, INT *count) { + static int calls; + TRACE("(%p, %p)\n", brush, count); if (!brush || !count) return InvalidParameter; + if(!(calls++)) + FIXME("not implemented\n"); + return NotImplemented; }

1 0

Austin English : ole2disp.dll16: Add a stub for SETERRORINFO.
by Alexandre Julliard April 13, 2011

April 13, 2011

Module: wine Branch: master Commit: 554715ce7293b0f4dfffae3758df411f520a7a9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=554715ce7293b0f4dfffae375… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Apr 12 12:09:17 2011 -0500 ole2disp.dll16: Add a stub for SETERRORINFO. --- dlls/ole2disp.dll16/ole2disp.c | 9 +++++++++ dlls/ole2disp.dll16/ole2disp.dll16.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/ole2disp.dll16/ole2disp.c b/dlls/ole2disp.dll16/ole2disp.c index 081683e..139b492 100644 --- a/dlls/ole2disp.dll16/ole2disp.c +++ b/dlls/ole2disp.dll16/ole2disp.c @@ -248,3 +248,12 @@ HRESULT WINAPI RegisterActiveObject16( FIXME("(%p,%s,0x%08x,%p):stub\n",punk,debugstr_guid(rclsid),dwFlags,pdwRegister); return E_NOTIMPL; } + +/****************************************************************************** + * SetErrorInfo [OLE2DISP.110] + */ +HRESULT WINAPI SetErrorInfo16(ULONG dwReserved, IErrorInfo *perrinfo) +{ + FIXME("stub: (%d, %p)\n", dwReserved, perrinfo); + return E_INVALIDARG; +} diff --git a/dlls/ole2disp.dll16/ole2disp.dll16.spec b/dlls/ole2disp.dll16/ole2disp.dll16.spec index 2f9e2ef..0bc4bae 100644 --- a/dlls/ole2disp.dll16/ole2disp.dll16.spec +++ b/dlls/ole2disp.dll16/ole2disp.dll16.spec @@ -107,7 +107,7 @@ 107 stub DOINVOKEMETHOD 108 stub VARIANTCHANGETYPEEX 109 stub SAFEARRAYPTROFINDEX -110 stub SETERRORINFO +110 pascal SetErrorInfo(long ptr) SetErrorInfo16 111 stub GETERRORINFO 112 stub CREATEERRORINFO 113 stub _IID_IERRORINFO

1 0

Rex Tsai : wininet: Added stub for option DATA_SEND_TIMEOUT.
by Alexandre Julliard April 13, 2011

April 13, 2011

Module: wine Branch: master Commit: b7582991de7c5d021d9582b69a84d2cef827ef34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7582991de7c5d021d9582b69… Author: Rex Tsai <chihchun(a)kalug.linux.org.tw> Date: Tue Apr 12 23:44:42 2011 +0800 wininet: Added stub for option DATA_SEND_TIMEOUT. --- dlls/wininet/internet.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 9b37e58..d671484 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2594,9 +2594,10 @@ BOOL WINAPI InternetSetOptionW(HINTERNET hInternet, DWORD dwOption, break; case INTERNET_OPTION_SEND_TIMEOUT: case INTERNET_OPTION_RECEIVE_TIMEOUT: + case INTERNET_OPTION_DATA_SEND_TIMEOUT: { ULONG timeout = *(ULONG *)lpBuffer; - FIXME("INTERNET_OPTION_SEND/RECEIVE_TIMEOUT %d\n", timeout); + FIXME("INTERNET_OPTION_SEND/RECEIVE_TIMEOUT/DATA_SEND_TIMEOUT %d\n", timeout); break; } case INTERNET_OPTION_CONNECT_RETRIES:

1 0

Henri Verbeet : wined3d: Take hDestWindowOverride into account in IWineGDISwapChainImpl_Present().
by Alexandre Julliard April 13, 2011

April 13, 2011

Module: wine Branch: master Commit: 7ace689742809dc33b54506182cd87de131bd02d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ace689742809dc33b5450618… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 12 18:28:42 2011 +0200 wined3d: Take hDestWindowOverride into account in IWineGDISwapChainImpl_Present(). --- dlls/wined3d/swapchain.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 3238a61..990758d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -757,6 +757,8 @@ static HRESULT WINAPI IWineGDISwapChainImpl_Present(IWineD3DSwapChain *iface, IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)iface; IWineD3DSurfaceImpl *front, *back; + IWineD3DBaseSwapChainImpl_SetDestWindowOverride(iface, hDestWindowOverride); + if (!swapchain->back_buffers) { WARN("Swapchain doesn't have a backbuffer, returning WINED3DERR_INVALIDCALL\n");

1 0

Rico Schüller : d3dx9: Make some functions inline.
by Alexandre Julliard April 13, 2011

April 13, 2011

Module: wine Branch: master Commit: 4dcb3ea325c39d48b90e21f9b63247e2bb99f42c URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dcb3ea325c39d48b90e21f9b… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Apr 12 21:25:03 2011 +0200 d3dx9: Make some functions inline. --- dlls/d3dx9_36/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f31ac31..ba02c56 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -102,12 +102,12 @@ static void skip_dword_unknown(const char **ptr, unsigned int count) } } -static struct d3dx_parameter *get_parameter_struct(D3DXHANDLE handle) +static inline struct d3dx_parameter *get_parameter_struct(D3DXHANDLE handle) { return (struct d3dx_parameter *) handle; } -static D3DXHANDLE get_parameter_handle(struct d3dx_parameter *parameter) +static inline D3DXHANDLE get_parameter_handle(struct d3dx_parameter *parameter) { return (D3DXHANDLE) parameter; }

1 0

Henri Verbeet : wined3d: Remove IWineD3DSwapChain::Destroy() from the public interface.
by Alexandre Julliard April 13, 2011

April 13, 2011

Module: wine Branch: master Commit: 3068ae9e83725d58716c64451426f3cd06c32018 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3068ae9e83725d58716c64451… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 12 18:28:40 2011 +0200 wined3d: Remove IWineD3DSwapChain::Destroy() from the public interface. --- dlls/wined3d/swapchain.c | 20 +++++++++----------- include/wine/wined3d.idl | 2 -- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 6db92d6..a44407f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -26,15 +26,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(fps); /* Do not call while under the GL lock. */ -static void WINAPI IWineD3DBaseSwapChainImpl_Destroy(IWineD3DSwapChain *iface) +static void swapchain_cleanup(IWineD3DSwapChainImpl *swapchain) { - IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)iface; WINED3DDISPLAYMODE mode; UINT i; - TRACE("Destroying swapchain %p.\n", iface); + TRACE("Destroying swapchain %p.\n", swapchain); - IWineD3DSwapChain_SetGammaRamp(iface, 0, &swapchain->orig_gamma); + IWineD3DSwapChain_SetGammaRamp((IWineD3DSwapChain *)swapchain, 0, &swapchain->orig_gamma); /* Release the swapchain's draw buffers. Make sure swapchain->back_buffers[0] * is the last buffer to be destroyed, FindContext() depends on that. */ @@ -64,6 +63,7 @@ static void WINAPI IWineD3DBaseSwapChainImpl_Destroy(IWineD3DSwapChain *iface) { context_destroy(swapchain->device, swapchain->context[i]); } + HeapFree(GetProcessHeap(), 0, swapchain->context); /* Restore the screen resolution if we rendered in fullscreen. * This will restore the screen resolution to what it was before creating @@ -79,10 +79,6 @@ static void WINAPI IWineD3DBaseSwapChainImpl_Destroy(IWineD3DSwapChain *iface) mode.Format = swapchain->orig_fmt; IWineD3DDevice_SetDisplayMode((IWineD3DDevice *)swapchain->device, 0, &mode); } - - swapchain->parent_ops->wined3d_object_destroyed(swapchain->parent); - HeapFree(GetProcessHeap(), 0, swapchain->context); - HeapFree(GetProcessHeap(), 0, swapchain); } static HRESULT WINAPI IWineD3DBaseSwapChainImpl_QueryInterface(IWineD3DSwapChain *iface, REFIID riid, void **object) @@ -123,7 +119,11 @@ static ULONG WINAPI IWineD3DBaseSwapChainImpl_Release(IWineD3DSwapChain *iface) TRACE("%p decreasing refcount to %u.\n", swapchain, refcount); if (!refcount) - IWineD3DBaseSwapChainImpl_Destroy(iface); + { + swapchain_cleanup(swapchain); + swapchain->parent_ops->wined3d_object_destroyed(swapchain->parent); + HeapFree(GetProcessHeap(), 0, swapchain); + } return refcount; } @@ -658,7 +658,6 @@ static const IWineD3DSwapChainVtbl IWineD3DSwapChain_Vtbl = IWineD3DBaseSwapChainImpl_Release, /* IWineD3DSwapChain */ IWineD3DBaseSwapChainImpl_GetParent, - IWineD3DBaseSwapChainImpl_Destroy, IWineD3DBaseSwapChainImpl_GetDevice, IWineD3DSwapChainImpl_Present, IWineD3DSwapChainImpl_SetDestWindowOverride, @@ -847,7 +846,6 @@ static const IWineD3DSwapChainVtbl IWineGDISwapChain_Vtbl = IWineD3DBaseSwapChainImpl_Release, /* IWineD3DSwapChain */ IWineD3DBaseSwapChainImpl_GetParent, - IWineD3DBaseSwapChainImpl_Destroy, IWineD3DBaseSwapChainImpl_GetDevice, IWineGDISwapChainImpl_Present, IWineGDISwapChainImpl_SetDestWindowOverride, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 3e375a1..fff763d 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2332,8 +2332,6 @@ interface IWineD3DVolume : IWineD3DResource ] interface IWineD3DSwapChain : IWineD3DBase { - void Destroy( - ); HRESULT GetDevice( [out] IWineD3DDevice **device );

1 0

Henri Verbeet : wined3d: Merge the IWineD3DSwapChain::SetDestWindowOverride () implementations.
by Alexandre Julliard April 13, 2011

April 13, 2011

Module: wine Branch: master Commit: 926dfc5c49dde8401732a943c1055ba6631bcc5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=926dfc5c49dde8401732a943c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 12 18:28:41 2011 +0200 wined3d: Merge the IWineD3DSwapChain::SetDestWindowOverride() implementations. --- dlls/wined3d/swapchain.c | 46 +++++++++++++++++++--------------------------- 1 files changed, 19 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index a44407f..3238a61 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -135,6 +135,22 @@ static void * WINAPI IWineD3DBaseSwapChainImpl_GetParent(IWineD3DSwapChain *ifac return ((IWineD3DSwapChainImpl *)iface)->parent; } +static HRESULT WINAPI IWineD3DBaseSwapChainImpl_SetDestWindowOverride(IWineD3DSwapChain *iface, HWND window) +{ + IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)iface; + + if (!window) + window = swapchain->device_window; + if (window == swapchain->win_handle) + return WINED3D_OK; + + TRACE("Setting swapchain %p window from %p to %p.\n", + swapchain, swapchain->win_handle, window); + swapchain->win_handle = window; + + return WINED3D_OK; +} + static HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetFrontBufferData(IWineD3DSwapChain *iface, IWineD3DSurface *dst_surface) { @@ -410,7 +426,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, RECT src_rect, dst_rect; BOOL render_to_fbo; - IWineD3DSwapChain_SetDestWindowOverride(iface, hDestWindowOverride); + IWineD3DBaseSwapChainImpl_SetDestWindowOverride(iface, hDestWindowOverride); context = context_acquire(This->device, This->back_buffers[0]); if (!context->valid) @@ -637,19 +653,6 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, return WINED3D_OK; } -static HRESULT WINAPI IWineD3DSwapChainImpl_SetDestWindowOverride(IWineD3DSwapChain *iface, HWND window) -{ - IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)iface; - - if (!window) window = swapchain->device_window; - if (window == swapchain->win_handle) return WINED3D_OK; - - TRACE("Setting swapchain %p window from %p to %p\n", swapchain, swapchain->win_handle, window); - swapchain->win_handle = window; - - return WINED3D_OK; -} - static const IWineD3DSwapChainVtbl IWineD3DSwapChain_Vtbl = { /* IUnknown */ @@ -660,7 +663,7 @@ static const IWineD3DSwapChainVtbl IWineD3DSwapChain_Vtbl = IWineD3DBaseSwapChainImpl_GetParent, IWineD3DBaseSwapChainImpl_GetDevice, IWineD3DSwapChainImpl_Present, - IWineD3DSwapChainImpl_SetDestWindowOverride, + IWineD3DBaseSwapChainImpl_SetDestWindowOverride, IWineD3DBaseSwapChainImpl_GetFrontBufferData, IWineD3DBaseSwapChainImpl_GetBackBuffer, IWineD3DBaseSwapChainImpl_GetRasterStatus, @@ -747,17 +750,6 @@ void x11_copy_to_screen(IWineD3DSwapChainImpl *swapchain, const RECT *rect) ReleaseDC(window, dst_dc); } -static HRESULT WINAPI IWineGDISwapChainImpl_SetDestWindowOverride(IWineD3DSwapChain *iface, HWND window) -{ - IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)iface; - - TRACE("iface %p, window %p.\n", iface, window); - - swapchain->win_handle = window; - - return WINED3D_OK; -} - static HRESULT WINAPI IWineGDISwapChainImpl_Present(IWineD3DSwapChain *iface, const RECT *pSourceRect, const RECT *pDestRect, HWND hDestWindowOverride, const RGNDATA *pDirtyRegion, DWORD flags) @@ -848,7 +840,7 @@ static const IWineD3DSwapChainVtbl IWineGDISwapChain_Vtbl = IWineD3DBaseSwapChainImpl_GetParent, IWineD3DBaseSwapChainImpl_GetDevice, IWineGDISwapChainImpl_Present, - IWineGDISwapChainImpl_SetDestWindowOverride, + IWineD3DBaseSwapChainImpl_SetDestWindowOverride, IWineD3DBaseSwapChainImpl_GetFrontBufferData, IWineD3DBaseSwapChainImpl_GetBackBuffer, IWineD3DBaseSwapChainImpl_GetRasterStatus,

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard April 13, 2011

April 13, 2011

Module: wine Branch: master Commit: 35e42ea40e0ccaec1b2f6215a57094dfd9de5a1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e42ea40e0ccaec1b2f6215a… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Tue Apr 12 19:29:30 2011 +0300 po: Update Lithuanian translation. --- po/lt.po | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/po/lt.po b/po/lt.po index 6b72045..94ac0de 100644 --- a/po/lt.po +++ b/po/lt.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-04-11 21:43+0300\n" +"PO-Revision-Date: 2011-04-12 19:25+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: komp_lt(a)konf.lt\n" "Language: Lithuanian\n" @@ -7723,9 +7723,8 @@ msgid "Inf&o" msgstr "&Informacija" #: clock.rc:42 -#, fuzzy msgid "&About Clock" -msgstr "&Apie laikrodį..." +msgstr "&Apie laikrodį" #: clock.rc:48 msgid "Clock" @@ -9056,9 +9055,8 @@ msgid "&Arrange Icons" msgstr "&Išdėstyti piktogramas" #: progman.rc:54 -#, fuzzy msgid "&About Program Manager" -msgstr "Programų tvarkytuvė" +msgstr "&Apie Programų tvarkytuvę" #: progman.rc:60 msgid "Program Manager" @@ -10824,9 +10822,8 @@ msgid "Arrange &Symbols" msgstr "Išdėstyti si&mbolius" #: winefile.rc:87 -#, fuzzy msgid "&About Wine File" -msgstr "&Apie Winefile..." +msgstr "&Apie Wine failų tvarkytuvę" #: winefile.rc:93 msgid "Applying font settings" @@ -10921,9 +10918,8 @@ msgid "&Fastest Times..." msgstr "&Geriausi laikai" #: winemine.rc:48 -#, fuzzy msgid "&About WineMine" -msgstr "Apie &Wine" +msgstr "&Apie Wine minas" #: winemine.rc:27 msgid "WineMine"

1 0

Rico Schüller : d3dcompiler: Fix HeapAlloc/ HeapFree for type members in the reflection parser.
by Alexandre Julliard April 13, 2011

April 13, 2011

Module: wine Branch: master Commit: c49f09d6f8f84cccd02a131e2ca7b10d81334aff URL: http://source.winehq.org/git/wine.git/?a=commit;h=c49f09d6f8f84cccd02a131e2… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Apr 12 21:24:55 2011 +0200 d3dcompiler: Fix HeapAlloc/HeapFree for type members in the reflection parser. --- dlls/d3dcompiler_43/reflection.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index ea01e24..5dd7c38 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -235,6 +235,7 @@ static void d3dcompiler_shader_reflection_type_destroy(struct wine_rb_entry *ent { free_type_member(&t->members[i]); } + HeapFree(GetProcessHeap(), 0, t->members); } HeapFree(GetProcessHeap(), 0, t); @@ -1235,7 +1236,7 @@ static HRESULT d3dcompiler_parse_type(struct d3dcompiler_shader_reflection_type { const char *ptr2 = data + member_offset; - members = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*members)); + members = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*members) * desc->Members); if (!members) { ERR("Failed to allocate type memory.\n");

1 0

Alexandre Julliard : winex11: Build the mouse input structure directly in the mouse event handlers.
by Alexandre Julliard April 13, 2011

April 13, 2011

Module: wine Branch: master Commit: b1be3ddbc618a0bacc478090f5552ca50daa0efc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1be3ddbc618a0bacc478090f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 12 21:20:08 2011 +0200 winex11: Build the mouse input structure directly in the mouse event handlers. --- dlls/winex11.drv/mouse.c | 152 +++++++++++++++++++++++++--------------------- 1 files changed, 82 insertions(+), 70 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index eb903cd..1716916 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -92,6 +92,32 @@ static const UINT button_up_flags[NB_BUTTONS] = MOUSEEVENTF_XUP }; +static const UINT button_down_data[NB_BUTTONS] = +{ + 0, + 0, + 0, + WHEEL_DELTA, + -WHEEL_DELTA, + XBUTTON1, + XBUTTON2, + XBUTTON1, + XBUTTON2 +}; + +static const UINT button_up_data[NB_BUTTONS] = +{ + 0, + 0, + 0, + 0, + 0, + XBUTTON1, + XBUTTON2, + XBUTTON1, + XBUTTON2 +}; + static HWND cursor_window; static HCURSOR last_cursor; static DWORD last_cursor_change; @@ -214,34 +240,35 @@ void sync_window_cursor( Window window ) * * Update the various window states on a mouse event. */ -static void send_mouse_input( HWND hwnd, UINT flags, Window window, int x, int y, - unsigned int state, DWORD mouse_data, Time time ) +static void send_mouse_input( HWND hwnd, Window window, unsigned int state, INPUT *input ) { struct x11drv_win_data *data; POINT pt; - INPUT input; + + input->type = INPUT_MOUSE; if (!hwnd && window == clip_window) { - pt.x = x + clip_rect.left; - pt.y = y + clip_rect.top; - goto done; + input->u.mi.dx += clip_rect.left; + input->u.mi.dy += clip_rect.top; + __wine_send_input( hwnd, input ); + return; } if (!(data = X11DRV_get_win_data( hwnd ))) return; if (window == data->whole_window) { - x += data->whole_rect.left - data->client_rect.left; - y += data->whole_rect.top - data->client_rect.top; + input->u.mi.dx += data->whole_rect.left - data->client_rect.left; + input->u.mi.dy += data->whole_rect.top - data->client_rect.top; } if (window == root_window) { - x += virtual_screen_rect.left; - y += virtual_screen_rect.top; + input->u.mi.dx += virtual_screen_rect.left; + input->u.mi.dy += virtual_screen_rect.top; } - pt.x = x; - pt.y = y; + pt.x = input->u.mi.dx; + pt.y = input->u.mi.dy; if (GetWindowLongW( data->hwnd, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) pt.x = data->client_rect.right - data->client_rect.left - 1 - pt.x; MapWindowPoints( hwnd, 0, &pt, 1 ); @@ -277,16 +304,9 @@ static void send_mouse_input( HWND hwnd, UINT flags, Window window, int x, int y SERVER_END_REQ; } -done: - input.type = INPUT_MOUSE; - input.u.mi.dx = pt.x; - input.u.mi.dy = pt.y; - input.u.mi.mouseData = mouse_data; - input.u.mi.dwFlags = flags; - input.u.mi.time = EVENT_x11_time_to_win32_time( time ); - input.u.mi.dwExtraInfo = 0; - - __wine_send_input( hwnd, &input ); + input->u.mi.dx = pt.x; + input->u.mi.dy = pt.y; + __wine_send_input( hwnd, input ); } #ifdef SONAME_LIBXCURSOR @@ -983,35 +1003,21 @@ void X11DRV_ButtonPress( HWND hwnd, XEvent *xev ) { XButtonEvent *event = &xev->xbutton; int buttonNum = event->button - 1; - WORD wData = 0; + INPUT input; if (buttonNum >= NB_BUTTONS) return; - switch (buttonNum) - { - case 3: - wData = WHEEL_DELTA; - break; - case 4: - wData = -WHEEL_DELTA; - break; - case 5: - wData = XBUTTON1; - break; - case 6: - wData = XBUTTON2; - break; - case 7: - wData = XBUTTON1; - break; - case 8: - wData = XBUTTON2; - break; - } + TRACE( "hwnd %p/%lx button %u pos %d,%d\n", hwnd, event->window, buttonNum, event->x, event->y ); + + input.u.mi.dx = event->x; + input.u.mi.dy = event->y; + input.u.mi.mouseData = button_down_data[buttonNum]; + input.u.mi.dwFlags = button_down_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE; + input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); + input.u.mi.dwExtraInfo = 0; update_user_time( event->time ); - send_mouse_input( hwnd, button_down_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, - event->window, event->x, event->y, event->state, wData, event->time ); + send_mouse_input( hwnd, event->window, event->state, &input ); } @@ -1022,28 +1028,20 @@ void X11DRV_ButtonRelease( HWND hwnd, XEvent *xev ) { XButtonEvent *event = &xev->xbutton; int buttonNum = event->button - 1; - WORD wData = 0; + INPUT input; if (buttonNum >= NB_BUTTONS || !button_up_flags[buttonNum]) return; - switch (buttonNum) - { - case 5: - wData = XBUTTON1; - break; - case 6: - wData = XBUTTON2; - break; - case 7: - wData = XBUTTON1; - break; - case 8: - wData = XBUTTON2; - break; - } + TRACE( "hwnd %p/%lx button %u pos %d,%d\n", hwnd, event->window, buttonNum, event->x, event->y ); + + input.u.mi.dx = event->x; + input.u.mi.dy = event->y; + input.u.mi.mouseData = button_up_data[buttonNum]; + input.u.mi.dwFlags = button_up_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE; + input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); + input.u.mi.dwExtraInfo = 0; - send_mouse_input( hwnd, button_up_flags[buttonNum] | MOUSEEVENTF_ABSOLUTE | MOUSEEVENTF_MOVE, - event->window, event->x, event->y, event->state, wData, event->time ); + send_mouse_input( hwnd, event->window, event->state, &input ); } @@ -1053,11 +1051,18 @@ void X11DRV_ButtonRelease( HWND hwnd, XEvent *xev ) void X11DRV_MotionNotify( HWND hwnd, XEvent *xev ) { XMotionEvent *event = &xev->xmotion; + INPUT input; - TRACE("hwnd %p, event->is_hint %d\n", hwnd, event->is_hint); + TRACE( "hwnd %p/%lx pos %d,%d is_hint %d\n", hwnd, event->window, event->x, event->y, event->is_hint ); - send_mouse_input( hwnd, MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE, - event->window, event->x, event->y, event->state, 0, event->time ); + input.u.mi.dx = event->x; + input.u.mi.dy = event->y; + input.u.mi.mouseData = 0; + input.u.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE; + input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); + input.u.mi.dwExtraInfo = 0; + + send_mouse_input( hwnd, event->window, event->state, &input ); } @@ -1067,13 +1072,20 @@ void X11DRV_MotionNotify( HWND hwnd, XEvent *xev ) void X11DRV_EnterNotify( HWND hwnd, XEvent *xev ) { XCrossingEvent *event = &xev->xcrossing; + INPUT input; - TRACE("hwnd %p, event->detail %d\n", hwnd, event->detail); + TRACE( "hwnd %p/%lx pos %d,%d detail %d\n", hwnd, event->window, event->x, event->y, event->detail ); if (event->detail == NotifyVirtual || event->detail == NotifyNonlinearVirtual) return; if (event->window == x11drv_thread_data()->grab_window) return; /* simulate a mouse motion event */ - send_mouse_input( hwnd, MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE, - event->window, event->x, event->y, event->state, 0, event->time ); + input.u.mi.dx = event->x; + input.u.mi.dy = event->y; + input.u.mi.mouseData = 0; + input.u.mi.dwFlags = MOUSEEVENTF_MOVE | MOUSEEVENTF_ABSOLUTE; + input.u.mi.time = EVENT_x11_time_to_win32_time( event->time ); + input.u.mi.dwExtraInfo = 0; + + send_mouse_input( hwnd, event->window, event->state, &input ); }

1 0