wine-commits April 2011

wine-commits@winehq.org

3 participants
937 discussions

Nikolay Sivov : ole32: Handle null argument in OleIsRunning().
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: master Commit: 0c33682330dae057e5984a5f2d19ac119fb14c5f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c33682330dae057e5984a5f2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Apr 8 13:31:33 2011 +0400 ole32: Handle null argument in OleIsRunning(). --- dlls/ole32/ole2.c | 8 +++++--- dlls/ole32/tests/ole2.c | 14 +++++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index d5fd2c2..3254619 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2628,15 +2628,17 @@ HRESULT WINAPI OleDoAutoConvert(LPSTORAGE pStg, LPCLSID pClsidNew) /****************************************************************************** * OleIsRunning [OLE32.@] */ -BOOL WINAPI OleIsRunning(LPOLEOBJECT pObject) +BOOL WINAPI OleIsRunning(LPOLEOBJECT object) { IRunnableObject *pRunnable; HRESULT hr; BOOL running; - TRACE("(%p)\n", pObject); + TRACE("(%p)\n", object); - hr = IOleObject_QueryInterface(pObject, &IID_IRunnableObject, (void **)&pRunnable); + if (!object) return FALSE; + + hr = IOleObject_QueryInterface(object, &IID_IRunnableObject, (void **)&pRunnable); if (FAILED(hr)) return TRUE; running = IRunnableObject_IsRunning(pRunnable); diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 8961186..f38af3b 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -1784,20 +1784,28 @@ static void test_runnable(void) { NULL, 0 } }; + BOOL ret; IOleObject *object = &OleObject; + /* null argument */ + ret = OleIsRunning(NULL); + ok(ret == FALSE, "got %d\n", ret); + expected_method_list = methods_query_runnable; - ok(OleIsRunning(object), "Object should be running\n"); + ret = OleIsRunning(object); + ok(ret == TRUE, "Object should be running\n"); CHECK_NO_EXTRA_METHODS(); g_isRunning = FALSE; expected_method_list = methods_query_runnable; - ok(OleIsRunning(object) == FALSE, "Object should not be running\n"); + ret = OleIsRunning(object); + ok(ret == FALSE, "Object should not be running\n"); CHECK_NO_EXTRA_METHODS(); g_showRunnable = FALSE; /* QueryInterface(IID_IRunnableObject, ...) will fail */ expected_method_list = methods_no_runnable; - ok(OleIsRunning(object), "Object without IRunnableObject should be running\n"); + ret = OleIsRunning(object); + ok(ret == TRUE, "Object without IRunnableObject should be running\n"); CHECK_NO_EXTRA_METHODS(); g_isRunning = TRUE;

1 0

Henri Verbeet : wined3d: Merge swapchain_base.c into swapchain.c.
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: master Commit: 032c3743079cad81099bc3ff3b57b1696c39771a URL: http://source.winehq.org/git/wine.git/?a=commit;h=032c3743079cad81099bc3ff3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 7 18:45:59 2011 +0200 wined3d: Merge swapchain_base.c into swapchain.c. --- dlls/wined3d/Makefile.in | 1 - dlls/wined3d/swapchain.c | 192 ++++++++++++++++++++++++++++++++++++++- dlls/wined3d/swapchain_base.c | 197 ---------------------------------------- dlls/wined3d/wined3d_private.h | 22 ----- 4 files changed, 187 insertions(+), 225 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=032c3743079cad81099bc…

1 0

Henri Verbeet : wined3d: Merge swapchain_gdi.c into swapchain.c.
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: master Commit: 0a174ae542df47c864c31c52540919e3d2488bfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a174ae542df47c864c31c525… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 7 18:45:58 2011 +0200 wined3d: Merge swapchain_gdi.c into swapchain.c. --- dlls/wined3d/Makefile.in | 1 - dlls/wined3d/swapchain.c | 270 +++++++++++++++++++++++++++++++++++++--- dlls/wined3d/swapchain_gdi.c | 273 ---------------------------------------- dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 253 insertions(+), 292 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0a174ae542df47c864c31…

1 0

