wine-commits April 2011

wine-commits@winehq.org

3 participants
937 discussions

Huw Davies : gdi32: Add the ability to track whether we should defer to the graphics driver.
by Alexandre Julliard 07 Apr '11

07 Apr '11

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: Initial SelectPen support.
by Alexandre Julliard 07 Apr '11

07 Apr '11

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 a solid_rects primitive.
by Alexandre Julliard 07 Apr '11

07 Apr '11

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

Rico Schüller : d3dx9: Start effect parameter parsing.
by Alexandre Julliard 07 Apr '11

07 Apr '11

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

Rico Schüller : d3dx9: Fix return values.
by Alexandre Julliard 07 Apr '11

07 Apr '11

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

Vincent Povirk : gdiplus: Validate MatrixOrder in matrix functions.
by Alexandre Julliard 07 Apr '11

07 Apr '11

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

Dmitry Timoshkov : kernel32: Constify some data.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 08f8f508949928a11fb078f2dfa40d41dec926ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=08f8f508949928a11fb078f2d… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Thu Apr 7 15:01:40 2011 +0900 kernel32: Constify some data. --- dlls/kernel32/tests/codepage.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 13f9b75..795e313 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -356,7 +356,7 @@ static void test_string_conversion(LPBOOL bUsedDefaultChar) static void test_undefined_byte_char(void) { - struct tag_testset { + static const struct tag_testset { INT codepage; LPCSTR str; BOOL is_error;

1 0

Piotr Caban : msvcp100: Fix spec file.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: 890ecdad24b507cea552d51ba34320efff4c4a78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=890ecdad24b507cea552d51ba… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Apr 6 23:06:58 2011 +0200 msvcp100: Fix spec file. --- dlls/msvcp100/msvcp100.spec | 3897 ++++++------------------------------------- 1 files changed, 489 insertions(+), 3408 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=890ecdad24b507cea552d…

1 0

Philipp Middendorf : dsound: Handle 8 channel audio input.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: f5721560f5530513feeed681b8303749a7bbab98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5721560f5530513feeed681b… Author: Philipp Middendorf <pmidden(a)gmx.net> Date: Wed Apr 6 18:06:57 2011 +0200 dsound: Handle 8 channel audio input. --- dlls/dsound/mixer.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/dsound/mixer.c b/dlls/dsound/mixer.c index 846278e..5ed8d90 100644 --- a/dlls/dsound/mixer.c +++ b/dlls/dsound/mixer.c @@ -295,6 +295,7 @@ static inline void cp_fields(const IDirectSoundBufferImpl *dsb, const BYTE *ibuf if (device->pwfx->nChannels == dsb->pwfx->nChannels || (device->pwfx->nChannels == 2 && dsb->pwfx->nChannels == 6) || + (device->pwfx->nChannels == 8 && dsb->pwfx->nChannels == 2) || (device->pwfx->nChannels == 6 && dsb->pwfx->nChannels == 2)) { dsb->convert(ibuf, obuf, istride, ostride, count, freqAcc, adj); if (device->pwfx->nChannels == 2 || dsb->pwfx->nChannels == 2)

1 0

Aric Stewart : wineqtdecoder: Tweak required for processing MPEG streams.
by Alexandre Julliard 07 Apr '11

07 Apr '11

Module: wine Branch: master Commit: a9e400b66abbeb32942c7f63f6607fee6ececbaa URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e400b66abbeb32942c7f63f… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 6 13:36:24 2011 -0500 wineqtdecoder: Tweak required for processing MPEG streams. --- dlls/wineqtdecoder/qtsplitter.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 384e9c8..2a44cfd 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -460,6 +460,9 @@ static DWORD WINAPI QTSplitter_thread(LPVOID data) WaitForSingleObject(This->runEvent, -1); This->state = State_Running; + /* Prime the pump: Needed for MPEG streams */ + GetMovieNextInterestingTime(This->pQTMovie, nextTimeEdgeOK | nextTimeStep, 0, NULL, movie_time, 1, &next_time, NULL); + GetMovieTime(This->pQTMovie, &tr); do {

1 0

← Newer
1
...
55
56
57
58
59
60
61
...
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