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

Zebediah Figura : d3d10core/tests: Test multiple instanced step rates.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 05a0e9ee2dcb3ebef392da275a04a8ae8143d047 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05a0e9ee2dcb3ebef392da27… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Mar 23 15:52:51 2021 -0500 d3d10core/tests: Test multiple instanced step rates. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 117 ++++++++++++++++++++++++--------------- 1 file changed, 73 insertions(+), 44 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=05a0e9ee2dcb3ebef392…

1 0

Zebediah Figura : d3d11: Use wined3d_device_context_set_vertex_declaration().
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 460fb42f97558fbb9a07cbb2039a59b135a4f164 URL: https://source.winehq.org/git/wine.git/?a=commit;h=460fb42f97558fbb9a07cbb2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 24 18:19:27 2021 -0500 d3d11: Use wined3d_device_context_set_vertex_declaration(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 9b2652b49ec..67781c57ef5 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -653,13 +653,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_PSSetConstantBuffers(ID3D1 static void STDMETHODCALLTYPE d3d11_immediate_context_IASetInputLayout(ID3D11DeviceContext1 *iface, ID3D11InputLayout *input_layout) { - struct d3d_device *device = device_from_immediate_ID3D11DeviceContext1(iface); + struct d3d11_immediate_context *context = impl_from_ID3D11DeviceContext1(iface); struct d3d_input_layout *layout = unsafe_impl_from_ID3D11InputLayout(input_layout); TRACE("iface %p, input_layout %p.\n", iface, input_layout); wined3d_mutex_lock(); - wined3d_device_set_vertex_declaration(device->wined3d_device, layout ? layout->wined3d_decl : NULL); + wined3d_device_context_set_vertex_declaration(context->wined3d_context, layout ? layout->wined3d_decl : NULL); wined3d_mutex_unlock(); } @@ -2616,7 +2616,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearState(ID3D11DeviceCon wined3d_device_context_set_stream_source(context->wined3d_context, i, NULL, 0, 0); } wined3d_device_context_set_index_buffer(context->wined3d_context, NULL, WINED3DFMT_UNKNOWN, 0); - wined3d_device_set_vertex_declaration(device->wined3d_device, NULL); + wined3d_device_context_set_vertex_declaration(context->wined3d_context, NULL); wined3d_device_set_primitive_type(device->wined3d_device, WINED3D_PT_UNDEFINED, 0); for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) {

1 0

Nikolay Sivov : mfplat: Implement GetScanline0AndPitch() for d3d11 buffers.
by Alexandre Julliard March 25, 2021

March 25, 2021

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