Henri Verbeet : wined3d: Don't use IWineD3DDeviceImpl_GetSwapChain() in IWineD3DDeviceImpl_Present().
by Alexandre Julliard 08 Apr '11

08 Apr '11

Module: wine Branch: master Commit: 617efafecff9083b2ed2cc4ec7e3a417635491bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=617efafecff9083b2ed2cc4ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 7 18:45:57 2011 +0200 wined3d: Don't use IWineD3DDeviceImpl_GetSwapChain() in IWineD3DDeviceImpl_Present(). It adds COM overhead and validation of the swapchain index, but we already know the index is valid. --- dlls/wined3d/device.c | 24 +++++++++++------------- 1 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 44b81c4..4623494 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4778,22 +4778,20 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EndScene(IWineD3DDevice *iface) return WINED3D_OK; } -static HRESULT WINAPI IWineD3DDeviceImpl_Present(IWineD3DDevice *iface, - const RECT *pSourceRect, const RECT *pDestRect, - HWND hDestWindowOverride, const RGNDATA *pDirtyRegion) +static HRESULT WINAPI IWineD3DDeviceImpl_Present(IWineD3DDevice *iface, const RECT *src_rect, + const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region) { - IWineD3DSwapChain *swapChain = NULL; - int i; - int swapchains = IWineD3DDeviceImpl_GetNumberOfSwapChains(iface); - - TRACE("iface %p.\n", iface); + IWineD3DDeviceImpl *device = (IWineD3DDeviceImpl *)iface; + UINT i; - for(i = 0 ; i < swapchains ; i ++) { + TRACE("iface %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p.\n", + iface, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect), + dst_window_override, dirty_region); - IWineD3DDeviceImpl_GetSwapChain(iface, i, &swapChain); - TRACE("Presenting chain %d, %p.\n", i, swapChain); - IWineD3DSwapChain_Present(swapChain, pSourceRect, pDestRect, hDestWindowOverride, pDirtyRegion, 0); - IWineD3DSwapChain_Release(swapChain); + for (i = 0; i < device->swapchain_count; ++i) + { + IWineD3DSwapChain_Present((IWineD3DSwapChain *)device->swapchains[i], + src_rect, dst_rect, dst_window_override, dirty_region, 0); } return WINED3D_OK;

1 0

