August 2017 - Wine-commits - list.winehq.org

Józef Kucia : d3d11: Implement d3d11_immediate_context_CopyStructureCount().
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: be3baca9a64db969cfb596a4af4f1176a07dddfe URL: http://source.winehq.org/git/wine.git/?a=commit;h=be3baca9a64db969cfb596a4a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 4 19:53:49 2017 +0200 d3d11: Implement d3d11_immediate_context_CopyStructureCount(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 14 +++++++++++++- dlls/d3d11/tests/d3d11.c | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 14e21f9..3fea1bb 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1025,8 +1025,20 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_UpdateSubresource(ID3D11De static void STDMETHODCALLTYPE d3d11_immediate_context_CopyStructureCount(ID3D11DeviceContext *iface, ID3D11Buffer *dst_buffer, UINT dst_offset, ID3D11UnorderedAccessView *src_view) { - FIXME("iface %p, dst_buffer %p, dst_offset %u, src_view %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + struct d3d11_unordered_access_view *uav; + struct d3d_buffer *buffer_impl; + + TRACE("iface %p, dst_buffer %p, dst_offset %u, src_view %p.\n", iface, dst_buffer, dst_offset, src_view); + + buffer_impl = unsafe_impl_from_ID3D11Buffer(dst_buffer); + uav = unsafe_impl_from_ID3D11UnorderedAccessView(src_view); + + wined3d_mutex_lock(); + wined3d_device_copy_uav_counter(device->wined3d_device, + buffer_impl->wined3d_buffer, dst_offset, uav->wined3d_view); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_ClearRenderTargetView(ID3D11DeviceContext *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 9af9f87..73269ed 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -17983,7 +17983,7 @@ static void test_uav_counters(void) /* produce */ ID3D11DeviceContext_Dispatch(context, 16, 1, 1); data = read_uav_counter(context, staging_buffer, uav); - todo_wine ok(data == 64, "Got unexpected value %u.\n", data); + ok(data == 64, "Got unexpected value %u.\n", data); get_buffer_readback(buffer, &rb); memcpy(id, rb.map_desc.pData, 64 * sizeof(*id)); release_resource_readback(&rb); @@ -18027,7 +18027,7 @@ static void test_uav_counters(void) todo_wine ok(data == 4, "Got unexpected value %u.\n", data); ID3D11DeviceContext_Dispatch(context, 1, 1, 1); data = read_uav_counter(context, staging_buffer, uav); - ok(!data, "Got unexpected value %u.\n", data); + todo_wine ok(!data, "Got unexpected value %u.\n", data); get_buffer_readback(buffer2, &rb); for (i = 0; i < 8; ++i) {

1 0

Józef Kucia : wined3d: Add support for initial UAV counters values.
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: e7f1559a8d332598b5b894b28a27aece1be2d8bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7f1559a8d332598b5b894b28… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 4 19:53:50 2017 +0200 wined3d: Add support for initial UAV counters values. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 23 ++++++----------------- dlls/d3d11/tests/d3d11.c | 10 +++++----- dlls/wined3d/cs.c | 7 ++++++- dlls/wined3d/device.c | 19 ++++++++++--------- dlls/wined3d/view.c | 17 +++++++++++++++++ dlls/wined3d/wined3d.spec | 4 ++-- dlls/wined3d/wined3d_private.h | 5 ++++- include/wine/wined3d.h | 4 ++-- 8 files changed, 52 insertions(+), 37 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7f1559a8d332598b5b89…

1 0

