October 2011 - Wine-Commits

Piotr Caban : msxml3/tests: Tests more XMLSAXReader versions.
by Alexandre Julliard Oct. 25, 2011

Oct. 25, 2011

Module: wine Branch: master Commit: 6238926a2e5c94891b7b81afa7ef073908ac3c86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6238926a2e5c94891b7b81afa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 24 20:09:12 2011 +0200 msxml3/tests: Tests more XMLSAXReader versions. --- dlls/msxml3/tests/saxreader.c | 166 +++++++++++++++++++++++++++-------------- 1 files changed, 109 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6238926a2e5c94891b7b8…

1 0

Henri Verbeet : wined3d: Upload directly from the source surface in wined3d_surface_blt(), if possible.
by Alexandre Julliard Oct. 25, 2011

Oct. 25, 2011

Module: wine Branch: master Commit: 2da4f87a7e7551f17cd650ef6d8596f595efc13b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da4f87a7e7551f17cd650ef6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 24 20:45:42 2011 +0200 wined3d: Upload directly from the source surface in wined3d_surface_blt(), if possible. This avoids either loading sysmem surfaces into video memory (wasting GPU memory) and then doing a blit on the GPU, or downloading GPU surfaces to sysmem, doing a blit on the CPU, and likely uploading it again. This mostly matters for ddraw and d3d8 applications, d3d9 already has to go through wined3d_device_update_surface() to transfer data from sysmem surfaces to GPU surfaces. --- dlls/wined3d/device.c | 116 +--------------------------------- dlls/wined3d/surface.c | 136 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 12 +++- 3 files changed, 145 insertions(+), 119 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2da4f87a7e7551f17cd65…

1 0

Jacek Caban : jscript: Moved return_type_t declaration to engine.c.
by Alexandre Julliard Oct. 25, 2011

Oct. 25, 2011

Module: wine Branch: master Commit: 6ffe4cb59fd62e7ce9c384bf098623b138f1e5ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ffe4cb59fd62e7ce9c384bf0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 25 11:56:36 2011 +0200 jscript: Moved return_type_t declaration to engine.c. --- dlls/jscript/engine.c | 10 ++++++++++ dlls/jscript/engine.h | 10 +--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 160a67b..130fe41 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -32,6 +32,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); #define EXPR_NEWREF 0x0002 #define EXPR_STRREF 0x0004 +struct _return_type_t { + enum{ + RT_NORMAL, + RT_RETURN, + RT_BREAK, + RT_CONTINUE + } type; + jsexcept_t ei; +}; + static inline HRESULT stat_eval(script_ctx_t *ctx, statement_t *stat, return_type_t *rt, VARIANT *ret) { return stat->eval(ctx, stat, rt, ret); diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 306e962..9b2e2b5 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -156,15 +156,7 @@ typedef struct _variable_declaration_t { struct _variable_declaration_t *next; } variable_declaration_t; -typedef struct { - enum{ - RT_NORMAL, - RT_RETURN, - RT_BREAK, - RT_CONTINUE - } type; - jsexcept_t ei; -} return_type_t; +typedef struct _return_type_t return_type_t; typedef HRESULT (*statement_eval_t)(script_ctx_t*,statement_t*,return_type_t*,VARIANT*);

1 0

Alexandre Julliard : gdi32: Rename the EnumDeviceFonts entry point to EnumFonts since it' s not limited to device fonts.
by Alexandre Julliard Oct. 25, 2011

Oct. 25, 2011

Module: wine Branch: master Commit: 2b1b11d6816cd98553f2199920e4b56810a2fea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b1b11d6816cd98553f219992… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 19 15:37:10 2011 +0200 gdi32: Rename the EnumDeviceFonts entry point to EnumFonts since it's not limited to device fonts. --- dlls/gdi32/dibdrv/dc.c | 2 +- dlls/gdi32/driver.c | 4 ++-- dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/font.c | 4 ++-- dlls/gdi32/freetype.c | 6 +++--- dlls/gdi32/mfdrv/init.c | 2 +- dlls/wineps.drv/builtin.c | 8 ++++---- dlls/wineps.drv/init.c | 2 +- dlls/wineps.drv/psdrv.h | 2 +- dlls/winex11.drv/init.c | 2 +- dlls/winex11.drv/x11drv.h | 3 +-- dlls/winex11.drv/xfont.c | 8 ++++---- dlls/winex11.drv/xrender.c | 2 +- include/wine/gdi_driver.h | 2 +- 14 files changed, 24 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b1b11d6816cd98553f21…

1 0

Piotr Caban : msxml3: Make positions returned by ISAXLocator compatible with msxml6.
by Alexandre Julliard Oct. 25, 2011

Oct. 25, 2011

