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

Vincent Povirk : gdiplus: Validate MatrixOrder in matrix functions.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: master Commit: 14f925d5af42bf29b7d7ce72059fdeaa6078c27c URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f925d5af42bf29b7d7ce720… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Apr 6 16:54:53 2011 -0500 gdiplus: Validate MatrixOrder in matrix functions. --- dlls/gdiplus/matrix.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/matrix.c b/dlls/gdiplus/matrix.c index 3798bd2..1035cc2 100644 --- a/dlls/gdiplus/matrix.c +++ b/dlls/gdiplus/matrix.c @@ -231,8 +231,10 @@ GpStatus WINGDIPAPI GdipMultiplyMatrix(GpMatrix *matrix, GDIPCONST GpMatrix* mat if(order == MatrixOrderAppend) matrix_multiply(matrix->matrix, matrix2->matrix, matrix->matrix); - else + else if (order == MatrixOrderPrepend) matrix_multiply(matrix2->matrix, matrix->matrix, matrix->matrix); + else + return InvalidParameter; return Ok; } @@ -260,8 +262,10 @@ GpStatus WINGDIPAPI GdipRotateMatrix(GpMatrix *matrix, REAL angle, if(order == MatrixOrderAppend) matrix_multiply(matrix->matrix, rotate, matrix->matrix); - else + else if (order == MatrixOrderPrepend) matrix_multiply(rotate, matrix->matrix, matrix->matrix); + else + return InvalidParameter; return Ok; } @@ -285,8 +289,10 @@ GpStatus WINGDIPAPI GdipScaleMatrix(GpMatrix *matrix, REAL scaleX, REAL scaleY, if(order == MatrixOrderAppend) matrix_multiply(matrix->matrix, scale, matrix->matrix); - else + else if (order == MatrixOrderPrepend) matrix_multiply(scale, matrix->matrix, matrix->matrix); + else + return InvalidParameter; return Ok; } @@ -330,8 +336,10 @@ GpStatus WINGDIPAPI GdipShearMatrix(GpMatrix *matrix, REAL shearX, REAL shearY, if(order == MatrixOrderAppend) matrix_multiply(matrix->matrix, shear, matrix->matrix); - else + else if (order == MatrixOrderPrepend) matrix_multiply(shear, matrix->matrix, matrix->matrix); + else + return InvalidParameter; return Ok; } @@ -410,8 +418,10 @@ GpStatus WINGDIPAPI GdipTranslateMatrix(GpMatrix *matrix, REAL offsetX, if(order == MatrixOrderAppend) matrix_multiply(matrix->matrix, translate, matrix->matrix); - else + else if (order == MatrixOrderPrepend) matrix_multiply(translate, matrix->matrix, matrix->matrix); + else + return InvalidParameter; return Ok; }

1 0

