March 2021 - Wine-commits - list.winehq.org

Rémi Bernon : include: Use UINT32 for IVectorView<T> index/size arguments.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: master Commit: a29a12135a7e3770e6337e07f16134de31c4e48c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a29a12135a7e3770e6337e07… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 23 11:23:17 2021 +0100 include: Use UINT32 for IVectorView<T> index/size arguments. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/main.c | 20 ++++++++++---------- dlls/windows.gaming.input/tests/input.c | 4 ++-- dlls/windows.media.speech/main.c | 10 +++++----- dlls/windows.media.speech/tests/speech.c | 2 +- include/windows.foundation.collections.idl | 8 ++++---- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c index e97322212e4..bf6b990a623 100644 --- a/dlls/windows.gaming.input/main.c +++ b/dlls/windows.gaming.input/main.c @@ -117,7 +117,7 @@ static HRESULT STDMETHODCALLTYPE vector_view_gamepad_GetTrustLevel( } static HRESULT STDMETHODCALLTYPE vector_view_gamepad_GetAt( - IVectorView_Gamepad *iface, ULONG index, IGamepad **value) + IVectorView_Gamepad *iface, UINT32 index, IGamepad **value) { FIXME("iface %p, index %#x, value %p stub!\n", iface, index, value); *value = NULL; @@ -125,7 +125,7 @@ static HRESULT STDMETHODCALLTYPE vector_view_gamepad_GetAt( } static HRESULT STDMETHODCALLTYPE vector_view_gamepad_get_Size( - IVectorView_Gamepad *iface, ULONG *value) + IVectorView_Gamepad *iface, UINT32 *value) { FIXME("iface %p, value %p stub!\n", iface, value); *value = 0; @@ -133,7 +133,7 @@ static HRESULT STDMETHODCALLTYPE vector_view_gamepad_get_Size( } static HRESULT STDMETHODCALLTYPE vector_view_gamepad_IndexOf( - IVectorView_Gamepad *iface, IGamepad *element, ULONG *index, BOOLEAN *found) + IVectorView_Gamepad *iface, IGamepad *element, UINT32 *index, BOOLEAN *found) { FIXME("iface %p, element %p, index %p, found %p stub!\n", iface, element, index, found); *index = 0; @@ -142,8 +142,8 @@ static HRESULT STDMETHODCALLTYPE vector_view_gamepad_IndexOf( } static HRESULT STDMETHODCALLTYPE vector_view_gamepad_GetMany( - IVectorView_Gamepad *iface, ULONG start_index, - ULONG items_size, IGamepad **items, UINT *value) + IVectorView_Gamepad *iface, UINT32 start_index, + UINT32 items_size, IGamepad **items, UINT *value) { FIXME("iface %p, start_index %#x, items %p, value %p stub!\n", iface, start_index, items, value); *value = 0; @@ -243,7 +243,7 @@ static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_GetTrustLevel( } static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_GetAt( - IVectorView_RawGameController *iface, ULONG index, IRawGameController **value) + IVectorView_RawGameController *iface, UINT32 index, IRawGameController **value) { FIXME("iface %p, index %#x, value %p stub!\n", iface, index, value); *value = NULL; @@ -251,7 +251,7 @@ static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_GetAt( } static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_get_Size( - IVectorView_RawGameController *iface, ULONG *value) + IVectorView_RawGameController *iface, UINT32 *value) { FIXME("iface %p, value %p stub!\n", iface, value); *value = 0; @@ -259,7 +259,7 @@ static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_get_Size( } static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_IndexOf( - IVectorView_RawGameController *iface, IRawGameController *element, ULONG *index, BOOLEAN *found) + IVectorView_RawGameController *iface, IRawGameController *element, UINT32 *index, BOOLEAN *found) { FIXME("iface %p, element %p, index %p, found %p stub!\n", iface, element, index, found); *index = 0; @@ -268,8 +268,8 @@ static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_IndexOf( } static HRESULT STDMETHODCALLTYPE vector_view_raw_game_controller_GetMany( - IVectorView_RawGameController *iface, ULONG start_index, - ULONG items_size, IRawGameController **items, UINT *value) + IVectorView_RawGameController *iface, UINT32 start_index, + UINT32 items_size, IRawGameController **items, UINT *value) { FIXME("iface %p, start_index %#x, items %p, value %p stub!\n", iface, start_index, items, value); *value = 0; diff --git a/dlls/windows.gaming.input/tests/input.c b/dlls/windows.gaming.input/tests/input.c index 6ed40186df9..6ce06de346e 100644 --- a/dlls/windows.gaming.input/tests/input.c +++ b/dlls/windows.gaming.input/tests/input.c @@ -115,7 +115,7 @@ static void test_Gamepad(void) BOOLEAN found; HSTRING str; HRESULT hr; - ULONG size; + UINT32 size; gamepad_event_handler.IEventHandler_Gamepad_iface.lpVtbl = &gamepad_event_handler_vtbl; @@ -292,7 +292,7 @@ static void test_RawGameController(void) BOOLEAN found; HSTRING str; HRESULT hr; - ULONG size; + UINT32 size; controller_event_handler.IEventHandler_RawGameController_iface.lpVtbl = &controller_event_handler_vtbl; diff --git a/dlls/windows.media.speech/main.c b/dlls/windows.media.speech/main.c index 1a9ba51b071..c358b991be2 100644 --- a/dlls/windows.media.speech/main.c +++ b/dlls/windows.media.speech/main.c @@ -116,14 +116,14 @@ static HRESULT STDMETHODCALLTYPE vector_view_voice_information_GetTrustLevel( } static HRESULT STDMETHODCALLTYPE vector_view_voice_information_GetAt( - IVectorView_VoiceInformation *iface, ULONG index, IVoiceInformation **value) + IVectorView_VoiceInformation *iface, UINT32 index, IVoiceInformation **value) { FIXME("iface %p, index %#x, value %p stub!\n", iface, index, value); return S_OK; } static HRESULT STDMETHODCALLTYPE vector_view_voice_information_get_Size( - IVectorView_VoiceInformation *iface, ULONG *value) + IVectorView_VoiceInformation *iface, UINT32 *value) { FIXME("iface %p, value %p stub!\n", iface, value); *value = 0; @@ -131,7 +131,7 @@ static HRESULT STDMETHODCALLTYPE vector_view_voice_information_get_Size( } static HRESULT STDMETHODCALLTYPE vector_view_voice_information_IndexOf( - IVectorView_VoiceInformation *iface, IVoiceInformation *element, ULONG *index, BOOLEAN *value) + IVectorView_VoiceInformation *iface, IVoiceInformation *element, UINT32 *index, BOOLEAN *value) { FIXME("iface %p, element %p, index %p, value %p stub!\n", iface, element, index, value); *value = FALSE; @@ -139,8 +139,8 @@ static HRESULT STDMETHODCALLTYPE vector_view_voice_information_IndexOf( } static HRESULT STDMETHODCALLTYPE vector_view_voice_information_GetMany( - IVectorView_VoiceInformation *iface, ULONG start_index, - ULONG items_size, IVoiceInformation **items, UINT *value) + IVectorView_VoiceInformation *iface, UINT32 start_index, + UINT32 items_size, IVoiceInformation **items, UINT *value) { FIXME("iface %p, start_index %#x, items %p, value %p stub!\n", iface, start_index, items, value); *value = 0; diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 30244e59612..770562e9d82 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -53,7 +53,7 @@ static void test_SpeechSynthesizer(void) IAgileObject *agile_object = NULL, *tmp_agile_object = NULL; HSTRING str; HRESULT hr; - ULONG size; + UINT32 size; hr = pRoInitialize(RO_INIT_MULTITHREADED); ok(hr == S_OK, "RoInitialize failed, hr %#x\n", hr); diff --git a/include/windows.foundation.collections.idl b/include/windows.foundation.collections.idl index 250f8b9acbe..b0b9430048b 100644 --- a/include/windows.foundation.collections.idl +++ b/include/windows.foundation.collections.idl @@ -101,10 +101,10 @@ cpp_quote("#endif") ] interface IVectorView<T> : IInspectable { - HRESULT GetAt([in] ULONG index, [out, retval] T *value); - [propget] HRESULT Size([out, retval] ULONG *value); - HRESULT IndexOf([in, optional] T element, [out] ULONG *index, [out, retval] BOOLEAN *value); - HRESULT GetMany([in] ULONG start_index, [in] ULONG items_size, [out] T *items, [out, retval] ULONG *value); + HRESULT GetAt([in] UINT32 index, [out, retval] T *value); + [propget] HRESULT Size([out, retval] UINT32 *value); + HRESULT IndexOf([in, optional] T element, [out] UINT32 *index, [out, retval] BOOLEAN *value); + HRESULT GetMany([in] UINT32 start_index, [in] UINT32 items_size, [out] T *items, [out, retval] UINT32 *value); } } #endif

