November 2015 - Wine-commits

Hans Leidekker : webservices: Implement WsXmlStringEquals.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 4977635361dff84b23de926815ec916707908fe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4977635361dff84b23de92681… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 10 10:46:34 2015 +0100 webservices: Implement WsXmlStringEquals. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 15 ++++++++++++ dlls/webservices/tests/reader.c | 48 +++++++++++++++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 1 + 4 files changed, 65 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index aeba36c..4195184 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -1564,3 +1564,18 @@ HRESULT WINAPI WsSetInputToBuffer( WS_XML_READER *handle, WS_XML_BUFFER *buffer, reader->read_bufptr = reader->input_data; return S_OK; } + +/************************************************************************** + * WsXmlStringEquals [webservices.@] + */ +HRESULT WINAPI WsXmlStringEquals( const WS_XML_STRING *str1, const WS_XML_STRING *str2, WS_ERROR *error ) +{ + TRACE( "%s %s %p\n", debugstr_xmlstr(str1), debugstr_xmlstr(str2), error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!str1 || !str2) return E_INVALIDARG; + + if (str1->length != str2->length) return S_FALSE; + if (!memcmp( str1->bytes, str2->bytes, str1->length )) return S_OK; + return S_FALSE; +} diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 3f23d90..1f9558c 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1406,6 +1406,53 @@ static void test_WsGetXmlAttribute(void) WsFreeHeap( heap ); } +static void test_WsXmlStringEquals(void) +{ + BYTE bom[] = {0xef,0xbb,0xbf}; + WS_XML_STRING str1 = {0, NULL}, str2 = {0, NULL}; + HRESULT hr; + + hr = WsXmlStringEquals( NULL, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsXmlStringEquals( &str1, NULL, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsXmlStringEquals( NULL, &str2, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + + hr = WsXmlStringEquals( &str1, &str2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + str1.length = 1; + str1.bytes = (BYTE *)"a"; + hr = WsXmlStringEquals( &str1, &str1, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + str2.length = 1; + str2.bytes = (BYTE *)"b"; + hr = WsXmlStringEquals( &str1, &str2, NULL ); + ok( hr == S_FALSE, "got %08x\n", hr ); + + str2.length = 1; + str2.bytes = bom; + hr = WsXmlStringEquals( &str1, &str2, NULL ); + ok( hr == S_FALSE, "got %08x\n", hr ); + + str1.length = 3; + hr = WsXmlStringEquals( &str1, &str2, NULL ); + ok( hr == S_FALSE, "got %08x\n", hr ); + + str2.length = 3; + hr = WsXmlStringEquals( &str1, &str2, NULL ); + ok( hr == S_FALSE, "got %08x\n", hr ); + + str1.length = 3; + str1.bytes = bom; + hr = WsXmlStringEquals( &str1, &str2, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); +} + START_TEST(reader) { test_WsCreateError(); @@ -1420,4 +1467,5 @@ START_TEST(reader) test_WsReadNode(); test_WsReadType(); test_WsGetXmlAttribute(); + test_WsXmlStringEquals(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 6e0f4f2..3378ea9 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -190,4 +190,4 @@ @ stub WsWriteXmlBuffer @ stub WsWriteXmlBufferToBytes @ stub WsWriteXmlnsAttribute -@ stub WsXmlStringEquals +@ stdcall WsXmlStringEquals(ptr ptr ptr) diff --git a/include/webservices.h b/include/webservices.h index 8bef315..a6e892e 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -498,6 +498,7 @@ HRESULT WINAPI WsWriteStartElement(WS_XML_WRITER*, const WS_XML_STRING*, const W const WS_XML_STRING*, WS_ERROR*); HRESULT WINAPI WsWriteType(WS_XML_WRITER*, WS_TYPE_MAPPING, WS_TYPE, const void*, WS_WRITE_OPTION, const void*, ULONG, WS_ERROR*); +HRESULT WINAPI WsXmlStringEquals(const WS_XML_STRING*, const WS_XML_STRING*, WS_ERROR*); #define WS_S_ASYNC 0x003d0000 #define WS_S_END 0x003d0001

1 0

Hans Leidekker : include: Add missing Web Services declarations.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 49638f1a7f6ec239648d5ee598bef500ca395f4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=49638f1a7f6ec239648d5ee59… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 10 10:46:35 2015 +0100 include: Add missing Web Services declarations. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/webservices.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/include/webservices.h b/include/webservices.h index a6e892e..0ebb6c4 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -388,6 +388,21 @@ typedef struct _WS_XML_NODE { } WS_XML_NODE; typedef enum { + WS_MOVE_TO_ROOT_ELEMENT, + WS_MOVE_TO_NEXT_ELEMENT, + WS_MOVE_TO_PREVIOUS_ELEMENT, + WS_MOVE_TO_CHILD_ELEMENT, + WS_MOVE_TO_END_ELEMENT, + WS_MOVE_TO_PARENT_ELEMENT, + WS_MOVE_TO_NEXT_NODE, + WS_MOVE_TO_PREVIOUS_NODE, + WS_MOVE_TO_FIRST_NODE, + WS_MOVE_TO_BOF, + WS_MOVE_TO_EOF, + WS_MOVE_TO_CHILD_NODE +} WS_MOVE_TO; + +typedef enum { WS_XML_TEXT_TYPE_UTF8 = 1, WS_XML_TEXT_TYPE_UTF16 = 2, WS_XML_TEXT_TYPE_BASE64 = 3, @@ -471,6 +486,8 @@ HRESULT WINAPI WsGetReaderProperty(WS_XML_READER*, WS_XML_READER_PROPERTY_ID, vo HRESULT WINAPI WsGetWriterProperty(WS_XML_WRITER*, WS_XML_WRITER_PROPERTY_ID, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsGetXmlAttribute(WS_XML_READER*, const WS_XML_STRING*, WS_HEAP*, WCHAR**, ULONG*, WS_ERROR*); +HRESULT WINAPI WsMoveReader(WS_XML_READER*, WS_MOVE_TO, BOOL*, WS_ERROR*); +HRESULT WINAPI WsMoveWriter(WS_XML_WRITER*, WS_MOVE_TO, BOOL*, WS_ERROR*); HRESULT WINAPI WsReadAttribute(WS_XML_READER*, const WS_ATTRIBUTE_DESCRIPTION*, WS_READ_OPTION, WS_HEAP*, void*, ULONG, WS_ERROR*); HRESULT WINAPI WsReadEndElement(WS_XML_READER*, WS_ERROR*); @@ -492,10 +509,12 @@ HRESULT WINAPI WsSetOutputToBuffer(WS_XML_WRITER*, WS_XML_BUFFER*, const WS_XML_ ULONG, WS_ERROR*); HRESULT WINAPI WsWriteEndAttribute(WS_XML_WRITER*, WS_ERROR*); HRESULT WINAPI WsWriteEndElement(WS_XML_WRITER*, WS_ERROR*); +HRESULT WINAPI WsWriteEndStartElement(WS_XML_WRITER*, WS_ERROR*); HRESULT WINAPI WsWriteStartAttribute(WS_XML_WRITER*, const WS_XML_STRING*, const WS_XML_STRING*, const WS_XML_STRING*, BOOL, WS_ERROR*); HRESULT WINAPI WsWriteStartElement(WS_XML_WRITER*, const WS_XML_STRING*, const WS_XML_STRING*, const WS_XML_STRING*, WS_ERROR*); +HRESULT WINAPI WsWriteText(WS_XML_WRITER*, const WS_XML_TEXT*, WS_ERROR*); HRESULT WINAPI WsWriteType(WS_XML_WRITER*, WS_TYPE_MAPPING, WS_TYPE, const void*, WS_WRITE_OPTION, const void*, ULONG, WS_ERROR*); HRESULT WINAPI WsXmlStringEquals(const WS_XML_STRING*, const WS_XML_STRING*, WS_ERROR*);

1 0

Hans Leidekker : webservices: Keep track of the parent-child relationship between nodes.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: ff990d3426f34c1dcc2bc363fa3d1ec391316f18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff990d3426f34c1dcc2bc363f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 10 10:46:36 2015 +0100 webservices: Keep track of the parent-child relationship between nodes. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 223 +++++++++++++++++++++++++++++----------------- 1 file changed, 143 insertions(+), 80 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff990d3426f34c1dcc2bc…

1 0

Hans Leidekker : webservices: Implement WsAlloc.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: e3859dffad37240f8498a20689745b37f7c1c14d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3859dffad37240f8498a2068… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 10 10:46:37 2015 +0100 webservices: Implement WsAlloc. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 17 +++++++++++++++++ dlls/webservices/tests/reader.c | 27 +++++++++++++++++++++++++++ dlls/webservices/webservices.spec | 2 +- include/webservices.h | 1 + 4 files changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 48b9c01..96a3dc3 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -170,6 +170,23 @@ void ws_free( WS_HEAP *handle, void *ptr ) HeapFree( heap->handle, 0, ptr ); } +/************************************************************************** + * WsAlloc [webservices.@] + */ +HRESULT WINAPI WsAlloc( WS_HEAP *handle, SIZE_T size, void **ptr, WS_ERROR *error ) +{ + void *mem; + + TRACE( "%p %u %p %p\n", handle, (ULONG)size, ptr, error ); + if (error) FIXME( "ignoring error parameter\n" ); + + if (!handle || !ptr) return E_INVALIDARG; + + if (!(mem = ws_alloc( handle, size ))) return E_OUTOFMEMORY; + *ptr = mem; + return S_OK; +} + static struct heap *alloc_heap(void) { static const ULONG count = sizeof(heap_props)/sizeof(heap_props[0]); diff --git a/dlls/webservices/tests/reader.c b/dlls/webservices/tests/reader.c index 1f9558c..dab57f1 100644 --- a/dlls/webservices/tests/reader.c +++ b/dlls/webservices/tests/reader.c @@ -1453,6 +1453,32 @@ static void test_WsXmlStringEquals(void) ok( hr == S_OK, "got %08x\n", hr ); } +static void test_WsAlloc(void) +{ + HRESULT hr; + WS_HEAP *heap; + void *ptr; + + hr = WsCreateHeap( 256, 0, NULL, 0, &heap, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + ptr = NULL; + hr = WsAlloc( NULL, 16, &ptr, NULL ); + ok( hr == E_INVALIDARG, "got %08x\n", hr ); + ok( ptr == NULL, "ptr set\n" ); + + ptr = NULL; + hr = WsAlloc( heap, 512, &ptr, NULL ); + todo_wine ok( hr == WS_E_QUOTA_EXCEEDED, "got %08x\n", hr ); + todo_wine ok( ptr == NULL, "ptr not set\n" ); + + ptr = NULL; + hr = WsAlloc( heap, 16, &ptr, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( ptr != NULL, "ptr not set\n" ); + WsFreeHeap( heap ); +} + START_TEST(reader) { test_WsCreateError(); @@ -1468,4 +1494,5 @@ START_TEST(reader) test_WsReadType(); test_WsGetXmlAttribute(); test_WsXmlStringEquals(); + test_WsAlloc(); } diff --git a/dlls/webservices/webservices.spec b/dlls/webservices/webservices.spec index 3378ea9..1f0bfdc 100644 --- a/dlls/webservices/webservices.spec +++ b/dlls/webservices/webservices.spec @@ -9,7 +9,7 @@ @ stub WsAddErrorString @ stub WsAddMappedHeader @ stub WsAddressMessage -@ stub WsAlloc +@ stdcall WsAlloc(ptr long ptr ptr) @ stub WsAsyncExecute @ stub WsCall @ stub WsCheckMustUnderstandHeaders diff --git a/include/webservices.h b/include/webservices.h index 0ebb6c4..594a6ba 100644 --- a/include/webservices.h +++ b/include/webservices.h @@ -464,6 +464,7 @@ typedef struct _WS_XML_NODE_POSITION { void *node; } WS_XML_NODE_POSITION; +HRESULT WINAPI WsAlloc(WS_HEAP*, SIZE_T, void**, WS_ERROR*); HRESULT WINAPI WsCreateError(const WS_ERROR_PROPERTY*, ULONG, WS_ERROR**); HRESULT WINAPI WsCreateHeap(SIZE_T, SIZE_T, const WS_HEAP_PROPERTY*, ULONG, WS_HEAP**, WS_ERROR*); HRESULT WINAPI WsCreateReader(const WS_XML_READER_PROPERTY*, ULONG, WS_XML_READER**, WS_ERROR*);

1 0

Hans Leidekker : webservices: Parse self-closing tags.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 29b1c115fefa7ee0aee12e583961513b27198759 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b1c115fefa7ee0aee12e583… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 10 10:46:38 2015 +0100 webservices: Parse self-closing tags. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/reader.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/reader.c b/dlls/webservices/reader.c index 96a3dc3..0e9d533 100644 --- a/dlls/webservices/reader.c +++ b/dlls/webservices/reader.c @@ -379,6 +379,7 @@ enum reader_state READER_STATE_INITIAL, READER_STATE_BOF, READER_STATE_STARTELEMENT, + READER_STATE_STARTENDELEMENT, READER_STATE_TEXT, READER_STATE_ENDELEMENT, READER_STATE_COMMENT, @@ -928,7 +929,7 @@ static HRESULT read_element( struct reader *reader ) for (;;) { read_skip_whitespace( reader ); - if (!read_cmp( reader, ">", 1 )) break; + if (!read_cmp( reader, ">", 1 ) || !read_cmp( reader, "/>", 2 )) break; if ((hr = read_attribute( reader, &attr )) != S_OK) goto error; if ((hr = append_attribute( elem, attr )) != S_OK) { @@ -938,16 +939,24 @@ static HRESULT read_element( struct reader *reader ) } read_skip_whitespace( reader ); - if (read_cmp( reader, ">", 1 )) + if (read_cmp( reader, ">", 1 ) && read_cmp( reader, "/>", 2 )) { hr = WS_E_INVALID_FORMAT; goto error; } read_insert_node( reader, reader->current, node ); - read_skip( reader, 1 ); - reader->state = READER_STATE_STARTELEMENT; - + if (!read_cmp( reader, "/>", 2 )) + { + read_skip( reader, 2 ); + reader->current = reader->current->parent; + reader->state = READER_STATE_STARTENDELEMENT; + } + else + { + read_skip( reader, 1 ); + reader->state = READER_STATE_STARTELEMENT; + } return S_OK; error: @@ -1056,6 +1065,7 @@ static HRESULT read_endelement( struct reader *reader ) { case READER_STATE_TEXT: case READER_STATE_STARTELEMENT: + case READER_STATE_STARTENDELEMENT: break; default: return WS_E_INVALID_FORMAT;

1 0

Huw Davies : riched20: Release the font cache when changing the default style.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: f47aab61671ad0d031fcea56c2204f8d0c47fff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f47aab61671ad0d031fcea56c… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 9 16:11:42 2015 +0000 riched20: Release the font cache when changing the default style. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/run.c | 19 ------------------- dlls/riched20/style.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index d76737a..d261213 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -763,25 +763,6 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C } } -/****************************************************************************** - * ME_SetDefaultCharFormat - * - * Applies a style change to the default character style. - */ -void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod) -{ - ME_Style *style; - - assert(mod->cbSize == sizeof(CHARFORMAT2W)); - style = ME_ApplyStyle(editor->pBuffer->pDefaultStyle, mod); - editor->pBuffer->pDefaultStyle->fmt = style->fmt; - editor->pBuffer->pDefaultStyle->tm = style->tm; - ScriptFreeCache( &editor->pBuffer->pDefaultStyle->script_cache ); - ME_ReleaseStyle(style); - ME_MarkAllForWrapping(editor); - /* pcf = editor->pBuffer->pDefaultStyle->fmt; */ -} - static void ME_GetRunCharFormat(ME_TextEditor *editor, ME_DisplayItem *run, CHARFORMAT2W *pFmt) { ME_CopyCharFormat(pFmt, &run->member.run.style->fmt); diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 0e990e2..37f56d9 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -508,3 +508,31 @@ void ME_ClearTempStyle(ME_TextEditor *editor) ME_ReleaseStyle(editor->pBuffer->pCharStyle); editor->pBuffer->pCharStyle = NULL; } + +/****************************************************************************** + * ME_SetDefaultCharFormat + * + * Applies a style change to the default character style. + * + * The default style is special in that it is mutable - runs + * in the document that have this style should change if the + * default style changes. That means we need to fix up this + * style manually. + */ +void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod) +{ + ME_Style *style, *def = editor->pBuffer->pDefaultStyle; + + assert(mod->cbSize == sizeof(CHARFORMAT2W)); + style = ME_ApplyStyle(def, mod); + def->fmt = style->fmt; + def->tm = style->tm; + if (def->font_cache) + { + release_font_cache( def->font_cache ); + def->font_cache = NULL; + } + ScriptFreeCache( &def->script_cache ); + ME_ReleaseStyle( style ); + ME_MarkAllForWrapping( editor ); +}

1 0

Huw Davies : riched20: Maintain a list of styles and reuse them if possible.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: b241276f50ba38f0e76b3c3645d059b22d30f652 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b241276f50ba38f0e76b3c364… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Nov 9 16:11:43 2015 +0000 riched20: Maintain a list of styles and reuse them if possible. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 8 ++++- dlls/riched20/editor.h | 3 +- dlls/riched20/editstr.h | 2 ++ dlls/riched20/run.c | 4 +-- dlls/riched20/style.c | 79 ++++++++++++++++++++++++++++++------------------- 5 files changed, 62 insertions(+), 34 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index ec584eb..bbb0cc0 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -533,7 +533,7 @@ void ME_RTFCharAttrHook(RTF_Info *info) ME_Style *style2; RTFFlushOutputBuffer(info); /* FIXME too slow ? how come ? */ - style2 = ME_ApplyStyle(info->style, &fmt); + style2 = ME_ApplyStyle(info->editor, info->style, &fmt); ME_ReleaseStyle(info->style); info->style = style2; info->styleChanged = TRUE; @@ -2920,6 +2920,7 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10, DWORD ed->wheel_remain = 0; + list_init( &ed->style_list ); OleInitialize(NULL); return ed; @@ -2929,6 +2930,7 @@ void ME_DestroyEditor(ME_TextEditor *editor) { ME_DisplayItem *pFirst = editor->pBuffer->pFirst; ME_DisplayItem *p = pFirst, *pNext = NULL; + ME_Style *s, *cursor2; int i; ME_ClearTempStyle(editor); @@ -2938,6 +2940,10 @@ void ME_DestroyEditor(ME_TextEditor *editor) ME_DestroyDisplayItem(p); p = pNext; } + + LIST_FOR_EACH_ENTRY_SAFE( s, cursor2, &editor->style_list, ME_Style, entry ) + ME_DestroyStyle( s ); + ME_ReleaseStyle(editor->pBuffer->pDefaultStyle); for (i=0; i<HFONT_CACHE_SIZE; i++) { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index f22f0e6..a63dea6 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -69,9 +69,10 @@ static inline const char *debugstr_run( const ME_Run *run ) /* style.c */ ME_Style *ME_MakeStyle(CHARFORMAT2W *style) DECLSPEC_HIDDEN; void ME_AddRefStyle(ME_Style *item) DECLSPEC_HIDDEN; +void ME_DestroyStyle(ME_Style *item) DECLSPEC_HIDDEN; void ME_ReleaseStyle(ME_Style *item) DECLSPEC_HIDDEN; ME_Style *ME_GetInsertStyle(ME_TextEditor *editor, int nCursor) DECLSPEC_HIDDEN; -ME_Style *ME_ApplyStyle(ME_Style *sSrc, CHARFORMAT2W *style) DECLSPEC_HIDDEN; +ME_Style *ME_ApplyStyle(ME_TextEditor *ed, ME_Style *sSrc, CHARFORMAT2W *style) DECLSPEC_HIDDEN; HFONT ME_SelectStyleFont(ME_Context *c, ME_Style *s) DECLSPEC_HIDDEN; void ME_UnselectStyleFont(ME_Context *c, ME_Style *s, HFONT hOldFont) DECLSPEC_HIDDEN; void ME_InitCharFormat2W(CHARFORMAT2W *pFmt) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 3e98dac..be925db 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -78,6 +78,7 @@ typedef struct tagME_Style TEXTMETRICW tm; /* cached font metrics for the style */ int nRefs; /* reference count */ SCRIPT_CACHE script_cache; + struct list entry; } ME_Style; typedef enum { @@ -444,6 +445,7 @@ typedef struct tagME_TextEditor BOOL bMouseCaptured; int wheel_remain; + struct list style_list; } ME_TextEditor; typedef struct tagME_Context diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index d261213..7016932 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -695,7 +695,7 @@ void ME_SetSelectionCharFormat(ME_TextEditor *editor, CHARFORMAT2W *pFmt) ME_Style *s; if (!editor->pBuffer->pCharStyle) editor->pBuffer->pCharStyle = ME_GetInsertStyle(editor, 0); - s = ME_ApplyStyle(editor->pBuffer->pCharStyle, pFmt); + s = ME_ApplyStyle(editor, editor->pBuffer->pCharStyle, pFmt); ME_ReleaseStyle(editor->pBuffer->pCharStyle); editor->pBuffer->pCharStyle = s; } else { @@ -753,7 +753,7 @@ void ME_SetCharFormat(ME_TextEditor *editor, ME_Cursor *start, ME_Cursor *end, C for (run = start_run; run != end_run; run = ME_FindItemFwd( run, diRun )) { - ME_Style *new_style = ME_ApplyStyle(run->member.run.style, pFmt); + ME_Style *new_style = ME_ApplyStyle(editor, run->member.run.style, pFmt); add_undo_set_char_fmt( editor, run->member.run.para->nCharOfs + run->member.run.nCharOfs, run->member.run.len, &run->member.run.style->fmt ); diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c index 37f56d9..06c0e6f 100644 --- a/dlls/riched20/style.c +++ b/dlls/riched20/style.c @@ -150,21 +150,22 @@ ME_Style *ME_MakeStyle(CHARFORMAT2W *style) memset(&s->tm, 0, sizeof(s->tm)); s->tm.tmAscent = -1; s->script_cache = NULL; + list_init(&s->entry); all_refs++; TRACE_(richedit_style)("ME_MakeStyle %p, total refs=%d\n", s, all_refs); return s; } #define COPY_STYLE_ITEM(mask, member) \ - if (style->dwMask & mask) { \ - s->fmt.dwMask |= mask;\ - s->fmt.member = style->member;\ + if (mod->dwMask & mask) { \ + fmt.dwMask |= mask;\ + fmt.member = mod->member;\ } #define COPY_STYLE_ITEM_MEMCPY(mask, member) \ - if (style->dwMask & mask) { \ - s->fmt.dwMask |= mask;\ - CopyMemory(s->fmt.member, style->member, sizeof(style->member));\ + if (mod->dwMask & mask) { \ + fmt.dwMask |= mask;\ + CopyMemory(fmt.member, mod->member, sizeof(mod->member));\ } void ME_InitCharFormat2W(CHARFORMAT2W *pFmt) @@ -173,10 +174,12 @@ void ME_InitCharFormat2W(CHARFORMAT2W *pFmt) pFmt->cbSize = sizeof(CHARFORMAT2W); } -ME_Style *ME_ApplyStyle(ME_Style *sSrc, CHARFORMAT2W *style) +ME_Style *ME_ApplyStyle(ME_TextEditor *editor, ME_Style *sSrc, CHARFORMAT2W *mod) { - ME_Style *s = ME_MakeStyle(&sSrc->fmt); - assert(style->cbSize == sizeof(CHARFORMAT2W)); + CHARFORMAT2W fmt = sSrc->fmt; + ME_Style *s; + + assert(mod->cbSize == sizeof(CHARFORMAT2W)); COPY_STYLE_ITEM(CFM_ANIMATION, bAnimation); COPY_STYLE_ITEM(CFM_BACKCOLOR, crBackColor); COPY_STYLE_ITEM(CFM_CHARSET, bCharSet); @@ -186,9 +189,9 @@ ME_Style *ME_ApplyStyle(ME_Style *sSrc, CHARFORMAT2W *style) COPY_STYLE_ITEM(CFM_LCID, lcid); COPY_STYLE_ITEM(CFM_OFFSET, yOffset); COPY_STYLE_ITEM(CFM_REVAUTHOR, bRevAuthor); - if (style->dwMask & CFM_SIZE) { - s->fmt.dwMask |= CFM_SIZE; - s->fmt.yHeight = min(style->yHeight, yHeightCharPtsMost * 20); + if (mod->dwMask & CFM_SIZE) { + fmt.dwMask |= CFM_SIZE; + fmt.yHeight = min(mod->yHeight, yHeightCharPtsMost * 20); } COPY_STYLE_ITEM(CFM_SPACING, sSpacing); COPY_STYLE_ITEM(CFM_STYLE, sStyle); @@ -197,31 +200,46 @@ ME_Style *ME_ApplyStyle(ME_Style *sSrc, CHARFORMAT2W *style) /* FIXME: this is not documented this way, but that's the more logical */ COPY_STYLE_ITEM(CFM_FACE, bPitchAndFamily); - s->fmt.dwEffects &= ~(style->dwMask); - s->fmt.dwEffects |= style->dwEffects & style->dwMask; - s->fmt.dwMask |= style->dwMask; - if (style->dwMask & CFM_COLOR) + fmt.dwEffects &= ~(mod->dwMask); + fmt.dwEffects |= mod->dwEffects & mod->dwMask; + fmt.dwMask |= mod->dwMask; + if (mod->dwMask & CFM_COLOR) { - if (style->dwEffects & CFE_AUTOCOLOR) - s->fmt.dwEffects |= CFE_AUTOCOLOR; + if (mod->dwEffects & CFE_AUTOCOLOR) + fmt.dwEffects |= CFE_AUTOCOLOR; else - s->fmt.dwEffects &= ~CFE_AUTOCOLOR; + fmt.dwEffects &= ~CFE_AUTOCOLOR; } - if (style->dwMask & CFM_UNDERLINE) + if (mod->dwMask & CFM_UNDERLINE) { - s->fmt.dwMask |= CFM_UNDERLINETYPE; - s->fmt.bUnderlineType = (style->dwEffects & CFM_UNDERLINE) ? + fmt.dwMask |= CFM_UNDERLINETYPE; + fmt.bUnderlineType = (mod->dwEffects & CFM_UNDERLINE) ? CFU_CF1UNDERLINE : CFU_UNDERLINENONE; } - if (style->dwMask & CFM_BOLD && !(style->dwMask & CFM_WEIGHT)) + if (mod->dwMask & CFM_BOLD && !(mod->dwMask & CFM_WEIGHT)) { - s->fmt.wWeight = (style->dwEffects & CFE_BOLD) ? FW_BOLD : FW_NORMAL; - } else if (style->dwMask & CFM_WEIGHT && !(style->dwMask & CFM_BOLD)) { - if (style->wWeight > FW_NORMAL) - s->fmt.dwEffects |= CFE_BOLD; + fmt.wWeight = (mod->dwEffects & CFE_BOLD) ? FW_BOLD : FW_NORMAL; + } else if (mod->dwMask & CFM_WEIGHT && !(mod->dwMask & CFM_BOLD)) { + if (mod->wWeight > FW_NORMAL) + fmt.dwEffects |= CFE_BOLD; else - s->fmt.dwEffects &= ~CFE_BOLD; + fmt.dwEffects &= ~CFE_BOLD; + } + + LIST_FOR_EACH_ENTRY(s, &editor->style_list, ME_Style, entry) + { + if (!memcmp( &s->fmt, &fmt, sizeof(fmt) )) + { + TRACE_(richedit_style)("found existing style %p\n", s); + ME_AddRefStyle( s ); + return s; + } } + + s = ME_MakeStyle( &fmt ); + if (s) + list_add_head( &editor->style_list, &s->entry ); + TRACE_(richedit_style)("created new style %p\n", s); return s; } @@ -423,8 +441,9 @@ void ME_UnselectStyleFont(ME_Context *c, ME_Style *s, HFONT hOldFont) s->font_cache = NULL; } -static void ME_DestroyStyle(ME_Style *s) +void ME_DestroyStyle(ME_Style *s) { + list_remove( &s->entry ); if (s->font_cache) { release_font_cache( s->font_cache ); @@ -524,7 +543,7 @@ void ME_SetDefaultCharFormat(ME_TextEditor *editor, CHARFORMAT2W *mod) ME_Style *style, *def = editor->pBuffer->pDefaultStyle; assert(mod->cbSize == sizeof(CHARFORMAT2W)); - style = ME_ApplyStyle(def, mod); + style = ME_ApplyStyle(editor, def, mod); def->fmt = style->fmt; def->tm = style->tm; if (def->font_cache)

1 0

Jacek Caban : ieframe: Store toolbar handle in InternetEplorer.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: 10b6d06f1523ca7e5ef5e1cf73f6ff6a9f1bd291 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10b6d06f1523ca7e5ef5e1cf7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 9 17:52:46 2015 +0100 ieframe: Store toolbar handle in InternetEplorer. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/iexplore.c | 50 ++++++++++++++++++++++++------------------------- 2 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 5806107..f0ca235 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -230,6 +230,7 @@ struct InternetExplorer { HWND frame_hwnd; HWND status_hwnd; + HWND toolbar_hwnd; HMENU menu; BOOL nohome; diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 6260476..18437c9 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -402,7 +402,7 @@ static void ie_dialog_about(HWND hwnd) DestroyIcon(icon); } -static void add_tb_separator(HWND hwnd) +static void add_tb_separator(InternetExplorer *ie) { TBBUTTON btn; @@ -410,10 +410,10 @@ static void add_tb_separator(HWND hwnd) btn.iBitmap = 3; btn.fsStyle = BTNS_SEP; - SendMessageW(hwnd, TB_ADDBUTTONSW, 1, (LPARAM)&btn); + SendMessageW(ie->toolbar_hwnd, TB_ADDBUTTONSW, 1, (LPARAM)&btn); } -static void add_tb_button(HWND hwnd, int bmp, int cmd, int strId) +static void add_tb_button(InternetExplorer *ie, int bmp, int cmd, int strId) { TBBUTTON btn; WCHAR buf[30]; @@ -427,14 +427,13 @@ static void add_tb_button(HWND hwnd, int bmp, int cmd, int strId) btn.dwData = 0; btn.iString = (INT_PTR)buf; - SendMessageW(hwnd, TB_ADDBUTTONSW, 1, (LPARAM)&btn); + SendMessageW(ie->toolbar_hwnd, TB_ADDBUTTONSW, 1, (LPARAM)&btn); } -static void create_rebar(HWND hwnd) +static void create_rebar(InternetExplorer *ie) { HWND hwndRebar; HWND hwndAddress; - HWND hwndToolbar; REBARINFO rebarinf; REBARBANDINFOW bandinf; WCHAR addr[40]; @@ -445,7 +444,7 @@ static void create_rebar(HWND hwnd) hwndRebar = CreateWindowExW(WS_EX_TOOLWINDOW, REBARCLASSNAMEW, NULL, WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN|RBS_VARHEIGHT|CCS_TOP|CCS_NODIVIDER, 0, 0, 0, 0, - hwnd, (HMENU)IDC_BROWSE_REBAR, ieframe_instance, NULL); + ie->frame_hwnd, (HMENU)IDC_BROWSE_REBAR, ieframe_instance, NULL); rebarinf.cbSize = sizeof(rebarinf); rebarinf.fMask = 0; @@ -453,29 +452,29 @@ static void create_rebar(HWND hwnd) SendMessageW(hwndRebar, RB_SETBARINFO, 0, (LPARAM)&rebarinf); - hwndToolbar = CreateWindowExW(TBSTYLE_EX_MIXEDBUTTONS, TOOLBARCLASSNAMEW, NULL, TBSTYLE_FLAT | WS_CHILD | WS_VISIBLE | CCS_NORESIZE, + ie->toolbar_hwnd = CreateWindowExW(TBSTYLE_EX_MIXEDBUTTONS, TOOLBARCLASSNAMEW, NULL, TBSTYLE_FLAT | WS_CHILD | WS_VISIBLE | CCS_NORESIZE, 0, 0, 0, 0, hwndRebar, (HMENU)IDC_BROWSE_TOOLBAR, ieframe_instance, NULL); imagelist = ImageList_LoadImageW(ieframe_instance, MAKEINTRESOURCEW(IDB_IETOOLBAR), 32, 0, CLR_NONE, IMAGE_BITMAP, LR_CREATEDIBSECTION); - SendMessageW(hwndToolbar, TB_SETIMAGELIST, 0, (LPARAM)imagelist); - SendMessageW(hwndToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); - add_tb_button(hwndToolbar, 0, ID_BROWSE_BACK, IDS_TB_BACK); - add_tb_button(hwndToolbar, 1, ID_BROWSE_FORWARD, IDS_TB_FORWARD); - add_tb_button(hwndToolbar, 2, ID_BROWSE_STOP, IDS_TB_STOP); - add_tb_button(hwndToolbar, 3, ID_BROWSE_REFRESH, IDS_TB_REFRESH); - add_tb_button(hwndToolbar, 4, ID_BROWSE_HOME, IDS_TB_HOME); - add_tb_separator(hwndToolbar); - add_tb_button(hwndToolbar, 5, ID_BROWSE_PRINT, IDS_TB_PRINT); - SendMessageW(hwndToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(55,50)); - SendMessageW(hwndToolbar, TB_GETMAXSIZE, 0, (LPARAM)&toolbar_size); + SendMessageW(ie->toolbar_hwnd, TB_SETIMAGELIST, 0, (LPARAM)imagelist); + SendMessageW(ie->toolbar_hwnd, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0); + add_tb_button(ie, 0, ID_BROWSE_BACK, IDS_TB_BACK); + add_tb_button(ie, 1, ID_BROWSE_FORWARD, IDS_TB_FORWARD); + add_tb_button(ie, 2, ID_BROWSE_STOP, IDS_TB_STOP); + add_tb_button(ie, 3, ID_BROWSE_REFRESH, IDS_TB_REFRESH); + add_tb_button(ie, 4, ID_BROWSE_HOME, IDS_TB_HOME); + add_tb_separator(ie); + add_tb_button(ie, 5, ID_BROWSE_PRINT, IDS_TB_PRINT); + SendMessageW(ie->toolbar_hwnd, TB_SETBUTTONSIZE, 0, MAKELPARAM(55,50)); + SendMessageW(ie->toolbar_hwnd, TB_GETMAXSIZE, 0, (LPARAM)&toolbar_size); bandinf.cbSize = sizeof(bandinf); bandinf.fMask = RBBIM_STYLE | RBBIM_CHILD | RBBIM_CHILDSIZE; bandinf.fStyle = RBBS_CHILDEDGE; bandinf.cxMinChild = toolbar_size.cx; bandinf.cyMinChild = toolbar_size.cy+2; - bandinf.hwndChild = hwndToolbar; + bandinf.hwndChild = ie->toolbar_hwnd; SendMessageW(hwndRebar, RB_INSERTBANDW, -1, (LPARAM)&bandinf); @@ -497,13 +496,15 @@ static LRESULT iewnd_OnCreate(HWND hwnd, LPCREATESTRUCTW lpcs) InternetExplorer* This = (InternetExplorer*)lpcs->lpCreateParams; SetWindowLongPtrW(hwnd, 0, (LONG_PTR) lpcs->lpCreateParams); + This->doc_host.frame_hwnd = This->frame_hwnd = hwnd; + This->menu = create_ie_menu(); This->status_hwnd = CreateStatusWindowW(WS_VISIBLE|WS_CHILD|SBT_NOBORDERS|CCS_NODIVIDER, NULL, hwnd, IDC_BROWSE_STATUSBAR); SendMessageW(This->status_hwnd, SB_SIMPLE, TRUE, 0); - create_rebar(hwnd); + create_rebar(This); return 0; } @@ -567,9 +568,7 @@ static LRESULT iewnd_OnNotify(InternetExplorer *This, WPARAM wparam, LPARAM lpar static LRESULT iewnd_OnDestroy(InternetExplorer *This) { - HWND hwndRebar = GetDlgItem(This->frame_hwnd, IDC_BROWSE_REBAR); - HWND hwndToolbar = GetDlgItem(hwndRebar, IDC_BROWSE_TOOLBAR); - HIMAGELIST list = (HIMAGELIST)SendMessageW(hwndToolbar, TB_GETIMAGELIST, 0, 0); + HIMAGELIST list = (HIMAGELIST)SendMessageW(This->toolbar_hwnd, TB_GETIMAGELIST, 0, 0); TRACE("%p\n", This); @@ -722,7 +721,7 @@ void unregister_iewindow_class(void) static void create_frame_hwnd(InternetExplorer *This) { - This->frame_hwnd = CreateWindowExW( + CreateWindowExW( WS_EX_WINDOWEDGE, szIEWinFrame, wszWineInternetExplorer, WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME @@ -730,7 +729,6 @@ static void create_frame_hwnd(InternetExplorer *This) CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT, NULL, NULL /* FIXME */, ieframe_instance, This); - This->doc_host.frame_hwnd = This->frame_hwnd; create_doc_view_hwnd(&This->doc_host); }

1 0

Jacek Caban : ieframe: Disable forward and backward navigation toolbar buttons when they are not usable.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: abe564ad3bed8eee07dda6032bc926f63fe2960b URL: http://source.winehq.org/git/wine.git/?a=commit;h=abe564ad3bed8eee07dda6032… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 9 17:53:00 2015 +0100 ieframe: Disable forward and backward navigation toolbar buttons when they are not usable. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/dochost.c | 8 +++++--- dlls/ieframe/ieframe.h | 1 + dlls/ieframe/iexplore.c | 20 ++++++++++++++++++++ dlls/ieframe/webbrowser.c | 5 +++++ 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 0823797..7ebd304 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -93,20 +93,22 @@ void on_commandstate_change(DocHost *doc_host, LONG command, VARIANT_BOOL enable dispparams.rgvarg = params; V_VT(params) = VT_BOOL; - V_BOOL(params) = enable; + V_BOOL(params) = enable ? VARIANT_TRUE : VARIANT_FALSE; V_VT(params+1) = VT_I4; V_I4(params+1) = command; call_sink(doc_host->cps.wbe2, DISPID_COMMANDSTATECHANGE, &dispparams); + + doc_host->container_vtbl->on_command_state_change(doc_host, command, enable); } void update_navigation_commands(DocHost *dochost) { unsigned pos = dochost->travellog.loading_pos == -1 ? dochost->travellog.position : dochost->travellog.loading_pos; - on_commandstate_change(dochost, CSC_NAVIGATEBACK, pos > 0 ? VARIANT_TRUE : VARIANT_FALSE); - on_commandstate_change(dochost, CSC_NAVIGATEFORWARD, pos < dochost->travellog.length ? VARIANT_TRUE : VARIANT_FALSE); + on_commandstate_change(dochost, CSC_NAVIGATEBACK, pos > 0); + on_commandstate_change(dochost, CSC_NAVIGATEFORWARD, pos < dochost->travellog.length); } static void notif_complete(DocHost *This, DISPID dispid) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index f0ca235..4baca9c 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -105,6 +105,7 @@ typedef struct _IDocHostContainerVtbl ULONG (*release)(DocHost*); void (WINAPI* GetDocObjRect)(DocHost*,RECT*); HRESULT (WINAPI* SetStatusText)(DocHost*,LPCWSTR); + void (*on_command_state_change)(DocHost*,LONG,BOOL); void (WINAPI* SetURL)(DocHost*,LPCWSTR); } IDocHostContainerVtbl; diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 18437c9..5793dd8 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -430,6 +430,11 @@ static void add_tb_button(InternetExplorer *ie, int bmp, int cmd, int strId) SendMessageW(ie->toolbar_hwnd, TB_ADDBUTTONSW, 1, (LPARAM)&btn); } +static void enable_toolbar_button(InternetExplorer *ie, int command, BOOL enable) +{ + SendMessageW(ie->toolbar_hwnd, TB_ENABLEBUTTON, command, enable); +} + static void create_rebar(InternetExplorer *ie) { HWND hwndRebar; @@ -761,6 +766,20 @@ static HRESULT WINAPI DocHostContainer_SetStatusText(DocHost *iface, LPCWSTR tex return update_ie_statustext(This, text); } +static void DocHostContainer_on_command_state_change(DocHost *iface, LONG command, BOOL enable) +{ + InternetExplorer *This = impl_from_DocHost(iface); + + switch(command) { + case CSC_NAVIGATEBACK: + enable_toolbar_button(This, ID_BROWSE_BACK, enable); + break; + case CSC_NAVIGATEFORWARD: + enable_toolbar_button(This, ID_BROWSE_FORWARD, enable); + break; + } +} + static void WINAPI DocHostContainer_SetURL(DocHost* iface, LPCWSTR url) { InternetExplorer *This = impl_from_DocHost(iface); @@ -774,6 +793,7 @@ static const IDocHostContainerVtbl DocHostContainerVtbl = { IEDocHost_release, DocHostContainer_GetDocObjRect, DocHostContainer_SetStatusText, + DocHostContainer_on_command_state_change, DocHostContainer_SetURL }; diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 5b4348b..3926cbb 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -1204,6 +1204,10 @@ static HRESULT WINAPI DocHostContainer_SetStatusText(DocHost* This, LPCWSTR text return E_NOTIMPL; } +static void DocHostContainer_on_command_state_change(DocHost *This, LONG command, BOOL enable) +{ +} + static void WINAPI DocHostContainer_SetURL(DocHost* This, LPCWSTR url) { } @@ -1213,6 +1217,7 @@ static const IDocHostContainerVtbl DocHostContainerVtbl = { WebBrowser_release, DocHostContainer_GetDocObjRect, DocHostContainer_SetStatusText, + DocHostContainer_on_command_state_change, DocHostContainer_SetURL };

1 0

Jacek Caban : ieframe: Don't use WINAPI in internal functions.
by Alexandre Julliard 10 Nov '15

10 Nov '15

Module: wine Branch: master Commit: ba87de8313827392f155883da8943cbe9579e1ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba87de8313827392f155883da… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 9 17:53:11 2015 +0100 ieframe: Don't use WINAPI in internal functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ieframe/dochost.c | 2 +- dlls/ieframe/frame.c | 2 +- dlls/ieframe/ieframe.h | 6 +++--- dlls/ieframe/iexplore.c | 12 ++++++------ dlls/ieframe/navigate.c | 2 +- dlls/ieframe/webbrowser.c | 12 ++++++------ 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 7ebd304..8f3b088 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -500,7 +500,7 @@ void create_doc_view_hwnd(DocHost *This) doc_view_atom = RegisterClassExW(&wndclass); } - This->container_vtbl->GetDocObjRect(This, &rect); + This->container_vtbl->get_docobj_rect(This, &rect); This->hwnd = CreateWindowExW(0, wszShell_DocObject_View, wszShell_DocObject_View, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP, diff --git a/dlls/ieframe/frame.c b/dlls/ieframe/frame.c index d394d74..d86c271 100644 --- a/dlls/ieframe/frame.c +++ b/dlls/ieframe/frame.c @@ -141,7 +141,7 @@ static HRESULT WINAPI InPlaceFrame_SetStatusText(IOleInPlaceFrame *iface, { DocHost *This = impl_from_IOleInPlaceFrame(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(pszStatusText)); - return This->container_vtbl->SetStatusText(This, pszStatusText); + return This->container_vtbl->set_status_text(This, pszStatusText); } static HRESULT WINAPI InPlaceFrame_EnableModeless(IOleInPlaceFrame *iface, BOOL fEnable) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 4baca9c..ae36c65 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -103,10 +103,10 @@ typedef struct _IDocHostContainerVtbl { ULONG (*addref)(DocHost*); ULONG (*release)(DocHost*); - void (WINAPI* GetDocObjRect)(DocHost*,RECT*); - HRESULT (WINAPI* SetStatusText)(DocHost*,LPCWSTR); + void (*get_docobj_rect)(DocHost*,RECT*); + HRESULT (*set_status_text)(DocHost*,const WCHAR*); void (*on_command_state_change)(DocHost*,LONG,BOOL); - void (WINAPI* SetURL)(DocHost*,LPCWSTR); + void (*set_url)(DocHost*,const WCHAR*); } IDocHostContainerVtbl; struct DocHost { diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 5793dd8..07061fd 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -754,13 +754,13 @@ static ULONG IEDocHost_release(DocHost *iface) return IWebBrowser2_Release(&This->IWebBrowser2_iface); } -static void WINAPI DocHostContainer_GetDocObjRect(DocHost* This, RECT* rc) +static void DocHostContainer_get_docobj_rect(DocHost *This, RECT *rc) { GetClientRect(This->frame_hwnd, rc); adjust_ie_docobj_rect(This->frame_hwnd, rc); } -static HRESULT WINAPI DocHostContainer_SetStatusText(DocHost *iface, LPCWSTR text) +static HRESULT DocHostContainer_set_status_text(DocHost *iface, const WCHAR *text) { InternetExplorer *This = impl_from_DocHost(iface); return update_ie_statustext(This, text); @@ -780,7 +780,7 @@ static void DocHostContainer_on_command_state_change(DocHost *iface, LONG comman } } -static void WINAPI DocHostContainer_SetURL(DocHost* iface, LPCWSTR url) +static void DocHostContainer_set_url(DocHost* iface, const WCHAR *url) { InternetExplorer *This = impl_from_DocHost(iface); @@ -791,10 +791,10 @@ static void WINAPI DocHostContainer_SetURL(DocHost* iface, LPCWSTR url) static const IDocHostContainerVtbl DocHostContainerVtbl = { IEDocHost_addref, IEDocHost_release, - DocHostContainer_GetDocObjRect, - DocHostContainer_SetStatusText, + DocHostContainer_get_docobj_rect, + DocHostContainer_set_status_text, DocHostContainer_on_command_state_change, - DocHostContainer_SetURL + DocHostContainer_set_url }; static HRESULT create_ie(InternetExplorer **ret_obj) diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 256fd18..1b42fa5 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -142,7 +142,7 @@ HRESULT set_dochost_url(DocHost *This, const WCHAR *url) heap_free(This->url); This->url = new_url; - This->container_vtbl->SetURL(This, This->url); + This->container_vtbl->set_url(This, This->url); return S_OK; } diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 3926cbb..0378d6b 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -1194,12 +1194,12 @@ static ULONG WebBrowser_release(DocHost *iface) return IWebBrowser2_Release(&This->IWebBrowser2_iface); } -static void WINAPI DocHostContainer_GetDocObjRect(DocHost* This, RECT* rc) +static void DocHostContainer_get_docobj_rect(DocHost *This, RECT *rc) { GetClientRect(This->frame_hwnd, rc); } -static HRESULT WINAPI DocHostContainer_SetStatusText(DocHost* This, LPCWSTR text) +static HRESULT DocHostContainer_set_status_text(DocHost *This, const WCHAR *text) { return E_NOTIMPL; } @@ -1208,17 +1208,17 @@ static void DocHostContainer_on_command_state_change(DocHost *This, LONG command { } -static void WINAPI DocHostContainer_SetURL(DocHost* This, LPCWSTR url) +static void DocHostContainer_set_url(DocHost *This, const WCHAR *url) { } static const IDocHostContainerVtbl DocHostContainerVtbl = { WebBrowser_addref, WebBrowser_release, - DocHostContainer_GetDocObjRect, - DocHostContainer_SetStatusText, + DocHostContainer_get_docobj_rect, + DocHostContainer_set_status_text, DocHostContainer_on_command_state_change, - DocHostContainer_SetURL + DocHostContainer_set_url }; static HRESULT create_webbrowser(int version, IUnknown *outer, REFIID riid, void **ppv)

1 0