Rico Schüller : d3dx9: Fix return values.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: master Commit: 651e044590e4c5f2a34c5502cd6beea640b52a5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=651e044590e4c5f2a34c5502c… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Apr 7 11:06:48 2011 +0200 d3dx9: Fix return values. --- dlls/d3dx9_36/effect.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 3f89eb8..b2cc197 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2328,7 +2328,7 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * /* todo: Parse techniques */ - return S_OK; + return D3D_OK; } static HRESULT d3dx9_base_effect_init(struct ID3DXBaseEffectImpl *base, @@ -2361,14 +2361,14 @@ static HRESULT d3dx9_base_effect_init(struct ID3DXBaseEffectImpl *base, TRACE("Offset: %x\n", offset); hr = d3dx9_parse_effect(base, ptr, data_size, offset); - if (hr != S_OK) + if (hr != D3D_OK) { FIXME("Failed to parse effect.\n"); return hr; } } - return S_OK; + return D3D_OK; } static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, LPDIRECT3DDEVICE9 device, @@ -2397,7 +2397,7 @@ static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, LPDIRECT3DDEVIC } hr = d3dx9_base_effect_init(object, data, data_size, effect); - if (hr != S_OK) + if (hr != D3D_OK) { FIXME("Failed to parse effect.\n"); goto err_out; @@ -2405,7 +2405,7 @@ static HRESULT d3dx9_effect_init(struct ID3DXEffectImpl *effect, LPDIRECT3DDEVIC effect->base_effect = &object->ID3DXBaseEffect_iface; - return S_OK; + return D3D_OK; err_out: @@ -2499,7 +2499,7 @@ static HRESULT d3dx9_effect_compiler_init(struct ID3DXEffectCompilerImpl *compil } hr = d3dx9_base_effect_init(object, data, data_size, NULL); - if (hr != S_OK) + if (hr != D3D_OK) { FIXME("Failed to parse effect.\n"); goto err_out; @@ -2507,7 +2507,7 @@ static HRESULT d3dx9_effect_compiler_init(struct ID3DXEffectCompilerImpl *compil compiler->base_effect = &object->ID3DXBaseEffect_iface; - return S_OK; + return D3D_OK; err_out:

1 0

Rico Schüller : d3dx9: Start effect parameter parsing.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: master Commit: 9a7720fc1d5f1ab305d84401ff620387aee41bb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a7720fc1d5f1ab305d84401f… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Apr 7 11:06:56 2011 +0200 d3dx9: Start effect parameter parsing. --- dlls/d3dx9_36/effect.c | 205 +++++++++++++++++++++++++++++++++++++++++++++++- include/d3dx9effect.h | 4 + 2 files changed, 208 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index b2cc197..1e3de0c 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -30,6 +30,16 @@ static const struct ID3DXEffectVtbl ID3DXEffect_Vtbl; static const struct ID3DXBaseEffectVtbl ID3DXBaseEffect_Vtbl; static const struct ID3DXEffectCompilerVtbl ID3DXEffectCompiler_Vtbl; +struct d3dx_parameter +{ + struct ID3DXBaseEffectImpl *base; + + UINT annotation_count; + DWORD flags; + + D3DXHANDLE *annotation_handles; +}; + struct ID3DXBaseEffectImpl { ID3DXBaseEffect ID3DXBaseEffect_iface; @@ -39,6 +49,8 @@ struct ID3DXBaseEffectImpl UINT parameter_count; UINT technique_count; + + D3DXHANDLE *parameter_handles; }; struct ID3DXEffectImpl @@ -79,6 +91,56 @@ static void skip_dword_unknown(const char **ptr, unsigned int count) } } +struct d3dx_parameter *get_parameter_struct(D3DXHANDLE handle) +{ + return (struct d3dx_parameter *) handle; +} + +D3DXHANDLE get_parameter_handle(struct d3dx_parameter *parameter) +{ + return (D3DXHANDLE) parameter; +} + +static void free_parameter(D3DXHANDLE handle) +{ + unsigned int i; + struct d3dx_parameter *param = get_parameter_struct(handle); + + TRACE("Free parameter %p\n", param); + + if (!param) + { + return; + } + + if (param->annotation_handles) + { + for (i = 0; i < param->annotation_count; ++i) + { + free_parameter(param->annotation_handles[i]); + } + HeapFree(GetProcessHeap(), 0, param->annotation_handles); + } + + HeapFree(GetProcessHeap(), 0, param); +} + +static void free_base_effect(struct ID3DXBaseEffectImpl *base) +{ + unsigned int i; + + TRACE("Free base effect %p\n", base); + + if (base->parameter_handles) + { + for (i = 0; i < base->parameter_count; ++i) + { + free_parameter(base->parameter_handles[i]); + } + HeapFree(GetProcessHeap(), 0, base->parameter_handles); + } +} + static void free_effect(struct ID3DXEffectImpl *effect) { TRACE("Free effect %p\n", effect); @@ -154,6 +216,7 @@ static ULONG WINAPI ID3DXBaseEffectImpl_Release(ID3DXBaseEffect *iface) if (!ref) { + free_base_effect(This); HeapFree(GetProcessHeap(), 0, This); } @@ -2312,9 +2375,102 @@ static const struct ID3DXEffectCompilerVtbl ID3DXEffectCompiler_Vtbl = ID3DXEffectCompilerImpl_CompileShader, }; +static HRESULT d3dx9_parse_effect_annotation(struct d3dx_parameter *anno, const char *data, const char **ptr) +{ + DWORD offset; + + read_dword(ptr, &offset); + TRACE("Typedef offset: %#x\n", offset); + /* todo: Parse typedef */ + + read_dword(ptr, &offset); + TRACE("Value offset: %#x\n", offset); + /* todo: Parse value */ + + anno->flags &= D3DX_PARAMETER_ANNOTATION; + + return D3D_OK; +} + +static HRESULT d3dx9_parse_effect_parameter(struct d3dx_parameter *param, const char *data, const char **ptr) +{ + DWORD offset; + HRESULT hr; + unsigned int i; + D3DXHANDLE *annotation_handles = NULL; + + read_dword(ptr, &offset); + TRACE("Typedef offset: %#x\n", offset); + /* todo: Parse typedef */ + + read_dword(ptr, &offset); + TRACE("Value offset: %#x\n", offset); + /* todo: Parse value */ + + read_dword(ptr, &param->flags); + TRACE("Flags: %#x\n", param->flags); + + read_dword(ptr, &param->annotation_count); + TRACE("Annotation count: %u\n", param->annotation_count); + + if (param->annotation_count) + { + annotation_handles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*annotation_handles) * param->annotation_count); + if (!annotation_handles) + { + ERR("Out of memory\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + for (i = 0; i < param->annotation_count; ++i) + { + struct d3dx_parameter *annotation; + + annotation = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*annotation)); + if (!annotation) + { + ERR("Out of memory\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + annotation_handles[i] = get_parameter_handle(annotation); + annotation->base = param->base; + + hr = d3dx9_parse_effect_annotation(annotation, data, ptr); + if (hr != D3D_OK) + { + WARN("Failed to parse annotation\n"); + goto err_out; + } + } + } + + param->annotation_handles = annotation_handles; + + return D3D_OK; + +err_out: + + if (annotation_handles) + { + for (i = 0; i < param->annotation_count; ++i) + { + free_parameter(annotation_handles[i]); + } + HeapFree(GetProcessHeap(), 0, annotation_handles); + } + + return hr; +} + static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char *data, UINT data_size, DWORD start) { const char *ptr = data + start; + D3DXHANDLE *parameter_handles = NULL; + HRESULT hr; + unsigned int i; read_dword(&ptr, &base->parameter_count); TRACE("Parameter count: %u\n", base->parameter_count); @@ -2324,11 +2480,58 @@ static HRESULT d3dx9_parse_effect(struct ID3DXBaseEffectImpl *base, const char * skip_dword_unknown(&ptr, 2); - /* todo: Parse parameter */ + if (base->parameter_count) + { + parameter_handles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*parameter_handles) * base->parameter_count); + if (!parameter_handles) + { + ERR("Out of memory\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + for (i = 0; i < base->parameter_count; ++i) + { + struct d3dx_parameter *parameter; + + parameter = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*parameter)); + if (!parameter) + { + ERR("Out of memory\n"); + hr = E_OUTOFMEMORY; + goto err_out; + } + + parameter_handles[i] = get_parameter_handle(parameter); + parameter->base = base; + + hr = d3dx9_parse_effect_parameter(parameter, data, &ptr); + if (hr != D3D_OK) + { + WARN("Failed to parse parameter\n"); + goto err_out; + } + } + } /* todo: Parse techniques */ + base->parameter_handles = parameter_handles; + return D3D_OK; + +err_out: + + if (parameter_handles) + { + for (i = 0; i < base->parameter_count; ++i) + { + free_parameter(parameter_handles[i]); + } + HeapFree(GetProcessHeap(), 0, parameter_handles); + } + + return hr; } static HRESULT d3dx9_base_effect_init(struct ID3DXBaseEffectImpl *base, diff --git a/include/d3dx9effect.h b/include/d3dx9effect.h index d014559..e0d1de5 100644 --- a/include/d3dx9effect.h +++ b/include/d3dx9effect.h @@ -21,6 +21,10 @@ #ifndef __D3DX9EFFECT_H__ #define __D3DX9EFFECT_H__ +#define D3DX_PARAMETER_SHARED 1 +#define D3DX_PARAMETER_LITERAL 2 +#define D3DX_PARAMETER_ANNOTATION 4 + typedef struct _D3DXEFFECT_DESC { LPCSTR Creator; UINT Parameters;

1 0

Huw Davies : gdi32: Initial SelectPen support.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: master Commit: ed23e3de5c42f107f2f7a14c0ed7848d21a6f1dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed23e3de5c42f107f2f7a14c0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 7 13:46:33 2011 +0100 gdi32: Initial SelectPen support. --- dlls/gdi32/Makefile.in | 1 + dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/dibdrv/dibdrv.h | 2 + dlls/gdi32/dibdrv/objects.c | 62 +++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/gdi_private.h | 3 ++ 5 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/Makefile.in b/dlls/gdi32/Makefile.in index 9753ef4..4b070ac 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/objects.c \ dibdrv/primitives.c \ driver.c \ enhmetafile.c \ diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index 473bf82..b8b401d 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -207,7 +207,7 @@ const DC_FUNCTIONS dib_driver = NULL, /* pSelectClipPath */ NULL, /* pSelectFont */ NULL, /* pSelectPalette */ - NULL, /* pSelectPen */ + dibdrv_SelectPen, /* pSelectPen */ NULL, /* pSetArcDirection */ NULL, /* pSetBitmapBits */ NULL, /* pSetBkColor */ diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 346b17a..766ca6c 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +extern HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) DECLSPEC_HIDDEN; + static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) { return (dibdrv_physdev *)dev; diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c new file mode 100644 index 0000000..ce3c1b2 --- /dev/null +++ b/dlls/gdi32/dibdrv/objects.c @@ -0,0 +1,62 @@ +/* + * DIB driver GDI objects. + * + * 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_SelectPen + */ +HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) +{ + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectPen ); + dibdrv_physdev *pdev = get_dibdrv_pdev(dev); + LOGPEN logpen; + + TRACE("(%p, %p)\n", dev, hpen); + + if (!GetObjectW( hpen, sizeof(logpen), &logpen )) + { + /* must be an extended pen */ + EXTLOGPEN *elp; + INT size = GetObjectW( hpen, 0, NULL ); + + if (!size) return 0; + + elp = HeapAlloc( GetProcessHeap(), 0, size ); + + GetObjectW( hpen, size, elp ); + /* FIXME: add support for user style pens */ + logpen.lopnStyle = elp->elpPenStyle; + logpen.lopnWidth.x = elp->elpWidth; + logpen.lopnWidth.y = 0; + logpen.lopnColor = elp->elpColor; + + HeapFree( GetProcessHeap(), 0, elp ); + } + + pdev->pen_color = pdev->dib.funcs->colorref_to_pixel(&pdev->dib, logpen.lopnColor); + + return next->funcs->pSelectPen( next, hpen ); +} diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 5f27106..6629ee6 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -96,6 +96,9 @@ typedef struct dibdrv_physdev { struct gdi_physdev dev; dib_info dib; + + /* pen */ + DWORD pen_color; } dibdrv_physdev; typedef struct tagDC_FUNCS