Józef Kucia : wined3d: Change wined3d_buffer_copy() return type to void.
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: 2100e140ca1652adad3409fcca86dcfed7c85172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2100e140ca1652adad3409fcc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Aug 4 19:53:51 2017 +0200 wined3d: Change wined3d_buffer_copy() return type to void. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 4 +--- dlls/wined3d/cs.c | 5 ++--- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b299fe7..e953e9a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1191,7 +1191,7 @@ static void wined3d_buffer_unmap(struct wined3d_buffer *buffer) } } -HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, +void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) { struct wined3d_bo_address dst, src; @@ -1213,8 +1213,6 @@ HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_ context_release(context); wined3d_buffer_invalidate_range(dst_buffer, ~dst_location, dst_offset, size); - - return WINED3D_OK; } void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_context *context, diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index bc1bf17..a76598f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1952,10 +1952,9 @@ static void wined3d_cs_exec_blt_sub_resource(struct wined3d_cs *cs, const void * if (op->dst_resource->type == WINED3D_RTYPE_BUFFER) { - if (FAILED(wined3d_buffer_copy(buffer_from_resource(op->dst_resource), op->dst_box.left, + wined3d_buffer_copy(buffer_from_resource(op->dst_resource), op->dst_box.left, buffer_from_resource(op->src_resource), op->src_box.left, - op->src_box.right - op->src_box.left))) - ERR("Failed to copy buffer.\n"); + op->src_box.right - op->src_box.left); } else if (op->dst_resource->type == WINED3D_RTYPE_TEXTURE_2D) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f17cc76..f8aeb62 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3568,7 +3568,7 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; BYTE *wined3d_buffer_load_sysmem(struct wined3d_buffer *buffer, struct wined3d_context *context) DECLSPEC_HIDDEN; -HRESULT wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, +void wined3d_buffer_copy(struct wined3d_buffer *dst_buffer, unsigned int dst_offset, struct wined3d_buffer *src_buffer, unsigned int src_offset, unsigned int size) DECLSPEC_HIDDEN; void wined3d_buffer_upload_data(struct wined3d_buffer *buffer, struct wined3d_context *context, const struct wined3d_box *box, const void *data) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : ole32: Store proxy/stub CLSIDs per process, not per apartment.
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: a56bc8f93bca9a0f99cf4c5b9459c75bc082ef0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a56bc8f93bca9a0f99cf4c5b9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Aug 3 16:48:04 2017 -0500 ole32: Store proxy/stub CLSIDs per process, not per apartment. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 60 ++++++++++++++++++++++++++------------- dlls/ole32/compobj_private.h | 1 - dlls/ole32/tests/compobj.c | 67 ++++++++++++++++++++++++++++++++++++++++++-- 3 files changed, 105 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a56bc8f93bca9a0f99cf4…

1 0

André Hentschel : winebuild: Improved position independent code generation.
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: db848fa76764d2464ded18aeb06fcbe0b82ff494 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db848fa76764d2464ded18aeb… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Aug 6 14:31:09 2017 +0200 winebuild: Improved position independent code generation. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Martin Storsjo <martin(a)martin.st> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/import.c | 34 ++++++++++++++-------------------- tools/winebuild/spec32.c | 4 ++-- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index e7bad72..43dfa50 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -668,15 +668,14 @@ static void output_import_thunk( const char *name, const char *table, int pos ) output( "1:\t.long %s+%u-(1b+4)\n", table, pos ); break; case CPU_ARM64: - output( "\tadr x9, 1f\n" ); - output( "\tldur x9, [x9, #0]\n" ); + output( "\tadrp x9, %s\n", table ); + output( "\tadd x9, x9, #:lo12:%s\n", table ); if (pos & 0xf000) output( "\tadd x9, x9, #%u\n", pos & 0xf000 ); if (pos & 0x0f00) output( "\tadd x9, x9, #%u\n", pos & 0x0f00 ); if (pos & 0x00f0) output( "\tadd x9, x9, #%u\n", pos & 0x00f0 ); if (pos & 0x000f) output( "\tadd x9, x9, #%u\n", pos & 0x000f ); output( "\tldur x9, [x9, #0]\n" ); output( "\tbr x9\n" ); - output( "1:\t.quad %s\n", table ); break; case CPU_POWERPC: output( "\tmr %s, %s\n", ppc_reg(0), ppc_reg(31) ); @@ -980,8 +979,8 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) case CPU_ARM64: output( "\tstp x29, x30, [sp,#-16]!\n" ); output( "\tmov x29, sp\n" ); - output( "\tadr x9, 1f\n" ); - output( "\tldur x9, [x9, #0]\n" ); + output( "\tadrp x9, %s\n", asm_name("__wine_spec_delay_load") ); + output( "\tadd x9, x9, #:lo12:%s\n", asm_name("__wine_spec_delay_load") ); output( "\tblr x9\n" ); output( "\tmov x9, x0\n" ); output( "\tldp x29, x30, [sp],#16\n" ); @@ -990,7 +989,6 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tldp x4, x5, [sp,#48]\n" ); output( "\tldp x6, x7, [sp],#80\n" ); output( "\tbr x9\n" ); /* or "ret x9" */ - output( "1:\t.quad %s\n", asm_name("__wine_spec_delay_load") ); break; case CPU_POWERPC: if (target_platform == PLATFORM_APPLE) extra_stack_storage = 56; @@ -1089,10 +1087,8 @@ static void output_delayed_import_thunks( const DLLSPEC *spec ) output( "\tmul x1, x0, x1\n" ); output( "\tmov x0, x1\n" ); output( "\tadd x0, x0, #%d\n", j ); - output( "\tadr x9, 1f\n" ); - output( "\tldur x9, [x9, #0]\n" ); + output( "\tadr x9, %s\n", asm_name("__wine_delay_load_asm") ); output( "\tbr x9\n" ); - output( "1:\t.quad %s\n", asm_name("__wine_delay_load_asm") ); break; case CPU_POWERPC: switch(target_platform) @@ -1281,21 +1277,19 @@ void output_stubs( DLLSPEC *spec ) else output( "\t.long %u\n", odp->ordinal ); break; case CPU_ARM64: - output( "\tadr x0, 2f\n" ); - output( "\tldur x0, [x0, #0]\n" ); - output( "\tadr x1, 2f+8\n" ); - output( "\tldur x1, [x1, #0]\n" ); - output( "\tadr x2, 1f\n" ); - output( "\tldur x2, [x2, #0]\n" ); - output( "\tblr x2\n" ); - output( "1:\t.quad %s\n", asm_name("__wine_spec_unimplemented_stub") ); - output( "2:\t.quad %s\n", asm_name("__wine_spec_file_name") ); + output( "\tadrp x0, %s\n", asm_name("__wine_spec_file_name") ); + output( "\tadd x0, x0, #:lo12:%s\n", asm_name("__wine_spec_file_name") ); if (exp_name) { - output( "\t.quad .L%s_string\n", name ); + output( "\tadrp x1, .L%s_string\n", name ); + output( "\tadd x1, x1, #:lo12:.L%s_string\n", name ); count++; } - else output( "\t.quad %u\n", odp->ordinal ); + else + output( "\tmov x1, %u\n", odp->ordinal ); + output( "\tadrp x2, %s\n", asm_name("__wine_spec_unimplemented_stub") ); + output( "\tadd x2, x2, #:lo12:%s\n", asm_name("__wine_spec_unimplemented_stub") ); + output( "\tblr x2\n" ); break; default: assert(0); diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 4a01238..83a48b6 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -257,14 +257,14 @@ static void output_relay_debug( DLLSPEC *spec ) output( "\tmov w1, #%u\n", (flags << 24) ); if (args) output( "\tadd w1, w1, #%u\n", (args << 16) ); if (i - spec->base) output( "\tadd w1, w1, #%u\n", i - spec->base ); - output( "\tldr x0, 1f\n"); + output( "\tadrp x0, .L__wine_spec_relay_descr\n"); + output( "\tadd x0, x0, #:lo12:.L__wine_spec_relay_descr\n"); output( "\tldr x3, [x0, #8]\n"); output( "\tblr x3\n"); output( "\tadd SP, SP, #16\n" ); output( "\tldp x29, x30, [SP], #16\n" ); if (args) output( "\tadd SP, SP, #%u\n", 8 * ((min(args, 8) + 1) & 0xe) ); output( "\tret\n"); - output( "\t1: .quad .L__wine_spec_relay_descr\n"); break; case CPU_x86_64:

1 0

Alistair Leslie-Hughes : ntdll/tests: Use standard wine_dbgstr_longlong.
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: 3b05f552e214e4b809986e250bc808329a10efae URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b05f552e214e4b809986e250… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sun Aug 6 23:31:31 2017 +0000 ntdll/tests: Use standard wine_dbgstr_longlong. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/directory.c | 16 +++++----- dlls/ntdll/tests/info.c | 2 +- dlls/ntdll/tests/large_int.c | 50 ++++++++++++++--------------- dlls/ntdll/tests/rtl.c | 20 ++++++------ dlls/ntdll/tests/rtlbitmap.c | 16 +++++----- dlls/ntdll/tests/string.c | 75 +++++++++++++++++++++----------------------- 6 files changed, 86 insertions(+), 93 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b05f552e214e4b809986…

1 0

Nikolay Sivov : d2d1: Fix trace message typo.
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: b9a03b70afd5753fb9b1a6cd8d4d7c6e5effef1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9a03b70afd5753fb9b1a6cd8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 7 10:31:53 2017 +0300 d2d1: Fix trace message typo. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/render_target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/render_target.c b/dlls/d2d1/render_target.c index cf559c1..2ac62e4 100644 --- a/dlls/d2d1/render_target.c +++ b/dlls/d2d1/render_target.c @@ -766,7 +766,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGeometry(ID2D1RenderTarg iface, geometry, brush, stroke_width, stroke_style); if (stroke_style) - FIXME("Ignoring stoke style %p.\n", stroke_style); + FIXME("Ignoring stroke style %p.\n", stroke_style); d2d_rt_draw_geometry(render_target, geometry_impl, brush_impl, stroke_width); }