1 0

Rémi Bernon : windows.media.speech: Make vector stub consistent with other WinRT stubs.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: master Commit: d831d9a4c528d6bb288c9fd56875b274e04a9dfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=d831d9a4c528d6bb288c9fd5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 23 11:23:18 2021 +0100 windows.media.speech: Make vector stub consistent with other WinRT stubs. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.media.speech/main.c | 10 ++++++---- dlls/windows.media.speech/tests/speech.c | 5 +++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/windows.media.speech/main.c b/dlls/windows.media.speech/main.c index c358b991be2..31847a2eb6a 100644 --- a/dlls/windows.media.speech/main.c +++ b/dlls/windows.media.speech/main.c @@ -119,7 +119,8 @@ static HRESULT STDMETHODCALLTYPE vector_view_voice_information_GetAt( IVectorView_VoiceInformation *iface, UINT32 index, IVoiceInformation **value) { FIXME("iface %p, index %#x, value %p stub!\n", iface, index, value); - return S_OK; + *value = NULL; + return E_BOUNDS; } static HRESULT STDMETHODCALLTYPE vector_view_voice_information_get_Size( @@ -131,10 +132,11 @@ static HRESULT STDMETHODCALLTYPE vector_view_voice_information_get_Size( } static HRESULT STDMETHODCALLTYPE vector_view_voice_information_IndexOf( - IVectorView_VoiceInformation *iface, IVoiceInformation *element, UINT32 *index, BOOLEAN *value) + IVectorView_VoiceInformation *iface, IVoiceInformation *element, UINT32 *index, BOOLEAN *found) { - FIXME("iface %p, element %p, index %p, value %p stub!\n", iface, element, index, value); - *value = FALSE; + FIXME("iface %p, element %p, index %p, found %p stub!\n", iface, element, index, found); + *index = 0; + *found = FALSE; return S_OK; } diff --git a/dlls/windows.media.speech/tests/speech.c b/dlls/windows.media.speech/tests/speech.c index 770562e9d82..1c48c5bf933 100644 --- a/dlls/windows.media.speech/tests/speech.c +++ b/dlls/windows.media.speech/tests/speech.c @@ -99,6 +99,11 @@ static void test_SpeechSynthesizer(void) ok(hr == S_OK, "IVectorView_VoiceInformation_get_Size voices failed, hr %#x\n", hr); todo_wine ok(size != 0 && size != 0xdeadbeef, "IVectorView_VoiceInformation_get_Size returned %u\n", size); + voice = (IVoiceInformation *)0xdeadbeef; + hr = IVectorView_VoiceInformation_GetAt(voices, size, &voice); + ok(hr == E_BOUNDS, "IVectorView_VoiceInformation_GetAt failed, hr %#x\n", hr); + ok(voice == NULL, "IVectorView_VoiceInformation_GetAt returned %p\n", voice); + hr = IVectorView_VoiceInformation_GetMany(voices, size, 1, &voice, &size); ok(hr == S_OK, "IVectorView_VoiceInformation_GetMany failed, hr %#x\n", hr); ok(size == 0, "IVectorView_VoiceInformation_GetMany returned count %u\n", size);

