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

Nikolay Sivov : mfplat/tests: Add a test for d3d11 texture buffer updates.
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: wine Branch: master Commit: e66bfc835137e92b9d30085652a21b9caed9deeb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e66bfc835137e92b9d300856… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 24 12:37:17 2021 +0300 mfplat/tests: Add a test for d3d11 texture buffer updates. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 138 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 138 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index fdfcf8a5d4b..879240ae1a4 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -93,6 +93,109 @@ static void check_interface_(unsigned int line, void *iface_ptr, REFIID iid, BOO IUnknown_Release(unk); } +struct d3d11_resource_readback +{ + ID3D11Resource *resource; + D3D11_MAPPED_SUBRESOURCE map_desc; + ID3D11DeviceContext *immediate_context; + unsigned int width, height, depth, sub_resource_idx; +}; + +static void init_d3d11_resource_readback(ID3D11Resource *resource, ID3D11Resource *readback_resource, + unsigned int width, unsigned int height, unsigned int depth, unsigned int sub_resource_idx, + ID3D11Device *device, struct d3d11_resource_readback *rb) +{ + HRESULT hr; + + rb->resource = readback_resource; + rb->width = width; + rb->height = height; + rb->depth = depth; + rb->sub_resource_idx = sub_resource_idx; + + ID3D11Device_GetImmediateContext(device, &rb->immediate_context); + + ID3D11DeviceContext_CopyResource(rb->immediate_context, rb->resource, resource); + if (FAILED(hr = ID3D11DeviceContext_Map(rb->immediate_context, + rb->resource, sub_resource_idx, D3D11_MAP_READ, 0, &rb->map_desc))) + { + trace("Failed to map resource, hr %#x.\n", hr); + ID3D11Resource_Release(rb->resource); + rb->resource = NULL; + ID3D11DeviceContext_Release(rb->immediate_context); + rb->immediate_context = NULL; + } +} + +static void get_d3d11_texture2d_readback(ID3D11Texture2D *texture, unsigned int sub_resource_idx, + struct d3d11_resource_readback *rb) +{ + D3D11_TEXTURE2D_DESC texture_desc; + ID3D11Resource *rb_texture; + unsigned int miplevel; + ID3D11Device *device; + HRESULT hr; + + memset(rb, 0, sizeof(*rb)); + + ID3D11Texture2D_GetDevice(texture, &device); + + ID3D11Texture2D_GetDesc(texture, &texture_desc); + texture_desc.Usage = D3D11_USAGE_STAGING; + texture_desc.BindFlags = 0; + texture_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ; + texture_desc.MiscFlags = 0; + if (FAILED(hr = ID3D11Device_CreateTexture2D(device, &texture_desc, NULL, (ID3D11Texture2D **)&rb_texture))) + { + trace("Failed to create texture, hr %#x.\n", hr); + ID3D11Device_Release(device); + return; + } + + miplevel = sub_resource_idx % texture_desc.MipLevels; + init_d3d11_resource_readback((ID3D11Resource *)texture, rb_texture, + max(1, texture_desc.Width >> miplevel), + max(1, texture_desc.Height >> miplevel), + 1, sub_resource_idx, device, rb); + + ID3D11Device_Release(device); +} + +static void release_d3d11_resource_readback(struct d3d11_resource_readback *rb) +{ + ID3D11DeviceContext_Unmap(rb->immediate_context, rb->resource, rb->sub_resource_idx); + ID3D11Resource_Release(rb->resource); + ID3D11DeviceContext_Release(rb->immediate_context); +} + +static void *get_d3d11_readback_data(struct d3d11_resource_readback *rb, + unsigned int x, unsigned int y, unsigned int z, unsigned byte_width) +{ + return (BYTE *)rb->map_desc.pData + z * rb->map_desc.DepthPitch + y * rb->map_desc.RowPitch + x * byte_width; +} + +static DWORD get_d3d11_readback_u32(struct d3d11_resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) +{ + return *(DWORD *)get_d3d11_readback_data(rb, x, y, z, sizeof(DWORD)); +} + +static DWORD get_d3d11_readback_color(struct d3d11_resource_readback *rb, unsigned int x, unsigned int y, unsigned int z) +{ + return get_d3d11_readback_u32(rb, x, y, z); +} + +static DWORD get_d3d11_texture_color(ID3D11Texture2D *texture, unsigned int x, unsigned int y) +{ + struct d3d11_resource_readback rb; + DWORD color; + + get_d3d11_texture2d_readback(texture, 0, &rb); + color = get_d3d11_readback_color(&rb, x, y, 0); + release_d3d11_resource_readback(&rb); + + return color; +} + static HRESULT (WINAPI *pD3D11CreateDevice)(IDXGIAdapter *adapter, D3D_DRIVER_TYPE driver_type, HMODULE swrast, UINT flags, const D3D_FEATURE_LEVEL *feature_levels, UINT levels, UINT sdk_version, ID3D11Device **device_out, D3D_FEATURE_LEVEL *obtained_feature_level, ID3D11DeviceContext **immediate_context); @@ -6201,6 +6304,7 @@ static ID3D11Device *create_d3d11_device(void) static void test_dxgi_surface_buffer(void) { + DWORD max_length, cur_length, color; IMFDXGIBuffer *dxgi_buffer; D3D11_TEXTURE2D_DESC desc; ID3D11Texture2D *texture; @@ -6280,6 +6384,40 @@ static void test_dxgi_surface_buffer(void) IMFDXGIBuffer_Release(dxgi_buffer); + /* Texture updates. */ + color = get_d3d11_texture_color(texture, 0, 0); + ok(!color, "Unexpected texture color %#x.\n", color); + + max_length = cur_length = 0; + data = NULL; + hr = IMFMediaBuffer_Lock(buffer, &data, &max_length, &cur_length); +todo_wine { + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(max_length && max_length == cur_length, "Unexpected length %u.\n", max_length); +} + if (data) *(DWORD *)data = ~0u; + + color = get_d3d11_texture_color(texture, 0, 0); + ok(!color, "Unexpected texture color %#x.\n", color); + + hr = IMFMediaBuffer_Unlock(buffer); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + color = get_d3d11_texture_color(texture, 0, 0); +todo_wine + ok(color == ~0u, "Unexpected texture color %#x.\n", color); + + hr = IMFMediaBuffer_Lock(buffer, &data, &max_length, &cur_length); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ok(*(DWORD *)data == ~0u, "Unexpected buffer %#x.\n", *(DWORD *)data); + + hr = IMFMediaBuffer_Unlock(buffer); +todo_wine + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFMediaBuffer_Release(buffer); ID3D11Texture2D_Release(texture);

1 0

Hugh McMaster : reg/tests: Add tests for duplicate command-line switches.
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: wine Branch: master Commit: a87a380a75723e0aa0e257c7efcc3024b56fb49d URL: https://source.winehq.org/git/wine.git/?a=commit;h=a87a380a75723e0aa0e257c7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 24 19:08:59 2021 +1100 reg/tests: Add tests for duplicate command-line switches. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 6 ++++++ programs/reg/tests/delete.c | 9 +++++++++ programs/reg/tests/query.c | 9 +++++++++ 3 files changed, 24 insertions(+) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 6d513f14fbd..8b6f234c6d0 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -233,6 +233,9 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /f /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); /* Test empty type */ @@ -291,6 +294,9 @@ static void test_add(void) ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); verify_reg(hkey, NULL, REG_SZ, "", 1, 0); + run_reg_exe("reg add HKCU\\" KEY_BASE " /ve /f /ve", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /d WineTEST /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg(hkey, "", REG_SZ, "WineTEST", 9, 0); diff --git a/programs/reg/tests/delete.c b/programs/reg/tests/delete.c index ee2257d42c5..77d95d013c9 100644 --- a/programs/reg/tests/delete.c +++ b/programs/reg/tests/delete.c @@ -47,9 +47,18 @@ static void test_delete(void) run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /va", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /ve", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg delete HKCU\\" KEY_BASE " /ve /va", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg delete HKCU\\" KEY_BASE " /va /va", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Test /ve /va", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + run_reg_exe("reg delete HKCU\\" KEY_BASE " /v Wine /v Test /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); diff --git a/programs/reg/tests/query.c b/programs/reg/tests/query.c index afa655f8d74..fcd43a4b195 100644 --- a/programs/reg/tests/query.c +++ b/programs/reg/tests/query.c @@ -74,6 +74,12 @@ static void test_query(void) run_reg_exe("reg query HKCU\\" KEY_BASE " /ve", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /v Wine", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + + run_reg_exe("reg query HKCU\\" KEY_BASE " /v Test /ve", &r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + /* Create a test subkey */ add_key(key, "Subkey", &subkey); add_value(subkey, "Test", REG_SZ, world, sizeof(world)); @@ -110,6 +116,9 @@ static void test_query(void) ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */, "got exit code %d, expected 0\n", r); + run_reg_exe("reg query HKCU\\" KEY_BASE " /s /s", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + /* Clean-up, then query */ delete_key(key, "subkey"); close_key(key);

1 0

Nikolay Sivov : mfplat: Implement GetContiguousLength() for d3d11 buffer.
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: wine Branch: master Commit: 264732a8c6ea333d430145183e2c974e9f46be83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=264732a8c6ea333d43014518… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 24 12:37:20 2021 +0300 mfplat: Implement GetContiguousLength() 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 | 9 +-------- dlls/mfplat/tests/mfplat.c | 13 ++++++++++++- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 3710843fd52..3c0f02709ee 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -888,13 +888,6 @@ static HRESULT WINAPI dxgi_surface_buffer_GetScanline0AndPitch(IMF2DBuffer2 *ifa return E_NOTIMPL; } -static HRESULT WINAPI dxgi_surface_buffer_GetContiguousLength(IMF2DBuffer2 *iface, DWORD *length) -{ - FIXME("%p, %p.\n", iface, length); - - return E_NOTIMPL; -} - static HRESULT WINAPI dxgi_surface_buffer_Lock2DSize(IMF2DBuffer2 *iface, MF2DBuffer_LockFlags flags, BYTE **scanline0, LONG *pitch, BYTE **buffer_start, DWORD *buffer_length) { @@ -1001,7 +994,7 @@ static const IMF2DBuffer2Vtbl dxgi_surface_buffer_vtbl = dxgi_surface_buffer_Unlock2D, dxgi_surface_buffer_GetScanline0AndPitch, memory_2d_buffer_IsContiguousFormat, - dxgi_surface_buffer_GetContiguousLength, + memory_2d_buffer_GetContiguousLength, memory_2d_buffer_ContiguousCopyTo, memory_2d_buffer_ContiguousCopyFrom, dxgi_surface_buffer_Lock2DSize, diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 1c236bdb655..aa6c0e28da6 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -6312,10 +6312,11 @@ static ID3D11Device *create_d3d11_device(void) static void test_dxgi_surface_buffer(void) { - DWORD max_length, cur_length, color; + DWORD max_length, cur_length, length, color; IMFDXGIBuffer *dxgi_buffer; D3D11_TEXTURE2D_DESC desc; ID3D11Texture2D *texture; + IMF2DBuffer *_2d_buffer; IMFMediaBuffer *buffer; ID3D11Device *device; UINT index, size; @@ -6366,6 +6367,16 @@ static void test_dxgi_surface_buffer(void) ok(hr == S_OK, "Failed to get length, hr %#x.\n", hr); ok(cur_length == 2 * max_length, "Unexpected length %u.\n", cur_length); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer, (void **)&_2d_buffer); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMF2DBuffer_GetContiguousLength(_2d_buffer, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hr = IMF2DBuffer_GetContiguousLength(_2d_buffer, &length); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(length == max_length, "Unexpected length %u.\n", length); + IMF2DBuffer_Release(_2d_buffer); + hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFDXGIBuffer, (void **)&dxgi_buffer); ok(hr == S_OK, "Failed to get interface, hr %#x.\n", hr);

1 0

Nikolay Sivov : mfplat: Implement GetContiguousLength() for d3d9 buffer.
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: wine Branch: master Commit: 31b88c38b0ca95ce75628ea8a815e25df06cbe2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=31b88c38b0ca95ce75628ea8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 24 12:37:21 2021 +0300 mfplat: Implement GetContiguousLength() for d3d9 buffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 9 +-------- dlls/mfplat/tests/mfplat.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index 3c0f02709ee..abfb3e738d7 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -697,13 +697,6 @@ static HRESULT WINAPI d3d9_surface_buffer_GetScanline0AndPitch(IMF2DBuffer2 *ifa return hr; } -static HRESULT WINAPI d3d9_surface_buffer_GetContiguousLength(IMF2DBuffer2 *iface, DWORD *length) -{ - FIXME("%p, %p.\n", iface, length); - - return E_NOTIMPL; -} - static HRESULT WINAPI d3d9_surface_buffer_Lock2DSize(IMF2DBuffer2 *iface, MF2DBuffer_LockFlags flags, BYTE **scanline0, LONG *pitch, BYTE **buffer_start, DWORD *buffer_length) { @@ -748,7 +741,7 @@ static const IMF2DBuffer2Vtbl d3d9_surface_buffer_vtbl = d3d9_surface_buffer_Unlock2D, d3d9_surface_buffer_GetScanline0AndPitch, memory_2d_buffer_IsContiguousFormat, - d3d9_surface_buffer_GetContiguousLength, + memory_2d_buffer_GetContiguousLength, memory_2d_buffer_ContiguousCopyTo, memory_2d_buffer_ContiguousCopyFrom, d3d9_surface_buffer_Lock2DSize, diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index aa6c0e28da6..b2b595b8fe7 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -5895,6 +5895,10 @@ static void test_MFCreateDXSurfaceBuffer(void) hr = pMFCreateDXSurfaceBuffer(&IID_IDirect3DSurface9, (IUnknown *)backbuffer, FALSE, &buffer); ok(hr == S_OK, "Failed to create a buffer, hr %#x.\n", hr); + check_interface(buffer, &IID_IMF2DBuffer, TRUE); + check_interface(buffer, &IID_IMF2DBuffer2, TRUE); + check_interface(buffer, &IID_IMFGetService, TRUE); + /* Surface is accessible. */ hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMFGetService, (void **)&gs); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -5977,6 +5981,12 @@ static void test_MFCreateDXSurfaceBuffer(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!value, "Unexpected return value %d.\n", value); + hr = IMF2DBuffer_GetContiguousLength(_2dbuffer, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hr = IMF2DBuffer_GetContiguousLength(_2dbuffer, &length); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(length == max_length, "Unexpected length %u.\n", length); + IMF2DBuffer_Release(_2dbuffer); hr = IMFMediaBuffer_QueryInterface(buffer, &IID_IMF2DBuffer2, (void **)&_2dbuffer2);

1 0

Rémi Bernon : hidclass.sys: Fix parsed report descriptor length index.
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: wine Branch: master Commit: 75dd9b92369ce27e15e070f966e2224ad973ee3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=75dd9b92369ce27e15e070f9… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Mar 24 14:57:59 2021 +0100 hidclass.sys: Fix parsed report descriptor length index. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index a50e7382466..a499aec93bb 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -161,7 +161,7 @@ NTSTATUS WINAPI PNP_AddDevice(DRIVER_OBJECT *driver, DEVICE_OBJECT *PDO) return status; } - ext->preparseData = ParseDescriptor(reportDescriptor, descriptor.DescriptorList[0].wReportLength); + ext->preparseData = ParseDescriptor(reportDescriptor, descriptor.DescriptorList[i].wReportLength); HeapFree(GetProcessHeap(), 0, reportDescriptor); if (!ext->preparseData)

1 0

Zhiyi Zhang : winedump: Dump more fields for EMR_EXTTEXTOUTW records.
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: wine Branch: master Commit: 603cb1c17348feba99c06f636517abddf0efa0eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=603cb1c17348feba99c06f63… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 24 16:10:21 2021 +0800 winedump: Dump more fields for EMR_EXTTEXTOUTW records. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/emf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index f3c92ac0539..d44f7a806a5 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -357,7 +357,9 @@ static int dump_emfrecord(void) const EMREXTTEXTOUTW *etoW = PRD(offset, sizeof(*etoW)); printf("%-20s %08x\n", "EMR_EXTTEXTOUTW", length); - printf("pt (%d,%d) rect (%d,%d - %d,%d) flags %#x, %s\n", + printf("bounds (%d,%d - %d,%d) mode %#x x_scale %f y_scale %f pt (%d,%d) rect (%d,%d - %d,%d) flags %#x, %s\n", + etoW->rclBounds.left, etoW->rclBounds.top, etoW->rclBounds.right, etoW->rclBounds.bottom, + etoW->iGraphicsMode, etoW->exScale, etoW->eyScale, etoW->emrtext.ptlReference.x, etoW->emrtext.ptlReference.y, etoW->emrtext.rcl.left, etoW->emrtext.rcl.top, etoW->emrtext.rcl.right, etoW->emrtext.rcl.bottom,

1 0

Hugh McMaster : reg: Use malloc(), realloc() and free() from stdlib.h instead of wine/heap.h.
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: wine Branch: master Commit: be718697a2e1b30944c019218ef635f6737503d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=be718697a2e1b30944c01921… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 24 19:08:58 2021 +1100 reg: Use malloc(), realloc() and free() from stdlib.h instead of wine/heap.h. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/add.c | 15 +++++++-------- programs/reg/delete.c | 8 ++++---- programs/reg/export.c | 45 ++++++++++++++++++++++----------------------- programs/reg/import.c | 43 +++++++++++++++++++++---------------------- programs/reg/query.c | 42 +++++++++++++++++++++--------------------- programs/reg/reg.c | 35 +++++------------------------------ programs/reg/reg.h | 4 +--- 7 files changed, 81 insertions(+), 111 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=be718697a2e1b30944c0…

1 0

Huw Davies : riched20: Add support for WM_PRINTCLIENT.
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: wine Branch: master Commit: a41b81115f53d0a7921f3e2de4c3083e7e338c64 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a41b81115f53d0a7921f3e2d… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 24 09:08:33 2021 +0000 riched20: Add support for WM_PRINTCLIENT. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/txthost.c | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 81f925c0578..b624fcd377c 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -1178,51 +1178,62 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam, break; case WM_PAINT: + case WM_PRINTCLIENT: { HDC hdc; - RECT rc, client; + RECT rc, client, update; PAINTSTRUCT ps; HBRUSH brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) ); ITextHostImpl_TxGetClientRect( &host->ITextHost_iface, &client ); - hdc = BeginPaint( hwnd, &ps ); + if (msg == WM_PAINT) + { + hdc = BeginPaint( hwnd, &ps ); + update = ps.rcPaint; + } + else + { + hdc = (HDC)wparam; + update = client; + } + brush = SelectObject( hdc, brush ); /* Erase area outside of the formatting rectangle */ - if (ps.rcPaint.top < client.top) + if (update.top < client.top) { - rc = ps.rcPaint; + rc = update; rc.bottom = client.top; PatBlt( hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); - ps.rcPaint.top = client.top; + update.top = client.top; } - if (ps.rcPaint.bottom > client.bottom) + if (update.bottom > client.bottom) { - rc = ps.rcPaint; + rc = update; rc.top = client.bottom; PatBlt( hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); - ps.rcPaint.bottom = client.bottom; + update.bottom = client.bottom; } - if (ps.rcPaint.left < client.left) + if (update.left < client.left) { - rc = ps.rcPaint; + rc = update; rc.right = client.left; PatBlt( hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); - ps.rcPaint.left = client.left; + update.left = client.left; } - if (ps.rcPaint.right > client.right) + if (update.right > client.right) { - rc = ps.rcPaint; + rc = update; rc.left = client.right; PatBlt( hdc, rc.left, rc.top, rc.right - rc.left, rc.bottom - rc.top, PATCOPY ); - ps.rcPaint.right = client.right; + update.right = client.right; } ITextServices_TxDraw( host->text_srv, DVASPECT_CONTENT, 0, NULL, NULL, hdc, NULL, NULL, NULL, - &ps.rcPaint, NULL, 0, TXTVIEW_ACTIVE ); + &update, NULL, 0, TXTVIEW_ACTIVE ); DeleteObject( SelectObject( hdc, brush ) ); - EndPaint( hwnd, &ps ); + if (msg == WM_PAINT) EndPaint( hwnd, &ps ); return 0; } case EM_REPLACESEL:

1 0

Zhiyi Zhang : winedump: Dump EMR_HEADER record.
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: wine Branch: master Commit: 99f69b4e8b1db3b1f938261c68fc6073b51d9e17 URL: https://source.winehq.org/git/wine.git/?a=commit;h=99f69b4e8b1db3b1f938261c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Mar 24 16:10:12 2021 +0800 winedump: Dump EMR_HEADER record. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/emf.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tools/winedump/emf.c b/tools/winedump/emf.c index cce66c838b6..f3c92ac0539 100644 --- a/tools/winedump/emf.c +++ b/tools/winedump/emf.c @@ -93,7 +93,22 @@ static int dump_emfrecord(void) switch(type) { - EMRCASE(EMR_HEADER); + case EMR_HEADER: + { + const ENHMETAHEADER *header = PRD(offset, sizeof(*header)); + + printf("%-20s %08x\n", "EMR_HEADER", length); + printf("bounds (%d,%d - %d,%d) frame (%d,%d - %d,%d) signature %#x version %#x bytes %#x records %#x\n" + "handles %#x reserved %#x palette entries %#x px %dx%d mm %dx%d μm %dx%d opengl %d description %s\n", + header->rclBounds.left, header->rclBounds.top, header->rclBounds.right, header->rclBounds.bottom, + header->rclFrame.left, header->rclFrame.top, header->rclFrame.right, header->rclFrame.bottom, + header->dSignature, header->nVersion, header->nBytes, header->nRecords, header->nHandles, header->sReserved, + header->nPalEntries, header->szlDevice.cx, header->szlDevice.cy, header->szlMillimeters.cx, + header->szlMillimeters.cy, header->szlMicrometers.cx, header->szlMicrometers.cy, header->bOpenGL, + debugstr_wn((LPCWSTR)((const BYTE *)header + header->offDescription), header->nDescription)); + break; + } + EMRCASE(EMR_POLYBEZIER); EMRCASE(EMR_POLYGON); EMRCASE(EMR_POLYLINE);

1 0

Hugh McMaster : reg/tests: Test whether a .reg file extension is required when exporting.
by Alexandre Julliard March 24, 2021

March 24, 2021

Module: wine Branch: master Commit: cd03238dd0174382c503d7b6771e803d876a2fbf URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd03238dd0174382c503d7b6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 24 19:09:01 2021 +1100 reg/tests: Test whether a .reg file extension is required when exporting. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/export.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 2c7ba88fb59..5296ebb1e06 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -247,6 +247,11 @@ static void test_export(void) ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", simple_test, 0), "compare_export() failed\n"); + /* Test whether a .reg file extension is required when exporting */ + run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " foo /y", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(compare_export("foo", simple_test, 0), "compare_export() failed\n"); + /* Test registry export with a complex data structure */ add_key(hkey, "Subkey1", &subkey); add_value(subkey, "Binary", REG_BINARY, "\x11\x22\x33\x44", 4);

1 0