April 2014 - Wine-Commits - list.winehq.org

Alexandre Julliard : makedep: Add helper functions to get and set variables in string arrays.
by Alexandre Julliard April 2, 2014

April 2, 2014

Module: wine Branch: master Commit: 43fd82c61215ef1e29d995749aa28a38acfa4596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43fd82c61215ef1e29d995749… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 14:10:45 2014 +0200 makedep: Add helper functions to get and set variables in string arrays. --- tools/makedep.c | 63 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 41 insertions(+), 22 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 9ec8aef..73bf3f0 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -345,6 +345,42 @@ static void strarray_add_uniq( struct strarray *array, const char *str ) /******************************************************************* + * strarray_get_value + * + * Find a value in a name/value pair string array. + */ +static char *strarray_get_value( const struct strarray *array, const char *name ) +{ + unsigned int i; + + for (i = 0; i < array->count; i += 2) + if (!strcmp( array->str[i], name )) return xstrdup( array->str[i + 1] ); + return NULL; +} + + +/******************************************************************* + * strarray_set_value + * + * Define a value in a name/value pair string array. + */ +static void strarray_set_value( struct strarray *array, const char *name, const char *value ) +{ + unsigned int i; + + /* redefining a variable replaces the previous value */ + for (i = 0; i < array->count; i += 2) + { + if (strcmp( array->str[i], name )) continue; + array->str[i + 1] = value; + return; + } + strarray_add( array, name ); + strarray_add( array, value ); +} + + +/******************************************************************* * output_filename */ static void output_filename( const char *name ) @@ -1226,19 +1262,11 @@ static struct incl_file *add_src_file( const char *name ) */ static char *get_make_variable( const char *name ) { - unsigned int i; - - for (i = 0; i < cmdline_vars.count; i += 2) - if (!strcmp( cmdline_vars.str[i], name )) - return xstrdup( cmdline_vars.str[i + 1] ); - - for (i = 0; i < make_vars.count; i += 2) - if (!strcmp( make_vars.str[i], name )) - return xstrdup( make_vars.str[i + 1] ); + char *ret; - for (i = 0; i < top_make_vars.count; i += 2) - if (!strcmp( top_make_vars.str[i], name )) - return xstrdup( top_make_vars.str[i + 1] ); + if ((ret = strarray_get_value( &cmdline_vars, name ))) return ret; + if ((ret = strarray_get_value( &make_vars, name ))) return ret; + if ((ret = strarray_get_value( &top_make_vars, name ))) return ret; return NULL; } @@ -1312,7 +1340,6 @@ static struct strarray get_expanded_make_var_array( const char *name ) */ static int set_make_variable( struct strarray *array, const char *assignment ) { - unsigned int i; char *p, *name; p = name = xstrdup( assignment ); @@ -1327,15 +1354,7 @@ static int set_make_variable( struct strarray *array, const char *assignment ) *p++ = 0; while (isspace(*p)) p++; - /* redefining a variable replaces the previous value */ - for (i = 0; i < array->count; i += 2) - { - if (strcmp( array->str[i], name )) continue; - array->str[i + 1] = p; - return 1; - } - strarray_add( array, name ); - strarray_add( array, p ); + strarray_set_value( array, name, p ); return 1; }

1 0

Alexandre Julliard : makedep: Allow the top-level makefile to set default values for make variables.
by Alexandre Julliard April 2, 2014

April 2, 2014