1 0

Francois Gouget : msvcrtd/tests: Missing the library should be a win_skip().
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: master Commit: c5bf1d2e19f42ae7b68e832a1d1a34f7d30f3d02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5bf1d2e19f42ae7b68e832a… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Mar 22 17:30:46 2021 +0100 msvcrtd/tests: Missing the library should be a win_skip(). Wine is supposed to have msvcrtd and we want its absence to be recorded as a skip either way. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrtd/tests/debug.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrtd/tests/debug.c b/dlls/msvcrtd/tests/debug.c index 4af4c815b38..2a232de4a49 100644 --- a/dlls/msvcrtd/tests/debug.c +++ b/dlls/msvcrtd/tests/debug.c @@ -42,7 +42,7 @@ static BOOL init_functions(void) HMODULE hModule = LoadLibraryA("msvcrtd.dll"); if (!hModule) { - trace("LoadLibraryA failed to load msvcrtd.dll with GLE=%d\n", GetLastError()); + win_skip("LoadLibraryA failed to load msvcrtd.dll with GLE=%d\n", GetLastError()); return FALSE; }

1 0

Jan Sikorski : wined3d: Rename create/destroy helpers dealing with Vulkan objects.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: master Commit: 7eec755bcef55559e57a1dafc61986e6557d141c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7eec755bcef55559e57a1daf… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Mar 23 14:21:06 2021 +0100 wined3d: Rename create/destroy helpers dealing with Vulkan objects. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 8 ++++---- dlls/wined3d/context_vk.c | 38 +++++++++++++++++++------------------- dlls/wined3d/device.c | 22 +++++++++++----------- dlls/wined3d/texture.c | 8 ++++---- dlls/wined3d/view.c | 22 +++++++++++----------- dlls/wined3d/wined3d_private.h | 12 ++++++------ 6 files changed, 55 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7eec755bcef55559e57a…

