August 2009 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Properly check if an attribute is used in streamsrc().
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: bda89180e15c861ce64993fceefcef85737b8000 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bda89180e15c861ce64993fce… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 25 08:17:11 2009 +0200 wined3d: Properly check if an attribute is used in streamsrc(). --- dlls/wined3d/state.c | 27 ++++++++++++++++----------- 1 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 0bbd917..8e05464 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4426,18 +4426,23 @@ static void streamsrc(DWORD state, IWineD3DStateBlockImpl *stateblock, struct wi device->useDrawStridedSlow = FALSE; } } - else if (fixup || (!dataLocations->elements[WINED3D_FFP_PSIZE].data - && !dataLocations->position_transformed - && (GL_SUPPORT(EXT_VERTEX_ARRAY_BGRA) - || (!dataLocations->elements[WINED3D_FFP_DIFFUSE].data - && !dataLocations->elements[WINED3D_FFP_SPECULAR].data)))) + else { - /* Load the vertex data using named arrays */ - load_named = TRUE; - device->useDrawStridedSlow = FALSE; - } else { - TRACE("Not loading vertex data\n"); - device->useDrawStridedSlow = TRUE; + WORD slow_mask = (1 << WINED3D_FFP_PSIZE); + slow_mask |= -!GL_SUPPORT(EXT_VERTEX_ARRAY_BGRA) & ((1 << WINED3D_FFP_DIFFUSE) | (1 << WINED3D_FFP_SPECULAR)); + + if (fixup || (!dataLocations->position_transformed + && !(dataLocations->use_map & slow_mask))) + { + /* Load the vertex data using named arrays */ + load_named = TRUE; + device->useDrawStridedSlow = FALSE; + } + else + { + TRACE("Not loading vertex data\n"); + device->useDrawStridedSlow = TRUE; + } } if (context->numberedArraysLoaded && !load_numbered)

1 0

