July 2008 - Wine-commits - list.winehq.org

Piotr Caban : msxml3: Added ISAXContentHandler_endElement event.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: 669326344fa24c53a32b7b083629f9a33c3ca6be URL: http://source.winehq.org/git/wine.git/?a=commit;h=669326344fa24c53a32b7b083… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 17 00:41:34 2008 +0200 msxml3: Added ISAXContentHandler_endElement event. --- dlls/msxml3/saxreader.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 7c79af0..854584f 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -165,6 +165,43 @@ static void libxmlStartElementNS( } } +static void libxmlEndElementNS( + void *ctx, + const xmlChar *localname, + const xmlChar *prefix, + const xmlChar *URI) +{ + BSTR NamespaceUri, LocalName, QName; + saxlocator *This = ctx; + HRESULT hr; + + This->lastColumn = xmlSAX2GetColumnNumber(This->pParserCtxt); + This->lastLine = xmlSAX2GetLineNumber(This->pParserCtxt); + + if(This->saxreader->contentHandler) + { + NamespaceUri = bstr_from_xmlChar(URI); + LocalName = bstr_from_xmlChar(localname); + QName = bstr_from_xmlChar(localname); + + hr = ISAXContentHandler_endElement( + This->saxreader->contentHandler, + NamespaceUri, SysStringLen(NamespaceUri), + LocalName, SysStringLen(LocalName), + QName, SysStringLen(QName)); + + SysFreeString(NamespaceUri); + SysFreeString(LocalName); + SysFreeString(QName); + + if(FAILED(hr)) + { + xmlStopParser(This->pParserCtxt); + This->ret = hr; + } + } +} + /*** ISAXLocator interface ***/ /*** IUnknown methods ***/ static HRESULT WINAPI isaxlocator_QueryInterface(ISAXLocator* iface, REFIID riid, void **ppvObject) @@ -966,6 +1003,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) reader->sax.startDocument = libxmlStartDocument; reader->sax.endDocument = libxmlEndDocument; reader->sax.startElementNs = libxmlStartElementNS; + reader->sax.endElementNs = libxmlEndElementNS; *ppObj = &reader->lpVtbl;

1 0

Piotr Caban : msxml3: Added ISAXContentHandler_startElement event.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: 965a2ea5dd944576ae2d260d23e71b1418f01965 URL: http://source.winehq.org/git/wine.git/?a=commit;h=965a2ea5dd944576ae2d260d2… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 17 00:41:27 2008 +0200 msxml3: Added ISAXContentHandler_startElement event. --- dlls/msxml3/saxreader.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 46 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 55da4db..7c79af0 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -120,6 +120,51 @@ static void libxmlEndDocument(void *ctx) } } +static void libxmlStartElementNS( + void *ctx, + const xmlChar *localname, + const xmlChar *prefix, + const xmlChar *URI, + int nb_namespaces, + const xmlChar **namespaces, + int nb_attributes, + int nb_defaulted, + const xmlChar **attributes) +{ + BSTR NamespaceUri, LocalName, QName; + saxlocator *This = ctx; + HRESULT hr; + + FIXME("Arguments processing not yet implemented.\n"); + + This->lastColumn = xmlSAX2GetColumnNumber(This->pParserCtxt)+1; + This->lastLine = xmlSAX2GetLineNumber(This->pParserCtxt); + + if(This->saxreader->contentHandler) + { + NamespaceUri = bstr_from_xmlChar(URI); + LocalName = bstr_from_xmlChar(localname); + QName = bstr_from_xmlChar(localname); + + hr = ISAXContentHandler_startElement( + This->saxreader->contentHandler, + NamespaceUri, SysStringLen(NamespaceUri), + LocalName, SysStringLen(LocalName), + QName, SysStringLen(QName), + NULL); + + SysFreeString(NamespaceUri); + SysFreeString(LocalName); + SysFreeString(QName); + + if(FAILED(hr)) + { + xmlStopParser(This->pParserCtxt); + This->ret = hr; + } + } +} + /*** ISAXLocator interface ***/ /*** IUnknown methods ***/ static HRESULT WINAPI isaxlocator_QueryInterface(ISAXLocator* iface, REFIID riid, void **ppvObject) @@ -920,6 +965,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) reader->sax.initialized = XML_SAX2_MAGIC; reader->sax.startDocument = libxmlStartDocument; reader->sax.endDocument = libxmlEndDocument; + reader->sax.startElementNs = libxmlStartElementNS; *ppObj = &reader->lpVtbl;

1 0