Module: wine Branch: master Commit: e84c41028be1761c4123cb76b61ff761ab60a259 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e84c41028be1761c4123cb76b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 24 20:08:46 2011 +0200 msxml3: Make positions returned by ISAXLocator compatible with msxml6. --- dlls/msxml3/factory.c | 10 ++++++-- dlls/msxml3/msxml_private.h | 2 +- dlls/msxml3/saxreader.c | 48 ++++++++++++++++++++++++++++++++++++------ 3 files changed, 49 insertions(+), 11 deletions(-) diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c index 0452ef7..1192780 100644 --- a/dlls/msxml3/factory.c +++ b/dlls/msxml3/factory.c @@ -81,7 +81,12 @@ static const struct clsid_version_t clsid_versions_table[] = { &CLSID_MXXMLWriter, MSXML_DEFAULT }, { &CLSID_MXXMLWriter30, MSXML3 }, { &CLSID_MXXMLWriter40, MSXML4 }, - { &CLSID_MXXMLWriter60, MSXML6 } + { &CLSID_MXXMLWriter60, MSXML6 }, + + { &CLSID_SAXXMLReader, MSXML_DEFAULT }, + { &CLSID_SAXXMLReader30, MSXML3 }, + { &CLSID_SAXXMLReader40, MSXML4 }, + { &CLSID_SAXXMLReader60, MSXML6 } }; static MSXML_VERSION get_msxml_version(const GUID *clsid) @@ -267,7 +272,6 @@ static HRESULT DOMClassFactory_Create(const GUID *clsid, REFIID riid, void **ppv } static ClassFactory xmldoccf = { { &ClassFactoryVtbl }, XMLDocument_create }; -static ClassFactory saxreadcf = { { &ClassFactoryVtbl }, SAXXMLReader_create }; static ClassFactory httpreqcf = { { &ClassFactoryVtbl }, XMLHTTPRequest_create }; static ClassFactory xsltemplatecf = { { &ClassFactoryVtbl }, XSLTemplate_create }; static ClassFactory mxnsmanagercf = { {&ClassFactoryVtbl }, MXNamespaceManager_create }; @@ -317,7 +321,7 @@ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, void **ppv ) IsEqualCLSID( rclsid, &CLSID_SAXXMLReader40 ) || IsEqualCLSID( rclsid, &CLSID_SAXXMLReader60 )) { - cf = &saxreadcf.IClassFactory_iface; + return DOMClassFactory_Create(rclsid, riid, ppv, SAXXMLReader_create); } else if( IsEqualCLSID( rclsid, &CLSID_XMLHTTPRequest ) || IsEqualCLSID( rclsid, &CLSID_XMLHTTP) || diff --git a/dlls/msxml3/msxml_private.h b/dlls/msxml3/msxml_private.h index 3e057bb..2962a0e 100644 --- a/dlls/msxml3/msxml_private.h +++ b/dlls/msxml3/msxml_private.h @@ -433,7 +433,7 @@ extern IXMLDOMParseError *create_parseError( LONG code, BSTR url, BSTR reason, B extern HRESULT DOMDocument_create(MSXML_VERSION, IUnknown*, void**) DECLSPEC_HIDDEN; extern HRESULT SchemaCache_create(MSXML_VERSION, IUnknown*, void**) DECLSPEC_HIDDEN; extern HRESULT XMLDocument_create(IUnknown*, void**) DECLSPEC_HIDDEN; -extern HRESULT SAXXMLReader_create(IUnknown*, void**) DECLSPEC_HIDDEN; +extern HRESULT SAXXMLReader_create(MSXML_VERSION, IUnknown*, void**) DECLSPEC_HIDDEN; extern HRESULT XMLHTTPRequest_create(IUnknown*, void **) DECLSPEC_HIDDEN; extern HRESULT XSLTemplate_create(IUnknown*, void**) DECLSPEC_HIDDEN; extern HRESULT MXWriter_create(MSXML_VERSION, IUnknown*, void**) DECLSPEC_HIDDEN; diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 45f7e909..e43afce 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -92,6 +92,7 @@ typedef struct _saxreader BOOL isParsing; struct bstrpool pool; enum ReaderFeatures features; + MSXML_VERSION version; } saxreader; typedef struct _saxlocator @@ -1155,6 +1156,13 @@ static void libxmlStartDocument(void *ctx) saxlocator *This = ctx; HRESULT hr; + if(This->saxreader->version >= MSXML6) { + xmlChar *end = (xmlChar*)This->pParserCtxt->input->cur; + while(end>This->pParserCtxt->input->base && *end!='>') + end--; + update_position(This, end); + } + if(has_content_handler(This)) { if(This->vbInterface) @@ -1174,8 +1182,15 @@ static void libxmlEndDocument(void *ctx) saxlocator *This = ctx; HRESULT hr; - This->column = 0; - This->line = 0; + if(This->saxreader->version >= MSXML6) { + update_position(This, NULL); + if(This->column > 1) + This->line++; + This->column = 0; + } else { + This->column = 0; + This->line = 0; + } if(This->ret != S_OK) return; @@ -1208,7 +1223,9 @@ static void libxmlStartElementNS( saxattributes *attr; int index; - if(*(This->pParserCtxt->input->cur) == '/') + if(This->saxreader->version >= MSXML6) + update_position(This, NULL); + else if(*(This->pParserCtxt->input->cur) == '/') update_position(This, (xmlChar*)This->pParserCtxt->input->cur+2); else update_position(This, (xmlChar*)This->pParserCtxt->input->cur+1); @@ -1274,9 +1291,13 @@ static void libxmlEndElementNS( int nsNr, index; end = (xmlChar*)This->pParserCtxt->input->cur; - if(*(end-1) != '>' || *(end-2) != '/') + if(This->saxreader->version >= MSXML6) { + while(end>This->pParserCtxt->input->base && *end!='>') + end--; + } else if(*(end-1) != '>' || *(end-2) != '/') { while(end-2>=This->pParserCtxt->input->base && *(end-2)!='<' && *(end-1)!='/') end--; + } update_position(This, end); @@ -1362,6 +1383,18 @@ static void libxmlCharacters( if(!lastEvent) *end = '\n'; + if(This->saxreader->version >= MSXML6) { + update_position(This, end); + if(*end == '\n') { + This->line++; + This->column = 1; + } else + This->column++; + + if(!lastEvent) + This->column = 0; + } + Chars = pooled_bstr_from_xmlCharN(&This->saxreader->pool, cur, end-cur+1); if(This->vbInterface) hr = IVBSAXContentHandler_characters( @@ -1905,7 +1938,7 @@ static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator, B locator->publicId = NULL; locator->systemId = NULL; locator->lastCur = NULL; - locator->line = 0; + locator->line = (reader->version>=MSXML6 ? 1 : 0); locator->column = 0; locator->ret = S_OK; locator->nsStackSize = 8; @@ -3046,7 +3079,7 @@ static const struct ISAXXMLReaderVtbl isaxreader_vtbl = isaxxmlreader_parseURL }; -HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) +HRESULT SAXXMLReader_create(MSXML_VERSION version, IUnknown *pUnkOuter, LPVOID *ppObj) { saxreader *reader; @@ -3072,6 +3105,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) reader->pool.index = 0; reader->pool.len = 0; reader->features = Namespaces; + reader->version = version; memset(&reader->sax, 0, sizeof(xmlSAXHandler)); reader->sax.initialized = XML_SAX2_MAGIC; @@ -3095,7 +3129,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) #else -HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) +HRESULT SAXXMLReader_create(MSXML_VERSION version, IUnknown *pUnkOuter, LPVOID *ppObj) { MESSAGE("This program tried to use a SAX XML Reader object, but\n" "libxml2 support was not present at compile time.\n");

1 0

Alexandre Julliard : gdi32: Implement EnumDeviceFonts as a standard driver entry point.
by Alexandre Julliard Oct. 25, 2011

Oct. 25, 2011

Module: wine Branch: master Commit: cbd81d391c641083ba05ddbedde40ece4a161f28 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cbd81d391c641083ba05ddbed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 19 15:34:21 2011 +0200 gdi32: Implement EnumDeviceFonts as a standard driver entry point. --- dlls/gdi32/driver.c | 2 +- dlls/gdi32/font.c | 58 +++++++++++++++----------------------------- dlls/gdi32/freetype.c | 18 ++++--------- dlls/gdi32/gdi_private.h | 1 - dlls/wineps.drv/builtin.c | 18 +++++++------ dlls/winex11.drv/xfont.c | 20 ++++++++------- 6 files changed, 48 insertions(+), 69 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cbd81d391c641083ba05d…

1 0

Alexandre Julliard : gdi32: Add driver entry points for a number of font functions.
by Alexandre Julliard Oct. 25, 2011

Oct. 25, 2011

Module: wine Branch: master Commit: a8444d7fd18a05c06cc9f785a1c8780e68361e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8444d7fd18a05c06cc9f785a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 19 21:51:39 2011 +0200 gdi32: Add driver entry points for a number of font functions. --- dlls/gdi32/dibdrv/dc.c | 13 +++++++ dlls/gdi32/driver.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ dlls/gdi32/enhmfdrv/init.c | 13 +++++++ dlls/gdi32/freetype.c | 13 +++++++ dlls/gdi32/mfdrv/init.c | 13 +++++++ dlls/wineps.drv/init.c | 13 +++++++ dlls/winex11.drv/init.c | 13 +++++++ dlls/winex11.drv/xrender.c | 13 +++++++ include/wine/gdi_driver.h | 15 ++++++++- 9 files changed, 185 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8444d7fd18a05c06cc9f…

1 0

Piotr Caban : msxml3: Accept S_FALSE as a valid callback result when msxml6 is used.
by Alexandre Julliard Oct. 25, 2011

Oct. 25, 2011

Module: wine Branch: master Commit: 2b671cad9637b8151bdf2c532cb9c9273e0bdf04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b671cad9637b8151bdf2c532… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Oct 24 20:08:55 2011 +0200 msxml3: Accept S_FALSE as a valid callback result when msxml6 is used. --- dlls/msxml3/saxreader.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index e43afce..344393a 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -1170,7 +1170,7 @@ static void libxmlStartDocument(void *ctx) else hr = ISAXContentHandler_startDocument(This->saxreader->contentHandler); - if(hr != S_OK) + if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK) format_error_message_from_id(This, hr); } @@ -1201,7 +1201,7 @@ static void libxmlEndDocument(void *ctx) else hr = ISAXContentHandler_endDocument(This->saxreader->contentHandler); - if(hr != S_OK) + if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK) format_error_message_from_id(This, hr); } } @@ -1248,7 +1248,7 @@ static void libxmlStartElementNS( Prefix, SysStringLen(Prefix), Uri, SysStringLen(Uri)); - if(hr != S_OK) + if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK) { format_error_message_from_id(This, hr); return; @@ -1274,7 +1274,7 @@ static void libxmlStartElementNS( } } - if(hr != S_OK) + if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK) format_error_message_from_id(This, hr); } @@ -1320,7 +1320,7 @@ static void libxmlEndElementNS( LocalName, SysStringLen(LocalName), QName, SysStringLen(QName)); - if(hr != S_OK) + if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK) { format_error_message_from_id(This, hr); return; @@ -1339,7 +1339,7 @@ static void libxmlEndElementNS( This->saxreader->contentHandler, Prefix, SysStringLen(Prefix)); - if(hr != S_OK) + if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK) { format_error_message_from_id(This, hr); return; @@ -1404,7 +1404,7 @@ static void libxmlCharacters( This->saxreader->contentHandler, Chars, SysStringLen(Chars)); - if(hr != S_OK) + if(This->saxreader->version>=MSXML6 ? FAILED(hr) : hr!=S_OK) { format_error_message_from_id(This, hr); return;

1 0

Alexandre Julliard : gdi32: Don't return outline metrics for bitmap fonts.
by Alexandre Julliard Oct. 25, 2011

Oct. 25, 2011

Module: wine Branch: master Commit: 873bf81d3b2c5d6bb343cda11e5c79ba6a8107c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=873bf81d3b2c5d6bb343cda11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 24 23:34:05 2011 +0200 gdi32: Don't return outline metrics for bitmap fonts. --- dlls/gdi32/freetype.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index a2b57eb..85afe48 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6240,6 +6240,8 @@ UINT WineEngGetOutlineTextMetrics(GdiFont *font, UINT cbSize, TRACE("font=%p\n", font); + if (!FT_IS_SCALABLE( font->ft_face )) return 0; + GDI_CheckNotLock(); EnterCriticalSection( &freetype_cs );

1 0

Thomas Faber : riched20: Do not return incorrect values from ME_CharFromPoint[Cursor].
by Alexandre Julliard Oct. 24, 2011

Oct. 24, 2011

Module: wine Branch: master Commit: 5e0050d0010a3007d70b6f2245832337fc82cb05 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e0050d0010a3007d70b6f224… Author: Thomas Faber <thfabba(a)gmx.de> Date: Sat Oct 22 21:41:28 2011 +0200 riched20: Do not return incorrect values from ME_CharFromPoint[Cursor]. --- dlls/riched20/run.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 4a9ae7a..8a1f91f 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -434,7 +434,7 @@ int ME_CharFromPoint(ME_Context *c, int cx, ME_Run *run) int fit = 0; HGDIOBJ hOldFont; SIZE sz; - if (!run->strText->nLen) + if (!run->strText->nLen || cx <= 0) return 0; if (run->nFlags & MERF_TAB || @@ -492,7 +492,7 @@ int ME_CharFromPointCursor(ME_TextEditor *editor, int cx, ME_Run *run) ME_Context c; HGDIOBJ hOldFont; SIZE sz, sz2, sz3; - if (!run->strText->nLen) + if (!run->strText->nLen || cx <= 0) return 0; if (run->nFlags & (MERF_TAB | MERF_ENDCELL))

1 0