1 0

Jan Sikorski : wined3d: Introduce struct wined3d_image_vk and its create/destroy helpers.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: master Commit: 16a62fcd876122fde52dcfafb51b2b47aaf2aa1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=16a62fcd876122fde52dcfaf… Author: Jan Sikorski <jsikorski(a)codeweavers.com> Date: Tue Mar 23 14:21:07 2021 +0100 wined3d: Introduce struct wined3d_image_vk and its create/destroy helpers. Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_vk.c | 97 ++++++++++++++++++++++++++ dlls/wined3d/device.c | 95 +++++--------------------- dlls/wined3d/swapchain.c | 26 ++----- dlls/wined3d/texture.c | 150 +++++++++++------------------------------ dlls/wined3d/view.c | 18 ++--- dlls/wined3d/wined3d_private.h | 42 +++++++----- 6 files changed, 195 insertions(+), 233 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=16a62fcd876122fde52d…

1 0

Huw Davies : riched20: Don't release the dc when destroying the context.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: master Commit: 132a35b8225d935b30fa559cd236a6fa3232894f URL: https://source.winehq.org/git/wine.git/?a=commit;h=132a35b8225d935b30fa559c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 23 13:04:03 2021 +0000 riched20: Don't release the dc when destroying the context. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 4 +++- dlls/riched20/context.c | 1 - dlls/riched20/paint.c | 1 - dlls/riched20/para.c | 4 +++- dlls/riched20/run.c | 8 ++++++-- dlls/riched20/wrap.c | 5 ++++- dlls/riched20/writer.c | 5 ++++- 7 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 96765cba25d..1f4c3903a38 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -227,12 +227,13 @@ void cursor_coords( ME_TextEditor *editor, ME_Cursor *cursor, ME_Run *size_run = run, *prev; ME_Context c; int run_x; + HDC hdc = ITextHost_TxGetDC( editor->texthost ); assert(~para->nFlags & MEPF_REWRAP); row = row_from_cursor( cursor ); - ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); + ME_InitContext( &c, editor, hdc ); if (!cursor->nOffset && (prev = run_prev( run ))) size_run = prev; @@ -243,6 +244,7 @@ void cursor_coords( ME_TextEditor *editor, ME_Cursor *cursor, *y = c.rcView.top + para->pt.y + row->nBaseline + run->pt.y - size_run->nAscent - editor->vert_si.nPos; ME_DestroyContext(&c); + ITextHost_TxReleaseDC( editor->texthost, hdc ); return; } diff --git a/dlls/riched20/context.c b/dlls/riched20/context.c index 66066b39e67..24592cff10c 100644 --- a/dlls/riched20/context.c +++ b/dlls/riched20/context.c @@ -44,5 +44,4 @@ void ME_InitContext(ME_Context *c, ME_TextEditor *editor, HDC hDC) void ME_DestroyContext(ME_Context *c) { select_style( c, NULL ); - if (c->hDC) ITextHost_TxReleaseDC( c->editor->texthost, c->hDC ); } diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 1c957e46ee2..bdf129b80a0 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -93,7 +93,6 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) if (oldRgn) DeleteObject(oldRgn); - c.hDC = NULL; ME_DestroyContext(&c); } diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 29624e6c1df..78148ae7793 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -160,8 +160,9 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) ME_Run *run; ME_Style *style; int eol_len; + HDC hdc = ITextHost_TxGetDC( editor->texthost ); - ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); + ME_InitContext( &c, editor, hdc ); hf = GetStockObject(SYSTEM_FONT); assert(hf); @@ -221,6 +222,7 @@ void ME_MakeFirstParagraph(ME_TextEditor *editor) wine_rb_init( &editor->marked_paras, para_mark_compare ); para_mark_add( editor, para ); ME_DestroyContext(&c); + ITextHost_TxReleaseDC( editor->texthost, hdc ); } static void para_mark_rewrap_paras( ME_TextEditor *editor, ME_Paragraph *first, const ME_Paragraph *end ) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index bc282b20a57..51e768f8441 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -571,10 +571,12 @@ int ME_CharFromPoint(ME_TextEditor *editor, int cx, ME_Run *run, BOOL closest, B { ME_Context c; int ret; + HDC hdc = ITextHost_TxGetDC( editor->texthost ); - ME_InitContext( &c, editor, ITextHost_TxGetDC( editor->texthost ) ); + ME_InitContext( &c, editor, hdc ); ret = ME_CharFromPointContext( &c, cx, run, closest, visual_order ); ME_DestroyContext(&c); + ITextHost_TxReleaseDC( editor->texthost, hdc ); return ret; } @@ -648,10 +650,12 @@ int ME_PointFromChar(ME_TextEditor *editor, ME_Run *pRun, int nOffset, BOOL visu { ME_Context c; int ret; + HDC hdc = ITextHost_TxGetDC( editor->texthost ); - ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); + ME_InitContext( &c, editor, hdc ); ret = ME_PointFromCharContext( &c, pRun, nOffset, visual_order ); ME_DestroyContext(&c); + ITextHost_TxReleaseDC( editor->texthost, hdc ); return ret; } diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index dcda041d773..3d7e030fe50 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1027,10 +1027,12 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) ME_Context c; int totalWidth = editor->nTotalWidth, prev_width; struct repaint_range repaint = { NULL, NULL }; + HDC hdc; if (!editor->marked_paras.root) return FALSE; - ME_InitContext(&c, editor, ITextHost_TxGetDC(editor->texthost)); + hdc = ITextHost_TxGetDC( editor->texthost ); + ME_InitContext( &c, editor, hdc ); entry = wine_rb_head( editor->marked_paras.root ); while (entry) @@ -1085,6 +1087,7 @@ BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) editor->nTotalWidth = totalWidth; ME_DestroyContext(&c); + ITextHost_TxReleaseDC( editor->texthost, hdc ); if (repaint.start || editor->nTotalLength < editor->nLastTotalLength) para_range_invalidate( editor, repaint.start, repaint.end); diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index 50eccfa714b..7c7e648f107 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -939,11 +939,13 @@ static BOOL stream_out_graphics( ME_TextEditor *editor, ME_OutStream *stream, UINT size; SIZE goal, pic; ME_Context c; + HDC hdc; hr = IOleObject_QueryInterface( run->reobj->obj.poleobj, &IID_IDataObject, (void **)&data ); if (FAILED(hr)) return FALSE; - ME_InitContext( &c, editor, ITextHost_TxGetDC( editor->texthost ) ); + hdc = ITextHost_TxGetDC( editor->texthost ); + ME_InitContext( &c, editor, hdc ); hr = IDataObject_QueryGetData( data, &fmt ); if (hr != S_OK) goto done; @@ -985,6 +987,7 @@ static BOOL stream_out_graphics( ME_TextEditor *editor, ME_OutStream *stream, done: ME_DestroyContext( &c ); + ITextHost_TxReleaseDC( editor->texthost, hdc ); HeapFree( GetProcessHeap(), 0, emf_bits ); ReleaseStgMedium( &med ); IDataObject_Release( data );

1 0

Huw Davies : riched20: Call OnTxInPlaceActivate() from the host.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: master Commit: 393b18ab7a45c22813a4ed3a2798c5fad84cfeea URL: https://source.winehq.org/git/wine.git/?a=commit;h=393b18ab7a45c22813a4ed3a… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 23 13:04:04 2021 +0000 riched20: Call OnTxInPlaceActivate() from the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/txthost.c | 2 +- dlls/riched20/txtsrv.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index c1f175dc9c2..cda9b35b199 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1021,7 +1021,7 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, LONG codepage = unicode ? CP_UNICODE : CP_ACP; int len; - ITextServices_OnTxPropertyBitsChange( host->text_srv, TXTBIT_CLIENTRECTCHANGE, 0 ); + ITextServices_OnTxInPlaceActivate( host->text_srv, NULL ); if (lparam) { diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 7bdd6ab924b..bab52269db6 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -220,6 +220,7 @@ static HRESULT update_client_rect( struct text_services *services, const RECT *c if (!client) { + if (!services->editor->in_place_active) return E_INVALIDARG; hr = ITextHost_TxGetClientRect( services->host, &rect ); client = &rect; }

1 0

Huw Davies : riched20: Explicitly select the background brush.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: master Commit: a19cecacdae2c301fffca62f4d7d9bde0e68584f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a19cecacdae2c301fffca62f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 23 13:04:05 2021 +0000 riched20: Explicitly select the background brush. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index bdf129b80a0..0d9916cd206 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -32,6 +32,9 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) ME_Cell *cell; int ys, ye; HRGN oldRgn; + HBRUSH brush = CreateSolidBrush( ITextHost_TxGetSysColor( editor->texthost, COLOR_WINDOW ) ); + + ME_InitContext( &c, editor, hDC ); oldRgn = CreateRectRgn(0, 0, 0, 0); if (!GetClipRgn(hDC, oldRgn)) @@ -42,7 +45,7 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) IntersectClipRect(hDC, rcUpdate->left, rcUpdate->top, rcUpdate->right, rcUpdate->bottom); - ME_InitContext(&c, editor, hDC); + brush = SelectObject( hDC, brush ); SetBkMode(hDC, TRANSPARENT); para = editor_first_para( editor ); @@ -89,6 +92,7 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) editor->nLastTotalLength = editor->nTotalLength; editor->nLastTotalWidth = editor->nTotalWidth; + DeleteObject( SelectObject( hDC, brush ) ); SelectClipRgn(hDC, oldRgn); if (oldRgn) DeleteObject(oldRgn);