Module: wine Branch: master Commit: 83fe4ffb36cf43b225b9f24c1c6c711e57004a3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=83fe4ffb36cf43b225b9f24c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 14:10:45 2014 +0200 makedep: Allow the top-level makefile to set default values for make variables. --- tools/makedep.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 8c6758c..9ec8aef 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -104,6 +104,7 @@ static struct strarray cpp_flags; static struct strarray unwind_flags; static struct strarray libs; static struct strarray cmdline_vars; +static struct strarray top_make_vars; static const char *root_src_dir; static const char *tools_dir; static const char *tools_ext; @@ -1234,6 +1235,10 @@ static char *get_make_variable( const char *name ) for (i = 0; i < make_vars.count; i += 2) if (!strcmp( make_vars.str[i], name )) return xstrdup( make_vars.str[i + 1] ); + + for (i = 0; i < top_make_vars.count; i += 2) + if (!strcmp( top_make_vars.str[i], name )) + return xstrdup( top_make_vars.str[i + 1] ); return NULL; } @@ -1338,12 +1343,12 @@ static int set_make_variable( struct strarray *array, const char *assignment ) /******************************************************************* * parse_makefile */ -static void parse_makefile( const char *name, const char *separator ) +static void parse_makefile( const char *name, const char *separator, struct strarray *vars ) { char *buffer; FILE *file; - make_vars = empty_strarray; + *vars = empty_strarray; input_file_name = name; if (!(file = fopen( input_file_name, "r" ))) fatal_perror( "open" ); @@ -1354,7 +1359,7 @@ static void parse_makefile( const char *name, const char *separator ) if (*buffer == '\t') continue; /* command */ while (isspace( *buffer )) buffer++; if (*buffer == '#') continue; /* comment */ - set_make_variable( &make_vars, buffer ); + set_make_variable( vars, buffer ); } fclose( file ); input_file_name = NULL; @@ -2316,7 +2321,7 @@ static void update_makefile( const char *path ) base_dir = path; if (!strcmp( base_dir, "." )) base_dir = NULL; output_file_name = base_dir_path( makefile_name ); - parse_makefile( output_file_name, Separator ); + parse_makefile( output_file_name, Separator, &make_vars ); src_dir = get_expanded_make_variable( "srcdir" ); top_src_dir = get_expanded_make_variable( "top_srcdir" ); @@ -2476,7 +2481,7 @@ int main( int argc, char *argv[] ) signal( SIGHUP, exit_on_signal ); #endif - parse_makefile( makefile_name, "# End of common header" ); + parse_makefile( makefile_name, "# End of common header", &top_make_vars ); linguas = get_expanded_make_var_array( "LINGUAS" ); target_flags = get_expanded_make_var_array( "TARGETFLAGS" );

1 0

Alexandre Julliard : makedep: Add phony install targets for fonts also for the ttf case.
by Alexandre Julliard April 2, 2014

April 2, 2014

Module: wine Branch: master Commit: 6bfd2e9a75bf562996111d631bc1712b3e5dc9dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bfd2e9a75bf562996111d631… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 2 10:58:30 2014 +0200 makedep: Add phony install targets for fonts also for the ttf case. --- tools/makedep.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index d878869..3be431a 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -1663,6 +1663,7 @@ static struct strarray output_sources(void) output( "%s: %s\n", ttf_file, source->filename ); output( "\t%s -script %s %s $@\n", fontforge, top_dir_path( "fonts/genttf.ff" ), source->filename ); + if (!(source->flags & FLAG_SFD_FONTS)) output( "all: %s\n", ttf_file ); } if (source->flags & FLAG_INSTALL) { @@ -1687,13 +1688,14 @@ static struct strarray output_sources(void) output( "\t$(INSTALL_DATA) %s $(DESTDIR)$(fontdir)/%s\n", font, font ); output( "uninstall::\n" ); output( "\t$(RM) $(DESTDIR)$(fontdir)/%s\n", font ); - strarray_add_uniq( &phony_targets, "install" ); - strarray_add_uniq( &phony_targets, "install-lib" ); - strarray_add_uniq( &phony_targets, "uninstall" ); } } - else output( "all: %s\n", ttf_file ); - + if (source->flags & (FLAG_INSTALL | FLAG_SFD_FONTS)) + { + strarray_add_uniq( &phony_targets, "install" ); + strarray_add_uniq( &phony_targets, "install-lib" ); + strarray_add_uniq( &phony_targets, "uninstall" ); + } continue; /* no dependencies */ } else if (!strcmp( ext, "svg" )) /* svg file */

1 0

Dmitry Timoshkov : widl: Pass type attributes from write_array_tfs to write_array_element_type.
by Alexandre Julliard April 2, 2014

April 2, 2014

