January 2013 - Wine-commits

Huw Davies : usp10: Fix MarkToBase offset for RTL text.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: 7ba38ad62e1d92f4b3db74ea2077add20547c07e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ba38ad62e1d92f4b3db74ea2… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 14 13:17:17 2013 +0000 usp10: Fix MarkToBase offset for RTL text. --- dlls/usp10/opentype.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 1938892..f8cf8a1 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1730,7 +1730,9 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, c if (desU.x || desU.y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY); - pGoffset[glyph_index].du += (round(devX) - piAdvance[glyph_index-1]); + if (!analysis->fRTL) pGoffset[glyph_index].du -= piAdvance[glyph_index-1]; + else if (analysis->fLogicalOrder) devX *= -1; + pGoffset[glyph_index].du += round(devX); pGoffset[glyph_index].dv += round(devY); } break;

1 0

Huw Davies : usp10: Don't compute a pair adjustment for the last glyph.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: 0783987a2623448ed3d1064b4bc045dd88276c04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0783987a2623448ed3d1064b4… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 14 13:17:18 2013 +0000 usp10: Don't compute a pair adjustment for the last glyph. --- dlls/usp10/opentype.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index f8cf8a1..d054e32 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1253,6 +1253,8 @@ static INT GPOS_apply_PairAdjustment(const OT_LookupTable *look, const SCRIPT_AN int j; int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; + if (glyph_index + write_dir < 0 || glyph_index + write_dir >= glyph_count) return glyph_index + 1; + TRACE("Pair Adjustment Positioning Subtable\n"); for (j = 0; j < GET_BE_WORD(look->SubTableCount); j++)

1 0

Huw Davies : usp10: Fix pair adjustment for RTL text.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: 464bf22fdf9840bba3b1b50e1c4c64f2ceaa4595 URL: http://source.winehq.org/git/wine.git/?a=commit;h=464bf22fdf9840bba3b1b50e1… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 14 13:17:19 2013 +0000 usp10: Fix pair adjustment for RTL text. --- dlls/usp10/opentype.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index d054e32..978c1d2 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1699,11 +1699,13 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, c double devX, devY; int index; int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; + int offset_sign = (analysis->fRTL && analysis->fLogicalOrder) ? -1 : 1; + index = GPOS_apply_PairAdjustment(look, analysis, glyphs, glyph_index, glyph_count, ppem, adjust, advance); if (adjust[0].x || adjust[0].y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, adjust[0].x, adjust[0].y, &devX, &devY); - pGoffset[glyph_index].du += round(devX); + pGoffset[glyph_index].du += round(devX) * offset_sign; pGoffset[glyph_index].dv += round(devY); } if (advance[0].x || advance[0].y) @@ -1714,7 +1716,7 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, c if (adjust[1].x || adjust[1].y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, adjust[1].x, adjust[1].y, &devX, &devY); - pGoffset[glyph_index + write_dir].du += round(devX); + pGoffset[glyph_index + write_dir].du += round(devX) * offset_sign; pGoffset[glyph_index + write_dir].dv += round(devY); } if (advance[1].x || advance[1].y)

1 0

Huw Davies : usp10: Fix MarkToMark offset for RTL text.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: 6ae41d015c67b58f81264b520b06ccf462eae4ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ae41d015c67b58f81264b520… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 14 13:17:20 2013 +0000 usp10: Fix MarkToMark offset for RTL text. --- dlls/usp10/opentype.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 978c1d2..05b8cab 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -1758,12 +1758,14 @@ static INT GPOS_apply_lookup(LPOUTLINETEXTMETRICW lpotm, LPLOGFONTW lplogfont, c { double devX, devY; POINT desU = {0,0}; + int write_dir = (analysis->fRTL && !analysis->fLogicalOrder) ? -1 : 1; GPOS_apply_MarkToMark(look, analysis, glyphs, glyph_index, glyph_count, ppem, &desU); if (desU.x || desU.y) { GPOS_convert_design_units_to_device(lpotm, lplogfont, desU.x, desU.y, &devX, &devY); - pGoffset[glyph_index].du += round(devX) + pGoffset[glyph_index-1].du; - pGoffset[glyph_index].dv += round(devY) + pGoffset[glyph_index-1].dv; + if (analysis->fRTL && analysis->fLogicalOrder) devX *= -1; + pGoffset[glyph_index].du += round(devX) + pGoffset[glyph_index - write_dir].du; + pGoffset[glyph_index].dv += round(devY) + pGoffset[glyph_index - write_dir].dv; } break; }

1 0

Nikolay Sivov : xmllite: Add a stub function for DTD parsing.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: 617a70f6c7985b35d2af8c8f0ef7788c1c9c7f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=617a70f6c7985b35d2af8c8f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 13 01:09:32 2013 +0400 xmllite: Add a stub function for DTD parsing. --- dlls/xmllite/reader.c | 41 ++++++++++++++++++++++++++++++++++------- 1 files changed, 34 insertions(+), 7 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 9c14899..4e99f1d 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -49,7 +49,9 @@ typedef enum XmlReadInState_Initial, XmlReadInState_XmlDecl, XmlReadInState_Misc_DTD, - XmlReadInState_DTD + XmlReadInState_DTD, + XmlReadInState_DTD_Misc, + XmlReadInState_Element } XmlReaderInternalState; typedef enum @@ -1117,12 +1119,22 @@ static HRESULT reader_parse_misc(xmlreader *reader) else break; - if (FAILED(hr)) return hr; + if (hr != S_FALSE) return hr; } return hr; } +/* [28] doctypedecl ::= '<!DOCTYPE' S Name (S ExternalID)? S? ('[' intSubset ']' S?)? '>' */ +static HRESULT reader_parse_dtd(xmlreader *reader) +{ + static const WCHAR doctypeW[] = {'D','O','C','T','Y','P','E',0}; + /* check if we have "<!DOCTYPE" */ + if (reader_cmp(reader, doctypeW)) return S_FALSE; + FIXME("DTD parsing not implemented\n"); + return E_NOTIMPL; +} + static HRESULT reader_parse_nextnode(xmlreader *reader) { HRESULT hr; @@ -1158,15 +1170,30 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) case XmlReadInState_Misc_DTD: hr = reader_parse_misc(reader); if (FAILED(hr)) return hr; - if (hr == S_FALSE) - { + if (hr == S_FALSE) { reader->instate = XmlReadInState_DTD; - return S_OK; + continue; } + else if (hr == S_OK) return hr; break; case XmlReadInState_DTD: - FIXME("DTD parsing not supported\n"); - return E_NOTIMPL; + hr = reader_parse_dtd(reader); + if (FAILED(hr)) return hr; + if (hr == S_FALSE) { + reader->instate = XmlReadInState_DTD_Misc; + continue; + } + else if (hr == S_OK) return hr; + break; + case XmlReadInState_DTD_Misc: + hr = reader_parse_misc(reader); + if (FAILED(hr)) return hr; + if (hr == S_FALSE) { + reader->instate = XmlReadInState_Element; + continue; + } + else if (hr == S_OK) return hr; + break; default: FIXME("internal state %d not handled\n", reader->instate); return E_NOTIMPL;

1 0

Nikolay Sivov : xmllite: Support whitespace nodes reporting.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: fc114a9b15e80131bd93cc92f2395449d595dea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc114a9b15e80131bd93cc92f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jan 13 22:36:30 2013 +0400 xmllite: Support whitespace nodes reporting. --- dlls/xmllite/reader.c | 32 +++++++++++++++++++--- dlls/xmllite/tests/reader.c | 61 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 4 deletions(-) diff --git a/dlls/xmllite/reader.c b/dlls/xmllite/reader.c index 4e99f1d..12b1d4a 100644 --- a/dlls/xmllite/reader.c +++ b/dlls/xmllite/reader.c @@ -517,14 +517,18 @@ static int readerinput_get_convlen(xmlreaderinput *readerinput) return len - (buffer->cur - buffer->data); } -/* It's possbile that raw buffer has some leftovers from last conversion - some char +/* It's possible that raw buffer has some leftovers from last conversion - some char sequence that doesn't represent a full code point. Length argument should be calculated with - readerinput_get_convlen(). */ + readerinput_get_convlen(), if it's -1 it will be calculated here. */ static void readerinput_shrinkraw(xmlreaderinput *readerinput, int len) { encoded_buffer *buffer = &readerinput->buffer->encoded; + + if (len == -1) + len = readerinput_get_convlen(readerinput); + memmove(buffer->data, buffer->cur + (buffer->written - len), len); - /* everything lower cur is lost too */ + /* everything below cur is lost too */ buffer->written -= len + (buffer->cur - buffer->data); /* after this point we don't need cur pointer really, it's used only to mark where actual data begins when first chunk is read */ @@ -1099,6 +1103,25 @@ static HRESULT reader_parse_pi(xmlreader *reader) return S_OK; } +/* This one is used to parse significant whitespace nodes, like in Misc production */ +static HRESULT reader_parse_whitespace(xmlreader *reader) +{ + WCHAR *start, *ptr; + + reader_shrink(reader); + start = reader_get_cur(reader); + + reader_skipspaces(reader); + ptr = reader_get_cur(reader); + TRACE("%s\n", debugstr_wn(start, ptr-start)); + + reader->nodetype = XmlNodeType_Whitespace; + reader_set_strvalue(reader, StringValue_LocalName, &strval_empty); + reader_set_strvalue(reader, StringValue_QualifiedName, &strval_empty); + reader_set_strvalue(reader, StringValue_Value, &strval_empty); + return S_OK; +} + /* [27] Misc ::= Comment | PI | S */ static HRESULT reader_parse_misc(xmlreader *reader) { @@ -1111,7 +1134,7 @@ static HRESULT reader_parse_misc(xmlreader *reader) const WCHAR *cur = reader_get_cur(reader); if (is_wchar_space(*cur)) - reader_skipspaces(reader); + hr = reader_parse_whitespace(reader); else if (!reader_cmp(reader, commentW)) hr = reader_parse_comment(reader); else if (!reader_cmp(reader, piW)) @@ -1163,6 +1186,7 @@ static HRESULT reader_parse_nextnode(xmlreader *reader) hr = reader_parse_xmldecl(reader); if (FAILED(hr)) return hr; + readerinput_shrinkraw(reader->input, -1); reader->instate = XmlReadInState_Misc_DTD; if (hr == S_OK) return hr; } diff --git a/dlls/xmllite/tests/reader.c b/dlls/xmllite/tests/reader.c index 140c99e..a8614a1 100644 --- a/dlls/xmllite/tests/reader.c +++ b/dlls/xmllite/tests/reader.c @@ -876,6 +876,66 @@ static void test_read_pi(void) IXmlReader_Release(reader); } +struct nodes_test { + const char *xml; + XmlNodeType types[10]; +}; + +static const char misc_test_xml[] = + "" + "" + "<?pi1 pi1body ?>" + "" + " \t \r \n" + "" +; + +static struct nodes_test misc_test = { + misc_test_xml, + { + XmlNodeType_Comment, + XmlNodeType_Comment, + XmlNodeType_ProcessingInstruction, + XmlNodeType_Comment, + XmlNodeType_Whitespace, + XmlNodeType_Comment, + XmlNodeType_None + } +}; + +static void test_read_full(void) +{ + struct nodes_test *test = &misc_test; + IXmlReader *reader; + XmlNodeType type; + IStream *stream; + HRESULT hr; + int i; + + hr = pCreateXmlReader(&IID_IXmlReader, (void**)&reader, NULL); + ok(hr == S_OK, "S_OK, got %08x\n", hr); + + stream = create_stream_on_data(test->xml, strlen(test->xml)+1); + hr = IXmlReader_SetInput(reader, (IUnknown*)stream); + ok(hr == S_OK, "got %08x\n", hr); + + i = 0; + type = XmlNodeType_None; + hr = IXmlReader_Read(reader, &type); + while (hr == S_OK) + { + ok(test->types[i] != XmlNodeType_None, "%d: unexpected end of test data\n", i); + if (test->types[i] == XmlNodeType_None) break; + ok(type == test->types[i], "%d: got wrong type %d, expected %d\n", i, type, test->types[i]); + hr = IXmlReader_Read(reader, &type); + i++; + } + ok(test->types[i] == XmlNodeType_None, "incomplete sequence\n"); + + IStream_Release(stream); + IXmlReader_Release(reader); +} + START_TEST(reader) { HRESULT r; @@ -894,6 +954,7 @@ START_TEST(reader) test_reader_state(); test_read_comment(); test_read_pi(); + test_read_full(); test_read_xmldeclaration(); CoUninitialize();

