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

Henri Verbeet : d3d9/tests: Add a test for partial depth buffer copies.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: f212a56819f5c6b51f3c021b5618d40e5688d320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f212a56819f5c6b51f3c021b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 4 17:46:04 2011 +0200 d3d9/tests: Add a test for partial depth buffer copies. --- dlls/d3d9/tests/visual.c | 97 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 97 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 54aa586..2a31c5c 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -10831,6 +10831,102 @@ static void depth_buffer_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); } +/* Test that partial depth copies work the way they're supposed to. The clear + * on rt2 only needs a partial copy of the onscreen depth/stencil buffer, and + * the following draw should only copy back the part that was modified. */ +static void depth_buffer2_test(IDirect3DDevice9 *device) +{ + static const struct vertex quad[] = + { + { -1.0, 1.0, 0.66f, 0xffff0000}, + { 1.0, 1.0, 0.66f, 0xffff0000}, + { -1.0, -1.0, 0.66f, 0xffff0000}, + { 1.0, -1.0, 0.66f, 0xffff0000}, + }; + + IDirect3DSurface9 *backbuffer, *rt1, *rt2; + unsigned int i, j; + D3DVIEWPORT9 vp; + D3DCOLOR color; + HRESULT hr; + + vp.X = 0; + vp.Y = 0; + vp.Width = 640; + vp.Height = 480; + vp.MinZ = 0.0; + vp.MaxZ = 1.0; + + hr = IDirect3DDevice9_SetViewport(device, &vp); + ok(SUCCEEDED(hr), "SetViewport failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, TRUE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZFUNC, D3DCMP_LESSEQUAL); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(SUCCEEDED(hr), "SetFVF failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, FALSE, &rt1, NULL); + ok(SUCCEEDED(hr), "CreateRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_CreateRenderTarget(device, 480, 360, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, FALSE, &rt2, NULL); + ok(SUCCEEDED(hr), "CreateRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetRenderTarget(device, 0, &backbuffer); + ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt1); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff0000ff, 1.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ff00, 0.5f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt2); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xffffffff, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, backbuffer); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + IDirect3DSurface9_Release(backbuffer); + IDirect3DSurface9_Release(rt2); + IDirect3DSurface9_Release(rt1); + + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, FALSE); + ok(SUCCEEDED(hr), "SetRenderState failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + for (i = 0; i < 4; ++i) + { + for (j = 0; j < 4; ++j) + { + unsigned int x = 80 * ((2 * j) + 1); + unsigned int y = 60 * ((2 * i) + 1); + color = getPixelColor(device, x, y); + ok(color_match(color, D3DCOLOR_ARGB(0x00, 0x00, 0xff, 0x00), 0), + "Expected color 0x0000ff00 at %u,%u, got 0x%08x.\n", x, y, color); + } + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); +} + static void intz_test(IDirect3DDevice9 *device) { static const DWORD ps_code[] = @@ -11930,6 +12026,7 @@ START_TEST(visual) alphareplicate_test(device_ptr); dp3_alpha_test(device_ptr); depth_buffer_test(device_ptr); + depth_buffer2_test(device_ptr); intz_test(device_ptr); shadow_test(device_ptr); fp_special_test(device_ptr);

1 0

Henri Verbeet : wined3d: Correctly check if the destination format is FBO attachable in fbo_blit_supported ().
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: b372faec3c2d91325e41969cb4252d84792422a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b372faec3c2d91325e41969cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Apr 4 17:46:05 2011 +0200 wined3d: Correctly check if the destination format is FBO attachable in fbo_blit_supported(). Like ca381b610c50e3a44713f536ced61e30e0e4f152, this was introduced by f1ca14cb5ba259b8eab9bccbb9a4813027c3beb8. --- dlls/wined3d/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index bbbdd49..88210bb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4983,7 +4983,7 @@ static BOOL fbo_blit_supported(const struct wined3d_gl_info *gl_info, enum blit_ return FALSE; if (!((src_format->flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) || (src_usage & WINED3DUSAGE_RENDERTARGET)) - && ((dst_format->flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) || (dst_usage & WINED3DUSAGE_RENDERTARGET))) + || !((dst_format->flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) || (dst_usage & WINED3DUSAGE_RENDERTARGET))) return FALSE; if (!(src_format->id == dst_format->id

1 0

Juan Lang : crypt32: Accept CA certificates without a key usage extension.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: 7871a9f85880e3bbe74d6b9ed614719210e0bfba URL: http://source.winehq.org/git/wine.git/?a=commit;h=7871a9f85880e3bbe74d6b9ed… Author: Juan Lang <juan.lang(a)gmail.com> Date: Mon Apr 4 09:03:28 2011 -0700 crypt32: Accept CA certificates without a key usage extension. --- dlls/crypt32/chain.c | 26 +++++--------------------- 1 files changed, 5 insertions(+), 21 deletions(-) diff --git a/dlls/crypt32/chain.c b/dlls/crypt32/chain.c index ca76cef..8af49f4 100644 --- a/dlls/crypt32/chain.c +++ b/dlls/crypt32/chain.c @@ -1760,28 +1760,12 @@ static BOOL CRYPT_KeyUsageValid(PCertificateChainEngine engine, * extensions as CA certs. V1 and V2 certificates did not have * extensions, and many root certificates are V1 certificates, so * perhaps this is prudent. On the other hand, MS also accepts V3 - * certs without key usage extensions. We are more restrictive: - * we accept locally installed V1 or V2 certs as CA certs. - * We also accept a lack of key usage extension on root certs, - * which is implied in RFC 5280, section 6.1: the trust anchor's - * only requirement is that it was used to issue the next - * certificate in the chain. + * certs without key usage extensions. Because some CAs, e.g. + * Certum, also do not include key usage extensions in their + * intermediate certificates, we are forced to accept V3 + * certificates without key usage extensions as well. */ - if (isRoot) - ret = TRUE; - else if (cert->pCertInfo->dwVersion == CERT_V1 || - cert->pCertInfo->dwVersion == CERT_V2) - { - PCCERT_CONTEXT localCert = CRYPT_FindCertInStore( - engine->hWorld, cert); - - ret = localCert != NULL; - CertFreeCertificateContext(localCert); - } - else - ret = FALSE; - if (!ret) - WARN_(chain)("no key usage extension on a CA cert\n"); + ret = TRUE; } else {

1 0

Jacek Caban : mshtml: Get rid of no longer needed app-startup observer initialization.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: bf163d79b811041490472c0736e71e6762db9c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf163d79b811041490472c073… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 4 19:32:35 2011 +0200 mshtml: Get rid of no longer needed app-startup observer initialization. --- dlls/mshtml/nsembed.c | 18 +----------------- dlls/mshtml/nsiface.idl | 11 +---------- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index c2332e0..7b7a84f 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -46,8 +46,6 @@ WINE_DECLARE_DEBUG_CHANNEL(gecko); #define NS_EDITORCONTROLLER_CONTRACTID "@mozilla.org/editor/editorcontroller;1" #define NS_PREFERENCES_CONTRACTID "@mozilla.org/preferences;1" -#define APPSTARTUP_TOPIC "app-startup" - #define PR_UINT32_MAX 0xffffffff #define NS_STRING_CONTAINER_INIT_DEPEND 0x0002 @@ -559,12 +557,11 @@ static void set_preferences(void) static BOOL init_xpcom(const PRUnichar *gre_path) { - nsresult nsres; - nsIObserver *pStartNotif; nsIComponentRegistrar *registrar = NULL; nsAString path; nsIFile *gre_dir; WCHAR *ptr; + nsresult nsres; nsAString_InitDepend(&path, gre_path); nsres = NS_NewLocalFile(&path, FALSE, &gre_dir); @@ -600,19 +597,6 @@ static BOOL init_xpcom(const PRUnichar *gre_path) ERR("NS_GetComponentRegistrar failed: %08x\n", nsres); init_mutation(pCompMgr); - - nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_APPSTARTUPNOTIFIER_CONTRACTID, - NULL, &IID_nsIObserver, (void**)&pStartNotif); - if(NS_SUCCEEDED(nsres)) { - nsres = nsIObserver_Observe(pStartNotif, NULL, APPSTARTUP_TOPIC, NULL); - if(NS_FAILED(nsres)) - ERR("Observe failed: %08x\n", nsres); - - nsIObserver_Release(pStartNotif); - }else { - ERR("could not get appstartup-notifier: %08x\n", nsres); - } - set_preferences(); nsres = nsIComponentManager_CreateInstanceByContractID(pCompMgr, NS_MEMORY_CONTRACTID, diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index b6367b4..9d682f0 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -153,6 +153,7 @@ typedef nsISupports nsIPluginStreamListener; typedef nsISupports nsIContentSink; typedef nsISupports nsIParserFilter; typedef nsISupports nsIDTD; +typedef nsISupports nsIObserver; [ object, @@ -180,16 +181,6 @@ interface nsIFactory : nsISupports [ object, - uuid(db242e01-e4d9-11d2-9dde-000064657374), - local -] -interface nsIObserver : nsISupports -{ - nsresult Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *aData); -} - -[ - object, uuid(a88e5a60-205a-4bb1-94e1-2628daf51eae), local ]

1 0

Vincent Povirk : gdiplus: Add helper for translating GpFont to HFONT.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: 32baa8ba4e5e17b8f360d01ae14c4e161ef67dff URL: http://source.winehq.org/git/wine.git/?a=commit;h=32baa8ba4e5e17b8f360d01ae… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 4 14:00:56 2011 -0500 gdiplus: Add helper for translating GpFont to HFONT. --- dlls/gdiplus/gdiplus_private.h | 2 + dlls/gdiplus/graphics.c | 93 ++++++++++++++++++++-------------------- 2 files changed, 49 insertions(+), 46 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index c0b10e7..380c22d 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -58,6 +58,8 @@ extern void calc_curve_bezier_endp(REAL xend, REAL yend, REAL xadj, REAL yadj, extern void free_installed_fonts(void); +extern void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, HFONT *hfont); + extern BOOL lengthen_path(GpPath *path, INT len); extern GpStatus trace_path(GpGraphics *graphics, GpPath *path); diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index cecc880..f26561a 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1654,6 +1654,45 @@ end: return stat; } +void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, HFONT *hfont) +{ + HDC hdc = CreateCompatibleDC(0); + GpPointF pt[3]; + REAL angle, rel_width, rel_height; + LOGFONTW lfw; + HFONT unscaled_font; + TEXTMETRICW textmet; + + pt[0].X = 0.0; + pt[0].Y = 0.0; + pt[1].X = 1.0; + pt[1].Y = 0.0; + pt[2].X = 0.0; + pt[2].Y = 1.0; + if (graphics) + GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 3); + angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); + rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ + (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); + rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ + (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); + + unscaled_font = CreateFontIndirectW(&font->lfw); + + SelectObject(hdc, unscaled_font); + GetTextMetricsW(hdc, &textmet); + + lfw = font->lfw; + lfw.lfHeight = roundr(((REAL)lfw.lfHeight) * rel_height); + lfw.lfWidth = roundr(textmet.tmAveCharWidth * rel_width); + lfw.lfEscapement = lfw.lfOrientation = roundr((angle / M_PI) * 1800.0); + + *hfont = CreateFontIndirectW(&lfw); + + DeleteDC(hdc); + DeleteObject(unscaled_font); +} + GpStatus WINGDIPAPI GdipCreateFromHDC(HDC hdc, GpGraphics **graphics) { TRACE("(%p, %p)\n", hdc, graphics); @@ -4581,8 +4620,6 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string { HRGN rgn = NULL; HFONT gdifont; - LOGFONTW lfw; - TEXTMETRICW textmet; GpPointF pt[3], rectcpy[4]; POINT corners[4]; REAL angle, rel_width, rel_height; @@ -4660,19 +4697,8 @@ GpStatus WINGDIPAPI GdipDrawString(GpGraphics *graphics, GDIPCONST WCHAR *string SelectClipRgn(graphics->hdc, rgn); } - /* Use gdi to find the font, then perform transformations on it (height, - * width, angle). */ - SelectObject(graphics->hdc, CreateFontIndirectW(&font->lfw)); - GetTextMetricsW(graphics->hdc, &textmet); - lfw = font->lfw; - - lfw.lfHeight = roundr(((REAL)lfw.lfHeight) * rel_height); - lfw.lfWidth = roundr(textmet.tmAveCharWidth * rel_width); - - lfw.lfEscapement = lfw.lfOrientation = roundr((angle / M_PI) * 1800.0); - - gdifont = CreateFontIndirectW(&lfw); - DeleteObject(SelectObject(graphics->hdc, gdifont)); + get_font_hfont(graphics, font, &gdifont); + SelectObject(graphics->hdc, gdifont); if (!format || format->align == StringAlignmentNear) { @@ -5594,11 +5620,8 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 { static const INT unsupported_flags = ~(DriverStringOptionsRealizedAdvance); INT save_state; - GpPointF pt[4]; - REAL angle, rel_width, rel_height; - LOGFONTW lfw; - HFONT unscaled_font, hfont; - TEXTMETRICW textmet; + GpPointF pt; + HFONT hfont; if (flags & unsupported_flags) FIXME("Ignoring flags %x\n", flags & unsupported_flags); @@ -5610,37 +5633,15 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 SetBkMode(graphics->hdc, TRANSPARENT); SetTextColor(graphics->hdc, brush->lb.lbColor); - pt[0].X = 0.0; - pt[0].Y = 0.0; - pt[1].X = 1.0; - pt[1].Y = 0.0; - pt[2].X = 0.0; - pt[2].Y = 1.0; - pt[3] = positions[0]; - GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, pt, 4); - angle = -gdiplus_atan2((pt[1].Y - pt[0].Y), (pt[1].X - pt[0].X)); - rel_width = sqrt((pt[1].Y-pt[0].Y)*(pt[1].Y-pt[0].Y)+ - (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X)); - rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ - (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); - - unscaled_font = CreateFontIndirectW(&font->lfw); + pt = positions[0]; + GdipTransformPoints(graphics, CoordinateSpaceDevice, CoordinateSpaceWorld, &pt, 1); - SelectObject(graphics->hdc, unscaled_font); - GetTextMetricsW(graphics->hdc, &textmet); - - lfw = font->lfw; - lfw.lfHeight = roundr(((REAL)lfw.lfHeight) * rel_height); - lfw.lfWidth = roundr(textmet.tmAveCharWidth * rel_width); - lfw.lfEscapement = lfw.lfOrientation = roundr((angle / M_PI) * 1800.0); - - hfont = CreateFontIndirectW(&lfw); + get_font_hfont(graphics, font, &hfont); SelectObject(graphics->hdc, hfont); - DeleteObject(unscaled_font); SetTextAlign(graphics->hdc, TA_BASELINE|TA_LEFT); - ExtTextOutW(graphics->hdc, roundr(pt[3].X), roundr(pt[3].Y), ETO_GLYPH_INDEX, NULL, text, length, NULL); + ExtTextOutW(graphics->hdc, roundr(pt.X), roundr(pt.Y), ETO_GLYPH_INDEX, NULL, text, length, NULL); RestoreDC(graphics->hdc, save_state);

1 0

Vincent Povirk : gdiplus: Add a software implementation of GdipDrawDriverString.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: be0af56be3ba2f6e03b22ed747ebcd5500e74ed0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be0af56be3ba2f6e03b22ed74… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 4 16:40:00 2011 -0500 gdiplus: Add a software implementation of GdipDrawDriverString. --- dlls/gdiplus/graphics.c | 188 ++++++++++++++++++++++++++++++++++++++++- dlls/gdiplus/tests/graphics.c | 2 - 2 files changed, 187 insertions(+), 3 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index f26561a..d7cc644 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5650,6 +5650,191 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 return Ok; } +static GpStatus SOFTWARE_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT16 *text, INT length, + GDIPCONST GpFont *font, GDIPCONST GpBrush *brush, + GDIPCONST PointF *positions, INT flags, + GDIPCONST GpMatrix *matrix ) +{ + static const INT unsupported_flags = ~(DriverStringOptionsCmapLookup); + GpStatus stat; + PointF *real_positions; + POINT *pti; + HFONT hfont; + HDC hdc; + int min_x=INT_MAX, min_y=INT_MAX, max_x=INT_MIN, max_y=INT_MIN, i, x, y; + DWORD max_glyphsize=0; + GLYPHMETRICS glyphmetrics; + static const MAT2 identity = {{0,1}, {0,0}, {0,0}, {0,1}}; + BYTE *glyph_mask; + BYTE *text_mask; + int text_mask_stride; + BYTE *pixel_data; + int pixel_data_stride; + GpRect pixel_area; + UINT ggo_flags = GGO_GRAY8_BITMAP; + + if (length <= 0) + return Ok; + + if (flags & DriverStringOptionsRealizedAdvance) + { + FIXME("Not implemented for DriverStringOptionsRealizedAdvance\n"); + return NotImplemented; + } + + if (!(flags & DriverStringOptionsCmapLookup)) + ggo_flags |= GGO_GLYPH_INDEX; + + if (flags & unsupported_flags) + FIXME("Ignoring flags %x\n", flags & unsupported_flags); + + if (matrix) + FIXME("Ignoring matrix\n"); + + real_positions = GdipAlloc(sizeof(PointF) * length); + if (!real_positions) + return OutOfMemory; + + pti = GdipAlloc(sizeof(POINT) * length); + if (!pti) + { + GdipFree(real_positions); + return OutOfMemory; + } + + memcpy(real_positions, positions, sizeof(PointF) * length); + + transform_and_round_points(graphics, pti, real_positions, length); + + GdipFree(real_positions); + + get_font_hfont(graphics, font, &hfont); + + hdc = CreateCompatibleDC(0); + SelectObject(hdc, hfont); + + /* Get the boundaries of the text to be drawn */ + for (i=0; i<length; i++) + { + DWORD glyphsize; + int left, top, right, bottom; + + glyphsize = GetGlyphOutlineW(hdc, text[i], ggo_flags, + &glyphmetrics, 0, NULL, &identity); + + if (glyphsize == GDI_ERROR) + { + ERR("GetGlyphOutlineW failed\n"); + GdipFree(pti); + DeleteDC(hdc); + DeleteObject(hfont); + return GenericError; + } + + if (glyphsize > max_glyphsize) + max_glyphsize = glyphsize; + + left = pti[i].x - glyphmetrics.gmptGlyphOrigin.x; + top = pti[i].y - glyphmetrics.gmptGlyphOrigin.y; + right = pti[i].x - glyphmetrics.gmptGlyphOrigin.x + glyphmetrics.gmBlackBoxX; + bottom = pti[i].y - glyphmetrics.gmptGlyphOrigin.y + glyphmetrics.gmBlackBoxY; + + if (left < min_x) min_x = left; + if (top < min_y) min_y = top; + if (right > max_x) max_x = right; + if (bottom > max_y) max_y = bottom; + } + + glyph_mask = GdipAlloc(max_glyphsize); + text_mask = GdipAlloc((max_x - min_x) * (max_y - min_y)); + text_mask_stride = max_x - min_x; + + if (!(glyph_mask && text_mask)) + { + GdipFree(glyph_mask); + GdipFree(text_mask); + GdipFree(pti); + DeleteDC(hdc); + DeleteObject(hfont); + return OutOfMemory; + } + + /* Generate a mask for the text */ + for (i=0; i<length; i++) + { + int left, top, stride; + + GetGlyphOutlineW(hdc, text[i], ggo_flags, + &glyphmetrics, max_glyphsize, glyph_mask, &identity); + + left = pti[i].x - glyphmetrics.gmptGlyphOrigin.x; + top = pti[i].y - glyphmetrics.gmptGlyphOrigin.y; + stride = (glyphmetrics.gmBlackBoxX + 3) & (~3); + + for (y=0; y<glyphmetrics.gmBlackBoxY; y++) + { + BYTE *glyph_val = glyph_mask + y * stride; + BYTE *text_val = text_mask + (left - min_x) + (top - min_y + y) * text_mask_stride; + for (x=0; x<glyphmetrics.gmBlackBoxX; x++) + { + *text_val = min(64, *text_val + *glyph_val); + glyph_val++; + text_val++; + } + } + } + + GdipFree(pti); + DeleteDC(hdc); + DeleteObject(hfont); + GdipFree(glyph_mask); + + /* get the brush data */ + pixel_data = GdipAlloc(4 * (max_x - min_x) * (max_y - min_y)); + if (!pixel_data) + { + GdipFree(text_mask); + return OutOfMemory; + } + + pixel_area.X = min_x; + pixel_area.Y = min_y; + pixel_area.Width = max_x - min_x; + pixel_area.Height = max_y - min_y; + pixel_data_stride = pixel_area.Width * 4; + + stat = brush_fill_pixels(graphics, (GpBrush*)brush, (DWORD*)pixel_data, &pixel_area, pixel_area.Width); + if (stat != Ok) + { + GdipFree(text_mask); + GdipFree(pixel_data); + return stat; + } + + /* multiply the brush data by the mask */ + for (y=0; y<pixel_area.Height; y++) + { + BYTE *text_val = text_mask + text_mask_stride * y; + BYTE *pixel_val = pixel_data + pixel_data_stride * y + 3; + for (x=0; x<pixel_area.Width; x++) + { + *pixel_val = (*pixel_val) * (*text_val) / 64; + text_val++; + pixel_val+=4; + } + } + + GdipFree(text_mask); + + /* draw the result */ + stat = alpha_blend_pixels(graphics, min_x, min_y, pixel_data, pixel_area.Width, + pixel_area.Height, pixel_data_stride); + + GdipFree(pixel_data); + + return stat; +} + /***************************************************************************** * GdipDrawDriverString [GDIPLUS.@] */ @@ -5676,7 +5861,8 @@ GpStatus WINGDIPAPI GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT16 positions, flags, matrix); if (stat == NotImplemented) - FIXME("Not fully implemented\n"); + stat = SOFTWARE_GdipDrawDriverString(graphics, text, length, font, brush, + positions, flags, matrix); return stat; } diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 9f5449a..28414cc 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2005,7 +2005,6 @@ static void test_GdipDrawString(void) status = GdipDrawDriverString(graphics, string, 4, fnt, brush, NULL, DriverStringOptionsCmapLookup, matrix); expect(InvalidParameter, status); -todo_wine { status = GdipDrawDriverString(graphics, string, 4, fnt, brush, positions, DriverStringOptionsCmapLookup|0x10, matrix); expect(Ok, status); @@ -2014,7 +2013,6 @@ todo_wine { status = GdipDrawDriverString(graphics, string, 4, fnt, brush, positions, DriverStringOptionsCmapLookup, matrix); expect(Ok, status); -} GdipDeleteMatrix(matrix); GdipDeleteGraphics(graphics);

1 0

Vincent Povirk : gdiplus: Don' t settle on a font size until absolutely necessary.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: 11f0662c60efe8f9fdbbafaf920000d15f4846b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11f0662c60efe8f9fdbbafaf9… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 4 17:18:23 2011 -0500 gdiplus: Don't settle on a font size until absolutely necessary. When we create a new font, we should store its height in a REAL field so we don't have to round it. Further, when we calculate the width, we should base the calculation on the metrics of a font at the height we will use, to prevent rounding errors when the graphics transform will enlarge the font. --- dlls/gdiplus/font.c | 18 +++++++++--------- dlls/gdiplus/gdiplus_private.h | 1 + dlls/gdiplus/graphics.c | 8 +++++--- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 54accd7..3624391 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -126,27 +126,27 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, { case UnitWorld: /* FIXME: Figure out when World != Pixel */ - lfw->lfHeight = emSize; break; + (*font)->pixel_size = emSize; break; case UnitDisplay: FIXME("Unknown behavior for UnitDisplay! Please report!\n"); /* FIXME: Figure out how this works... * MSDN says that if "DISPLAY" is a monitor, then pixel should be * used. That's not what I got. Tests on Windows revealed no output, * and the tests in tests/font crash windows */ - lfw->lfHeight = 0; break; + (*font)->pixel_size = 0; break; case UnitPixel: - lfw->lfHeight = emSize; break; + (*font)->pixel_size = emSize; break; case UnitPoint: - lfw->lfHeight = point_to_pixel(emSize); break; + (*font)->pixel_size = point_to_pixel(emSize); break; case UnitInch: - lfw->lfHeight = inch_to_pixel(emSize); break; + (*font)->pixel_size = inch_to_pixel(emSize); break; case UnitDocument: - lfw->lfHeight = document_to_pixel(emSize); break; + (*font)->pixel_size = document_to_pixel(emSize); break; case UnitMillimeter: - lfw->lfHeight = mm_to_pixel(emSize); break; + (*font)->pixel_size = mm_to_pixel(emSize); break; } - lfw->lfHeight *= -1; + lfw->lfHeight = (*font)->pixel_size * -1; lfw->lfWeight = style & FontStyleBold ? 700 : 400; lfw->lfItalic = style & FontStyleItalic; @@ -190,7 +190,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, (*font)->lfw.lfUnderline = logfont->lfUnderline; (*font)->lfw.lfStrikeOut = logfont->lfStrikeOut; - (*font)->emSize = logfont->lfHeight; + (*font)->pixel_size = (*font)->emSize = logfont->lfHeight; (*font)->unit = UnitPixel; hfont = CreateFontIndirectW(&(*font)->lfw); diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 380c22d..1629ae6 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -323,6 +323,7 @@ struct GpImageAttributes{ struct GpFont{ LOGFONTW lfw; REAL emSize; + REAL pixel_size; UINT height; LONG line_spacing; Unit unit; diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index d7cc644..5ba3a4f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1677,14 +1677,16 @@ void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font, HFONT *hfont) rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+ (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X)); - unscaled_font = CreateFontIndirectW(&font->lfw); + lfw = font->lfw; + lfw.lfHeight = roundr(-font->pixel_size * rel_height); + unscaled_font = CreateFontIndirectW(&lfw); SelectObject(hdc, unscaled_font); GetTextMetricsW(hdc, &textmet); lfw = font->lfw; - lfw.lfHeight = roundr(((REAL)lfw.lfHeight) * rel_height); - lfw.lfWidth = roundr(textmet.tmAveCharWidth * rel_width); + lfw.lfHeight = roundr(-font->pixel_size * rel_height); + lfw.lfWidth = roundr(textmet.tmAveCharWidth * rel_width / rel_height); lfw.lfEscapement = lfw.lfOrientation = roundr((angle / M_PI) * 1800.0); *hfont = CreateFontIndirectW(&lfw);