1 0

Huw Davies : gdi32: Add the ability to track whether we should defer to the graphics driver.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: master Commit: 842d49939d6d76010c5ced4e9eb371e0bb986b71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=842d49939d6d76010c5ced4e9… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 7 13:47:18 2011 +0100 gdi32: Add the ability to track whether we should defer to the graphics driver. --- dlls/gdi32/dibdrv/dc.c | 17 ++++++++++------- dlls/gdi32/dibdrv/objects.c | 13 +++++++++++++ dlls/gdi32/gdi_private.h | 5 +++++ 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c index b8b401d..d24ef37 100644 --- a/dlls/gdi32/dibdrv/dc.c +++ b/dlls/gdi32/dibdrv/dc.c @@ -90,12 +90,12 @@ static BOOL init_dib(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD *bit switch(dib->bit_count) { case 32: - init_bit_fields(dib, bit_fields); - if(dib->red_mask == 0xff0000 && dib->green_mask == 0x00ff00 && dib->blue_mask == 0x0000ff) - dib->funcs = &funcs_8888; - else - dib->funcs = &funcs_32; - break; + init_bit_fields(dib, bit_fields); + if(dib->red_mask == 0xff0000 && dib->green_mask == 0x00ff00 && dib->blue_mask == 0x0000ff) + dib->funcs = &funcs_8888; + else + dib->funcs = &funcs_32; + break; default: TRACE("bpp %d not supported, will forward to graphics driver.\n", dib->bit_count); @@ -118,7 +118,10 @@ static HBITMAP CDECL dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap ) if (!bmp) return 0; assert(bmp->dib); - init_dib(&pdev->dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, bmp->dib->dsBm.bmBits); + pdev->defer = 0; + + if(!init_dib(&pdev->dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields, bmp->dib->dsBm.bmBits)) + pdev->defer |= DEFER_FORMAT; GDI_ReleaseObj( bitmap ); diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index ce3c1b2..c9862dc 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -58,5 +58,18 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) pdev->pen_color = pdev->dib.funcs->colorref_to_pixel(&pdev->dib, logpen.lopnColor); + pdev->defer |= DEFER_PEN; + + switch(logpen.lopnStyle & PS_STYLE_MASK) + { + case PS_SOLID: + if(logpen.lopnStyle & PS_GEOMETRIC) break; + if(logpen.lopnWidth.x > 1) break; + pdev->defer &= ~DEFER_PEN; + break; + default: + break; + } + return next->funcs->pSelectPen( next, hpen ); } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 6629ee6..79fdb26 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -97,10 +97,15 @@ typedef struct dibdrv_physdev struct gdi_physdev dev; dib_info dib; + DWORD defer; + /* pen */ DWORD pen_color; } dibdrv_physdev; +#define DEFER_FORMAT 1 +#define DEFER_PEN 2 + typedef struct tagDC_FUNCS { INT (CDECL *pAbortDoc)(PHYSDEV);

