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

Hans Leidekker : msi: Get rid of helpers.c.
by Alexandre Julliard 06 May '11

06 May '11

Module: wine Branch: master Commit: 0c43024af76be5d01ce583b7bed86715104939e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c43024af76be5d01ce583b7b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 6 14:39:17 2011 +0200 msi: Get rid of helpers.c. --- dlls/msi/Makefile.in | 1 - dlls/msi/action.c | 503 +++++++++++++++++++++++++++-------- dlls/msi/appsearch.c | 10 +- dlls/msi/assembly.c | 14 +- dlls/msi/classes.c | 53 ++-- dlls/msi/custom.c | 66 +++++- dlls/msi/dialog.c | 2 +- dlls/msi/files.c | 83 ++++-- dlls/msi/font.c | 12 +- dlls/msi/format.c | 29 ++- dlls/msi/helpers.c | 713 -------------------------------------------------- dlls/msi/install.c | 158 ++++++++++- dlls/msi/media.c | 2 +- dlls/msi/msi.c | 4 +- dlls/msi/msipriv.h | 42 ++-- dlls/msi/package.c | 30 ++- dlls/msi/record.c | 26 ++ dlls/msi/upgrade.c | 6 +- 18 files changed, 802 insertions(+), 952 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0c43024af76be5d01ce58…

1 0

Hans Leidekker : msi: Handle NULL component correctly in MsiEnumComponentCostsW.
by Alexandre Julliard 06 May '11

06 May '11