Juan Lang : wininet: Honor security flags specified when opening a connection.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 0b8bfd97361fc68358608b03cdf71c2875c4a451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b8bfd97361fc68358608b03c… Author: Juan Lang <juan.lang(a)gmail.com> Date: Thu Apr 7 08:05:36 2011 -0700 wininet: Honor security flags specified when opening a connection. --- dlls/wininet/http.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b2b7bd9..801357c 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2832,6 +2832,10 @@ static DWORD HTTP_HttpOpenRequestW(http_session_t *session, if ((res = NETCON_init(&request->netConnection, dwFlags & INTERNET_FLAG_SECURE)) != ERROR_SUCCESS) goto lend; + if (dwFlags & INTERNET_FLAG_IGNORE_CERT_CN_INVALID) + request->netConnection.security_flags |= SECURITY_FLAG_IGNORE_CERT_CN_INVALID; + if (dwFlags & INTERNET_FLAG_IGNORE_CERT_DATE_INVALID) + request->netConnection.security_flags |= SECURITY_FLAG_IGNORE_CERT_DATE_INVALID; if (lpszObjectName && *lpszObjectName) { HRESULT rc;

1 0

Jacek Caban : urlmon: Use winetest data. php URLs for regular http binding tests.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 777b06fb9e85a73ffc5299a663014ba1d0374f5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=777b06fb9e85a73ffc5299a66… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 7 15:46:01 2011 +0200 urlmon: Use winetest data.php URLs for regular http binding tests. --- dlls/urlmon/tests/url.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index f236fa1..7202052 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -146,11 +146,12 @@ DEFINE_EXPECT(GetWindow_IHttpSecurity); DEFINE_EXPECT(GetWindow_IWindowForBindingUI); DEFINE_EXPECT(OnSecurityProblem); -static const WCHAR TEST_URL_1[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.','o','r','g','/','\0'}; -static const WCHAR TEST_PART_URL_1[] = {'/','t','e','s','t','/','\0'}; +static const WCHAR winetest_data_urlW[] = + {'h','t','t','p',':','/','/','t','e','s','t','.','w','i','n','e','h','q','.','o','r','g','/', + 't','e','s','t','s','/','d','a','t','a','.','p','h','p',0}; + +static const WCHAR TEST_PART_URL_1[] = {'/','t','e','s','t','s','/','d','a','t','a','.','p','h','p','\0'}; -static const WCHAR WINE_ABOUT_URL[] = {'h','t','t','p',':','/','/','w','w','w','.','w','i','n','e','h','q','.', - 'o','r','g','/','s','i','t','e','/','a','b','o','u','t',0}; static const WCHAR SHORT_RESPONSE_URL[] = {'h','t','t','p',':','/','/','c','r','o','s','s','o','v','e','r','.', 'c','o','d','e','w','e','a','v','e','r','s','.','c','o','m','/', @@ -205,7 +206,7 @@ static BOOL only_check_prot_args = FALSE; static BOOL invalid_cn_accepted = FALSE; static LPCWSTR urls[] = { - WINE_ABOUT_URL, + winetest_data_urlW, ABOUT_BLANK, INDEX_HTML, ITS_URL, @@ -314,7 +315,7 @@ static void test_create(void) IBindCtx *bctx; HRESULT hr; - test_CreateURLMoniker(TEST_URL_1, TEST_PART_URL_1); + test_CreateURLMoniker(winetest_data_urlW, TEST_PART_URL_1); mon = (void*)0xdeadbeef; hr = CreateURLMoniker(NULL, relativeW, &mon); @@ -339,7 +340,7 @@ static void test_create(void) IMoniker_Release(mon); mon = (void*)0xdaedbeef; - hr = CreateURLMoniker(NULL, TEST_URL_1, &mon); + hr = CreateURLMoniker(NULL, winetest_data_urlW, &mon); ok(hr == S_OK, "got 0x%08x\n", hr); stream = (void*)0xdeadbeef; @@ -511,7 +512,7 @@ static DWORD WINAPI thread_proc(PVOID arg) SET_EXPECT(Obj_OnProgress_REDIRECTING); else SET_EXPECT(OnProgress_REDIRECTING); - hres = IInternetProtocolSink_ReportProgress(protocol_sink, BINDSTATUS_REDIRECTING, WINE_ABOUT_URL); + hres = IInternetProtocolSink_ReportProgress(protocol_sink, BINDSTATUS_REDIRECTING, winetest_data_urlW); ok(hres == S_OK, "ReportProgress(BINDSTATUS_REFIRECTING) failed: %08x\n", hres); WaitForSingleObject(complete_event, INFINITE); if(bind_to_object) @@ -1609,7 +1610,7 @@ static HRESULT WINAPI statusclb_OnProgress(IBindStatusCallbackEx *iface, ULONG u CHECK_EXPECT(Obj_OnProgress_REDIRECTING); else CHECK_EXPECT(OnProgress_REDIRECTING); - ok(!lstrcmpW(szStatusText, WINE_ABOUT_URL), "unexpected status text %s\n", + ok(!lstrcmpW(szStatusText, winetest_data_urlW), "unexpected status text %s\n", wine_dbgstr_w(szStatusText)); if(emulate_protocol && (test_protocol == HTTP_TEST || test_protocol == HTTPS_TEST || test_protocol == WINETEST_TEST) && (!bind_to_object || iface == &objbsc)) @@ -2687,7 +2688,7 @@ static void init_bind_test(int protocol, DWORD flags, DWORD t) if(flags & BINDTEST_HTTPRESPONSE) urls[HTTP_TEST] = SHORT_RESPONSE_URL; else - urls[HTTP_TEST] = WINE_ABOUT_URL; + urls[HTTP_TEST] = winetest_data_urlW; if(flags & BINDTEST_INVALID_CN) urls[HTTPS_TEST] = https_invalid_cn_urlW; else

1 0

Huw Davies : gdi32/tests: Add horizontal and vertical solid line tests.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: b4ae69749609280972e71bb1fbfd9c99e1839ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b4ae69749609280972e71bb1f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 7 13:50:01 2011 +0100 gdi32/tests: Add horizontal and vertical solid line tests. --- dlls/gdi32/tests/dib.c | 24 ++++++++++++++++++++++++ 1 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 7dd1ba3..d882da4 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -34,6 +34,7 @@ static HCRYPTPROV crypt_prov; static const char *sha1_graphics_a8r8g8b8[] = { "a3cadd34d95d3d5cc23344f69aab1c2e55935fcf", + "2426172d9e8fec27d9228088f382ef3c93717da9", NULL }; @@ -105,9 +106,32 @@ static void compare_hash(BITMAPINFO *bmi, BYTE *bits, const char ***sha1, const static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sha1) { DWORD dib_size = get_dib_size(bmi); + HPEN solid_pen, orig_pen; + INT i; memset(bits, 0xcc, dib_size); compare_hash(bmi, bits, sha1, "empty"); + + solid_pen = CreatePen(PS_SOLID, 1, RGB(0, 0, 0xff)); + orig_pen = SelectObject(hdc, solid_pen); + + /* horizontal and vertical lines */ + for(i = 1; i <= 16; i++) + { + SetROP2(hdc, i); + MoveToEx(hdc, 10, i * 3, NULL); + LineTo(hdc, 100, i * 3); /* l -> r */ + MoveToEx(hdc, 100, 50 + i * 3, NULL); + LineTo(hdc, 10, 50 + i * 3); /* r -> l */ + MoveToEx(hdc, 120 + i * 3, 10, NULL); + LineTo(hdc, 120 + i * 3, 100); /* t -> b */ + MoveToEx(hdc, 170 + i * 3, 100, NULL); + LineTo(hdc, 170 + i * 3, 10); /* b -> t */ + } + compare_hash(bmi, bits, sha1, "h and v solid lines"); + + SelectObject(hdc, orig_pen); + DeleteObject(solid_pen); } static void test_simple_graphics(void)

1 0

Huw Davies : gdi32: Draw single pixel wide, horizontal or vertical lines with the dib driver.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 1e27c9512527e5382599a7ecc91ca607b9ccaaeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e27c9512527e5382599a7ecc… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 7 13:49:33 2011 +0100 gdi32: Draw single pixel wide, horizontal or vertical lines with the dib driver. --- dlls/gdi32/Makefile.in | 1 + dlls/gdi32/clipping.c | 13 ----------- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 6 +++++ dlls/gdi32/dibdrv/graphics.c | 47 ++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/dibdrv/objects.c | 49 ++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 9 +++++++ 7 files changed, 113 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 4b070ac..6a04742 100644 --- a/dlls/gdi32/Makefile.in +++ b/dlls/gdi32/Makefile.in @@ -15,6 +15,7 @@ C_SRCS = \ dc.c \ dib.c \ dibdrv/dc.c \ + dibdrv/graphics.c \ dibdrv/objects.c \ dibdrv/primitives.c \ driver.c \ diff --git a/dlls/gdi32/clipping.c b/dlls/gdi32/clipping.c index 9d529ac..86b19f1 100644 --- a/dlls/gdi32/clipping.c +++ b/dlls/gdi32/clipping.c @@ -30,19 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(clipping); /*********************************************************************** - * get_clip_region - * - * Return the total clip region (if any). - */ -static inline HRGN get_clip_region( DC * dc ) -{ - if (dc->hMetaClipRgn) return dc->hMetaClipRgn; - if (dc->hMetaRgn) return dc->hMetaRgn; - return dc->hClipRgn; -} - - -/*********************************************************************** * get_clip_rect * * Compute a clip rectangle from its logical coordinates. diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 1a16260..78248dd 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -192,7 +192,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pGetTextMetrics */ NULL, /* pIntersectClipRect */ NULL, /* pInvertRgn */ - NULL, /* pLineTo */ + dibdrv_LineTo, /* pLineTo */ NULL, /* pModifyWorldTransform */ NULL, /* pMoveTo */ NULL, /* pOffsetClipRgn */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 2620e38..b7408ac 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +extern BOOL CDECL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; extern HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; extern COLORREF CDECL dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; @@ -26,6 +27,11 @@ static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) return (dibdrv_physdev *)dev; } +static inline DC *get_dibdrv_dc( PHYSDEV dev ) +{ + return CONTAINING_RECORD( dev, DC, dibdrv ); +} + typedef struct primitive_funcs { void (* solid_rects)(const dib_info *dib, int num, RECT *rc, DWORD and, DWORD xor); diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c new file mode 100644 index 0000000..1e0de2f --- /dev/null +++ b/dlls/gdi32/dibdrv/graphics.c @@ -0,0 +1,47 @@ +/* + * DIB driver graphics operations. + * + * Copyright 2011 Huw Davies + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "gdi_private.h" +#include "dibdrv.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(dib); + +/*********************************************************************** + * dibdrv_LineTo + */ +BOOL CDECL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) +{ + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pLineTo ); + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + POINT pts[2]; + + GetCurrentPositionEx(dev->hdc, pts); + pts[1].x = x; + pts[1].y = y; + + LPtoDP(dev->hdc, pts, 2); + + if(pdev->defer || !pdev->pen_line(pdev, pts, pts + 1)) + return next->funcs->pLineTo( next, x, y ); + + return TRUE; +} diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 88c9581..a26785a 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -89,6 +89,54 @@ void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) *xor = (color & rop2_xor_array[rop-1][0]) | ((~color) & rop2_xor_array[rop-1][1]); } +static inline void order_end_points(int *s, int *e) +{ + if(*s > *e) + { + int tmp; + tmp = *s + 1; + *s = *e + 1; + *e = tmp; + } +} + +static inline BOOL pt_in_rect( const RECT *rect, POINT pt ) +{ + return ((pt.x >= rect->left) && (pt.x < rect->right) && + (pt.y >= rect->top) && (pt.y < rect->bottom)); +} + +static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) +{ + RECT rc; + DC *dc = get_dibdrv_dc( &pdev->dev ); + + if(get_clip_region(dc) || !pt_in_rect(&dc->vis_rect, *start) || !pt_in_rect(&dc->vis_rect, *end)) + return FALSE; + + rc.left = start->x; + rc.top = start->y; + rc.right = end->x; + rc.bottom = end->y; + + if(rc.top == rc.bottom) + { + order_end_points(&rc.left, &rc.right); + rc.bottom++; + pdev->dib.funcs->solid_rects(&pdev->dib, 1, &rc, pdev->pen_and, pdev->pen_xor); + return TRUE; + } + else if(rc.left == rc.right) + { + order_end_points(&rc.top, &rc.bottom); + rc.right++; + pdev->dib.funcs->solid_rects(&pdev->dib, 1, &rc, pdev->pen_and, pdev->pen_xor); + return TRUE; + } + + return FALSE; +} + /*********************************************************************** * dibdrv_SelectPen */ @@ -133,6 +181,7 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) case PS_SOLID: if(logpen.lopnStyle & PS_GEOMETRIC) break; if(logpen.lopnWidth.x > 1) break; + pdev->pen_line = solid_pen_line; pdev->defer &= ~DEFER_PEN; break; default: diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 9a81afd..fc86b32 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -101,6 +101,7 @@ typedef struct dibdrv_physdev /* pen */ DWORD pen_color, pen_and, pen_xor; + BOOL (* pen_line)(struct dibdrv_physdev *pdev, POINT *start, POINT *end); } dibdrv_physdev; #define DEFER_FORMAT 1 @@ -399,6 +400,14 @@ extern INT BITMAP_GetWidthBytes( INT bmWidth, INT bpp ) DECLSPEC_HIDDEN; /* clipping.c */ extern void CLIPPING_UpdateGCRegion( DC * dc ) DECLSPEC_HIDDEN; +/* Return the total clip region (if any) */ +static inline HRGN get_clip_region( DC * dc ) +{ + if (dc->hMetaClipRgn) return dc->hMetaClipRgn; + if (dc->hMetaRgn) return dc->hMetaRgn; + return dc->hClipRgn; +} + /* dc.c */ extern DC *alloc_dc_ptr( WORD magic ) DECLSPEC_HIDDEN; extern void free_dc_ptr( DC *dc ) DECLSPEC_HIDDEN;

