October 2016 - Wine-commits

Józef Kucia : wined3d: Replace wined3d_buffer_load_sysmem() calls with wined3d_buffer_load_location().
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 4a23e91462083db82058111977762532c86afcad URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a23e91462083db8205811197… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 24 11:57:24 2016 +0200 wined3d: Replace wined3d_buffer_load_sysmem() calls with wined3d_buffer_load_location(). 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 | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index eae55e1..d8b47fc 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -631,6 +631,7 @@ void wined3d_buffer_get_memory(struct wined3d_buffer *buffer, static void buffer_unload(struct wined3d_resource *resource) { struct wined3d_buffer *buffer = buffer_from_resource(resource); + DWORD flags = buffer->flags; TRACE("buffer %p.\n", buffer); @@ -641,12 +642,10 @@ static void buffer_unload(struct wined3d_resource *resource) context = context_acquire(device, NULL); - /* Download the buffer, but don't permanently enable double buffering */ - if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) - { - wined3d_buffer_load_sysmem(buffer, context); + /* Download the buffer, but don't permanently enable double buffering. */ + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); + if (!(flags & WINED3D_BUFFER_DOUBLEBUFFER)) buffer->flags &= ~WINED3D_BUFFER_DOUBLEBUFFER; - } wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER); delete_gl_buffer(buffer, context->gl_info); @@ -988,8 +987,7 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * if (buffer->buffer_type_hint != GL_ARRAY_BUFFER) ERR("Converting data in non-vertex buffer.\n"); - if (!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) - wined3d_buffer_load_sysmem(buffer, context); + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); /* Now for each vertex in the buffer that needs conversion */ vertex_count = buffer->resource.size / buffer->stride; @@ -1144,7 +1142,7 @@ static HRESULT wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UI else { TRACE("Falling back to doublebuffered operation.\n"); - wined3d_buffer_load_sysmem(buffer, context); + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); } TRACE("New pointer is %p.\n", buffer->resource.heap_memory); buffer->map_ptr = NULL;

1 0