1 0

Huw Davies : gdi32: Draw single pixel wide, horizontal or vertical lines with the dib driver.
by Alexandre Julliard April 7, 2011

April 7, 2011

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: Add a solid_rects primitive.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: master Commit: f382478377037eae92c2b8722b8066f5d85d21dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f382478377037eae92c2b8722… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 7 13:46:11 2011 +0100 gdi32: Add a solid_rects primitive. --- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/primitives.c | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index 9ed7661..346b17a 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -25,6 +25,7 @@ static inline dibdrv_physdev *get_dibdrv_pdev( PHYSDEV dev ) typedef struct primitive_funcs { + void (* solid_rects)(const dib_info *dib, int num, RECT *rc, DWORD and, DWORD xor); DWORD (* colorref_to_pixel)(const dib_info *dib, COLORREF color); } primitive_funcs; diff --git a/dlls/gdi32/dibdrv/primitives.c b/dlls/gdi32/dibdrv/primitives.c index 92559d2..c8d60cb 100644 --- a/dlls/gdi32/dibdrv/primitives.c +++ b/dlls/gdi32/dibdrv/primitives.c @@ -21,6 +21,35 @@ #include "gdi_private.h" #include "dibdrv.h" +static inline DWORD *get_pixel_ptr_32(const dib_info *dib, int x, int y) +{ + return (DWORD *)((BYTE*)dib->bits + y * dib->stride + x * 4); +} + +static inline void do_rop_32(DWORD *ptr, DWORD and, DWORD xor) +{ + *ptr = (*ptr & and) ^ xor; +} + +static void solid_rects_32(const dib_info *dib, int num, RECT *rc, DWORD and, DWORD xor) +{ + DWORD *ptr, *start; + int x, y, i; + + for(i = 0; i < num; i++, rc++) + { + start = ptr = get_pixel_ptr_32(dib, rc->left, rc->top); + for(y = rc->top; y < rc->bottom; y++, start += dib->stride / 4) + for(x = rc->left, ptr = start; x < rc->right; x++) + do_rop_32(ptr++, and, xor); + } +} + +static void solid_rects_null(const dib_info *dib, int num, RECT *rc, DWORD and, DWORD xor) +{ + return; +} + static DWORD colorref_to_pixel_888(const dib_info *dib, COLORREF color) { return ( ((color >> 16) & 0xff) | (color & 0xff00) | ((color << 16) & 0xff0000) ); @@ -58,15 +87,18 @@ static DWORD colorref_to_pixel_null(const dib_info *dib, COLORREF color) const primitive_funcs funcs_8888 = { + solid_rects_32, colorref_to_pixel_888 }; const primitive_funcs funcs_32 = { + solid_rects_32, colorref_to_pixel_masks }; const primitive_funcs funcs_null = { + solid_rects_null, colorref_to_pixel_null };

