wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Dmitry Timoshkov : gdiplus: Fix reading the mask bits in GdipCreateBitmapFromHICON.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 34ef07fda20a5fdd92961a016d0e7465b2316da3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34ef07fda20a5fdd92961a016… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 15 12:48:08 2013 +0800 gdiplus: Fix reading the mask bits in GdipCreateBitmapFromHICON. --- dlls/gdiplus/image.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 9d88629..558e300 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1691,7 +1691,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) bih.biSize = sizeof(bih); bih.biWidth = width; - bih.biHeight = -height; + bih.biHeight = iinfo.hbmColor ? -height: -height * 2; bih.biPlanes = 1; bih.biBitCount = 32; bih.biCompression = BI_RGB;

1 0

Dmitry Timoshkov : windowscodecs: Fix reading the mask bits in CreateBitmapFromHICON.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 0df1742307b7aafec611feddec9c049eae0d938a URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df1742307b7aafec611fedde… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 15 12:47:47 2013 +0800 windowscodecs: Fix reading the mask bits in CreateBitmapFromHICON. --- dlls/windowscodecs/imgfactory.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/imgfactory.c b/dlls/windowscodecs/imgfactory.c index 8762c81..3e574d5 100644 --- a/dlls/windowscodecs/imgfactory.c +++ b/dlls/windowscodecs/imgfactory.c @@ -642,7 +642,7 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromHICON(IWICComponentFactor memset(&bi, 0, sizeof(bi)); bi.bmiHeader.biSize = sizeof(bi.bmiHeader); bi.bmiHeader.biWidth = width; - bi.bmiHeader.biHeight = -height; + bi.bmiHeader.biHeight = info.hbmColor ? -height: -height * 2; bi.bmiHeader.biPlanes = 1; bi.bmiHeader.biBitCount = 32; bi.bmiHeader.biCompression = BI_RGB; @@ -701,8 +701,6 @@ static HRESULT WINAPI ComponentFactory_CreateBitmapFromHICON(IWICComponentFactor for (x = 0; x < width; x++, rgba++, bits++) { - if (!info.hbmColor) *rgba = ~*rgba; - if (*bits) *rgba = 0; else

1 0

Dmitry Timoshkov : qcap: Fix compilation on older systems.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 98166a59804971b06a851abc68ea5546cdadbcee URL: http://source.winehq.org/git/wine.git/?a=commit;h=98166a59804971b06a851abc6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Jan 15 12:47:00 2013 +0800 qcap: Fix compilation on older systems. --- dlls/qcap/v4l.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index f5baaeb..2562c48 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -47,7 +47,8 @@ #endif #ifdef HAVE_LIBV4L1_H #include <libv4l1.h> -#elif defined(HAVE_LINUX_VIDEODEV_H) +#endif +#ifdef HAVE_LINUX_VIDEODEV_H #include <linux/videodev.h> #endif #ifdef HAVE_UNISTD_H

1 0

Vincent Povirk : winex11.drv: Don' t join INCR data until the transfer finishes.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: 9dcc21e3e79bf4b3dcfab233fb57348112de31d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dcc21e3e79bf4b3dcfab233f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jan 14 13:35:53 2013 -0600 winex11.drv: Don't join INCR data until the transfer finishes. --- dlls/winex11.drv/clipboard.c | 68 +++++++++++++++++++++++++++++++++-------- 1 files changed, 54 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 0df355a..730b6c9 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2347,6 +2347,12 @@ static BOOL X11DRV_CLIPBOARD_GetProperty(Display *display, Window w, Atom prop, } +struct clipboard_data_packet { + struct list entry; + unsigned long size; + unsigned char *data; +}; + /************************************************************************** * X11DRV_CLIPBOARD_ReadProperty * Reads the contents of the X selection property. @@ -2368,13 +2374,21 @@ static BOOL X11DRV_CLIPBOARD_ReadProperty(Display *display, Window w, Atom prop, if (atype == x11drv_atom(INCR)) { - unsigned char *buf = *data; + unsigned char *buf; unsigned long bufsize = 0; + struct list packets; + struct clipboard_data_packet *packet, *packet2; + BOOL res; + + HeapFree(GetProcessHeap(), 0, *data); + *data = NULL; + + list_init(&packets); for (;;) { int i; - unsigned char *prop_data, *tmp; + unsigned char *prop_data; unsigned long prop_size; /* Wait until PropertyNotify is received */ @@ -2392,32 +2406,58 @@ static BOOL X11DRV_CLIPBOARD_ReadProperty(Display *display, Window w, Atom prop, if (i >= SELECTION_RETRIES || !X11DRV_CLIPBOARD_GetProperty(display, w, prop, &atype, &prop_data, &prop_size)) { - HeapFree(GetProcessHeap(), 0, buf); - return FALSE; + res = FALSE; + break; } /* Retrieved entire data. */ if (prop_size == 0) { HeapFree(GetProcessHeap(), 0, prop_data); - *data = buf; - *datasize = bufsize; - return TRUE; + res = TRUE; + break; } - tmp = HeapReAlloc(GetProcessHeap(), 0, buf, bufsize + prop_size + 1); - if (!tmp) + packet = HeapAlloc(GetProcessHeap(), 0, sizeof(*packet)); + if (!packet) { - HeapFree(GetProcessHeap(), 0, buf); HeapFree(GetProcessHeap(), 0, prop_data); - return FALSE; + res = FALSE; + break; } - buf = tmp; - memcpy(buf + bufsize, prop_data, prop_size + 1); + packet->size = prop_size; + packet->data = prop_data; + list_add_tail(&packets, &packet->entry); bufsize += prop_size; - HeapFree(GetProcessHeap(), 0, prop_data); } + + if (res) + { + buf = HeapAlloc(GetProcessHeap(), 0, bufsize + 1); + if (buf) + { + unsigned long bytes_copied = 0; + *datasize = bufsize; + LIST_FOR_EACH_ENTRY( packet, &packets, struct clipboard_data_packet, entry) + { + memcpy(&buf[bytes_copied], packet->data, packet->size); + bytes_copied += packet->size; + } + buf[bufsize] = 0; + *data = buf; + } + else + res = FALSE; + } + + LIST_FOR_EACH_ENTRY_SAFE( packet, packet2, &packets, struct clipboard_data_packet, entry) + { + HeapFree(GetProcessHeap(), 0, packet->data); + HeapFree(GetProcessHeap(), 0, packet); + } + + return res; } return TRUE;

1 0

Jacek Caban : vbscript: Added support for more constants.
by Alexandre Julliard 15 Jan '13

15 Jan '13

Module: wine Branch: master Commit: a71443a8840be9e80b4778815ead3170fa7a5168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71443a8840be9e80b4778815… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jan 14 17:42:48 2013 +0100 vbscript: Added support for more constants. --- dlls/vbscript/global.c | 56 +++++------------------------------------- dlls/vbscript/tests/api.vbs | 7 +++++ 2 files changed, 14 insertions(+), 49 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 5b28e8a..6886ff7 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1548,48 +1548,6 @@ static HRESULT Global_GetRef(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA return E_NOTIMPL; } -static HRESULT Global_vbUseSystem(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbUseSystemDayOfWeek(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbFirstJan1(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbFirstFourDays(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbFirstFullWeek(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbTrue(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - -static HRESULT Global_vbFalse(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT Global_vbUseDefault(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { FIXME("\n"); @@ -1777,8 +1735,8 @@ static HRESULT Global_vbMsgBoxRtlReading(vbdisp_t *This, VARIANT *arg, unsigned } static const builtin_prop_t global_props[] = { - {DISPID_GLOBAL_VBUSESYSTEM, Global_vbUseSystem, BP_GET}, - {DISPID_GLOBAL_USESYSTEMDAYOFWEEK, Global_vbUseSystemDayOfWeek, BP_GET}, + {DISPID_GLOBAL_VBUSESYSTEM, NULL, BP_GET, 0}, + {DISPID_GLOBAL_USESYSTEMDAYOFWEEK, NULL, BP_GET, 0}, {DISPID_GLOBAL_VBSUNDAY, NULL, BP_GET, 1}, {DISPID_GLOBAL_VBMONDAY, NULL, BP_GET, 2}, {DISPID_GLOBAL_VBTUESDAY, NULL, BP_GET, 3}, @@ -1786,9 +1744,9 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBTHURSDAY, NULL, BP_GET, 5}, {DISPID_GLOBAL_VBFRIDAY, NULL, BP_GET, 6}, {DISPID_GLOBAL_VBSATURDAY, NULL, BP_GET, 7}, - {DISPID_GLOBAL_VBFIRSTJAN1, Global_vbFirstJan1, BP_GET}, - {DISPID_GLOBAL_VBFIRSTFOURDAYS, Global_vbFirstFourDays, BP_GET}, - {DISPID_GLOBAL_VBFIRSTFULLWEEK, Global_vbFirstFullWeek, BP_GET}, + {DISPID_GLOBAL_VBFIRSTJAN1, NULL, BP_GET, 1}, + {DISPID_GLOBAL_VBFIRSTFOURDAYS, NULL, BP_GET, 2}, + {DISPID_GLOBAL_VBFIRSTFULLWEEK, NULL, BP_GET, 3}, {DISPID_GLOBAL_VBOKONLY, NULL, BP_GET, MB_OK}, {DISPID_GLOBAL_VBOKCANCEL, NULL, BP_GET, MB_OKCANCEL}, {DISPID_GLOBAL_VBABORTRETRYIGNORE, NULL, BP_GET, MB_ABORTRETRYIGNORE}, @@ -1829,8 +1787,8 @@ static const builtin_prop_t global_props[] = { {DISPID_GLOBAL_VBDECIMAL, NULL, BP_GET, VT_DECIMAL}, {DISPID_GLOBAL_VBBYTE, NULL, BP_GET, VT_UI1}, {DISPID_GLOBAL_VBARRAY, NULL, BP_GET, VT_ARRAY}, - {DISPID_GLOBAL_VBTRUE, Global_vbTrue, BP_GET}, - {DISPID_GLOBAL_VBFALSE, Global_vbFalse, BP_GET}, + {DISPID_GLOBAL_VBTRUE, NULL, BP_GET, VARIANT_TRUE}, + {DISPID_GLOBAL_VBFALSE, NULL, BP_GET, VARIANT_FALSE}, {DISPID_GLOBAL_VBUSEDEFAULT, Global_vbUseDefault, BP_GET}, {DISPID_GLOBAL_VBBINARYCOMPARE, Global_vbBinaryCompare, BP_GET}, {DISPID_GLOBAL_VBTEXTCOMPARE, Global_vbTextCompare, BP_GET}, diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 4f8c544..966b256 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -69,6 +69,13 @@ TestConstant "vbDefaultButton3", vbDefaultButton3, 512 TestConstant "vbDefaultButton4", vbDefaultButton4, 768 TestConstant "vbApplicationModal", vbApplicationModal, 0 TestConstant "vbSystemModal", vbSystemModal, 4096 +TestConstant "vbUseSystem", vbUseSystem, 0 +TestConstant "vbUseSystemDayOfWeek", vbUseSystemDayOfWeek, 0 +TestConstant "vbFirstJan1", vbFirstJan1, 1 +TestConstant "vbFirstFourDays", vbFirstFourDays, 2 +TestConstant "vbFirstFullWeek", vbFirstFullWeek, 3 +TestConstant "vbTrue", vbTrue, -1 +TestConstant "vbFalse", vbFalse, 0 Sub TestCStr(arg, exval) dim x

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

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

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

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: 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

← Newer
1
...
41
42
43
44
45
46
47
...
74
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 January 2013