1 0

Vincent Povirk : gdiplus: Respect the CmapLookup flag in GDI32_GdipDrawDriverString.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: 64841aac838a9327af134aa613943ae930b652c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64841aac838a9327af134aa61… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Apr 4 17:48:31 2011 -0500 gdiplus: Respect the CmapLookup flag in GDI32_GdipDrawDriverString. --- dlls/gdiplus/graphics.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 5ba3a4f..336929f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5620,10 +5620,11 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 GDIPCONST PointF *positions, INT flags, GDIPCONST GpMatrix *matrix ) { - static const INT unsupported_flags = ~(DriverStringOptionsRealizedAdvance); + static const INT unsupported_flags = ~(DriverStringOptionsRealizedAdvance|DriverStringOptionsCmapLookup); INT save_state; GpPointF pt; HFONT hfont; + UINT eto_flags=0; if (flags & unsupported_flags) FIXME("Ignoring flags %x\n", flags & unsupported_flags); @@ -5631,6 +5632,9 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 if (matrix) FIXME("Ignoring matrix\n"); + if (!(flags & DriverStringOptionsCmapLookup)) + eto_flags |= ETO_GLYPH_INDEX; + save_state = SaveDC(graphics->hdc); SetBkMode(graphics->hdc, TRANSPARENT); SetTextColor(graphics->hdc, brush->lb.lbColor); @@ -5643,7 +5647,7 @@ static GpStatus GDI32_GdipDrawDriverString(GpGraphics *graphics, GDIPCONST UINT1 SetTextAlign(graphics->hdc, TA_BASELINE|TA_LEFT); - ExtTextOutW(graphics->hdc, roundr(pt.X), roundr(pt.Y), ETO_GLYPH_INDEX, NULL, text, length, NULL); + ExtTextOutW(graphics->hdc, roundr(pt.X), roundr(pt.Y), eto_flags, NULL, text, length, NULL); RestoreDC(graphics->hdc, save_state);

1 0

Gerald Pfeifer : quartz: Properly set a parameter by reference in Parser_OutputPin_DecideAllocator.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: a3d8e7b369b244303a94109fcf11c473ad1fc51c URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3d8e7b369b244303a94109fc… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Tue Apr 5 00:48:01 2011 +0200 quartz: Properly set a parameter by reference in Parser_OutputPin_DecideAllocator. --- dlls/quartz/parser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index 354d78f..9d7baa0 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -582,7 +582,7 @@ static HRESULT WINAPI Parser_OutputPin_DecideAllocator(BaseOutputPin *iface, IMe Parser_OutputPin *This = (Parser_OutputPin *)iface; HRESULT hr; - pAlloc = NULL; + *pAlloc = NULL; if (This->alloc) hr = IMemInputPin_NotifyAllocator(pPin, This->alloc, This->readonly);

1 0

Jerome Leclanche : mscms: Move MSCMS_dbgstr_tag outside of the HAVE_LCMS conditional.
by Alexandre Julliard 05 Apr '11

05 Apr '11

Module: wine Branch: master Commit: 41838721fc565ce88aacc67dd78a2a3db0a80352 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41838721fc565ce88aacc67dd… Author: Jerome Leclanche <adys.wh(a)gmail.com> Date: Tue Apr 5 08:44:49 2011 +0100 mscms: Move MSCMS_dbgstr_tag outside of the HAVE_LCMS conditional. --- dlls/mscms/mscms_priv.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mscms/mscms_priv.h b/dlls/mscms/mscms_priv.h index 479148b..e48193e 100644 --- a/dlls/mscms/mscms_priv.h +++ b/dlls/mscms/mscms_priv.h @@ -109,6 +109,6 @@ extern void MSCMS_get_profile_header( const icProfile *iccprofile, PROFILEHEADER extern void MSCMS_set_profile_header( icProfile *iccprofile, const PROFILEHEADER *header ); extern DWORD MSCMS_get_profile_size( const icProfile *iccprofile ); -extern const char *MSCMS_dbgstr_tag(DWORD); - #endif /* HAVE_LCMS */ + +extern const char *MSCMS_dbgstr_tag(DWORD);

1 0