Józef Kucia : wined3d: Introduce buffer_conversion_upload() helper function.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 6454242009715249b497fa7db9df21946b74d648 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6454242009715249b497fa7db… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 24 11:57:25 2016 +0200 wined3d: Introduce buffer_conversion_upload() helper function. 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 | 122 +++++++++++++++++++++++++++----------------------- 1 file changed, 65 insertions(+), 57 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d8b47fc..e0e62c5 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -852,6 +852,69 @@ static void buffer_direct_upload(struct wined3d_buffer *This, struct wined3d_con wined3d_buffer_validate_location(This, WINED3D_LOCATION_BUFFER); } +static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined3d_context *context) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + unsigned int i, j, start, end, len, vertex_count; + BYTE *data; + + /* This would potentially invalidate the element array buffer binding. */ + if (buffer->buffer_type_hint != GL_ARRAY_BUFFER) + ERR("Converting data in non-vertex buffer.\n"); + + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); + + /* Now for each vertex in the buffer that needs conversion. */ + vertex_count = buffer->resource.size / buffer->stride; + + if (!(data = HeapAlloc(GetProcessHeap(), 0, buffer->resource.size))) + { + ERR("Out of memory.\n"); + return; + } + + while (buffer->modified_areas) + { + buffer->modified_areas--; + start = buffer->maps[buffer->modified_areas].offset; + len = buffer->maps[buffer->modified_areas].size; + end = start + len; + + memcpy(data + start, (BYTE *)buffer->resource.heap_memory + start, end - start); + for (i = start / buffer->stride; i < min((end / buffer->stride) + 1, vertex_count); ++i) + { + for (j = 0; j < buffer->stride;) + { + switch (buffer->conversion_map[j]) + { + case CONV_NONE: + /* Done already */ + j += sizeof(DWORD); + break; + case CONV_D3DCOLOR: + j += fixup_d3dcolor((DWORD *) (data + i * buffer->stride + j)); + break; + case CONV_POSITIONT: + j += fixup_transformed_pos((float *) (data + i * buffer->stride + j)); + break; + default: + FIXME("Unimplemented conversion %d in shifted conversion.\n", buffer->conversion_map[j]); + ++j; + } + } + } + + GL_EXTCALL(glBindBuffer(buffer->buffer_type_hint, buffer->buffer_object)); + checkGLcall("glBindBuffer"); + GL_EXTCALL(glBufferSubData(buffer->buffer_type_hint, start, len, data + start)); + checkGLcall("glBufferSubData"); + } + + HeapFree(GetProcessHeap(), 0, data); + + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); +} + void buffer_mark_used(struct wined3d_buffer *buffer) { buffer->flags &= ~(WINED3D_BUFFER_SYNC | WINED3D_BUFFER_DISCARD); @@ -863,9 +926,7 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * { DWORD flags = buffer->flags & (WINED3D_BUFFER_SYNC | WINED3D_BUFFER_DISCARD); const struct wined3d_gl_info *gl_info = context->gl_info; - unsigned int i, j, start, end, len, vertex_count; BOOL decl_changed = FALSE; - BYTE *data; TRACE("buffer %p.\n", buffer); @@ -980,64 +1041,11 @@ void wined3d_buffer_load(struct wined3d_buffer *buffer, struct wined3d_context * return; buffer_direct_upload(buffer, context, flags); - return; } - - /* This would potentially invalidate the element array buffer binding. */ - if (buffer->buffer_type_hint != GL_ARRAY_BUFFER) - ERR("Converting data in non-vertex buffer.\n"); - - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); - - /* Now for each vertex in the buffer that needs conversion */ - vertex_count = buffer->resource.size / buffer->stride; - - if (!(data = HeapAlloc(GetProcessHeap(), 0, buffer->resource.size))) + else { - ERR("Out of memory.\n"); - return; + buffer_conversion_upload(buffer, context); } - - while (buffer->modified_areas) - { - buffer->modified_areas--; - start = buffer->maps[buffer->modified_areas].offset; - len = buffer->maps[buffer->modified_areas].size; - end = start + len; - - memcpy(data + start, (BYTE *)buffer->resource.heap_memory + start, end - start); - for (i = start / buffer->stride; i < min((end / buffer->stride) + 1, vertex_count); ++i) - { - for (j = 0; j < buffer->stride;) - { - switch (buffer->conversion_map[j]) - { - case CONV_NONE: - /* Done already */ - j += sizeof(DWORD); - break; - case CONV_D3DCOLOR: - j += fixup_d3dcolor((DWORD *) (data + i * buffer->stride + j)); - break; - case CONV_POSITIONT: - j += fixup_transformed_pos((float *) (data + i * buffer->stride + j)); - break; - default: - FIXME("Unimplemented conversion %d in shifted conversion.\n", buffer->conversion_map[j]); - ++j; - } - } - } - - GL_EXTCALL(glBindBuffer(buffer->buffer_type_hint, buffer->buffer_object)); - checkGLcall("glBindBuffer"); - GL_EXTCALL(glBufferSubData(buffer->buffer_type_hint, start, len, data + start)); - checkGLcall("glBufferSubData"); - } - - HeapFree(GetProcessHeap(), 0, data); - - wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); } struct wined3d_resource * CDECL wined3d_buffer_get_resource(struct wined3d_buffer *buffer)

1 0

