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

Alexandre Julliard : makedep: Pass a makefile pointer to all internal functions.
by Alexandre Julliard 10 Apr '14

10 Apr '14

Module: wine Branch: master Commit: f9ddafa807b95f743764dea0f3bddf4acf71dcbc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9ddafa807b95f743764dea0f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 10 13:41:23 2014 +0200 makedep: Pass a makefile pointer to all internal functions. --- tools/makedep.c | 588 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 307 insertions(+), 281 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f9ddafa807b95f743764d…

1 0

Alexandre Julliard : makedep: Add a helper function to check if a string exists in an array.
by Alexandre Julliard 10 Apr '14

10 Apr '14

Module: wine Branch: master Commit: 299ce6f9f04224f72161ff7d6698de129eacb919 URL: http://source.winehq.org/git/wine.git/?a=commit;h=299ce6f9f04224f72161ff7d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 10 13:15:13 2014 +0200 makedep: Add a helper function to check if a string exists in an array. --- tools/makedep.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index a83320f..63b4de9 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -343,14 +343,23 @@ static void strarray_addall( struct strarray *array, struct strarray added ) /******************************************************************* - * strarray_add_uniq + * strarray_exists */ -static void strarray_add_uniq( struct strarray *array, const char *str ) +static int strarray_exists( struct strarray *array, const char *str ) { unsigned int i; - for (i = 0; i < array->count; i++) if (!strcmp( array->str[i], str )) return; - strarray_add( array, str ); + for (i = 0; i < array->count; i++) if (!strcmp( array->str[i], str )) return 1; + return 0; +} + + +/******************************************************************* + * strarray_add_uniq + */ +static void strarray_add_uniq( struct strarray *array, const char *str ) +{ + if (!strarray_exists( array, str )) strarray_add( array, str ); } @@ -2417,16 +2426,12 @@ static void update_makefile( const char *path ) if (make->module && strendswith( make->module, ".a" )) make->staticlib = make->module; - make->use_msvcrt = 0; - for (i = 0; i < make->appmode.count && !make->use_msvcrt; i++) - make->use_msvcrt = !strcmp( make->appmode.str[i], "-mno-cygwin" ); + make->is_win16 = strarray_exists( &make->extradllflags, "-m16" ); + make->use_msvcrt = strarray_exists( &make->appmode, "-mno-cygwin" ); + for (i = 0; i < make->imports.count && !make->use_msvcrt; i++) make->use_msvcrt = !strncmp( make->imports.str[i], "msvcr", 5 ); - make->is_win16 = 0; - for (i = 0; i < make->extradllflags.count && !make->is_win16; i++) - if (!strcmp( make->extradllflags.str[i], "-m16" )) make->is_win16 = 1; - make->include_args = empty_strarray; make->define_args = empty_strarray; strarray_add( &make->define_args, "-D__WINESRC__" );

1 0

Alexandre Julliard : makedep: Store the sources list inside the makefile structure.
by Alexandre Julliard 10 Apr '14

10 Apr '14