Module: wine Branch: master Commit: 2afd65f69bc710b4aaeb67b8f9f50510114333b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2afd65f69bc710b4aaeb67b8f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri May 6 14:39:01 2011 +0200 msi: Handle NULL component correctly in MsiEnumComponentCostsW. --- dlls/msi/msi.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 867abb4..7b90203 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1844,13 +1844,12 @@ UINT WINAPI MsiEnumComponentCostsW( MSIHANDLE handle, LPCWSTR component, DWORD i { HRESULT hr; IWineMsiRemotePackage *remote_package; - BSTR bname; + BSTR bname = NULL; if (!(remote_package = (IWineMsiRemotePackage *)msi_get_remote( handle ))) return ERROR_INVALID_HANDLE; - bname = SysAllocString( component ); - if (!bname) + if (component && !(bname = SysAllocString( component ))) { IWineMsiRemotePackage_Release( remote_package ); return ERROR_OUTOFMEMORY;

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetFloat().
by Alexandre Julliard 06 May '11

06 May '11

Module: wine Branch: master Commit: 3ef0a28faf53312cc23e1f5774818a6731ab1aac URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ef0a28faf53312cc23e1f577… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri May 6 11:45:36 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetFloat(). --- dlls/d3dx9_36/effect.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c7ad93b..44f6b19 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -489,6 +489,33 @@ static INT get_int(D3DXPARAMETER_TYPE type, void *data) return i; } +inline static FLOAT get_float(D3DXPARAMETER_TYPE type, void *data) +{ + FLOAT f; + + switch (type) + { + case D3DXPT_FLOAT: + f = *(FLOAT *)data; + break; + + case D3DXPT_INT: + f = *(INT *)data; + break; + + case D3DXPT_BOOL: + f = *(BOOL *)data; + break; + + default: + f = 0.0f; + FIXME("Unhandled type %s. This should not happen!\n", debug_d3dxparameter_type(type)); + break; + } + + return f; +} + static inline BOOL get_bool(void *data) { return (*(DWORD *)data) ? TRUE : FALSE; @@ -1309,10 +1336,22 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetFloat(ID3DXBaseEffect *iface, D3DXH static HRESULT WINAPI ID3DXBaseEffectImpl_GetFloat(ID3DXBaseEffect *iface, D3DXHANDLE parameter, FLOAT *f) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = is_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, f %p stub\n", This, parameter, f); + TRACE("iface %p, parameter %p, f %p\n", This, parameter, f); - return E_NOTIMPL; + if (!param) param = get_parameter_by_name(This, NULL, parameter); + + if (f && param && !param->element_count && param->class == D3DXPC_SCALAR) + { + f = param->data; + TRACE("Returning %f\n", *f); + return D3D_OK; + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_SetFloatArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST FLOAT *f, UINT count)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetInt().
by Alexandre Julliard 06 May '11

06 May '11

Module: wine Branch: master Commit: 033439908d49206cd0627a52e1f296561e66bdfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=033439908d49206cd0627a52e… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri May 6 11:45:33 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetInt(). --- dlls/d3dx9_36/effect.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a0e699d..c7ad93b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -462,6 +462,33 @@ static void free_effect_compiler(struct ID3DXEffectCompilerImpl *compiler) } } +static INT get_int(D3DXPARAMETER_TYPE type, void *data) +{ + INT i; + + switch (type) + { + case D3DXPT_FLOAT: + i = *(FLOAT *)data; + break; + + case D3DXPT_INT: + i = *(INT *)data; + break; + + case D3DXPT_BOOL: + i = *(BOOL *)data; + break; + + default: + i = 0; + FIXME("Unhandled type %s. This should not happen!\n", debug_d3dxparameter_type(type)); + break; + } + + return i; +} + static inline BOOL get_bool(void *data) { return (*(DWORD *)data) ? TRUE : FALSE; @@ -1234,10 +1261,22 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetInt(ID3DXBaseEffect *iface, D3DXHAN static HRESULT WINAPI ID3DXBaseEffectImpl_GetInt(ID3DXBaseEffect *iface, D3DXHANDLE parameter, INT *n) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = is_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, n %p stub\n", This, parameter, n); + TRACE("iface %p, parameter %p, n %p\n", This, parameter, n); - return E_NOTIMPL; + if (!param) param = get_parameter_by_name(This, NULL, parameter); + + if (n && param && !param->element_count && param->class == D3DXPC_SCALAR) + { + *n = get_int(param->type, param->data); + TRACE("Returning %i\n", *n); + return D3D_OK; + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_SetIntArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST INT *n, UINT count)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetBool().
by Alexandre Julliard 06 May '11

06 May '11

Module: wine Branch: master Commit: 7f3ce799deac51ae329a88b0d5cfeafdc2f72a46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f3ce799deac51ae329a88b0d… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri May 6 11:45:29 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetBool(). --- dlls/d3dx9_36/effect.c | 21 +++++++++++++++++++-- 1 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 3875517..a0e699d 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -462,6 +462,11 @@ static void free_effect_compiler(struct ID3DXEffectCompilerImpl *compiler) } } +static inline BOOL get_bool(void *data) +{ + return (*(DWORD *)data) ? TRUE : FALSE; +} + static struct d3dx_parameter *get_parameter_element_by_name(struct ID3DXBaseEffectImpl *base, struct d3dx_parameter *parameter, LPCSTR name) { @@ -1181,10 +1186,22 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_SetBool(ID3DXBaseEffect *iface, D3DXHA static HRESULT WINAPI ID3DXBaseEffectImpl_GetBool(ID3DXBaseEffect *iface, D3DXHANDLE parameter, BOOL *b) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = is_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, b %p stub\n", This, parameter, b); + TRACE("iface %p, parameter %p, b %p\n", This, parameter, b); - return E_NOTIMPL; + if (!param) param = get_parameter_by_name(This, NULL, parameter); + + if (b && param && !param->element_count && param->class == D3DXPC_SCALAR) + { + *b = get_bool(param->data); + TRACE("Returning %s\n", *b ? "TRUE" : "FALSE"); + return D3D_OK; + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_SetBoolArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST BOOL *b, UINT count)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: GetDesc() partially.
by Alexandre Julliard 06 May '11

06 May '11

Module: wine Branch: master Commit: 18e48762457396d50fdceeb919cb37ced350a2ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=18e48762457396d50fdceeb91… Author: Rico Schüller <kgbricola(a)web.de> Date: Fri May 6 11:44:58 2011 +0200 d3dx9: Implement ID3DXBaseEffect::GetDesc() partially. --- dlls/d3dx9_36/effect.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 5732dee..3875517 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -665,9 +665,21 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetDesc(ID3DXBaseEffect *iface, D3DXEF { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); - FIXME("iface %p, desc %p stub\n", This, desc); + FIXME("iface %p, desc %p partial stub\n", This, desc); - return E_NOTIMPL; + if (!desc) + { + WARN("Invalid argument specified.\n"); + return D3DERR_INVALIDCALL; + } + + /* Todo: add creator and function count */ + desc->Creator = NULL; + desc->Functions = 0; + desc->Parameters = This->parameter_count; + desc->Techniques = This->technique_count; + + return D3D_OK; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetParameterDesc(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXPARAMETER_DESC *desc)

1 0

Huw Davies : gdi32: Add support for drawing vertical patterned lines.
by Alexandre Julliard 06 May '11

06 May '11

Module: wine Branch: master Commit: 72804fca54923e92a2e5114c6a6b68d6142804ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=72804fca54923e92a2e5114c6… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 6 11:53:51 2011 +0100 gdi32: Add support for drawing vertical patterned lines. --- dlls/gdi32/dibdrv/objects.c | 77 +++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/tests/dib.c | 18 ++++++++++ 2 files changed, 95 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index cb58f4b..f58d9c2 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -670,6 +670,83 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) pdev->dash_pos = start_pos; skip_dash(pdev, right - left + 1); } + else if(start->x == end->x) /* vline */ + { + BOOL t_to_b; + INT top, bottom, cur_y; + + rect.left = start->x; + rect.right = start->x + 1; + + if(start->y <= end->y) + { + top = start->y; + bottom = end->y - 1; + t_to_b = TRUE; + } + else + { + top = end->y + 1; + bottom = start->y; + t_to_b = FALSE; + } + + for(i = 0; i < clip->numRects; i++) + { + if(clip->rects[i].top > bottom) break; + if(clip->rects[i].bottom <= top) continue; + if(clip->rects[i].right > start->x && clip->rects[i].left <= start->x) + { + int clipped_top = max(clip->rects[i].top, top); + int clipped_bottom = min(clip->rects[i].bottom - 1, bottom); + + pdev->dash_pos = start_pos; + + if(t_to_b) + { + cur_y = clipped_top; + if(cur_y != top) + skip_dash(pdev, clipped_top - top); + + while(cur_y <= clipped_bottom) + { + get_dash_colors(pdev, &and, &xor); + dash_len = pdev->dash_pos.left_in_dash; + if(cur_y + dash_len > clipped_bottom + 1) + dash_len = clipped_bottom - cur_y + 1; + rect.top = cur_y; + rect.bottom = cur_y + dash_len; + + pdev->dib.funcs->solid_rects(&pdev->dib, 1, &rect, and, xor); + cur_y += dash_len; + skip_dash(pdev, dash_len); + } + } + else + { + cur_y = clipped_bottom; + if(cur_y != bottom) + skip_dash(pdev, bottom - clipped_bottom); + + while(cur_y >= clipped_top) + { + get_dash_colors(pdev, &and, &xor); + dash_len = pdev->dash_pos.left_in_dash; + if(cur_y - dash_len < clipped_top - 1) + dash_len = cur_y - clipped_top + 1; + rect.top = cur_y - dash_len + 1; + rect.bottom = cur_y + 1; + + pdev->dib.funcs->solid_rects(&pdev->dib, 1, &rect, and, xor); + cur_y -= dash_len; + skip_dash(pdev, dash_len); + } + } + } + } + pdev->dash_pos = start_pos; + skip_dash(pdev, bottom - top + 1); + } else { ret = FALSE; diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 6b7a0bf..c6b2c90 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -86,6 +86,8 @@ static const char *sha1_graphics_a8r8g8b8[] = "f2af53dd073a09b1031d0032d28da35c82adc566", "eb5a963a6f7b25533ddfb8915e70865d037bd156", "c387917268455017aa0b28bed73aa6554044bbb3", + "dcae44fee010dbf7a107797a503923fd8b1abe2e", + "6c530622a025d872a642e8f950867884d7b136cb", NULL }; @@ -375,6 +377,22 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh compare_hash(bmi, bits, sha1, "clipped dashed hlines r -> l"); memset(bits, 0xcc, dib_size); + for(i = 0; i < sizeof(vline_clips)/sizeof(vline_clips[0]); i++) + { + MoveToEx(hdc, vline_clips[i].left, vline_clips[i].top, NULL); + LineTo(hdc, vline_clips[i].right, vline_clips[i].bottom); + } + compare_hash(bmi, bits, sha1, "clipped dashed vlines"); + memset(bits, 0xcc, dib_size); + + for(i = 0; i < sizeof(vline_clips)/sizeof(vline_clips[0]); i++) + { + MoveToEx(hdc, vline_clips[i].right, vline_clips[i].bottom - 1, NULL); + LineTo(hdc, vline_clips[i].left, vline_clips[i].top - 1); + } + compare_hash(bmi, bits, sha1, "clipped dashed vlines b -> t"); + memset(bits, 0xcc, dib_size); + ExtSelectClipRgn(hdc, NULL, RGN_COPY); SelectObject(hdc, orig_brush);

1 0

Huw Davies : gdi32: Add support for drawing diagonal patterned lines.
by Alexandre Julliard 06 May '11

06 May '11

Module: wine Branch: master Commit: 699f1ab0dc522acd38811ce23c56e66e093cc2f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=699f1ab0dc522acd38811ce23… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 6 11:58:18 2011 +0100 gdi32: Add support for drawing diagonal patterned lines. --- dlls/gdi32/dibdrv/objects.c | 68 +++++++++++++++++++++++++++++++++++++++++-- dlls/gdi32/tests/dib.c | 20 ++++++++++++ 2 files changed, 85 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index f58d9c2..a0e238e 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -583,6 +583,21 @@ static inline void get_dash_colors(const dibdrv_physdev *pdev, DWORD *and, DWORD } } +static void dashed_pen_line_callback(dibdrv_physdev *pdev, INT x, INT y) +{ + RECT rect; + DWORD and, xor; + + get_dash_colors(pdev, &and, &xor); + skip_dash(pdev, 1); + rect.left = x; + rect.right = x + 1; + rect.top = y; + rect.bottom = y + 1; + pdev->dib.funcs->solid_rects(&pdev->dib, 1, &rect, and, xor); + return; +} + static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) { const WINEREGION *clip = get_wine_region(pdev->clip); @@ -590,7 +605,6 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) int i, dash_len; RECT rect; const dash_pos start_pos = pdev->dash_pos; - BOOL ret = TRUE; if(start->y == end->y) /* hline */ { @@ -749,11 +763,59 @@ static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) } else { - ret = FALSE; + bres_params params; + INT dx = end->x - start->x; + INT dy = end->y - start->y; + INT i; + + params.dx = abs(dx); + params.dy = abs(dy); + params.octant = get_octant_mask(dx, dy); + /* Octants 3, 5, 6 and 8 take a bias */ + params.bias = (params.octant & 0xb4) ? 1 : 0; + + for(i = 0; i < clip->numRects; i++) + { + POINT clipped_start, clipped_end; + int clip_status; + clip_status = clip_line(start, end, clip->rects + i, &params, &clipped_start, &clipped_end); + + if(clip_status) + { + int m = abs(clipped_start.x - start->x); + int n = abs(clipped_start.y - start->y); + int err; + BOOL last_pt = FALSE; + + pdev->dash_pos = start_pos; + + if(is_xmajor(params.octant)) + { + err = 2 * params.dy - params.dx + m * 2 * params.dy - n * 2 * params.dx; + skip_dash(pdev, m); + } + else + { + err = 2 * params.dx - params.dy + n * 2 * params.dx - m * 2 * params.dy; + skip_dash(pdev, n); + } + if(clip_status == 1 && (end->x != clipped_end.x || end->y != clipped_end.y)) last_pt = TRUE; + + bres_line_with_bias(clipped_start.x, clipped_start.y, clipped_end.x, clipped_end.y, &params, + err, last_pt, dashed_pen_line_callback, pdev); + + if(clip_status == 2) break; /* completely unclipped, so we can finish */ + } + } + pdev->dash_pos = start_pos; + if(is_xmajor(params.octant)) + skip_dash(pdev, params.dx); + else + skip_dash(pdev, params.dy); } release_wine_region(pdev->clip); - return ret; + return TRUE; } static const dash_pattern dash_patterns[4] = diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index c6b2c90..196cbc5 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -88,6 +88,8 @@ static const char *sha1_graphics_a8r8g8b8[] = "c387917268455017aa0b28bed73aa6554044bbb3", "dcae44fee010dbf7a107797a503923fd8b1abe2e", "6c530622a025d872a642e8f950867884d7b136cb", + "7c07d91b8f68fb31821701b3dcb96de018bf0c66", + "b2261353decda2712b83538ab434a49ce21f3172", NULL }; @@ -393,6 +395,24 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh compare_hash(bmi, bits, sha1, "clipped dashed vlines b -> t"); memset(bits, 0xcc, dib_size); + for(i = 0; i < sizeof(line_clips)/sizeof(line_clips[0]); i++) + { + MoveToEx(hdc, line_clips[i].left, line_clips[i].top, NULL); + LineTo(hdc, line_clips[i].right, line_clips[i].bottom); + } + compare_hash(bmi, bits, sha1, "clipped dashed diagonal lines"); + memset(bits, 0xcc, dib_size); + + SetBkMode(hdc, OPAQUE); + + for(i = 0; i < sizeof(line_clips)/sizeof(line_clips[0]); i++) + { + MoveToEx(hdc, line_clips[i].left, line_clips[i].top, NULL); + LineTo(hdc, line_clips[i].right, line_clips[i].bottom); + } + compare_hash(bmi, bits, sha1, "clipped opaque dashed diagonal lines"); + memset(bits, 0xcc, dib_size); + ExtSelectClipRgn(hdc, NULL, RGN_COPY); SelectObject(hdc, orig_brush);