Piotr Caban : msxml3: Added ISAXContentHandler_endDocument event.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: c58b24b374698ae8595e4aa6a810c3b345ce1625 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c58b24b374698ae8595e4aa6a… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 17 00:41:19 2008 +0200 msxml3: Added ISAXContentHandler_endDocument event. --- dlls/msxml3/saxreader.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 1cbaf41..55da4db 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -101,6 +101,25 @@ static void libxmlStartDocument(void *ctx) This->lastLine = xmlSAX2GetLineNumber(This->pParserCtxt); } +static void libxmlEndDocument(void *ctx) +{ + saxlocator *This = ctx; + HRESULT hr; + + This->lastColumn = 0; + This->lastLine = 0; + + if(This->saxreader->contentHandler) + { + hr = ISAXContentHandler_endDocument(This->saxreader->contentHandler); + if(FAILED(hr)) + { + xmlStopParser(This->pParserCtxt); + This->ret = hr; + } + } +} + /*** ISAXLocator interface ***/ /*** IUnknown methods ***/ static HRESULT WINAPI isaxlocator_QueryInterface(ISAXLocator* iface, REFIID riid, void **ppvObject) @@ -900,6 +919,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) memset(&reader->sax, 0, sizeof(xmlSAXHandler)); reader->sax.initialized = XML_SAX2_MAGIC; reader->sax.startDocument = libxmlStartDocument; + reader->sax.endDocument = libxmlEndDocument; *ppObj = &reader->lpVtbl;

1 0

Piotr Caban : msxml3: Added ISAXLocator_getLineNumber and ISAXLocator_getColumnNumber partial implementation .
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: 4cdcc0256289c3b6a6c592e0c58307db1db49c82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cdcc0256289c3b6a6c592e0c… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 17 00:41:11 2008 +0200 msxml3: Added ISAXLocator_getLineNumber and ISAXLocator_getColumnNumber partial implementation. --- dlls/msxml3/saxreader.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 1a3aa37..1cbaf41 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -62,6 +62,8 @@ typedef struct _saxlocator saxreader *saxreader; HRESULT ret; xmlParserCtxtPtr pParserCtxt; + int lastLine; + int lastColumn; } saxlocator; static inline saxreader *impl_from_IVBSAXXMLReader( IVBSAXXMLReader *iface ) @@ -94,6 +96,9 @@ static void libxmlStartDocument(void *ctx) This->ret = hr; } } + + This->lastColumn = xmlSAX2GetColumnNumber(This->pParserCtxt); + This->lastLine = xmlSAX2GetLineNumber(This->pParserCtxt); } /*** ISAXLocator interface ***/ @@ -154,8 +159,8 @@ static HRESULT WINAPI isaxlocator_getColumnNumber( { saxlocator *This = impl_from_ISAXLocator( iface ); - FIXME("(%p)->(%p) stub\n", This, pnColumn); - return E_NOTIMPL; + *pnColumn = This->lastColumn; + return S_OK; } static HRESULT WINAPI isaxlocator_getLineNumber( @@ -164,8 +169,8 @@ static HRESULT WINAPI isaxlocator_getLineNumber( { saxlocator *This = impl_from_ISAXLocator( iface ); - FIXME("(%p)->(%p) stub\n", This, pnLine); - return E_NOTIMPL; + *pnLine = This->lastLine; + return S_OK; } static HRESULT WINAPI isaxlocator_getPublicId( @@ -214,6 +219,8 @@ static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator) ISAXXMLReader_AddRef((ISAXXMLReader*)&reader->lpSAXXMLReaderVtbl); locator->pParserCtxt = NULL; + locator->lastLine = 0; + locator->lastColumn = 0; locator->ret = S_OK; *ppsaxlocator = locator;

1 0

Piotr Caban : msxml3: Added ISAXContentHandler_startDocument event.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: 072383e05b3dbbf3b2395c1a08cebff6c6bbd028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=072383e05b3dbbf3b2395c1a0… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 17 00:41:01 2008 +0200 msxml3: Added ISAXContentHandler_startDocument event. --- dlls/msxml3/saxreader.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index a50adca..1a3aa37 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -79,6 +79,23 @@ static inline saxlocator *impl_from_ISAXLocator( ISAXLocator *iface ) return (saxlocator *)((char*)iface - FIELD_OFFSET(saxlocator, lpSAXLocatorVtbl)); } +/*** LibXML callbacks ***/ +static void libxmlStartDocument(void *ctx) +{ + saxlocator *This = ctx; + HRESULT hr; + + if(This->saxreader->contentHandler) + { + hr = ISAXContentHandler_startDocument(This->saxreader->contentHandler); + if(FAILED(hr)) + { + xmlStopParser(This->pParserCtxt); + This->ret = hr; + } + } +} + /*** ISAXLocator interface ***/ /*** IUnknown methods ***/ static HRESULT WINAPI isaxlocator_QueryInterface(ISAXLocator* iface, REFIID riid, void **ppvObject) @@ -875,6 +892,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) memset(&reader->sax, 0, sizeof(xmlSAXHandler)); reader->sax.initialized = XML_SAX2_MAGIC; + reader->sax.startDocument = libxmlStartDocument; *ppObj = &reader->lpVtbl;

1 0

Piotr Caban : msxml3: Added partial implementation of ISAXXMLReader_parse.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: 51c952767c8b68c4f99e576f890dbdb90cc51c66 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51c952767c8b68c4f99e576f8… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 17 00:40:53 2008 +0200 msxml3: Added partial implementation of ISAXXMLReader_parse. --- dlls/msxml3/saxreader.c | 51 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index cda75b6..a50adca 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -60,6 +60,8 @@ typedef struct _saxlocator const struct ISAXLocatorVtbl *lpSAXLocatorVtbl; LONG ref; saxreader *saxreader; + HRESULT ret; + xmlParserCtxtPtr pParserCtxt; } saxlocator; static inline saxreader *impl_from_IVBSAXXMLReader( IVBSAXXMLReader *iface ) @@ -194,6 +196,9 @@ static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator) locator->saxreader = reader; ISAXXMLReader_AddRef((ISAXXMLReader*)&reader->lpSAXXMLReaderVtbl); + locator->pParserCtxt = NULL; + locator->ret = S_OK; + *ppsaxlocator = locator; TRACE("returning %p\n", *ppsaxlocator); @@ -773,9 +778,48 @@ static HRESULT WINAPI isaxxmlreader_parse( VARIANT varInput) { saxreader *This = impl_from_ISAXXMLReader( iface ); + saxlocator *locator; + xmlChar *data = NULL; + HRESULT hr; - FIXME("(%p) stub\n", This); - return E_NOTIMPL; + FIXME("(%p) semi-stub\n", This); + + hr = SAXLocator_create(This, &locator); + if(FAILED(hr)) + return E_FAIL; + + hr = S_OK; + switch(V_VT(&varInput)) + { + case VT_BSTR: + locator->pParserCtxt = xmlNewParserCtxt(); + if(!locator->pParserCtxt) + { + hr = E_FAIL; + break; + } + data = xmlChar_from_wchar(V_BSTR(&varInput)); + xmlSetupParserForBuffer(locator->pParserCtxt, data, NULL); + + locator->pParserCtxt->sax = &locator->saxreader->sax; + locator->pParserCtxt->userData = locator; + + if(xmlParseDocument(locator->pParserCtxt)) hr = E_FAIL; + else hr = locator->ret; + break; + default: + hr = E_NOTIMPL; + } + + if(locator->pParserCtxt) + { + locator->pParserCtxt->sax = NULL; + xmlFreeParserCtxt(locator->pParserCtxt); + locator->pParserCtxt = NULL; + } + if(data) HeapFree(GetProcessHeap(), 0, data); + ISAXLocator_Release((ISAXLocator*)&locator->lpSAXLocatorVtbl); + return hr; } static HRESULT WINAPI isaxxmlreader_parseURL( @@ -829,6 +873,9 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) reader->contentHandler = NULL; reader->errorHandler = NULL; + memset(&reader->sax, 0, sizeof(xmlSAXHandler)); + reader->sax.initialized = XML_SAX2_MAGIC; + *ppObj = &reader->lpVtbl; TRACE("returning iface %p\n", *ppObj);

