October 2011 - Wine-commits

Alexandre Julliard : gdi32: Move internal path functions to the top of the file to avoid forward declarations .
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: ef34c47c4be511e4da4a824ce7b40739e4384dab URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef34c47c4be511e4da4a824ce… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 26 14:14:17 2011 +0200 gdi32: Move internal path functions to the top of the file to avoid forward declarations. --- dlls/gdi32/path.c | 746 +++++++++++++++++++++++++---------------------------- 1 files changed, 357 insertions(+), 389 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef34c47c4be511e4da4a8…

1 0

Alexandre Julliard : gdi32: Always use a polygon to draw text strike-outs and underlines.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: ba2ea235748730d0cfe7fe9488272e1544859816 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba2ea235748730d0cfe7fe948… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 25 18:14:04 2011 +0200 gdi32: Always use a polygon to draw text strike-outs and underlines. --- dlls/gdi32/font.c | 113 +++++++++++++++++----------------------------------- 1 files changed, 37 insertions(+), 76 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index cda41dc..f9e690c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2094,6 +2094,11 @@ done: int underlineWidth, strikeoutWidth; UINT size = GetOutlineTextMetricsW(hdc, 0, NULL); OUTLINETEXTMETRICW* otm = NULL; + POINT pts[5]; + HPEN hpen = SelectObject(hdc, GetStockObject(NULL_PEN)); + HBRUSH hbrush = CreateSolidBrush(GetTextColor(hdc)); + + hbrush = SelectObject(hdc, hbrush); if(!size) { @@ -2113,86 +2118,42 @@ done: HeapFree(GetProcessHeap(), 0, otm); } - if (PATH_IsPathOpen(dc->path)) - { - POINT pts[5]; - HPEN hpen; - HBRUSH hbrush = CreateSolidBrush(GetTextColor(hdc)); - - hbrush = SelectObject(hdc, hbrush); - hpen = SelectObject(hdc, GetStockObject(NULL_PEN)); - - if (lf.lfUnderline) - { - pts[0].x = x - underlinePos * sinEsc; - pts[0].y = y - underlinePos * cosEsc; - pts[1].x = x + width.x - underlinePos * sinEsc; - pts[1].y = y + width.y - underlinePos * cosEsc; - pts[2].x = pts[1].x + underlineWidth * sinEsc; - pts[2].y = pts[1].y + underlineWidth * cosEsc; - pts[3].x = pts[0].x + underlineWidth * sinEsc; - pts[3].y = pts[0].y + underlineWidth * cosEsc; - pts[4].x = pts[0].x; - pts[4].y = pts[0].y; - DPtoLP(hdc, pts, 5); - Polygon(hdc, pts, 5); - } - - if (lf.lfStrikeOut) - { - pts[0].x = x - strikeoutPos * sinEsc; - pts[0].y = y - strikeoutPos * cosEsc; - pts[1].x = x + width.x - strikeoutPos * sinEsc; - pts[1].y = y + width.y - strikeoutPos * cosEsc; - pts[2].x = pts[1].x + strikeoutWidth * sinEsc; - pts[2].y = pts[1].y + strikeoutWidth * cosEsc; - pts[3].x = pts[0].x + strikeoutWidth * sinEsc; - pts[3].y = pts[0].y + strikeoutWidth * cosEsc; - pts[4].x = pts[0].x; - pts[4].y = pts[0].y; - DPtoLP(hdc, pts, 5); - Polygon(hdc, pts, 5); - } - SelectObject(hdc, hpen); - hbrush = SelectObject(hdc, hbrush); - DeleteObject(hbrush); - } - else + if (lf.lfUnderline) { - POINT pts[2], oldpt; - HPEN hpen; - - if (lf.lfUnderline) - { - hpen = CreatePen(PS_SOLID, underlineWidth, GetTextColor(hdc)); - hpen = SelectObject(hdc, hpen); - pts[0].x = x; - pts[0].y = y; - pts[1].x = x + width.x; - pts[1].y = y + width.y; - DPtoLP(hdc, pts, 2); - MoveToEx(hdc, pts[0].x - underlinePos * sinEsc, pts[0].y - underlinePos * cosEsc, &oldpt); - LineTo(hdc, pts[1].x - underlinePos * sinEsc, pts[1].y - underlinePos * cosEsc); - MoveToEx(hdc, oldpt.x, oldpt.y, NULL); - DeleteObject(SelectObject(hdc, hpen)); - } + pts[0].x = x - underlinePos * sinEsc; + pts[0].y = y - underlinePos * cosEsc; + pts[1].x = x + width.x - underlinePos * sinEsc; + pts[1].y = y + width.y - underlinePos * cosEsc; + pts[2].x = pts[1].x + underlineWidth * sinEsc; + pts[2].y = pts[1].y + underlineWidth * cosEsc; + pts[3].x = pts[0].x + underlineWidth * sinEsc; + pts[3].y = pts[0].y + underlineWidth * cosEsc; + pts[4].x = pts[0].x; + pts[4].y = pts[0].y; + DPtoLP(hdc, pts, 5); + Polygon(hdc, pts, 5); + } - if (lf.lfStrikeOut) - { - hpen = CreatePen(PS_SOLID, strikeoutWidth, GetTextColor(hdc)); - hpen = SelectObject(hdc, hpen); - pts[0].x = x; - pts[0].y = y; - pts[1].x = x + width.x; - pts[1].y = y + width.y; - DPtoLP(hdc, pts, 2); - MoveToEx(hdc, pts[0].x - strikeoutPos * sinEsc, pts[0].y - strikeoutPos * cosEsc, &oldpt); - LineTo(hdc, pts[1].x - strikeoutPos * sinEsc, pts[1].y - strikeoutPos * cosEsc); - MoveToEx(hdc, oldpt.x, oldpt.y, NULL); - DeleteObject(SelectObject(hdc, hpen)); - } + if (lf.lfStrikeOut) + { + pts[0].x = x - strikeoutPos * sinEsc; + pts[0].y = y - strikeoutPos * cosEsc; + pts[1].x = x + width.x - strikeoutPos * sinEsc; + pts[1].y = y + width.y - strikeoutPos * cosEsc; + pts[2].x = pts[1].x + strikeoutWidth * sinEsc; + pts[2].y = pts[1].y + strikeoutWidth * cosEsc; + pts[3].x = pts[0].x + strikeoutWidth * sinEsc; + pts[3].y = pts[0].y + strikeoutWidth * cosEsc; + pts[4].x = pts[0].x; + pts[4].y = pts[0].y; + DPtoLP(hdc, pts, 5); + Polygon(hdc, pts, 5); } + + SelectObject(hdc, hpen); + hbrush = SelectObject(hdc, hbrush); + DeleteObject(hbrush); } return ret;

