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

Piotr Caban : msxml3: Use IXMLDOMNode_get_nodeType in xmlnode_appendChild.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 26b95dc7fdf9ffc82cff6e4b0778663ffbcf0559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=26b95dc7fdf9ffc82cff6e4b0… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 8 20:53:58 2008 +0200 msxml3: Use IXMLDOMNode_get_nodeType in xmlnode_appendChild. --- dlls/msxml3/node.c | 23 ++++++----------------- 1 files changed, 6 insertions(+), 17 deletions(-) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index fac74c8..d4703dd 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -661,27 +661,16 @@ static HRESULT WINAPI xmlnode_appendChild( IXMLDOMNode** outNewChild) { xmlnode *This = impl_from_IXMLDOMNode( iface ); - IXMLDOMNode *pAttr = NULL; + DOMNodeType type; VARIANT var; + HRESULT hr; TRACE("(%p)->(%p,%p)\n", This, newChild, outNewChild); - /* Cannot Append an Attribute node. */ - IUnknown_QueryInterface(newChild, &IID_IXMLDOMNode, (LPVOID*)&pAttr); - if(pAttr) - { - xmlnode *ThisNew = impl_from_IXMLDOMNode( pAttr ); - - if(ThisNew->node->type == XML_ATTRIBUTE_NODE) - { - if(outNewChild) *outNewChild = NULL; - - IUnknown_Release(pAttr); - - return E_FAIL; - } - - IUnknown_Release(pAttr); + hr = IXMLDOMNode_get_nodeType(newChild, &type); + if(FAILED(hr) || type == NODE_ATTRIBUTE) { + if(outNewChild) *outNewChild = NULL; + return E_FAIL; } VariantInit(&var);

1 0

Piotr Caban : msxml3/test: Added ISAXXMLReader test.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: cabbe8fa35bc143aa34e805c45aa81b02d8a251d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cabbe8fa35bc143aa34e805c4… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 8 20:53:43 2008 +0200 msxml3/test: Added ISAXXMLReader test. --- dlls/msxml3/tests/Makefile.in | 1 + dlls/msxml3/tests/saxreader.c | 221 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 222 insertions(+), 0 deletions(-) diff --git a/dlls/msxml3/tests/Makefile.in b/dlls/msxml3/tests/Makefile.in index 3376252..5e1740c 100644 --- a/dlls/msxml3/tests/Makefile.in +++ b/dlls/msxml3/tests/Makefile.in @@ -7,6 +7,7 @@ IMPORTS = oleaut32 ole32 user32 kernel32 CTESTS = \ domdoc.c \ + saxreader.c \ schema.c \ xmldoc.c \ xmlelem.c diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c new file mode 100644 index 0000000..64ad625 --- /dev/null +++ b/dlls/msxml3/tests/saxreader.c @@ -0,0 +1,221 @@ +/* + * XML test + * + * 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 + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define COBJMACROS +#define CONST_VTABLE + +#include <stdio.h> +#include "windows.h" +#include "ole2.h" +#include "msxml2.h" +#include "ocidl.h" + +#include "wine/test.h" + +typedef struct _contenthandler +{ + const struct ISAXContentHandlerVtbl *lpContentHandlerVtbl; +} contenthandler; + +static inline contenthandler *impl_from_ISAXContentHandler(ISAXContentHandler *iface) +{ + return (contenthandler *)((char*)iface - FIELD_OFFSET(contenthandler, lpContentHandlerVtbl)); +} + +static HRESULT WINAPI contentHandler_QueryInterface( + ISAXContentHandler* iface, + REFIID riid, + void **ppvObject) +{ + *ppvObject = NULL; + + if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_ISAXContentHandler)) + { + *ppvObject = iface; + } + else + { + return E_NOINTERFACE; + } + + return S_OK; +} + +static ULONG WINAPI contentHandler_AddRef( + ISAXContentHandler* iface) +{ + return 2; +} + +static ULONG WINAPI contentHandler_Release( + ISAXContentHandler* iface) +{ + return 1; +} + +static HRESULT WINAPI contentHandler_putDocumentLocator( + ISAXContentHandler* iface, + ISAXLocator *pLocator) +{ + return S_OK; +} + +static HRESULT WINAPI contentHandler_startDocument( + ISAXContentHandler* iface) +{ + return S_OK; +} + +static HRESULT WINAPI contentHandler_endDocument( + ISAXContentHandler* iface) +{ + return S_OK; +} + +static HRESULT WINAPI contentHandler_startPrefixMapping( + ISAXContentHandler* iface, + const WCHAR *pPrefix, + int nPrefix, + const WCHAR *pUri, + int nUri) +{ + return S_OK; +} + +static HRESULT WINAPI contentHandler_endPrefixMapping( + ISAXContentHandler* iface, + const WCHAR *pPrefix, + int nPrefix) +{ + return S_OK; +} + +static HRESULT WINAPI contentHandler_startElement( + ISAXContentHandler* iface, + const WCHAR *pNamespaceUri, + int nNamespaceUri, + const WCHAR *pLocalName, + int nLocalName, + const WCHAR *pQName, + int nQName, + ISAXAttributes *pAttr) +{ + return S_OK; +} + +static HRESULT WINAPI contentHandler_endElement( + ISAXContentHandler* iface, + const WCHAR *pNamespaceUri, + int nNamespaceUri, + const WCHAR *pLocalName, + int nLocalName, + const WCHAR *pQName, + int nQName) +{ + return S_OK; +} + +static HRESULT WINAPI contentHandler_characters( + ISAXContentHandler* iface, + const WCHAR *pChars, + int nChars) +{ + return S_OK; +} + +static HRESULT WINAPI contentHandler_ignorableWhitespace( + ISAXContentHandler* iface, + const WCHAR *pChars, + int nChars) +{ + return S_OK; +} + +static HRESULT WINAPI contentHandler_processingInstruction( + ISAXContentHandler* iface, + const WCHAR *pTarget, + int nTarget, + const WCHAR *pData, + int nData) +{ + return S_OK; +} + +static HRESULT WINAPI contentHandler_skippedEntity( + ISAXContentHandler* iface, + const WCHAR *pName, + int nName) +{ + return S_OK; +} + + +static const ISAXContentHandlerVtbl contentHandlerVtbl = +{ + contentHandler_QueryInterface, + contentHandler_AddRef, + contentHandler_Release, + contentHandler_putDocumentLocator, + contentHandler_startDocument, + contentHandler_endDocument, + contentHandler_startPrefixMapping, + contentHandler_endPrefixMapping, + contentHandler_startElement, + contentHandler_endElement, + contentHandler_characters, + contentHandler_ignorableWhitespace, + contentHandler_processingInstruction, + contentHandler_skippedEntity +}; + +static ISAXContentHandler contentHandler = { &contentHandlerVtbl }; + + +static void test_saxreader(void) +{ + HRESULT hr; + ISAXXMLReader *reader = NULL; + + hr = CoCreateInstance(&CLSID_SAXXMLReader, NULL, CLSCTX_INPROC_SERVER, + &IID_ISAXXMLReader, (LPVOID*)&reader); + + if(FAILED(hr)) + { + skip("Failed to create SAXXMLReader instance\n"); + return; + } + + hr = ISAXXMLReader_putContentHandler(reader, &contentHandler); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + ISAXXMLReader_Release(reader); +} + +START_TEST(saxreader) +{ + HRESULT hr; + + hr = CoInitialize(NULL); + ok(hr == S_OK, "failed to init com\n"); + + test_saxreader(); + + CoUninitialize(); +}

1 0

Piotr Caban : msxml3: Added ISAXXMLReader_getErrorHandler implementation.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: a3549cd9d272baa306d7c56f463e96317dc356fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3549cd9d272baa306d7c56f4… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 8 21:01:42 2008 +0200 msxml3: Added ISAXXMLReader_getErrorHandler implementation. --- dlls/msxml3/saxreader.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index dfcc9f3..a5654e9 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -563,8 +563,12 @@ static HRESULT WINAPI isaxxmlreader_getErrorHandler( { saxreader *This = impl_from_ISAXXMLReader( iface ); - FIXME("(%p)->(%p) stub\n", This, pErrorHandler); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pErrorHandler); + if(This->errorHandler) + ISAXErrorHandler_AddRef(This->errorHandler); + *pErrorHandler = This->errorHandler; + + return S_OK; } static HRESULT WINAPI isaxxmlreader_putErrorHandler(

1 0

Piotr Caban : msxml3: Added ISAXMLReader_putErrorHandler implementation.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: be89ee1a3138a83a65a81683f11986d2f5f0ba67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be89ee1a3138a83a65a81683f… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 8 20:52:41 2008 +0200 msxml3: Added ISAXMLReader_putErrorHandler implementation. --- dlls/msxml3/saxreader.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index b68ccae..dfcc9f3 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -50,6 +50,7 @@ typedef struct _saxreader const struct ISAXXMLReaderVtbl *lpSAXXMLReaderVtbl; LONG ref; struct ISAXContentHandler *contentHandler; + struct ISAXErrorHandler *errorHandler; xmlSAXHandler sax; } saxreader; @@ -115,6 +116,9 @@ static ULONG WINAPI saxxmlreader_Release( if(This->contentHandler) ISAXContentHandler_Release(This->contentHandler); + if(This->errorHandler) + ISAXErrorHandler_Release(This->errorHandler); + HeapFree( GetProcessHeap(), 0, This ); } @@ -569,8 +573,14 @@ static HRESULT WINAPI isaxxmlreader_putErrorHandler( { saxreader *This = impl_from_ISAXXMLReader( iface ); - FIXME("(%p)->(%p) stub\n", This, errorHandler); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, errorHandler); + if(errorHandler) + ISAXErrorHandler_AddRef(errorHandler); + if(This->errorHandler) + ISAXErrorHandler_Release(This->errorHandler); + This->errorHandler = errorHandler; + + return S_OK; } static HRESULT WINAPI isaxxmlreader_getBaseURL( @@ -672,6 +682,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) reader->lpSAXXMLReaderVtbl = &isaxreader_vtbl; reader->ref = 1; reader->contentHandler = NULL; + reader->errorHandler = NULL; *ppObj = &reader->lpVtbl;

1 0

Piotr Caban : msxml3: Added ISAXMLReader_getContentHandler implementation.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 23cae5803ac00d733a177d32a862348bc6e1a008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23cae5803ac00d733a177d32a… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 8 20:52:26 2008 +0200 msxml3: Added ISAXMLReader_getContentHandler implementation. --- dlls/msxml3/saxreader.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index b2e5418..b68ccae 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -509,8 +509,12 @@ static HRESULT WINAPI isaxxmlreader_getContentHandler( { saxreader *This = impl_from_ISAXXMLReader( iface ); - FIXME("(%p)->(%p) stub\n", This, pContentHandler); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pContentHandler); + if(This->contentHandler) + ISAXContentHandler_AddRef(This->contentHandler); + *pContentHandler = This->contentHandler; + + return S_OK; } static HRESULT WINAPI isaxxmlreader_putContentHandler(

1 0

Piotr Caban : msxml3: Added ISAXXMLReader_putContentHandler implementation.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 3fa75f49b45872a7b79be0dfd190ff81d72e349b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa75f49b45872a7b79be0dfd… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 8 21:00:20 2008 +0200 msxml3: Added ISAXXMLReader_putContentHandler implementation. --- dlls/msxml3/saxreader.c | 23 +++++++++++++++-------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index e7c2d21..b2e5418 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -49,6 +49,7 @@ typedef struct _saxreader const struct IVBSAXXMLReaderVtbl *lpVtbl; const struct ISAXXMLReaderVtbl *lpSAXXMLReaderVtbl; LONG ref; + struct ISAXContentHandler *contentHandler; xmlSAXHandler sax; } saxreader; @@ -111,6 +112,9 @@ static ULONG WINAPI saxxmlreader_Release( ref = InterlockedDecrement( &This->ref ); if ( ref == 0 ) { + if(This->contentHandler) + ISAXContentHandler_Release(This->contentHandler); + HeapFree( GetProcessHeap(), 0, This ); } @@ -505,12 +509,8 @@ static HRESULT WINAPI isaxxmlreader_getContentHandler( { saxreader *This = impl_from_ISAXXMLReader( iface ); - TRACE("(%p)->(%p)\n", This, pContentHandler); - if(This->contentHandler) - ISAXContentHandler_AddRef(This->contentHandler); - *pContentHandler = This->contentHandler; - - return S_OK; + FIXME("(%p)->(%p) stub\n", This, pContentHandler); + return E_NOTIMPL; } static HRESULT WINAPI isaxxmlreader_putContentHandler( @@ -519,8 +519,14 @@ static HRESULT WINAPI isaxxmlreader_putContentHandler( { saxreader *This = impl_from_ISAXXMLReader( iface ); - FIXME("(%p)->(%p) stub\n", This, contentHandler); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, contentHandler); + if(contentHandler) + ISAXContentHandler_AddRef(contentHandler); + if(This->contentHandler) + ISAXContentHandler_Release(This->contentHandler); + This->contentHandler = contentHandler; + + return S_OK; } static HRESULT WINAPI isaxxmlreader_getDTDHandler( @@ -661,6 +667,7 @@ HRESULT SAXXMLReader_create(IUnknown *pUnkOuter, LPVOID *ppObj) reader->lpVtbl = &saxreader_vtbl; reader->lpSAXXMLReaderVtbl = &isaxreader_vtbl; reader->ref = 1; + reader->contentHandler = NULL; *ppObj = &reader->lpVtbl;

1 0

Piotr Caban : msxml3: Added ISAXMLReader_getContentHandler implementation.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 5b350582b92d2d74a9638a8e516bfde78f660ea5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b350582b92d2d74a9638a8e5… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Tue Jul 8 20:52:26 2008 +0200 msxml3: Added ISAXMLReader_getContentHandler implementation. --- dlls/msxml3/saxreader.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 3539cbb..e7c2d21 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -505,8 +505,12 @@ static HRESULT WINAPI isaxxmlreader_getContentHandler( { saxreader *This = impl_from_ISAXXMLReader( iface ); - FIXME("(%p)->(%p) stub\n", This, pContentHandler); - return E_NOTIMPL; + TRACE("(%p)->(%p)\n", This, pContentHandler); + if(This->contentHandler) + ISAXContentHandler_AddRef(This->contentHandler); + *pContentHandler = This->contentHandler; + + return S_OK; } static HRESULT WINAPI isaxxmlreader_putContentHandler(

1 0

Dylan Smith : richedit: Fixed 2 minor paragraph format effect errors.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 12bc51ca2648f72d312daf94ad340290ce701fed URL: http://source.winehq.org/git/wine.git/?a=commit;h=12bc51ca2648f72d312daf94a… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jul 8 13:39:01 2008 -0400 richedit: Fixed 2 minor paragraph format effect errors. In ME_SetParaFormat the wEffects that were being set needed to be set rather than the dwMask. --- dlls/riched20/para.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index e2ba258..4da1721 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -367,7 +367,8 @@ void ME_SetParaFormat(ME_TextEditor *editor, ME_DisplayItem *para, const PARAFOR PFM_TABLE) /* we take for granted that PFE_xxx is the hiword of the corresponding PFM_xxx */ if (pFmt->dwMask & EFFECTS_MASK) { - para->member.para.pFmt->dwMask &= ~(pFmt->dwMask & EFFECTS_MASK); + para->member.para.pFmt->dwMask |= pFmt->dwMask & EFFECTS_MASK; + para->member.para.pFmt->wEffects &= ~HIWORD(pFmt->dwMask); para->member.para.pFmt->wEffects |= pFmt->wEffects & HIWORD(pFmt->dwMask); } #undef EFFECTS_MASK @@ -464,6 +465,7 @@ void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) ME_GetParaFormat(editor, para, pFmt); if (para == para_end) return; + /* Invalidate values that change across the selected paragraphs. */ do { ZeroMemory(&tmp, sizeof(tmp)); tmp.cbSize = sizeof(tmp); @@ -472,8 +474,8 @@ void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) #define CHECK_FIELD(m, f) \ if (pFmt->f != tmp.f) pFmt->dwMask &= ~(m); + pFmt->dwMask &= ~((pFmt->wEffects ^ tmp.wEffects) << 16); CHECK_FIELD(PFM_NUMBERING, wNumbering); - /* para->member.para.pFmt->wEffects = pFmt->wEffects; */ assert(tmp.dwMask & PFM_ALIGNMENT); CHECK_FIELD(PFM_NUMBERING, wNumbering); assert(tmp.dwMask & PFM_STARTINDENT);

1 0

Dylan Smith : richedit: PFE_TABLE flag is now used instead of private bTable value.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: aba425eb70adf376a71e8743f313a7e6fa306046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba425eb70adf376a71e8743f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jul 8 13:38:54 2008 -0400 richedit: PFE_TABLE flag is now used instead of private bTable value. The PARAFORMAT structure has a bit in wEffects to indicate whether the paragraph is a table or not, so this should be used instead of a private bTable value, since this structure can be retrieved with EM_GETPARAFORMAT. --- dlls/riched20/caret.c | 4 +++- dlls/riched20/editor.c | 10 +++++----- dlls/riched20/editstr.h | 3 +-- dlls/riched20/para.c | 6 +++--- dlls/riched20/writer.c | 8 ++++---- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index a76f2db..08e9036 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -454,7 +454,9 @@ ME_InsertTableCellFromCursor(ME_TextEditor *editor, int nCursor) } } assert(run->type == diParagraph); - assert(run->member.para.bTable); + assert(run->member.para.pFmt); + assert(run->member.para.pFmt->dwMask & PFM_TABLE); + assert(run->member.para.pFmt->wEffects & PFE_TABLE); assert(run->member.para.pCells); p->member.run.pCell = run->member.para.pCells; } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 8a099a6..4665845 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -452,7 +452,7 @@ static void ME_RTFParAttrHook(RTF_Info *info) { case rtfParDef: /* restores default paragraph attributes */ fmt.dwMask = PFM_ALIGNMENT | PFM_BORDER | PFM_LINESPACING | PFM_TABSTOPS | PFM_OFFSET | - PFM_RIGHTINDENT | PFM_SPACEAFTER | PFM_SPACEBEFORE | PFM_STARTINDENT; + PFM_RIGHTINDENT | PFM_SPACEAFTER | PFM_SPACEBEFORE | PFM_STARTINDENT | PFM_TABLE; /* TODO: numbering, shading */ fmt.wAlignment = PFA_LEFT; fmt.cTabCount = 0; @@ -462,8 +462,7 @@ static void ME_RTFParAttrHook(RTF_Info *info) fmt.bLineSpacingRule = 0; fmt.dySpaceBefore = fmt.dySpaceAfter = 0; fmt.dyLineSpacing = 0; - RTFFlushOutputBuffer(info); - ME_GetParagraph(info->editor->pCursors[0].pRun)->member.para.bTable = FALSE; + fmt.wEffects &= ~PFE_TABLE; break; case rtfInTable: { @@ -472,8 +471,9 @@ static void ME_RTFParAttrHook(RTF_Info *info) RTFFlushOutputBuffer(info); para = ME_GetParagraph(info->editor->pCursors[0].pRun); assert(para->member.para.pCells); - para->member.para.bTable = TRUE; - return; + fmt.dwMask |= PFM_TABLE; + fmt.wEffects |= PFE_TABLE; + break; } case rtfFirstIndent: ME_GetSelectionParaFormat(info->editor, &fmt); diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index e3f29b3..f3e837e 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -169,8 +169,7 @@ typedef struct tagME_TableCell typedef struct tagME_Paragraph { PARAFORMAT2 *pFmt; - - BOOL bTable; /* this paragraph is a table row */ + struct tagME_TableCell *pCells; /* list of cells and their properties */ struct tagME_TableCell *pLastCell; /* points to the last cell in the list */ diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index de69794..c0f1857 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -151,8 +151,6 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, ME new_para->member.para.nFlags = MEPF_REWRAP; /* FIXME copy flags (if applicable) */ /* FIXME initialize format style and call ME_SetParaFormat blah blah */ *new_para->member.para.pFmt = *run_para->member.para.pFmt; - - new_para->member.para.bTable = run_para->member.para.bTable; /* Inherit previous cell definitions if any */ new_para->member.para.pCells = NULL; @@ -174,7 +172,9 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, ME } /* fix paragraph properties. FIXME only needed when called from RTF reader */ - if (run_para->member.para.pCells && !run_para->member.para.bTable) + if (run_para->member.para.pCells && + !(run_para->member.para.pFmt->wEffects & PFE_TABLE + && run_para->member.para.pFmt->dwMask & PFM_TABLE)) { /* Paragraph does not have an \intbl keyword, so any table definition * stored is invalid */ diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index ce9e853..9845417 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -310,7 +310,7 @@ ME_StreamOutRTFParaProps(ME_OutStream *pStream, const ME_DisplayItem *para) if (!ME_StreamOutPrint(pStream, "\\pard")) return FALSE; - if (para->member.para.bTable) + if (fmt->dwMask & PFM_TABLE && fmt->wEffects & PFE_TABLE) strcat(props, "\\intbl"); /* TODO: PFM_BORDER. M$ does not emit any keywords for these properties, and @@ -376,8 +376,6 @@ ME_StreamOutRTFParaProps(ME_OutStream *pStream, const ME_DisplayItem *para) strcat(props, "\\rtlpar"); if (fmt->dwMask & PFM_SIDEBYSIDE && fmt->wEffects & PFE_SIDEBYSIDE) strcat(props, "\\sbys"); - if (fmt->dwMask & PFM_TABLE && fmt->dwMask & PFE_TABLE) - strcat(props, "\\intbl"); if (fmt->dwMask & PFM_OFFSET) sprintf(props + strlen(props), "\\li%d", fmt->dxOffset); @@ -704,7 +702,9 @@ ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, int nStart, int nC return FALSE; nChars--; } else if (p->member.run.nFlags & MERF_ENDPARA) { - if (pPara->member.para.bTable) { + if (pPara->member.para.pFmt->dwMask & PFM_TABLE + && pPara->member.para.pFmt->wEffects & PFE_TABLE) + { if (!ME_StreamOutPrint(pStream, "\\row \r\n")) return FALSE; } else {

1 0

Dylan Smith : richedit: Set the default paragraph format consistently.
by Alexandre Julliard July 9, 2008

July 9, 2008

Module: wine Branch: master Commit: 8172d69e8f422d31bdeb5d82ca0c9c3f806b7ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8172d69e8f422d31bdeb5d82c… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jul 8 13:38:58 2008 -0400 richedit: Set the default paragraph format consistently. I created a function to set the default paragraph format to ensure consistency when this is done. This initial paragraph format is also now more consistent with native richedit controls. The dwMask value always appears to have the same value when retrieved from the native richedit controls, so all the mask values are now initialized when the PARAFORMAT2 structure is created. --- dlls/riched20/editor.c | 5 ++++- dlls/riched20/editor.h | 1 + dlls/riched20/list.c | 3 +-- dlls/riched20/para.c | 18 ++++++++++-------- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4665845..35e4be1 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1040,13 +1040,16 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre ME_InternalDeleteText(editor, from, to-from); } else { + ME_DisplayItem *para_item; style = editor->pBuffer->pDefaultStyle; ME_AddRefStyle(style); SendMessageA(editor->hWnd, EM_SETSEL, 0, 0); ME_InternalDeleteText(editor, 0, ME_GetTextLength(editor)); from = to = 0; ME_ClearTempStyle(editor); - /* FIXME restore default paragraph formatting ! */ + + para_item = ME_GetParagraph(editor->pCursors[0].pRun); + ME_SetDefaultParaFormat(para_item->member.para.pFmt); } diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 76f61a2..786191a 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -231,6 +231,7 @@ void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt); void ME_MarkForWrapping(ME_TextEditor *editor, ME_DisplayItem *first, const ME_DisplayItem *last); void ME_MarkForPainting(ME_TextEditor *editor, ME_DisplayItem *first, const ME_DisplayItem *last); void ME_MarkAllForWrapping(ME_TextEditor *editor); +void ME_SetDefaultParaFormat(PARAFORMAT2 *pFmt); /* paint.c */ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, BOOL bOnlyNew, const RECT *rcUpdate); diff --git a/dlls/riched20/list.c b/dlls/riched20/list.c index f5c5f42..60c49e3 100644 --- a/dlls/riched20/list.c +++ b/dlls/riched20/list.c @@ -151,8 +151,7 @@ ME_DisplayItem *ME_MakeDI(ME_DIType type) { item->prev = item->next = NULL; if (type == diParagraph || type == diUndoSplitParagraph) { item->member.para.pFmt = ALLOC_OBJ(PARAFORMAT2); - item->member.para.pFmt->cbSize = sizeof(PARAFORMAT2); - item->member.para.pFmt->dwMask = 0; + ME_SetDefaultParaFormat(item->member.para.pFmt); item->member.para.nFlags = MEPF_REWRAP; } diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index c0f1857..e2ba258 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -28,7 +28,6 @@ static const WCHAR wszParagraphSign[] = {0xB6, 0}; void ME_MakeFirstParagraph(ME_TextEditor *editor) { ME_Context c; - PARAFORMAT2 fmt; CHARFORMAT2W cf; LOGFONTW lf; HFONT hf; @@ -62,13 +61,6 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) cf.bPitchAndFamily = lf.lfPitchAndFamily; cf.bCharSet = lf.lfCharSet; - ZeroMemory(&fmt, sizeof(fmt)); - fmt.cbSize = sizeof(fmt); - fmt.dwMask = PFM_ALIGNMENT | PFM_OFFSET | PFM_STARTINDENT | PFM_RIGHTINDENT | PFM_TABSTOPS; - fmt.wAlignment = PFA_LEFT; - - *para->member.para.pFmt = fmt; - style = ME_MakeStyle(&cf); text->pDefaultStyle = style; @@ -520,3 +512,13 @@ void ME_GetSelectionParaFormat(ME_TextEditor *editor, PARAFORMAT2 *pFmt) para = para->member.para.next_para; } while(1); } + +void ME_SetDefaultParaFormat(PARAFORMAT2 *pFmt) +{ + ZeroMemory(pFmt, sizeof(PARAFORMAT2)); + pFmt->cbSize = sizeof(PARAFORMAT2); + pFmt->dwMask = PFM_ALL2; + pFmt->wAlignment = PFA_LEFT; + pFmt->sStyle = -1; + pFmt->bOutlineLevel = TRUE; +}

1 0