1 0

Piotr Caban : msxml3: Added stub implementation of ISAXLocator.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: d3e9ca7d0a058b67353dbc5123eb7ecc84a68cb0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3e9ca7d0a058b67353dbc512… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Thu Jul 17 00:40:32 2008 +0200 msxml3: Added stub implementation of ISAXLocator. --- dlls/msxml3/saxreader.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 137 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index abb2168..cda75b6 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2,6 +2,7 @@ * SAX Reader implementation * * Copyright 2008 Alistair Leslie-Hughes + * Copyright 2008 Piotr Caban * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -54,6 +55,13 @@ typedef struct _saxreader xmlSAXHandler sax; } saxreader; +typedef struct _saxlocator +{ + const struct ISAXLocatorVtbl *lpSAXLocatorVtbl; + LONG ref; + saxreader *saxreader; +} saxlocator; + static inline saxreader *impl_from_IVBSAXXMLReader( IVBSAXXMLReader *iface ) { return (saxreader *)((char*)iface - FIELD_OFFSET(saxreader, lpVtbl)); @@ -64,6 +72,135 @@ static inline saxreader *impl_from_ISAXXMLReader( ISAXXMLReader *iface ) return (saxreader *)((char*)iface - FIELD_OFFSET(saxreader, lpSAXXMLReaderVtbl)); } +static inline saxlocator *impl_from_ISAXLocator( ISAXLocator *iface ) +{ + return (saxlocator *)((char*)iface - FIELD_OFFSET(saxlocator, lpSAXLocatorVtbl)); +} + +/*** ISAXLocator interface ***/ +/*** IUnknown methods ***/ +static HRESULT WINAPI isaxlocator_QueryInterface(ISAXLocator* iface, REFIID riid, void **ppvObject) +{ + saxlocator *This = impl_from_ISAXLocator( iface ); + + TRACE("%p %s %p\n", This, debugstr_guid( riid ), ppvObject ); + + *ppvObject = NULL; + + if ( IsEqualGUID( riid, &IID_IUnknown ) || + IsEqualGUID( riid, &IID_ISAXLocator )) + { + *ppvObject = iface; + } + else + { + FIXME("interface %s not implemented\n", debugstr_guid(riid)); + return E_NOINTERFACE; + } + + ISAXLocator_AddRef( iface ); + + return S_OK; +} + +static ULONG WINAPI isaxlocator_AddRef(ISAXLocator* iface) +{ + saxlocator *This = impl_from_ISAXLocator( iface ); + TRACE("%p\n", This ); + return InterlockedIncrement( &This->ref ); +} + +static ULONG WINAPI isaxlocator_Release( + ISAXLocator* iface) +{ + saxlocator *This = impl_from_ISAXLocator( iface ); + LONG ref; + + TRACE("%p\n", This ); + + ref = InterlockedDecrement( &This->ref ); + if ( ref == 0 ) + { + ISAXXMLReader_Release((ISAXXMLReader*)&This->saxreader->lpSAXXMLReaderVtbl); + HeapFree( GetProcessHeap(), 0, This ); + } + + return ref; +} + +/*** ISAXLocator methods ***/ +static HRESULT WINAPI isaxlocator_getColumnNumber( + ISAXLocator* iface, + int *pnColumn) +{ + saxlocator *This = impl_from_ISAXLocator( iface ); + + FIXME("(%p)->(%p) stub\n", This, pnColumn); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxlocator_getLineNumber( + ISAXLocator* iface, + int *pnLine) +{ + saxlocator *This = impl_from_ISAXLocator( iface ); + + FIXME("(%p)->(%p) stub\n", This, pnLine); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxlocator_getPublicId( + ISAXLocator* iface, + const WCHAR ** ppwchPublicId) +{ + saxlocator *This = impl_from_ISAXLocator( iface ); + + FIXME("(%p)->(%p) stub\n", This, ppwchPublicId); + return E_NOTIMPL; +} + +static HRESULT WINAPI isaxlocator_getSystemId( + ISAXLocator* iface, + const WCHAR ** ppwchSystemId) +{ + saxlocator *This = impl_from_ISAXLocator( iface ); + + FIXME("(%p)->(%p) stub\n", This, ppwchSystemId); + return E_NOTIMPL; +} + +static const struct ISAXLocatorVtbl isaxlocator_vtbl = +{ + isaxlocator_QueryInterface, + isaxlocator_AddRef, + isaxlocator_Release, + isaxlocator_getColumnNumber, + isaxlocator_getLineNumber, + isaxlocator_getPublicId, + isaxlocator_getSystemId +}; + +static HRESULT SAXLocator_create(saxreader *reader, saxlocator **ppsaxlocator) +{ + saxlocator *locator; + + locator = HeapAlloc( GetProcessHeap(), 0, sizeof (*locator) ); + if( !locator ) + return E_OUTOFMEMORY; + + locator->lpSAXLocatorVtbl = &isaxlocator_vtbl; + locator->ref = 1; + + locator->saxreader = reader; + ISAXXMLReader_AddRef((ISAXXMLReader*)&reader->lpSAXXMLReaderVtbl); + + *ppsaxlocator = locator; + + TRACE("returning %p\n", *ppsaxlocator); + + return S_OK; +} + /*** IVBSAXXMLReader interface ***/ /*** IUnknown methods ***/ static HRESULT WINAPI saxxmlreader_QueryInterface(IVBSAXXMLReader* iface, REFIID riid, void **ppvObject)

1 0

Alexandre Julliard : mstask: Add stubs for the duplicate stdcall entry points.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: 17b436890baa6876b4cba8432ddcbc3215fbee9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=17b436890baa6876b4cba8432… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jul 17 13:01:40 2008 +0200 mstask: Add stubs for the duplicate stdcall entry points. --- dlls/mstask/mstask.spec | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/dlls/mstask/mstask.spec b/dlls/mstask/mstask.spec index c09f7f1..a65cae0 100644 --- a/dlls/mstask/mstask.spec +++ b/dlls/mstask/mstask.spec @@ -11,3 +11,16 @@ @ stub SASetAccountInformation @ stub SASetNSAccountInformation @ stub SetNetScheduleAccountInformation +@ stub _ConvertAtJobsToTasks(a)0 +@ stub _DllCanUnloadNow(a)0 +@ stub _DllGetClassObject(a)12 +@ stub _GetNetScheduleAccountInformation(a)12 +@ stub _NetrJobAdd(a)12 +@ stub _NetrJobDel(a)12 +@ stub _NetrJobEnum(a)20 +@ stub _NetrJobGetInfo(a)12 +@ stub _SAGetAccountInformation(a)16 +@ stub _SAGetNSAccountInformation(a)12 +@ stub _SASetAccountInformation(a)20 +@ stub _SASetNSAccountInformation(a)12 +@ stub _SetNetScheduleAccountInformation(a)12

1 0

Aric Stewart : mlang: Stub implementation of IMLangFontLink2.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: 0d7d5ebf3b0a8c41fa4c37ebf4e3ec84ad9c9b1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d7d5ebf3b0a8c41fa4c37ebf… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Jul 16 14:01:08 2008 +0900 mlang: Stub implementation of IMLangFontLink2. --- dlls/mlang/mlang.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/mlang.idl | 48 +++++++++++++++++++ 2 files changed, 178 insertions(+), 0 deletions(-) diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 8bc11b5..0920178 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -961,6 +961,7 @@ typedef struct tagMLang_impl const IMLangFontLinkVtbl *vtbl_IMLangFontLink; const IMultiLanguageVtbl *vtbl_IMultiLanguage; const IMultiLanguage3Vtbl *vtbl_IMultiLanguage3; + const IMLangFontLink2Vtbl *vtbl_IMLangFontLink2; LONG ref; DWORD total_cp, total_scripts; } MLang_impl; @@ -1002,6 +1003,14 @@ static HRESULT WINAPI MLang_QueryInterface( return S_OK; } + if (IsEqualGUID(riid, &IID_IMLangFontLink2)) + { + MLang_AddRef(This); + TRACE("Returning IID_IMLangFontLink2 %p ref = %d\n", This, This->ref); + *ppvObject = &(This->vtbl_IMLangFontLink2); + return S_OK; + } + if (IsEqualGUID(riid, &IID_IMultiLanguage) ) { MLang_AddRef(This); @@ -2568,6 +2577,126 @@ static const IMultiLanguage3Vtbl IMultiLanguage3_vtbl = fnIMultiLanguage3_DetectOutboundCodePageInIStream }; +/******************************************************************************/ +static HRESULT WINAPI fnIMLangFontLink2_QueryInterface( + IMLangFontLink2 * iface, + REFIID riid, + void** ppvObject) +{ + ICOM_THIS_MULTI(MLang_impl, vtbl_IMLangFontLink2, iface); + return MLang_QueryInterface( This, riid, ppvObject ); +} + +static ULONG WINAPI fnIMLangFontLink2_AddRef( IMLangFontLink2* iface ) +{ + ICOM_THIS_MULTI(MLang_impl, vtbl_IMLangFontLink2, iface); + return MLang_AddRef( This ); +} + +static ULONG WINAPI fnIMLangFontLink2_Release( IMLangFontLink2* iface ) +{ + ICOM_THIS_MULTI(MLang_impl, vtbl_IMLangFontLink2, iface); + return MLang_Release( This ); +} + +static HRESULT WINAPI fnIMLangFontLink2_GetCharCodePages( IMLangFontLink2* This, + WCHAR chSrc, DWORD *pdwCodePages) +{ + FIXME("(%p)->%s %p\n",This, debugstr_wn(&chSrc,1),pdwCodePages); + return E_NOTIMPL; +} + +static HRESULT WINAPI fnIMLangFontLink2_GetStrCodePages( IMLangFontLink2* This, + const WCHAR *pszSrc, long cchSrc, DWORD dwPriorityCodePages, + DWORD *pdwCodePages, long *pcchCodePages) +{ + FIXME("(%p)->%s %li %x %p %p\n",This, debugstr_wn(pszSrc,cchSrc),cchSrc,dwPriorityCodePages,pdwCodePages,pcchCodePages); + return E_NOTIMPL; +} + +static HRESULT WINAPI fnIMLangFontLink2_CodePageToCodePages(IMLangFontLink2* This, + UINT uCodePage, + DWORD *pdwCodePages) +{ + FIXME("(%p)->%i %p\n",This, uCodePage, pdwCodePages); + return E_NOTIMPL; +} + +static HRESULT WINAPI fnIMLangFontLink2_CodePagesToCodePage(IMLangFontLink2* This, + DWORD dwCodePages, UINT uDefaultCodePage, UINT *puCodePage) +{ + FIXME("(%p)->%i %i %p\n",This, dwCodePages, uDefaultCodePage, puCodePage); + return E_NOTIMPL; +} + +static HRESULT WINAPI fnIMLangFontLink2_GetFontCodePages(IMLangFontLink2* This, + HDC hDC, HFONT hFont, DWORD *pdwCodePages) +{ + FIXME("(%p)->%p %p %p\n",This, hDC, hFont, pdwCodePages); + return E_NOTIMPL; +} + +static HRESULT WINAPI fnIMLangFontLink2_ReleaseFont(IMLangFontLink2* This, + HFONT hFont) +{ + FIXME("(%p)->%p\n",This, hFont); + return E_NOTIMPL; +} + +static HRESULT WINAPI fnIMLangFontLink2_ResetFontMapping(IMLangFontLink2* This) +{ + FIXME("(%p)->\n",This); + return E_NOTIMPL; +} + +static HRESULT WINAPI fnIMLangFontLink2_MapFont(IMLangFontLink2* This, + HDC hDC, DWORD dwCodePages, WCHAR chSrc, HFONT *pFont) +{ + FIXME("(%p)->%p %i %s %p\n",This, hDC, dwCodePages, debugstr_wn(&chSrc,1), pFont); + return E_NOTIMPL; +} + +static HRESULT WINAPI fnIMLangFontLink2_GetFontUnicodeRanges(IMLangFontLink2* This, + HDC hDC, UINT *puiRanges, UNICODERANGE *pUranges) +{ + FIXME("(%p)->%p %p %p\n",This, hDC, puiRanges, pUranges); + return E_NOTIMPL; +} + +static HRESULT WINAPI fnIMLangFontLink2_GetScriptFontInfo(IMLangFontLink2* This, + SCRIPT_ID sid, DWORD dwFlags, UINT *puiFonts, + SCRIPTFONTINFO *pScriptFont) +{ + FIXME("(%p)->%i %i %p %p\n",This, sid, dwFlags, puiFonts, pScriptFont); + return E_NOTIMPL; +} + +static HRESULT WINAPI fnIMLangFontLink2_CodePageToScriptID(IMLangFontLink2* This, + UINT uiCodePage, SCRIPT_ID *pSid) +{ + FIXME("(%p)->%i %p\n",This, uiCodePage, pSid); + return E_NOTIMPL; +} + +static const IMLangFontLink2Vtbl IMLangFontLink2_vtbl = +{ + fnIMLangFontLink2_QueryInterface, + fnIMLangFontLink2_AddRef, + fnIMLangFontLink2_Release, + fnIMLangFontLink2_GetCharCodePages, + fnIMLangFontLink2_GetStrCodePages, + fnIMLangFontLink2_CodePageToCodePages, + fnIMLangFontLink2_CodePagesToCodePage, + fnIMLangFontLink2_GetFontCodePages, + fnIMLangFontLink2_ReleaseFont, + fnIMLangFontLink2_ResetFontMapping, + fnIMLangFontLink2_MapFont, + fnIMLangFontLink2_GetFontUnicodeRanges, + fnIMLangFontLink2_GetScriptFontInfo, + fnIMLangFontLink2_CodePageToScriptID +}; + + static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj) { MLang_impl *mlang; @@ -2582,6 +2711,7 @@ static HRESULT MultiLanguage_create(IUnknown *pUnkOuter, LPVOID *ppObj) mlang->vtbl_IMLangFontLink = &IMLangFontLink_vtbl; mlang->vtbl_IMultiLanguage = &IMultiLanguage_vtbl; mlang->vtbl_IMultiLanguage3 = &IMultiLanguage3_vtbl; + mlang->vtbl_IMLangFontLink2 = &IMLangFontLink2_vtbl; mlang->total_cp = 0; for (i = 0; i < sizeof(mlang_data)/sizeof(mlang_data[0]); i++) diff --git a/include/mlang.idl b/include/mlang.idl index c76826a..fabcc59 100644 --- a/include/mlang.idl +++ b/include/mlang.idl @@ -176,6 +176,53 @@ interface IEnumScript : IUnknown [ object, + uuid(dccfc162-2b38-11d2-b7ec-00c04f8f5d9a), + pointer_default(unique) +] +interface IMLangFontLink2 : IMLangCodePages +{ + typedef struct tagUNICODERANGE + { + WCHAR wcFrom; + WCHAR wcTo; + } UNICODERANGE; + + typedef [unique] IMLangFontLink2 *PMLANGFONTLINK2; + + HRESULT GetFontCodePages( + [in] HDC hDC, + [in] HFONT hFont, + [out] DWORD *pdwCodePages ); + + HRESULT ReleaseFont( + [in] HFONT hFont); + + HRESULT ResetFontMapping(); + + HRESULT MapFont( + [in] HDC hDC, + [in] DWORD dwCodePages, + [in] WCHAR chSrc, + [out] HFONT *pFont); + + HRESULT GetFontUnicodeRanges( + [in] HDC hDC, + [in,out] UINT *puiRanges, + [out] UNICODERANGE* pUranges); + + HRESULT GetScriptFontInfo( + [in] SCRIPT_ID sid, + [in] DWORD dwFlags, + [in,out] UINT *puiFonts, + [out] SCRIPTFONTINFO* pScriptFont); + + HRESULT CodePageToScriptID( + [in] UINT uiCodePage, + [out] SCRIPT_ID *pSid); +} + +[ + object, uuid(275c23e3-3747-11d0-9fea-00aa003f8646), pointer_default(unique) ] @@ -595,6 +642,7 @@ coclass CMultiLanguage interface IMLangCodePages; interface IMLangFontLink; /* interface IMLangLineBreakConsole; */ + interface IMLangFontLink2; } cpp_quote("STDAPI LcidToRfc1766A(LCID, LPSTR, INT);")