1 0

Piotr Caban : msxml3: Fix attributes handling when msxml6 is used.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 685be40c332b88b5faaa1d3008a0b0c9dafe39d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=685be40c332b88b5faaa1d300… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 26 13:25:27 2011 +0200 msxml3: Fix attributes handling when msxml6 is used. --- dlls/msxml3/saxreader.c | 93 +++++++++++++++++++++++++++++++---------------- 1 files changed, 62 insertions(+), 31 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 344393a..29ab60e 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1088,13 +1088,16 @@ static const struct ISAXAttributesVtbl isaxattributes_vtbl = isaxattributes_getValueFromQName }; -static HRESULT SAXAttributes_create(saxattributes **attr, +static HRESULT SAXAttributes_create(saxattributes **attr, MSXML_VERSION version, int nb_namespaces, const xmlChar **xmlNamespaces, int nb_attributes, const xmlChar **xmlAttributes) { saxattributes *attributes; int index; static const xmlChar xmlns[] = "xmlns"; + static const WCHAR xmlnsW[] = { 'x','m','l','n','s',0 }; + static const WCHAR w3xmlns[] = { 'h','t','t','p',':','/','/', 'w','w','w','.','w','3','.', + 'o','r','g','/','2','0','0','0','/','x','m','l','n','s','/',0 }; attributes = heap_alloc(sizeof(*attributes)); if(!attributes) @@ -1124,23 +1127,26 @@ static HRESULT SAXAttributes_create(saxattributes **attr, for(index=0; index<nb_namespaces; index++) { - attributes->szLocalname[index] = SysAllocStringLen(NULL, 0); - attributes->szURI[index] = SysAllocStringLen(NULL, 0); - attributes->szValue[index] = bstr_from_xmlChar(xmlNamespaces[2*index+1]); - attributes->szQName[index] = QName_from_xmlChar(xmlns, xmlNamespaces[2*index]); + attributes->szLocalname[nb_attributes+index] = SysAllocStringLen(NULL, 0); + if(version >= MSXML6) + attributes->szURI[nb_attributes+index] = SysAllocString(w3xmlns); + else + attributes->szURI[nb_attributes+index] = SysAllocStringLen(NULL, 0); + attributes->szValue[nb_attributes+index] = bstr_from_xmlChar(xmlNamespaces[2*index+1]); + if(!xmlNamespaces[2*index]) + attributes->szQName[nb_attributes+index] = SysAllocString(xmlnsW); + else + attributes->szQName[nb_attributes+index] = QName_from_xmlChar(xmlns, xmlNamespaces[2*index]); } for(index=0; index<nb_attributes; index++) { - attributes->szLocalname[nb_namespaces+index] = - bstr_from_xmlChar(xmlAttributes[index*5]); - attributes->szURI[nb_namespaces+index] = - bstr_from_xmlChar(xmlAttributes[index*5+2]); - attributes->szValue[nb_namespaces+index] = - bstr_from_xmlCharN(xmlAttributes[index*5+3], - xmlAttributes[index*5+4]-xmlAttributes[index*5+3]); - attributes->szQName[nb_namespaces+index] = - QName_from_xmlChar(xmlAttributes[index*5+1], xmlAttributes[index*5]); + attributes->szLocalname[index] = bstr_from_xmlChar(xmlAttributes[index*5]); + attributes->szURI[index] = bstr_from_xmlChar(xmlAttributes[index*5+2]); + attributes->szValue[index] = bstr_from_xmlCharN(xmlAttributes[index*5+3], + xmlAttributes[index*5+4]-xmlAttributes[index*5+3]); + attributes->szQName[index] = QName_from_xmlChar(xmlAttributes[index*5+1], + xmlAttributes[index*5]); } *attr = attributes; @@ -1259,7 +1265,8 @@ static void libxmlStartElementNS( LocalName = pooled_bstr_from_xmlChar(&This->saxreader->pool, localname); QName = pooled_QName_from_xmlChar(&This->saxreader->pool, prefix, localname); - hr = SAXAttributes_create(&attr, nb_namespaces, namespaces, nb_attributes, attributes); + hr = SAXAttributes_create(&attr, This->saxreader->version, + nb_namespaces, namespaces, nb_attributes, attributes); if(hr == S_OK) { if(This->vbInterface) @@ -1326,25 +1333,49 @@ static void libxmlEndElementNS( return; } - for(index=This->pParserCtxt->nsNr-2; - index>=This->pParserCtxt->nsNr-nsNr*2; index-=2) + if(This->saxreader->version >= MSXML6) { - Prefix = pooled_bstr_from_xmlChar(&This->saxreader->pool, This->pParserCtxt->nsTab[index]); + for(index=This->pParserCtxt->nsNr-nsNr*2; + index<This->pParserCtxt->nsNr; index+=2) + { + Prefix = pooled_bstr_from_xmlChar(&This->saxreader->pool, This->pParserCtxt->nsTab[index]); - if(This->vbInterface) - hr = IVBSAXContentHandler_endPrefixMapping( - This->saxreader->vbcontentHandler, &Prefix); - else - hr = ISAXContentHandler_endPrefixMapping( - This->saxreader->contentHandler, - Prefix, SysStringLen(Prefix)); + if(This->vbInterface) + hr = IVBSAXContentHandler_endPrefixMapping( + This->saxreader->vbcontentHandler, &Prefix); + else + hr = ISAXContentHandler_endPrefixMapping( + This->saxreader->contentHandler, + Prefix, SysStringLen(Prefix)); - if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK) - { - format_error_message_from_id(This, hr); - return; + if(FAILED(hr)) + { + format_error_message_from_id(This, hr); + return; + } } + } + else + { + for(index=This->pParserCtxt->nsNr-2; + index>=This->pParserCtxt->nsNr-nsNr*2; index-=2) + { + Prefix = pooled_bstr_from_xmlChar(&This->saxreader->pool, This->pParserCtxt->nsTab[index]); + if(This->vbInterface) + hr = IVBSAXContentHandler_endPrefixMapping( + This->saxreader->vbcontentHandler, &Prefix); + else + hr = ISAXContentHandler_endPrefixMapping( + This->saxreader->contentHandler, + Prefix, SysStringLen(Prefix)); + + if(hr != S_OK) + { + format_error_message_from_id(This, hr); + return; + } + } } }

1 0

Piotr Caban : msxml3/tests: Added element attributes tests when SAXXMLReader is used.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: df5d3e348a8036f3f8b536c9ccf4fb4ca964fb39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df5d3e348a8036f3f8b536c9c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 26 13:25:52 2011 +0200 msxml3/tests: Added element attributes tests when SAXXMLReader is used. --- dlls/msxml3/tests/saxreader.c | 130 ++++++++++++++++++++++++++++++++++++++++- 1 files changed, 129 insertions(+), 1 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index ca9c4aa..973381b 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -121,6 +121,11 @@ static const CHAR szTestXML[] = " <Name>Captain Ahab</Name>\n" "</BankAccount>\n"; +static const CHAR szTestAttributes[] = +"<?xml version=\"1.0\" ?>\n" +"<document xmlns:test=\"prefix_test\" xmlns=\"prefix\" test:arg1=\"arg1\" arg2=\"arg2\">\n" +"</document>\n"; + typedef struct _contenthandlercheck { CH id; int line; @@ -202,6 +207,34 @@ static content_handler_test contentHandlerTestCallbackResult6[] = { { CH_ENDTEST } }; +static content_handler_test contentHandlerTestAttributes[] = { + { CH_PUTDOCUMENTLOCATOR, 0, 0, 1, 0 }, + { CH_STARTDOCUMENT, 0, 0, 1, 22 }, + { CH_STARTPREFIXMAPPING, 2, 80, 2, 79, "test", "prefix_test" }, + { CH_STARTPREFIXMAPPING, 2, 80, 2, 79, "", "prefix" }, + { CH_STARTELEMENT, 2, 80, 2, 79, "prefix", "document", "document" }, + { CH_CHARACTERS, 2, 80, 3, 1, "\n" }, + { CH_ENDELEMENT, 3, 3, 3, 11, "prefix", "document", "document" }, + { CH_ENDPREFIXMAPPING, 3, 3, 3, 11, "" }, + { CH_ENDPREFIXMAPPING, 3, 3, 3, 11, "test" }, + { CH_ENDDOCUMENT, 0, 0, 4, 0 }, + { CH_ENDTEST } +}; + +static content_handler_test contentHandlerTestAttributes6[] = { + { CH_PUTDOCUMENTLOCATOR, 0, 0, 1, 0 }, + { CH_STARTDOCUMENT, 0, 0, 1, 22 }, + { CH_STARTPREFIXMAPPING, 2, 80, 2, 79, "test", "prefix_test" }, + { CH_STARTPREFIXMAPPING, 2, 80, 2, 79, "", "prefix" }, + { CH_STARTELEMENT, 2, 80, 2, 79, "prefix", "document", "document" }, + { CH_CHARACTERS, 2, 80, 3, 1, "\n" }, + { CH_ENDELEMENT, 3, 3, 3, 11, "prefix", "document", "document" }, + { CH_ENDPREFIXMAPPING, 3, 3, 3, 11, "test" }, + { CH_ENDPREFIXMAPPING, 3, 3, 3, 11, "" }, + { CH_ENDDOCUMENT, 0, 0, 4, 0 }, + { CH_ENDTEST } +}; + static content_handler_test *expectCall; static ISAXLocator *locator; int msxml_version; @@ -321,7 +354,7 @@ static HRESULT WINAPI contentHandler_startPrefixMapping( const WCHAR *pUri, int nUri) { - if(!test_expect_call(CH_ENDDOCUMENT)) + if(!test_expect_call(CH_STARTPREFIXMAPPING)) return E_FAIL; test_saxstr(__LINE__, pPrefix, nPrefix, expectCall->arg1); @@ -357,6 +390,9 @@ static HRESULT WINAPI contentHandler_startElement( int nQName, ISAXAttributes *pAttr) { + int len; + HRESULT hres; + if(!test_expect_call(CH_STARTELEMENT)) return E_FAIL; @@ -366,6 +402,79 @@ static HRESULT WINAPI contentHandler_startElement( test_locator(__LINE__, msxml_version>=6 ? expectCall->line_v6 : expectCall->line, msxml_version>=6 ? expectCall->column_v6 : expectCall->column); + if(expectCall == contentHandlerTestAttributes+4) { + int i; + /* msxml3 returns attributes and namespaces in the input order */ + hres = ISAXAttributes_getLength(pAttr, &len); + ok(hres == S_OK, "getLength returned %x\n", hres); + ok(len == 4, "Incorrect number of attributes: %d\n", len); + ok(msxml_version < 6, "wrong msxml_version: %d\n", msxml_version); + + for(i=0; i<len; i++) { + hres = ISAXAttributes_getName(pAttr, i, &pNamespaceUri, &nNamespaceUri, + &pLocalName, &nLocalName, &pQName, &nQName); + ok(hres == S_OK, "getName returned %x\n", hres); + + if(nQName == 4) { + todo_wine ok(i==3, "Incorrect attributes order\n"); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, ""); + test_saxstr(__LINE__, pLocalName, nLocalName, "arg2"); + test_saxstr(__LINE__, pQName, nQName, "arg2"); + } else if(nQName == 5) { + todo_wine ok(i==1, "Incorrect attributes order\n"); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, ""); + test_saxstr(__LINE__, pLocalName, nLocalName, ""); + test_saxstr(__LINE__, pQName, nQName, "xmlns"); + } else if(nQName == 9) { + todo_wine ok(i==2, "Incorrect attributes order\n"); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, "prefix_test"); + test_saxstr(__LINE__, pLocalName, nLocalName, "arg1"); + test_saxstr(__LINE__, pQName, nQName, "test:arg1"); + } else if(nQName == 10) { + todo_wine ok(i==0, "Incorrect attributes order\n"); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, ""); + test_saxstr(__LINE__, pLocalName, nLocalName, ""); + test_saxstr(__LINE__, pQName, nQName, "xmlns:test"); + } else { + ok(0, "Unexpected attribute\n"); + } + } + } else if(expectCall == contentHandlerTestAttributes6+4) { + /* msxml6 returns attributes first and then namespaces */ + hres = ISAXAttributes_getLength(pAttr, &len); + ok(hres == S_OK, "getLength returned %x\n", hres); + ok(len == 4, "Incorrect number of attributes: %d\n", len); + ok(msxml_version >= 6, "wrong msxml_version: %d\n", msxml_version); + + hres = ISAXAttributes_getName(pAttr, 0, &pNamespaceUri, &nNamespaceUri, + &pLocalName, &nLocalName, &pQName, &nQName); + ok(hres == S_OK, "getName returned %x\n", hres); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, "prefix_test"); + test_saxstr(__LINE__, pLocalName, nLocalName, "arg1"); + test_saxstr(__LINE__, pQName, nQName, "test:arg1"); + + hres = ISAXAttributes_getName(pAttr, 1, &pNamespaceUri, &nNamespaceUri, + &pLocalName, &nLocalName, &pQName, &nQName); + ok(hres == S_OK, "getName returned %x\n", hres); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, ""); + test_saxstr(__LINE__, pLocalName, nLocalName, "arg2"); + test_saxstr(__LINE__, pQName, nQName, "arg2"); + + hres = ISAXAttributes_getName(pAttr, 2, &pNamespaceUri, &nNamespaceUri, + &pLocalName, &nLocalName, &pQName, &nQName); + ok(hres == S_OK, "getName returned %x\n", hres); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, "http://www.w3.org/2000/xmlns/"); + test_saxstr(__LINE__, pLocalName, nLocalName, ""); + test_saxstr(__LINE__, pQName, nQName, "xmlns:test"); + + hres = ISAXAttributes_getName(pAttr, 3, &pNamespaceUri, &nNamespaceUri, + &pLocalName, &nLocalName, &pQName, &nQName); + ok(hres == S_OK, "getName returned %x\n", hres); + test_saxstr(__LINE__, pNamespaceUri, nNamespaceUri, "http://www.w3.org/2000/xmlns/"); + test_saxstr(__LINE__, pLocalName, nLocalName, ""); + test_saxstr(__LINE__, pQName, nQName, "xmlns"); + } + return (expectCall++)->ret; } @@ -1182,6 +1291,25 @@ static void test_saxreader(int version) IStream_Release(iStream); + CreateStreamOnHGlobal(NULL, TRUE, &iStream); + liSize.QuadPart = strlen(szTestAttributes); + IStream_SetSize(iStream, liSize); + IStream_Write(iStream, szTestAttributes, strlen(szTestAttributes), &bytesWritten); + liPos.QuadPart = 0; + IStream_Seek(iStream, liPos, STREAM_SEEK_SET, NULL); + V_VT(&var) = VT_UNKNOWN|VT_DISPATCH; + V_UNKNOWN(&var) = (IUnknown*)iStream; + + if(version >= 6) + expectCall = contentHandlerTestAttributes6; + else + expectCall = contentHandlerTestAttributes; + hr = ISAXXMLReader_parse(reader, var); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + test_expect_call(CH_ENDTEST); + + IStream_Release(iStream); + V_VT(&var) = VT_BSTR; V_BSTR(&var) = SysAllocString(szCarriageRetTest);

