October 2010 - Wine-Commits

Henri Verbeet : ddraw: Remove another hack.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: 5fa84c56c344927dcb13b12409fbf64d738438f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fa84c56c344927dcb13b1240… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Oct 5 14:32:35 2010 +0200 ddraw: Remove another hack. It breaks actual front buffer / back buffer flips. --- dlls/ddraw/ddraw_private.h | 1 - dlls/ddraw/device.c | 78 ++++++---------------------------------- dlls/wined3d/device.c | 86 -------------------------------------------- include/wine/wined3d.idl | 4 -- 4 files changed, 11 insertions(+), 158 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 9b3f614..f9b9a48 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -359,7 +359,6 @@ struct IDirect3DDeviceImpl IDirectDrawImpl *ddraw; IWineD3DBuffer *indexbuffer; IDirectDrawSurfaceImpl *target; - BOOL OffScreenTarget; /* Viewport management */ IDirect3DViewportImpl *viewport_list; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 30109e9..0056a40 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -311,34 +311,10 @@ IDirect3DDeviceImpl_7_Release(IDirect3DDevice7 *iface) * IDirect3DVertexBuffer::Release will unset it. */ - /* Restore the render targets */ - if(This->OffScreenTarget) - { - WINED3DVIEWPORT vp; - - vp.X = 0; - vp.Y = 0; - vp.Width = This->ddraw->d3d_target->surface_desc.dwWidth; - vp.Height = This->ddraw->d3d_target->surface_desc.dwHeight; - vp.MinZ = 0.0; - vp.MaxZ = 1.0; - IWineD3DDevice_SetViewport(This->wineD3DDevice, - &vp); - - /* Set the device up to render to the front buffer since the back buffer will - * vanish soon. - */ - IWineD3DDevice_SetRenderTarget(This->wineD3DDevice, 0, - This->ddraw->d3d_target->WineD3DSurface, - FALSE); - /* This->target is the offscreen target. - * This->ddraw->d3d_target is the target used by DDraw - */ - TRACE("(%p) Release: Using %p as front buffer, %p as back buffer\n", This, This->ddraw->d3d_target, NULL); - IWineD3DDevice_SetFrontBackBuffers(This->wineD3DDevice, - This->ddraw->d3d_target->WineD3DSurface, - NULL); - } + /* Set the device up to render to the front buffer since the back + * buffer will vanish soon. */ + IWineD3DDevice_SetRenderTarget(This->wineD3DDevice, 0, + This->ddraw->d3d_target->WineD3DSurface, TRUE); /* Release the WineD3DDevice. This won't destroy it */ if(IWineD3DDevice_Release(This->wineD3DDevice) <= 0) @@ -7024,46 +7000,14 @@ HRESULT d3d_device_init(IDirect3DDeviceImpl *device, IDirectDrawImpl *ddraw, IDi device->wineD3DDevice = ddraw->wineD3DDevice; IWineD3DDevice_AddRef(ddraw->wineD3DDevice); - /* This is for apps which create a non-flip, non-d3d primary surface - * and an offscreen D3DDEVICE surface, then render to the offscreen surface - * and do a Blt from the offscreen to the primary surface. - * - * Set the offscreen D3DDDEVICE surface(=target) as the back buffer, - * and the primary surface(=This->d3d_target) as the front buffer. - * - * This way the app will render to the D3DDEVICE surface and WineD3D - * will catch the Blt was Back Buffer -> Front buffer blt and perform - * a flip instead. This way we don't have to deal with a mixed GL / GDI - * environment. - * - * This should be checked against windowed apps. The only app tested with - * this is moto racer 2 during the loading screen. - */ - TRACE("Is rendertarget: %s, d3d_target %p.\n", - target->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE ? "true" : "false", ddraw->d3d_target); - - if (!(target->surface_desc.ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) - && ddraw->d3d_target != target) - { - TRACE("Using %p as front buffer, %p as back buffer.\n", ddraw->d3d_target, target); - - hr = IWineD3DDevice_SetFrontBackBuffers(ddraw->wineD3DDevice, - ddraw->d3d_target->WineD3DSurface, target->WineD3DSurface); - if (FAILED(hr)) - { - ERR("Failed to set front and back buffer, hr %#x.\n", hr); - IParent_Release((IParent *)index_buffer_parent); - ddraw_handle_table_destroy(&device->handle_table); - return hr; - } - - /* Render to the back buffer */ - IWineD3DDevice_SetRenderTarget(ddraw->wineD3DDevice, 0, target->WineD3DSurface, TRUE); - device->OffScreenTarget = TRUE; - } - else + /* Render to the back buffer */ + hr = IWineD3DDevice_SetRenderTarget(ddraw->wineD3DDevice, 0, target->WineD3DSurface, TRUE); + if (FAILED(hr)) { - device->OffScreenTarget = FALSE; + ERR("Failed to set render target, hr %#x.\n", hr); + IParent_Release((IParent *)index_buffer_parent); + ddraw_handle_table_destroy(&device->handle_table); + return hr; } /* FIXME: This is broken. The target AddRef() makes some sense, because diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ea4f69e..1e42409 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5636,91 +5636,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetRenderTarget(IWineD3DDevice *iface, return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *iface, - IWineD3DSurface *front, IWineD3DSurface *back) -{ - IWineD3DSurfaceImpl *front_impl = (IWineD3DSurfaceImpl *)front; - IWineD3DSurfaceImpl *back_impl = (IWineD3DSurfaceImpl *)back; - IWineD3DSwapChainImpl *swapchain; - HRESULT hr; - - TRACE("iface %p, front %p, back %p.\n", iface, front, back); - - if (FAILED(hr = IWineD3DDevice_GetSwapChain(iface, 0, (IWineD3DSwapChain **)&swapchain))) - { - ERR("Failed to get the swapchain, hr %#x.\n", hr); - return hr; - } - - if (front_impl && !(front_impl->resource.usage & WINED3DUSAGE_RENDERTARGET)) - { - ERR("Trying to set a front buffer which doesn't have WINED3DUSAGE_RENDERTARGET usage.\n"); - IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); - return WINED3DERR_INVALIDCALL; - } - - if (back_impl) - { - if (!(back_impl->resource.usage & WINED3DUSAGE_RENDERTARGET)) - { - ERR("Trying to set a back buffer which doesn't have WINED3DUSAGE_RENDERTARGET usage.\n"); - IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); - return WINED3DERR_INVALIDCALL; - } - - if (!swapchain->back_buffers) - { - swapchain->back_buffers = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*swapchain->back_buffers)); - if (!swapchain->back_buffers) - { - ERR("Failed to allocate back buffer array memory.\n"); - IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); - return E_OUTOFMEMORY; - } - } - } - - if (swapchain->front_buffer != front_impl) - { - TRACE("Changing the front buffer from %p to %p.\n", swapchain->front_buffer, front_impl); - - if (swapchain->front_buffer) - surface_set_container(swapchain->front_buffer, WINED3D_CONTAINER_NONE, NULL); - swapchain->front_buffer = front_impl; - - if (front_impl) - surface_set_container(front_impl, WINED3D_CONTAINER_SWAPCHAIN, (IWineD3DBase *)swapchain); - } - - if (swapchain->back_buffers[0] != back_impl) - { - TRACE("Changing the back buffer from %p to %p.\n", swapchain->back_buffers[0], back_impl); - - if (swapchain->back_buffers[0]) - surface_set_container(swapchain->back_buffers[0], WINED3D_CONTAINER_NONE, NULL); - swapchain->back_buffers[0] = back_impl; - - if (back_impl) - { - swapchain->presentParms.BackBufferWidth = back_impl->currentDesc.Width; - swapchain->presentParms.BackBufferHeight = back_impl->currentDesc.Height; - swapchain->presentParms.BackBufferFormat = back_impl->resource.format->id; - swapchain->presentParms.BackBufferCount = 1; - - surface_set_container(back_impl, WINED3D_CONTAINER_SWAPCHAIN, (IWineD3DBase *)swapchain); - } - else - { - swapchain->presentParms.BackBufferCount = 0; - HeapFree(GetProcessHeap(), 0, swapchain->back_buffers); - swapchain->back_buffers = NULL; - } - } - - IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); - return WINED3D_OK; -} - static HRESULT WINAPI IWineD3DDeviceImpl_GetDepthStencilSurface(IWineD3DDevice *iface, IWineD3DSurface **depth_stencil) { IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)iface; @@ -6803,7 +6718,6 @@ static const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl = IWineD3DDeviceImpl_GetRenderState, IWineD3DDeviceImpl_SetRenderTarget, IWineD3DDeviceImpl_GetRenderTarget, - IWineD3DDeviceImpl_SetFrontBackBuffers, IWineD3DDeviceImpl_SetSamplerState, IWineD3DDeviceImpl_GetSamplerState, IWineD3DDeviceImpl_SetScissorRect, diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index 548a08a..d990f70 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -3137,10 +3137,6 @@ interface IWineD3DDevice : IUnknown [in] DWORD render_target_idx, [out] IWineD3DSurface **render_target ); - HRESULT SetFrontBackBuffers( - [in] IWineD3DSurface *front, - [in] IWineD3DSurface *back - ); HRESULT SetSamplerState( [in] DWORD sampler_idx, [in] WINED3DSAMPLERSTATETYPE state,

1 0

Reece Dunn : jscript: Throw TypeError if T in 'new T' is not an object.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: e368fd545ca20da61f36f49f61269b7a8c28dbb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e368fd545ca20da61f36f49f6… Author: Reece Dunn <msclrhd(a)gmail.com> Date: Fri Oct 1 19:19:29 2010 +0100 jscript: Throw TypeError if T in 'new T' is not an object. --- dlls/jscript/engine.c | 13 ++++++++++--- dlls/jscript/tests/api.js | 3 +++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8aed4db..8e43f70 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1562,10 +1562,17 @@ HRESULT new_expression_eval(exec_ctx_t *ctx, expression_t *_expr, DWORD flags, j if(FAILED(hres)) return hres; - if(V_VT(&constr) != VT_DISPATCH) { - FIXME("throw TypeError\n"); + /* NOTE: Should use to_object here */ + + if(V_VT(&constr) == VT_NULL) { VariantClear(&constr); - return E_FAIL; + return throw_type_error(ctx->parser->script, ei, IDS_OBJECT_EXPECTED, NULL); + } else if(V_VT(&constr) != VT_DISPATCH) { + VariantClear(&constr); + return throw_type_error(ctx->parser->script, ei, IDS_UNSUPPORTED_ACTION, NULL); + } else if(!V_DISPATCH(&constr)) { + VariantClear(&constr); + return throw_type_error(ctx->parser->script, ei, IDS_NO_PROPERTY, NULL); } hres = disp_call(ctx->parser->script, V_DISPATCH(&constr), DISPID_VALUE, diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 2e0ae0b..956ea55 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1894,6 +1894,9 @@ exception_test(function() {(new Object()) instanceof nullDisp;}, "TypeError", -2 exception_test(function() {"test" in 3;}, "TypeError", -2146823281); exception_test(function() {"test" in null;}, "TypeError", -2146823281); exception_test(function() {"test" in nullDisp;}, "TypeError", -2146823281); +exception_test(function() {new 3;}, "TypeError", -2146827843); +exception_test(function() {new null;}, "TypeError", -2146823281); +exception_test(function() {new nullDisp;}, "TypeError", -2146827850); function testThisExcept(func, number) { exception_test(function() {func.call(new Object())}, "TypeError", number);

1 0

Alexandre Julliard : comctl32/propsheet: Fix incorrect use of the ScreenToClient function.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: a37e5975dc9bfb93d069dc39370f172b965507a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a37e5975dc9bfb93d069dc393… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 14:04:01 2010 +0200 comctl32/propsheet: Fix incorrect use of the ScreenToClient function. --- dlls/comctl32/propsheet.c | 19 +++++-------------- 1 files changed, 5 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c index e25db1d..f711399 100644 --- a/dlls/comctl32/propsheet.c +++ b/dlls/comctl32/propsheet.c @@ -1074,18 +1074,13 @@ static PADDING_INFO PROPSHEET_GetPaddingInfo(HWND hwndDlg) { HWND hwndTab = GetDlgItem(hwndDlg, IDC_TABCONTROL); RECT rcTab; - POINT tl; PADDING_INFO padding; GetWindowRect(hwndTab, &rcTab); + MapWindowPoints( 0, hwndDlg, (POINT *)&rcTab, 2 ); - tl.x = rcTab.left; - tl.y = rcTab.top; - - ScreenToClient(hwndDlg, &tl); - - padding.x = tl.x; - padding.y = tl.y; + padding.x = rcTab.left; + padding.y = rcTab.top; return padding; } @@ -1131,21 +1126,17 @@ static PADDING_INFO PROPSHEET_GetPaddingInfoWizard(HWND hwndDlg, const PropSheet hwndControl = GetDlgItem(hwndDlg, idButton); GetWindowRect(hwndControl, &rc); - + MapWindowPoints( 0, hwndDlg, (POINT *)&rc, 2 ); ptButton.x = rc.left; ptButton.y = rc.top; - ScreenToClient(hwndDlg, &ptButton); - /* Line */ hwndControl = GetDlgItem(hwndDlg, IDC_SUNKEN_LINE); GetWindowRect(hwndControl, &rc); - + MapWindowPoints( 0, hwndDlg, (POINT *)&rc, 2 ); ptLine.x = rc.left; ptLine.y = rc.bottom; - ScreenToClient(hwndDlg, &ptLine); - padding.y = ptButton.y - ptLine.y; if (padding.y < 0)

1 0

Alexandre Julliard : comdlg32: Fix incorrect use of the ScreenToClient function.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: 6d5bfce3eee9c957b4850780e96325bdf998d218 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d5bfce3eee9c957b4850780e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 14:04:15 2010 +0200 comdlg32: Fix incorrect use of the ScreenToClient function. --- dlls/comdlg32/printdlg.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 05d9401..d692e7d 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3487,8 +3487,7 @@ static INT_PTR CALLBACK pagesetup_dlg_proc(HWND hDlg, UINT uMsg, WPARAM wParam, SetPropW(hDlg, pagesetupdlg_prop, data); SetPropW(hDrawWnd, pagesetupdlg_prop, data); GetWindowRect(hDrawWnd, &data->rtDrawRect); /* Calculating rect in client coordinates where paper draws */ - ScreenToClient(hDlg, (LPPOINT)&data->rtDrawRect); - ScreenToClient(hDlg, (LPPOINT)(&data->rtDrawRect.right)); + MapWindowPoints( 0, hDlg, (LPPOINT)&data->rtDrawRect, 2 ); lpfnStaticWndProc = (WNDPROC)SetWindowLongPtrW( hDrawWnd, GWLP_WNDPROC,

1 0

Alexandre Julliard : comctl32/progress: Fix incorrect use of the ScreenToClient function.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: 87b359c48a9966f4125bba9dbb7124e6c969f962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87b359c48a9966f4125bba9db… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 14:03:54 2010 +0200 comctl32/progress: Fix incorrect use of the ScreenToClient function. --- dlls/comctl32/progress.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/progress.c b/dlls/comctl32/progress.c index c44b816..5f2f166 100644 --- a/dlls/comctl32/progress.c +++ b/dlls/comctl32/progress.c @@ -380,8 +380,7 @@ static LRESULT PROGRESS_Draw (PROGRESS_INFO *infoPtr, HDC hdc) if (pdi.theme) { GetWindowRect( infoPtr->Self, &pdi.bgRect ); - ScreenToClient( infoPtr->Self, (POINT*)&pdi.bgRect ); - ScreenToClient( infoPtr->Self, (POINT*)&pdi.bgRect.right ); + MapWindowPoints( infoPtr->Self, 0, (POINT*)&pdi.bgRect, 2 ); } if (!barSmooth)

1 0

Alexandre Julliard : comctl32/ipaddress: Fix incorrect use of the ScreenToClient function.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: a10441d67aa45943f24cee035570cbdccd593890 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a10441d67aa45943f24cee035… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 14:03:41 2010 +0200 comctl32/ipaddress: Fix incorrect use of the ScreenToClient function. --- dlls/comctl32/ipaddress.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c index 03b8d1c..1f41f91 100644 --- a/dlls/comctl32/ipaddress.c +++ b/dlls/comctl32/ipaddress.c @@ -149,7 +149,6 @@ static LRESULT IPADDRESS_Draw (const IPADDRESS_INFO *infoPtr, HDC hdc) { static const WCHAR dotW[] = { '.', 0 }; RECT rect, rcPart; - POINT pt; COLORREF bgCol, fgCol; int i; @@ -173,13 +172,11 @@ static LRESULT IPADDRESS_Draw (const IPADDRESS_INFO *infoPtr, HDC hdc) for (i = 0; i < 3; i++) { GetWindowRect (infoPtr->Part[i].EditHwnd, &rcPart); - pt.x = rcPart.right; - ScreenToClient(infoPtr->Self, &pt); - rect.left = pt.x; + MapWindowPoints( 0, infoPtr->Self, (POINT *)&rcPart, 2 ); + rect.left = rcPart.right; GetWindowRect (infoPtr->Part[i+1].EditHwnd, &rcPart); - pt.x = rcPart.left; - ScreenToClient(infoPtr->Self, &pt); - rect.right = pt.x; + MapWindowPoints( 0, infoPtr->Self, (POINT *)&rcPart, 2 ); + rect.right = rcPart.left; DrawTextW(hdc, dotW, 1, &rect, DT_SINGLELINE | DT_CENTER | DT_BOTTOM); }

1 0

Alexandre Julliard : comctl32/pager: Fix incorrect use of the ScreenToClient function.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: 5434d069ea7d12c9cdc317e81c9f32a205b3e981 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5434d069ea7d12c9cdc317e81… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 14:03:48 2010 +0200 comctl32/pager: Fix incorrect use of the ScreenToClient function. --- dlls/comctl32/pager.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/pager.c b/dlls/comctl32/pager.c index f3461fd..e1420e0 100644 --- a/dlls/comctl32/pager.c +++ b/dlls/comctl32/pager.c @@ -99,11 +99,7 @@ PAGER_GetButtonRects(const PAGER_INFO* infoPtr, RECT* prcTopLeft, RECT* prcBotto GetWindowRect (infoPtr->hwndSelf, &rcWindow); if (bClientCoords) - { - POINT pt = {rcWindow.left, rcWindow.top}; - ScreenToClient(infoPtr->hwndSelf, &pt); - OffsetRect(&rcWindow, -(rcWindow.left-pt.x), -(rcWindow.top-pt.y)); - } + MapWindowPoints( 0, infoPtr->hwndSelf, (POINT *)&rcWindow, 2 ); else OffsetRect(&rcWindow, -rcWindow.left, -rcWindow.top);

1 0

Alexandre Julliard : winefile: Fix incorrect use of the ScreenToClient function.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: d1f8eb49fef515a1a532b1e98a0200121c3b3758 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1f8eb49fef515a1a532b1e98… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 14:02:41 2010 +0200 winefile: Fix incorrect use of the ScreenToClient function. --- programs/winefile/winefile.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/programs/winefile/winefile.c b/programs/winefile/winefile.c index c150c9a..aed4d14 100644 --- a/programs/winefile/winefile.c +++ b/programs/winefile/winefile.c @@ -2019,8 +2019,7 @@ static BOOL toggle_fullscreen(HWND hwnd) g_fullscreen.wasZoomed = IsZoomed(hwnd); Frame_CalcFrameClient(hwnd, &rt); - ClientToScreen(hwnd, (LPPOINT)&rt.left); - ClientToScreen(hwnd, (LPPOINT)&rt.right); + MapWindowPoints( hwnd, 0, (POINT *)&rt, 2 ); rt.left = g_fullscreen.orgPos.left-rt.left; rt.top = g_fullscreen.orgPos.top-rt.top; @@ -2046,8 +2045,7 @@ static void fullscreen_move(HWND hwnd) GetWindowRect(hwnd, &pos); Frame_CalcFrameClient(hwnd, &rt); - ClientToScreen(hwnd, (LPPOINT)&rt.left); - ClientToScreen(hwnd, (LPPOINT)&rt.right); + MapWindowPoints( hwnd, 0, (POINT *)&rt, 2 ); rt.left = pos.left-rt.left; rt.top = pos.top-rt.top;

1 0

Alexandre Julliard : comctl32/datetime: Fix incorrect use of the ScreenToClient function.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: 96ed854d3553ef3917e2521fa68d5059dc54973e URL: http://source.winehq.org/git/wine.git/?a=commit;h=96ed854d3553ef3917e2521fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 14:03:33 2010 +0200 comctl32/datetime: Fix incorrect use of the ScreenToClient function. --- dlls/comctl32/datetime.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 6204cd1..1ac6ba7 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -787,6 +787,7 @@ DATETIME_LButtonDown (DATETIME_INFO *infoPtr, INT x, INT y) if (infoPtr->select == DTHT_MCPOPUP) { RECT rcMonthCal; + POINT pos; SendMessageW(infoPtr->hMonthCal, MCM_GETMINREQRECT, 0, (LPARAM)&rcMonthCal); /* FIXME: button actually is only depressed during dropdown of the */ @@ -795,17 +796,16 @@ DATETIME_LButtonDown (DATETIME_INFO *infoPtr, INT x, INT y) /* recalculate the position of the monthcal popup */ if(infoPtr->dwStyle & DTS_RIGHTALIGN) - infoPtr->monthcal_pos.x = infoPtr->calbutton.left - - (rcMonthCal.right - rcMonthCal.left); + pos.x = infoPtr->calbutton.left - (rcMonthCal.right - rcMonthCal.left); else /* FIXME: this should be after the area reserved for the checkbox */ - infoPtr->monthcal_pos.x = infoPtr->rcDraw.left; + pos.x = infoPtr->rcDraw.left; - infoPtr->monthcal_pos.y = infoPtr->rcClient.bottom; - ClientToScreen (infoPtr->hwndSelf, &(infoPtr->monthcal_pos)); - SetWindowPos(infoPtr->hMonthCal, 0, infoPtr->monthcal_pos.x, - infoPtr->monthcal_pos.y, rcMonthCal.right - rcMonthCal.left, - rcMonthCal.bottom - rcMonthCal.top, 0); + pos.y = infoPtr->rcClient.bottom; + OffsetRect( &rcMonthCal, pos.x, pos.y ); + MapWindowPoints( infoPtr->hwndSelf, 0, (POINT *)&rcMonthCal, 2 ); + SetWindowPos(infoPtr->hMonthCal, 0, rcMonthCal.left, rcMonthCal.top, + rcMonthCal.right - rcMonthCal.left, rcMonthCal.bottom - rcMonthCal.top, 0); if(IsWindowVisible(infoPtr->hMonthCal)) { ShowWindow(infoPtr->hMonthCal, SW_HIDE);

1 0

Alexandre Julliard : comctl32/comboex: Fix incorrect use of the ScreenToClient function.
by Alexandre Julliard Oct. 5, 2010

Oct. 5, 2010

Module: wine Branch: master Commit: 4b4c1a0060dcfa17d1a8876dd8cf8cd49cfef53f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b4c1a0060dcfa17d1a8876dd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 5 14:03:25 2010 +0200 comctl32/comboex: Fix incorrect use of the ScreenToClient function. --- dlls/comctl32/comboex.c | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 6e90751..e516ea8 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -431,18 +431,13 @@ static void COMBOEX_ReSize (const COMBOEX_INFO *infoPtr) if (infoPtr->hwndCombo) { SendMessageW (infoPtr->hwndCombo, CB_SETITEMHEIGHT, 0, cy); if ( !(infoPtr->flags & CBES_EX_NOSIZELIMIT)) { - RECT comboRect; - if (GetWindowRect(infoPtr->hwndCombo, &comboRect)) { - RECT ourRect; - if (GetWindowRect(infoPtr->hwndSelf, &ourRect)) { - if (comboRect.bottom > ourRect.bottom) { - POINT pt = { ourRect.left, ourRect.top }; - if (ScreenToClient(infoPtr->hwndSelf, &pt)) - MoveWindow( infoPtr->hwndSelf, pt.x, pt.y, ourRect.right - ourRect.left, - comboRect.bottom - comboRect.top, FALSE); - } - } - } + RECT comboRect, ourRect; + GetWindowRect(infoPtr->hwndCombo, &comboRect); + GetWindowRect(infoPtr->hwndSelf, &ourRect); + if (comboRect.bottom > ourRect.bottom) + SetWindowPos( infoPtr->hwndSelf, 0, 0, 0, ourRect.right - ourRect.left, + comboRect.bottom - comboRect.top, + SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOREDRAW ); } } }

1 0