1 0

Huw Davies : gdi32: Add support for drawing horizontal patterned lines.
by Alexandre Julliard 06 May '11

06 May '11

Module: wine Branch: master Commit: 6976cee4250ceee898669d4bf7c17750667f9c32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6976cee4250ceee898669d4bf… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 6 11:48:34 2011 +0100 gdi32: Add support for drawing horizontal patterned lines. --- dlls/gdi32/dibdrv/dibdrv.h | 1 + dlls/gdi32/dibdrv/graphics.c | 2 + dlls/gdi32/dibdrv/objects.c | 132 +++++++++++++++++++++++++++++++++++++++++- dlls/gdi32/gdi_private.h | 10 +++- dlls/gdi32/tests/dib.c | 29 +++++++++- 5 files changed, 170 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h index c6cdd62..c2b3294 100644 --- a/dlls/gdi32/dibdrv/dibdrv.h +++ b/dlls/gdi32/dibdrv/dibdrv.h @@ -47,6 +47,7 @@ extern const primitive_funcs funcs_null DECLSPEC_HIDDEN; extern void calc_and_xor_masks(INT rop, DWORD color, DWORD *and, DWORD *xor) DECLSPEC_HIDDEN; extern void update_brush_rop( dibdrv_physdev *pdev, INT rop ) DECLSPEC_HIDDEN; +extern void reset_dash_origin(dibdrv_physdev *pdev) DECLSPEC_HIDDEN; static inline BOOL defer_pen(dibdrv_physdev *pdev) { diff --git a/dlls/gdi32/dibdrv/graphics.c b/dlls/gdi32/dibdrv/graphics.c index 7d0f2e9..c231434 100644 --- a/dlls/gdi32/dibdrv/graphics.c +++ b/dlls/gdi32/dibdrv/graphics.c @@ -71,6 +71,8 @@ BOOL CDECL dibdrv_LineTo( PHYSDEV dev, INT x, INT y ) LPtoDP(dev->hdc, pts, 2); + reset_dash_origin(pdev); + if(defer_pen(pdev) || !pdev->pen_line(pdev, pts, pts + 1)) return next->funcs->pLineTo( next, x, y ); diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 25aad8e..cb58f4b 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -544,9 +544,139 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) return TRUE; } +void reset_dash_origin(dibdrv_physdev *pdev) +{ + pdev->dash_pos.cur_dash = 0; + pdev->dash_pos.left_in_dash = pdev->pen_pattern.dashes[0]; + pdev->dash_pos.mark = TRUE; +} + +static inline void skip_dash(dibdrv_physdev *pdev, unsigned int skip) +{ + skip %= pdev->pen_pattern.total_len; + while(skip) + { + if(pdev->dash_pos.left_in_dash > skip) + { + pdev->dash_pos.left_in_dash -= skip; + return; + } + skip -= pdev->dash_pos.left_in_dash; + pdev->dash_pos.cur_dash++; + if(pdev->dash_pos.cur_dash == pdev->pen_pattern.count) pdev->dash_pos.cur_dash = 0; + pdev->dash_pos.left_in_dash = pdev->pen_pattern.dashes[pdev->dash_pos.cur_dash]; + pdev->dash_pos.mark = !pdev->dash_pos.mark; + } +} + +static inline void get_dash_colors(const dibdrv_physdev *pdev, DWORD *and, DWORD *xor) +{ + if(pdev->dash_pos.mark) + { + *and = pdev->pen_and; + *xor = pdev->pen_xor; + } + else /* space */ + { + *and = pdev->bkgnd_and; + *xor = pdev->bkgnd_xor; + } +} + static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) { - return FALSE; + const WINEREGION *clip = get_wine_region(pdev->clip); + DWORD and, xor; + int i, dash_len; + RECT rect; + const dash_pos start_pos = pdev->dash_pos; + BOOL ret = TRUE; + + if(start->y == end->y) /* hline */ + { + BOOL l_to_r; + INT left, right, cur_x; + + rect.top = start->y; + rect.bottom = start->y + 1; + + if(start->x <= end->x) + { + left = start->x; + right = end->x - 1; + l_to_r = TRUE; + } + else + { + left = end->x + 1; + right = start->x; + l_to_r = FALSE; + } + + for(i = 0; i < clip->numRects; i++) + { + if(clip->rects[i].top > start->y) break; + if(clip->rects[i].bottom <= start->y) continue; + + if(clip->rects[i].right > left && clip->rects[i].left <= right) + { + int clipped_left = max(clip->rects[i].left, left); + int clipped_right = min(clip->rects[i].right - 1, right); + + pdev->dash_pos = start_pos; + + if(l_to_r) + { + cur_x = clipped_left; + if(cur_x != left) + skip_dash(pdev, clipped_left - left); + + while(cur_x <= clipped_right) + { + get_dash_colors(pdev, &and, &xor); + dash_len = pdev->dash_pos.left_in_dash; + if(cur_x + dash_len > clipped_right + 1) + dash_len = clipped_right - cur_x + 1; + rect.left = cur_x; + rect.right = cur_x + dash_len; + + pdev->dib.funcs->solid_rects(&pdev->dib, 1, &rect, and, xor); + cur_x += dash_len; + skip_dash(pdev, dash_len); + } + } + else + { + cur_x = clipped_right; + if(cur_x != right) + skip_dash(pdev, right - clipped_right); + + while(cur_x >= clipped_left) + { + get_dash_colors(pdev, &and, &xor); + dash_len = pdev->dash_pos.left_in_dash; + if(cur_x - dash_len < clipped_left - 1) + dash_len = cur_x - clipped_left + 1; + rect.left = cur_x - dash_len + 1; + rect.right = cur_x + 1; + + pdev->dib.funcs->solid_rects(&pdev->dib, 1, &rect, and, xor); + cur_x -= dash_len; + skip_dash(pdev, dash_len); + } + } + } + } + pdev->dash_pos = start_pos; + skip_dash(pdev, right - left + 1); + } + else + { + ret = FALSE; + } + + release_wine_region(pdev->clip); + return ret; } static const dash_pattern dash_patterns[4] = diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 0a90fb1..7b4c585 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -99,6 +99,13 @@ typedef struct DWORD total_len; /* total length of the dashes, should be multiplied by 2 if there are an odd number of dash lengths */ } dash_pattern; +typedef struct +{ + int left_in_dash; + int cur_dash; + BOOL mark; +} dash_pos; + typedef struct dibdrv_physdev { struct gdi_physdev dev; @@ -109,8 +116,9 @@ typedef struct dibdrv_physdev /* pen */ DWORD pen_color, pen_and, pen_xor; - BOOL (* pen_line)(struct dibdrv_physdev *pdev, POINT *start, POINT *end); dash_pattern pen_pattern; + dash_pos dash_pos; + BOOL (* pen_line)(struct dibdrv_physdev *pdev, POINT *start, POINT *end); /* brush */ UINT brush_style; diff --git a/dlls/gdi32/tests/dib.c b/dlls/gdi32/tests/dib.c index 57a2969..6b7a0bf 100644 --- a/dlls/gdi32/tests/dib.c +++ b/dlls/gdi32/tests/dib.c @@ -84,6 +84,8 @@ static const char *sha1_graphics_a8r8g8b8[] = "d51bd330cec510cdccf5394328bd8e5411901e9e", "df4aebf98d91f11be560dd232123b3ae327303d7", "f2af53dd073a09b1031d0032d28da35c82adc566", + "eb5a963a6f7b25533ddfb8915e70865d037bd156", + "c387917268455017aa0b28bed73aa6554044bbb3", NULL }; @@ -237,7 +239,7 @@ static const RECT patblt_clips[] = static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sha1) { DWORD dib_size = get_dib_size(bmi); - HPEN solid_pen, orig_pen; + HPEN solid_pen, dashed_pen, orig_pen; HBRUSH solid_brush, orig_brush; INT i, y; HRGN hrgn, hrgn2; @@ -349,12 +351,35 @@ static void draw_graphics(HDC hdc, BITMAPINFO *bmi, BYTE *bits, const char ***sh patblt_clips[i].bottom - patblt_clips[i].top, PATCOPY); } compare_hash(bmi, bits, sha1, "clipped patblt"); + memset(bits, 0xcc, dib_size); - ExtSelectClipRgn(hdc, NULL, RGN_COPY); + /* clipped dashed lines */ + dashed_pen = CreatePen(PS_DASH, 1, RGB(0xff, 0, 0)); + SelectObject(hdc, dashed_pen); + SetBkMode(hdc, TRANSPARENT); + SetBkColor(hdc, RGB(0, 0xff, 0)); + for(i = 0; i < sizeof(hline_clips)/sizeof(hline_clips[0]); i++) + { + MoveToEx(hdc, hline_clips[i].left, hline_clips[i].top, NULL); + LineTo(hdc, hline_clips[i].right, hline_clips[i].bottom); + } + compare_hash(bmi, bits, sha1, "clipped dashed hlines"); + memset(bits, 0xcc, dib_size); + + for(i = 0; i < sizeof(hline_clips)/sizeof(hline_clips[0]); i++) + { + MoveToEx(hdc, hline_clips[i].right - 1, hline_clips[i].bottom, NULL); + LineTo(hdc, hline_clips[i].left - 1, hline_clips[i].top); + } + compare_hash(bmi, bits, sha1, "clipped dashed hlines r -> l"); + memset(bits, 0xcc, dib_size); + + ExtSelectClipRgn(hdc, NULL, RGN_COPY); SelectObject(hdc, orig_brush); SelectObject(hdc, orig_pen); + DeleteObject(dashed_pen); DeleteObject(solid_brush); DeleteObject(solid_pen); }