1 0

Piotr Caban : msvcrt: Don' t search for LCID in _setmbcp_l if it was already done.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 698afdca98dd6e1525edaec73b78a60aebc1556b URL: http://source.winehq.org/git/wine.git/?a=commit;h=698afdca98dd6e1525edaec73… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 26 14:10:22 2011 +0200 msvcrt: Don't search for LCID in _setmbcp_l if it was already done. --- dlls/msvcrt/locale.c | 2 +- dlls/msvcrt/mbcs.c | 13 +++++++++---- dlls/msvcrt/msvcrt.h | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index b196cee..017d358 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -842,7 +842,7 @@ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) } } - _setmbcp_l(loc->locinfo->lc_id[MSVCRT_LC_CTYPE].wCodePage, loc->mbcinfo); + _setmbcp_l(loc->locinfo->lc_id[MSVCRT_LC_CTYPE].wCodePage, lcid[MSVCRT_LC_CTYPE], loc->mbcinfo); if(lcid[MSVCRT_LC_MONETARY] && (category==MSVCRT_LC_ALL || category==MSVCRT_LC_MONETARY)) { if(update_threadlocinfo_category(lcid[MSVCRT_LC_MONETARY], loc, MSVCRT_LC_MONETARY)) { diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index 737f690..e9adbd8 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -184,7 +184,7 @@ int* CDECL ___mb_cur_max_l_func(MSVCRT__locale_t locale) /********************************************************************* * INTERNAL: _setmbcp_l */ -int _setmbcp_l(int cp, MSVCRT_pthreadmbcinfo mbcinfo) +int _setmbcp_l(int cp, LCID lcid, MSVCRT_pthreadmbcinfo mbcinfo) { const char format[] = ".%d"; @@ -222,8 +222,13 @@ int _setmbcp_l(int cp, MSVCRT_pthreadmbcinfo mbcinfo) break; } - sprintf(bufA, format, newcp); - mbcinfo->mblcid = MSVCRT_locale_to_LCID(bufA); + if(lcid == -1) { + sprintf(bufA, format, newcp); + mbcinfo->mblcid = MSVCRT_locale_to_LCID(bufA); + } else { + mbcinfo->mblcid = lcid; + } + if(mbcinfo->mblcid == -1) { WARN("Can't assign LCID to codepage (%d)\n", mbcinfo->mblcid); @@ -347,7 +352,7 @@ int _setmbcp_l(int cp, MSVCRT_pthreadmbcinfo mbcinfo) */ int CDECL _setmbcp(int cp) { - return _setmbcp_l(cp, NULL); + return _setmbcp_l(cp, -1, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 14bf972..671eb5b 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -888,7 +888,7 @@ MSVCRT_pthreadmbcinfo get_mbcinfo(void); void __cdecl MSVCRT__free_locale(MSVCRT__locale_t); void free_locinfo(MSVCRT_pthreadlocinfo); void free_mbcinfo(MSVCRT_pthreadmbcinfo); -int _setmbcp_l(int, MSVCRT_pthreadmbcinfo); +int _setmbcp_l(int, LCID, MSVCRT_pthreadmbcinfo); #ifndef __WINE_MSVCRT_TEST int __cdecl MSVCRT__write(int,const void*,unsigned int);

1 0

Bruno Jesus : shell32: Don' t parse command line if numargs is NULL in CommandLineToArgvW.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: f621f8ea787df007b55e4369563502eb69cc421b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f621f8ea787df007b55e43695… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Oct 25 23:35:13 2011 -0200 shell32: Don't parse command line if numargs is NULL in CommandLineToArgvW. --- dlls/shell32/shell32_main.c | 12 ++++++++---- dlls/shell32/tests/shlexec.c | 10 ++++++++++ 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c index 981a245..2561f8c 100644 --- a/dlls/shell32/shell32_main.c +++ b/dlls/shell32/shell32_main.c @@ -92,6 +92,12 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) LPWSTR cmdline; int in_quotes,bcount; + if(!numargs) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + if (*lpCmdline==0) { /* Return the path to the executable */ @@ -113,8 +119,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) LocalFree( argv ); } argv[0]=(LPWSTR)(argv+1); - if (numargs) - *numargs=1; + *numargs=1; return argv; } @@ -228,8 +233,7 @@ LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCmdline, int* numargs) *d='\0'; argv[argc++]=arg; } - if (numargs) - *numargs=argc; + *numargs=argc; return argv; } diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 5542ea5..1c5fe7f 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -2157,6 +2157,7 @@ static void test_commandline(void) LPWSTR *args = (LPWSTR*)0xdeadcafe, pbuf; INT numargs = -1; size_t buflen; + DWORD lerror; wsprintfW(cmdline,fmt1,one,two,three,four); args=CommandLineToArgvW(cmdline,&numargs); @@ -2171,6 +2172,15 @@ static void test_commandline(void) ok(lstrcmpW(args[2],three)==0,"arg2 is not as expected\n"); ok(lstrcmpW(args[3],four)==0,"arg3 is not as expected\n"); + SetLastError(0xdeadbeef); + args=CommandLineToArgvW(cmdline,NULL); + lerror=GetLastError(); + ok(args == NULL && lerror == ERROR_INVALID_PARAMETER, "expected NULL with ERROR_INVALID_PARAMETER got %p with %d\n",args,lerror); + SetLastError(0xdeadbeef); + args=CommandLineToArgvW(NULL,NULL); + lerror=GetLastError(); + ok(args == NULL && lerror == ERROR_INVALID_PARAMETER, "expected NULL with ERROR_INVALID_PARAMETER got %p with %d\n",args,lerror); + wsprintfW(cmdline,fmt2,one,two,three,four); args=CommandLineToArgvW(cmdline,&numargs); ok(numargs == 5, "expected 5 args, got %i\n",numargs);