1 0

Huw Davies : gdi32: Calculate AND and XOR masks corresponding to the current pen colour and rop2 .
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: d5d46030624abde05cdde89b0616143dff90278b URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5d46030624abde05cdde89b0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 7 13:48:39 2011 +0100 gdi32: Calculate AND and XOR masks corresponding to the current pen colour and rop2. --- dlls/gdi32/dibdrv/dc.c | 15 +++++++++- dlls/gdi32/dibdrv/dibdrv.h | 2 + dlls/gdi32/dibdrv/objects.c | 68 +++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 2 +- 4 files changed, 85 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 806f089..1a16260 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -128,6 +128,19 @@ static HBITMAP CDECL dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) return next->funcs->pSelectBitmap( next, bitmap ); } +/*********************************************************************** + * dibdrv_SetROP2 + */ +static INT CDECL dibdrv_SetROP2( PHYSDEV dev, INT rop ) +{ + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetROP2 ); + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + + calc_and_xor_masks(rop, pdev->pen_color, &pdev->pen_and, &pdev->pen_xor); + + return next->funcs->pSetROP2( next, rop ); +} + const DC_FUNCTIONS dib_driver = { NULL, /* pAbortDoc */ @@ -228,7 +241,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pSetPixel */ NULL, /* pSetPixelFormat */ NULL, /* pSetPolyFillMode */ - NULL, /* pSetROP2 */ + dibdrv_SetROP2, /* pSetROP2 */ NULL, /* pSetRelAbs */ NULL, /* pSetStretchBltMode */ NULL, /* pSetTextAlign */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index d33bf88..2620e38 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -35,3 +35,5 @@ typedef struct primitive_funcs extern const primitive_funcs funcs_8888 DECLSPEC_HIDDEN; extern const primitive_funcs funcs_32 DECLSPEC_HIDDEN; extern const primitive_funcs funcs_null DECLSPEC_HIDDEN; + +extern void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 02df7cf..88c9581 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -25,6 +25,70 @@ WINE_DEFAULT_DEBUG_CHANNEL(dib); +/* + * + * Decompose the 16 ROP2s into an expression of the form + * + * D = (D & A) ^ X + * + * Where A and X depend only on P (and so can be precomputed). + * + * A X + * + * R2_BLACK 0 0 0 + * R2_NOTMERGEPEN ~(D | P) ~P ~P + * R2_MASKNOTPEN ~P & D ~P 0 + * R2_NOTCOPYPEN ~P 0 ~P + * R2_MASKPENNOT P & ~D P P + * R2_NOT ~D 1 1 + * R2_XORPEN P ^ D 1 P + * R2_NOTMASKPEN ~(P & D) P 1 + * R2_MASKPEN P & D P 0 + * R2_NOTXORPEN ~(P ^ D) 1 ~P + * R2_NOP D 1 0 + * R2_MERGENOTPEN ~P | D P ~P + * R2_COPYPEN P 0 P + * R2_MERGEPENNOT P | ~D ~P 1 + * R2_MERGEPEN P | D ~P P + * R2_WHITE 1 0 1 + * + */ + +/* A = (P & A1) | (~P & A2) */ +#define ZERO {0, 0} +#define ONE {0xffffffff, 0xffffffff} +#define P {0xffffffff, 0} +#define NOT_P {0, 0xffffffff} + +static const DWORD rop2_and_array[16][2] = +{ + ZERO, NOT_P, NOT_P, ZERO, + P, ONE, ONE, P, + P, ONE, ONE, P, + ZERO, NOT_P, NOT_P, ZERO +}; + +/* X = (P & X1) | (~P & X2) */ +static const DWORD rop2_xor_array[16][2] = +{ + ZERO, NOT_P, ZERO, NOT_P, + P, ONE, P, ONE, + ZERO, NOT_P, ZERO, NOT_P, + P, ONE, P, ONE +}; + +#undef NOT_P +#undef P +#undef ONE +#undef ZERO + +void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) +{ + /* NB The ROP2 codes start at one and the arrays are zero-based */ + *and = (color & rop2_and_array[rop-1][0]) | ((~color) & rop2_and_array[rop-1][1]); + *xor = (color & rop2_xor_array[rop-1][0]) | ((~color) & rop2_xor_array[rop-1][1]); +} + /*********************************************************************** * dibdrv_SelectPen */ @@ -60,6 +124,7 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) logpen.lopnColor = GetDCPenColor( dev->hdc ); pdev->pen_color = pdev->dib.funcs->colorref_to_pixel(&pdev->dib, logpen.lopnColor); + calc_and_xor_masks(GetROP2(dev->hdc), pdev->pen_color, &pdev->pen_and, &pdev->pen_xor); pdev->defer |= DEFER_PEN; @@ -86,7 +151,10 @@ COLORREF CDECL dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) dibdrv_physdev *pdev = get_dibdrv_pdev(dev); if (GetCurrentObject(dev->hdc, OBJ_PEN) == GetStockObject( DC_PEN )) + { pdev->pen_color = pdev->dib.funcs->colorref_to_pixel(&pdev->dib, color); + calc_and_xor_masks(GetROP2(dev->hdc), pdev->pen_color, &pdev->pen_and, &pdev->pen_xor); + } return next->funcs->pSetDCPenColor( next, color ); } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 79fdb26..9a81afd 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -100,7 +100,7 @@ typedef struct dibdrv_physdev DWORD defer; /* pen */ - DWORD pen_color; + DWORD pen_color, pen_and, pen_xor; } dibdrv_physdev; #define DEFER_FORMAT 1

1 0

Huw Davies : gdi32: Add support for DC pens.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 15ef394159790eadbc7ba7ba178b6f5d28006c1b URL: http://source.winehq.org/git/wine.git/?a=commit;h=15ef394159790eadbc7ba7ba1… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 7 13:47:59 2011 +0100 gdi32: Add support for DC pens. --- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/objects.c | 17 +++++++++++++++++ 3 files changed, 19 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index d24ef37..806f089 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -216,7 +216,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pSetBkColor */ NULL, /* pSetBkMode */ NULL, /* pSetDCBrushColor */ - NULL, /* pSetDCPenColor */ + dibdrv_SetDCPenColor, /* pSetDCPenColor */ NULL, /* pSetDIBColorTable */ NULL, /* pSetDIBits */ NULL, /* pSetDIBitsToDevice */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 766ca6c..d33bf88 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -19,6 +19,7 @@ */ extern HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; +extern COLORREF CDECL dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) DECLSPEC_HIDDEN; static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) { diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index c9862dc..02df7cf 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -56,6 +56,9 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) HeapFree( GetProcessHeap(), 0, elp ); } + if (hpen == GetStockObject( DC_PEN )) + logpen.lopnColor = GetDCPenColor( dev->hdc ); + pdev->pen_color = pdev->dib.funcs->colorref_to_pixel(&pdev->dib, logpen.lopnColor); pdev->defer |= DEFER_PEN; @@ -73,3 +76,17 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) return next->funcs->pSelectPen( next, hpen ); } + +/*********************************************************************** + * dibdrv_SetDCPenColor + */ +COLORREF CDECL dibdrv_SetDCPenColor( PHYSDEV dev, COLORREF color ) +{ + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSetDCPenColor ); + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + + if (GetCurrentObject(dev->hdc, OBJ_PEN) == GetStockObject( DC_PEN )) + pdev->pen_color = pdev->dib.funcs->colorref_to_pixel(&pdev->dib, color); + + return next->funcs->pSetDCPenColor( next, color ); +}

1 0

← Newer
1
...
54
55
56
57
58
59
60
...
94
Older →

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 April 2011