wine-commits March 2021

wine-commits@winehq.org

2 participants
1163 discussions

Nikolay Sivov : mfplat: Implement Lock2DSize() for d3d11 buffers.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 78ab39559429838ad15208b3c42144b201917375 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78ab39559429838ad15208b3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 25 12:40:35 2021 +0300 mfplat: Implement Lock2DSize() for d3d11 buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index dd88a661e45..77767c27d94 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -1019,9 +1019,34 @@ static HRESULT WINAPI dxgi_surface_buffer_GetScanline0AndPitch(IMF2DBuffer2 *ifa static HRESULT WINAPI dxgi_surface_buffer_Lock2DSize(IMF2DBuffer2 *iface, MF2DBuffer_LockFlags flags, BYTE **scanline0, LONG *pitch, BYTE **buffer_start, DWORD *buffer_length) { - FIXME("%p, %#x, %p, %p, %p, %p.\n", iface, flags, scanline0, pitch, buffer_start, buffer_length); + struct buffer *buffer = impl_from_IMF2DBuffer2(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %#x, %p, %p, %p, %p.\n", iface, flags, scanline0, pitch, buffer_start, buffer_length); + + if (!scanline0 || !pitch || !buffer_start || !buffer_length) + return E_POINTER; + + EnterCriticalSection(&buffer->cs); + + if (buffer->_2d.linear_buffer) + hr = MF_E_UNEXPECTED; + else if (!buffer->_2d.locks++) + hr = dxgi_surface_buffer_map(buffer); + + if (SUCCEEDED(hr)) + { + *scanline0 = buffer->dxgi_surface.map_desc.pData; + *pitch = buffer->dxgi_surface.map_desc.RowPitch; + if (buffer_start) + *buffer_start = *scanline0; + if (buffer_length) + *buffer_length = buffer->dxgi_surface.map_desc.RowPitch * buffer->_2d.height; + } + + LeaveCriticalSection(&buffer->cs); + + return hr; } static HRESULT WINAPI dxgi_buffer_QueryInterface(IMFDXGIBuffer *iface, REFIID riid, void **obj)

1 0

Nikolay Sivov : mfplat: Rename media buffer structure to better reflect its usage.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 81c7633154215c86d39e7e8c49aad5608b500d3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=81c7633154215c86d39e7e8c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 25 12:40:34 2021 +0300 mfplat: Rename media buffer structure to better reflect its usage. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 118 +++++++++++++++++++++++++-------------------------- 1 file changed, 59 insertions(+), 59 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=81c7633154215c86d39e…

1 0

Nikolay Sivov : mfplat: Always initialize output arguments in GetScanline0AndPitch() for d3d9 buffers.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: ca52f07565b52718f87881849bff136cf053c07c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca52f07565b52718f8788184… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 25 12:40:33 2021 +0300 mfplat: Always initialize output arguments in GetScanline0AndPitch() for d3d9 buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index e6bf52662e8..d4efafdea45 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -689,7 +689,11 @@ static HRESULT WINAPI d3d9_surface_buffer_GetScanline0AndPitch(IMF2DBuffer2 *ifa EnterCriticalSection(&buffer->cs); if (!buffer->_2d.locks) + { + *scanline0 = NULL; + *pitch = 0; hr = HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED); + } else { *scanline0 = buffer->d3d9_surface.rect.pBits;

1 0

Nikolay Sivov : mfplat: Implement GetScanline0AndPitch() for d3d11 buffers.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 01059d5946575d245d814f4c8247d4bae19887be URL: https://source.winehq.org/git/wine.git/?a=commit;h=01059d5946575d245d814f4c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 25 12:40:32 2021 +0300 mfplat: Implement GetScanline0AndPitch() for d3d11 buffers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 26 ++++++++++++++++++++++++-- dlls/mfplat/tests/mfplat.c | 32 ++++++++++++++++++++++++++++++-- 2 files changed, 54 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index fbd3b7786b6..e6bf52662e8 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -985,9 +985,31 @@ static HRESULT WINAPI dxgi_surface_buffer_Unlock2D(IMF2DBuffer2 *iface) static HRESULT WINAPI dxgi_surface_buffer_GetScanline0AndPitch(IMF2DBuffer2 *iface, BYTE **scanline0, LONG *pitch) { - FIXME("%p, %p, %p.\n", iface, scanline0, pitch); + struct memory_buffer *buffer = impl_from_IMF2DBuffer2(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p, %p.\n", iface, scanline0, pitch); + + if (!scanline0 || !pitch) + return E_POINTER; + + EnterCriticalSection(&buffer->cs); + + if (!buffer->_2d.locks) + { + *scanline0 = NULL; + *pitch = 0; + hr = HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED); + } + else + { + *scanline0 = buffer->dxgi_surface.map_desc.pData; + *pitch = buffer->dxgi_surface.map_desc.RowPitch; + } + + LeaveCriticalSection(&buffer->cs); + + return hr; } static HRESULT WINAPI dxgi_surface_buffer_Lock2DSize(IMF2DBuffer2 *iface, MF2DBuffer_LockFlags flags, diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index dacad924ae9..18361d4d721 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6346,11 +6346,11 @@ static void test_dxgi_surface_buffer(void) IMFMediaBuffer *buffer; ID3D11Device *device; BYTE buff[64 * 64 * 4]; + BYTE *data, *data2; + LONG pitch, pitch2; UINT index, size; IUnknown *obj; HRESULT hr; - BYTE *data; - LONG pitch; if (!pMFCreateDXGISurfaceBuffer) { @@ -6485,6 +6485,9 @@ todo_wine hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&_2d_buffer); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMF2DBuffer_GetScanline0AndPitch(_2d_buffer, &data2, &pitch2); + ok(hr == HRESULT_FROM_WIN32(ERROR_WAS_UNLOCKED), "Unexpected hr %#x.\n", hr); + hr = IMF2DBuffer_Lock2D(_2d_buffer, &data, &pitch); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!!data && pitch == desc.Width * 4, "Unexpected pitch %d.\n", pitch); @@ -6493,6 +6496,10 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!!data && pitch == desc.Width * 4, "Unexpected pitch %d.\n", pitch); + hr = IMF2DBuffer_GetScanline0AndPitch(_2d_buffer, &data2, &pitch2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(data2 == data && pitch2 == pitch, "Unexpected data/pitch.\n"); + hr = IMFMediaBuffer_Lock(buffer, &data, &max_length, &cur_length); todo_wine ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); @@ -6509,6 +6516,27 @@ todo_wine IMF2DBuffer_Release(_2d_buffer); IMFMediaBuffer_Release(buffer); + /* Bottom up. */ + hr = pMFCreateDXGISurfaceBuffer(&IID_ID3D11Texture2D, (IUnknown *)texture, 0, TRUE, &buffer); + ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&_2d_buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMF2DBuffer_Lock2D(_2d_buffer, &data, &pitch); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!data && pitch == desc.Width * 4, "Unexpected pitch %d.\n", pitch); + + hr = IMF2DBuffer_GetScanline0AndPitch(_2d_buffer, &data2, &pitch2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(data2 == data && pitch2 == pitch, "Unexpected data/pitch.\n"); + + hr = IMF2DBuffer_Unlock2D(_2d_buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMF2DBuffer_Release(_2d_buffer); + IMFMediaBuffer_Release(buffer); + ID3D11Texture2D_Release(texture); /* Subresource index 1. */

1 0

Nikolay Sivov : mfplat: Implement Lock2D()/Unlock2D() for d3d11 buffer.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 9932a1943b2091d7b1f9df35aabde5901665c71a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9932a1943b2091d7b1f9df35… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Mar 25 12:40:31 2021 +0300 mfplat: Implement Lock2D()/Unlock2D() for d3d11 buffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 127 +++++++++++++++++++++++++++++++++++++++++---- dlls/mfplat/tests/mfplat.c | 72 +++++++++++++++++++++++++ 2 files changed, 190 insertions(+), 9 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9932a1943b2091d7b1f9…

1 0

Huw Davies : riched20: Implement TxGetNaturalSize().
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: e7b42deaf2a18e32313e2da02566905180986760 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7b42deaf2a18e32313e2da0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 25 09:10:28 2021 +0000 riched20: Implement TxGetNaturalSize(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/txtsrv.c | 6 +++--- dlls/riched20/txtsrv.c | 39 ++++++++++++++++++++++++++++++++++----- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 7ca6074587d..3cfd5e63753 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -705,7 +705,7 @@ static void _check_txgetnaturalsize(HRESULT res, LONG width, LONG height, HDC hd expected_width = expected_rect.right - expected_rect.left; expected_height = expected_rect.bottom - expected_rect.top; ok_(__FILE__,line)(res == S_OK, "ITextServices_TxGetNaturalSize failed: 0x%08x.\n", res); - ok_(__FILE__,line)(width >= expected_width && width <= expected_width + 1, + todo_wine ok_(__FILE__,line)(width >= expected_width && width <= expected_width + 1, "got wrong width: %d, expected: %d {+1}.\n", width, expected_width); ok_(__FILE__,line)(height == expected_height, "got wrong height: %d, expected: %d.\n", height, expected_height); @@ -717,7 +717,7 @@ static void test_TxGetNaturalSize(void) ITextHost *host; HRESULT result; SIZEL extent; - static const WCHAR test_text[] = {'T','e','s','t','S','o','m','e','T','e','x','t',0}; + static const WCHAR test_text[] = L"TestSomeText"; LONG width, height; HDC hdcDraw; HWND hwnd; @@ -752,7 +752,7 @@ static void test_TxGetNaturalSize(void) height = 0; result = ITextServices_TxGetNaturalSize(txtserv, DVASPECT_CONTENT, hdcDraw, NULL, NULL, TXTNS_FITTOCONTENT, &extent, &width, &height); - todo_wine CHECK_TXGETNATURALSIZE(result, width, height, hdcDraw, rect, test_text); + CHECK_TXGETNATURALSIZE(result, width, height, hdcDraw, rect, test_text); ReleaseDC(hwnd, hdcDraw); DestroyWindow(hwnd); diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 79ade0f6117..5736964c1b1 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -366,14 +366,43 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetBaseLinePos(ITextServices *ifa } DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetNaturalSize,36) -DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetNaturalSize(ITextServices *iface, DWORD dwAspect, HDC hdcDraw, - HDC hicTargetDev, DVTARGETDEVICE *ptd, DWORD dwMode, - const SIZEL *psizelExtent, LONG *pwidth, LONG *pheight) +DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxGetNaturalSize( ITextServices *iface, DWORD aspect, HDC draw, + HDC target, DVTARGETDEVICE *td, DWORD mode, + const SIZEL *extent, LONG *width, LONG *height ) { struct text_services *services = impl_from_ITextServices( iface ); + RECT rect; + HDC dc = draw; + BOOL rewrap = FALSE; + HRESULT hr; - FIXME( "%p: STUB\n", services ); - return E_NOTIMPL; + TRACE( "%p: aspect %d, draw %p, target %p, td %p, mode %08x, extent %s, *width %d, *height %d\n", services, + aspect, draw, target, td, mode, wine_dbgstr_point( (POINT *)extent ), *width, *height ); + + if (aspect != DVASPECT_CONTENT || target || td || mode != TXTNS_FITTOCONTENT ) + FIXME( "Many arguments are ignored\n" ); + + SetRect( &rect, 0, 0, *width, *height ); + + hr = update_client_rect( services, &rect ); + if (FAILED( hr )) return hr; + if (hr == S_OK) rewrap = TRUE; + + if (!dc && services->editor->in_place_active) + dc = ITextHost_TxGetDC( services->host ); + if (!dc) return E_FAIL; + + if (rewrap) + { + editor_mark_rewrap_all( services->editor ); + wrap_marked_paras_dc( services->editor, dc, FALSE ); + } + + *width = services->editor->nTotalWidth; + *height = services->editor->nTotalLength; + + if (!draw) ITextHost_TxReleaseDC( services->host, dc ); + return S_OK; } DEFINE_THISCALL_WRAPPER(fnTextSrv_TxGetDropTarget,8)

1 0

Huw Davies : riched20: Don't invalidate while inside TxDraw().
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: aae4fa9b1cdf0012a3fc07c553b08ea211fa03b0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aae4fa9b1cdf0012a3fc07c5… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 25 09:10:27 2021 +0000 riched20: Don't invalidate while inside TxDraw(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 2 +- dlls/riched20/txtsrv.c | 2 +- dlls/riched20/wrap.c | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 929e10a3179..bf713880f8f 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -202,7 +202,7 @@ void ME_DestroyContext(ME_Context *c) DECLSPEC_HIDDEN; BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) DECLSPEC_HIDDEN; void para_range_invalidate( ME_TextEditor *editor, ME_Paragraph *start_para, ME_Paragraph *last_para ) DECLSPEC_HIDDEN; void ME_SendRequestResize(ME_TextEditor *editor, BOOL force) DECLSPEC_HIDDEN; -BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc ) DECLSPEC_HIDDEN; +BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc, BOOL invalidate ) DECLSPEC_HIDDEN; /* para.c */ void editor_get_selection_paras(ME_TextEditor *editor, ME_Paragraph **para, ME_Paragraph **para_end ) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 6ef7b7ef029..79ade0f6117 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -192,7 +192,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxDraw( ITextServices *iface, DWORD if (rewrap) { editor_mark_rewrap_all( services->editor ); - wrap_marked_paras_dc( services->editor, dc ); + wrap_marked_paras_dc( services->editor, dc, FALSE ); } editor_draw( services->editor, dc, update ); diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 468b267ceae..9456d54d815 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -1020,7 +1020,7 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran } } -BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc ) +BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc, BOOL invalidate ) { ME_Paragraph *para, *next; struct wine_rb_entry *entry, *next_entry = NULL; @@ -1086,7 +1086,7 @@ BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc ) ME_DestroyContext(&c); - if (repaint.start || editor->nTotalLength < editor->nLastTotalLength) + if (invalidate && (repaint.start || editor->nTotalLength < editor->nLastTotalLength)) para_range_invalidate( editor, repaint.start, repaint.end); return !!repaint.start; } @@ -1094,7 +1094,7 @@ BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc ) BOOL ME_WrapMarkedParagraphs( ME_TextEditor *editor ) { HDC hdc = ITextHost_TxGetDC( editor->texthost ); - BOOL ret = wrap_marked_paras_dc( editor, hdc ); + BOOL ret = wrap_marked_paras_dc( editor, hdc, TRUE ); ITextHost_TxReleaseDC( editor->texthost, hdc ); return ret; }

1 0

Huw Davies : riched20: Add support for TXTBACK_TRANSPARENT.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: e668aa9dcb590be9990ff2c96ea950a429fe4223 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e668aa9dcb590be9990ff2c9… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 25 09:10:26 2021 +0000 riched20: Add support for TXTBACK_TRANSPARENT. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 3 ++ dlls/riched20/editstr.h | 1 + dlls/riched20/paint.c | 76 +++++++++++++++++++++++++++++-------------------- 3 files changed, 49 insertions(+), 31 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4f66220d230..4eb90a4c300 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3037,6 +3037,9 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) ed->wheel_remain = 0; + ed->back_style = TXTBACK_OPAQUE; + ITextHost_TxGetBackStyle( texthost, &ed->back_style ); + list_init( &ed->reobj_list ); OleInitialize(NULL); diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index c0fef69547e..6bf60748f7e 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -436,6 +436,7 @@ typedef struct tagME_TextEditor BOOL caret_hidden; BOOL bMouseCaptured; int wheel_remain; + TXTBACKSTYLE back_style; struct list style_list; struct list reobj_list; struct wine_rb_tree marked_paras; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 4704f43c2c3..7b7882be2b7 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -25,6 +25,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(richedit); static void draw_paragraph( ME_Context *c, ME_Paragraph *para ); +static inline BOOL editor_opaque( ME_TextEditor *editor ) +{ + return editor->back_style != TXTBACK_TRANSPARENT; +} + void editor_draw( ME_TextEditor *editor, HDC hDC, const RECT *update ) { ME_Paragraph *para; @@ -78,23 +83,26 @@ void editor_draw( ME_TextEditor *editor, HDC hDC, const RECT *update ) draw_paragraph( &c, para ); para = para_next( para ); } - if (c.pt.y + editor->nTotalLength < c.rcView.bottom) - { /* 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; - if (IntersectRect( &rc, &rc, update )) - PatBlt(hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); - } - 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, update )) - PatBlt( hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); + if (editor_opaque( editor )) + { + if (c.pt.y + editor->nTotalLength < c.rcView.bottom) + { /* 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; + if (IntersectRect( &rc, &rc, update )) + PatBlt(hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); + } + 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, update )) + 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); @@ -597,22 +605,28 @@ static void ME_DrawParaDecoration(ME_Context* c, ME_Paragraph* para, int y, RECT if (para->fmt.dwMask & PFM_SPACEBEFORE) { - rc.left = c->rcView.left; - rc.right = c->rcView.right; - rc.top = y; bounds->top = ME_twips2pointsY(c, para->fmt.dySpaceBefore); - rc.bottom = y + bounds->top + top_border; - PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); + if (editor_opaque( c->editor )) + { + rc.left = c->rcView.left; + rc.right = c->rcView.right; + rc.top = y; + rc.bottom = y + bounds->top + top_border; + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); + } } if (para->fmt.dwMask & PFM_SPACEAFTER) { - rc.left = c->rcView.left; - rc.right = c->rcView.right; - rc.bottom = y + para->nHeight; bounds->bottom = ME_twips2pointsY(c, para->fmt.dySpaceAfter); - rc.top = rc.bottom - bounds->bottom - bottom_border; - PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); + if (editor_opaque( c->editor )) + { + rc.left = c->rcView.left; + rc.right = c->rcView.right; + rc.bottom = y + para->nHeight; + rc.top = rc.bottom - bounds->bottom - bottom_border; + PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); + } } /* Native richedit doesn't support paragraph borders in v1.0 - 4.1, @@ -730,7 +744,7 @@ static void draw_table_borders( ME_Context *c, ME_Paragraph *para ) rc.top = top + width; width = cell->yTextOffset - width; rc.bottom = rc.top + width; - if (width) + if (width && editor_opaque( c->editor )) PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); } /* Draw cell borders. @@ -973,7 +987,7 @@ static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) rc.bottom = y + p->member.row.nHeight; } visible = RectVisible(c->hDC, &rc); - if (visible) + if (editor_opaque( c->editor ) && visible) PatBlt(c->hDC, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY); if (bounds.right) { @@ -982,7 +996,7 @@ static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) RECT after_bdr = rc; after_bdr.left = rc.right + bounds.right; after_bdr.right = c->rcView.right; - if (RectVisible(c->hDC, &after_bdr)) + if (editor_opaque( c->editor ) && RectVisible( c->hDC, &after_bdr )) PatBlt(c->hDC, after_bdr.left, after_bdr.top, after_bdr.right - after_bdr.left, after_bdr.bottom - after_bdr.top, PATCOPY); } @@ -1035,7 +1049,7 @@ static void draw_paragraph( ME_Context *c, ME_Paragraph *para ) no++; } - if (para_cell( para )) + if (editor_opaque( c->editor ) && para_cell( para )) { /* Clear any space at the bottom of the cell after the text. */ rc.top = c->pt.y + para->pt.y + para->nHeight;

1 0

Jacek Caban : windowscodecs: Use nameless unions.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 909b2ced71f1151c29fa7a9e24f1a42d6cdd81ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=909b2ced71f1151c29fa7a9e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 24 18:37:50 2021 +0100 windowscodecs: Use nameless unions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 1 - dlls/windowscodecs/gifformat.c | 110 +++++++++++++++--------------- dlls/windowscodecs/metadatahandler.c | 126 +++++++++++++++++------------------ dlls/windowscodecs/metadataquery.c | 40 +++++------ dlls/windowscodecs/pngformat.c | 12 ++-- 5 files changed, 144 insertions(+), 145 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=909b2ced71f1151c29fa…

1 0

Alexandre Julliard : wine.inf: Fix 64-bit driver installation.
by Alexandre Julliard 25 Mar '21

25 Mar '21

Module: wine Branch: master Commit: 36cec2c7df5a3c7742ae55f578d7b1399c1f7528 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36cec2c7df5a3c7742ae55f5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 12:48:35 2021 +0100 wine.inf: Fix 64-bit driver installation. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index aaed4cf6824..52c2297fb2f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2710,7 +2710,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 16427,System\OLE DB,msdaps.dll 16427,System\ADO,msado15.dll 66000,3,wineps.drv -12,,*.sys,- +12,,*.sys 11,,* [SystemIni]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2021