Józef Kucia : wined3d: Simplify remove_vbos().
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 6c5e1aff0421b8a56e686520b6f6d11a0408871b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c5e1aff0421b8a56e686520b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 24 11:57:26 2016 +0200 wined3d: Simplify remove_vbos(). 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/drawprim.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 4833845..bf035ae 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -391,18 +391,19 @@ static void remove_vbos(struct wined3d_context *context, { unsigned int i; - for (i = 0; i < (sizeof(s->elements) / sizeof(*s->elements)); ++i) + for (i = 0; i < ARRAY_SIZE(s->elements); ++i) { struct wined3d_stream_info_element *e; - if (!(s->use_map & (1u << i))) continue; + if (!(s->use_map & (1u << i))) + continue; e = &s->elements[i]; if (e->data.buffer_object) { struct wined3d_buffer *vb = state->streams[e->stream_idx].buffer; e->data.buffer_object = 0; - e->data.addr = (BYTE *)((ULONG_PTR)e->data.addr + (ULONG_PTR)wined3d_buffer_load_sysmem(vb, context)); + e->data.addr += (ULONG_PTR)wined3d_buffer_load_sysmem(vb, context); } } }

1 0

Józef Kucia : wined3d: Fix index offset for immediate mode draws.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 0581d8614784cd24340123eae520159aeb40ec0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0581d8614784cd24340123eae… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 24 11:57:27 2016 +0200 wined3d: Fix index offset for immediate mode draws. This fixes 42fcf202211f62ccec21863b36076c2d5e02c1da. A non-NULL pointer doesn't imply that the pointer isn't an offset into a buffer object data. 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/drawprim.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index bf035ae..36c8d98 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -196,12 +196,10 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const if (instance_count) FIXME("Instancing not implemented.\n"); - /* Immediate mode drawing can't make use of indices in a vbo - get the - * data from the index buffer. If the index buffer has no vbo (not - * supported or other reason), or with user pointer drawing idx_data - * will be non-NULL. */ - if (idx_size && !idx_data) - idx_data = wined3d_buffer_load_sysmem(state->index_buffer, context); + /* Immediate mode drawing can't make use of indices in a VBO - get the + * data from the index buffer. */ + if (idx_size) + idx_data = wined3d_buffer_load_sysmem(state->index_buffer, context) + state->index_offset; ops = &d3d_info->ffp_attrib_ops;

1 0

Józef Kucia : wined3d: Use buffer_bind() in buffer_conversion_upload().
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 61fef3bd1ead45deca83e94e404790d8d5f8e6c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61fef3bd1ead45deca83e94e4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Oct 24 11:57:28 2016 +0200 wined3d: Use buffer_bind() in buffer_conversion_upload(). 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 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index e0e62c5..a81cd64 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -858,10 +858,6 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined unsigned int i, j, start, end, len, vertex_count; BYTE *data; - /* This would potentially invalidate the element array buffer binding. */ - if (buffer->buffer_type_hint != GL_ARRAY_BUFFER) - ERR("Converting data in non-vertex buffer.\n"); - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); /* Now for each vertex in the buffer that needs conversion. */ @@ -873,6 +869,7 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined return; } + buffer_bind(buffer, context); while (buffer->modified_areas) { buffer->modified_areas--; @@ -904,8 +901,6 @@ static void buffer_conversion_upload(struct wined3d_buffer *buffer, struct wined } } - GL_EXTCALL(glBindBuffer(buffer->buffer_type_hint, buffer->buffer_object)); - checkGLcall("glBindBuffer"); GL_EXTCALL(glBufferSubData(buffer->buffer_type_hint, start, len, data + start)); checkGLcall("glBufferSubData"); }

1 0