Henri Verbeet : wined3d: Properly check if an attribute is used in drawStridedSlow().
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: c9f270a5d9acc55498b48991be7f5e5823422338 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9f270a5d9acc55498b48991b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Aug 25 08:17:10 2009 +0200 wined3d: Properly check if an attribute is used in drawStridedSlow(). --- dlls/wined3d/drawprim.c | 39 +++++++++++++++++++++++++++------------ 1 files changed, 27 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 643b098..2b82cca 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -113,23 +113,38 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_context VTRACE(("glBegin(%x)\n", glPrimType)); glBegin(glPrimType); - element = &si->elements[WINED3D_FFP_POSITION]; - if (element->data) position = element->data + streamOffset[element->stream_idx]; + if (si->use_map & (1 << WINED3D_FFP_POSITION)) + { + element = &si->elements[WINED3D_FFP_POSITION]; + position = element->data + streamOffset[element->stream_idx]; + } - element = &si->elements[WINED3D_FFP_NORMAL]; - if (element->data) normal = element->data + streamOffset[element->stream_idx]; - else glNormal3f(0, 0, 0); + if (si->use_map & (1 << WINED3D_FFP_NORMAL)) + { + element = &si->elements[WINED3D_FFP_NORMAL]; + normal = element->data + streamOffset[element->stream_idx]; + } + else + { + glNormal3f(0, 0, 0); + } - element = &si->elements[WINED3D_FFP_DIFFUSE]; - if (element->data) diffuse = element->data + streamOffset[element->stream_idx]; - else glColor4f(1.0f, 1.0f, 1.0f, 1.0f); + if (si->use_map & (1 << WINED3D_FFP_DIFFUSE)) + { + element = &si->elements[WINED3D_FFP_DIFFUSE]; + diffuse = element->data + streamOffset[element->stream_idx]; + } + else + { + glColor4f(1.0f, 1.0f, 1.0f, 1.0f); + } num_untracked_materials = context->num_untracked_materials; if (num_untracked_materials && element->format_desc->format != WINED3DFMT_A8R8G8B8) FIXME("Implement diffuse color tracking from %s\n", debug_d3dformat(element->format_desc->format)); - element = &si->elements[WINED3D_FFP_SPECULAR]; - if (element->data) + if (si->use_map & (1 << WINED3D_FFP_SPECULAR)) { + element = &si->elements[WINED3D_FFP_SPECULAR]; specular = element->data + streamOffset[element->stream_idx]; /* special case where the fog density is stored in the specular alpha channel */ @@ -187,9 +202,9 @@ static void drawStridedSlow(IWineD3DDevice *iface, const struct wined3d_context continue; } - element = &si->elements[WINED3D_FFP_TEXCOORD0 + coordIdx]; - if (element->data) + if (si->use_map & (1 << (WINED3D_FFP_TEXCOORD0 + coordIdx))) { + element = &si->elements[WINED3D_FFP_TEXCOORD0 + coordIdx]; texCoords[coordIdx] = element->data + streamOffset[element->stream_idx]; tex_mask |= (1 << textureNo); }

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLStyle get/put letterSpacing .
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 15bd593fae631f3c32f64c23ba3a2d06b49284cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=15bd593fae631f3c32f64c23b… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 25 16:17:56 2009 +1000 mshtml: Implement IHTMLStyle get/put letterSpacing. --- dlls/mshtml/htmlstyle.c | 11 +++++++---- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/dom.c | 20 ++++++++++++++++++++ 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index a5e0ace..cd9ae4d 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -95,6 +95,8 @@ static const WCHAR attrHeight[] = {'h','e','i','g','h','t',0}; static const WCHAR attrLeft[] = {'l','e','f','t',0}; +static const WCHAR attrLetterSpacing[] = + {'l','e','t','t','e','r','-','s','p','a','c','i','n','g',0}; static const WCHAR attrMargin[] = {'m','a','r','g','i','n',0}; static const WCHAR attrMarginLeft[] = @@ -162,6 +164,7 @@ static const struct{ {attrFontWeight, DISPID_IHTMLSTYLE_FONTWEIGHT}, {attrHeight, DISPID_IHTMLSTYLE_HEIGHT}, {attrLeft, DISPID_IHTMLSTYLE_LEFT}, + {attrLetterSpacing, DISPID_IHTMLSTYLE_LETTERSPACING}, {attrMargin, DISPID_IHTMLSTYLE_MARGIN}, {attrMarginLeft, DISPID_IHTMLSTYLE_MARGINLEFT}, {attrMarginRight, DISPID_IHTMLSTYLE_MARGINRIGHT}, @@ -940,15 +943,15 @@ static HRESULT WINAPI HTMLStyle_get_wordSpacing(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_put_letterSpacing(IHTMLStyle *iface, VARIANT v) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(v%d)\n", This, V_VT(&v)); - return E_NOTIMPL; + TRACE("(%p)->(v%d)\n", This, V_VT(&v)); + return set_nsstyle_attr_var(This->nsstyle, STYLEID_LETTER_SPACING, &v, 0); } static HRESULT WINAPI HTMLStyle_get_letterSpacing(IHTMLStyle *iface, VARIANT *p) { HTMLStyle *This = HTMLSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_LETTER_SPACING, p, 0); } static HRESULT WINAPI HTMLStyle_put_textDecoration(IHTMLStyle *iface, BSTR v) diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 41581f3..b691804 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -65,6 +65,7 @@ typedef enum { STYLEID_FONT_WEIGHT, STYLEID_HEIGHT, STYLEID_LEFT, + STYLEID_LETTER_SPACING, STYLEID_MARGIN, STYLEID_MARGIN_LEFT, STYLEID_MARGIN_RIGHT, diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7846428..f22d6bd 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -3747,6 +3747,26 @@ static void test_default_style(IHTMLStyle *style) ok(hres == S_OK, "put_wordSpacing: %08x\n", hres); VariantClear(&vDefault); + /* letterSpacing */ + hres = IHTMLStyle_get_letterSpacing(style, &vDefault); + ok(hres == S_OK, "get_letterSpacing: %08x\n", hres); + + V_VT(&v) = VT_BSTR; + V_BSTR(&v) = a2bstr("11"); + hres = IHTMLStyle_put_letterSpacing(style, v); + ok(hres == S_OK, "put_letterSpacing: %08x\n", hres); + VariantClear(&v); + + hres = IHTMLStyle_get_letterSpacing(style, &v); + ok(hres == S_OK, "get_letterSpacing: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v)=%d\n", V_VT(&v)); + ok(!strcmp_wa(V_BSTR(&v), "11px"), "expected 10px = %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + + hres = IHTMLStyle_put_letterSpacing(style, vDefault); + ok(hres == S_OK, "put_letterSpacing: %08x\n", hres); + VariantClear(&vDefault); + hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); ok(hres == S_OK, "Could not get IHTMLStyle2 iface: %08x\n", hres); if(SUCCEEDED(hres)) {

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_margin.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 15da6c94f5a2dd964d17e2d79c0c0ea6f9c929ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=15da6c94f5a2dd964d17e2d79… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 25 15:15:03 2009 +1000 mshtml: Implement IHTMLCurrentStyle_get_margin. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 2127764..a93bdb0 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -739,8 +739,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_padding(IHTMLCurrentStyle *iface, BST static HRESULT WINAPI HTMLCurrentStyle_get_margin(IHTMLCurrentStyle *iface, BSTR *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr(This->nsstyle, STYLEID_MARGIN, p); } static HRESULT WINAPI HTMLCurrentStyle_get_accelerator(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 51dad8b..7846428 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2567,6 +2567,10 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_borderWidth failed: %08x\n", hres); SysFreeString(str); + hres = IHTMLCurrentStyle_get_margin(current_style, &str); + ok(hres == S_OK, "get_margin failed: %08x\n", hres); + SysFreeString(str); + hres = IHTMLCurrentStyle_get_fontWeight(current_style, &v); ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v));

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_borderWidth.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: c1c9858b2784d1f442d74f608d4cc6e791df6b91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1c9858b2784d1f442d74f608… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 25 15:10:39 2009 +1000 mshtml: Implement IHTMLCurrentStyle_get_borderWidth. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 1ccd668..2127764 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -725,8 +725,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_borderColor(IHTMLCurrentStyle *iface, static HRESULT WINAPI HTMLCurrentStyle_get_borderWidth(IHTMLCurrentStyle *iface, BSTR *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr(This->nsstyle, STYLEID_BORDER_WIDTH, p); } static HRESULT WINAPI HTMLCurrentStyle_get_padding(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 1fb7979..51dad8b 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2563,6 +2563,10 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_overflow failed: %08x\n", hres); SysFreeString(str); + hres = IHTMLCurrentStyle_get_borderWidth(current_style, &str); + ok(hres == S_OK, "get_borderWidth failed: %08x\n", hres); + SysFreeString(str); + hres = IHTMLCurrentStyle_get_fontWeight(current_style, &v); ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v));

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_overflow.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: b2f61a5e09a47652e39082d711e17009c69df140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2f61a5e09a47652e39082d71… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 25 15:02:24 2009 +1000 mshtml: Implement IHTMLCurrentStyle_get_overflow. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 239a5a5..1ccd668 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -521,8 +521,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_clipLeft(IHTMLCurrentStyle *iface, VA static HRESULT WINAPI HTMLCurrentStyle_get_overflow(IHTMLCurrentStyle *iface, BSTR *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr(This->nsstyle, STYLEID_OVERFLOW, p); } static HRESULT WINAPI HTMLCurrentStyle_get_pageBreakBefore(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 99ab148..1fb7979 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2559,6 +2559,10 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_visibility failed: %08x\n", hres); SysFreeString(str); + hres = IHTMLCurrentStyle_get_overflow(current_style, &str); + ok(hres == S_OK, "get_overflow failed: %08x\n", hres); + SysFreeString(str); + hres = IHTMLCurrentStyle_get_fontWeight(current_style, &v); ok(hres == S_OK, "get_fontWeight failed: %08x\n", hres); ok(V_VT(&v) == VT_I4, "V_VT(v) = %d\n", V_VT(&v));

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_color.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 1479263f7e894c8a5aa209ef6de7a5d57eea45d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1479263f7e894c8a5aa209ef6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 25 14:40:20 2009 +1000 mshtml: Implement IHTMLCurrentStyle_get_color. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index e27cba7..6c595ad 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -144,8 +144,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_styleFloat(IHTMLCurrentStyle *iface, static HRESULT WINAPI HTMLCurrentStyle_get_color(IHTMLCurrentStyle *iface, VARIANT *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_COLOR, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_backgroundColor(IHTMLCurrentStyle *iface, VARIANT *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index c2852cc..e26da2f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2637,6 +2637,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_borderTopWidth failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + hres = IHTMLCurrentStyle_get_color(current_style, &v); + ok(hres == S_OK, "get_color failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + VariantClear(&v); } static void test_style2(IHTMLStyle2 *style2)

1 0

Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_backgroundColor.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 0a77124844fb33d833d6749ab1c107e8b2dc9780 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a77124844fb33d833d6749ab… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Aug 25 14:45:23 2009 +1000 mshtml: Implement IHTMLCurrentStyle_get_backgroundColor. --- dlls/mshtml/htmlcurstyle.c | 4 ++-- dlls/mshtml/tests/dom.c | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c index 6c595ad..239a5a5 100644 --- a/dlls/mshtml/htmlcurstyle.c +++ b/dlls/mshtml/htmlcurstyle.c @@ -151,8 +151,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_color(IHTMLCurrentStyle *iface, VARIA static HRESULT WINAPI HTMLCurrentStyle_get_backgroundColor(IHTMLCurrentStyle *iface, VARIANT *p) { HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, p); + return get_nsstyle_attr_var(This->nsstyle, STYLEID_BACKGROUND_COLOR, p, 0); } static HRESULT WINAPI HTMLCurrentStyle_get_fontFamily(IHTMLCurrentStyle *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e26da2f..99ab148 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2642,6 +2642,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ok(hres == S_OK, "get_color failed: %08x\n", hres); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); VariantClear(&v); + + hres = IHTMLCurrentStyle_get_backgroundColor(current_style, &v); + ok(hres == S_OK, "get_backgroundColor failed: %08x\n", hres); + ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); + VariantClear(&v); } static void test_style2(IHTMLStyle2 *style2)

1 0

Vincent Povirk : windowscodecs: Fix rounding in BMP encoder.
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 2c1d555a08647cf69dcde1621d04b1fa0b2ba629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c1d555a08647cf69dcde1621… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 24 14:03:28 2009 -0500 windowscodecs: Fix rounding in BMP encoder. --- dlls/windowscodecs/bmpencode.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index a545103..11c39e8 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -333,8 +333,8 @@ static HRESULT WINAPI BmpFrameEncode_Commit(IWICBitmapFrameEncode *iface) bih.bV5BitCount = This->format->bpp; bih.bV5Compression = This->format->compression; bih.bV5SizeImage = This->stride*This->height; - bih.bV5XPelsPerMeter = (This->xres-0.0127) / 0.0254; - bih.bV5YPelsPerMeter = (This->yres-0.0127) / 0.0254; + bih.bV5XPelsPerMeter = (This->xres+0.0127) / 0.0254; + bih.bV5YPelsPerMeter = (This->yres+0.0127) / 0.0254; bih.bV5ClrUsed = 0; bih.bV5ClrImportant = 0;

1 0

Vincent Povirk : windowscodecs: Support conversion of 8bppGray to 32bppBGRA .
by Alexandre Julliard 25 Aug '09

25 Aug '09

Module: wine Branch: master Commit: 4753a9d0532a9b5b634e8b954bf9d25d303bd1bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=4753a9d0532a9b5b634e8b954… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Aug 24 13:22:23 2009 -0500 windowscodecs: Support conversion of 8bppGray to 32bppBGRA. --- dlls/windowscodecs/converter.c | 44 ++++++++++++++++++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 1 + 2 files changed, 45 insertions(+), 0 deletions(-) diff --git a/dlls/windowscodecs/converter.c b/dlls/windowscodecs/converter.c index 7db56ea..f8efd45 100644 --- a/dlls/windowscodecs/converter.c +++ b/dlls/windowscodecs/converter.c @@ -39,6 +39,7 @@ enum pixelformat { format_1bppIndexed, format_4bppIndexed, format_8bppIndexed, + format_8bppGray, format_16bppBGR555, format_16bppBGR565, format_24bppBGR, @@ -190,6 +191,48 @@ static HRESULT copypixels_to_32bppBGRA(struct FormatConverter *This, const WICRe return res; } return S_OK; + case format_8bppGray: + if (prc) + { + HRESULT res; + UINT x, y; + BYTE *srcdata; + UINT srcstride, srcdatasize; + const BYTE *srcrow; + const BYTE *srcbyte; + BYTE *dstrow; + DWORD *dstpixel; + + srcstride = prc->Width; + srcdatasize = srcstride * prc->Height; + + srcdata = HeapAlloc(GetProcessHeap(), 0, srcdatasize); + if (!srcdata) return E_OUTOFMEMORY; + + res = IWICBitmapSource_CopyPixels(This->source, prc, srcstride, srcdatasize, srcdata); + + if (SUCCEEDED(res)) + { + srcrow = srcdata; + dstrow = pbBuffer; + for (y=0; y<prc->Height; y++) { + srcbyte=(const BYTE*)srcrow; + dstpixel=(DWORD*)dstrow; + for (x=0; x<prc->Width; x++) + { + *dstpixel++ = 0xff000000|(*srcbyte<<16)|(*srcbyte<<8)|*srcbyte; + srcbyte++; + } + srcrow += srcstride; + dstrow += cbStride; + } + } + + HeapFree(GetProcessHeap(), 0, srcdata); + + return res; + } + return S_OK; case format_8bppIndexed: if (prc) { @@ -425,6 +468,7 @@ static const struct pixelformatinfo supported_formats[] = { {format_1bppIndexed, &GUID_WICPixelFormat1bppIndexed, NULL}, {format_4bppIndexed, &GUID_WICPixelFormat4bppIndexed, NULL}, {format_8bppIndexed, &GUID_WICPixelFormat8bppIndexed, NULL}, + {format_8bppGray, &GUID_WICPixelFormat8bppGray, NULL}, {format_16bppBGR555, &GUID_WICPixelFormat16bppBGR555, NULL}, {format_16bppBGR565, &GUID_WICPixelFormat16bppBGR565, NULL}, {format_24bppBGR, &GUID_WICPixelFormat24bppBGR, NULL}, diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index fe6fc1c..2ee1a89 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -880,6 +880,7 @@ static GUID const * const converter_formats[] = { &GUID_WICPixelFormat1bppIndexed, &GUID_WICPixelFormat4bppIndexed, &GUID_WICPixelFormat8bppIndexed, + &GUID_WICPixelFormat8bppGray, &GUID_WICPixelFormat16bppBGR555, &GUID_WICPixelFormat16bppBGR565, &GUID_WICPixelFormat24bppBGR,

1 0