Module: wine Branch: master Commit: 4cb68d2322a396ba7ef3ff9b5601a6ce59e57e92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cb68d2322a396ba7ef3ff9b5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 10 13:50:37 2014 +0200 makedep: Store the sources list inside the makefile structure. --- tools/makedep.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tools/makedep.c b/tools/makedep.c index 63b4de9..3c1f8bd 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -82,7 +82,6 @@ static const struct { FLAG_IDL_HEADER, ".h" } }; -static struct list sources = LIST_INIT(sources); static struct list includes = LIST_INIT(includes); struct strarray @@ -126,6 +125,7 @@ struct makefile struct strarray imports; struct strarray delayimports; struct strarray extradllflags; + struct list sources; const char *base_dir; const char *src_dir; const char *obj_dir; @@ -654,11 +654,11 @@ static char *get_line( FILE *file ) /******************************************************************* * find_src_file */ -static struct incl_file *find_src_file( const char *name ) +static struct incl_file *find_src_file( struct makefile *make, const char *name ) { struct incl_file *file; - LIST_FOR_EACH_ENTRY( file, &sources, struct incl_file, entry ) + LIST_FOR_EACH_ENTRY( file, &make->sources, struct incl_file, entry ) if (!strcmp( name, file->name )) return file; return NULL; } @@ -741,13 +741,13 @@ static struct incl_file *add_generated_source( struct makefile *make, { struct incl_file *file; - if ((file = find_src_file( name ))) return file; /* we already have it */ + if ((file = find_src_file( make, name ))) return file; /* we already have it */ file = xmalloc( sizeof(*file) ); memset( file, 0, sizeof(*file) ); file->name = xstrdup( name ); file->filename = obj_dir_path( make, filename ? filename : name ); file->flags = FLAG_GENERATED; - list_add_tail( &sources, &file->entry ); + list_add_tail( &make->sources, &file->entry ); return file; } @@ -1280,11 +1280,11 @@ static struct incl_file *add_src_file( struct makefile *make, const char *name ) { struct incl_file *file; - if ((file = find_src_file( name ))) return file; /* we already have it */ + if ((file = find_src_file( make, name ))) return file; /* we already have it */ file = xmalloc( sizeof(*file) ); memset( file, 0, sizeof(*file) ); file->name = xstrdup(name); - list_add_tail( &sources, &file->entry ); + list_add_tail( &make->sources, &file->entry ); parse_file( make, file, 1 ); return file; } @@ -1434,7 +1434,7 @@ static void add_generated_sources( struct makefile *make ) { struct incl_file *source, *next, *file; - LIST_FOR_EACH_ENTRY_SAFE( source, next, &sources, struct incl_file, entry ) + LIST_FOR_EACH_ENTRY_SAFE( source, next, &make->sources, struct incl_file, entry ) { if (source->flags & FLAG_IDL_CLIENT) { @@ -1582,7 +1582,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t if (make->use_msvcrt) strarray_add( &includes, strmake( "-I%s", top_dir_path( make, "include/msvcrt" ))); strarray_addall( &includes, make->include_args ); - LIST_FOR_EACH_ENTRY( source, &sources, struct incl_file, entry ) + LIST_FOR_EACH_ENTRY( source, &make->sources, struct incl_file, entry ) { struct strarray extradefs; char *obj = xstrdup( source->name ); @@ -1690,7 +1690,7 @@ static struct strarray output_sources( struct makefile *make, struct strarray *t { if (!(source->flags & idl_outputs[i].flag)) continue; dest = strmake( "%s%s", obj, idl_outputs[i].ext ); - if (!find_src_file( dest )) strarray_add( &clean_files, dest ); + if (!find_src_file( make, dest )) strarray_add( &clean_files, dest ); strarray_add( &targets, dest ); } if (source->flags & FLAG_IDL_PROXY) strarray_add( &dlldata_files, source->name ); @@ -2444,7 +2444,7 @@ static void update_makefile( const char *path ) strarray_add_uniq( &make->define_args, value.str[i] ); strarray_addall( &make->define_args, get_expanded_make_var_array( make, "EXTRADEFS" )); - list_init( &sources ); + list_init( &make->sources ); list_init( &includes ); for (var = source_vars; *var; var++)

1 0

Henri Verbeet : d3d9/tests: Use a separate device for maxmip_test().
by Alexandre Julliard 10 Apr '14

10 Apr '14

Module: wine Branch: master Commit: f329a2b5866ec70391e0778f8daa4ab33887fe0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f329a2b5866ec70391e0778f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 10 10:05:42 2014 +0200 d3d9/tests: Use a separate device for maxmip_test(). --- dlls/d3d9/tests/visual.c | 62 ++++++++++++++++++++++++++++------------------ 1 file changed, 38 insertions(+), 24 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 3d4cda7..75ec355 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3472,12 +3472,18 @@ out: } } -static void maxmip_test(IDirect3DDevice9 *device) +static void maxmip_test(void) { - IDirect3DTexture9 *texture = NULL; - IDirect3DSurface9 *surface = NULL; + IDirect3DTexture9 *texture; + IDirect3DSurface9 *surface; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + D3DCOLOR color; + ULONG refcount; + D3DCAPS9 caps; + HWND window; HRESULT hr; - DWORD color; + static const struct { struct @@ -3515,15 +3521,29 @@ static void maxmip_test(IDirect3DDevice9 *device) }}, }; - hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 3, 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, - &texture, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_CreateTexture failed with %08x\n", hr); - if(!texture) + 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 test texture\n"); - return; + 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.TextureCaps & D3DPTEXTURECAPS_MIPMAP)) + { + skip("No mipmap support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; } + hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 3, 0, + D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); ok(SUCCEEDED(hr), "IDirect3DTexture9_GetSurfaceLevel returned %#x.\n", hr); fill_surface(surface, 0xffff0000, 0); @@ -3542,6 +3562,8 @@ static void maxmip_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_TEX1); ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with %08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_NONE); ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState failed with %08x\n", hr); @@ -3696,13 +3718,12 @@ static void maxmip_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed (0x%08x)\n", hr); - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(hr == D3D_OK, "IDirect3DDevice9_SetTexture failed with %08x\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_NONE); - ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState failed with %08x\n", hr); - hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAXMIPLEVEL, 0); - ok(hr == D3D_OK, "IDirect3DDevice9_SetSamplerState failed with %08x\n", hr); IDirect3DTexture9_Release(texture); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void release_buffer_test(void) @@ -16660,18 +16681,11 @@ START_TEST(visual) skip("No cube texture support\n"); } z_range_test(device_ptr); - if(caps.TextureCaps & D3DPTEXTURECAPS_MIPMAP) - { - maxmip_test(device_ptr); - } - else - { - skip("No mipmap support\n"); - } cleanup_device(device_ptr); device_ptr = NULL; + maxmip_test(); offscreen_test(); ds_size_test(); alpha_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for z_range_test().
by Alexandre Julliard 10 Apr '14

10 Apr '14

Module: wine Branch: master Commit: 8a170e9d48885ddcd509a2e58dc3ea257d9a6859 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a170e9d48885ddcd509a2e58… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 10 10:05:43 2014 +0200 d3d9/tests: Use a separate device for z_range_test(). --- dlls/d3d9/tests/visual.c | 57 ++++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 22 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 75ec355..4094ff3 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -2551,8 +2551,17 @@ done: DestroyWindow(window); } -static void z_range_test(IDirect3DDevice9 *device) +static void z_range_test(void) { + IDirect3DVertexShader9 *shader; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; + DWORD color; + HWND window; + HRESULT hr; + static const struct vertex quad[] = { {-1.0f, 0.0f, 1.1f, 0xffff0000}, @@ -2569,22 +2578,18 @@ static void z_range_test(IDirect3DDevice9 *device) }; static const struct tvertex quad3[] = { - { 0.0f, 240.0f, 1.1f, 1.0f, 0xffffff00}, - { 0.0f, 480.0f, 1.1f, 1.0f, 0xffffff00}, {640.0f, 240.0f, -1.1f, 1.0f, 0xffffff00}, {640.0f, 480.0f, -1.1f, 1.0f, 0xffffff00}, + { 0.0f, 240.0f, 1.1f, 1.0f, 0xffffff00}, + { 0.0f, 480.0f, 1.1f, 1.0f, 0xffffff00}, }; static const struct tvertex quad4[] = { - { 0.0f, 240.0f, 1.1f, 1.0f, 0xff00ff00}, - { 0.0f, 480.0f, 1.1f, 1.0f, 0xff00ff00}, {640.0f, 240.0f, -1.1f, 1.0f, 0xff00ff00}, {640.0f, 480.0f, -1.1f, 1.0f, 0xff00ff00}, + { 0.0f, 240.0f, 1.1f, 1.0f, 0xff00ff00}, + { 0.0f, 480.0f, 1.1f, 1.0f, 0xff00ff00}, }; - HRESULT hr; - DWORD color; - IDirect3DVertexShader9 *shader; - D3DCAPS9 caps; static const DWORD shader_code[] = { 0xfffe0101, /* vs_1_1 */ @@ -2596,6 +2601,16 @@ static void z_range_test(IDirect3DDevice9 *device) static const float color_const_1[] = {1.0f, 0.0f, 0.0f, 1.0f}; static const float color_const_2[] = {0.0f, 0.0f, 1.0f, 1.0f}; + 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); @@ -2610,6 +2625,8 @@ static void z_range_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffffffff, 0.0f, 0); ok(SUCCEEDED(hr), "Failed to clear, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_LIGHTING, FALSE); + ok(SUCCEEDED(hr), "Failed to disable lighting, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, TRUE); ok(SUCCEEDED(hr), "Failed to enable clipping, hr %#x.\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_TRUE); @@ -2698,8 +2715,9 @@ static void z_range_test(IDirect3DDevice9 *device) /* Test the shader path */ if (caps.VertexShaderVersion < D3DVS_VERSION(1, 1)) { - skip("Vertex shaders not supported\n"); - goto out; + skip("Vertex shaders not supported, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; } hr = IDirect3DDevice9_CreateVertexShader(device, shader_code, &shader); ok(SUCCEEDED(hr), "Failed to create vertex shader, hr %#x.\n", hr); @@ -2730,9 +2748,6 @@ static void z_range_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetVertexShader(device, NULL); - ok(SUCCEEDED(hr), "Failed to set vertex shader, hr %#x.\n", hr); - IDirect3DVertexShader9_Release(shader); /* Z < 1.0 */ @@ -2759,13 +2774,11 @@ static void z_range_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); -out: - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); - ok(SUCCEEDED(hr), "Failed to disable z test, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_CLIPPING, FALSE); - ok(SUCCEEDED(hr), "Failed to disable clipping, hr %#x.\n", hr); - hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZWRITEENABLE, TRUE); - ok(SUCCEEDED(hr), "Failed to enable z writes, hr %#x.\n", hr); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void fill_surface(IDirect3DSurface9 *surface, DWORD color, DWORD flags) @@ -16680,11 +16693,11 @@ START_TEST(visual) } else { skip("No cube texture support\n"); } - z_range_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + z_range_test(); maxmip_test(); offscreen_test(); ds_size_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for test_cube_wrap().
by Alexandre Julliard 10 Apr '14

10 Apr '14

Module: wine Branch: master Commit: 0453e4e44a556c5dbcac68a03b59c5d4ca8433dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0453e4e44a556c5dbcac68a03… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 10 10:05:44 2014 +0200 d3d9/tests: Use a separate device for test_cube_wrap(). --- dlls/d3d9/tests/visual.c | 78 +++++++++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 28 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4094ff3..67099a5 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1496,40 +1496,65 @@ static void fog_test(IDirect3DDevice9 *device) * interpolate between the edge texels of the three involved faces. It should * never involve the border color or the other side (texcoord wrapping) of a * face in the interpolation. */ -static void test_cube_wrap(IDirect3DDevice9 *device) +static void test_cube_wrap(void) { - static const float quad[][6] = { + IDirect3DVertexDeclaration9 *vertex_declaration; + IDirect3DSurface9 *face_surface, *surface; + IDirect3DCubeTexture9 *texture; + D3DLOCKED_RECT locked_rect; + IDirect3DDevice9 *device; + unsigned int x, y, face; + IDirect3D9 *d3d; + ULONG refcount; + D3DCAPS9 caps; + HWND window; + HRESULT hr; + + static const float quad[][6] = + { {-1.0f, -1.0f, 0.0f, 1.0f, 1.0f, 1.0f}, {-1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 1.0f}, { 1.0f, -1.0f, 0.0f, 1.0f, 1.0f, 1.0f}, { 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 1.0f}, }; - - static const D3DVERTEXELEMENT9 decl_elements[] = { + static const D3DVERTEXELEMENT9 decl_elements[] = + { {0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0}, {0, 12, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_TEXCOORD, 0}, D3DDECL_END() }; - - static const struct { + static const struct + { D3DTEXTUREADDRESS mode; const char *name; - } address_modes[] = { - {D3DTADDRESS_WRAP, "D3DTADDRESS_WRAP"}, - {D3DTADDRESS_MIRROR, "D3DTADDRESS_MIRROR"}, - {D3DTADDRESS_CLAMP, "D3DTADDRESS_CLAMP"}, - {D3DTADDRESS_BORDER, "D3DTADDRESS_BORDER"}, + } + address_modes[] = + { + {D3DTADDRESS_WRAP, "D3DTADDRESS_WRAP"}, + {D3DTADDRESS_MIRROR, "D3DTADDRESS_MIRROR"}, + {D3DTADDRESS_CLAMP, "D3DTADDRESS_CLAMP"}, + {D3DTADDRESS_BORDER, "D3DTADDRESS_BORDER"}, {D3DTADDRESS_MIRRORONCE, "D3DTADDRESS_MIRRORONCE"}, }; - IDirect3DVertexDeclaration9 *vertex_declaration = NULL; - IDirect3DCubeTexture9 *texture = NULL; - IDirect3DSurface9 *surface = NULL; - IDirect3DSurface9 *face_surface; - D3DLOCKED_RECT locked_rect; - HRESULT hr; - UINT x; - INT y, face; + 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.TextureCaps & D3DPTEXTURECAPS_CUBEMAP)) + { + skip("No cube texture support, skipping tests.\n"); + IDirect3DDevice9_Release(device); + goto done; + } hr = IDirect3DDevice9_CreateVertexDeclaration(device, decl_elements, &vertex_declaration); ok(SUCCEEDED(hr), "CreateVertexDeclaration failed (0x%08x)\n", hr); @@ -1645,12 +1670,14 @@ static void test_cube_wrap(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "Clear failed (0x%08x)\n", hr); } - hr = IDirect3DDevice9_SetTexture(device, 0, NULL); - ok(SUCCEEDED(hr), "SetTexture failed (0x%08x)\n", hr); - IDirect3DVertexDeclaration9_Release(vertex_declaration); IDirect3DCubeTexture9_Release(texture); IDirect3DSurface9_Release(surface); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } static void offscreen_test(void) @@ -16687,16 +16714,11 @@ START_TEST(visual) clear_test(device_ptr); color_fill_test(device_ptr); fog_test(device_ptr); - if(caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP) - { - test_cube_wrap(device_ptr); - } else { - skip("No cube texture support\n"); - } cleanup_device(device_ptr); device_ptr = NULL; + test_cube_wrap(); z_range_test(); maxmip_test(); offscreen_test();

1 0

Henri Verbeet : d3d9/tests: Use a separate device for fog_test().
by Alexandre Julliard 10 Apr '14

10 Apr '14

Module: wine Branch: master Commit: b7f323e8c6e420b41e21155198c70937c2cac9c4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7f323e8c6e420b41e2115519… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 10 10:05:45 2014 +0200 d3d9/tests: Use a separate device for fog_test(). --- dlls/d3d9/tests/visual.c | 268 +++++++++++++++++++++++++--------------------- 1 file changed, 146 insertions(+), 122 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b7f323e8c6e420b41e211…

1 0

Henri Verbeet : d3d9/tests: Use a separate device for color_fill_test().
by Alexandre Julliard 10 Apr '14

10 Apr '14

Module: wine Branch: master Commit: 9595526932d6db0baea1c912f7160749bf809e4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9595526932d6db0baea1c912f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 10 10:05:46 2014 +0200 d3d9/tests: Use a separate device for color_fill_test(). --- dlls/d3d9/tests/visual.c | 94 ++++++++++++++++++++++++++-------------------- 1 file changed, 53 insertions(+), 41 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 06e1e68..50d563a 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -719,72 +719,84 @@ static void clear_test(IDirect3DDevice9 *device) IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); } -static void color_fill_test(IDirect3DDevice9 *device) +static void color_fill_test(void) { + IDirect3DSurface9 *offscreen_surface; + IDirect3DSurface9 *backbuffer; + IDirect3DSurface9 *rt_surface; + D3DCOLOR fill_color, color; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; HRESULT hr; - IDirect3DSurface9 *backbuffer = NULL; - IDirect3DSurface9 *rt_surface = NULL; - IDirect3DSurface9 *offscreen_surface = NULL; - DWORD fill_color, color; + + 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; + } /* Test ColorFill on a the backbuffer (should pass) */ hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); ok(hr == D3D_OK, "Can't get back buffer, hr = %08x\n", hr); - if(backbuffer) - { - fill_color = 0x112233; - hr = IDirect3DDevice9_ColorFill(device, backbuffer, NULL, fill_color); - ok(SUCCEEDED(hr), "Color fill failed, hr %#x.\n", hr); - color = getPixelColor(device, 0, 0); - ok(color == fill_color, "Expected color %08x, got %08x\n", fill_color, color); + fill_color = 0x112233; + hr = IDirect3DDevice9_ColorFill(device, backbuffer, NULL, fill_color); + ok(SUCCEEDED(hr), "Color fill failed, hr %#x.\n", hr); - IDirect3DSurface9_Release(backbuffer); - } + color = getPixelColor(device, 0, 0); + ok(color == fill_color, "Expected color %08x, got %08x\n", fill_color, color); + + IDirect3DSurface9_Release(backbuffer); /* Test ColorFill on a render target surface (should pass) */ - hr = IDirect3DDevice9_CreateRenderTarget(device, 32, 32, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, TRUE, &rt_surface, NULL ); + hr = IDirect3DDevice9_CreateRenderTarget(device, 32, 32, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &rt_surface, NULL ); ok(hr == D3D_OK, "Unable to create render target surface, hr = %08x\n", hr); - if(rt_surface) - { - fill_color = 0x445566; - hr = IDirect3DDevice9_ColorFill(device, rt_surface, NULL, fill_color); - ok(SUCCEEDED(hr), "Color fill failed, hr %#x.\n", hr); - color = getPixelColorFromSurface(rt_surface, 0, 0); - ok(color == fill_color, "Expected color %08x, got %08x\n", fill_color, color); + fill_color = 0x445566; + hr = IDirect3DDevice9_ColorFill(device, rt_surface, NULL, fill_color); + ok(SUCCEEDED(hr), "Color fill failed, hr %#x.\n", hr); - IDirect3DSurface9_Release(rt_surface); - } + color = getPixelColorFromSurface(rt_surface, 0, 0); + ok(color == fill_color, "Expected color %08x, got %08x\n", fill_color, color); + + IDirect3DSurface9_Release(rt_surface); /* Test ColorFill on an offscreen plain surface in D3DPOOL_DEFAULT (should pass) */ hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 32, 32, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &offscreen_surface, NULL); ok(hr == D3D_OK, "Unable to create offscreen plain surface, hr = %08x\n", hr); - if(offscreen_surface) - { - fill_color = 0x778899; - hr = IDirect3DDevice9_ColorFill(device, offscreen_surface, NULL, fill_color); - ok(SUCCEEDED(hr), "Color fill failed, hr %#x.\n", hr); - color = getPixelColorFromSurface(offscreen_surface, 0, 0); - ok(color == fill_color, "Expected color %08x, got %08x\n", fill_color, color); + fill_color = 0x778899; + hr = IDirect3DDevice9_ColorFill(device, offscreen_surface, NULL, fill_color); + ok(SUCCEEDED(hr), "Color fill failed, hr %#x.\n", hr); - IDirect3DSurface9_Release(offscreen_surface); - } + color = getPixelColorFromSurface(offscreen_surface, 0, 0); + ok(color == fill_color, "Expected color %08x, got %08x\n", fill_color, color); + + IDirect3DSurface9_Release(offscreen_surface); /* Try ColorFill on an offscreen surface in sysmem (should fail) */ - offscreen_surface = NULL; hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 32, 32, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &offscreen_surface, NULL); ok(hr == D3D_OK, "Unable to create offscreen plain surface, hr = %08x\n", hr); - if(offscreen_surface) - { - hr = IDirect3DDevice9_ColorFill(device, offscreen_surface, NULL, 0); - ok(hr == D3DERR_INVALIDCALL, "ColorFill on offscreen sysmem surface failed with hr = %08x\n", hr); - IDirect3DSurface9_Release(offscreen_surface); - } + hr = IDirect3DDevice9_ColorFill(device, offscreen_surface, NULL, 0); + ok(hr == D3DERR_INVALIDCALL, "ColorFill on offscreen sysmem surface failed with hr = %08x\n", hr); + + IDirect3DSurface9_Release(offscreen_surface); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); } /* @@ -16736,11 +16748,11 @@ START_TEST(visual) stretchrect_test(device_ptr); lighting_test(device_ptr); clear_test(device_ptr); - color_fill_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + color_fill_test(); fog_test(); test_cube_wrap(); z_range_test();

1 0

Dmitry Timoshkov : taskschd: Add invalid parameter check to IRegisteredTask:: get_State and IRegisteredTask::get_Enabled.
by Alexandre Julliard 10 Apr '14

10 Apr '14

Module: wine Branch: master Commit: ea248186b35796e733e1246759a0b89967cf6a0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea248186b35796e733e124675… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 10 17:41:22 2014 +0900 taskschd: Add invalid parameter check to IRegisteredTask::get_State and IRegisteredTask::get_Enabled. --- dlls/taskschd/regtask.c | 4 ++++ dlls/taskschd/tests/scheduler.c | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/dlls/taskschd/regtask.c b/dlls/taskschd/regtask.c index e224b3e..5e9d5d3 100644 --- a/dlls/taskschd/regtask.c +++ b/dlls/taskschd/regtask.c @@ -157,6 +157,8 @@ static HRESULT WINAPI regtask_get_State(IRegisteredTask *iface, TASK_STATE *stat TRACE("%p,%p\n", iface, state); + if (!state) return E_POINTER; + return SchRpcGetTaskInfo(regtask->path, SCH_FLAG_STATE, &enabled, state); } @@ -168,6 +170,8 @@ static HRESULT WINAPI regtask_get_Enabled(IRegisteredTask *iface, VARIANT_BOOL * TRACE("%p,%p\n", iface, v_enabled); + if (!v_enabled) return E_POINTER; + hr = SchRpcGetTaskInfo(regtask->path, 0, &enabled, &state); if (hr == S_OK) *v_enabled = enabled ? VARIANT_TRUE : VARIANT_FALSE; diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index e54e6ee..17501ad 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -909,6 +909,11 @@ todo_wine todo_wine ok(vbool == VARIANT_TRUE, "expected VARIANT_TRUE, got %d\n", vbool); + hr = IRegisteredTask_get_State(task2, NULL); + ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + hr = IRegisteredTask_get_Enabled(task2, NULL); + ok(hr == E_POINTER, "expected E_POINTER, got %#x\n", hr); + IRegisteredTask_Release(task2); hr = ITaskFolder_DeleteTask(folder, NULL, 0);

1 0

Dmitry Timoshkov : schedsvc/tests: Add a test for NULL task name passed to SchRpcRegisterTask.
by Alexandre Julliard 10 Apr '14

10 Apr '14

Module: wine Branch: master Commit: af0ede42d597e29f8526dd57c451490a9c717e03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af0ede42d597e29f8526dd57c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Apr 10 17:41:27 2014 +0900 schedsvc/tests: Add a test for NULL task name passed to SchRpcRegisterTask. --- dlls/schedsvc/schedsvc.c | 6 ++++++ dlls/schedsvc/tests/Makefile.in | 2 +- dlls/schedsvc/tests/rpcapi.c | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/schedsvc/schedsvc.c b/dlls/schedsvc/schedsvc.c index eb84998..5ce7d1d 100644 --- a/dlls/schedsvc/schedsvc.c +++ b/dlls/schedsvc/schedsvc.c @@ -180,6 +180,12 @@ HRESULT __cdecl SchRpcRegisterTask(const WCHAR *path, const WCHAR *xml, DWORD fl /* FIXME: assume that validation is performed on the client side */ if (flags & TASK_VALIDATE_ONLY) return S_OK; + if (!path) + { + FIXME("NULL name is not supported\n"); + return E_INVALIDARG; + } + full_name = get_full_name(path, &relative_path); if (!full_name) return E_OUTOFMEMORY; diff --git a/dlls/schedsvc/tests/Makefile.in b/dlls/schedsvc/tests/Makefile.in index f671f85..cd56fde 100644 --- a/dlls/schedsvc/tests/Makefile.in +++ b/dlls/schedsvc/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = schedsvc.dll -IMPORTS = rpcrt4 +IMPORTS = rpcrt4 ole32 C_SRCS = \ rpcapi.c diff --git a/dlls/schedsvc/tests/rpcapi.c b/dlls/schedsvc/tests/rpcapi.c index 02f6882..beaf7da 100644 --- a/dlls/schedsvc/tests/rpcapi.c +++ b/dlls/schedsvc/tests/rpcapi.c @@ -99,6 +99,7 @@ START_TEST(rpcapi) TASK_NAMES names; unsigned char *binding_str; PTOP_LEVEL_EXCEPTION_FILTER old_exception_filter; + IID iid; hr = RpcStringBindingComposeA(NULL, ncalrpc, NULL, NULL, NULL, &binding_str); ok(hr == RPC_S_OK, "RpcStringBindingCompose error %#x\n", hr); @@ -517,6 +518,21 @@ todo_wine hr = SchRpcDelete(Wine, 0); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + path = NULL; + info = NULL; + hr = SchRpcRegisterTask(NULL, xmlW, TASK_CREATE, NULL, TASK_LOGON_NONE, 0, NULL, &path, &info); +todo_wine + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + ok(!info, "expected NULL, info %p\n", info); +if (hr == S_OK) +{ + hr = IIDFromString(path, &iid); + ok(hr == S_OK, "IIDFromString(%s) error %#x\n", wine_dbgstr_w(path), hr); + hr = SchRpcDelete(path, 0); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + MIDL_user_free(path); +} + hr = RpcBindingFree(&rpc_handle); ok(hr == RPC_S_OK, "RpcBindingFree error %#x\n", hr); }

1 0