Hugh McMaster : regedit/tests: Replace the hard-coded subkey path with a define.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 211a5d15d77133fd8593bc2e3cf245fe3d9f8f08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=211a5d15d77133fd8593bc2e3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Oct 24 11:26:58 2016 +0000 regedit/tests: Replace the hard-coded subkey path with a define. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 86 +++++++++++++++++----------------------- 1 file changed, 36 insertions(+), 50 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 2002e64..cc6cf43 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -241,6 +241,8 @@ static void r_verify_reg_nonexist(unsigned line, HKEY key, const char *subkey, value_name); } +#define KEY_BASE "Software\\Wine\\regedit_test" + static void test_basic_import(void) { char exp_binary[] = {0xAA,0xBB,0xCC,0x11}; @@ -263,58 +265,51 @@ static void test_basic_import(void) WCHAR wide_exp[] = {0x3041,'V','a','l','u','e',0}; LONG lr; - lr = RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test"); + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestValue\"=\"AValue\"\n"); - verify_reg_sz(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "TestValue", "AValue"); + verify_reg_sz(HKEY_CURRENT_USER, KEY_BASE, "TestValue", "AValue"); exec_import_str("REGEDIT4\r\n\r\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" "\"TestValue2\"=\"BValue\"\r\n"); - verify_reg_sz(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "TestValue2", "BValue"); + verify_reg_sz(HKEY_CURRENT_USER, KEY_BASE, "TestValue2", "BValue"); if(supports_wchar){ exec_import_wstr(wide_test); - verify_reg_wsz(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "TestValue3", wide_exp); + verify_reg_wsz(HKEY_CURRENT_USER, KEY_BASE, "TestValue3", wide_exp); exec_import_wstr(wide_test_r); - verify_reg_wsz(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "TestValue5", wide_exp); + verify_reg_wsz(HKEY_CURRENT_USER, KEY_BASE, "TestValue5", wide_exp); }else win_skip("Some WCHAR tests skipped\n"); exec_import_str("REGEDIT4\r\r" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\r" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r" "\"TestValue4\"=\"DValue\"\r"); - verify_reg_sz(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "TestValue4", "DValue"); + verify_reg_sz(HKEY_CURRENT_USER, KEY_BASE, "TestValue4", "DValue"); exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestDword\"=dword:00000017\n"); - verify_reg_dword(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "TestDword", 0x17); + verify_reg_dword(HKEY_CURRENT_USER, KEY_BASE, "TestDword", 0x17); exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestBinary\"=hex:aa,bb,cc,11\n"); - verify_reg_binary(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", + verify_reg_binary(HKEY_CURRENT_USER, KEY_BASE, "TestBinary", exp_binary, sizeof(exp_binary)); exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"With=Equals\"=\"asdf\"\n"); - verify_reg_sz(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "With=Equals", "asdf"); + verify_reg_sz(HKEY_CURRENT_USER, KEY_BASE, "With=Equals", "asdf"); - lr = RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test"); + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); } @@ -322,55 +317,46 @@ static void test_invalid_import(void) { LONG lr; - lr = RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test"); - ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, - "RegDeleteKeyA failed: %d\n", lr); + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); + ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestNoEndQuote\"=\"Asdffdsa\n"); - verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "TestNoEndQuote"); + verify_reg_nonexist(HKEY_CURRENT_USER, KEY_BASE, "TestNoEndQuote"); exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestNoBeginQuote\"=Asdffdsa\"\n"); - verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "TestNoBeginQuote"); + verify_reg_nonexist(HKEY_CURRENT_USER, KEY_BASE, "TestNoBeginQuote"); exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestNoQuotes\"=Asdffdsa\n"); - verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "TestNoQuotes"); + verify_reg_nonexist(HKEY_CURRENT_USER, KEY_BASE, "TestNoQuotes"); exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"NameNoEndQuote=\"Asdffdsa\"\n"); - verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "NameNoEndQuote"); + verify_reg_nonexist(HKEY_CURRENT_USER, KEY_BASE, "NameNoEndQuote"); exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "NameNoBeginQuote\"=\"Asdffdsa\"\n"); - verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "NameNoBeginQuote"); + verify_reg_nonexist(HKEY_CURRENT_USER, KEY_BASE, "NameNoBeginQuote"); exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "NameNoQuotes=\"Asdffdsa\"\n"); - verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "NameNoQuotes"); + verify_reg_nonexist(HKEY_CURRENT_USER, KEY_BASE, "NameNoQuotes"); exec_import_str("REGEDIT4\n\n" - "[HKEY_CURRENT_USER\\Software\\Wine\\regedit_test]\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"MixedQuotes=Asdffdsa\"\n"); - verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "MixedQuotes"); - verify_reg_nonexist(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test", - "MixedQuotes=Asdffdsa"); + verify_reg_nonexist(HKEY_CURRENT_USER, KEY_BASE, "MixedQuotes"); + verify_reg_nonexist(HKEY_CURRENT_USER, KEY_BASE, "MixedQuotes=Asdffdsa"); - lr = RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Wine\\regedit_test"); + lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr); }

1 0