1 0

Nikolay Sivov : dmloader: Use safe list iterator when clearing the cache ( Coverity).
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: 96fd03b269cbd991e6609f0fa2ce4c12984cfd43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96fd03b269cbd991e6609f0fa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 7 10:34:50 2017 +0300 dmloader: Use safe list iterator when clearing the cache (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmloader/loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index e44d2b9..10a2151 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -776,11 +776,11 @@ static HRESULT WINAPI IDirectMusicLoaderImpl_ReleaseObject(IDirectMusicLoader8 * static HRESULT WINAPI IDirectMusicLoaderImpl_ClearCache(IDirectMusicLoader8 *iface, REFGUID class) { IDirectMusicLoaderImpl *This = impl_from_IDirectMusicLoader8(iface); - struct cache_entry *obj; + struct cache_entry *obj, *obj2; TRACE("(%p, %s)\n", This, debugstr_dmguid(class)); - LIST_FOR_EACH_ENTRY(obj, &This->cache, struct cache_entry, entry) { + LIST_FOR_EACH_ENTRY_SAFE(obj, obj2, &This->cache, struct cache_entry, entry) { if ((IsEqualGUID(class, &GUID_DirectMusicAllTypes) || IsEqualGUID(class, &obj->Desc.guidClass)) && (obj->Desc.dwValidData & DMUS_OBJ_LOADED)) { /* basically, wrap to ReleaseObject for each object found */

1 0

Hugh McMaster : reg/tests: Add tests for importing Windows 3.1 registry data.
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: f95f3fb1bf6abb4e6f2767f557bedd2377edb4d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f95f3fb1bf6abb4e6f2767f55… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 7 12:28:35 2017 +0000 reg/tests: Add tests for importing Windows 3.1 registry data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 118 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 118 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 941d325..a2728ca 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4053,6 +4053,123 @@ static void test_unicode_import_with_whitespace(void) todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", err); } +static void test_import_31(void) +{ + LONG err; + HKEY hkey; + DWORD r; + + err = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); + ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", err); + + /* Check if reg.exe is running with elevated privileges */ + err = RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_READ|KEY_SET_VALUE, NULL, &hkey, NULL); + if (err == ERROR_ACCESS_DENIED) + { + win_skip("reg.exe is not running with elevated privileges; " + "skipping Windows 3.1 import tests\n"); + return; + } + + /* Test simple value */ + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " = Value0\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "", REG_SZ, "Value0", 7, 0); + + /* Test proper handling of spaces and equals signs */ + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " =Value1\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "", REG_SZ, "Value1", 7, 0); + + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " = Value2\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "", REG_SZ, " Value2", 8, 0); + + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " = Value3 \r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "", REG_SZ, "Value3 ", 8, 0); + + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " Value4\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "", REG_SZ, "Value4", 7, 0); + + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " Value5\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "", REG_SZ, "Value5", 7, 0); + + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE "\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "", REG_SZ, "", 1, 0); + + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " \r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "", REG_SZ, "", 1, 0); + + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " = No newline", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "", REG_SZ, "No newline", 11, 0); + + err = RegDeleteValueW(hkey, NULL); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteValue failed: %d\n", err); + + /* Test character validity at the start of the line */ + test_import_str("REGEDIT\r\n" + " HKEY_CLASSES_ROOT\\" KEY_BASE " = Value1a\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + test_import_str("REGEDIT\r\n" + " HKEY_CLASSES_ROOT\\" KEY_BASE " = Value1b\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + test_import_str("REGEDIT\r\n" + "\tHKEY_CLASSES_ROOT\\" KEY_BASE " = Value1c\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + test_import_str("REGEDIT\r\n" + ";HKEY_CLASSES_ROOT\\" KEY_BASE " = Value2a\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + test_import_str("REGEDIT\r\n" + "#HKEY_CLASSES_ROOT\\" KEY_BASE " = Value2b\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + /* Test case sensitivity */ + test_import_str("REGEDIT\r\n" + "hkey_classes_root\\" KEY_BASE " = Value3a\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + test_import_str("REGEDIT\r\n" + "hKEY_CLASSES_ROOT\\" KEY_BASE " = Value3b\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + test_import_str("REGEDIT\r\n" + "Hkey_Classes_Root\\" KEY_BASE " = Value3c\r\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + RegCloseKey(hkey); + + err = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); + ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err); +} + START_TEST(reg) { DWORD r; @@ -4069,4 +4186,5 @@ START_TEST(reg) test_unicode_import(); test_import_with_whitespace(); test_unicode_import_with_whitespace(); + test_import_31(); }

1 0

Hugh McMaster : reg: Dynamically allocate memory for the value name buffer when deleting all registry values in a specified key.
by Alexandre Julliard 08 Aug '17

08 Aug '17

Module: wine Branch: master Commit: 8abec73530bff8129b3a4a07d196b44e8cf4fa5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=8abec73530bff8129b3a4a07d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Aug 7 12:28:44 2017 +0000 reg: Dynamically allocate memory for the value name buffer when deleting all registry values in a specified key. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index c086763..37ac193 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -482,40 +482,35 @@ static int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name if (value_all) { - LPWSTR szValue; - DWORD maxValue; - DWORD count; + DWORD max_value_len = 256, value_len; + WCHAR *value_name; LONG rc; - rc = RegQueryInfoKeyW(key, NULL, NULL, NULL, NULL, NULL, NULL, - NULL, &maxValue, NULL, NULL, NULL); - if (rc != ERROR_SUCCESS) - { - RegCloseKey(key); - output_message(STRING_GENERAL_FAILURE); - return 1; - } - maxValue++; - szValue = heap_xalloc(maxValue * sizeof(WCHAR)); + value_name = heap_xalloc(max_value_len * sizeof(WCHAR)); while (1) { - count = maxValue; - rc = RegEnumValueW(key, 0, szValue, &count, NULL, NULL, NULL, NULL); + value_len = max_value_len; + rc = RegEnumValueW(key, 0, value_name, &value_len, NULL, NULL, NULL, NULL); if (rc == ERROR_SUCCESS) { - rc = RegDeleteValueW(key, szValue); + rc = RegDeleteValueW(key, value_name); if (rc != ERROR_SUCCESS) { - heap_free(szValue); + heap_free(value_name); RegCloseKey(key); output_message(STRING_VALUEALL_FAILED, key_name); return 1; } } + else if (rc == ERROR_MORE_DATA) + { + max_value_len *= 2; + value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR)); + } else break; } - heap_free(szValue); + heap_free(value_name); } else if (value_name || value_empty) {

1 0