1 0

Alexandre Julliard : gdi32: Implement GetKerningPairs as a standard driver entry point.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 0c968201047ffe13054e2f3f1ee62eace252709f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c968201047ffe13054e2f3f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 16:39:53 2011 +0200 gdi32: Implement GetKerningPairs as a standard driver entry point. --- dlls/gdi32/font.c | 8 ++++---- dlls/gdi32/freetype.c | 33 +++++++++++++++++++-------------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 26eba55..9859f3c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2664,7 +2664,8 @@ DWORD WINAPI GetKerningPairsW( HDC hDC, DWORD cPairs, LPKERNINGPAIR lpKerningPairs ) { DC *dc; - DWORD ret = 0; + DWORD ret; + PHYSDEV dev; TRACE("(%p,%d,%p)\n", hDC, cPairs, lpKerningPairs); @@ -2677,9 +2678,8 @@ DWORD WINAPI GetKerningPairsW( HDC hDC, DWORD cPairs, dc = get_dc_ptr(hDC); if (!dc) return 0; - if (dc->gdiFont) - ret = WineEngGetKerningPairs(dc->gdiFont, cPairs, lpKerningPairs); - + dev = GET_DC_PHYSDEV( dc, pGetKerningPairs ); + ret = dev->funcs->pGetKerningPairs( dev, cPairs, lpKerningPairs ); release_dc_ptr( dc ); return ret; } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a98cf36..6d21cc9 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6896,7 +6896,10 @@ static DWORD parse_format0_kern_subtable(GdiFont *font, return nPairs; } -DWORD WineEngGetKerningPairs(GdiFont *font, DWORD cPairs, KERNINGPAIR *kern_pair) +/************************************************************* + * freetype_GetKerningPairs + */ +static DWORD freetype_GetKerningPairs( PHYSDEV dev, DWORD cPairs, KERNINGPAIR *kern_pair ) { DWORD length; void *buf; @@ -6904,6 +6907,14 @@ DWORD WineEngGetKerningPairs(GdiFont *font, DWORD cPairs, KERNINGPAIR *kern_pair const struct TT_kern_subtable *tt_kern_subtable; USHORT i, nTables; USHORT *glyph_to_char; + GdiFont *font; + struct freetype_physdev *physdev = get_freetype_dev( dev ); + + if (!(font = physdev->font)) + { + dev = GET_NEXT_PHYSDEV( dev, pGetKerningPairs ); + return dev->funcs->pGetKerningPairs( dev, cPairs, kern_pair ); + } GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); @@ -6913,11 +6924,11 @@ DWORD WineEngGetKerningPairs(GdiFont *font, DWORD cPairs, KERNINGPAIR *kern_pair { cPairs = min(cPairs, font->total_kern_pairs); memcpy(kern_pair, font->kern_pairs, cPairs * sizeof(*kern_pair)); - LeaveCriticalSection( &freetype_cs ); - return cPairs; } + else cPairs = font->total_kern_pairs; + LeaveCriticalSection( &freetype_cs ); - return font->total_kern_pairs; + return cPairs; } font->total_kern_pairs = 0; @@ -7038,11 +7049,11 @@ DWORD WineEngGetKerningPairs(GdiFont *font, DWORD cPairs, KERNINGPAIR *kern_pair { cPairs = min(cPairs, font->total_kern_pairs); memcpy(kern_pair, font->kern_pairs, cPairs * sizeof(*kern_pair)); - LeaveCriticalSection( &freetype_cs ); - return cPairs; } + else cPairs = font->total_kern_pairs; + LeaveCriticalSection( &freetype_cs ); - return font->total_kern_pairs; + return cPairs; } static const struct gdi_dc_funcs freetype_funcs = @@ -7097,7 +7108,7 @@ static const struct gdi_dc_funcs freetype_funcs = freetype_GetGlyphOutline, /* pGetGlyphOutline */ NULL, /* pGetICMProfile */ NULL, /* pGetImage */ - NULL, /* pGetKerningPairs */ + freetype_GetKerningPairs, /* pGetKerningPairs */ NULL, /* pGetNearestColor */ NULL, /* pGetOutlineTextMetrics */ NULL, /* pGetPixel */ @@ -7267,12 +7278,6 @@ BOOL WINAPI GetRasterizerCaps( LPRASTERIZER_STATUS lprs, UINT cbNumBytes) return TRUE; } -DWORD WineEngGetKerningPairs(GdiFont *font, DWORD cPairs, KERNINGPAIR *kern_pair) -{ - ERR("called but we don't have FreeType\n"); - return 0; -} - BOOL WineEngRealizationInfo(GdiFont *font, realization_info_t *info) { ERR("called but we don't have FreeType\n"); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index d0727a2..5e685d3 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -293,7 +293,6 @@ extern INT WineEngAddFontResourceEx(LPCWSTR, DWORD, PVOID) DECLSPEC_HIDDEN; extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC_HIDDEN; extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; extern DWORD WineEngGetFontData(GdiFont*, DWORD, DWORD, LPVOID, DWORD) DECLSPEC_HIDDEN; -extern DWORD WineEngGetKerningPairs(GdiFont*, DWORD, KERNINGPAIR *) DECLSPEC_HIDDEN; extern BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) DECLSPEC_HIDDEN; extern UINT WineEngGetOutlineTextMetrics(GdiFont*, UINT, LPOUTLINETEXTMETRICW) DECLSPEC_HIDDEN; extern UINT WineEngGetTextCharsetInfo(GdiFont *font, LPFONTSIGNATURE fs, DWORD flags) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Implement GetOutlineTextMetrics as a standard driver entry point.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: ce8d7b4601b00f75ecec28e69780fe29e147fdcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce8d7b4601b00f75ecec28e69… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 16:49:18 2011 +0200 gdi32: Implement GetOutlineTextMetrics as a standard driver entry point. --- dlls/gdi32/font.c | 113 ++++++++++++++++++++-------------------------- dlls/gdi32/freetype.c | 36 +++++++-------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 66 insertions(+), 84 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce8d7b4601b00f75ecec2…

1 0

Alexandre Julliard : gdi32: Implement GetTextCharsetInfo as a standard driver entry point.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: 1740f34ffbafc3f250a225ffbdb1d859726711d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1740f34ffbafc3f250a225ffb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 16:55:16 2011 +0200 gdi32: Implement GetTextCharsetInfo as a standard driver entry point. --- dlls/gdi32/font.c | 11 ++++------- dlls/gdi32/freetype.c | 24 ++++++++++++++---------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 5e55e31..38ad477 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -472,10 +472,7 @@ HFONT WINAPI CreateFontW( INT height, INT width, INT esc, static void update_font_code_page( DC *dc ) { CHARSETINFO csi; - int charset = DEFAULT_CHARSET; - - if (dc->gdiFont) - charset = WineEngGetTextCharsetInfo( dc->gdiFont, NULL, 0 ); + int charset = GetTextCharsetInfo( dc->hSelf, NULL, 0 ); /* Hmm, nicely designed api this one! */ if (TranslateCharsetInfo( ULongToPtr(charset), &csi, TCI_SRCCHARSET) ) @@ -3261,12 +3258,12 @@ UINT WINAPI GetTextCharsetInfo(HDC hdc, LPFONTSIGNATURE fs, DWORD flags) { UINT ret = DEFAULT_CHARSET; DC *dc = get_dc_ptr(hdc); + PHYSDEV dev; if (dc) { - if (dc->gdiFont) - ret = WineEngGetTextCharsetInfo(dc->gdiFont, fs, flags); - + dev = GET_DC_PHYSDEV( dc, pGetTextCharsetInfo ); + ret = dev->funcs->pGetTextCharsetInfo( dev, fs, flags ); release_dc_ptr( dc ); } diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5d5e8a5..31f52b8 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6602,10 +6602,20 @@ INT WineEngGetTextFace(GdiFont *font, INT count, LPWSTR str) return n; } -UINT WineEngGetTextCharsetInfo(GdiFont *font, LPFONTSIGNATURE fs, DWORD flags) +/************************************************************* + * freetype_GetTextCharsetInfo + */ +static UINT freetype_GetTextCharsetInfo( PHYSDEV dev, LPFONTSIGNATURE fs, DWORD flags ) { - if (fs) *fs = font->fs; - return font->charset; + struct freetype_physdev *physdev = get_freetype_dev( dev ); + + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pGetTextCharsetInfo ); + return dev->funcs->pGetTextCharsetInfo( dev, fs, flags ); + } + if (fs) *fs = physdev->font->fs; + return physdev->font->charset; } BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) @@ -7119,7 +7129,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pGetPixel */ NULL, /* pGetPixelFormat */ NULL, /* pGetSystemPaletteEntries */ - NULL, /* pGetTextCharsetInfo */ + freetype_GetTextCharsetInfo, /* pGetTextCharsetInfo */ freetype_GetTextExtentExPoint, /* pGetTextExtentExPoint */ NULL, /* pGetTextExtentExPointI */ NULL, /* pGetTextFace */ @@ -7249,12 +7259,6 @@ HANDLE WineEngAddFontMemResourceEx(PVOID pbFont, DWORD cbFont, PVOID pdv, DWORD return NULL; } -UINT WineEngGetTextCharsetInfo(GdiFont *font, LPFONTSIGNATURE fs, DWORD flags) -{ - FIXME("(%p, %p, %u): stub\n", font, fs, flags); - return DEFAULT_CHARSET; -} - BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) { return FALSE; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 3e9cad6..365d158 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -294,7 +294,6 @@ extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; extern DWORD WineEngGetFontData(GdiFont*, DWORD, DWORD, LPVOID, DWORD) DECLSPEC_HIDDEN; extern BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) DECLSPEC_HIDDEN; -extern UINT WineEngGetTextCharsetInfo(GdiFont *font, LPFONTSIGNATURE fs, DWORD flags) DECLSPEC_HIDDEN; extern BOOL WineEngGetTextExtentExPointI(GdiFont*, const WORD *, INT, INT, LPINT, LPINT, LPSIZE) DECLSPEC_HIDDEN; extern INT WineEngGetTextFace(GdiFont*, INT, LPWSTR) DECLSPEC_HIDDEN; extern BOOL WineEngFontIsLinked(GdiFont*) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : gdi32: Implement GetTextExtentExPointI as a standard driver entry point.
by Alexandre Julliard 26 Oct '11