Hugh McMaster : regedit/tests: Handle different data types with one verify_reg() function.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 4e43d7675162e5fbc9b2981127235f694ea04da9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e43d7675162e5fbc9b298112… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Oct 24 11:27:25 2016 +0000 regedit/tests: Handle different data types with one verify_reg() function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 93 +++++++++++++--------------------------- 1 file changed, 30 insertions(+), 63 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index db4ccd8..eeff9d8 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -98,24 +98,32 @@ static BOOL r_exec_import_wstr(unsigned line, const WCHAR *file_contents) return (dr != WAIT_TIMEOUT); } -#define verify_reg_sz(k,n,e) r_verify_reg_sz(__LINE__,k,n,e) -static void r_verify_reg_sz(unsigned line, HKEY key, const char *value_name, const char *exp_value) +#define TODO_REG_TYPE (0x0001u) +#define TODO_REG_SIZE (0x0002u) +#define TODO_REG_DATA (0x0004u) + +/* verify_reg() adapted from programs/reg/tests/reg.c */ +#define verify_reg(k,v,t,d,s,todo) verify_reg_(__LINE__,k,v,t,d,s,todo) +static void verify_reg_(unsigned line, HKEY hkey, const char *value, + DWORD exp_type, const void *exp_data, DWORD exp_size, DWORD todo) { - LONG lr; - DWORD fnd_type, fnd_len; - char fnd_value[1024]; - - fnd_len = sizeof(fnd_value); - lr = RegQueryValueExA(key, value_name, NULL, &fnd_type, (BYTE*)fnd_value, &fnd_len); - lok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr); - if(lr != ERROR_SUCCESS) + DWORD type, size; + BYTE data[256]; + LONG err; + + size = sizeof(data); + memset(data, 0xdd, size); + err = RegQueryValueExA(hkey, value, NULL, &type, data, &size); + lok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got %d\n", err); + if (err != ERROR_SUCCESS) return; - lok(fnd_type == REG_SZ, "Got wrong type: %d\n", fnd_type); - if(fnd_type != REG_SZ) - return; - lok(!strcmp(exp_value, fnd_value), - "Strings differ: expected %s, got %s\n", exp_value, fnd_value); + todo_wine_if (todo & TODO_REG_TYPE) + lok(type == exp_type, "got wrong type %d, expected %d\n", type, exp_type); + todo_wine_if (todo & TODO_REG_SIZE) + lok(size == exp_size, "got wrong size %d, expected %d\n", size, exp_size); + todo_wine_if (todo & TODO_REG_DATA) + lok(memcmp(data, exp_data, size) == 0, "got wrong data\n"); } #define verify_reg_wsz(k,n,e) r_verify_reg_wsz(__LINE__,k,n,e) @@ -142,48 +150,6 @@ static void r_verify_reg_wsz(unsigned line, HKEY key, const char *value_name, co wine_dbgstr_w(exp_value), wine_dbgstr_w(fnd_value)); } -#define verify_reg_dword(k,n,e) r_verify_reg_dword(__LINE__,k,n,e) -static void r_verify_reg_dword(unsigned line, HKEY key, const char *value_name, DWORD exp_value) -{ - LONG lr; - DWORD fnd_type, fnd_len, fnd_value; - - fnd_len = sizeof(fnd_value); - lr = RegQueryValueExA(key, value_name, NULL, &fnd_type, (BYTE *)&fnd_value, &fnd_len); - lok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr); - if(lr != ERROR_SUCCESS) - return; - - lok(fnd_type == REG_DWORD, "Got wrong type: %d\n", fnd_type); - if(fnd_type != REG_DWORD) - return; - lok(fnd_value == exp_value, "Values differ: expected: 0x%x, got: 0x%x\n", - exp_value, fnd_value); -} - -#define verify_reg_binary(k,n,e,z) r_verify_reg_binary(__LINE__,k,n,e,z) -static void r_verify_reg_binary(unsigned line, HKEY key, - const char *value_name, const char *exp_value, int exp_len) -{ - LONG lr; - DWORD fnd_type, fnd_len; - char fnd_value[1024]; - - fnd_len = sizeof(fnd_value); - lr = RegQueryValueExA(key, value_name, NULL, &fnd_type, (BYTE*)fnd_value, &fnd_len); - lok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr); - if(lr != ERROR_SUCCESS) - return; - - lok(fnd_type == REG_BINARY, "Got wrong type: %d\n", fnd_type); - if(fnd_type != REG_BINARY) - return; - lok(fnd_len == exp_len, - "Lengths differ: expected %d, got %d\n", exp_len, fnd_len); - lok(!memcmp(exp_value, fnd_value, exp_len), - "Data differs\n"); -} - #define verify_reg_nonexist(k,n) r_verify_reg_nonexist(__LINE__,k,n) static void r_verify_reg_nonexist(unsigned line, HKEY key, const char *value_name) { @@ -202,6 +168,7 @@ static void r_verify_reg_nonexist(unsigned line, HKEY key, const char *value_nam static void test_basic_import(void) { HKEY hkey; + DWORD dword = 0x17; char exp_binary[] = {0xAA,0xBB,0xCC,0x11}; WCHAR wide_test[] = {0xFEFF,'W','i','n','d','o','w','s',' ','R','e','g', 'i','s','t','r','y',' ','E','d','i','t','o','r',' ','V','e','r','s', @@ -231,12 +198,12 @@ static void test_basic_import(void) "\"TestValue\"=\"AValue\"\n"); lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr); - verify_reg_sz(hkey, "TestValue", "AValue"); + verify_reg(hkey, "TestValue", REG_SZ, "AValue", 7, 0); exec_import_str("REGEDIT4\r\n\r\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" "\"TestValue2\"=\"BValue\"\r\n"); - verify_reg_sz(hkey, "TestValue2", "BValue"); + verify_reg(hkey, "TestValue2", REG_SZ, "BValue", 7, 0); if (supports_wchar) { @@ -252,22 +219,22 @@ static void test_basic_import(void) exec_import_str("REGEDIT4\r\r" "[HKEY_CURRENT_USER\\" KEY_BASE "]\r" "\"TestValue4\"=\"DValue\"\r"); - verify_reg_sz(hkey, "TestValue4", "DValue"); + verify_reg(hkey, "TestValue4", REG_SZ, "DValue", 7, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestDword\"=dword:00000017\n"); - verify_reg_dword(hkey, "TestDword", 0x17); + verify_reg(hkey, "TestDword", REG_DWORD, &dword, sizeof(dword), 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestBinary\"=hex:aa,bb,cc,11\n"); - verify_reg_binary(hkey, "TestBinary", exp_binary, sizeof(exp_binary)); + verify_reg(hkey, "TestBinary", REG_BINARY, exp_binary, sizeof(exp_binary), 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"With=Equals\"=\"asdf\"\n"); - verify_reg_sz(hkey, "With=Equals", "asdf"); + verify_reg(hkey, "With=Equals", REG_SZ, "asdf", 5, 0); RegCloseKey(hkey);

