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

Nikolay Sivov : mfplat: Implement GetContiguousLength() for d3d11 buffer.
by Alexandre Julliard 24 Mar '21

24 Mar '21

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 24 Mar '21

24 Mar '21

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

Nikolay Sivov : mfplat: Use texture pointer for DXGI surface buffer.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: cd397d1aa6140a21ab3dd1043238f815365b67fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd397d1aa6140a21ab3dd104… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 24 12:37:22 2021 +0300 mfplat: Use texture pointer for DXGI surface buffer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/buffer.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/mfplat/buffer.c b/dlls/mfplat/buffer.c index abfb3e738d7..cf9ead7d809 100644 --- a/dlls/mfplat/buffer.c +++ b/dlls/mfplat/buffer.c @@ -63,7 +63,7 @@ struct memory_buffer } d3d9_surface; struct { - IUnknown *surface; + ID3D11Texture2D *texture; unsigned int subresource; struct attributes attributes; } dxgi_surface; @@ -131,9 +131,9 @@ static ULONG WINAPI memory_buffer_Release(IMFMediaBuffer *iface) { if (buffer->d3d9_surface.surface) IDirect3DSurface9_Release(buffer->d3d9_surface.surface); - if (buffer->dxgi_surface.surface) + if (buffer->dxgi_surface.texture) { - IUnknown_Release(buffer->dxgi_surface.surface); + ID3D11Texture2D_Release(buffer->dxgi_surface.texture); clear_attributes_object(&buffer->dxgi_surface.attributes); } DeleteCriticalSection(&buffer->cs); @@ -913,7 +913,7 @@ static HRESULT WINAPI dxgi_buffer_GetResource(IMFDXGIBuffer *iface, REFIID riid, TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); - return IUnknown_QueryInterface(buffer->dxgi_surface.surface, riid, obj); + return ID3D11Texture2D_QueryInterface(buffer->dxgi_surface.texture, riid, obj); } static HRESULT WINAPI dxgi_buffer_GetSubresourceIndex(IMFDXGIBuffer *iface, UINT *index) @@ -1170,32 +1170,44 @@ static HRESULT create_dxgi_surface_buffer(IUnknown *surface, UINT subresource, B { struct memory_buffer *object; D3D11_TEXTURE2D_DESC desc; + ID3D11Texture2D *texture; unsigned int stride; D3DFORMAT format; GUID subtype; BOOL is_yuv; HRESULT hr; - ID3D11Texture2D_GetDesc((ID3D11Texture2D *)surface, &desc); + if (FAILED(hr = IUnknown_QueryInterface(surface, &IID_ID3D11Texture2D, (void **)&texture))) + { + WARN("Failed to get texture interface, hr %#x.\n", hr); + return hr; + } + + ID3D11Texture2D_GetDesc(texture, &desc); TRACE("format %#x, %u x %u.\n", desc.Format, desc.Width, desc.Height); memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); subtype.Data1 = format = MFMapDXGIFormatToDX9Format(desc.Format); if (!(stride = mf_format_get_stride(&subtype, desc.Width, &is_yuv))) + { + ID3D11Texture2D_Release(texture); return MF_E_INVALIDMEDIATYPE; + } object = heap_alloc_zero(sizeof(*object)); if (!object) + { + ID3D11Texture2D_Release(texture); return E_OUTOFMEMORY; + } object->IMFMediaBuffer_iface.lpVtbl = &dxgi_surface_1d_buffer_vtbl; object->IMF2DBuffer2_iface.lpVtbl = &dxgi_surface_buffer_vtbl; object->IMFDXGIBuffer_iface.lpVtbl = &dxgi_buffer_vtbl; object->refcount = 1; InitializeCriticalSection(&object->cs); - object->dxgi_surface.surface = surface; - IUnknown_AddRef(surface); + object->dxgi_surface.texture = texture; object->dxgi_surface.subresource = subresource; MFGetPlaneSize(format, desc.Width, desc.Height, &object->_2d.plane_size);

1 0

Rémi Bernon : hidclass.sys: Fix parsed report descriptor length index.
by Alexandre Julliard 24 Mar '21

24 Mar '21

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 EMR_HEADER record.
by Alexandre Julliard 24 Mar '21

24 Mar '21

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

Zhiyi Zhang : winedump: Dump more fields for EMR_EXTTEXTOUTW records.
by Alexandre Julliard 24 Mar '21

24 Mar '21

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 24 Mar '21

24 Mar '21

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

Hugh McMaster : reg/tests: Add tests for duplicate command-line switches.
by Alexandre Julliard 24 Mar '21

24 Mar '21

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

Hugh McMaster : reg/tests: Test whether overwriting a registry key modifies existing keys and values.
by Alexandre Julliard 24 Mar '21

24 Mar '21

Module: wine Branch: master Commit: 89251073c7b7a919ca7c3450d53744921ac2979c URL: https://source.winehq.org/git/wine.git/?a=commit;h=89251073c7b7a919ca7c3450… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Mar 24 19:09:00 2021 +1100 reg/tests: Test whether overwriting a registry key modifies existing keys and values. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/add.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c index 8b6f234c6d0..f5d473e8887 100644 --- a/programs/reg/tests/add.c +++ b/programs/reg/tests/add.c @@ -210,7 +210,7 @@ void delete_value_(const char *file, unsigned line, const HKEY hkey, const char static void test_add(void) { - HKEY hkey; + HKEY hkey, hsubkey; LONG err; DWORD r, dword, type, size; char buffer[22]; @@ -606,6 +606,7 @@ static void test_add(void) verify_reg(hkey, "\\foo\\bar", REG_SZ, "", 1, 0); close_key(hkey); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); /* Test duplicate switches */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v Wine /t REG_DWORD /d 0x1 /v Test /f", &r); @@ -642,6 +643,22 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v invalid4 -", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u, expected 1\n", r); + /* Test whether overwriting a registry key modifies existing keys and values */ + add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); + add_key(hkey, "Subkey", &hsubkey); + close_key(hsubkey); + add_value(hkey, "Test1", REG_SZ, "Value1", 7); + dword = 0x123; + add_value(hkey, "Test2", REG_DWORD, &dword, sizeof(dword)); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + verify_key(HKEY_CURRENT_USER, KEY_BASE); + verify_key(hkey, "Subkey"); + verify_reg(hkey, "Test1", REG_SZ, "Value1", 7, 0); + verify_reg(hkey, "Test2", REG_DWORD, &dword, sizeof(dword), 0); + delete_tree(HKEY_CURRENT_USER, KEY_BASE); }

1 0

Hugh McMaster : reg/tests: Test whether a .reg file extension is required when exporting.
by Alexandre Julliard 24 Mar '21

24 Mar '21

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