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

Daniel Lehman : gdi32: Don' t add_join if points are coincident in wide_line_segments.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: 2c5d7d716ada49f898bb0d7961ee693654205e27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c5d7d716ada49f898bb0d796… Author: Daniel Lehman <dlehman(a)esri.com> Date: Wed Jan 25 13:47:31 2012 -0800 gdi32: Don't add_join if points are coincident in wide_line_segments. --- dlls/gdi32/dibdrv/objects.c | 16 ++++++++++------ dlls/gdi32/tests/dib.c | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index acb7091..d589f6e 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -1327,7 +1327,7 @@ static void add_join( dibdrv_physdev *pdev, HRGN region, HRGN round_cap, const P return; } -static void wide_line_segment( dibdrv_physdev *pdev, HRGN total, +static int wide_line_segment( dibdrv_physdev *pdev, HRGN total, const POINT *pt_1, const POINT *pt_2, int dx, int dy, BOOL need_cap_1, BOOL need_cap_2, struct face *face_1, struct face *face_2 ) { @@ -1335,7 +1335,7 @@ static void wide_line_segment( dibdrv_physdev *pdev, HRGN total, BOOL sq_cap_1 = need_cap_1 && (pdev->pen_endcap == PS_ENDCAP_SQUARE); BOOL sq_cap_2 = need_cap_2 && (pdev->pen_endcap == PS_ENDCAP_SQUARE); - if (dx == 0 && dy == 0) return; + if (dx == 0 && dy == 0) return 0; if (dy == 0) { @@ -1451,6 +1451,8 @@ static void wide_line_segment( dibdrv_physdev *pdev, HRGN total, face_1->dx = face_2->dx = dx; face_1->dy = face_2->dy = dy; + + return 1; } static void wide_line_segments( dibdrv_physdev *pdev, int num, const POINT *pts, BOOL close, @@ -1486,10 +1488,12 @@ static void wide_line_segments( dibdrv_physdev *pdev, int num, const POINT *pts, { pt_1 = &pts[(start + i) % num]; pt_2 = &pts[(start + i + 1) % num]; - wide_line_segment( pdev, total, pt_1, pt_2, pt_2->x - pt_1->x, pt_2->y - pt_1->y, - FALSE, FALSE, &face_1, &face_2 ); - add_join( pdev, total, round_cap, pt_1, &prev_face, &face_1 ); - prev_face = face_2; + if (wide_line_segment( pdev, total, pt_1, pt_2, pt_2->x - pt_1->x, pt_2->y - pt_1->y, + FALSE, FALSE, &face_1, &face_2 )) + { + add_join( pdev, total, round_cap, pt_1, &prev_face, &face_1 ); + prev_face = face_2; + } } pt_1 = &pts[(start + count - 1) % num]; diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 30b4ad9..b431add 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -139,6 +139,7 @@ static const char *sha1_graphics_a8r8g8b8[] = "657514a4ca1f2b6ca7a125ad58dfed82099a37d1", "5e0549fdcf0fc7c50054dccc51d37fc734ab8134", "eca1998a4d79fb81b2a4103f79e3b846a864eaaf", + "e4acfcf2d001fbc431d9af59ab3d3ca7c2d965e5", "2b3198bd5c0a87db5dab13df8bbe14363d02acec", "f115ef8392ba82d8cd6e7a039320edcd812c1d28", "aebb1b3baa4fd5213bf80a5ad7a50d54de8fdba4", @@ -211,6 +212,7 @@ static const char *sha1_graphics_a8r8g8b8_bitfields[] = "657514a4ca1f2b6ca7a125ad58dfed82099a37d1", "5e0549fdcf0fc7c50054dccc51d37fc734ab8134", "eca1998a4d79fb81b2a4103f79e3b846a864eaaf", + "e4acfcf2d001fbc431d9af59ab3d3ca7c2d965e5", "e4f110504dd3e4e34f960a39ba91a91c67bf26af", "f115ef8392ba82d8cd6e7a039320edcd812c1d28", "aebb1b3baa4fd5213bf80a5ad7a50d54de8fdba4", @@ -283,6 +285,7 @@ static const char *sha1_graphics_a8b8g8r8[] = "9988ceca44dafbee247aece1f027c06c27c01652", "d80d45a97bc877b50ba2c3f720d5197f2f1c5fc5", "b76e0724496e471b01ef8b34f8beba69f5bde261", + "34201d3d3583f89ce3267d3d0c4e01c64463de4b", "693f5c5fbaeaadb5928d34b035499626fecb8394", "8a9aa84c42dedc3e681191a1229846887ed262ec", "66041875232f64dbfd2d18353aa28e43e8ccb6b5", @@ -355,6 +358,7 @@ static const char *sha1_graphics_r10g10b10[] = "ce0fc29bb0281d6c955d64e239254ef9e6dbc06d", "5ab49e7b61eddd3bab4182f362a38e1ab6a5a3b7", "555b6f04ba8dec9e2a60693dcaac594227052727", + "c199b96a71c3aab2d49ccb5b6294bf14eb0dd1eb", "4238fe9d296b5c72b0a8745cc761f308605b2094", "943dc6033ab335a6a63e666f70a6bb3a0677e157", "88b6427cf71a6b9a26bfd6026103d50f721651a9", @@ -427,6 +431,7 @@ static const char *sha1_graphics_r6g6b6[] = "d67b897cad72d31e75359094007b1346fd8806ea", "442bcf4d94a649c9406c3b0bf2f00cb7c6a4d1d4", "3d0853f4f7580d7cd5148c21c34d878ecf39a5f3", + "1e5a4ef7f8634847a251d1fcce298c409fd13d87", "481337fbedf181d4324bf7f8299b0327197ff468", "9ab957870fa4e17aec6a79bc1a4fdb42a5ffcc30", "b4b9f0bf127ef11f510f25684ae21d692609c85e", @@ -499,6 +504,7 @@ static const char *sha1_graphics_24[] = "cf311a96d41bd98fdbdfb5dfaac4ba1ba9b7d6da", "bf5ec23456efe00e1e0931c17de9040ab2092858", "0bbdf0a0489428f96e3c1d3e5305f9a893820852", + "9d86b1b2bbce90efd3c0b9fe20d23ffa3eeecd20", "8f7a0af421101952e674f37154c1e8c4646ea2d2", "e96b79bf88988b5694a04dfc3bd0029361b39801", "d12284f58daabbd173dfae6c7e55fd5d822d89b4", @@ -575,6 +581,7 @@ static const char *sha1_graphics_r5g5b5[] = "1c1499051860b7caa25173b328ca9c862f01dd1a", "a655512753bc90e6d4eb3848f69e96db1ad348e5", "2230f36f12d4becb242e2962fa1b3694db2496ca", + "d81e41a765d7a2d68073f5fde3f74f09df84001d", "0de013c2c6aba9f99cbcf5f8cfd3212ded7ae72a", "5950f7d00cd8692872377df0e869a7d5ea5e4420", "fedc67d1b0797be5f40cd45280844f2b61d29b0a", @@ -646,6 +653,7 @@ static const char *sha1_graphics_r4g4b4[] = "5505d2ed20dc61ffe48832ecf5329162a5ceb734", "9f72be4467219a345b1164205d1fbfda2d64271e", "13d1634e03bc49cfe14a32278d9b1f5ddbb9be10", + "a79e4cc419b9e1735e275e2823da52875536943a", "b0182002cb1f4fba9df3c21a4d046ab41ce7e9be", "3830cd728c1e72837310940bcdac4e294d6c9843", "f571c7c4aac92491017963032194690c0fa06b42", @@ -723,6 +731,7 @@ static const char *sha1_graphics_8_color[] = "2c07272462c68cf5944b03e2aa049475b99143c5", "07ca369fb875d37b9cf855045f528af1827edec4", "5e9e3e71b06c5efe20f93b3838e745b40b878471", + "153ae5c9fc2a31b38c4878b25d9026b9f51f132d", "488341e88810d737de0b26de4e4d4fa0e78eb482", "bd1e7f40e3971e2ff6c5561286901193a1557527", "5a42b7eeff8198e7b005e4afa4282e6ffb939906", @@ -805,6 +814,7 @@ static const char *sha1_graphics_8_grayscale[] = "1918a33f59d3500204ffc573318a39e9ff754221", "5449d1aef0d2d6af9ac3fd7adb32c23ddc9be1e2", "55d302ece31a9b7fc4be4a07a53767ba210273e7", + "a6a29836291f9dbca85e25cee60f62ef5faca6d7", "3494a23633405e46af96cb57715617fef1ac252e", "5a3ae1da30d83cc157e6a4a5617c85598309f4ac", "edc1ad2704452354aa6f79fac244a55b6f509c2e", @@ -880,6 +890,7 @@ static const char *sha1_graphics_8[] = "f81c70b6ee2d4690f9f7c797c66582b176f8dcef", "d3f359cac7318ce09e0531d51c8c2b316cf3a23b", "293c41a7ed923a4617560481ae8815cebf83701a", + "ec06b56f3abe277be42650ebd49dabeaae9e756d", "750c923785ba2afb9ce597516c072f90f014bf95", "80089132f8a11d86e8038f2f8e12dfba46624ee5", "bde5a62a065c027561226fbec5155e938ba7f6b3", @@ -951,6 +962,7 @@ static const char *sha1_graphics_4[] = "297f6ad15200bffbf15198324ee8f27a61a6f2d4", "70cfa427a1a0d6f2232b1fd544905d48af69cb98", "287ea7db721e641439888cb9f4bac3a5f16124eb", + "dd9eaa5325cdf250e89162ac84207978ebb6458e", "42466aab11852741d937c1ff6f3bb711e58415a6", "0663cf6330591fcf744aba96664e05d90243d07a", "3024fa38333f83a639b0f0e6ac6d4b9868231157", @@ -1022,6 +1034,7 @@ static const char *sha1_graphics_4_grayscale[] = "58f400c9bb78e49a879276fb049edfc9c981740a", "cb3794f676d6e9502f27172ac7d79a12ca2ba32c", "aa89612798fbc4e11a73b6233c0ac4832e6af2f9", + "c96a998be5c1d588ef1243cfd2610d056d16947e", "68bee638d59a373f33f308751471b3ef41849582", "be0501175cc3cbb61217fca76356f761117fb40f", "8fa37e26cdae406c2d1c81b1175dcf0311cf60c9", @@ -1111,6 +1124,7 @@ static const char *sha1_graphics_1[] = "55c26d22f11d80b73383fa57d0fac552d705b092", "14443b33a9879bf829ed3b06e1aef0d7dcf662cc", "53ab1fcccd09fa5cbff77497f36a70a3b3cb8b81", + "4842a30dd7fdf38ddc3ddec85c08efe13a0e2e0b", "cc76db6da5ba1776f20240a5ad97a26a9cdf96b0", "014f477664a7f4ce4a948d6359a2707119afc8e2", "1ee4e951743efc8764249fbc7adecefbfec0428e", @@ -1184,6 +1198,7 @@ static const RECT graphics_bounds[] = { 5, 5, 206, 206 }, { 45, 45, 256, 256 }, { 86, 86, 215, 215 }, + { 45, 45, 256, 256 }, { 8, 0, 392, 231 }, { 8, 0, 392, 231 }, { 0, 0, 60, 20 }, @@ -1399,6 +1414,16 @@ static const POINT poly_lines[] = {100, 100}, {200, 100}, {200, 200}, {100, 200} }; +static const POINT polypoly_lines[] = +{ + {100, 100}, {200, 100}, {200, 100}, {200, 200} +}; + +static const DWORD polypoly_counts[] = +{ + sizeof(polypoly_lines)/sizeof(polypoly_lines[0]) +}; + static const RECT patblt_clips[] = { {120, 120, 140, 126}, /* unclipped */ @@ -2497,6 +2522,16 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits) SelectObject( hdc, orig_pen ); DeleteObject( wide_pen ); + wide_pen = ExtCreatePen( PS_GEOMETRIC | PS_ENDCAP_FLAT | PS_JOIN_MITER | PS_SOLID, + 9, &log_brush, 0, NULL ); + SelectObject( hdc, wide_pen ); + + PolyPolyline( hdc, polypoly_lines, polypoly_counts, sizeof(polypoly_counts)/sizeof(polypoly_counts[0]) ); + compare_hash(hdc, bmi, bits, "wide pen - empty segments" ); + + SelectObject( hdc, orig_pen ); + DeleteObject( wide_pen ); + /* brushed wide pen */ old_text = GetTextColor( hdc );

1 0

Vincent Povirk : windowscodecs: Implement JpegEncoder_Frame_WriteSource.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: 8b3fce9b8ea2c995794cae985252785acdfb01d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b3fce9b8ea2c995794cae985… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 11 16:01:58 2012 -0500 windowscodecs: Implement JpegEncoder_Frame_WriteSource. --- dlls/windowscodecs/jpegformat.c | 70 +++++++++++++++++++++++++++++++++++++- 1 files changed, 68 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index 3a9b095..d15dabf 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -1064,8 +1064,74 @@ static HRESULT WINAPI JpegEncoder_Frame_WritePixels(IWICBitmapFrameEncode *iface static HRESULT WINAPI JpegEncoder_Frame_WriteSource(IWICBitmapFrameEncode *iface, IWICBitmapSource *pIBitmapSource, WICRect *prc) { - FIXME("(%p,%p,%p): stub\n", iface, pIBitmapSource, prc); - return E_NOTIMPL; + JpegEncoder *This = impl_from_IWICBitmapFrameEncode(iface); + HRESULT hr; + WICRect rc; + WICPixelFormatGUID guid; + UINT stride; + BYTE *pixeldata; + TRACE("(%p,%p,%p)\n", iface, pIBitmapSource, prc); + + if (!This->frame_initialized || !This->width || !This->height) + return WINCODEC_ERR_WRONGSTATE; + + if (!This->format) + { + hr = IWICBitmapSource_GetPixelFormat(pIBitmapSource, &guid); + if (FAILED(hr)) return hr; + hr = IWICBitmapFrameEncode_SetPixelFormat(iface, &guid); + if (FAILED(hr)) return hr; + } + + hr = IWICBitmapSource_GetPixelFormat(pIBitmapSource, &guid); + if (FAILED(hr)) return hr; + if (memcmp(&guid, This->format->guid, sizeof(GUID)) != 0) + { + /* FIXME: should use WICConvertBitmapSource to convert */ + ERR("format %s unsupported\n", debugstr_guid(&guid)); + return E_FAIL; + } + + if (This->xres == 0.0 || This->yres == 0.0) + { + double xres, yres; + hr = IWICBitmapSource_GetResolution(pIBitmapSource, &xres, &yres); + if (FAILED(hr)) return hr; + hr = IWICBitmapFrameEncode_SetResolution(iface, xres, yres); + if (FAILED(hr)) return hr; + } + + if (!prc) + { + UINT width, height; + hr = IWICBitmapSource_GetSize(pIBitmapSource, &width, &height); + if (FAILED(hr)) return hr; + rc.X = 0; + rc.Y = 0; + rc.Width = width; + rc.Height = height; + prc = &rc; + } + + if (prc->Width != This->width) return E_INVALIDARG; + + stride = (This->format->bpp * This->width + 7)/8; + + pixeldata = HeapAlloc(GetProcessHeap(), 0, stride * prc->Height); + if (!pixeldata) return E_OUTOFMEMORY; + + hr = IWICBitmapSource_CopyPixels(pIBitmapSource, prc, stride, + stride*prc->Height, pixeldata); + + if (SUCCEEDED(hr)) + { + hr = IWICBitmapFrameEncode_WritePixels(iface, prc->Height, stride, + stride*prc->Height, pixeldata); + } + + HeapFree(GetProcessHeap(), 0, pixeldata); + + return hr; } static HRESULT WINAPI JpegEncoder_Frame_Commit(IWICBitmapFrameEncode *iface)

1 0

Vincent Povirk : windowscodecs: Implement JpegDecoder_Frame_GetResolution.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: 10a32bfed1acd7986015292311ae7b9c80d9c937 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a32bfed1acd798601529231… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 11 17:22:43 2012 -0500 windowscodecs: Implement JpegDecoder_Frame_GetResolution. --- dlls/windowscodecs/jpegformat.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/jpegformat.c b/dlls/windowscodecs/jpegformat.c index d15dabf..53d7ec4 100644 --- a/dlls/windowscodecs/jpegformat.c +++ b/dlls/windowscodecs/jpegformat.c @@ -528,8 +528,27 @@ static HRESULT WINAPI JpegDecoder_Frame_GetPixelFormat(IWICBitmapFrameDecode *if static HRESULT WINAPI JpegDecoder_Frame_GetResolution(IWICBitmapFrameDecode *iface, double *pDpiX, double *pDpiY) { - FIXME("(%p,%p,%p): stub\n", iface, pDpiX, pDpiY); - return E_NOTIMPL; + JpegDecoder *This = impl_from_IWICBitmapFrameDecode(iface); + + EnterCriticalSection(&This->lock); + + if (This->cinfo.density_unit == 2) /* pixels per centimeter */ + { + *pDpiX = This->cinfo.X_density * 2.54; + *pDpiY = This->cinfo.Y_density * 2.54; + } + else + { + /* 1 = pixels per inch, 0 = unknown */ + *pDpiX = This->cinfo.X_density; + *pDpiY = This->cinfo.Y_density; + } + + LeaveCriticalSection(&This->lock); + + TRACE("(%p)->(%0.2f,%0.2f)\n", iface, *pDpiX, *pDpiY); + + return S_OK; } static HRESULT WINAPI JpegDecoder_Frame_CopyPalette(IWICBitmapFrameDecode *iface,

1 0

Vincent Povirk : gdiplus: Add support for JPEG encoding.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: 57e491210819ec068f1ad8a0daadaf08e5095cdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=57e491210819ec068f1ad8a0d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 11 17:25:01 2012 -0500 gdiplus: Add support for JPEG encoding. --- dlls/gdiplus/image.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 3b70b25..825ca02 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3103,6 +3103,12 @@ static GpStatus encode_image_png(GpImage *image, IStream* stream, return encode_image_WIC(image, stream, &CLSID_WICPngEncoder, params); } +static GpStatus encode_image_jpeg(GpImage *image, IStream* stream, + GDIPCONST CLSID* clsid, GDIPCONST EncoderParameters* params) +{ + return encode_image_WIC(image, stream, &CLSID_WICJpegEncoder, params); +} + /***************************************************************************** * GdipSaveImageToStream [GDIPLUS.@] */ @@ -3277,14 +3283,14 @@ static const struct image_codec codecs[NUM_CODECS] = { /* FormatDescription */ jpeg_format, /* FilenameExtension */ jpeg_extension, /* MimeType */ jpeg_mimetype, - /* Flags */ ImageCodecFlagsDecoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin, + /* Flags */ ImageCodecFlagsEncoder | ImageCodecFlagsDecoder | ImageCodecFlagsSupportBitmap | ImageCodecFlagsBuiltin, /* Version */ 1, /* SigCount */ 1, /* SigSize */ 2, /* SigPattern */ jpeg_sig_pattern, /* SigMask */ jpeg_sig_mask, }, - NULL, + encode_image_jpeg, decode_image_jpeg }, {

1 0

Rico Schüller : d3dx9: Use param-> bytes for copying the data in ID3DXBaseEffect::SetValue().
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: fcb5b6c32cd40e8a6383a091a94f124cd7b360a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcb5b6c32cd40e8a6383a091a… Author: Rico Schüller <kgbricola(a)web.de> Date: Wed Apr 18 09:33:35 2012 +0200 d3dx9: Use param->bytes for copying the data in ID3DXBaseEffect::SetValue(). --- dlls/d3dx9_36/effect.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b8509b1..def73a0 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1623,7 +1623,7 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetValue(ID3DXBaseEffect *iface, D3DXH return E_FAIL; } - if (data && param->bytes >= bytes) + if (data && param->bytes <= bytes) { switch (param->type) { @@ -1631,8 +1631,8 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetValue(ID3DXBaseEffect *iface, D3DXH case D3DXPT_BOOL: case D3DXPT_INT: case D3DXPT_FLOAT: - TRACE("Copy %u bytes\n", bytes); - memcpy(param->data, data, bytes); + TRACE("Copy %u bytes\n", param->bytes); + memcpy(param->data, data, param->bytes); break; default: @@ -3580,7 +3580,7 @@ static HRESULT WINAPI ID3DXEffectImpl_SetStateManager(ID3DXEffect *iface, LPD3DX TRACE("iface %p, manager %p\n", This, manager); if (manager) IUnknown_AddRef(manager); - if (This->manager) IUnknown_Release(This->manager); + if (This->manager) IUnknown_Release(This->manager); This->manager = manager;

1 0

Alexandre Julliard : winex11: Remove support for server-side fonts.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: bb62ddeba7d98e6839a9513ff995e736f40e65cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb62ddeba7d98e6839a9513ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 18 13:07:17 2012 +0200 winex11: Remove support for server-side fonts. --- dlls/winex11.drv/Makefile.in | 3 - dlls/winex11.drv/codepage.c | 768 --------- dlls/winex11.drv/graphics.c | 32 - dlls/winex11.drv/init.c | 34 +- dlls/winex11.drv/opengl.c | 36 +- dlls/winex11.drv/text.c | 234 --- dlls/winex11.drv/x11drv.h | 18 - dlls/winex11.drv/x11drv_main.c | 4 - dlls/winex11.drv/x11font.h | 249 --- dlls/winex11.drv/xfont.c | 3462 ---------------------------------------- dlls/winex11.drv/xrender.c | 63 +- 11 files changed, 35 insertions(+), 4868 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bb62ddeba7d98e6839a95…

1 0

Alexandre Julliard : winex11: Add bounds rectangle tracking to all graphics entry points.
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: 4a87722144c0f1114e8c03da449b9b89a30b40a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a87722144c0f1114e8c03da4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 16 17:49:05 2012 +0200 winex11: Add bounds rectangle tracking to all graphics entry points. --- dlls/gdi32/tests/dc.c | 12 +---- dlls/winex11.drv/bitblt.c | 5 ++ dlls/winex11.drv/graphics.c | 122 +++++++++++++++++++++++++++++++++++------- dlls/winex11.drv/init.c | 28 ++++++++++- dlls/winex11.drv/opengl.c | 3 + dlls/winex11.drv/x11drv.h | 18 ++++++ dlls/winex11.drv/xrender.c | 34 ++++++++++-- 7 files changed, 183 insertions(+), 39 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4a87722144c0f1114e8c0…

1 0

Henri Verbeet : d3d8: Properly retrieve an interface pointer in d3d8_texture_2d_GetSurfaceLevel( ).
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: 4473047478a7e21e51bfa26be2bab46fce6c6aad URL: http://source.winehq.org/git/wine.git/?a=commit;h=4473047478a7e21e51bfa26be… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 17 20:49:11 2012 +0200 d3d8: Properly retrieve an interface pointer in d3d8_texture_2d_GetSurfaceLevel(). --- dlls/d3d8/texture.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index d4c1d06..5b4278a 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -276,6 +276,7 @@ static HRESULT WINAPI d3d8_texture_2d_GetSurfaceLevel(IDirect3DTexture8 *iface, { struct d3d8_texture *texture = impl_from_IDirect3DTexture8(iface); struct wined3d_resource *sub_resource; + IDirect3DSurface8Impl *surface_impl; TRACE("iface %p, level %u, surface %p.\n", iface, level, surface); @@ -286,7 +287,8 @@ static HRESULT WINAPI d3d8_texture_2d_GetSurfaceLevel(IDirect3DTexture8 *iface, return D3DERR_INVALIDCALL; } - *surface = wined3d_resource_get_parent(sub_resource); + surface_impl = wined3d_resource_get_parent(sub_resource); + *surface = &surface_impl->IDirect3DSurface8_iface; IDirect3DSurface8_AddRef(*surface); wined3d_mutex_unlock();

1 0

Henri Verbeet : d3d8: Properly retrieve an interface pointer in d3d8_texture_2d_LockRect().
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: 5bc8c5d347423187af86323efddf74b5eb6e8db6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bc8c5d347423187af86323ef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 17 20:49:12 2012 +0200 d3d8: Properly retrieve an interface pointer in d3d8_texture_2d_LockRect(). --- dlls/d3d8/texture.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 5b4278a..3f9339e 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -300,6 +300,7 @@ static HRESULT WINAPI d3d8_texture_2d_LockRect(IDirect3DTexture8 *iface, UINT le { struct d3d8_texture *texture = impl_from_IDirect3DTexture8(iface); struct wined3d_resource *sub_resource; + IDirect3DSurface8Impl *surface_impl; HRESULT hr; TRACE("iface %p, level %u, locked_rect %p, rect %p, flags %#x.\n", @@ -309,8 +310,10 @@ static HRESULT WINAPI d3d8_texture_2d_LockRect(IDirect3DTexture8 *iface, UINT le if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - hr = IDirect3DSurface8_LockRect((IDirect3DSurface8 *)wined3d_resource_get_parent(sub_resource), - locked_rect, rect, flags); + { + surface_impl = wined3d_resource_get_parent(sub_resource); + hr = IDirect3DSurface8_LockRect(&surface_impl->IDirect3DSurface8_iface, locked_rect, rect, flags); + } wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d8: Properly retrieve an interface pointer in d3d8_texture_2d_UnlockRect().
by Alexandre Julliard 18 Apr '12

18 Apr '12

Module: wine Branch: master Commit: 40d113c10e8e9f70bb8e1035b0dcbb0a5a3bf42f URL: http://source.winehq.org/git/wine.git/?a=commit;h=40d113c10e8e9f70bb8e1035b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 17 20:49:13 2012 +0200 d3d8: Properly retrieve an interface pointer in d3d8_texture_2d_UnlockRect(). --- dlls/d3d8/texture.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 3f9339e..877c518 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -323,6 +323,7 @@ static HRESULT WINAPI d3d8_texture_2d_UnlockRect(IDirect3DTexture8 *iface, UINT { struct d3d8_texture *texture = impl_from_IDirect3DTexture8(iface); struct wined3d_resource *sub_resource; + IDirect3DSurface8Impl *surface_impl; HRESULT hr; TRACE("iface %p, level %u.\n", iface, level); @@ -331,7 +332,10 @@ static HRESULT WINAPI d3d8_texture_2d_UnlockRect(IDirect3DTexture8 *iface, UINT if (!(sub_resource = wined3d_texture_get_sub_resource(texture->wined3d_texture, level))) hr = D3DERR_INVALIDCALL; else - hr = IDirect3DSurface8_UnlockRect((IDirect3DSurface8 *)wined3d_resource_get_parent(sub_resource)); + { + surface_impl = wined3d_resource_get_parent(sub_resource); + hr = IDirect3DSurface8_UnlockRect(&surface_impl->IDirect3DSurface8_iface); + } wined3d_mutex_unlock(); return hr;

1 0