26 Oct '11

Module: wine Branch: master Commit: a2de6a8766e1b28288f18983741ffd35d502fcdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2de6a8766e1b28288f189837… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 20 17:03:17 2011 +0200 gdi32: Implement GetTextExtentExPointI as a standard driver entry point. --- dlls/gdi32/font.c | 22 +++++++--------------- dlls/gdi32/freetype.c | 31 +++++++++++++++---------------- dlls/gdi32/gdi_private.h | 1 - 3 files changed, 22 insertions(+), 32 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 38ad477..98529db 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -945,7 +945,8 @@ BOOL WINAPI GetTextExtentPoint32W( BOOL WINAPI GetTextExtentExPointI( HDC hdc, const WORD *indices, INT count, INT max_ext, LPINT nfit, LPINT dxs, LPSIZE size ) { - BOOL ret = FALSE; + PHYSDEV dev; + BOOL ret; DC *dc; if (count < 0) return FALSE; @@ -953,20 +954,11 @@ BOOL WINAPI GetTextExtentExPointI( HDC hdc, const WORD *indices, INT count, INT dc = get_dc_ptr( hdc ); if (!dc) return FALSE; - if(dc->gdiFont) - { - ret = WineEngGetTextExtentExPointI(dc->gdiFont, indices, count, max_ext, nfit, dxs, size); - size->cx = abs(INTERNAL_XDSTOWS(dc, size->cx)); - size->cy = abs(INTERNAL_YDSTOWS(dc, size->cy)); - size->cx += count * dc->charExtra; - } - else - { - PHYSDEV physdev = GET_DC_PHYSDEV( dc, pGetTextExtentExPoint ); - FIXME("calling GetTextExtentExPoint\n"); - ret = physdev->funcs->pGetTextExtentExPoint( physdev, indices, count, max_ext, nfit, dxs, size ); - } - + dev = GET_DC_PHYSDEV( dc, pGetTextExtentExPointI ); + ret = dev->funcs->pGetTextExtentExPointI( dev, indices, count, max_ext, nfit, dxs, size ); + size->cx = abs(INTERNAL_XDSTOWS(dc, size->cx)); + size->cy = abs(INTERNAL_YDSTOWS(dc, size->cy)); + size->cx += count * dc->charExtra; release_dc_ptr( dc ); TRACE("(%p %p %d %p): returning %d x %d\n", diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 31f52b8..7ca7262 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6501,30 +6501,36 @@ static BOOL freetype_GetTextExtentExPoint( PHYSDEV dev, LPCWSTR wstr, INT count, } /************************************************************* - * WineEngGetTextExtentExPointI - * + * freetype_GetTextExtentExPointI */ -BOOL WineEngGetTextExtentExPointI(GdiFont *font, const WORD *indices, INT count, - INT max_ext, LPINT pnfit, LPINT dxs, LPSIZE size) +static BOOL freetype_GetTextExtentExPointI( PHYSDEV dev, const WORD *indices, INT count, + INT max_ext, LPINT pnfit, LPINT dxs, LPSIZE size ) { static const MAT2 identity = { {0,1},{0,0},{0,0},{0,1} }; INT idx; INT nfit = 0, ext; GLYPHMETRICS gm; TEXTMETRICW tm; + struct freetype_physdev *physdev = get_freetype_dev( dev ); + + if (!physdev->font) + { + dev = GET_NEXT_PHYSDEV( dev, pGetTextExtentExPointI ); + return dev->funcs->pGetTextExtentExPointI( dev, indices, count, max_ext, pnfit, dxs, size ); + } - TRACE("%p, %p, %d, %d, %p\n", font, indices, count, max_ext, size); + TRACE("%p, %p, %d, %d, %p\n", physdev->font, indices, count, max_ext, size); GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs ); size->cx = 0; - get_text_metrics(font, &tm); + get_text_metrics(physdev->font, &tm); size->cy = tm.tmHeight; for(idx = 0; idx < count; idx++) { - get_glyph_outline(font, indices[idx], GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, NULL, &identity); - size->cx += FONT_GM(font,indices[idx])->adv; + get_glyph_outline(physdev->font, indices[idx], GGO_METRICS | GGO_GLYPH_INDEX, &gm, 0, NULL, &identity); + size->cx += FONT_GM(physdev->font,indices[idx])->adv; ext = size->cx; if (! pnfit || ext <= max_ext) { ++nfit; @@ -7131,7 +7137,7 @@ static const struct gdi_dc_funcs freetype_funcs = NULL, /* pGetSystemPaletteEntries */ freetype_GetTextCharsetInfo, /* pGetTextCharsetInfo */ freetype_GetTextExtentExPoint, /* pGetTextExtentExPoint */ - NULL, /* pGetTextExtentExPointI */ + freetype_GetTextExtentExPointI, /* pGetTextExtentExPointI */ NULL, /* pGetTextFace */ freetype_GetTextMetrics, /* pGetTextMetrics */ NULL, /* pIntersectClipRect */ @@ -7221,13 +7227,6 @@ BOOL WineEngDestroyFontInstance(HFONT hfont) return FALSE; } -BOOL WineEngGetTextExtentExPointI(GdiFont *font, const WORD *indices, INT count, - INT max_ext, LPINT nfit, LPINT dx, LPSIZE size) -{ - ERR("called but we don't have FreeType\n"); - return FALSE; -} - DWORD WineEngGetFontData(GdiFont *font, DWORD table, DWORD offset, LPVOID buf, DWORD cbData) { diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index 365d158..ee7aacf 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -294,7 +294,6 @@ extern HANDLE WineEngAddFontMemResourceEx(PVOID, DWORD, PVOID, LPDWORD) DECLSPEC extern BOOL WineEngDestroyFontInstance(HFONT handle) DECLSPEC_HIDDEN; extern DWORD WineEngGetFontData(GdiFont*, DWORD, DWORD, LPVOID, DWORD) DECLSPEC_HIDDEN; extern BOOL WineEngGetLinkedHFont(DC *dc, WCHAR c, HFONT *new_hfont, UINT *glyph) DECLSPEC_HIDDEN; -extern BOOL WineEngGetTextExtentExPointI(GdiFont*, const WORD *, INT, INT, LPINT, LPINT, LPSIZE) DECLSPEC_HIDDEN; extern INT WineEngGetTextFace(GdiFont*, INT, LPWSTR) DECLSPEC_HIDDEN; extern BOOL WineEngFontIsLinked(GdiFont*) DECLSPEC_HIDDEN; extern BOOL WineEngInit(void) DECLSPEC_HIDDEN;

1 0