1 0

Vincent Povirk : windowscodecs: Implement TiffFrameEncode_SetPixelFormat.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: master Commit: 3c8edfe9dc823780157b7f8d79b2424a467fbb3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c8edfe9dc823780157b7f8d7… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 5 12:09:25 2011 -0500 windowscodecs: Implement TiffFrameEncode_SetPixelFormat. --- dlls/windowscodecs/tiffformat.c | 57 +++++++++++++++++++++++++++++++++++++- 1 files changed, 55 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 65a65a5..52dcf3c 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1116,6 +1116,30 @@ HRESULT TiffDecoder_CreateInstance(IUnknown *pUnkOuter, REFIID iid, void** ppv) return ret; } +struct tiff_encode_format { + const WICPixelFormatGUID *guid; + int photometric; + int bps; + int samples; + int bpp; + int extra_sample; + int extra_sample_type; + int reverse_bgr; +}; + +static const struct tiff_encode_format formats[] = { + {&GUID_WICPixelFormat24bppBGR, 2, 8, 3, 24, 0, 0, 1}, + {&GUID_WICPixelFormatBlackWhite, 1, 1, 1, 1, 0, 0, 0}, + {&GUID_WICPixelFormat4bppGray, 1, 4, 1, 4, 0, 0, 0}, + {&GUID_WICPixelFormat8bppGray, 1, 8, 1, 8, 0, 0, 0}, + {&GUID_WICPixelFormat32bppBGRA, 2, 8, 4, 32, 1, 2, 1}, + {&GUID_WICPixelFormat32bppPBGRA, 2, 8, 4, 32, 1, 1, 1}, + {&GUID_WICPixelFormat48bppRGB, 2, 16, 3, 48, 0, 0, 0}, + {&GUID_WICPixelFormat64bppRGBA, 2, 16, 4, 64, 1, 2, 0}, + {&GUID_WICPixelFormat64bppPRGBA, 2, 16, 4, 64, 1, 1, 0}, + {0} +}; + typedef struct TiffEncoder { IWICBitmapEncoder IWICBitmapEncoder_iface; LONG ref; @@ -1138,6 +1162,8 @@ typedef struct TiffFrameEncode { TiffEncoder *parent; /* fields below are protected by parent->lock */ BOOL initialized; + BOOL info_written; + const struct tiff_encode_format *format; } TiffFrameEncode; static inline TiffFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) @@ -1232,8 +1258,33 @@ static HRESULT WINAPI TiffFrameEncode_SetResolution(IWICBitmapFrameEncode *iface static HRESULT WINAPI TiffFrameEncode_SetPixelFormat(IWICBitmapFrameEncode *iface, WICPixelFormatGUID *pPixelFormat) { - FIXME("(%p,%s)\n", iface, debugstr_guid(pPixelFormat)); - return E_NOTIMPL; + TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + int i; + + TRACE("(%p,%s)\n", iface, debugstr_guid(pPixelFormat)); + + EnterCriticalSection(&This->parent->lock); + + if (!This->initialized || This->info_written) + { + LeaveCriticalSection(&This->parent->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + for (i=0; formats[i].guid; i++) + { + if (memcmp(formats[i].guid, pPixelFormat, sizeof(GUID)) == 0) + break; + } + + if (!formats[i].guid) i = 0; + + This->format = &formats[i]; + memcpy(pPixelFormat, This->format->guid, sizeof(GUID)); + + LeaveCriticalSection(&This->parent->lock); + + return S_OK; } static HRESULT WINAPI TiffFrameEncode_SetColorContexts(IWICBitmapFrameEncode *iface, @@ -1460,6 +1511,8 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, result->ref = 1; result->parent = This; result->initialized = FALSE; + result->info_written = FALSE; + result->format = NULL; IWICBitmapEncoder_AddRef(iface); *ppIFrameEncode = &result->IWICBitmapFrameEncode_iface;

1 0

Vincent Povirk : windowscodecs: Implement TiffFrameEncode_SetSize.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: master Commit: eaf61d8361a5a05b7d03a69f17a837640c1a5316 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eaf61d8361a5a05b7d03a69f1… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 5 12:15:42 2011 -0500 windowscodecs: Implement TiffFrameEncode_SetSize. --- dlls/windowscodecs/tiffformat.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index 52dcf3c..22e9912 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -1164,6 +1164,7 @@ typedef struct TiffFrameEncode { BOOL initialized; BOOL info_written; const struct tiff_encode_format *format; + UINT width, height; } TiffFrameEncode; static inline TiffFrameEncode *impl_from_IWICBitmapFrameEncode(IWICBitmapFrameEncode *iface) @@ -1244,8 +1245,23 @@ static HRESULT WINAPI TiffFrameEncode_Initialize(IWICBitmapFrameEncode *iface, static HRESULT WINAPI TiffFrameEncode_SetSize(IWICBitmapFrameEncode *iface, UINT uiWidth, UINT uiHeight) { - FIXME("(%p,%u,%u): stub\n", iface, uiWidth, uiHeight); - return E_NOTIMPL; + TiffFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + TRACE("(%p,%u,%u)\n", iface, uiWidth, uiHeight); + + EnterCriticalSection(&This->parent->lock); + + if (!This->initialized || This->info_written) + { + LeaveCriticalSection(&This->parent->lock); + return WINCODEC_ERR_WRONGSTATE; + } + + This->width = uiWidth; + This->height = uiHeight; + + LeaveCriticalSection(&This->parent->lock); + + return S_OK; } static HRESULT WINAPI TiffFrameEncode_SetResolution(IWICBitmapFrameEncode *iface, @@ -1513,6 +1529,8 @@ static HRESULT WINAPI TiffEncoder_CreateNewFrame(IWICBitmapEncoder *iface, result->initialized = FALSE; result->info_written = FALSE; result->format = NULL; + result->width = 0; + result->height = 0; IWICBitmapEncoder_AddRef(iface); *ppIFrameEncode = &result->IWICBitmapFrameEncode_iface;

1 0

Henri Verbeet : wined3d: Don' t unregister windows with the wrong window proc on unload either.
by Alexandre Julliard April 7, 2011

April 7, 2011

Module: wine Branch: master Commit: 9d405473d091ee7e8f9319cbaf4d35146c982ca2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d405473d091ee7e8f9319cba… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 6 19:17:51 2011 +0200 wined3d: Don't unregister windows with the wrong window proc on unload either. This is the same issue as 7a354177b38c9451c938389576890a14d5c543fa, just on wined3d unload this time. --- dlls/wined3d/wined3d_main.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 532314c..63cc677 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -355,8 +355,13 @@ static BOOL wined3d_dll_destroy(HINSTANCE hInstDLL) for (i = 0; i < wndproc_table.count; ++i) { - struct wined3d_wndproc *entry = &wndproc_table.entries[i]; - SetWindowLongPtrW(entry->window, GWLP_WNDPROC, (LONG_PTR)entry->proc); + /* Trying to unregister these would be futile. These entries can only + * exist if either we skipped them in wined3d_unregister_window() due + * to the application replacing the wndproc after the entry was + * registered, or if the application still has an active wined3d + * device. In the latter case the application has bigger problems than + * these entries. */ + WARN("Leftover wndproc table entry %p.\n", &wndproc_table.entries[i]); } HeapFree(GetProcessHeap(), 0, wndproc_table.entries);

1 0