Module: wine Branch: master Commit: 1845d10c3eee8bca3bfbfc6cdeab831dcd907ee6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1845d10c3eee8bca3bfbfc6cd… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 2 18:37:32 2014 +0900 widl: Pass type attributes from write_array_tfs to write_array_element_type. This allows to differentiate strings and write appropriate rpc type (FC_C_C[W]STRING instead of FC_[W]CHAR). --- tools/widl/typegen.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 889d8c5..881f161 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2316,7 +2316,7 @@ static void write_member_type(FILE *file, const type_t *cont, error("Unsupported member type %d\n", type_get_type(type)); } -static void write_array_element_type(FILE *file, const type_t *type, +static void write_array_element_type(FILE *file, const attr_list_t *attrs, const type_t *type, int cont_is_complex, unsigned int *tfsoff) { type_t *elem = type_array_get_element(type); @@ -2331,7 +2331,7 @@ static void write_array_element_type(FILE *file, const type_t *type, ref->typestring_offset, tfsoff); return; } - if (cont_is_complex && is_string_type(NULL, elem)) + if (cont_is_complex && is_string_type(attrs, elem)) { write_string_tfs(file, NULL, elem, TYPE_CONTEXT_CONTAINER, NULL, tfsoff); return; @@ -2967,7 +2967,7 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t *typestring_offset += 1; } - write_array_element_type(file, type, FALSE, typestring_offset); + write_array_element_type(file, is_string_type(attrs, type) ? attrs : NULL, type, FALSE, typestring_offset); write_end(file, typestring_offset); } else @@ -2982,7 +2982,7 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t += write_conf_or_var_desc(file, current_structure, baseoff, type, length_is); - write_array_element_type(file, type, TRUE, typestring_offset); + write_array_element_type(file, is_string_type(attrs, type) ? attrs : NULL, type, TRUE, typestring_offset); write_end(file, typestring_offset); }

1 0

Henri Verbeet : d3d9/tests: Use a separate device for clip_planes_test().
by Alexandre Julliard April 2, 2014

April 2, 2014