1 0

Mikołaj Zalewski : comctl32: statusbar: WM_SETFONT should change the bar height.
by Alexandre Julliard 17 Jul '08

17 Jul '08

Module: wine Branch: master Commit: 9aee00e8fa359d2ed0cacc50845fd85caa66331b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9aee00e8fa359d2ed0cacc508… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Wed Jul 16 20:21:09 2008 +0200 comctl32: statusbar: WM_SETFONT should change the bar height. --- dlls/comctl32/comctl32.h | 1 + dlls/comctl32/commctrl.c | 11 +++++++ dlls/comctl32/status.c | 69 ++++++++++++++++++++--------------------- dlls/comctl32/tests/status.c | 63 +++++++++++++++++++++++++++++++++----- 4 files changed, 101 insertions(+), 43 deletions(-) diff --git a/dlls/comctl32/comctl32.h b/dlls/comctl32/comctl32.h index 51320e6..da9243f 100644 --- a/dlls/comctl32/comctl32.h +++ b/dlls/comctl32/comctl32.h @@ -148,6 +148,7 @@ HWND COMCTL32_CreateToolTip (HWND); VOID COMCTL32_RefreshSysColors(void); void COMCTL32_DrawInsertMark(HDC hDC, const RECT *lpRect, COLORREF clrInsertMark, BOOL bHorizontal); void COMCTL32_EnsureBitmapSize(HBITMAP *pBitmap, int cxMinWidth, int cyMinHeight, COLORREF crBackground); +void COMCTL32_GetFontMetrics(HFONT hFont, TEXTMETRICW *ptm); INT Str_GetPtrWtoA (LPCWSTR lpSrc, LPSTR lpDest, INT nMaxLen); INT Str_GetPtrAtoW (LPCSTR lpSrc, LPWSTR lpDest, INT nMaxLen); BOOL Str_SetPtrAtoW (LPWSTR *lppDest, LPCSTR lpSrc); diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index 4ff2075..1863dbf 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1561,6 +1561,17 @@ void COMCTL32_EnsureBitmapSize(HBITMAP *pBitmap, int cxMinWidth, int cyMinHeight return; } +void COMCTL32_GetFontMetrics(HFONT hFont, TEXTMETRICW *ptm) +{ + HDC hdc = GetDC(NULL); + HFONT hOldFont; + + hOldFont = SelectObject(hdc, hFont); + GetTextMetricsW(hdc, ptm); + SelectObject(hdc, hOldFont); + ReleaseDC(NULL, hdc); +} + /*********************************************************************** * MirrorIcon [COMCTL32.414] * diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 3744280..1b97b41 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -108,6 +108,35 @@ static inline LPCSTR debugstr_t(LPCWSTR text, BOOL isW) return isW ? debugstr_w(text) : debugstr_a((LPCSTR)text); } +static UINT +STATUSBAR_ComputeHeight(STATUS_INFO *infoPtr) +{ + HTHEME theme; + UINT height; + TEXTMETRICW tm; + + COMCTL32_GetFontMetrics(infoPtr->hFont ? infoPtr->hFont : infoPtr->hDefaultFont, &tm); + height = tm.tmHeight + 4 + infoPtr->verticalBorder; + + if ((theme = GetWindowTheme(infoPtr->Self))) + { + /* Determine bar height from theme such that the content area is + * textHeight pixels large */ + HDC hdc = GetDC(infoPtr->Self); + RECT r; + memset (&r, 0, sizeof (r)); + r.bottom = tm.tmHeight; + if (SUCCEEDED(GetThemeBackgroundExtent(theme, hdc, SP_PANE, 0, &r, &r))) + { + height = r.bottom - r.top; + } + ReleaseDC(infoPtr->Self, hdc); + } + + TRACE(" textHeight=%d+%d, final height=%d\n", tm.tmHeight, tm.tmInternalLeading, height); + return height; +} + static void STATUSBAR_DrawSizeGrip (HTHEME theme, HDC hdc, LPRECT lpRect) { @@ -913,8 +942,7 @@ STATUSBAR_WMCreate (HWND hwnd, const CREATESTRUCTA *lpCreate) NONCLIENTMETRICSW nclm; DWORD dwStyle; RECT rect; - int len, textHeight = 0; - HDC hdc; + int len; TRACE("\n"); infoPtr = (STATUS_INFO*)Alloc (sizeof(STATUS_INFO)); @@ -971,17 +999,7 @@ STATUSBAR_WMCreate (HWND hwnd, const CREATESTRUCTA *lpCreate) dwStyle &= ~WS_BORDER; SetWindowLongW (hwnd, GWL_STYLE, dwStyle); - if ((hdc = GetDC (hwnd))) { - TEXTMETRICW tm; - HFONT hOldFont; - - hOldFont = SelectObject (hdc, infoPtr->hDefaultFont); - GetTextMetricsW (hdc, &tm); - textHeight = tm.tmHeight; - SelectObject (hdc, hOldFont); - ReleaseDC (hwnd, hdc); - } - TRACE(" textHeight=%d\n", textHeight); + infoPtr->height = STATUSBAR_ComputeHeight(infoPtr); if (dwStyle & SBT_TOOLTIPS) { infoPtr->hwndToolTip = @@ -1002,28 +1020,6 @@ STATUSBAR_WMCreate (HWND hwnd, const CREATESTRUCTA *lpCreate) } } - if (!(dwStyle & CCS_NORESIZE)) { /* don't resize wnd if it doesn't want it ! */ - HTHEME theme; - infoPtr->height = textHeight + 4 + infoPtr->verticalBorder; - - if ((theme = GetWindowTheme (hwnd))) - { - /* Determine bar height from theme such that the content area is - * textHeight pixels large */ - HDC hdc = GetDC (hwnd); - RECT r; - memset (&r, 0, sizeof (r)); - r.bottom = textHeight; - if (SUCCEEDED(GetThemeBackgroundExtent (theme, hdc, SP_PANE, 0, &r, &r))) - { - infoPtr->height = r.bottom - r.top; - } - ReleaseDC (hwnd, hdc); - } - - STATUSBAR_SetPartBounds (infoPtr); - } - return 0; create_fail: @@ -1099,6 +1095,9 @@ STATUSBAR_WMSetFont (STATUS_INFO *infoPtr, HFONT font, BOOL redraw) { infoPtr->hFont = font; TRACE("%p\n", infoPtr->hFont); + + infoPtr->height = STATUSBAR_ComputeHeight(infoPtr); + SendMessageW(infoPtr->Self, WM_SIZE, 0, 0); /* update size */ if (redraw) InvalidateRect(infoPtr->Self, NULL, FALSE); diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 18501fb..b6c5b7b 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -24,6 +24,8 @@ #include "wine/test.h" +#define SUBCLASS_NAME "MyStatusBar" + #define expect(expected,got) ok (expected == got,"Expected %d, got %d\n",expected,got) #define expect_rect(_left,_top,_right,_bottom,got) do { RECT _rcExp = {_left, _top, _right, _bottom}; \ ok(memcmp(&_rcExp, &(got), sizeof(RECT)) == 0, "Expected rect {%d,%d, %d,%d}, got {%d,%d, %d,%d}\n", \ @@ -34,6 +36,7 @@ static HINSTANCE hinst; static WNDPROC g_status_wndproc; static RECT g_rcCreated; static HWND g_hMainWnd; +static int g_wmsize_count = 0; static HWND create_status_control(DWORD style, DWORD exstyle) { @@ -51,34 +54,46 @@ static HWND create_status_control(DWORD style, DWORD exstyle) static LRESULT WINAPI create_test_wndproc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { + LRESULT ret; + if (msg == WM_CREATE) { CREATESTRUCT *cs = (CREATESTRUCT *)lParam; - LRESULT ret = CallWindowProc(g_status_wndproc, hwnd, msg, wParam, lParam); + ret = CallWindowProc(g_status_wndproc, hwnd, msg, wParam, lParam); GetWindowRect(hwnd, &g_rcCreated); MapWindowPoints(HWND_DESKTOP, g_hMainWnd, (LPPOINT)&g_rcCreated, 2); ok(cs->x == g_rcCreated.left, "CREATESTRUCT.x modified\n"); ok(cs->y == g_rcCreated.top, "CREATESTRUCT.y modified\n"); - return ret; + } else if (msg == WM_SIZE) + { + g_wmsize_count++; + ret = CallWindowProc(g_status_wndproc, hwnd, msg, wParam, lParam); } - return CallWindowProc(g_status_wndproc, hwnd, msg, wParam, lParam); + else + ret = CallWindowProc(g_status_wndproc, hwnd, msg, wParam, lParam); + + return ret; } -static void test_create() +static void register_subclass() { WNDCLASSEX cls; - RECT rc; - HWND hwnd; cls.cbSize = sizeof(WNDCLASSEX); GetClassInfoEx(NULL, STATUSCLASSNAME, &cls); g_status_wndproc = cls.lpfnWndProc; cls.lpfnWndProc = create_test_wndproc; - cls.lpszClassName = "MyStatusBar"; + cls.lpszClassName = SUBCLASS_NAME; cls.hInstance = NULL; ok(RegisterClassEx(&cls), "RegisterClassEx failed\n"); +} - ok((hwnd = CreateWindowA("MyStatusBar", "", WS_CHILD|WS_VISIBLE|SBARS_SIZEGRIP, 0, 0, 100, 100, +static void test_create() +{ + RECT rc; + HWND hwnd; + + ok((hwnd = CreateWindowA(SUBCLASS_NAME, "", WS_CHILD|WS_VISIBLE|SBARS_SIZEGRIP, 0, 0, 100, 100, g_hMainWnd, NULL, NULL, 0)) != NULL, "CreateWindowA failed\n"); MapWindowPoints(HWND_DESKTOP, g_hMainWnd, (LPPOINT)&rc, 2); GetWindowRect(hwnd, &rc); @@ -91,6 +106,35 @@ static void test_create() DestroyWindow(hwnd); } +static void test_setfont() +{ + HFONT hFont; + RECT rc1, rc2; + HWND hwndStatus = CreateWindow(SUBCLASS_NAME, NULL, WS_CHILD|WS_VISIBLE, + 0, 0, 300, 20, g_hMainWnd, NULL, NULL, NULL); + + GetClientRect(hwndStatus, &rc1); + hFont = CreateFont(32, 0, 0, 0, FW_DONTCARE, FALSE, FALSE, FALSE, ANSI_CHARSET, + OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, FF_DONTCARE, "Tahoma"); + + g_wmsize_count = 0; + SendMessage(hwndStatus, WM_SETFONT, (WPARAM)hFont, TRUE); + ok(g_wmsize_count > 0, "WM_SETFONT should issue WM_SIZE\n"); + + GetClientRect(hwndStatus, &rc2); + todo_wine expect_rect(0, 0, 672, 42, rc2); + + g_wmsize_count = 0; + SendMessage(hwndStatus, WM_SETFONT, (WPARAM)hFont, TRUE); + ok(g_wmsize_count > 0, "WM_SETFONT should issue WM_SIZE\n"); + + GetClientRect(hwndStatus, &rc2); + todo_wine expect_rect(0, 0, 672, 42, rc2); + + DestroyWindow(hwndStatus); + DeleteObject(hFont); +} + static void test_status_control(void) { HWND hWndStatus; @@ -246,6 +290,9 @@ START_TEST(status) InitCommonControls(); + register_subclass(); + test_status_control(); test_create(); + test_setfont(); }

1 0