1 0

Huw Davies : riched20: Fill the selection bar.
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: master Commit: 93b634877971ce8bf8b69202eba9b4ec460ed653 URL: https://source.winehq.org/git/wine.git/?a=commit;h=93b634877971ce8bf8b69202… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 23 13:04:06 2021 +0000 riched20: Fill the selection bar. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/paint.c | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 0d9916cd206..e6eef7a0acd 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -32,6 +32,7 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) ME_Cell *cell; int ys, ye; HRGN oldRgn; + RECT rc; HBRUSH brush = CreateSolidBrush( ITextHost_TxGetSysColor( editor->texthost, COLOR_WINDOW ) ); ME_InitContext( &c, editor, hDC ); @@ -73,21 +74,24 @@ void ME_PaintContent(ME_TextEditor *editor, HDC hDC, const RECT *rcUpdate) para = para_next( para ); } if (c.pt.y + editor->nTotalLength < c.rcView.bottom) - { - /* Fill space after the end of the text. */ - RECT rc; + { /* space after the end of the text */ rc.top = c.pt.y + editor->nTotalLength; rc.left = c.rcView.left; rc.bottom = c.rcView.bottom; rc.right = c.rcView.right; - - IntersectRect(&rc, &rc, rcUpdate); - - if (!IsRectEmpty(&rc)) + if (IntersectRect( &rc, &rc, rcUpdate )) PatBlt(hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); } - if (editor->nTotalLength != editor->nLastTotalLength || - editor->nTotalWidth != editor->nLastTotalWidth) + if (editor->selofs) + { /* selection bar */ + rc.left = c.rcView.left - editor->selofs; + rc.top = c.rcView.top; + rc.right = c.rcView.left; + rc.bottom = c.rcView.bottom; + if (IntersectRect( &rc, &rc, rcUpdate )) + PatBlt( hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); + } + if (editor->nTotalLength != editor->nLastTotalLength || editor->nTotalWidth != editor->nLastTotalWidth) ME_SendRequestResize(editor, FALSE); editor->nLastTotalLength = editor->nTotalLength; editor->nLastTotalWidth = editor->nTotalWidth;

1 0

Huw Davies : riched20: Implement TxDraw().
by Alexandre Julliard 23 Mar '21

23 Mar '21

Module: wine Branch: master Commit: 02f083641ec1aee19d8c2e2b410619cdd5e5f45d URL: https://source.winehq.org/git/wine.git/?a=commit;h=02f083641ec1aee19d8c2e2b… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Mar 23 13:04:07 2021 +0000 riched20: Implement TxDraw(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 3 +- dlls/riched20/paint.c | 19 +++++++---- dlls/riched20/tests/txtsrv.c | 55 +++++++++++++++++++++--------- dlls/riched20/txthost.c | 2 +- dlls/riched20/txtsrv.c | 79 +++++++++++++++++++++++++++++--------------- dlls/riched20/wrap.c | 13 +++++--- 6 files changed, 116 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02f083641ec1aee19d8c…

1 0