Module: wine Branch: master Commit: f237f863972b4ec034d7d2c6338f010656ba742b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f237f863972b4ec034d7d2c63… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 2 09:11:11 2014 +0200 d3d9/tests: Use a separate device for clip_planes_test(). --- dlls/d3d9/tests/visual.c | 55 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e73cca5..e86a117 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -13214,18 +13214,18 @@ done: static void clip_planes(IDirect3DDevice9 *device, const char *test_name) { - const struct vertex quad1[] = + static const struct vertex quad1[] = { {-1.0f, -1.0f, 0.0f, 0xfff9e814}, - { 1.0f, -1.0f, 0.0f, 0xfff9e814}, {-1.0f, 1.0f, 0.0f, 0xfff9e814}, + { 1.0f, -1.0f, 0.0f, 0xfff9e814}, { 1.0f, 1.0f, 0.0f, 0xfff9e814}, }; - const struct vertex quad2[] = + static const struct vertex quad2[] = { {-1.0f, -1.0f, 0.0f, 0xff002b7f}, - { 1.0f, -1.0f, 0.0f, 0xff002b7f}, {-1.0f, 1.0f, 0.0f, 0xff002b7f}, + { 1.0f, -1.0f, 0.0f, 0xff002b7f}, { 1.0f, 1.0f, 0.0f, 0xff002b7f}, }; D3DCOLOR color; @@ -13264,10 +13264,19 @@ static void clip_planes(IDirect3DDevice9 *device, const char *test_name) ok(color_match(color, 0x00f9e814, 1), "%s test: color 0x%08x.\n", test_name, color); } -static void clip_planes_test(IDirect3DDevice9 *device) +static void clip_planes_test(void) { - const float plane0[4] = {0.0f, 1.0f, 0.0f, 0.5f / 480.0f}; /* a quarter-pixel offset */ + IDirect3DSurface9 *offscreen_surface, *original_rt; + IDirect3DTexture9 *offscreen = NULL; + IDirect3DVertexShader9 *shader; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; + HWND window; + HRESULT hr; + static const float plane0[4] = {0.0f, 1.0f, 0.0f, 0.5f / 480.0f}; /* a quarter-pixel offset */ static const DWORD shader_code[] = { 0xfffe0200, /* vs_2_0 */ @@ -13277,11 +13286,25 @@ static void clip_planes_test(IDirect3DDevice9 *device) 0x02000001, 0xd00f0000, 0x90e40001, /* mov oD0, v1 */ 0x0000ffff /* end */ }; - IDirect3DVertexShader9 *shader; - IDirect3DTexture9 *offscreen = NULL; - IDirect3DSurface9 *offscreen_surface, *original_rt; - HRESULT hr; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.VertexShaderVersion < D3DVS_VERSION(2, 0)) + { + skip("No vs_2_0 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } hr = IDirect3DDevice9_GetRenderTarget(device, 0, &original_rt); ok(SUCCEEDED(hr), "GetRenderTarget failed, hr %#x.\n", hr); @@ -13334,15 +13357,15 @@ static void clip_planes_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); - IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPLANEENABLE, 0); - hr = IDirect3DDevice9_SetVertexShader(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader failed, hr=%08x\n", hr); IDirect3DVertexShader9_Release(shader); - hr = IDirect3DDevice9_SetRenderTarget(device, 0, original_rt); - ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderTarget failed, hr=%08x\n", hr); IDirect3DSurface9_Release(original_rt); IDirect3DSurface9_Release(offscreen_surface); IDirect3DTexture9_Release(offscreen); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void fp_special_test(void) @@ -16219,13 +16242,13 @@ START_TEST(visual) loop_index_test(device_ptr); sincos_test(device_ptr); sgn_test(device_ptr); - clip_planes_test(device_ptr); } else skip("No vs_2_0 support\n"); cleanup_device(device_ptr); device_ptr = NULL; + clip_planes_test(); test_vshader_input(); test_vshader_float16(); stream_test();

1 0

Dmitry Timoshkov : widl: Avoid generating negative offsets for conformant arrays of strings.
by Alexandre Julliard April 2, 2014

April 2, 2014

Module: wine Branch: master Commit: bde38bebe9d396ba83a5b3e477fa616b6500c4d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bde38bebe9d396ba83a5b3e47… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 2 18:37:37 2014 +0900 widl: Avoid generating negative offsets for conformant arrays of strings. --- tools/widl/typegen.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 881f161..37222d1 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3581,12 +3581,26 @@ static unsigned int write_type_tfs(FILE *file, int indent, case TGT_POINTER: { enum type_context ref_context; + type_t *ref = type_pointer_get_ref(type); + if (context == TYPE_CONTEXT_TOPLEVELPARAM) ref_context = TYPE_CONTEXT_PARAM; else if (context == TYPE_CONTEXT_CONTAINER_NO_POINTERS) ref_context = TYPE_CONTEXT_CONTAINER; else ref_context = context; + + if (is_string_type(attrs, type) && is_conformant_array(ref)) + { + if (context != TYPE_CONTEXT_CONTAINER_NO_POINTERS) + write_pointer_tfs(file, attrs, type, *typeformat_offset + 4, context, typeformat_offset); + + offset = write_type_tfs(file, indent, attrs, ref, name, ref_context, typeformat_offset); + if (context == TYPE_CONTEXT_CONTAINER_NO_POINTERS) + return 0; + return offset; + } + offset = write_type_tfs( file, indent, attrs, type_pointer_get_ref(type), name, ref_context, typeformat_offset); if (context == TYPE_CONTEXT_CONTAINER_NO_POINTERS)

1 0

Dmitry Timoshkov : widl: Pass type attributes from write_array_tfs to write_pointer_description.
by Alexandre Julliard April 2, 2014

April 2, 2014

Module: wine Branch: master Commit: eb54b5b4dffd8f170a75d67b88de56c1a0678eb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb54b5b4dffd8f170a75d67b8… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Apr 2 18:37:27 2014 +0900 widl: Pass type attributes from write_array_tfs to write_pointer_description. This allows to differentiate strings and write appropriate rpc type (FC_C_C[W]STRING instead of FC_[W]CHAR). --- tools/widl/typegen.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 37d18f5..889d8c5 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -2728,7 +2728,7 @@ static int write_varying_array_pointer_descriptions( return pointer_count; } -static void write_pointer_description(FILE *file, type_t *type, +static void write_pointer_description(FILE *file, const attr_list_t *attrs, type_t *type, unsigned int *typestring_offset) { unsigned int offset_in_buffer; @@ -2757,7 +2757,7 @@ static void write_pointer_description(FILE *file, type_t *type, if (is_conformant_array(type) && (type_array_is_decl_as_ptr(type) || !current_structure)) write_conformant_array_pointer_descriptions( - file, NULL, type, 0, typestring_offset); + file, attrs, type, 0, typestring_offset); else if (type_get_type(type) == TYPE_STRUCT && get_struct_fc(type) == RPC_FC_CPSTRUCT) { @@ -2962,7 +2962,7 @@ static unsigned int write_array_tfs(FILE *file, const attr_list_t *attrs, type_t print_file(file, 2, "0x%x,\t/* FC_PP */\n", RPC_FC_PP); print_file(file, 2, "0x%x,\t/* FC_PAD */\n", RPC_FC_PAD); *typestring_offset += 2; - write_pointer_description(file, type, typestring_offset); + write_pointer_description(file, is_string_type(attrs, type) ? attrs : NULL, type, typestring_offset); print_file(file, 2, "0x%x,\t/* FC_END */\n", RPC_FC_END); *typestring_offset += 1; } @@ -3149,7 +3149,7 @@ static unsigned int write_struct_tfs(FILE *file, type_t *type, print_file(file, 2, "0x%x,\t/* FC_PP */\n", RPC_FC_PP); print_file(file, 2, "0x%x,\t/* FC_PAD */\n", RPC_FC_PAD); *tfsoff += 2; - write_pointer_description(file, type, tfsoff); + write_pointer_description(file, NULL, type, tfsoff); print_file(file, 2, "0x%x,\t/* FC_END */\n", RPC_FC_END); *tfsoff += 1; }

1 0

Henri Verbeet : d3d9/tests: Use a separate device for sgn_test().
by Alexandre Julliard April 2, 2014

April 2, 2014

Module: wine Branch: master Commit: 94e337df19c0f17078ee6c1fb3b57f8625deaa43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94e337df19c0f17078ee6c1fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 2 09:11:12 2014 +0200 d3d9/tests: Use a separate device for sgn_test(). --- dlls/d3d9/tests/visual.c | 55 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 13 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e86a117..c34a7fa 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11829,8 +11829,17 @@ static void loop_index_test(IDirect3DDevice9 *device) IDirect3DVertexShader9_Release(shader); } -static void sgn_test(IDirect3DDevice9 *device) +static void sgn_test(void) { + IDirect3DVertexShader9 *shader; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; + DWORD color; + HWND window; + HRESULT hr; + static const DWORD shader_code[] = { 0xfffe0200, /* vs_2_0 */ @@ -11842,23 +11851,40 @@ static void sgn_test(IDirect3DDevice9 *device) 0x03000002, 0xd00f0000, 0x80e40000, 0xa0e40001, /* add oD0, r0, c1 */ 0x0000ffff /* end */ }; - IDirect3DVertexShader9 *shader; - HRESULT hr; - DWORD color; - const float quad[] = { - -1.0, -1.0, 0.1, - 1.0, -1.0, 0.1, - -1.0, 1.0, 0.1, - 1.0, 1.0, 0.1 + static const float quad[] = + { + -1.0f, -1.0f, 0.1f, + -1.0f, 1.0f, 0.1f, + 1.0f, -1.0f, 0.1f, + 1.0f, 1.0f, 0.1f, }; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.VertexShaderVersion < D3DVS_VERSION(2, 0)) + { + skip("No vs_2_0 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } + hr = IDirect3DDevice9_CreateVertexShader(device, shader_code, &shader); ok(hr == D3D_OK, "IDirect3DDevice9_CreateVertexShader failed with %08x\n", hr); hr = IDirect3DDevice9_SetVertexShader(device, shader); ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader failed with %08x\n", hr); hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with %08x\n", hr); - hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00ff0000, 0.0, 0); + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00ff0000, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear returned %08x\n", hr); hr = IDirect3DDevice9_BeginScene(device); @@ -11876,9 +11902,12 @@ static void sgn_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); - hr = IDirect3DDevice9_SetVertexShader(device, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetVertexShader failed with %08x\n", hr); IDirect3DVertexShader9_Release(shader); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void viewport_test(IDirect3DDevice9 *device) { @@ -16241,13 +16270,13 @@ START_TEST(visual) test_mova(device_ptr); loop_index_test(device_ptr); sincos_test(device_ptr); - sgn_test(device_ptr); } else skip("No vs_2_0 support\n"); cleanup_device(device_ptr); device_ptr = NULL; + sgn_test(); clip_planes_test(); test_vshader_input(); test_vshader_float16();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for test_vshader_input() .
by Alexandre Julliard April 2, 2014

April 2, 2014

Module: wine Branch: master Commit: 779b8b53e874a71da6055a77d3e60771cbb76c0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=779b8b53e874a71da6055a77d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 2 09:11:10 2014 +0200 d3d9/tests: Use a separate device for test_vshader_input(). --- dlls/d3d9/tests/visual.c | 220 +++++++++++++++++++++++++++------------------- 1 file changed, 130 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=779b8b53e874a71da6055…

1 0

Henri Verbeet : d3d9/tests: Use a separate device for sincos_test().
by Alexandre Julliard April 2, 2014

April 2, 2014

Module: wine Branch: master Commit: 47786eb64a4f53d6acb825227c80d2f284a63bcf URL: http://source.winehq.org/git/wine.git/?a=commit;h=47786eb64a4f53d6acb825227… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 2 09:11:13 2014 +0200 d3d9/tests: Use a separate device for sincos_test(). --- dlls/d3d9/tests/visual.c | 49 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 38 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index c34a7fa..562e3f0 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11648,8 +11648,18 @@ static void alphatest_test(IDirect3DDevice9 *device) { ok(hr == D3D_OK, "IDirect3DDevice9_SetPixelShader failed with 0x%08x\n", hr); } -static void sincos_test(IDirect3DDevice9 *device) +static void sincos_test(void) { + IDirect3DVertexShader9 *sin_shader, *cos_shader; + IDirect3DDevice9 *device; + struct vec3 data[1280]; + IDirect3D9 *d3d; + unsigned int i; + ULONG refcount; + D3DCAPS9 caps; + HWND window; + HRESULT hr; + static const DWORD sin_shader_code[] = { 0xfffe0200, /* vs_2_0 */ @@ -11674,14 +11684,27 @@ static void sincos_test(IDirect3DDevice9 *device) 0x02000001, 0xd00f0000, 0xa0a90002, /* mov oD0, c2.yzzz */ 0x0000ffff /* end */ }; - IDirect3DVertexShader9 *sin_shader, *cos_shader; - HRESULT hr; - struct { - float x, y, z; - } data[1280]; - unsigned int i; - float sincosc1[4] = {D3DSINCOSCONST1}; - float sincosc2[4] = {D3DSINCOSCONST2}; + static const float sincosc1[4] = {D3DSINCOSCONST1}; + static const float sincosc2[4] = {D3DSINCOSCONST2}; + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); + if (caps.VertexShaderVersion < D3DVS_VERSION(2, 0)) + { + skip("No vs_2_0 support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00000000, 1.0f, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with 0x%08x\n", hr); @@ -11723,9 +11746,13 @@ static void sincos_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "IDirect3DDevice9_Present returned %#x.\n", hr); /* TODO: Find a way to properly validate the lines. Precicion issues make this a kinda nasty task */ - IDirect3DDevice9_SetVertexShader(device, NULL); IDirect3DVertexShader9_Release(sin_shader); IDirect3DVertexShader9_Release(cos_shader); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void loop_index_test(IDirect3DDevice9 *device) @@ -16269,13 +16296,13 @@ START_TEST(visual) { test_mova(device_ptr); loop_index_test(device_ptr); - sincos_test(device_ptr); } else skip("No vs_2_0 support\n"); cleanup_device(device_ptr); device_ptr = NULL; + sincos_test(); sgn_test(); clip_planes_test(); test_vshader_input();

1 0