1 0

Huw Davies : gdi32: Add support for patterned pens.
by Alexandre Julliard 06 May '11

06 May '11

Module: wine Branch: master Commit: 54397f1552cfc76de5b1ae9cda0e2328a0de791c URL: http://source.winehq.org/git/wine.git/?a=commit;h=54397f1552cfc76de5b1ae9cd… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 6 11:35:26 2011 +0100 gdi32: Add support for patterned pens. --- dlls/gdi32/dibdrv/objects.c | 31 ++++++++++++++++++++++++++++++- dlls/gdi32/gdi_private.h | 8 ++++++++ 2 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c index 50b2996..25aad8e 100644 --- a/dlls/gdi32/dibdrv/objects.c +++ b/dlls/gdi32/dibdrv/objects.c @@ -544,6 +544,19 @@ static BOOL solid_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) return TRUE; } +static BOOL dashed_pen_line(dibdrv_physdev *pdev, POINT *start, POINT *end) +{ + return FALSE; +} + +static const dash_pattern dash_patterns[4] = +{ + {2, {18, 6}, 24}, /* PS_DASH */ + {2, {3, 3}, 6}, /* PS_DOT */ + {4, {9, 6, 3, 6}, 24}, /* PS_DASHDOT */ + {6, {9, 3, 3, 3, 3, 3}, 24} /* PS_DASHDOTDOT */ +}; + /*********************************************************************** * dibdrv_SelectPen */ @@ -552,6 +565,7 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) PHYSDEV next = GET_NEXT_PHYSDEV( dev, pSelectPen ); dibdrv_physdev *pdev = get_dibdrv_pdev(dev); LOGPEN logpen; + DWORD style; TRACE("(%p, %p)\n", dev, hpen); @@ -583,14 +597,29 @@ HPEN CDECL dibdrv_SelectPen( PHYSDEV dev, HPEN hpen ) pdev->defer |= DEFER_PEN; - switch(logpen.lopnStyle & PS_STYLE_MASK) + style = logpen.lopnStyle & PS_STYLE_MASK; + + switch(style) { case PS_SOLID: if(logpen.lopnStyle & PS_GEOMETRIC) break; if(logpen.lopnWidth.x > 1) break; pdev->pen_line = solid_pen_line; + pdev->pen_pattern.count = 0; pdev->defer &= ~DEFER_PEN; break; + + case PS_DASH: + case PS_DOT: + case PS_DASHDOT: + case PS_DASHDOTDOT: + if(logpen.lopnStyle & PS_GEOMETRIC) break; + if(logpen.lopnWidth.x > 1) break; + pdev->pen_line = dashed_pen_line; + pdev->pen_pattern = dash_patterns[style - PS_DASH]; + pdev->defer &= ~DEFER_PEN; + break; + default: break; } diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 695eff0..0a90fb1 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -92,6 +92,13 @@ typedef struct const struct primitive_funcs *funcs; } dib_info; +typedef struct +{ + DWORD count; + DWORD dashes[16]; /* 16 is the maximium number for a PS_USERSTYLE pen */ + DWORD total_len; /* total length of the dashes, should be multiplied by 2 if there are an odd number of dash lengths */ +} dash_pattern; + typedef struct dibdrv_physdev { struct gdi_physdev dev; @@ -103,6 +110,7 @@ typedef struct dibdrv_physdev /* pen */ DWORD pen_color, pen_and, pen_xor; BOOL (* pen_line)(struct dibdrv_physdev *pdev, POINT *start, POINT *end); + dash_pattern pen_pattern; /* brush */ UINT brush_style;

1 0