Zebediah Figura : wined3d: Introduce wined3d_device_context_set_vertex_declaration().
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 55b088831468b4e524f57c6995970fab8466fac7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55b088831468b4e524f57c69… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Mar 24 18:19:26 2021 -0500 wined3d: Introduce wined3d_device_context_set_vertex_declaration(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 34 +++++++++++++++++++++------------- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 666b2829f7e..067fdecf3cf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1887,21 +1887,9 @@ struct wined3d_device_context * CDECL wined3d_device_get_immediate_context(struc void CDECL wined3d_device_set_vertex_declaration(struct wined3d_device *device, struct wined3d_vertex_declaration *declaration) { - struct wined3d_state *state = device->cs->c.state; - struct wined3d_vertex_declaration *prev; - TRACE("device %p, declaration %p.\n", device, declaration); - prev = state->vertex_declaration; - if (declaration == prev) - return; - - if (declaration) - wined3d_vertex_declaration_incref(declaration); - state->vertex_declaration = declaration; - wined3d_device_context_emit_set_vertex_declaration(&device->cs->c, declaration); - if (prev) - wined3d_vertex_declaration_decref(prev); + wined3d_device_context_set_vertex_declaration(&device->cs->c, declaration); } struct wined3d_vertex_declaration * CDECL wined3d_device_get_vertex_declaration(const struct wined3d_device *device) @@ -2381,6 +2369,26 @@ void CDECL wined3d_device_context_set_index_buffer(struct wined3d_device_context wined3d_buffer_decref(prev_buffer); } +void CDECL wined3d_device_context_set_vertex_declaration(struct wined3d_device_context *context, + struct wined3d_vertex_declaration *declaration) +{ + struct wined3d_state *state = context->state; + struct wined3d_vertex_declaration *prev; + + TRACE("context %p, declaration %p.\n", context, declaration); + + prev = state->vertex_declaration; + if (declaration == prev) + return; + + if (declaration) + wined3d_vertex_declaration_incref(declaration); + state->vertex_declaration = declaration; + wined3d_device_context_emit_set_vertex_declaration(context, declaration); + if (prev) + wined3d_vertex_declaration_decref(prev); +} + void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader) { TRACE("device %p, shader %p.\n", device, shader); diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 54d4ef4c23c..4f0d1e8e0b3 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -180,6 +180,7 @@ @ cdecl wined3d_device_context_set_shader_resource_view(ptr long long ptr) @ cdecl wined3d_device_context_set_stream_source(ptr long ptr long long) @ cdecl wined3d_device_context_set_unordered_access_view(ptr long long ptr long) +@ cdecl wined3d_device_context_set_vertex_declaration(ptr ptr) @ cdecl wined3d_device_context_set_viewports(ptr long ptr) @ cdecl wined3d_output_find_closest_matching_mode(ptr ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3937f1f5be2..e8f5e824bc3 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2584,6 +2584,8 @@ HRESULT __cdecl wined3d_device_context_set_stream_source(struct wined3d_device_c void __cdecl wined3d_device_context_set_unordered_access_view(struct wined3d_device_context *context, enum wined3d_pipeline pipeline, unsigned int idx, struct wined3d_unordered_access_view *uav, unsigned int initial_count); +void __cdecl wined3d_device_context_set_vertex_declaration(struct wined3d_device_context *context, + struct wined3d_vertex_declaration *declaration); void __cdecl wined3d_device_context_set_viewports(struct wined3d_device_context *context, unsigned int viewport_count, const struct wined3d_viewport *viewports);

1 0

Nikolay Sivov : mfplat: Implement Lock2D()/Unlock2D() for d3d11 buffer.
by Alexandre Julliard March 25, 2021

March 25, 2021

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

Alexandre Julliard : ntdll: Add a helper to launch start.exe always as builtin.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: aef821ccbd9f2b7c8980c289316696eb4a3bca3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=aef821ccbd9f2b7c8980c289… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 11:29:37 2021 +0100 ntdll: Add a helper to launch start.exe always as builtin. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 12 +++--------- dlls/ntdll/unix/loader.c | 26 ++++++++++++++++++++++++++ dlls/ntdll/unix/unix_private.h | 1 + 3 files changed, 30 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 07b9f0fc384..f7ba8ce8ab5 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -1880,23 +1880,17 @@ static RTL_USER_PROCESS_PARAMETERS *build_initial_params(void) if (status) /* try launching it through start.exe */ { - static const WCHAR startW[] = {'C',':','\\','w','i','n','d','o','w','s','\\', - 's','y','s','t','e','m','3','2','\\','s','t','a','r','t','.','e','x','e',0}; static const WCHAR slashwW[] = {'/','w',0}; static const WCHAR slashbW[] = {'/','b',0}; - const WCHAR *args[] = { startW, slashwW, slashbW }; + const WCHAR *args[] = { NULL, slashwW, slashbW }; free( image ); prepend_main_wargv( args, 3 ); - if ((status = load_main_exe( startW, NULL, curdir, &image, &module, &image_info ))) - { - MESSAGE( "wine: failed to start %s\n", debugstr_w(main_wargv[2]) ); - NtTerminateProcess( GetCurrentProcess(), status ); - } + load_start_exe( &image, &module, &image_info ); } - else main_wargv[0] = get_dos_path( image ); NtCurrentTeb()->Peb->ImageBaseAddress = module; + main_wargv[0] = get_dos_path( image ); cmdline = build_command_line( main_wargv ); TRACE( "image %s cmdline %s dir %s\n", diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 24cc546c300..2467b640a79 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1544,6 +1544,32 @@ failed: } +/*********************************************************************** + * load_start_exe + * + * Load start.exe as main image. + */ +NTSTATUS load_start_exe( WCHAR **image, void **module, SECTION_IMAGE_INFORMATION *image_info ) +{ + static const WCHAR startW[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\', + 's','y','s','t','e','m','3','2','\\','s','t','a','r','t','.','e','x','e',0}; + UNICODE_STRING nt_name; + NTSTATUS status; + SIZE_T size; + + init_unicode_string( &nt_name, startW ); + status = find_builtin_dll( &nt_name, module, &size, image_info, current_machine, FALSE ); + if (status) + { + MESSAGE( "wine: failed to load start.exe: %x\n", status ); + NtTerminateProcess( GetCurrentProcess(), status ); + } + *image = malloc( sizeof(startW) ); + memcpy( *image, startW, sizeof(startW) ); + return status; +} + + #ifdef __FreeBSD__ /* The PT_LOAD segments are sorted in increasing order, and the first * starts at the beginning of the ELF file. By parsing the file, we can diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index a486a2ff0f4..3f84fa9c065 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -145,6 +145,7 @@ extern NTSTATUS load_builtin( const pe_image_info_t *image_info, const WCHAR *fi void **addr_ptr, SIZE_T *size_ptr ) DECLSPEC_HIDDEN; extern NTSTATUS load_main_exe( const WCHAR *name, const char *unix_name, const WCHAR *curdir, WCHAR **image, void **module, SECTION_IMAGE_INFORMATION *image_info ) DECLSPEC_HIDDEN; +extern NTSTATUS load_start_exe( WCHAR **image, void **module, SECTION_IMAGE_INFORMATION *image_info ) DECLSPEC_HIDDEN; extern void start_server( BOOL debug ) DECLSPEC_HIDDEN; extern ULONG_PTR get_image_address(void) DECLSPEC_HIDDEN;

1 0

Huw Davies : riched20: Implement TxGetNaturalSize().
by Alexandre Julliard March 25, 2021

March 25, 2021

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: Add support for TXTBACK_TRANSPARENT.
by Alexandre Julliard March 25, 2021

March 25, 2021

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

Alexandre Julliard : ntdll: Set the initial DllPath to null if it's empty.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 9bdfb1f34a4f512488c198555249a49f4e7c1172 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bdfb1f34a4f512488c19855… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 12:05:41 2021 +0100 ntdll: Set the initial DllPath to null if it's empty. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/env.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/env.c b/dlls/ntdll/unix/env.c index 256ea40cc87..2f4d988d709 100644 --- a/dlls/ntdll/unix/env.c +++ b/dlls/ntdll/unix/env.c @@ -2011,7 +2011,7 @@ void init_startup_info(void) params->CurrentDirectory.DosPath.MaximumLength = MAX_PATH * sizeof(WCHAR); dst = params->CurrentDirectory.DosPath.Buffer + MAX_PATH; - copy_unicode_string( &src, &dst, &params->DllPath, info->dllpath_len ); + if (info->dllpath_len) copy_unicode_string( &src, &dst, &params->DllPath, info->dllpath_len ); copy_unicode_string( &src, &dst, &params->ImagePathName, info->imagepath_len ); copy_unicode_string( &src, &dst, &params->CommandLine, info->cmdline_len ); copy_unicode_string( &src, &dst, &params->WindowTitle, info->title_len );

1 0

Alexandre Julliard : start: Add a private /exec option to replicate the Wine command-line usage.
by Alexandre Julliard March 25, 2021

March 25, 2021

Module: wine Branch: master Commit: 15a6ee944049bc15110b2219721a49b1afc268f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15a6ee944049bc15110b2219… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 25 11:27:56 2021 +0100 start: Add a private /exec option to replicate the Wine command-line usage. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 92 +++++++++++++++++++++++++++++++++++++++++++-- po/ast.po | 38 +++++++++++++++++-- po/bg.po | 38 +++++++++++++++++-- po/ca.po | 98 ++++++++++++++++++++++++++++++++++++++++++++++-- po/cs.po | 38 +++++++++++++++++-- po/da.po | 38 +++++++++++++++++-- po/de.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/el.po | 38 +++++++++++++++++-- po/en.po | 66 +++++++++++++++++++++++++++++++-- po/en_US.po | 66 +++++++++++++++++++++++++++++++-- po/eo.po | 38 +++++++++++++++++-- po/es.po | 38 +++++++++++++++++-- po/fa.po | 38 +++++++++++++++++-- po/fi.po | 95 +++++++++++++++++++++++++++++++++++++++++++++-- po/fr.po | 99 +++++++++++++++++++++++++++++++++++++++++++++++-- po/he.po | 38 +++++++++++++++++-- po/hi.po | 38 +++++++++++++++++-- po/hr.po | 38 +++++++++++++++++-- po/hu.po | 38 +++++++++++++++++-- po/it.po | 38 +++++++++++++++++-- po/ja.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/ko.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/lt.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/ml.po | 38 +++++++++++++++++-- po/nb_NO.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/nl.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/or.po | 38 +++++++++++++++++-- po/pa.po | 38 +++++++++++++++++-- po/pl.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/pt_BR.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/pt_PT.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/rm.po | 38 +++++++++++++++++-- po/ro.po | 38 +++++++++++++++++-- po/ru.po | 95 +++++++++++++++++++++++++++++++++++++++++++++-- po/si.po | 66 +++++++++++++++++++++++++++++++-- po/sk.po | 38 +++++++++++++++++-- po/sl.po | 38 +++++++++++++++++-- po/sr_RS(a)cyrillic.po | 38 +++++++++++++++++-- po/sr_RS(a)latin.po | 38 +++++++++++++++++-- po/sv.po | 97 ++++++++++++++++++++++++++++++++++++++++++++++-- po/ta.po | 38 +++++++++++++++++-- po/te.po | 38 +++++++++++++++++-- po/th.po | 38 +++++++++++++++++-- po/tr.po | 96 +++++++++++++++++++++++++++++++++++++++++++++-- po/uk.po | 38 +++++++++++++++++-- po/wa.po | 38 +++++++++++++++++-- po/wine.pot | 38 +++++++++++++++++-- po/zh_CN.po | 93 ++++++++++++++++++++++++++++++++++++++++++++-- po/zh_TW.po | 91 +++++++++++++++++++++++++++++++++++++++++++-- programs/start/start.c | 25 +++++++------ programs/start/start.rc | 1 + 51 files changed, 2849 insertions(+), 159 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=15a6ee944049bc15110b…

1 0