1 0

Hugh McMaster : regedit/tests: Open the registry key once in each test function.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 01590f5c35ff7faf09ca1c2da1f19b8681abc7c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=01590f5c35ff7faf09ca1c2da… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Oct 24 11:27:14 2016 +0000 regedit/tests: Open the registry key once in each test function. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 123 ++++++++++++++------------------------- 1 file changed, 45 insertions(+), 78 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=01590f5c35ff7faf09ca1…

1 0

Hugh McMaster : regedit/tests: Add line break and complexity tests.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: 5027f01a6a6bfde440c1427ade69cefe1627c950 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5027f01a6a6bfde440c1427ad… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Oct 24 11:27:37 2016 +0000 regedit/tests: Add line break and complexity tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index eeff9d8..9692c06 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -236,6 +236,39 @@ static void test_basic_import(void) "\"With=Equals\"=\"asdf\"\n"); verify_reg(hkey, "With=Equals", REG_SZ, "asdf", 5, 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Line1\"=\"Value1\"\n\n" + "\"Line2\"=\"Value2\"\n\n\n" + "\"Line3\"=\"Value3\"\n\n\n\n" + "\"Line4\"=\"Value4\"\n\n"); + verify_reg(hkey, "Line1", REG_SZ, "Value1", 7, 0); + todo_wine verify_reg(hkey, "Line2", REG_SZ, "Value2", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "Line3", REG_SZ, "Value3", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "Line4", REG_SZ, "Value4", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine1\"=dword:00000782\n\n" + "\"Wine2\"=\"Test Value\"\n" + "\"Wine3\"=hex(7):4c,69,6e,65,20,\ + 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "#comment\n" + "@=\"Test\"\n" + ";comment\n\n" + "\"Wine4\"=dword:12345678\n\n"); + dword = 0x782; + verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "", REG_SZ, "Test", 5, + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + dword = 0x12345678; + todo_wine verify_reg(hkey, "Wine4", REG_DWORD, &dword, sizeof(dword), + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : reg/tests: Add line break and complexity tests for ' reg import'.
by Alexandre Julliard 24 Oct '16

24 Oct '16

Module: wine Branch: master Commit: bce972b156d184b34e8780898c2fa3ccb757866d URL: http://source.winehq.org/git/wine.git/?a=commit;h=bce972b156d184b34e8780898… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Oct 24 11:28:32 2016 +0000 reg/tests: Add line break and complexity tests for 'reg import'. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 1e3d1d2..794ebbc 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -908,6 +908,42 @@ static void test_import(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg(hkey, "Test6", REG_SZ, "Value6", 7, 0); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Line1\"=\"Value1\"\n\n" + "\"Line2\"=\"Value2\"\n\n\n" + "\"Line3\"=\"Value3\"\n\n\n\n" + "\"Line4\"=\"Value4\"\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Line1", REG_SZ, "Value1", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "Line2", REG_SZ, "Value2", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "Line3", REG_SZ, "Value3", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "Line4", REG_SZ, "Value4", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine1\"=dword:00000782\n\n" + "\"Wine2\"=\"Test Value\"\n" + "\"Wine3\"=hex(7):4c,69,6e,65,20,\ + 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "#comment\n" + "@=\"Test\"\n" + ";comment\n\n" + "\"Wine4\"=dword:12345678\n\n", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = 0x782; + todo_wine verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + todo_wine verify_reg(hkey, "", REG_SZ, "Test", 5, + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + dword = 0x12345678; + todo_wine verify_reg(hkey, "Wine4", REG_DWORD, &dword, sizeof(dword), + TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0