1 0

Henri Verbeet : ddraw: Avoid LPD3DINSTRUCTION.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: cc60cc6abb6d662745d211bff444f9cc38bc4737 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc60cc6abb6d662745d211bff… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 13 22:08:05 2013 +0100 ddraw: Avoid LPD3DINSTRUCTION. --- dlls/ddraw/executebuffer.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 1b412f7..5e8e475 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -71,8 +71,9 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer, if (TRACE_ON(ddraw)) _dump_executedata(&(buffer->data)); - while (1) { - LPD3DINSTRUCTION current = (LPD3DINSTRUCTION) instr; + for (;;) + { + D3DINSTRUCTION *current = (D3DINSTRUCTION *)instr; BYTE size; WORD count;

1 0

Henri Verbeet : ddraw: Avoid LPD3DPICKRECORD.
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: d210b875872c7aedd0bc845109a2ea69005465b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d210b875872c7aedd0bc84510… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 13 22:08:06 2013 +0100 ddraw: Avoid LPD3DPICKRECORD. --- include/d3d.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 94367da..2ee638e 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -950,7 +950,7 @@ DECLARE_INTERFACE_(IDirect3DDevice,IUnknown) IDirect3DViewport **viewport, DWORD flags) PURE; STDMETHOD(Pick)(THIS_ IDirect3DExecuteBuffer *buffer, IDirect3DViewport *viewport, DWORD flags, D3DRECT *rect) PURE; - STDMETHOD(GetPickRecords)(THIS_ LPDWORD lpCount, LPD3DPICKRECORD lpD3DPickRec) PURE; + STDMETHOD(GetPickRecords)(THIS_ DWORD *count, D3DPICKRECORD *records) PURE; STDMETHOD(EnumTextureFormats)(THIS_ LPD3DENUMTEXTUREFORMATSCALLBACK lpD3DEnumTextureProc, LPVOID lpArg) PURE; STDMETHOD(CreateMatrix)(THIS_ D3DMATRIXHANDLE *matrix) PURE; STDMETHOD(SetMatrix)(THIS_ D3DMATRIXHANDLE handle, D3DMATRIX *matrix) PURE;

1 0

Henri Verbeet : ddraw: Only check dwFlags if we actually have a D3DLIGHT2 structure in d3d_light_SetLight ().
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: d9051bbe93b470197a22cf1e21d26f5b7fb9ecbf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9051bbe93b470197a22cf1e2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 13 22:08:07 2013 +0100 ddraw: Only check dwFlags if we actually have a D3DLIGHT2 structure in d3d_light_SetLight(). --- dlls/ddraw/light.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index ebc1410..1d81803 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -210,7 +210,7 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) /* Translate D3DLIGHT2 structure to D3DLIGHT7. */ light7->dltType = data->dltType; light7->dcvDiffuse = data->dcvColor; - if (((D3DLIGHT2 *)data)->dwFlags & D3DLIGHT_NO_SPECULAR) + if (data->dwSize >= sizeof(D3DLIGHT2) && (((D3DLIGHT2 *)data)->dwFlags & D3DLIGHT_NO_SPECULAR)) light7->dcvSpecular = data->dcvColor; else light7->dcvSpecular = *(const D3DCOLORVALUE *)zero_value;

1 0

Henri Verbeet : ddraw: Get rid of dump_light().
by Alexandre Julliard 14 Jan '13

14 Jan '13

Module: wine Branch: master Commit: af377acabed7fce13dea9aab9e55381d4d961c5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=af377acabed7fce13dea9aab9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Jan 13 22:08:08 2013 +0100 ddraw: Get rid of dump_light(). --- dlls/ddraw/light.c | 30 ------------------------------ 1 files changed, 0 insertions(+), 30 deletions(-) diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index 1d81803..c4062ac 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -166,24 +166,6 @@ static HRESULT WINAPI d3d_light_Initialize(IDirect3DLight *iface, IDirect3D *d3d return D3D_OK; } -/***************************************************************************** - * IDirect3DLight::SetLight - * - * Assigns a lighting value to this object - * - * Params: - * Light: Lighting parameter to set - * - * Returns: - * D3D_OK on success - * DDERR_INVALIDPARAMS if Light is NULL - * - *****************************************************************************/ -static void dump_light(const D3DLIGHT2 *light) -{ - TRACE(" - dwSize : %d\n", light->dwSize); -} - static const float zero_value[] = { 0.0, 0.0, 0.0, 0.0 }; @@ -195,12 +177,6 @@ static HRESULT WINAPI d3d_light_SetLight(IDirect3DLight *iface, D3DLIGHT *data) TRACE("iface %p, data %p.\n", iface, data); - if (TRACE_ON(ddraw)) - { - TRACE(" Light definition :\n"); - dump_light((D3DLIGHT2 *)data); - } - if ((!data->dltType) || (data->dltType > D3DLIGHT_PARALLELPOINT)) return DDERR_INVALIDPARAMS; @@ -252,12 +228,6 @@ static HRESULT WINAPI d3d_light_GetLight(IDirect3DLight *iface, D3DLIGHT *lpLigh TRACE("iface %p, light %p.\n", iface, lpLight); - if (TRACE_ON(ddraw)) - { - TRACE(" Returning light definition :\n"); - dump_light(&light->light); - } - wined3d_mutex_lock(); memcpy(lpLight, &light->light, lpLight->dwSize); wined3d_mutex_unlock();

1 0